Add optional support for Perl Compatible Regular Expressions (POSTFIX_PCRE)

and Variable Envelope Return Paths (POSTFIX_VERP).  Handle MANINSTALL using
separate PLIST.{catinstall,maninstall} files.  Record the setting of all 3.

28 files changed, 203 insertions, 175 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 481794dd305..b1dd19c786f 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,18 +1,43 @@
-# $NetBSD: Makefile,v 1.18 2000/04/10 00:19:15 bad Exp $
+# $NetBSD: Makefile,v 1.19 2000/04/27 01:05:06 kim Exp $
 
 DISTNAME=	postfix-19991231-pl06
 PKGNAME=	postfix-19991231pl06
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
+.include "../../mk/bsd.prefs.mk"
+
+.if defined(POSTFIX_VERP) && ${POSTFIX_VERP} == YES
+PATCHFILES=		postfix-19991231-pl06-verp.patch.gz
+PATCH_SITES=		ftp://ftp.gw.com/pub/people/kim/patches/
+PATCH_DIST_STRIP=	-p1
+.endif
+
 MAINTAINER=	christos@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
 
 MIRROR_DISTFILE= no
 MANCOMPRESSED_IF_MANZ=	yes
+DIST_SUBDIR=	postfix
 
 POSTFIX_SPOOL=	/var/spool/postfix
 
+.if defined(POSTFIX_PCRE) && ${POSTFIX_PCRE} == YES
+DEPENDS+=	pcre-2.08:../../devel/pcre
+CFLAGS+=	-DHAS_PCRE -I${LOCALBASE}/include
+AUXLIBS=	-lpcre
+MAKE_ENV+=	AUXLIBS="${AUXLIBS}"
+.endif
+
+MANINSTALL?=	maninstall catinstall
+
+BUILD_DEFS+=	POSTFIX_PCRE POSTFIX_VERP MANINSTALL
+
+PLIST_SRC=	${PKGDIR}/PLIST
+.for i in ${MANINSTALL}
+PLIST_SRC+=	${PKGDIR}/PLIST.$i
+.endfor
+
 pre-patch:
 	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 
diff --git a/mail/postfix/files/md5 b/mail/postfix/files/md5
index ffef97a9ede..27dd2c4395c 100644
--- a/mail/postfix/files/md5
+++ b/mail/postfix/files/md5
@@ -1,3 +1,4 @@
-$NetBSD: md5,v 1.5 2000/04/09 08:10:20 simonb Exp $
+$NetBSD: md5,v 1.6 2000/04/27 01:05:07 kim Exp $
 
-MD5 (postfix-19991231-pl06.tar.gz) = 7630d7466569c08f1fdf7c437cef0a14
+MD5 (postfix/postfix-19991231-pl06.tar.gz) = 7630d7466569c08f1fdf7c437cef0a14
+MD5 (postfix/postfix-19991231-pl06-verp.patch.gz) = 50a274d4b7e33a6e573f7678e4b5955b
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
index eb41debcccf..3b1359bb89a 100644
--- a/mail/postfix/patches/patch-ac
+++ b/mail/postfix/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.1 1999/05/30 18:18:31 tron Exp $
+$NetBSD: patch-ac,v 1.2 2000/04/27 01:05:07 kim Exp $
 
---- bounce/Makefile.orig	Sun May 30 18:49:12 1999
-+++ bounce/Makefile	Sun May 30 18:49:12 1999
+--- bounce/Makefile.orig	Wed Apr 26 20:25:53 2000
++++ bounce/Makefile	Wed Apr 26 20:38:14 2000
 @@ -0,0 +1,15 @@
-+#	$NetBSD: patch-ac,v 1.1 1999/05/30 18:18:31 tron Exp $
++#	$NetBSD: patch-ac,v 1.2 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	bounce
 +BINDIR=${daemon_directory}
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1 1999/05/30 18:18:31 tron Exp $
 +	bounce_cleanup.c
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-ad b/mail/postfix/patches/patch-ad
index 9d000a85802..40ef0717630 100644
--- a/mail/postfix/patches/patch-ad
+++ b/mail/postfix/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.1 1999/05/30 18:18:31 tron Exp $
+$NetBSD: patch-ad,v 1.2 2000/04/27 01:05:07 kim Exp $
 
