diff options
| author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-02-11 17:48:50 +0000 |
|---|---|---|
| committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-02-11 17:48:50 +0000 |
| commit | c5043654af8aa1ad46bf6f5032fb846255e1b3c2 (patch) | |
| tree | 18240b48d9fe7e108765a367adc99e689f845e5e /mail | |
| parent | Fix installation of config files as to not overwrite current ones (diff) | |
Update to 1.1.3
Update to latest TLS
Give Vivek Khera Maintainership
Fix loss of config files during upgrade
PR: 34837
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=54566
Diffstat (limited to 'mail')
55 files changed, 440 insertions, 308 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix/pkg-install b/mail/postfix/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix/pkg-install +++ b/mail/postfix/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix/pkg-plist +++ b/mail/postfix/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix index 257834ec2a2a..4d466a144bb1 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix1/Makefile +++ b/mail/postfix1/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix1/distinfo b/mail/postfix1/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix1/distinfo +++ b/mail/postfix1/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix1/pkg-install b/mail/postfix1/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix1/pkg-install +++ b/mail/postfix1/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix1/pkg-plist b/mail/postfix1/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix1/pkg-plist +++ b/mail/postfix1/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix index e5d20b814d83..80537ddee4de 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix20/Makefile +++ b/mail/postfix20/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix20/distinfo b/mail/postfix20/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix20/distinfo +++ b/mail/postfix20/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix20/pkg-install b/mail/postfix20/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix20/pkg-install +++ b/mail/postfix20/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix20/pkg-plist b/mail/postfix20/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix20/pkg-plist +++ b/mail/postfix20/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix index b41246bbee19..f47b62e96d5d 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix21/Makefile +++ b/mail/postfix21/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix21/distinfo b/mail/postfix21/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix21/distinfo +++ b/mail/postfix21/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix21/pkg-install b/mail/postfix21/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix21/pkg-install +++ b/mail/postfix21/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix21/pkg-plist b/mail/postfix21/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix21/pkg-plist +++ b/mail/postfix21/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix index 770d6f2235e8..7b20a1221b01 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix22/distinfo +++ b/mail/postfix22/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix22/pkg-install +++ b/mail/postfix22/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix22/pkg-plist +++ b/mail/postfix22/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index a14555e416aa..21ce2262c3b5 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix23/Makefile +++ b/mail/postfix23/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix23/distinfo +++ b/mail/postfix23/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix23/pkg-install +++ b/mail/postfix23/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix23/pkg-plist +++ b/mail/postfix23/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix index 056e0dd8c882..3aa348221baf 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix24/distinfo +++ b/mail/postfix24/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix24/pkg-install +++ b/mail/postfix24/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix24/pkg-plist +++ b/mail/postfix24/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix index d6355ef9bc35..11f5f1a57d75 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix25/Makefile +++ b/mail/postfix25/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix25/distinfo +++ b/mail/postfix25/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix25/pkg-install +++ b/mail/postfix25/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix25/pkg-plist +++ b/mail/postfix25/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix index f0e4af94a02e..69b67157bb40 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix26/distinfo +++ b/mail/postfix26/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix26/pkg-install +++ b/mail/postfix26/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix26/pkg-plist +++ b/mail/postfix26/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix index c52b2426f9b2..729588aefeaa 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix27/distinfo +++ b/mail/postfix27/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix27/pkg-install +++ b/mail/postfix27/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix27/pkg-plist +++ b/mail/postfix27/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix index 863c6a315e7e..c3b64418f3a1 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 09258cd2e865..df2246416b52 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -6,8 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 1.1.2 -PORTREVISION= 1 +PORTVERSION= 1.1.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +19,7 @@ MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} -MAINTAINER= dwcjr@FreeBSD.org +MAINTAINER= khera@kciLink.com 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 \ @@ -33,6 +32,9 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \ master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \ smtpd.8 spawn.8 trivial-rewrite.8 virtual.8 +CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ + relocated transport virtual + .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif @@ -79,11 +81,10 @@ do-install: sample_directory=${PREFIX}/etc/postfix \ readme_directory=${READMEDIR} - @${INSTALL_DATA} ${WRKSRC}/conf/main.cf \ - ${PREFIX}/etc/postfix/sample-main.cf - - @${INSTALL_DATA} ${WRKSRC}/conf/master.cf \ - ${PREFIX}/etc/postfix/sample-master.cf +.for file in ${CONF1} + ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ + ${PREFIX}/etc/postfix/sample-${file} +.endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo index 8966a43ecfaf..9eaa993c52eb 100644 --- a/mail/postfix28/distinfo +++ b/mail/postfix28/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/postfix-1.1.2.tar.gz) = 685c27bc353a0625c3e3129baa613183 -MD5 (postfix/pfixtls-0.8.1-1.1.1-0.9.6c.tar.gz) = a445439c23876aa158453462be4d2485 +MD5 (postfix/postfix-1.1.3.tar.gz) = f70c14f34f0f38b0466cc40f65a53b22 +MD5 (postfix/pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz) = 1a7756cab77ab793f5777c62b8b32bcb diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install index 2e4266564c2b..24bdf1d98728 100644 --- a/mail/postfix28/pkg-install +++ b/mail/postfix28/pkg-install @@ -83,12 +83,15 @@ if [ x"$2" = xPRE-INSTALL ]; then fi if [ x"$2" = xPOST-INSTALL ]; then - if [ ! -f ${PKG_PREFIX}/etc/postfix/main.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-main.cf ${PKG_PREFIX}/etc/postfix/main.cf - fi - if [ ! -f ${PKG_PREFIX}/etc/postfix/master.cf ]; then - cp ${PKG_PREFIX}/etc/postfix/sample-master.cf ${PKG_PREFIX}/etc/postfix/master.cf - fi + CONF1="main.cf master.cf access aliases canonical pcre_table \ + regexp_table relocated transport virtual" + + for file in $CONF1 + do + if [ ! -f ${PKG_PREFIX}/etc/postfix/$file ]; then + cp ${PKG_PREFIX}/etc/postfix/sample-$file ${PKG_PREFIX}/etc/postfix/$file + fi + done sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist index 0bcc22b0ef74..5b6c3c55d5b6 100644 --- a/mail/postfix28/pkg-plist +++ b/mail/postfix28/pkg-plist @@ -1,17 +1,25 @@ @unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/sample-main.cf; then rm -f %D/etc/postfix/main.cf; fi @unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/sample-master.cf; then rm -f %D/etc/postfix/master.cf; fi +@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/sample-access; then rm -f %D/etc/postfix/access; fi +@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/sample-aliases; then rm -f %D/etc/postfix/aliases; fi +@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/sample-canonical; then rm -f %D/etc/postfix/canonical; fi +@unexec if cmp -s %D/etc/postfix/pcre_table %D/etc/postfix/sample-pcre_table; then rm -f %D/etc/postfix/pcre_table; fi +@unexec if cmp -s %D/etc/postfix/regexp_table %D/etc/postfix/sample-regexp_table; then rm -f %D/etc/postfix/regexp_table; fi +@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/sample-relocated; then rm -f %D/etc/postfix/relocated; fi +@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/sample-transport; then rm -f %D/etc/postfix/transport; fi +@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/sample-virtual; then rm -f %D/etc/postfix/virtual; fi bin/rmail etc/postfix/LICENSE -etc/postfix/access -etc/postfix/aliases -etc/postfix/canonical etc/postfix/main.cf.default -etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files etc/postfix/postfix-script -etc/postfix/regexp_table -etc/postfix/relocated +etc/postfix/sample-access +etc/postfix/sample-aliases +etc/postfix/sample-canonical +etc/postfix/sample-pcre_table +etc/postfix/sample-regexp_table +etc/postfix/sample-relocated etc/postfix/sample-aliases.cf etc/postfix/sample-auth.cf etc/postfix/sample-canonical.cf @@ -40,8 +48,8 @@ etc/postfix/sample-smtp.cf etc/postfix/sample-smtpd.cf etc/postfix/sample-transport.cf etc/postfix/sample-virtual.cf -etc/postfix/transport -etc/postfix/virtual +etc/postfix/sample-transport +etc/postfix/sample-virtual %%SUB_TLS%%etc/postfix/sample-tls.cf libexec/postfix/bounce libexec/postfix/cleanup diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix index 2e48eaa515ae..0778e38ac9be 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.15 2002-01-30 19:59:40 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.16 2002-02-11 17:48:50 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" OFF \ +IPv6 "IPv6 support (CURRENTLY BROKEN)" OFF \ 2> $tempfile retval=$? @@ -79,8 +79,8 @@ 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.1-1.1.1-0.9.6c.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.1-1.1.1-0.9.6c/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.3-1.1.3-0.9.6c.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.3-1.1.3-0.9.6c/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; |