git: c3f62605c215 - main - mail/postfix-current: Update to 3.7-20211023

The branch main has been updated by otis:

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

commit c3f62605c215769ded84e17e3fdbecf2d36c6f3f
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2021-10-30 13:02:41 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2021-10-30 13:02:41 +0000

    mail/postfix-current: Update to 3.7-20211023
    
    - Update to 3.7-20211023
    - Fix plist issues
    - Install sample files properly
    
    PR:             259530
---
 mail/postfix-current/Makefile  | 9 ++++++---
 mail/postfix-current/distinfo  | 6 +++---
 mail/postfix-current/pkg-plist | 8 ++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index f139d92e2abd..13965077086d 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,8 +1,8 @@
 # Created by: Torsten Blum <torstenb@FreeBSD.org>
 
 PORTNAME=	postfix
-DISTVERSION=	3.7-20210815
-PORTREVISION?=	1
+DISTVERSION=	3.7-20211023
+PORTREVISION?=	0
 PORTEPOCH=	6
 CATEGORIES=	mail
 MASTER_SITES=	http://ftp.porcupine.org/mirrors/postfix-release/ \
@@ -297,7 +297,7 @@ REINPLACE=	s!^PATH=.*!PATH=/bin:/sbin:/usr/bin:/usr/sbin:${PREFIX}/bin:${PREFIX}
 		)/etc/postfix!\1$$config_directory!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!;
+		s!($$config_directory/(access|aliases|canonical|generic|header_checks|relocated|transport|virtual):f:root:-:644:)p1!\1o!;
 
 pre-patch:
 .if ${PORT_OPTIONS:MSASL} && ! ${PORT_OPTIONS:MMYSQL} && exists(${LOCALBASE}/lib/libsasl2.a)
@@ -366,6 +366,9 @@ do-install:
 	${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${STAGEDIR}${DATADIR}
+.for SAMPLEFILE in access aliases canonical generic header_checks relocated transport virtual
+	${MV} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE} ${STAGEDIR}${ETCDIR}/${SAMPLEFILE}.sample
+.endfor
 
 # == chop dynamicmaps.cf entries into dedicated .cf files
 # for future sub-packages support
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index cef6aa2d6cad..7fbfc1c1b3a1 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630763703
-SHA256 (postfix/postfix-3.7-20210815.tar.gz) = 46369e7ed32fdee5cc950cfde0e67ec3469c0a5830b61991499547d36582cb59
-SIZE (postfix/postfix-3.7-20210815.tar.gz) = 4756174
+TIMESTAMP = 1635598846
+SHA256 (postfix/postfix-3.7-20211023.tar.gz) = 21c51b19175ba4ac663a4f82b5276b1fb4b011c57f7842df39cd96411b49bb14
+SIZE (postfix/postfix-3.7-20211023.tar.gz) = 4768047
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 09e304898f33..a3cc7b594290 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -12,6 +12,14 @@ bin/rmail
 %%PFETC%%/main.cf.default
 @sample %%PFETC%%/main.cf.sample
 @sample %%PFETC%%/master.cf.sample
+@sample %%PFETC%%/access.sample
+@sample %%PFETC%%/aliases.sample
+@sample %%PFETC%%/canonical.sample
+@sample %%PFETC%%/generic.sample
+@sample %%PFETC%%/header_checks.sample
+@sample %%PFETC%%/relocated.sample
+@sample %%PFETC%%/transport.sample
+@sample %%PFETC%%/virtual.sample
 lib/postfix/libpostfix-dns.so
 lib/postfix/libpostfix-global.so
 lib/postfix/libpostfix-master.so