---- cleanup/Makefile.orig	Sun May 30 18:49:12 1999
-+++ cleanup/Makefile	Sun May 30 18:49:12 1999
+--- cleanup/Makefile.orig	Wed Apr 26 20:25:53 2000
++++ cleanup/Makefile	Wed Apr 26 20:38:21 2000
 @@ -0,0 +1,18 @@
-+#	$NetBSD: patch-ad,v 1.1 1999/05/30 18:18:31 tron Exp $
++#	$NetBSD: patch-ad,v 1.2 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +
 +PROG=	cleanup
@@ -15,7 +15,7 @@ $NetBSD: patch-ad,v 1.1 1999/05/30 18:18:31 tron Exp $
 +	cleanup_out_recipient.c
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-aj b/mail/postfix/patches/patch-aj
index df3d2631c58..d71649b6287 100644
--- a/mail/postfix/patches/patch-aj
+++ b/mail/postfix/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.3 1999/09/12 00:14:53 simonb Exp $
+$NetBSD: patch-aj,v 1.4 2000/04/27 01:05:07 kim Exp $
 
---- local/Makefile.orig	Sun May 30 18:49:13 1999
-+++ local/Makefile	Sun May 30 18:49:13 1999
+--- local/Makefile.orig	Wed Apr 26 20:25:54 2000
++++ local/Makefile	Wed Apr 26 20:38:30 2000
 @@ -0,0 +1,18 @@
-+#	$NetBSD: patch-aj,v 1.3 1999/09/12 00:14:53 simonb Exp $
++#	$NetBSD: patch-aj,v 1.4 2000/04/27 01:05:07 kim Exp $
 +
 +.include "../conf/main.cf"
 +PROG=	local
@@ -15,7 +15,7 @@ $NetBSD: patch-aj,v 1.3 1999/09/12 00:14:53 simonb Exp $
 +	local_expand.c
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-ao b/mail/postfix/patches/patch-ao
index 82ec0a3c9d0..b032f24b102 100644
--- a/mail/postfix/patches/patch-ao
+++ b/mail/postfix/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.2 1999/06/27 00:11:03 christos Exp $
+$NetBSD: patch-ao,v 1.3 2000/04/27 01:05:07 kim Exp $
 
---- master/Makefile.orig	Sun May 30 18:49:13 1999
-+++ master/Makefile	Sun May 30 18:49:13 1999
+--- master/Makefile.orig	Wed Apr 26 20:25:54 2000
++++ master/Makefile	Wed Apr 26 20:38:35 2000
 @@ -0,0 +1,17 @@
-+#	$NetBSD: patch-ao,v 1.2 1999/06/27 00:11:03 christos Exp $
++#	$NetBSD: patch-ao,v 1.3 2000/04/27 01:05:07 kim Exp $
 +
 +.include "../conf/main.cf"
 +PROG=	master
@@ -14,7 +14,7 @@ $NetBSD: patch-ao,v 1.2 1999/06/27 00:11:03 christos Exp $
 +	trigger_server.c master_proto.c
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-aq b/mail/postfix/patches/patch-aq
index 762586c1fa6..29b86442930 100644
--- a/mail/postfix/patches/patch-aq
+++ b/mail/postfix/patches/patch-aq
@@ -1,15 +1,15 @@
-$NetBSD: patch-aq,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-aq,v 1.2 2000/04/27 01:05:07 kim Exp $
 
---- pickup/Makefile.orig	Sun May 30 18:49:13 1999
-+++ pickup/Makefile	Sun May 30 18:49:13 1999
+--- pickup/Makefile.orig	Wed Apr 26 20:25:54 2000
++++ pickup/Makefile	Wed Apr 26 20:38:39 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-aq,v 1.1 1999/05/30 18:18:32 tron Exp $
++#	$NetBSD: patch-aq,v 1.2 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	pickup
 +BINDIR=${daemon_directory}
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-ar b/mail/postfix/patches/patch-ar
index ecf4f57091e..c74b2df6485 100644
--- a/mail/postfix/patches/patch-ar
+++ b/mail/postfix/patches/patch-ar
@@ -1,15 +1,15 @@
-$NetBSD: patch-ar,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-ar,v 1.2 2000/04/27 01:05:07 kim Exp $
 
