aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuraj Lutter <otis@FreeBSD.org>2022-03-15 21:14:32 +0000
committerJuraj Lutter <otis@FreeBSD.org>2022-03-15 21:15:51 +0000
commitdaa89f04731a86d6ab23d176ed00755510954536 (patch)
tree2e2eacbafec58361fc2faa93c3717bc6d1c07f09
parenteca3d5adb5fcefef7d320c595f93116fbe324627 (diff)
downloadports-daa89f04731a86d6ab23d176ed00755510954536.tar.gz
ports-daa89f04731a86d6ab23d176ed00755510954536.zip
mail/postfix: Apply correct config file patch
Apply proper config file patch in correct stage.
-rw-r--r--mail/postfix/Makefile3
-rw-r--r--mail/postfix/files/patch-conf_main.cf2
2 files changed, 2 insertions, 3 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 28e7112271c3..ea67595bf2bc 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -308,7 +308,7 @@ REINPLACE= s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
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:
+post-patch:
.if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a)
@if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | ${GREP} -wq "mysql_init"; then \
${ECHO_MSG}; \
@@ -329,7 +329,6 @@ pre-patch:
-type f -a ! \( -name INSTALL -o -name aliases \) | ${XARGS} \
${REINPLACE_CMD} -i '' -E -e '${REINPLACE}'
-post-patch:
.for f in ${HTML1}
@${ECHO_CMD} '$$html_directory/$f:f:root:-:644' \
>> ${WRKSRC}/conf/postfix-files
diff --git a/mail/postfix/files/patch-conf_main.cf b/mail/postfix/files/patch-conf_main.cf
index bd57507b466f..9035a169d712 100644
--- a/mail/postfix/files/patch-conf_main.cf
+++ b/mail/postfix/files/patch-conf_main.cf
@@ -3,7 +3,7 @@
@@ -681,4 +681,7 @@ sample_directory = /usr/local/etc/postfix
# readme_directory: The location of the Postfix README files.
#
- readme_directory = no
+ readme_directory =
-inet_protocols = ipv4
+inet_protocols = all
+