git: daa89f04731a - main - mail/postfix: Apply correct config file patch

From: Juraj Lutter <otis_at_FreeBSD.org>
Date: Tue, 15 Mar 2022 21:16:00 UTC
The branch main has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=daa89f04731a86d6ab23d176ed00755510954536

commit daa89f04731a86d6ab23d176ed00755510954536
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2022-03-15 21:14:32 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2022-03-15 21:15:51 +0000

    mail/postfix: Apply correct config file patch
    
    Apply proper config file patch in correct stage.
---
 mail/postfix/Makefile                 | 3 +--
 mail/postfix/files/patch-conf_main.cf | 2 +-
 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
 +