---- pipe/Makefile.orig	Sun May 30 18:49:13 1999
-+++ pipe/Makefile	Sun May 30 18:49:13 1999
+--- pipe/Makefile.orig	Wed Apr 26 20:25:54 2000
++++ pipe/Makefile	Wed Apr 26 20:38:43 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-ar,v 1.1 1999/05/30 18:18:32 tron Exp $
++#	$NetBSD: patch-ar,v 1.2 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	pipe
 +BINDIR=${daemon_directory}
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-as b/mail/postfix/patches/patch-as
index aa2ee4d3698..3eaf4b4ac4c 100644
--- a/mail/postfix/patches/patch-as
+++ b/mail/postfix/patches/patch-as
@@ -1,15 +1,15 @@
-$NetBSD: patch-as,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-as,v 1.2 2000/04/27 01:05:07 kim Exp $
 
---- postalias/Makefile.orig	Sun May 30 18:49:13 1999
-+++ postalias/Makefile	Sun May 30 18:49:13 1999
+--- postalias/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postalias/Makefile	Wed Apr 26 20:38:49 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-as,v 1.1 1999/05/30 18:18:32 tron Exp $
++#	$NetBSD: patch-as,v 1.2 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postalias
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-at b/mail/postfix/patches/patch-at
index b29485d9273..bc0c35821d9 100644
--- a/mail/postfix/patches/patch-at
+++ b/mail/postfix/patches/patch-at
@@ -1,15 +1,15 @@
-$NetBSD: patch-at,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-at,v 1.2 2000/04/27 01:05:07 kim Exp $
 
---- postcat/Makefile.orig	Sun May 30 18:49:13 1999
-+++ postcat/Makefile	Sun May 30 18:49:13 1999
+--- postcat/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postcat/Makefile	Wed Apr 26 20:38:55 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-at,v 1.1 1999/05/30 18:18:32 tron Exp $
++#	$NetBSD: patch-at,v 1.2 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postcat
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-au b/mail/postfix/patches/patch-au
index e378d7398d8..39a5af66f4f 100644
--- a/mail/postfix/patches/patch-au
+++ b/mail/postfix/patches/patch-au
@@ -1,9 +1,9 @@
-$NetBSD: patch-au,v 1.2 1999/09/12 00:14:53 simonb Exp $
+$NetBSD: patch-au,v 1.3 2000/04/27 01:05:07 kim Exp $
 
---- postconf/Makefile.orig	Sun May 30 18:49:13 1999
-+++ postconf/Makefile	Sun May 30 18:49:13 1999
+--- postconf/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postconf/Makefile	Wed Apr 26 20:39:03 2000
 @@ -0,0 +1,28 @@
-+#	$NetBSD: patch-au,v 1.2 1999/09/12 00:14:53 simonb Exp $
++#	$NetBSD: patch-au,v 1.3 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postconf
 +BINDIR=${command_directory}
@@ -18,7 +18,7 @@ $NetBSD: patch-au,v 1.2 1999/09/12 00:14:53 simonb Exp $
 +CPPFLAGS+= -I${.OBJDIR}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-av b/mail/postfix/patches/patch-av
index b68473923e6..6ebd9634e90 100644
--- a/mail/postfix/patches/patch-av
+++ b/mail/postfix/patches/patch-av
@@ -1,16 +1,16 @@
-$NetBSD: patch-av,v 1.3 2000/04/10 00:19:17 bad Exp $
+$NetBSD: patch-av,v 1.4 2000/04/27 01:05:07 kim Exp $
 
---- postdrop/Makefile.orig	Sun May 30 18:49:13 1999
-+++ postdrop/Makefile	Sun May 30 18:49:13 1999
+--- postdrop/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postdrop/Makefile	Wed Apr 26 20:39:09 2000
 @@ -0,0 +1,20 @@
