diff options
| author | Juraj Lutter <otis@FreeBSD.org> | 2022-03-15 22:08:32 +0100 |
|---|---|---|
| committer | Juraj Lutter <otis@FreeBSD.org> | 2022-03-15 22:08:32 +0100 |
| commit | c3a86ca080b399946e23b960658d86d618114eb6 (patch) | |
| tree | fe14aee3ffcb703f76a1b5b33dfe751005e9c94d | |
| parent | mail/postfix: Update to 3.7.0 (diff) | |
mail/postfix-current: Unbreak build
Unbreak build after update to recent 3.8. The breakage was caused
by a patch generated using makepatch. Local patches are now applied
in post-patch stage.
| -rw-r--r-- | mail/postfix-current/Makefile | 5 | ||||
| -rw-r--r-- | mail/postfix-current/files/patch-conf_main.cf | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 008846f1cc63..d75d90e54909 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -315,11 +315,11 @@ 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}; \ - ${ECHO_MSG} "Your SASL library it's compiled with MYSQL"; \ + ${ECHO_MSG} "Your SASL library is compiled with MYSQL"; \ ${ECHO_MSG} "If you use MYSQL in ${PORTNAME} consider CTRL+C and"; \ ${ECHO_MSG} "select MYSQL OPTION in config menu."; \ ${ECHO_MSG} "# make clean config"; \ @@ -336,7 +336,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-current/files/patch-conf_main.cf b/mail/postfix-current/files/patch-conf_main.cf index ecdcaecc206e..f16769847224 100644 --- a/mail/postfix-current/files/patch-conf_main.cf +++ b/mail/postfix-current/files/patch-conf_main.cf @@ -1,9 +1,9 @@ ---- conf/main.cf.orig 2022-03-12 22:37:09 UTC +--- conf/main.cf.orig 2022-03-15 21:02:43 UTC +++ conf/main.cf -@@ -681,4 +681,7 @@ sample_directory = /etc/postfix +@@ -682,4 +682,7 @@ sample_directory = # readme_directory: The location of the Postfix README files. # - readme_directory = no + readme_directory = -inet_protocols = ipv4 +inet_protocols = all + |