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

--- pkgsrc/mail/postfix/Makefile	2003/11/21 15:33:41	1.107
+++ pkgsrc/mail/postfix/Makefile	2020/11/22 11:14:44	1.325
@@ -1,185 +1,96 @@
-# $NetBSD: Makefile,v 1.107 2003/11/21 15:33:41 jlam Exp $
+# $NetBSD: Makefile,v 1.325 2020/11/22 11:14:44 adam Exp $
 
-DISTNAME=	postfix-2.0.16
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+.include "../../mail/postfix/Makefile.common"
 
-MAINTAINER=	martti@NetBSD.org
-HOMEPAGE=	http://www.postfix.org/
-COMMENT=	Postfix SMTP server and tools
+COMMENT=	Fast, easy to administer, and secure mail transfer agent
 
-DIST_SUBDIR=	postfix
+CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
+CONFLICTS+=	esmtp>=1.2 nullmailer-[0-9]*
 
-POSTFIX_SPOOL=	/var/spool/postfix
+USE_TOOLS+=	perl pkg-config m4
 
-USE_BUILDLINK2=	yes
-USE_PKGINSTALL=	yes
+SPECIAL_PERMS+=	sbin/postdrop ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
+SPECIAL_PERMS+=	sbin/postqueue ${POSTFIX_USER} ${MAILDROP_GROUP} 2555
 
-PKG_SYSCONFSUBDIR=	postfix
+REPLACE_PERL+=	auxiliary/qshape/qshape.pl
 
-OWN_DIRS=	${POSTFIX_SPOOL}
+# options.mk appends to CCARGS and AUXLIBS the options needed to build
+# Postfix with support for various add-on modules.
+#
+.include "options.mk"
 
-CCARGS+=	-DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
-CCARGS+=	-DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
-CCARGS+=	-DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
-CCARGS+=	-DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
-CCARGS+=	-DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
-CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
+FILES_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
+MESSAGE_SUBST+=		EXAMPLEDIR=${EXAMPLEDIR}
+MESSAGE_SUBST+=		DOCDIR=${DOCDIR}
 
-.include "../../mk/bsd.prefs.mk"
-
-FIX_RPATH+=	AUXLIBS
-
-.if defined(POSTFIX_USE_INET6) && ${POSTFIX_USE_INET6} == "YES"
-.include "../../security/openssl/buildlink2.mk"
-PATCHFILES+=		tls+ipv6-1.18a-pf-2.0.16.patch.gz
-PATCH_SITES+=		ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.18/
-PATCH_DIST_STRIP=	-p1
-BUILD_DEFS+=		POSTFIX_USE_INET6
-
-CCARGS+=		-DHAS_SSL
-AUXLIBS+=		-L${BUILDLINK_PREFIX.openssl}/lib	\
-			-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib \
-			-lssl -lcrypto
-BUILD_DEFS+=		POSTFIX_USE_TLS
-
-PLIST_SRC+=		${PKGDIR}/PLIST.tls
-MESSAGE_SRC+=		${PKGDIR}/MESSAGE.tls
+MESSAGE_SRC+=		${PKGDIR}/MESSAGE
+.if exists(${PKGDIR}/MESSAGE.${OPSYS})
+MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS}
 .endif
+PLIST_SRC+=		${PKGDIR}/PLIST
 
-.if defined(POSTFIX_USE_PCRE) && ${POSTFIX_USE_PCRE} == "YES"
-.include "../../devel/pcre/buildlink2.mk"
-CCARGS+=	-DHAS_PCRE
-AUXLIBS+=	-L${BUILDLINK_PREFIX.pcre}/lib		\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pcre}/lib	\
-		-lpcre
-BUILD_DEFS+=	POSTFIX_USE_PCRE
-.else
-CCARGS+=	-DNO_PCRE
-.endif
+RCD_SCRIPTS=		postfix
+OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
+OWN_DIRS_PERMS+=	${POSTFIX_DATA_DIR} ${POSTFIX_USER} ${POSTFIX_GROUP} 0700
+MAKE_DIRS+=		${METADIR}/dynamicmaps.cf.d ${METADIR}/postfix-files.d
 