-+#	$NetBSD: patch-av,v 1.3 2000/04/10 00:19:17 bad Exp $
++#	$NetBSD: patch-av,v 1.4 2000/04/27 01:05:07 kim Exp $
 +.include "../conf/main.cf"
 +
 +PROG=	postdrop
 +BINDIR=	${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-aw b/mail/postfix/patches/patch-aw
index 4ee75afa28c..9ba96d1ef96 100644
--- a/mail/postfix/patches/patch-aw
+++ b/mail/postfix/patches/patch-aw
@@ -1,15 +1,15 @@
-$NetBSD: patch-aw,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-aw,v 1.2 2000/04/27 01:05:08 kim Exp $
 
---- postfix/Makefile.orig	Sun May 30 18:49:13 1999
-+++ postfix/Makefile	Sun May 30 18:49:13 1999
+--- postfix/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postfix/Makefile	Wed Apr 26 20:39:14 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-aw,v 1.1 1999/05/30 18:18:32 tron Exp $
++#	$NetBSD: patch-aw,v 1.2 2000/04/27 01:05:08 kim Exp $
 +.include "../conf/main.cf"
 +PROG=postfix
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-ay b/mail/postfix/patches/patch-ay
index 982a1fd4db6..c1d880033f0 100644
--- a/mail/postfix/patches/patch-ay
+++ b/mail/postfix/patches/patch-ay
@@ -1,15 +1,15 @@
-$NetBSD: patch-ay,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-ay,v 1.2 2000/04/27 01:05:08 kim Exp $
 
---- postkick/Makefile.orig	Sun May 30 18:49:14 1999
-+++ postkick/Makefile	Sun May 30 18:49:14 1999
+--- postkick/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postkick/Makefile	Wed Apr 26 20:39:21 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-ay,v 1.1 1999/05/30 18:18:32 tron Exp $
++#	$NetBSD: patch-ay,v 1.2 2000/04/27 01:05:08 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postkick
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-az b/mail/postfix/patches/patch-az
index 625f1b804a7..bd3a54224f6 100644
--- a/mail/postfix/patches/patch-az
+++ b/mail/postfix/patches/patch-az
@@ -1,15 +1,15 @@
-$NetBSD: patch-az,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-az,v 1.2 2000/04/27 01:05:08 kim Exp $
 
---- postlock/Makefile.orig	Sun May 30 18:49:14 1999
-+++ postlock/Makefile	Sun May 30 18:49:14 1999
+--- postlock/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postlock/Makefile	Wed Apr 26 20:39:25 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-az,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-az,v 1.2 2000/04/27 01:05:08 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postlock
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-ba b/mail/postfix/patches/patch-ba
index 93cca3f3346..b377c79965e 100644
--- a/mail/postfix/patches/patch-ba
+++ b/mail/postfix/patches/patch-ba
@@ -1,15 +1,15 @@
-$NetBSD: patch-ba,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-ba,v 1.2 2000/04/27 01:05:08 kim Exp $
 
---- postlog/Makefile.orig	Sun May 30 18:49:14 1999
-+++ postlog/Makefile	Sun May 30 18:49:14 1999
+--- postlog/Makefile.orig	Wed Apr 26 20:25:55 2000
++++ postlog/Makefile	Wed Apr 26 20:39:30 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-ba,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-ba,v 1.2 2000/04/27 01:05:08 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postlog
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-bb b/mail/postfix/patches/patch-bb
index f11417dcde2..ad88c0c117f 100644
--- a/mail/postfix/patches/patch-bb
+++ b/mail/postfix/patches/patch-bb
@@ -1,15 +1,15 @@
-$NetBSD: patch-bb,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bb,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- postmap/Makefile.orig	Sun May 30 18:49:14 1999
-+++ postmap/Makefile	Sun May 30 18:49:14 1999
+--- postmap/Makefile.orig	Wed Apr 26 20:25:56 2000
++++ postmap/Makefile	Wed Apr 26 20:39:34 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-bb,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-bb,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postmap
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-bc b/mail/postfix/patches/patch-bc
index e9d149d4dc7..124b3c8cdfe 100644
--- a/mail/postfix/patches/patch-bc
+++ b/mail/postfix/patches/patch-bc
@@ -1,15 +1,15 @@
-$NetBSD: patch-bc,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bc,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- postsuper/Makefile.orig	Sun May 30 18:49:14 1999
-+++ postsuper/Makefile	Sun May 30 18:49:14 1999
+--- postsuper/Makefile.orig	Wed Apr 26 20:25:56 2000
++++ postsuper/Makefile	Wed Apr 26 20:39:40 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-bc,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-bc,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	postsuper
 +BINDIR=${command_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-bd b/mail/postfix/patches/patch-bd
index 3b2b086a5a7..bb7faf4de31 100644
--- a/mail/postfix/patches/patch-bd
+++ b/mail/postfix/patches/patch-bd
@@ -1,9 +1,9 @@
-$NetBSD: patch-bd,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bd,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- qmgr/Makefile.orig	Sun May 30 18:49:14 1999
-+++ qmgr/Makefile	Sun May 30 18:49:14 1999
+--- qmgr/Makefile.orig	Wed Apr 26 20:25:56 2000
++++ qmgr/Makefile	Wed Apr 26 20:39:45 2000
 @@ -0,0 +1,16 @@
-+#	$NetBSD: patch-bd,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-bd,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	qmgr
 +BINDIR=${daemon_directory}
@@ -13,7 +13,7 @@ $NetBSD: patch-bd,v 1.1 1999/05/30 18:18:33 tron Exp $
 +	qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-be b/mail/postfix/patches/patch-be
index 40b412181db..fac42983db8 100644
--- a/mail/postfix/patches/patch-be
+++ b/mail/postfix/patches/patch-be
@@ -1,15 +1,15 @@
-$NetBSD: patch-be,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-be,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- sendmail/Makefile.orig	Sun May 30 18:49:14 1999
-+++ sendmail/Makefile	Sun May 30 18:49:14 1999
+--- sendmail/Makefile.orig	Wed Apr 26 20:25:56 2000
++++ sendmail/Makefile	Wed Apr 26 20:39:50 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-be,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-be,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	sendmail
 +BINDIR=${daemon_directory}
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-bf b/mail/postfix/patches/patch-bf
index b434d744466..907b3bfa750 100644
--- a/mail/postfix/patches/patch-bf
+++ b/mail/postfix/patches/patch-bf
@@ -1,15 +1,15 @@
-$NetBSD: patch-bf,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bf,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- showq/Makefile.orig	Sun May 30 18:49:14 1999
-+++ showq/Makefile	Sun May 30 18:49:14 1999
+--- showq/Makefile.orig	Wed Apr 26 20:25:56 2000
++++ showq/Makefile	Wed Apr 26 20:39:56 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-bf,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-bf,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	showq
 +BINDIR=${daemon_directory}
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-bg b/mail/postfix/patches/patch-bg
index 0426f5edd58..52561d7618c 100644
--- a/mail/postfix/patches/patch-bg
+++ b/mail/postfix/patches/patch-bg
@@ -1,9 +1,9 @@
-$NetBSD: patch-bg,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bg,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- smtp/Makefile.orig	Sun May 30 18:49:14 1999
-+++ smtp/Makefile	Sun May 30 18:49:14 1999
+--- smtp/Makefile.orig	Wed Apr 26 20:25:56 2000
++++ smtp/Makefile	Wed Apr 26 20:40:05 2000
 @@ -0,0 +1,17 @@
-+#	$NetBSD: patch-bg,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-bg,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	smtp
 +BINDIR=${daemon_directory}
@@ -14,7 +14,7 @@ $NetBSD: patch-bg,v 1.1 1999/05/30 18:18:33 tron Exp $
 +LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libdns.a ../lib/libutil.a
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-bh b/mail/postfix/patches/patch-bh
index 43d32b1c72b..0b66135720b 100644
--- a/mail/postfix/patches/patch-bh
+++ b/mail/postfix/patches/patch-bh
@@ -1,9 +1,9 @@
-$NetBSD: patch-bh,v 1.2 2000/04/09 08:10:20 simonb Exp $
+$NetBSD: patch-bh,v 1.3 2000/04/27 01:05:09 kim Exp $
 
---- smtpd/Makefile.orig	Sun May 30 18:49:14 1999
-+++ smtpd/Makefile	Sun May 30 18:49:14 1999
+--- smtpd/Makefile.orig	Wed Apr 26 20:25:56 2000
++++ smtpd/Makefile	Wed Apr 26 20:40:18 2000
 @@ -0,0 +1,17 @@
-+#	$NetBSD: patch-bh,v 1.2 2000/04/09 08:10:20 simonb Exp $
++#	$NetBSD: patch-bh,v 1.3 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +
 +PROG=	smtpd
@@ -14,7 +14,7 @@ $NetBSD: patch-bh,v 1.2 2000/04/09 08:10:20 simonb Exp $
 +
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-bi b/mail/postfix/patches/patch-bi
index f023f339475..5a35fff509b 100644
--- a/mail/postfix/patches/patch-bi
+++ b/mail/postfix/patches/patch-bi
@@ -1,9 +1,9 @@
-$NetBSD: patch-bi,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bi,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- trivial-rewrite/Makefile.orig	Sun May 30 18:49:14 1999
-+++ trivial-rewrite/Makefile	Sun May 30 18:49:14 1999
+--- trivial-rewrite/Makefile.orig	Wed Apr 26 20:25:57 2000
++++ trivial-rewrite/Makefile	Wed Apr 26 20:40:26 2000
 @@ -0,0 +1,16 @@
-+#	$NetBSD: patch-bi,v 1.1 1999/05/30 18:18:33 tron Exp $
++#	$NetBSD: patch-bi,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	trivial-rewrite
 +BINDIR=${daemon_directory}
@@ -11,7 +11,7 @@ $NetBSD: patch-bi,v 1.1 1999/05/30 18:18:33 tron Exp $
 +SRCS	= trivial-rewrite.c rewrite.c resolve.c transport.c
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/patches/patch-br b/mail/postfix/patches/patch-br
index ba6a5ce1032..abc0e87546d 100644
--- a/mail/postfix/patches/patch-br
+++ b/mail/postfix/patches/patch-br
@@ -1,15 +1,15 @@
-$NetBSD: patch-br,v 1.1 1999/09/14 01:54:22 simonb Exp $
+$NetBSD: patch-br,v 1.2 2000/04/27 01:05:09 kim Exp $
 
---- error/Makefile.orig	Tue Sep 14 11:37:39 1999
-+++ error/Makefile	Tue Sep 14 11:36:25 1999
+--- error/Makefile.orig	Wed Apr 26 20:25:57 2000
++++ error/Makefile	Wed Apr 26 20:38:25 2000
 @@ -0,0 +1,12 @@
-+#	$NetBSD: patch-br,v 1.1 1999/09/14 01:54:22 simonb Exp $
++#	$NetBSD: patch-br,v 1.2 2000/04/27 01:05:09 kim Exp $
 +.include "../conf/main.cf"
 +PROG=	error
 +BINDIR=${daemon_directory}
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
-+LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
 +
 +# XXX
 +NOMAN=1
diff --git a/mail/postfix/pkg/PLIST b/mail/postfix/pkg/PLIST
index f6d4d2e347b..7b25088ec9d 100644
--- a/mail/postfix/pkg/PLIST
+++ b/mail/postfix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2000/04/10 00:19:18 bad Exp $
+@comment $NetBSD: PLIST,v 1.9 2000/04/27 01:05:09 kim Exp $
 etc/mailer.conf.postfix
 libexec/postfix/bounce
 libexec/postfix/cleanup
@@ -13,62 +13,6 @@ libexec/postfix/showq
 libexec/postfix/smtp
 libexec/postfix/smtpd
 libexec/postfix/trivial-rewrite
-man/cat1/postalias.0
-man/cat1/postcat.0
-man/cat1/postconf.0
-man/cat1/postdrop.0
-man/cat1/postfix.0
-man/cat1/postkick.0
-man/cat1/postlock.0
-man/cat1/postlog.0
-man/cat1/postmap.0
-man/cat1/postsuper.0
-man/cat5/access.0
-man/cat5/canonical.0
-man/cat5/relocated.0
-man/cat5/transport.0
-man/cat5/virtual.0
-man/cat8/bounce.0
-man/cat8/cleanup.0
-man/cat8/defer.0
-man/cat8/error.0
-man/cat8/local.0
-man/cat8/master.0
-man/cat8/pickup.0
-man/cat8/pipe.0
-man/cat8/qmgr.0
-man/cat8/showq.0
-man/cat8/smtp.0
-man/cat8/smtpd.0
-man/cat8/trivial-rewrite.0
-man/man1/postalias.1
-man/man1/postcat.1
-man/man1/postconf.1
-man/man1/postdrop.1
-man/man1/postfix.1
-man/man1/postkick.1
-man/man1/postlock.1
-man/man1/postlog.1
-man/man1/postmap.1
-man/man1/postsuper.1
-man/man5/access.5
-man/man5/canonical.5
-man/man5/relocated.5
-man/man5/transport.5
-man/man5/virtual.5
-man/man8/bounce.8
-man/man8/cleanup.8
-man/man8/defer.8
-man/man8/error.8
-man/man8/local.8
-man/man8/master.8
-man/man8/pickup.8
-man/man8/pipe.8
-man/man8/qmgr.8
-man/man8/showq.8
-man/man8/smtp.8
-man/man8/smtpd.8
-man/man8/trivial-rewrite.8
 sbin/postalias
 sbin/postcat
 sbin/postconf
diff --git a/mail/postfix/pkg/PLIST.catinstall b/mail/postfix/pkg/PLIST.catinstall
new file mode 100644
index 00000000000..aa3924ddeda
--- /dev/null
+++ b/mail/postfix/pkg/PLIST.catinstall
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST.catinstall,v 1.1 2000/04/27 01:05:09 kim Exp $
+man/cat1/postalias.0
+man/cat1/postcat.0
+man/cat1/postconf.0
+man/cat1/postdrop.0
+man/cat1/postfix.0
+man/cat1/postkick.0
+man/cat1/postlock.0
+man/cat1/postlog.0
+man/cat1/postmap.0
+man/cat1/postsuper.0
+man/cat5/access.0
+man/cat5/canonical.0
+man/cat5/relocated.0
+man/cat5/transport.0
+man/cat5/virtual.0
+man/cat8/bounce.0
+man/cat8/cleanup.0
+man/cat8/defer.0
+man/cat8/error.0
+man/cat8/local.0
+man/cat8/master.0
+man/cat8/pickup.0
+man/cat8/pipe.0
+man/cat8/qmgr.0
+man/cat8/showq.0
+man/cat8/smtp.0
+man/cat8/smtpd.0
+man/cat8/trivial-rewrite.0
diff --git a/mail/postfix/pkg/PLIST.maninstall b/mail/postfix/pkg/PLIST.maninstall
new file mode 100644
index 00000000000..e3179944459
--- /dev/null
+++ b/mail/postfix/pkg/PLIST.maninstall
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST.maninstall,v 1.1 2000/04/27 01:05:09 kim Exp $
+man/man1/postalias.1
+man/man1/postcat.1
+man/man1/postconf.1
+man/man1/postdrop.1
+man/man1/postfix.1
+man/man1/postkick.1
+man/man1/postlock.1
+man/man1/postlog.1
+man/man1/postmap.1
+man/man1/postsuper.1
+man/man5/access.5
+man/man5/canonical.5
+man/man5/relocated.5
+man/man5/transport.5
+man/man5/virtual.5
+man/man8/bounce.8
+man/man8/cleanup.8
+man/man8/defer.8
+man/man8/error.8
+man/man8/local.8
+man/man8/master.8
+man/man8/pickup.8
+man/man8/pipe.8
+man/man8/qmgr.8
+man/man8/showq.8
+man/man8/smtp.8
+man/man8/smtpd.8
+man/man8/trivial-rewrite.8