aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/postfix/Makefile18
-rw-r--r--mail/postfix/files/pkg-install.in10
-rw-r--r--mail/postfix/pkg-plist12
-rw-r--r--mail/postfix25/Makefile18
-rw-r--r--mail/postfix25/files/pkg-install.in10
-rw-r--r--mail/postfix25/pkg-plist12
-rw-r--r--mail/postfix26/Makefile18
-rw-r--r--mail/postfix26/files/pkg-install.in10
-rw-r--r--mail/postfix26/pkg-plist12
-rw-r--r--mail/postfix27/Makefile18
-rw-r--r--mail/postfix27/files/pkg-install.in10
-rw-r--r--mail/postfix27/pkg-plist12
-rw-r--r--mail/postfix28/Makefile18
-rw-r--r--mail/postfix28/files/pkg-install.in10
-rw-r--r--mail/postfix28/pkg-plist12
15 files changed, 40 insertions, 160 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index aa1888d89eb6..f39c41cf8c23 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -7,6 +7,7 @@
PORTNAME= postfix
PORTVERSION= 2.6.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -28,6 +29,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
USE_SUBMAKE= yes
USE_PERL5_BUILD=yes
USE_RC_SUBR= postfix.sh
+SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
# back compat pull in settings from POSTFIX_OPTIONS for convenience when
# make config is run (happens first time port is built, too)
@@ -76,9 +78,6 @@ MLINKS= sendmail.1 mailq.1 \
bounce.8 trace.8 \
smtp.8 lmtp.8
-PORTEXAMPLES= access aliases canonical generic header_checks \
- main.cf master.cf relocated transport virtual
-
.if !defined(DEBUG)
MAKEFILEFLAGS+= DEBUG=
.endif
@@ -88,7 +87,6 @@ MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
.include <bsd.port.pre.mk>
POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
- -DDEF_SAMPLE_DIR=\\\"${EXAMPLESDIR}\\\" \
-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
@@ -232,12 +230,13 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
s!^(setgid_group =)!\1 maildrop!g;\
s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
- s!^(sample_directory =)!\1 ${EXAMPLESDIR}!g;\
s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
s!/etc/aliases!/etc/mail/aliases!g;\
s!(:|= )/etc/postfix!\1$$config_directory!g;\
- s!/etc/postfix!${ETCDIR}!g;
+ s!/etc/postfix!${ETCDIR}!g;\
+ s!^(sample_directory =)!\1 ${ETCDIR}!g;\
+ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
pre-patch:
.if defined(POSTFIX_OPTIONS)
@@ -308,13 +307,6 @@ do-install:
@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
.endif
-.if !defined(NOPORTEXAMPLES)
- ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR}
-.for f in ${PORTEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${EXAMPLESDIR}
-.endfor
- @${ECHO_MSG} "Installed configuration examples in ${EXAMPLESDIR}"
-.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/mail/postfix/files/pkg-install.in b/mail/postfix/files/pkg-install.in
index 5cd874c814ee..f26f5dbcf002 100644
--- a/mail/postfix/files/pkg-install.in
+++ b/mail/postfix/files/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix/files/pkg-install.in,v 1.1 2009-05-26 13:36:08 netchild Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -11,7 +11,6 @@ PREFIX=${PKG_PREFIX:=%%PREFIX%%}
ETCDIR=${ETCDIR:=%%ETCDIR%%}
DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
READMEDIR=${READMEDIR:=%%READMEDIR%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
BATCH=${BATCH:=no}
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
@@ -115,13 +114,6 @@ if [ "$2" = "PRE-INSTALL" ]; then
fi
if [ "$2" = "POST-INSTALL" ]; then
- if [ -d ${EXAMPLESDIR} ]; then
- for file in ${EXAMPLESDIR}/*; do
- if [ ! -f ${ETCDIR}/${file#${EXAMPLESDIR}} ]; then
- cp $file ${ETCDIR}/
- fi
- done
- fi
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
daemon_directory=${DAEMONDIR} \
upgrade-package
diff --git a/mail/postfix/pkg-plist b/mail/postfix/pkg-plist
index f71fa439bcd7..298ef69caf43 100644
--- a/mail/postfix/pkg-plist
+++ b/mail/postfix/pkg-plist
@@ -1,13 +1,5 @@
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/access %D/%%ETCDIR%%/access; then rm -f %D/%%ETCDIR%%/access; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/aliases %D/%%ETCDIR%%/aliases; then rm -f %D/%%ETCDIR%%/aliases; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/canonical %D/%%ETCDIR%%/canonical; then rm -f %D/%%ETCDIR%%/canonical; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/header_checks %D/%%ETCDIR%%/header_checks; then rm -f %D/%%ETCDIR%%/header_checks; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/relocated %D/%%ETCDIR%%/relocated; then rm -f %D/%%ETCDIR%%/relocated; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/transport %D/%%ETCDIR%%/transport; then rm -f %D/%%ETCDIR%%/transport; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/virtual %D/%%ETCDIR%%/virtual; then rm -f %D/%%ETCDIR%%/virtual; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/generic %D/%%ETCDIR%%/generic; then rm -f %D/%%ETCDIR%%/generic; fi
+@unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
+@unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
%%ETCDIR%%/LICENSE
%%ETCDIR%%/TLS_LICENSE
%%ETCDIR%%/bounce.cf.default
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index aa1888d89eb6..f39c41cf8c23 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -7,6 +7,7 @@
PORTNAME= postfix
PORTVERSION= 2.6.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -28,6 +29,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
USE_SUBMAKE= yes
USE_PERL5_BUILD=yes
USE_RC_SUBR= postfix.sh
+SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
# back compat pull in settings from POSTFIX_OPTIONS for convenience when
# make config is run (happens first time port is built, too)
@@ -76,9 +78,6 @@ MLINKS= sendmail.1 mailq.1 \
bounce.8 trace.8 \
smtp.8 lmtp.8
-PORTEXAMPLES= access aliases canonical generic header_checks \
- main.cf master.cf relocated transport virtual
-
.if !defined(DEBUG)
MAKEFILEFLAGS+= DEBUG=
.endif
@@ -88,7 +87,6 @@ MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
.include <bsd.port.pre.mk>
POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
- -DDEF_SAMPLE_DIR=\\\"${EXAMPLESDIR}\\\" \
-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
@@ -232,12 +230,13 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
s!^(setgid_group =)!\1 maildrop!g;\
s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
- s!^(sample_directory =)!\1 ${EXAMPLESDIR}!g;\
s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
s!/etc/aliases!/etc/mail/aliases!g;\
s!(:|= )/etc/postfix!\1$$config_directory!g;\
- s!/etc/postfix!${ETCDIR}!g;
+ s!/etc/postfix!${ETCDIR}!g;\
+ s!^(sample_directory =)!\1 ${ETCDIR}!g;\
+ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
pre-patch:
.if defined(POSTFIX_OPTIONS)
@@ -308,13 +307,6 @@ do-install:
@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
.endif
-.if !defined(NOPORTEXAMPLES)
- ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR}
-.for f in ${PORTEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${EXAMPLESDIR}
-.endfor
- @${ECHO_MSG} "Installed configuration examples in ${EXAMPLESDIR}"
-.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/mail/postfix25/files/pkg-install.in b/mail/postfix25/files/pkg-install.in
index e0828be7541f..9abb7340da66 100644
--- a/mail/postfix25/files/pkg-install.in
+++ b/mail/postfix25/files/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/files/Attic/pkg-install.in,v 1.1 2009-05-26 13:36:08 netchild Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/files/Attic/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -11,7 +11,6 @@ PREFIX=${PKG_PREFIX:=%%PREFIX%%}
ETCDIR=${ETCDIR:=%%ETCDIR%%}
DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
READMEDIR=${READMEDIR:=%%READMEDIR%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
BATCH=${BATCH:=no}
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
@@ -115,13 +114,6 @@ if [ "$2" = "PRE-INSTALL" ]; then
fi
if [ "$2" = "POST-INSTALL" ]; then
- if [ -d ${EXAMPLESDIR} ]; then
- for file in ${EXAMPLESDIR}/*; do
- if [ ! -f ${ETCDIR}/${file#${EXAMPLESDIR}} ]; then
- cp $file ${ETCDIR}/
- fi
- done
- fi
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
daemon_directory=${DAEMONDIR} \
upgrade-package
diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist
index f71fa439bcd7..298ef69caf43 100644
--- a/mail/postfix25/pkg-plist
+++ b/mail/postfix25/pkg-plist
@@ -1,13 +1,5 @@
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/access %D/%%ETCDIR%%/access; then rm -f %D/%%ETCDIR%%/access; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/aliases %D/%%ETCDIR%%/aliases; then rm -f %D/%%ETCDIR%%/aliases; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/canonical %D/%%ETCDIR%%/canonical; then rm -f %D/%%ETCDIR%%/canonical; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/header_checks %D/%%ETCDIR%%/header_checks; then rm -f %D/%%ETCDIR%%/header_checks; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/relocated %D/%%ETCDIR%%/relocated; then rm -f %D/%%ETCDIR%%/relocated; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/transport %D/%%ETCDIR%%/transport; then rm -f %D/%%ETCDIR%%/transport; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/virtual %D/%%ETCDIR%%/virtual; then rm -f %D/%%ETCDIR%%/virtual; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/generic %D/%%ETCDIR%%/generic; then rm -f %D/%%ETCDIR%%/generic; fi
+@unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
+@unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
%%ETCDIR%%/LICENSE
%%ETCDIR%%/TLS_LICENSE
%%ETCDIR%%/bounce.cf.default
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index aa1888d89eb6..f39c41cf8c23 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -7,6 +7,7 @@
PORTNAME= postfix
PORTVERSION= 2.6.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -28,6 +29,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
USE_SUBMAKE= yes
USE_PERL5_BUILD=yes
USE_RC_SUBR= postfix.sh
+SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
# back compat pull in settings from POSTFIX_OPTIONS for convenience when
# make config is run (happens first time port is built, too)
@@ -76,9 +78,6 @@ MLINKS= sendmail.1 mailq.1 \
bounce.8 trace.8 \
smtp.8 lmtp.8
-PORTEXAMPLES= access aliases canonical generic header_checks \
- main.cf master.cf relocated transport virtual
-
.if !defined(DEBUG)
MAKEFILEFLAGS+= DEBUG=
.endif
@@ -88,7 +87,6 @@ MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
.include <bsd.port.pre.mk>
POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
- -DDEF_SAMPLE_DIR=\\\"${EXAMPLESDIR}\\\" \
-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
@@ -232,12 +230,13 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
s!^(setgid_group =)!\1 maildrop!g;\
s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
- s!^(sample_directory =)!\1 ${EXAMPLESDIR}!g;\
s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
s!/etc/aliases!/etc/mail/aliases!g;\
s!(:|= )/etc/postfix!\1$$config_directory!g;\
- s!/etc/postfix!${ETCDIR}!g;
+ s!/etc/postfix!${ETCDIR}!g;\
+ s!^(sample_directory =)!\1 ${ETCDIR}!g;\
+ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
pre-patch:
.if defined(POSTFIX_OPTIONS)
@@ -308,13 +307,6 @@ do-install:
@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
.endif
-.if !defined(NOPORTEXAMPLES)
- ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR}
-.for f in ${PORTEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${EXAMPLESDIR}
-.endfor
- @${ECHO_MSG} "Installed configuration examples in ${EXAMPLESDIR}"
-.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/mail/postfix26/files/pkg-install.in b/mail/postfix26/files/pkg-install.in
index 147a836ccf34..bf9002fa2198 100644
--- a/mail/postfix26/files/pkg-install.in
+++ b/mail/postfix26/files/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.1 2009-05-26 13:36:08 netchild Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -11,7 +11,6 @@ PREFIX=${PKG_PREFIX:=%%PREFIX%%}
ETCDIR=${ETCDIR:=%%ETCDIR%%}
DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
READMEDIR=${READMEDIR:=%%READMEDIR%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
BATCH=${BATCH:=no}
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
@@ -115,13 +114,6 @@ if [ "$2" = "PRE-INSTALL" ]; then
fi
if [ "$2" = "POST-INSTALL" ]; then
- if [ -d ${EXAMPLESDIR} ]; then
- for file in ${EXAMPLESDIR}/*; do
- if [ ! -f ${ETCDIR}/${file#${EXAMPLESDIR}} ]; then
- cp $file ${ETCDIR}/
- fi
- done
- fi
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
daemon_directory=${DAEMONDIR} \
upgrade-package
diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist
index f71fa439bcd7..298ef69caf43 100644
--- a/mail/postfix26/pkg-plist
+++ b/mail/postfix26/pkg-plist
@@ -1,13 +1,5 @@
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/access %D/%%ETCDIR%%/access; then rm -f %D/%%ETCDIR%%/access; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/aliases %D/%%ETCDIR%%/aliases; then rm -f %D/%%ETCDIR%%/aliases; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/canonical %D/%%ETCDIR%%/canonical; then rm -f %D/%%ETCDIR%%/canonical; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/header_checks %D/%%ETCDIR%%/header_checks; then rm -f %D/%%ETCDIR%%/header_checks; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/relocated %D/%%ETCDIR%%/relocated; then rm -f %D/%%ETCDIR%%/relocated; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/transport %D/%%ETCDIR%%/transport; then rm -f %D/%%ETCDIR%%/transport; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/virtual %D/%%ETCDIR%%/virtual; then rm -f %D/%%ETCDIR%%/virtual; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/generic %D/%%ETCDIR%%/generic; then rm -f %D/%%ETCDIR%%/generic; fi
+@unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
+@unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
%%ETCDIR%%/LICENSE
%%ETCDIR%%/TLS_LICENSE
%%ETCDIR%%/bounce.cf.default
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index aa1888d89eb6..f39c41cf8c23 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -7,6 +7,7 @@
PORTNAME= postfix
PORTVERSION= 2.6.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -28,6 +29,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
USE_SUBMAKE= yes
USE_PERL5_BUILD=yes
USE_RC_SUBR= postfix.sh
+SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
# back compat pull in settings from POSTFIX_OPTIONS for convenience when
# make config is run (happens first time port is built, too)
@@ -76,9 +78,6 @@ MLINKS= sendmail.1 mailq.1 \
bounce.8 trace.8 \
smtp.8 lmtp.8
-PORTEXAMPLES= access aliases canonical generic header_checks \
- main.cf master.cf relocated transport virtual
-
.if !defined(DEBUG)
MAKEFILEFLAGS+= DEBUG=
.endif
@@ -88,7 +87,6 @@ MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
.include <bsd.port.pre.mk>
POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
- -DDEF_SAMPLE_DIR=\\\"${EXAMPLESDIR}\\\" \
-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
@@ -232,12 +230,13 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
s!^(setgid_group =)!\1 maildrop!g;\
s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
- s!^(sample_directory =)!\1 ${EXAMPLESDIR}!g;\
s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
s!/etc/aliases!/etc/mail/aliases!g;\
s!(:|= )/etc/postfix!\1$$config_directory!g;\
- s!/etc/postfix!${ETCDIR}!g;
+ s!/etc/postfix!${ETCDIR}!g;\
+ s!^(sample_directory =)!\1 ${ETCDIR}!g;\
+ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
pre-patch:
.if defined(POSTFIX_OPTIONS)
@@ -308,13 +307,6 @@ do-install:
@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
.endif
-.if !defined(NOPORTEXAMPLES)
- ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR}
-.for f in ${PORTEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${EXAMPLESDIR}
-.endfor
- @${ECHO_MSG} "Installed configuration examples in ${EXAMPLESDIR}"
-.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/mail/postfix27/files/pkg-install.in b/mail/postfix27/files/pkg-install.in
index 469f7c0eaf2d..e700453e617f 100644
--- a/mail/postfix27/files/pkg-install.in
+++ b/mail/postfix27/files/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.1 2009-05-26 13:36:08 netchild Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -11,7 +11,6 @@ PREFIX=${PKG_PREFIX:=%%PREFIX%%}
ETCDIR=${ETCDIR:=%%ETCDIR%%}
DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
READMEDIR=${READMEDIR:=%%READMEDIR%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
BATCH=${BATCH:=no}
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
@@ -115,13 +114,6 @@ if [ "$2" = "PRE-INSTALL" ]; then
fi
if [ "$2" = "POST-INSTALL" ]; then
- if [ -d ${EXAMPLESDIR} ]; then
- for file in ${EXAMPLESDIR}/*; do
- if [ ! -f ${ETCDIR}/${file#${EXAMPLESDIR}} ]; then
- cp $file ${ETCDIR}/
- fi
- done
- fi
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
daemon_directory=${DAEMONDIR} \
upgrade-package
diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist
index f71fa439bcd7..298ef69caf43 100644
--- a/mail/postfix27/pkg-plist
+++ b/mail/postfix27/pkg-plist
@@ -1,13 +1,5 @@
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/access %D/%%ETCDIR%%/access; then rm -f %D/%%ETCDIR%%/access; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/aliases %D/%%ETCDIR%%/aliases; then rm -f %D/%%ETCDIR%%/aliases; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/canonical %D/%%ETCDIR%%/canonical; then rm -f %D/%%ETCDIR%%/canonical; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/header_checks %D/%%ETCDIR%%/header_checks; then rm -f %D/%%ETCDIR%%/header_checks; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/relocated %D/%%ETCDIR%%/relocated; then rm -f %D/%%ETCDIR%%/relocated; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/transport %D/%%ETCDIR%%/transport; then rm -f %D/%%ETCDIR%%/transport; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/virtual %D/%%ETCDIR%%/virtual; then rm -f %D/%%ETCDIR%%/virtual; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/generic %D/%%ETCDIR%%/generic; then rm -f %D/%%ETCDIR%%/generic; fi
+@unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
+@unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
%%ETCDIR%%/LICENSE
%%ETCDIR%%/TLS_LICENSE
%%ETCDIR%%/bounce.cf.default
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index aa1888d89eb6..f39c41cf8c23 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -7,6 +7,7 @@
PORTNAME= postfix
PORTVERSION= 2.6.1
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
@@ -28,6 +29,7 @@ CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-57-9].* postfix-current-2.* \
USE_SUBMAKE= yes
USE_PERL5_BUILD=yes
USE_RC_SUBR= postfix.sh
+SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
# back compat pull in settings from POSTFIX_OPTIONS for convenience when
# make config is run (happens first time port is built, too)
@@ -76,9 +78,6 @@ MLINKS= sendmail.1 mailq.1 \
bounce.8 trace.8 \
smtp.8 lmtp.8
-PORTEXAMPLES= access aliases canonical generic header_checks \
- main.cf master.cf relocated transport virtual
-
.if !defined(DEBUG)
MAKEFILEFLAGS+= DEBUG=
.endif
@@ -88,7 +87,6 @@ MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}"
.include <bsd.port.pre.mk>
POSTFIX_CCARGS+= -DDEF_CONFIG_DIR=\\\"${ETCDIR}\\\" \
- -DDEF_SAMPLE_DIR=\\\"${EXAMPLESDIR}\\\" \
-DDEF_DAEMON_DIR=\\\"${PREFIX}/libexec/postfix\\\" \
-DDEF_COMMAND_DIR=\\\"${PREFIX}/sbin\\\" \
-DDEF_SENDMAIL_PATH=\\\"${PREFIX}/sbin/sendmail\\\" \
@@ -232,12 +230,13 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
s!^(mailq_path =)!\1 ${PREFIX}/bin/mailq!g;\
s!^(setgid_group =)!\1 maildrop!g;\
s!^(manpage_directory =)!\1 ${PREFIX}/man!g;\
- s!^(sample_directory =)!\1 ${EXAMPLESDIR}!g;\
s!^((html|readme)_directory =)!\1 ${READMEDIR}!g;\
\!^\#alias_database = dbm:/etc/mail/aliases$$!d;\
s!/etc/aliases!/etc/mail/aliases!g;\
s!(:|= )/etc/postfix!\1$$config_directory!g;\
- s!/etc/postfix!${ETCDIR}!g;
+ s!/etc/postfix!${ETCDIR}!g;\
+ s!^(sample_directory =)!\1 ${ETCDIR}!g;\
+ s!($config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
pre-patch:
.if defined(POSTFIX_OPTIONS)
@@ -308,13 +307,6 @@ do-install:
@cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \
${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}"
.endif
-.if !defined(NOPORTEXAMPLES)
- ${INSTALL} -o ${SHAREOWN} -g ${SHAREGRP} -m 555 -d ${EXAMPLESDIR}
-.for f in ${PORTEXAMPLES}
- ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${EXAMPLESDIR}
-.endfor
- @${ECHO_MSG} "Installed configuration examples in ${EXAMPLESDIR}"
-.endif
post-install:
@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/mail/postfix28/files/pkg-install.in b/mail/postfix28/files/pkg-install.in
index 63b35a634394..f23dd9aaf902 100644
--- a/mail/postfix28/files/pkg-install.in
+++ b/mail/postfix28/files/pkg-install.in
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.1 2009-05-26 13:36:08 netchild Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/files/pkg-install.in,v 1.2 2009-06-04 07:45:27 mm Exp $
#
# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it
@@ -11,7 +11,6 @@ PREFIX=${PKG_PREFIX:=%%PREFIX%%}
ETCDIR=${ETCDIR:=%%ETCDIR%%}
DAEMONDIR=${DAEMONDIR:=${PREFIX}/libexec/postfix}
READMEDIR=${READMEDIR:=%%READMEDIR%%}
-EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%}
BATCH=${BATCH:=no}
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
@@ -115,13 +114,6 @@ if [ "$2" = "PRE-INSTALL" ]; then
fi
if [ "$2" = "POST-INSTALL" ]; then
- if [ -d ${EXAMPLESDIR} ]; then
- for file in ${EXAMPLESDIR}/*; do
- if [ ! -f ${ETCDIR}/${file#${EXAMPLESDIR}} ]; then
- cp $file ${ETCDIR}/
- fi
- done
- fi
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
daemon_directory=${DAEMONDIR} \
upgrade-package
diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist
index f71fa439bcd7..298ef69caf43 100644
--- a/mail/postfix28/pkg-plist
+++ b/mail/postfix28/pkg-plist
@@ -1,13 +1,5 @@
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/access %D/%%ETCDIR%%/access; then rm -f %D/%%ETCDIR%%/access; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/aliases %D/%%ETCDIR%%/aliases; then rm -f %D/%%ETCDIR%%/aliases; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/canonical %D/%%ETCDIR%%/canonical; then rm -f %D/%%ETCDIR%%/canonical; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/header_checks %D/%%ETCDIR%%/header_checks; then rm -f %D/%%ETCDIR%%/header_checks; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/relocated %D/%%ETCDIR%%/relocated; then rm -f %D/%%ETCDIR%%/relocated; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/transport %D/%%ETCDIR%%/transport; then rm -f %D/%%ETCDIR%%/transport; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/virtual %D/%%ETCDIR%%/virtual; then rm -f %D/%%ETCDIR%%/virtual; fi
-@unexec if cmp -s %D/%%EXAMPLESDIR%%/generic %D/%%ETCDIR%%/generic; then rm -f %D/%%ETCDIR%%/generic; fi
+@unexec if cmp -s %D/libexec/postfix/main.cf %D/%%ETCDIR%%/main.cf; then rm -f %D/%%ETCDIR%%/main.cf; fi
+@unexec if cmp -s %D/libexec/postfix/master.cf %D/%%ETCDIR%%/master.cf; then rm -f %D/%%ETCDIR%%/master.cf; fi
%%ETCDIR%%/LICENSE
%%ETCDIR%%/TLS_LICENSE
%%ETCDIR%%/bounce.cf.default
generated by cgit (git 2.34.1) at 2024-11-08 17:44:44 +0800