-.if defined(POSTFIX_USE_LDAP) && ${POSTFIX_USE_LDAP} == "YES"
-.include "../../databases/openldap/buildlink2.mk"
-CCARGS+=	-DHAS_LDAP
-AUXLIBS+=	-L${BUILDLINK_PREFIX.openldap}/lib	\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openldap}/lib	\
-		-lldap -llber
-BUILD_DEFS+=	POSTFIX_USE_LDAP
-.endif
+PKG_GROUPS?=		${POSTFIX_GROUP} ${MAILDROP_GROUP}
+PKG_USERS?=		${POSTFIX_USER}:${POSTFIX_GROUP}
 
-.if defined(POSTFIX_USE_MYSQL) && ${POSTFIX_USE_MYSQL} == "YES"
-.include "../../databases/mysql-client/buildlink2.mk"
-CCARGS+=	-DHAS_MYSQL -I${BUILDLINK_PREFIX.mysql-client}/include/mysql
-AUXLIBS+=	-L${BUILDLINK_PREFIX.mysql-client}/lib/mysql		\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql	\
-		-lmysqlclient -lz -lm
-BUILD_DEFS+=	POSTFIX_USE_MYSQL
-.endif
-
-.if defined(USE_SASL2) && ${USE_SASL2} == "YES"
-USING_SASL=YES
-.include "../../security/cyrus-sasl2/buildlink2.mk"
-CCARGS+=	-DUSE_SASL2_AUTH
-AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib		\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
-		-lsasl2
-BUILD_DEFS+=	USE_SASL2
-.elif defined(USE_SASL) && ${USE_SASL} == "YES"
-USING_SASL=YES
-.include "../../security/cyrus-sasl/buildlink2.mk"
-CCARGS+=	-DUSE_SASL_AUTH
-AUXLIBS+=	-L${BUILDLINK_PREFIX.cyrus-sasl}/lib		\
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.cyrus-sasl}/lib	\
-		-lsasl
-BUILD_DEFS+=	USE_SASL
-.endif
-
-.if defined(USING_SASL)
-PLIST_SRC+=	${PKGDIR}/PLIST.sasl
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE.sasl
-MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-.endif
+PKG_GECOS.${POSTFIX_USER}=	Postfix User
+PKG_HOME.${POSTFIX_USER}=	${POSTFIX_QUEUE_DIR}
 
