From 89ee78e3fb4f619911ee8712c0d2cc958b73437c Mon Sep 17 00:00:00 2001 From: dwcjr Date: Mon, 6 May 2002 19:59:29 +0000 Subject: Update to 1.1.8 Re-enable IPv6 with non official patch PR: 37798 Submitted by: maintainer --- mail/postfix/Makefile | 3 ++- mail/postfix/distinfo | 5 +++-- mail/postfix/pkg-install | 13 ------------- mail/postfix/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix1/Makefile | 3 ++- mail/postfix1/distinfo | 5 +++-- mail/postfix1/pkg-install | 13 ------------- mail/postfix1/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix20/Makefile | 3 ++- mail/postfix20/distinfo | 5 +++-- mail/postfix20/pkg-install | 13 ------------- mail/postfix20/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix21/Makefile | 3 ++- mail/postfix21/distinfo | 5 +++-- mail/postfix21/pkg-install | 13 ------------- mail/postfix21/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix22/Makefile | 3 ++- mail/postfix22/distinfo | 5 +++-- mail/postfix22/pkg-install | 13 ------------- mail/postfix22/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix23/Makefile | 3 ++- mail/postfix23/distinfo | 5 +++-- mail/postfix23/pkg-install | 13 ------------- mail/postfix23/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix24/Makefile | 3 ++- mail/postfix24/distinfo | 5 +++-- mail/postfix24/pkg-install | 13 ------------- mail/postfix24/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix25/Makefile | 3 ++- mail/postfix25/distinfo | 5 +++-- mail/postfix25/pkg-install | 13 ------------- mail/postfix25/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix26/Makefile | 3 ++- mail/postfix26/distinfo | 5 +++-- mail/postfix26/pkg-install | 13 ------------- mail/postfix26/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix27/Makefile | 3 ++- mail/postfix27/distinfo | 5 +++-- mail/postfix27/pkg-install | 13 ------------- mail/postfix27/scripts/configure.postfix | 29 +++++++++++++++++++---------- mail/postfix28/Makefile | 3 ++- mail/postfix28/distinfo | 5 +++-- mail/postfix28/pkg-install | 13 ------------- mail/postfix28/scripts/configure.postfix | 29 +++++++++++++++++++---------- 44 files changed, 264 insertions(+), 286 deletions(-) (limited to 'mail') diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix/pkg-install b/mail/postfix/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix/pkg-install +++ b/mail/postfix/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix index 8064d0e..ffe704a 100644 --- a/mail/postfix/scripts/configure.postfix +++ b/mail/postfix/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix1/Makefile +++ b/mail/postfix1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix1/distinfo +++ b/mail/postfix1/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix1/pkg-install +++ b/mail/postfix1/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix index 838998c..175ec0b 100644 --- a/mail/postfix1/scripts/configure.postfix +++ b/mail/postfix1/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix20/Makefile +++ b/mail/postfix20/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix20/distinfo +++ b/mail/postfix20/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix20/pkg-install b/mail/postfix20/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix20/pkg-install +++ b/mail/postfix20/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix index 4704833..b473c5f 100644 --- a/mail/postfix20/scripts/configure.postfix +++ b/mail/postfix20/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix21/Makefile +++ b/mail/postfix21/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix21/distinfo +++ b/mail/postfix21/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix21/pkg-install b/mail/postfix21/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix21/pkg-install +++ b/mail/postfix21/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix index 00e3765..9fe9d65f 100644 --- a/mail/postfix21/scripts/configure.postfix +++ b/mail/postfix21/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix22/distinfo +++ b/mail/postfix22/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix22/pkg-install +++ b/mail/postfix22/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index f9ede7c..9def91b 100644 --- a/mail/postfix22/scripts/configure.postfix +++ b/mail/postfix22/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix23/Makefile +++ b/mail/postfix23/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix23/distinfo +++ b/mail/postfix23/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix23/pkg-install +++ b/mail/postfix23/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix index 7f6aaa1..aae0c4b 100644 --- a/mail/postfix23/scripts/configure.postfix +++ b/mail/postfix23/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix24/distinfo +++ b/mail/postfix24/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix24/pkg-install +++ b/mail/postfix24/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix index d34447e..a397679 100644 --- a/mail/postfix24/scripts/configure.postfix +++ b/mail/postfix24/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix25/Makefile +++ b/mail/postfix25/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix25/distinfo +++ b/mail/postfix25/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix25/pkg-install +++ b/mail/postfix25/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix index 94f80e1..2df484f 100644 --- a/mail/postfix25/scripts/configure.postfix +++ b/mail/postfix25/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix26/distinfo +++ b/mail/postfix26/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix26/pkg-install +++ b/mail/postfix26/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix index ec8b4cb..266dabf 100644 --- a/mail/postfix26/scripts/configure.postfix +++ b/mail/postfix26/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix27/distinfo +++ b/mail/postfix27/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix27/pkg-install +++ b/mail/postfix27/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix index 8591538..0b4ffd6 100644 --- a/mail/postfix27/scripts/configure.postfix +++ b/mail/postfix27/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 793fe9f..cbf06a2 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.7 +PORTVERSION= 1.1.8 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -112,6 +112,7 @@ post-install: # 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 diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo index 30bce47..9d93ab0 100644 --- a/mail/postfix28/distinfo +++ b/mail/postfix28/distinfo @@ -1,2 +1,3 @@ -MD5 (postfix/postfix-1.1.7.tar.gz) = 320ea040f13c084a5e8bea680b422e06 -MD5 (postfix/pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz) = 578ade33d4d5475c55c31041857cc6f1 +MD5 (postfix/postfix-1.1.8.tar.gz) = 3b07a59e8bdb46af8c1d82f085a62d73 +MD5 (postfix/pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz) = a00656e4e7fd1e4827c3e805799d2359 +MD5 (postfix/postfix-1.1.7+ipv6.patch.gz) = 9564e8e1e3ddfb885bb1ffaaf75c670b diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install index 8ecea16..5acdbac 100644 --- a/mail/postfix28/pkg-install +++ b/mail/postfix28/pkg-install @@ -143,19 +143,6 @@ if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - cat <<'EOM' -To enable postfix to start at boot time, please set these variables in -your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely. - -EOM fi else if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix index 80c0bc9..465f92f 100644 --- a/mail/postfix28/scripts/configure.postfix +++ b/mail/postfix28/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.19 2002-04-01 18:01:27 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.20 2002-05-06 19:59:29 dwcjr Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -20,7 +20,7 @@ MySQL "MySQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ TLS "Secure Sockets Layer and Transport Layer Security" OFF \ -IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ +IPv6 "IPv6 support (not KAME official)" OFF \ 2> $tempfile retval=$? @@ -55,12 +55,14 @@ while [ "$1" ]; do echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libpcre.a:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libpcre.a" + echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; \"SASL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libsasl.a:\${PORTSDIR}/security/cyrus-sasl" echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libsasl.a -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" @@ -79,34 +81,35 @@ while [ "$1" ]; do echo "MAN8+= tlsmgr.8" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.6-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.6-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.7-1.1.7-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.7-1.1.7-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" + echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" + echo "DB3_SUFFIX= +db3" ;; \"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" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" + echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") - /usr/bin/dialog --msgbox "IPv6 is currently broken until kame updates patches" 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc @@ -117,10 +120,10 @@ while [ "$1" ]; do rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi - echo "PATCH_SITES+= ftp://ftp.kame.net/pub/kame/misc/" - echo "PATCH_SITES+= \${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}" - echo "PATCHFILES+= postfix-20010225snap-v6-20010228a.diff.gz" + echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" + echo "PATCHFILES+= postfix-1.1.7+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" + echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) @@ -134,3 +137,9 @@ done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" + +# 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}" -- cgit v1.1