Page MenuHomeFreeBSD
Files F174315546

D60212.diff
No OneTemporary
Actions

D60212.diff
View Options

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postfix
DISTVERSION= 3.11.7
-PORTREVISION?= 1
+PORTREVISION?= 2
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= https://postfix-mirror.horus-it.com/postfix-release/ \
@@ -85,13 +85,14 @@
SHEBANG_FILES= auxiliary/qshape/qshape.pl
SCRIPTS_ENV+= POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
-
-PORTSCOUT= limit:^3\.9\.
+ALL_TARGET= default
CONFLICTS_INSTALL= courier-0.* opensmtpd opensmtpd-devel \
postfix postfix-base postfix-ldap-sasl \
postfix-sasl sendmail sendmail-devel
+PORTSCOUT= limit:^3\.9\.
+
USERS= postfix
GROUPS= mail maildrop postfix
@@ -147,8 +148,6 @@
SQLITE_USES= sqlite
TLSRPT_LIB_DEPENDS= libtlsrpt.so:mail/libtlsrpt
-ALL_TARGET= default
-
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MBLOCKLISTD}
diff --git a/mail/postfix/files/pkg-install.in b/mail/postfix/files/pkg-install.in
--- a/mail/postfix/files/pkg-install.in
+++ b/mail/postfix/files/pkg-install.in
@@ -9,12 +9,15 @@
POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no}
# fixed vars
-MC_TEMPLATE="${PKG_ROOTDIR}${PKG_PREFIX}/share/postfix/mailer.conf.postfix"
+# pkg sets PKG_ROOTDIR to "/" by default; strip the trailing slash so
+# joined paths do not show up as "//usr/local/..." in messages
+ROOTDIR="${PKG_ROOTDIR%/}"
+MC_TEMPLATE="${ROOTDIR}${PKG_PREFIX}/share/postfix/mailer.conf.postfix"
# FreeBSD <= 10.3
-MC_BASE="${PKG_ROOTDIR}etc/mail/mailer.conf"
+MC_BASE="${ROOTDIR}/etc/mail/mailer.conf"
# FreeBSD >= 10.3 (and current)
-MC_LOCALBASE="${PKG_ROOTDIR}%%LOCALBASE%%/etc/mail/mailer.conf"
+MC_LOCALBASE="${ROOTDIR}%%LOCALBASE%%/etc/mail/mailer.conf"
USE_LOCALBASE_MAILER_CONF="%%USE_LOCALBASE_MAILER_CONF%%"
if [ "${POSTFIX_DEFAULT_MTA}" = "no" ]; then
@@ -49,7 +52,7 @@
echo "To finish installation run the following commands:"
echo
if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then
- echo " mkdir -p ${PKG_ROOTDIR}%%LOCALBASE%%/etc/mail"
+ echo " mkdir -p ${ROOTDIR}%%LOCALBASE%%/etc/mail"
else
echo " mv -f ${mailerconf} ${mailerconf}.old"
fi
@@ -81,8 +84,8 @@
mailerconf=$1
echo "Activate Postfix in ${mailerconf}"
if [ "${USE_LOCALBASE_MAILER_CONF}" = "yes" ]; then
- [ -d "${PKG_ROOTDIR}/%%LOCALBASE%%/etc/mail" ] || \
- mkdir -p "${PKG_ROOTDIR}/%%LOCALBASE%%/etc/mail"
+ [ -d "${ROOTDIR}%%LOCALBASE%%/etc/mail" ] || \
+ mkdir -p "${ROOTDIR}%%LOCALBASE%%/etc/mail"
fi
[ -f ${mailerconf} ] && mv -f ${mailerconf} ${mailerconf}.old
install -m 644 ${MC_TEMPLATE} ${mailerconf}

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 7:53 AM (5 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40118794
Default Alt Text
D60212.diff (2 KB)

Event Timeline