From owner-svn-ports-all@FreeBSD.ORG Thu Jul 26 17:11:07 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B3471106564A; Thu, 26 Jul 2012 17:11:07 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9E9368FC0A; Thu, 26 Jul 2012 17:11:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q6QHB7Ns006593; Thu, 26 Jul 2012 17:11:07 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6QHB7NZ006591; Thu, 26 Jul 2012 17:11:07 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201207261711.q6QHB7NZ006591@svn.freebsd.org> From: Dirk Meyer Date: Thu, 26 Jul 2012 17:11:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r301568 - head/mail/meta1 X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Jul 2012 17:11:07 -0000 Author: dinoex Date: Thu Jul 26 17:11:07 2012 New Revision: 301568 URL: http://svn.freebsd.org/changeset/ports/301568 Log: - use OPTIONS_DEFINE PR: 169846 Submitted by: Alastair Hogge Modified: head/mail/meta1/Makefile Modified: head/mail/meta1/Makefile ============================================================================== --- head/mail/meta1/Makefile Thu Jul 26 16:21:29 2012 (r301567) +++ head/mail/meta1/Makefile Thu Jul 26 17:11:07 2012 (r301568) @@ -47,72 +47,63 @@ EXTRA_SBIN= libcheck/noroot libconf/tree #GROUPS= meta1s meta1q meta1c meta1m meta1 #USERS= meta1s meta1q meta1c meta1m meta1 -# Options to define Features: -# META1_WITHOUT_TLS=yes -# META1_WITHOUT_SASL=yes -# META1_WITHOUT_PMILTER=yes -# META1_WITH_INTERNAL_BERKELEYD=yes -# META1_WITH_BERKELEYDB=yes -# Set either WITH_BDB_VER or META1_WITH_BDB_VER -# to the version of Berkely DB to use. - # default config: META1CONFDIR?= ${PREFIX}/etc/meta1 NOLOGIN_CMD?= /usr/sbin/nologin -.if defined(META1_WITH_BERKELEYDB_VER) -META1_WITH_BERKELEYDB= yes -OBSOLETE_BDB_VAR= META1_WITH_BERKELEYDB_VER BERKELEYDB_PORT \ - BERKELEYDB_LIB BERKELEYDB_LIBDIR BERKELEYDB_INCLUDE -IGNORE= use META1_WITH_BERKELEYDB to select Berkeley DB -.endif +OPTIONS_DEFINE= BDB PMILTER SASL2 SASL2AUTHD TLS +OPTIONS_DEFAULT= BDB PMILTER SASL2 TLS -.if defined(META1_WITH_INTERNAL_BERKELEYD) -BERKELEYDB_SUFFIX= -intbdb -PLIST_SUB+= WITH_BDBINT="" -.else -.if defined(META1_WITH_BDB_VER) -META1_WITH_BERKELEYDB=yes -.endif -.if !defined(META1_WITH_BERKELEYDB) -META1_WITH_BERKELEYDB=yes -WITH_BDB_VER= 43 -.endif -USE_BDB= 41+ -IGNORE_WITH_BDB= 2 3 40 -BERKELEYDB_SUFFIX= -${BDB_INCLUDE_DIR:S,^${LOCALBASE}/include/,,} +BDB_DESC= External Berkeley DB support +PMILTER_DESC= Adds policy milter support +SASL2_DESC= Adds SASL2 support +SASL2AUTHD_DESC= Enable plaintext authentication via SASL2 + +.include + +.if ${PORT_OPTIONS:MBDB} +USE_BDB= 42+ +INVALID_BDB_VER= 46 47 48 5 +BERKELEYDB_SUFFIX= -db${BDB_VER} CONFIGURE_ARGS+= --disable-included-bdb CONFIGURE_ARGS+= --with-bdb-incdir=${BDB_INCLUDE_DIR} CONFIGURE_ARGS+= --with-bdb-libdir=${BDB_LIB_DIR} PLIST_SUB+= WITH_BDBINT="@comment " +.else +BERKELEYDB_SUFFIX= -intbdb +PLIST_SUB+= WITH_BDBINT="" .endif -.if defined(META1_WITHOUT_SASL) -SASL_SUFFIX?= -nosasl -CONFIGURE_ARGS+= --disable-SASL +.if ${PORT_OPTIONS:MPMILTER} +USE_OPENSSL= yes +CONFIGURE_ARGS+= --enable-pmilter .else -LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -.if !defined(META1_WITHOUT_SASLAUTHD) -RUN_DEPENDS+= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd +PMILTER_SUFFIX?= -nopmilter +CONFIGURE_ARGS+= --disable-pmilter .endif + +.if ${PORT_OPTIONS:MSASL2} +LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CONFIGURE_ARGS+= --enable-SASL CONFIGURE_ARGS+= --with-sasl-incdir=${LOCALBASE}/include CONFIGURE_ARGS+= --with-sasl-libdir=${LOCALBASE}/lib +.else +SASL_SUFFIX?= -nosasl +CONFIGURE_ARGS+= --disable-SASL .endif -.if defined(META1_WITHOUT_TLS) || defined(WITHOUT_TLS) -TLS_SUFFIX?= -notls -CONFIGURE_ARGS+= --disable-TLS -.else -CONFIGURE_ARGS+= --enable-TLS +.if ${PORT_OPTIONS:MSASL2AUTHD} +.if empty(PORT_OPTIONS:MSASL2) +IGNORE= Option SASL2AUTHD needs option SASL2 +.endif +RUN_DEPENDS+= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd .endif -.if defined(META1_WITHOUT_PMILTER) || defined(WITHOUT_PMILTER) -PMILTER_SUFFIX?= -nopmilter -CONFIGURE_ARGS+= --disable-pmilter +.if ${PORT_OPTIONS:MTLS} +CONFIGURE_ARGS+= --enable-TLS .else -USE_OPENSSL= yes -CONFIGURE_ARGS+= --enable-pmilter +TLS_SUFFIX?= -notls +CONFIGURE_ARGS+= --disable-TLS .endif post-patch: @@ -143,6 +134,13 @@ test: #fails on bento #regression-test: test +.if !defined(UID) +UID!= ${ID} -u +.endif +.if ${UID} != 0 +post-build: test +.endif + pre-install: if ! pw groupshow meta1s; then pw groupadd meta1s -g 260; fi if ! pw groupshow meta1q; then pw groupadd meta1q -g 261; fi @@ -176,13 +174,4 @@ post-install: @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ .endif -.include - -.if !defined(UID) -UID!= ${ID} -u -.endif -.if ${UID} != 0 -post-build: test -.endif - -.include +.include