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

--- pkgsrc/mail/postfix/Makefile	2004/08/07 16:56:53	1.149
+++ pkgsrc/mail/postfix/Makefile	2005/11/21 23:24:30	1.167.2.1
@@ -1,23 +1,19 @@
-# $NetBSD: Makefile,v 1.149 2004/08/07 16:56:53 jlam Exp $
+# $NetBSD: Makefile,v 1.167.2.1 2005/11/21 23:24:30 salo Exp $
 
-DISTNAME=	postfix-2.1.4
+DISTNAME=	postfix-2.2.5
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
-DIST_SUBDIR=	postfix
-
-CLASS_PATCH=		postfix-2.1.1-canonical_classes-with_docs.diff
-PATCHFILES+=		${CLASS_PATCH}
-SITES_${CLASS_PATCH}=	ftp://ftp.gw.com/pub/people/kim/patches/
-PATCH_DIST_STRIP.${CLASS_PATCH}=	-p1
 
 MAINTAINER=	martti@NetBSD.org
 HOMEPAGE=	http://www.postfix.org/
 COMMENT=	Postfix SMTP server and tools
 
+DIST_SUBDIR=	postfix
+
 CONFLICTS+=	sendmail-[0-9]* fastforward>=0.51nb2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
-USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,7 +27,7 @@ POSTFIX_QUEUE_DIR?=	${VARBASE}/spool/pos
 # AUXLIBS is a list of options to pass to the linker.
 #
 CCARGS=		# empty
-AUXLIBS=	# empty
+AUXLIBS=	${LDFLAGS}
 FIX_RPATH+=	AUXLIBS
 
 # Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
@@ -83,7 +79,7 @@ MESSAGE_SRC+=		${PKGDIR}/MESSAGE.${OPSYS
 .endif
 PLIST_SRC+=		${PKGDIR}/PLIST
 
-ALL_TARGET=		# empty
+BUILD_TARGET=		# empty
 MAKE_ENV=		CC="${CC}" OPT="${CFLAGS}"
 MAKE_ENV+=		AUXLIBS="${AUXLIBS}" CCARGS="${CCARGS}"
 
@@ -93,7 +89,7 @@ OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 
 PKG_GROUPS?=		postfix maildrop
-PKG_USERS?=		postfix:postfix::Postfix\\ User:${POSTFIX_QUEUE_DIR}
+PKG_USERS?=		postfix:postfix::Postfix\ User:${POSTFIX_QUEUE_DIR}
 
 CONF_FILES=		# empty
 .for _file_ in main.cf master.cf postfix-files
@@ -110,6 +106,8 @@ MAKE_DIRS+=		${SASLLIBDIR}
 CONF_FILES+=		${EXAMPLEDIR}/smtpd.conf ${SASLLIBDIR}/smtpd.conf
 .endif
 
+MAKE_ENV+=		DEBUG= # empty
+
 do-configure:
 	cd ${WRKSRC} &&							\
 	${SETENV} ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles	\
@@ -122,10 +120,6 @@ post-build:
 	${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
 .endif
 
-POSTFIX_EXAMPLE_FILES=	LICENSE access aliases canonical header_checks	\
-			main.cf main.cf.default makedefs.out master.cf	\
-			postfix-files relocated transport virtual
-
 do-install:
 	${INSTALL_DATA_DIR} ${LIBEXECDIR}
 	${INSTALL_DATA_DIR} ${EXAMPLEDIR}
@@ -134,9 +128,6 @@ do-install:
 .if !empty(PKG_OPTIONS:Msasl)
 	${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
 .endif
-	@for i in ${POSTFIX_EXAMPLE_FILES}; do				\
-		${INSTALL_DATA} ${WRKSRC}/conf/$$i ${EXAMPLEDIR}/$$i;	\
-	done
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf