Date: Sat, 14 Jul 2012 09:07:28 GMT From: Alastair Hogge <agh@fastmail.fm> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/169846: MeTA1 update to match latest upstream release Message-ID: <201207140907.q6E97SsB008130@red.freebsd.org> Resent-Message-ID: <201207140910.q6E9A2AY062946@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169846 >Category: ports >Synopsis: MeTA1 update to match latest upstream release >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jul 14 09:10:02 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Alastair Hogge >Release: r238177 CURRENT >Organization: >Environment: >Description: mail/meta1 is currently at 1.0.Alpha5.0 & the latest upstream release is 1.0.Alpha11.0. Attached is a diff to update the port to match the upstream release. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -u /usr/ports/mail/meta1/Makefile /var/tmp/meta1/Makefile --- /usr/ports/mail/meta1/Makefile 2012-07-12 20:49:17.000000000 +0800 +++ /var/tmp/meta1/Makefile 2012-07-14 11:55:00.000000000 +0800 @@ -6,10 +6,10 @@ # PORTNAME= meta1 -PORTVERSION= 1.0.0a.5.0 -DISTVERSION= 1.0.Alpha5.0 +PORTVERSION= 1.0.0a.11.0 +DISTVERSION= 1.0.Alpha11.0 CATEGORIES= mail ipv6 -MASTER_SITES= http://www.MeTA1.org/download/.alpha/tlcs/ +MASTER_SITES= http://www.MeTA1.org/download/.alpha/rainy/ PKGNAMESUFFIX?= ${TLS_SUFFIX}${SASL_SUFFIX}${LDAP_SUFFIX}${BERKELEYDB_SUFFIX}${PMILTER_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org @@ -47,72 +47,59 @@ #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 -.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/,,} +PMILTER_DESC= Adds policy milter support +SASL2_DESC= Adds SASL2 support +SASL2AUTHD_DESC= Enable plaintext authentication via SASL2 + +OPTIONS_DEFAULT= BDB PMILTER SASL2 TLS + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MBDB} +USE_BDB= 43+ +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} +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: @@ -176,7 +163,7 @@ @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ .endif -.include <bsd.port.pre.mk> +#.include <bsd.port.pre.mk> .if !defined(UID) UID!= ${ID} -u @@ -185,4 +172,5 @@ post-build: test .endif -.include <bsd.port.post.mk> +#.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -u /usr/ports/mail/meta1/distinfo /var/tmp/meta1/distinfo --- /usr/ports/mail/meta1/distinfo 2012-07-12 20:49:20.000000000 +0800 +++ /var/tmp/meta1/distinfo 2012-07-14 11:13:18.000000000 +0800 @@ -1,2 +1,2 @@ -SHA256 (meta1-1.0.Alpha5.0.tar.gz) = d40228eb1a80ccb3f577559652e38c3d57469110582fc4dd49ff785fd8efda48 -SIZE (meta1-1.0.Alpha5.0.tar.gz) = 4700791 +SHA256 (meta1-1.0.Alpha11.0.tar.gz) = fdcf7285dfd744809171d36dcdf9e9edfe9978be1a40a13478b894aa96d2c169 +SIZE (meta1-1.0.Alpha11.0.tar.gz) = 4724757 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207140907.q6E97SsB008130>