summaryrefslogtreecommitdiff
path: root/mail/postfix1
diff options
context:
space:
mode:
authorDavid W. Chapman Jr. <dwcjr@FreeBSD.org>2002-02-11 17:48:50 +0000
committerDavid W. Chapman Jr. <dwcjr@FreeBSD.org>2002-02-11 17:48:50 +0000
commitc5043654af8aa1ad46bf6f5032fb846255e1b3c2 (patch)
tree18240b48d9fe7e108765a367adc99e689f845e5e /mail/postfix1
parentFix 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/postfix1')
-rw-r--r--mail/postfix1/Makefile17
-rw-r--r--mail/postfix1/distinfo4
-rw-r--r--mail/postfix1/pkg-install15
-rw-r--r--mail/postfix1/pkg-plist24
-rw-r--r--mail/postfix1/scripts/configure.postfix8
5 files changed, 40 insertions, 28 deletions
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=""
;;