From owner-svn-ports-head@FreeBSD.ORG Mon Oct 14 17:21:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id B4D02E88; Mon, 14 Oct 2013 17:21:23 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 929F928F2; Mon, 14 Oct 2013 17:21:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EHLN8Q037295; Mon, 14 Oct 2013 17:21:23 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EHLNOw037294; Mon, 14 Oct 2013 17:21:23 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201310141721.r9EHLNOw037294@svn.freebsd.org> From: Hajimu UMEMOTO Date: Mon, 14 Oct 2013 17:21:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330337 - head/mail/cyrus-imapd23 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 17:21:23 -0000 Author: ume Date: Mon Oct 14 17:21:23 2013 New Revision: 330337 URL: http://svnweb.freebsd.org/changeset/ports/330337 Log: use modern OPTIONS helper. Modified: head/mail/cyrus-imapd23/Makefile Modified: head/mail/cyrus-imapd23/Makefile ============================================================================== --- head/mail/cyrus-imapd23/Makefile Mon Oct 14 16:46:20 2013 (r330336) +++ head/mail/cyrus-imapd23/Makefile Mon Oct 14 17:21:23 2013 (r330337) @@ -39,23 +39,51 @@ CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB DRAC IDLED LDAP_PTLOADER \ - LISTEXT MURDER MYSQL NETSCAPEHACK NNTP PGSQL \ - REPLICATION SNMP_5 SQLITE +OPTIONS_DEFINE= AUTOCREATE AUTOSIEVE BDB DRAC IDLED \ + LDAP_PTLOADER LISTEXT MURDER MYSQL \ + NETSCAPEHACK NNTP PGSQL REPLICATION SNMP_5 \ + SQLITE OPTIONS_DEFAULT= BDB +OPTIONS_SUB= yes AUTOCREATE_DESC= Use autocreate INBOX patch (UoA) AUTOSIEVE_DESC= Use autosievefolder patch (UoA) +BDB_USE= BDB=yes +BDB_CONFIGURE_ON= --with-bdb-incdir=${BDB_INCLUDE_DIR} \ + --with-bdb-libdir=${LOCALBASE}/lib DRAC_DESC= Enable DRAC support +DRAC_CONFIGURE_ON= --with-drac=${LOCALBASE} +DRAC_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac IDLED_DESC= Enable IMAP idled support +IDLED_CONFIGURE_ENABLE= idled LDAP_PTLOADER_DESC= Enable LDAP ptloader +LDAP_PTLOADER_USE= OPENLDAP=yes +LDAP_PTLOADER_CONFIGURE_ON=--with-ldap=${LOCALBASE} LISTEXT_DESC= Enable IMAP List extensions +LISTEXT_CONFIGURE_ENABLE=listext MURDER_DESC= Enable IMAP Murder support +MURDER_CONFIGURE_ENABLE=murder +MURDER_CFLAGS= ${PTHREAD_CFLAGS} +MURDER_MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} +MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_ON= --with-mysql=yes \ + --with-mysql-libdir=${LOCALBASE}/lib/mysql \ + --with-mysql-incdir=${LOCALBASE}/include/mysql NETSCAPEHACK_DESC= Enable X-NETSCAPE extensions +NETSCAPEHACK_CONFIGURE_ENABLE=netscapehack NNTP_DESC= Enable NNTP support +NNTP_CONFIGURE_ENABLE= nntp PGSQL_DESC= Enable PostgreSQL backend (experimental) +PGSQL_USE= PGSQL=yes +PGSQL_CONFIGURE_ON= --with-pgsql=${LOCALBASE} REPLICATION_DESC= Enable replication +REPLICATION_CONFIGURE_ENABLE=replication SNMP_5_DESC= Enable SNMP support +SNMP_5_LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp +SNMP_5_CONFIGURE_ON= --with-snmp=${LOCALBASE} +SNMP_5_CONFIGURE_OFF= --with-snmp=no SQLITE_DESC= Enable SQLite backend (experimental) +SQLITE_USE= SQLITE=yes +SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} .include @@ -70,9 +98,6 @@ PATCH_SITES+= http://email.uoa.gr/downlo .if ${PORT_OPTIONS:MAUTOCREATE} AUTOCREATE_VERSION= 0.10-0 PATCHFILES+= ${PORTNAME}-2.3.16-autocreate-${AUTOCREATE_VERSION}.diff -PLIST_SUB+= AUTOCREATE="" -.else -PLIST_SUB+= AUTOCREATE="@comment " .endif .if ${PORT_OPTIONS:MAUTOSIEVE} @@ -81,69 +106,11 @@ PATCHFILES+= ${PORTNAME}-2.3.16-autosiev .endif .if ${PORT_OPTIONS:MBDB} -USE_BDB= yes INVALID_BDB_VER=2 -CONFIGURE_ARGS+=--with-bdb-incdir=${BDB_INCLUDE_DIR} \ - --with-bdb-libdir=${LOCALBASE}/lib .else BDB_LIB_NAME= no .endif -.if ${PORT_OPTIONS:MNNTP} -CONFIGURE_ARGS+=--enable-nntp -PLIST_SUB+= NNTP="" -.else -PLIST_SUB+= NNTP="@comment " -.endif - -.if ${PORT_OPTIONS:MMURDER} -CONFIGURE_ARGS+=--enable-murder -CFLAGS+= ${PTHREAD_CFLAGS} -MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} -PLIST_SUB+= MURDER="" -.else -PLIST_SUB+= MURDER="@comment " -.endif - -.if ${PORT_OPTIONS:MIDLED} -CONFIGURE_ARGS+=--enable-idled -PLIST_SUB+= IDLED="" -.else -PLIST_SUB+= IDLED="@comment " -.endif - -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CONFIGURE_ARGS+=--with-mysql=yes \ - --with-mysql-libdir=${LOCALBASE}/lib/mysql \ - --with-mysql-incdir=${LOCALBASE}/include/mysql -.endif - -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= yes -CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE} -.endif - -.if ${PORT_OPTIONS:MREPLICATION} -CONFIGURE_ARGS+=--enable-replication -PLIST_SUB+= REPLICATION="" -.else -PLIST_SUB+= REPLICATION="@comment " -.endif - -.if ${PORT_OPTIONS:MLISTEXT} -CONFIGURE_ARGS+=--enable-listext -.endif - -.if ${PORT_OPTIONS:MNETSCAPEHACK} -CONFIGURE_ARGS+=--enable-netscapehack -.endif - .if ${PORT_OPTIONS:MDRAC} EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in \ @@ -152,23 +119,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4 .endif USE_AUTOTOOLS= autoconf autoheader -CONFIGURE_ARGS+=--with-drac=${LOCALBASE} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac -.endif - -.if ${PORT_OPTIONS:MSNMP_5} -LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp -CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} -.else -CONFIGURE_ARGS+=--with-snmp=no -.endif - -.if ${PORT_OPTIONS:MLDAP_PTLOADER} -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} -PLIST_SUB+= LDAP_PTLOADER="" -.else -PLIST_SUB+= LDAP_PTLOADER="@comment " .endif .if ${OSVERSION} >= 900022