diff options
author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-01-31 21:10:09 +0000 |
---|---|---|
committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-01-31 21:10:09 +0000 |
commit | c127b53b1623d4e99e00feef75021048459ce0fa (patch) | |
tree | 5503ed80719bedae1dbe52da6b6038d3f0a8dd20 | |
parent | Add missing files to pkg-plist (diff) |
Fix pkg-plist and erasing of config files
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=54090
-rw-r--r-- | mail/postfix-current/Makefile | 7 | ||||
-rw-r--r-- | mail/postfix-current/pkg-install | 7 | ||||
-rw-r--r-- | mail/postfix-current/pkg-plist | 6 |
3 files changed, 18 insertions, 2 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 747b9c35f3e6..fb7c5e7a3bc1 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -7,6 +7,7 @@ PORTNAME= postfix PORTVERSION= 20020115 +PORTREVISION= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ @@ -79,6 +80,12 @@ 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 + @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail diff --git a/mail/postfix-current/pkg-install b/mail/postfix-current/pkg-install index b2b0e42a0332..2e4266564c2b 100644 --- a/mail/postfix-current/pkg-install +++ b/mail/postfix-current/pkg-install @@ -83,6 +83,13 @@ 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 + sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ config_directory=${PKG_PREFIX}/etc/postfix \ daemon_directory=${PKG_PREFIX}/libexec/postfix \ diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist index a6e41994c5c5..30f295d6dfe2 100644 --- a/mail/postfix-current/pkg-plist +++ b/mail/postfix-current/pkg-plist @@ -5,9 +5,7 @@ etc/postfix/LICENSE etc/postfix/access etc/postfix/aliases etc/postfix/canonical -etc/postfix/main.cf etc/postfix/main.cf.default -etc/postfix/master.cf etc/postfix/pcre_table etc/postfix/post-install etc/postfix/postfix-files @@ -24,6 +22,8 @@ etc/postfix/sample-flush.cf etc/postfix/sample-ldap.cf etc/postfix/sample-lmtp.cf etc/postfix/sample-local.cf +etc/postfix/sample-main.cf +etc/postfix/sample-master.cf etc/postfix/sample-misc.cf etc/postfix/sample-pcre-access.cf etc/postfix/sample-pcre-body.cf @@ -74,6 +74,8 @@ sbin/postmap sbin/postqueue sbin/postsuper sbin/sendmail +bin/newaliases +bin/mailq %%SUB_TEST%%sbin/smtp-sink %%SUB_TEST%%sbin/smtp-source %%PORTDOCS%%share/doc/postfix/DB_README |