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

--- pkgsrc/mail/postfix/Makefile	2005/11/21 23:24:30	1.167.2.1
+++ pkgsrc/mail/postfix/Makefile	2011/09/03 15:18:20	1.242
@@ -1,36 +1,49 @@
-# $NetBSD: Makefile,v 1.167.2.1 2005/11/21 23:24:30 salo Exp $
+# $NetBSD: Makefile,v 1.242 2011/09/03 15:18:20 taca Exp $
 
-DISTNAME=	postfix-2.2.5
-PKGREVISION=	1
+DISTNAME=	postfix-2.8.5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
+MASTER_SITES+=	http://postfix.it-austria.net/releases/official/
+MASTER_SITES+=	http://mirrors.isc.org/pub/postfix/official/
+MASTER_SITES+=	http://mirror.postfix.jp/postfix-release/official/
 
-MAINTAINER=	martti@NetBSD.org
+MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
+# The postfix license has only very minor diffs from cpl-1.0.
+LICENSE=	cpl-1.0
+#LICENSE=	postfix-license
 
-DIST_SUBDIR=	postfix
-
-CONFLICTS+=	sendmail-[0-9]* fastforward>=0.51nb2
+CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
+CONFLICTS+=	esmtp>=1.2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_TOOLS+=	perl
+CHECK_HEADERS_SKIP+=	src/global/mail_params.h
+
 .include "../../mk/bsd.prefs.mk"
 
+SPECIAL_PERMS+=	sbin/postdrop postfix maildrop 2555
+SPECIAL_PERMS+=	sbin/postqueue postfix maildrop 2555
+
 # POSTFIX_QUEUE_DIR is the default queue directory for Postfix.  This is
 # merely a default, and may be changed by setting "queue_directory" in
 # ${PKG_SYSCONFDIR}/main.cf.
 #
+POSTFIX_DATA_DIR?=	${VARBASE}/db/postfix
 POSTFIX_QUEUE_DIR?=	${VARBASE}/spool/postfix
+BUILD_DEFS+=		VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
 
 # CCARGS is a list of options to pass to the preprocessor/compiler.
 # AUXLIBS is a list of options to pass to the linker.
 #
-CCARGS=		# empty
+CCARGS=		-DUSE_SASL_AUTH
 AUXLIBS=	${LDFLAGS}
-FIX_RPATH+=	AUXLIBS
 
 # Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
+CCARGS+=	-DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\"
 CCARGS+=	-DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
 CCARGS+=	-DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
 CCARGS+=	-DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
@@ -38,26 +51,40 @@ CCARGS+=	-DDEF_CONFIG_DIR=\"${PKG_SYSCON
 CCARGS+=	-DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
 CCARGS+=	-DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
 CCARGS+=	-DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
-CCARGS+=	-DDEF_MANPAGE_DIR=\"${PREFIX}/man\"
+CCARGS+=	-DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\"
 CCARGS+=	-DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
 CCARGS+=	-DDEF_README_DIR=\"${DOCDIR}\"
 
+REPLACE_PERL+=	auxiliary/qshape/qshape.pl
+
 # Override those same default paths in the installed example main.cf.
 SUBST_CLASSES+=		postfix
 SUBST_STAGE.postfix=	post-configure
 SUBST_FILES.postfix=	conf/main.cf src/global/mail_params.h
 SUBST_SED.postfix=	\
-	-e "s|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|"	\
-	-e "s|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|"		\
-	-e "s|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|"		\
-	-e "s|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|"	\
-	-e "s|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|"	\
-	-e "s|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|"		\
-	-e "s|^\(setgid_group\) =.*|\1 = maildrop|"			\
-	-e "s|^\(manpage_directory\) =.*|\1 = ${PREFIX}/man|"		\
-	-e "s|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|"		\
-	-e "s|^\(readme_directory\) =.*|\1 = ${DOCDIR}|"		\
-	-e "/^\#define DEF_SGID_GROUP[ 	]/s,postdrop,maildrop,g"
+	-e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(setgid_group\) =.*|\1 = maildrop|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
+SUBST_SED.postfix+=	\
+	-e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
+SUBST_SED.postfix+=	\
+	-e '/^\#define DEF_SGID_GROUP[ 	]/s,postdrop,maildrop,g'
 
 # options.mk appends to CCARGS and AUXLIBS the options needed to build
 # Postfix with support for various add-on modules.
@@ -80,58 +107,64 @@ MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS
 PLIST_SRC+=		${PKGDIR}/PLIST
 
 BUILD_TARGET=		# empty
-MAKE_ENV=		CC="${CC}" OPT="${CFLAGS}"
-MAKE_ENV+=		AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
+MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:Q}
+MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 
-USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		postfix
-OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
+OWN_DIRS+=		${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
+OWN_DIRS_PERMS+=	${POSTFIX_DATA_DIR} postfix postfix 0700
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix::Postfix\ User:${POSTFIX_QUEUE_DIR}
+PKG_USERS?=		postfix:postfix
+PKG_GECOS.postfix=	Postfix User
+PKG_HOME.postfix=	${POSTFIX_QUEUE_DIR}
 
 CONF_FILES=		# empty
-.for _file_ in main.cf master.cf postfix-files
-CONF_FILES+=		${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_}
+.for i in main.cf master.cf
+CONF_FILES+=		${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
 .endfor
 CONF_FILES_PERMS=	# empty
-.for _file_ in post-install postfix-script
-CONF_FILES_PERMS+=	${EXAMPLEDIR}/${_file_} ${PKG_SYSCONFDIR}/${_file_} \
-			${ROOT_USER} ${ROOT_GROUP} 755
-.endfor
-.undef _file_
-.if !empty(PKG_OPTIONS:Msasl)
-MAKE_DIRS+=		${SASLLIBDIR}
-CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
-.endif
 
 MAKE_ENV+=		DEBUG= # empty
 
+SUBST_CLASSES+=		paths
+SUBST_FILES.paths=	${WRKDIR}/mailer.conf
+SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.paths=	post-patch
+
+.if !empty(USE_DESTDIR:M[Yy][Ee][Ss])
+DESTDIR_INSTALLOPTIONS=-package install_root="${DESTDIR}"
+.endif
+
+INSTALLATION_DIRS+=	${LIBEXECDIR} ${EXAMPLEDIR} ${DOCDIR}
+
+post-extract:
+	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
+	rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
+
 do-configure:
 	cd ${WRKSRC} &&							\
-	${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles	\
+	env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles		\
 		'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
 
 post-build:
-	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf		\
-		> ${WRKDIR}/mailer.conf
 .if !empty(PKG_OPTIONS:Msasl)
 	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
 
 do-install:
-	${INSTALL_DATA_DIR} ${LIBEXECDIR}
-	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
-	${INSTALL_DATA_DIR} ${DOCDIR}
-	-${RM} -f ${WRKSRC}/conf/*.orig
+	rm -f ${WRKSRC}/conf/*.orig
 .if !empty(PKG_OPTIONS:Msasl)
-	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
+	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${DESTDIR}${EXAMPLEDIR}
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
-	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
-	cd ${WRKSRC}; ${SH} ./postfix-install -non-interactive		\
-		config_directory="${EXAMPLEDIR}"
+	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
 
 .include "../../mk/bsd.pkg.mk"