-MESSAGE_SRC+=	${PKGDIR}/MESSAGE
-PLIST_SRC+=	${PKGDIR}/PLIST
-ALL_TARGET=	#empty
-MAKE_ENV=	CC="${CC}" OPT="${CFLAGS}"
-MAKE_ENV+=	AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
-
-POSTFIX_CONF_FILES=	conf/main.cf src/util/sys_defs.h postfix-install
-POSTFIX_CONF_FILES+=	conf/sample-misc.cf src/global/mail_params.h
-
-FILES_SUBST+=	SHAREDIR=${SHAREDIR}
-MESSAGE_SUBST+=	SHAREDIR=${SHAREDIR}
-PLIST_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
-PLIST_SUBST+=	POSTFIX_SPOOL=${POSTFIX_SPOOL}
-
-PKG_GROUPS?=	postfix maildrop
-PKG_USERS?=	postfix:postfix::Postfix\\ User:${POSTFIX_SPOOL}
-
-LIBEXECDIR=	${PREFIX}/libexec/${PKGBASE}
-SHAREDIR=	${PREFIX}/share/examples/${PKGBASE}
-
-CONF_FILES=	${SHAREDIR}/main.cf ${PKG_SYSCONFDIR}/main.cf
-CONF_FILES+=	${SHAREDIR}/master.cf ${PKG_SYSCONFDIR}/master.cf
-.if defined(USING_SASL)
-.if defined(USE_SASL2)
-CONF_FILES+=	${SHAREDIR}/smtpd.conf	${PREFIX}/lib/sasl2/smtpd.conf
-.else
-CONF_FILES+=	${SHAREDIR}/smtpd.conf	${PREFIX}/lib/sasl/smtpd.conf
-.endif
-.endif
-CONF_FILES_PERMS=
-.for confscr in post-install postfix-files postfix-script
-CONF_FILES_PERMS+=	${SHAREDIR}/${confscr} ${PKG_SYSCONFDIR}/${confscr} \
-			${ROOT_USER} ${ROOT_GROUP} 755
+CONF_FILES=		# empty
+.for i in main.cf master.cf
+CONF_FILES+=		${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
 .endfor
-.undef confscr
-
-INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
+CONF_FILES_PERMS=	# empty
 
-pre-configure:
-	@for i in ${POSTFIX_CONF_FILES}; do				\
-		${CP} ${WRKSRC}/$${i} ${WRKSRC}/$${i}.dist;		\
-		${SED} -e 's|__PREFIX|'${PREFIX}'|g'			\
-			-e 's|__PKG_SYSCONFDIR|'${PKG_SYSCONFDIR}'|g'	\
-			< ${WRKSRC}/$${i}.dist				\
-			> ${WRKSRC}/$${i};				\
-	done
-
-do-configure:
-	(cd ${WRKSRC} && \
-	${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
-		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}')
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	${WRKDIR}/mailer.conf
+SUBST_VARS.paths=	PREFIX
+SUBST_STAGE.paths=	pre-configure
+
+INSTALLATION_DIRS+=	${LIBEXECDIR} ${METADIR} ${SHLIBDIR} ${EXAMPLEDIR} ${DOCDIR}
+
+post-extract:
+	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+	${RM} -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
 
 post-build:
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
-	    <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
-
-pre-install:
-	${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
-	${INSTALL_DATA_DIR} ${SHAREDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/postfix
-	${INSTALL_DATA_DIR} ${LIBEXECDIR}
-	${CHOWN} ${ROOT_USER}:${ROOT_GROUP} ${SHAREDIR} ${LIBEXECDIR}
-	${CHMOD} 755 ${SHAREDIR} ${LIBEXECDIR}
-	-${RM} -f ${WRKSRC}/conf/*.orig
-.if defined(USING_SASL)
-.if defined(USE_SASL2)
-	${ECHO} "pwcheck_method: auxprop" > ${WRKDIR}/smtpd.conf
-.else
-	${ECHO} "pwcheck_method: sasldb" > ${WRKDIR}/smtpd.conf
+.if !empty(PKG_OPTIONS:Msasl)
+	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
-.endif
-	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-files ${SHAREDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/main.cf ${SHAREDIR}
-	${INSTALL_DATA} ${WRKSRC}/conf/master.cf ${SHAREDIR}
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${SHAREDIR}/mailer.conf
 
 do-install:
-	(cd ${WRKSRC} && ${SETENV} config_directory="${SHAREDIR}" ${SH} postfix-install -non-interactive)
+	${RM} -f ${WRKSRC}/conf/*.orig
+.if !empty(PKG_OPTIONS:Msasl)
+	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
+.endif
+	cd ${WRKSRC} && ${SH} ./postfix-install -non-interactive \
+		${DESTDIR_INSTALLOPTIONS} config_directory="${EXAMPLEDIR}"
+	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
+		${DESTDIR}${EXAMPLEDIR}/mailer.conf
+	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
+		${DESTDIR}${PREFIX}/sbin/qshape
+	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.for dir in ${POSTFIX_QUEUE_SUBDIR}
+	${RMDIR} ${DESTDIR}${POSTFIX_QUEUE_DIR}/${dir}
+.endfor
+.if ${OPSYS} == "Darwin"
+	for f in ${DESTDIR}${PREFIX}/lib/postfix/lib*.dylib; do \
+		install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
+	done
+	for f in ${DESTDIR}${PREFIX}/libexec/postfix/* ${DESTDIR}${PREFIX}/sbin/*; do \
+		install_name_tool \
+			-change @rpath/libpostfix-dns.dylib ${PREFIX}/lib/postfix/libpostfix-dns.dylib \
+			-change @rpath/libpostfix-global.dylib ${PREFIX}/lib/postfix/libpostfix-global.dylib \
+			-change @rpath/libpostfix-master.dylib ${PREFIX}/lib/postfix/libpostfix-master.dylib \
+			-change @rpath/libpostfix-tls.dylib ${PREFIX}/lib/postfix/libpostfix-tls.dylib \
+			-change @rpath/libpostfix-util.dylib ${PREFIX}/lib/postfix/libpostfix-util.dylib \
+			$$f; \
+	done
+.endif
 
 .include "../../mk/bsd.pkg.mk"