Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/mail/postfix/Makefile	2015/10/10 01:58:12	1.288
+++ pkgsrc/mail/postfix/Makefile	2019/04/03 00:32:52	1.308
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.288 2015/10/10 01:58:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.308 2019/04/03 00:32:52 ryoon Exp $
 
+PKGREVISION= 1
 .include "../../mail/postfix/Makefile.common"
 
 COMMENT=	Postfix SMTP server and tools
-PKGREVISION=	2
 
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
 CONFLICTS+=	esmtp>=1.2 nullmailer-[0-9]*
 
 USE_TOOLS+=	perl
 
-SPECIAL_PERMS+=	sbin/postdrop postfix maildrop 2555
-SPECIAL_PERMS+=	sbin/postqueue postfix maildrop 2555
+SPECIAL_PERMS+=	sbin/postdrop ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
+SPECIAL_PERMS+=	sbin/postqueue ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
 
 REPLACE_PERL+=	auxiliary/qshape/qshape.pl
 
@@ -32,13 +32,14 @@ PLIST_SRC+=		${PKGDIR}/PLIST
 
 RCD_SCRIPTS=		postfix
 OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
-OWN_DIRS_PERMS+=	${POSTFIX_DATA_DIR} postfix postfix 0700
+OWN_DIRS_PERMS+=	${POSTFIX_DATA_DIR} ${POSTFIX_USER} ${POSTFIX_GROUP} 0700
 MAKE_DIRS+=		${METADIR}/dynamicmaps.cf.d ${METADIR}/postfix-files.d
 
-PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix
-PKG_GECOS.postfix=	Postfix User
-PKG_HOME.postfix=	${POSTFIX_QUEUE_DIR}
+PKG_GROUPS?=		${POSTFIX_GROUP} ${MAILDROP_GROUP}
+PKG_USERS?=		${POSTFIX_USER}:${POSTFIX_GROUP}
+
+PKG_GECOS.${POSTFIX_USER}=	Postfix User
+PKG_HOME.${POSTFIX_USER}=	${POSTFIX_QUEUE_DIR}
 
 CONF_FILES=		# empty
 .for i in main.cf master.cf
@@ -49,7 +50,7 @@ CONF_FILES_PERMS=	# empty
 SUBST_CLASSES+=		paths
 SUBST_FILES.paths=	${WRKDIR}/mailer.conf
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	pre-configure
 
 INSTALLATION_DIRS+=	${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR}
 
@@ -67,8 +68,7 @@ do-install:
 .if !empty(PKG_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
 .endif
-	cd ${WRKSRC} && ${SETENV} LD_LIBRARY_PATH=${WRKSRC}/lib sh		\
-		./postfix-install -non-interactive				\
+	cd ${WRKSRC} && ${SH} ./postfix-install -non-interactive \
 		${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}"
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
 		${DESTDIR}${EXAMPLEDIR}/mailer.conf