Index: head/mail/postfix/Makefile =================================================================== --- head/mail/postfix/Makefile (revision 90004) +++ head/mail/postfix/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix/distinfo =================================================================== --- head/mail/postfix/distinfo (revision 90004) +++ head/mail/postfix/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix/scripts/configure.postfix =================================================================== --- head/mail/postfix/scripts/configure.postfix (revision 90004) +++ head/mail/postfix/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix20/Makefile =================================================================== --- head/mail/postfix20/Makefile (revision 90004) +++ head/mail/postfix20/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix20/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix20/distinfo =================================================================== --- head/mail/postfix20/distinfo (revision 90004) +++ head/mail/postfix20/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix20/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix20/scripts/configure.postfix =================================================================== --- head/mail/postfix20/scripts/configure.postfix (revision 90004) +++ head/mail/postfix20/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix20/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix21/Makefile =================================================================== --- head/mail/postfix21/Makefile (revision 90004) +++ head/mail/postfix21/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix21/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix21/distinfo =================================================================== --- head/mail/postfix21/distinfo (revision 90004) +++ head/mail/postfix21/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix21/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix21/scripts/configure.postfix =================================================================== --- head/mail/postfix21/scripts/configure.postfix (revision 90004) +++ head/mail/postfix21/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix21/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix22/Makefile =================================================================== --- head/mail/postfix22/Makefile (revision 90004) +++ head/mail/postfix22/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix22/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix22/distinfo =================================================================== --- head/mail/postfix22/distinfo (revision 90004) +++ head/mail/postfix22/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix22/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix22/scripts/configure.postfix =================================================================== --- head/mail/postfix22/scripts/configure.postfix (revision 90004) +++ head/mail/postfix22/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix22/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix23/Makefile =================================================================== --- head/mail/postfix23/Makefile (revision 90004) +++ head/mail/postfix23/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix23/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix23/distinfo =================================================================== --- head/mail/postfix23/distinfo (revision 90004) +++ head/mail/postfix23/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix23/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix23/scripts/configure.postfix =================================================================== --- head/mail/postfix23/scripts/configure.postfix (revision 90004) +++ head/mail/postfix23/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix23/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix24/Makefile =================================================================== --- head/mail/postfix24/Makefile (revision 90004) +++ head/mail/postfix24/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix24/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix24/distinfo =================================================================== --- head/mail/postfix24/distinfo (revision 90004) +++ head/mail/postfix24/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix24/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix24/scripts/configure.postfix =================================================================== --- head/mail/postfix24/scripts/configure.postfix (revision 90004) +++ head/mail/postfix24/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix24/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix25/Makefile =================================================================== --- head/mail/postfix25/Makefile (revision 90004) +++ head/mail/postfix25/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix25/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix25/distinfo =================================================================== --- head/mail/postfix25/distinfo (revision 90004) +++ head/mail/postfix25/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix25/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix25/scripts/configure.postfix =================================================================== --- head/mail/postfix25/scripts/configure.postfix (revision 90004) +++ head/mail/postfix25/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix25/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix26/Makefile =================================================================== --- head/mail/postfix26/Makefile (revision 90004) +++ head/mail/postfix26/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix26/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix26/distinfo =================================================================== --- head/mail/postfix26/distinfo (revision 90004) +++ head/mail/postfix26/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix26/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix26/scripts/configure.postfix =================================================================== --- head/mail/postfix26/scripts/configure.postfix (revision 90004) +++ head/mail/postfix26/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix26/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix27/Makefile =================================================================== --- head/mail/postfix27/Makefile (revision 90004) +++ head/mail/postfix27/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix27/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix27/distinfo =================================================================== --- head/mail/postfix27/distinfo (revision 90004) +++ head/mail/postfix27/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix27/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix27/scripts/configure.postfix =================================================================== --- head/mail/postfix27/scripts/configure.postfix (revision 90004) +++ head/mail/postfix27/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix27/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property Index: head/mail/postfix28/Makefile =================================================================== --- head/mail/postfix28/Makefile (revision 90004) +++ head/mail/postfix28/Makefile (revision 90005) @@ -1,166 +1,168 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # # To pre-select options in batch mode, run make like this: # # make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS" # # the options are the same names as in the scripts/configure.postfix file. # POSTFIX_OPTIONS can be set in /etc/make.conf also. # NOTE: PCRE is enabled by default unless you specifically disable it. PORTNAME= postfix -PORTVERSION= 2.0.15 +PORTVERSION= 2.0.16 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/official/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ ftp://ftp.samurai.com/pub/postfix/official/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= postfix-2.0-ns-mx-acl-patch.gz MAINTAINER= khera@kciLink.com COMMENT= A secure alternative to widely-used Sendmail USE_SUBMAKE= yes USE_REINPLACE= yes MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \ postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \ smtp.8 smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 # TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to # patch it. MAN8base=$(MAN8:S/tlsmgr.8//) CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif .if defined(WITHOUT_PCRE) POSTFIX_CCARGS+= -DNO_PCRE .else LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-patch: .for file in ${MAN1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN5} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html .endfor .for file in ${MAN8base} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html .endfor .for file in faq rate rewrite uce @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \ ${WRKSRC}/html/${file}.html .endfor .for file in ${CONF1} @${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file} .endfor pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif do-install: cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ config_directory=${PREFIX}/etc/postfix \ daemon_directory=${PREFIX}/libexec/postfix \ command_directory=${PREFIX}/sbin \ queue_directory=/var/spool/postfix \ sendmail_path=${PREFIX}/sbin/sendmail \ newaliases_path=${PREFIX}/bin/newaliases \ mailq_path=${PREFIX}/bin/mailq \ mail_owner=postfix \ setgid_group=maildrop \ manpage_directory=${PREFIX}/man \ sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include Property changes on: head/mail/postfix28/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.78 \ No newline at end of property +1.79 \ No newline at end of property Index: head/mail/postfix28/distinfo =================================================================== --- head/mail/postfix28/distinfo (revision 90004) +++ head/mail/postfix28/distinfo (revision 90005) @@ -1,5 +1,6 @@ -MD5 (postfix/postfix-2.0.15.tar.gz) = 723c2b7f67016e0c19b0e1aa08dad246 -MD5 (postfix/pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz) = 298f55e2d896a0240f5913a3b611e623 +MD5 (postfix/postfix-2.0.16.tar.gz) = ac13776442ba7708e683bc1bfbadab2f +MD5 (postfix/postfix-2.0-ns-mx-acl-patch.gz) = 55a3d76d52fddd5cd0365004957a1160 +MD5 (postfix/pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz) = b39c08eabe807db4af5bcb1cafc9761e MD5 (postfix/postfix-pg.postfix-2.0.0.2.patch) = 5a0aa5ef6a231a593eb6c5628236a3e4 -MD5 (postfix/ipv6-1.17-pf-2.0.14.patch.gz) = 5dbafae86744c1893d1d3c52b3cdbcb7 -MD5 (postfix/tls+ipv6-1.17-pf-2.0.14.patch.gz) = aba3c1d230f1591e7f7f8c426ce6b2fc +MD5 (postfix/ipv6-1.18a-pf-2.0.16.patch.gz) = 8e0b85c6c131d367dc5b0d0d95e7e2c1 +MD5 (postfix/tls+ipv6-1.18a-pf-2.0.16.patch.gz) = b32876b1a02d3a8f6a93a66e574ddee7 Property changes on: head/mail/postfix28/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.44 \ No newline at end of property +1.45 \ No newline at end of property Index: head/mail/postfix28/scripts/configure.postfix =================================================================== --- head/mail/postfix28/scripts/configure.postfix (revision 90004) +++ head/mail/postfix28/scripts/configure.postfix (revision 90005) @@ -1,247 +1,247 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.40 2003-08-27 20:19:58 osa Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.41 2003-10-01 19:55:24 osa Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${POSTFIX_OPTIONS}" ]; then set ${POSTFIX_OPTIONS} fi for i; do eval status_$i=ON done if [ -z "${BATCH}" ]; then /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ TLS "SSL and TLS" "$status_TLS" \ IPv6 "IPv6 support" "$status_IPv6" \ IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ MySQL "MySQL map lookups" "$status_MySQL" \ PgSQL "PostgreSQL v7.3 map lookups" "$status_PgSQL" \ PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \ OpenLDAP12 "OpenLDAP 1.2 map lookups" "$status_OpenLDAP" \ OpenLDAP20 "OpenLDAP 2.0 map lookups" "$status_OpenLDAP" \ OpenLDAP21 "OpenLDAP 2.1 map lookups" "$status_OpenLDAP" \ Test "SMTP/LMTP test server and generator" "$status_Test" \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `sed 's/"//g' $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " SUB_IPV6="@comment " while [ "$1" ]; do case $1 in NOPCRE) echo "WITHOUT_PCRE= yes" echo "NOPCRE_SUFFIX= +nopcre" SUB_NOPCRE="" ;; SASL) echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" echo "SASL_SUFFIX= +sasl" if [ -f ${PREFIX}/lib/libsasl.a ]; then if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASL2) echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" echo "SASL_SUFFIX= +sasl2" if [ -f ${PREFIX}/lib/libsasl2.a ]; then if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi fi SUB_SASL="" ;; SASLKRB) echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" ;; TLS) echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.15-2.0.13-0.9.7b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.15-2.0.13-0.9.7b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.16-2.0.16-0.9.7b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.16-2.0.16-0.9.7b/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; DB3) if [ X$DB40_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB_SUFFIX= +db3" DB3_SELECTED="YES" ;; DB40) if [ X$DB3_SELECTED != "X" -o X$DB41_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" echo "DB_SUFFIX= +db40" DB40_SELECTED="YES" ;; DB41) if [ X$DB3_SELECTED != "X" -o X$DB40_SELECTED != "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40 and DB41 options." 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" echo "DB_SUFFIX= +db41" DB41_SELECTED="YES" ;; MySQL) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) echo "POSTGRESQL_PORT?= databases/postgresql7" echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; PgSQL72) echo "POSTGRESQL_PORT?= databases/postgresql72" echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-2.0.0.2.patch" echo "PATCH_DIST_STRIP= -p1" echo "PGSQL_SUFFIX= +pgsql" ;; OpenLDAP12) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap12" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap12" ;; OpenLDAP20) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap20-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap20" ;; OpenLDAP21) echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap21-client" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -lldap -llber" echo "OPENLDAP_SUFFIX= +openldap21" ;; Test) echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; IPv6) if [ X$SUB_TLS = "X" ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" IPv6SELECTED=YES SUB_IPV6="" ;; IPv6TLS) if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then /usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "MAN8+= tlsmgr.8" echo "USE_OPENSSL= yes" echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}" echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - echo "PATCHFILES+= tls+ipv6-1.17-pf-2.0.14.patch.gz" + echo "PATCHFILES+= tls+ipv6-1.18a-pf-2.0.16.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "TLS_SUFFIX= +tls+ipv6" SUB_TLS="" SUB_IPV6="" ;; *) echo "Unknown option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\"" # for some reason, if we alter the pkg name this way, the first build (where # we ask the configure questions) doesn't pick up the extensions, but # any subsequent build will. so "make; make install" will build twice. # don't do this for now. #echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" Property changes on: head/mail/postfix28/scripts/configure.postfix ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.40 \ No newline at end of property +1.41 \ No newline at end of property