Some more changes besides the update to which Simon beat me:

Create the /var/spool/postfix on install so that "postfix check" can
create the directories below it.
Create /etc/postfix/postfix-scrip on "make install".
Make the library Makefiles DTRT on systems that don't understand MKXXX=no.
Remover owner write permission from "maildrop" binary.
Adjust offsets in a couple of patches.

11 files changed, 71 insertions, 48 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 63f2f473023..481794dd305 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/04/09 08:10:19 simonb Exp $
+# $NetBSD: Makefile,v 1.18 2000/04/10 00:19:15 bad Exp $
 
 DISTNAME=	postfix-19991231-pl06
 PKGNAME=	postfix-19991231pl06
@@ -11,6 +11,8 @@ HOMEPAGE=	http://www.postfix.org/
 MIRROR_DISTFILE= no
 MANCOMPRESSED_IF_MANZ=	yes
 
+POSTFIX_SPOOL=	/var/spool/postfix
+
 pre-patch:
 	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 
@@ -42,5 +44,10 @@ pre-install:
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.postfix ${PREFIX}/etc
+	${LN} -sf ${PREFIX}/share/postfix/postfix-script /etc/postfix
+	-${MKDIR} ${POSTFIX_SPOOL}
+	$(CHMOD) 755 ${POSTFIX_SPOOL}
+	${TEST} -f /etc/postfix/main.cf || ${INSTALL_DATA} ${PREFIX}/share/postfix/main.cf /etc/postfix
+	${TEST} -f /etc/postfix/master.cf || ${INSTALL_DATA} ${PREFIX}/share/postfix/master.cf /etc/postfix
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/files/patch-sum b/mail/postfix/files/patch-sum
index 90b7657ccef..2963e1236e8 100644
--- a/mail/postfix/files/patch-sum
+++ b/mail/postfix/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.7 2000/04/09 08:10:20 simonb Exp $
+$NetBSD: patch-sum,v 1.8 2000/04/10 00:19:16 bad Exp $
 
 MD5 (patch-aa) = cdf2646ba580757237d38ddd98768214
 MD5 (patch-ab) = 8b503cf0ecfaffdfefa2273631588d30
@@ -6,22 +6,22 @@ MD5 (patch-ac) = 97942ae862063e7a004ccaf763c0322f
 MD5 (patch-ad) = 78efb242774fead3f76268cf6b061947
 MD5 (patch-ae) = 8fe4ad7a6e51f2b7f8a4fd8fd78521bc
 MD5 (patch-af) = 75ac9870384f28958d4d3645dc45fff6
-MD5 (patch-ag) = d4dbd0aede1994b1ccf1d29c3bbeb0d1
+MD5 (patch-ag) = 63fcea403fe1b39b33d3c1e85a837596
 MD5 (patch-ah) = e91ff490a3ebc60961dd51130b329abe
-MD5 (patch-ai) = ed1273fc7b6f920733f4985c98fca03b
+MD5 (patch-ai) = d0314cf936b97e233b38e8a0ec8b414f
 MD5 (patch-aj) = 0cc01c3d3caec25e2889004af910f07e
 MD5 (patch-ak) = 3ce753b4951c5b52f8f0c0873189481c
 MD5 (patch-al) = def9b532bd501c1f34c6f8406930de6e
 MD5 (patch-am) = 3c626e1cd80ba665bd37014c9d3fae5f
 MD5 (patch-an) = 6400743b1c91b6205d6f0cdf8d7fb217
 MD5 (patch-ao) = 6e9674d9b1bbf5ce3ebd9f60ca267e0c
-MD5 (patch-ap) = 71ac3d36fd38b40f61d65de9cd717440
+MD5 (patch-ap) = f84c707949ef39bc29c4d9e95bcd69e6
 MD5 (patch-aq) = 373e13513d79535a7fce40e1c68419b2
 MD5 (patch-ar) = 83de48f492bcd471269320d850e20b29
 MD5 (patch-as) = cbebca442d05b13fd9e8a1bf966e2f72
 MD5 (patch-at) = 0de7b94b6a5d41a6168c7d2623d35733
 MD5 (patch-au) = b86b568887776e9b93dc988d58208269
-MD5 (patch-av) = 71f004f467bba15c9c54748bb0118c64
+MD5 (patch-av) = ddc641b216fa1b1d9fef729542089fc1
 MD5 (patch-aw) = 07951a5900caf4ea5d617a1c9f655763
 MD5 (patch-ax) = a3e1244663ffffa265f48fcfa9623c2e
 MD5 (patch-ay) = 9a2da62ab2b364b692e3cf68a25a5963
@@ -35,12 +35,12 @@ MD5 (patch-bf) = 76c734a8cab7f18ed911cbdb02a52236
 MD5 (patch-bg) = 4e577781f6960c0ca075c1eb4064fc2b
 MD5 (patch-bh) = 712cf7c58c498ffcae77dae1704c95d7
 MD5 (patch-bi) = 51b31d6c1d255e3d808a243f4e436ca6
-MD5 (patch-bj) = 8285b9ba17e546b6e52561716ff8ec63
+MD5 (patch-bj) = eb8f1125d5acfba0ff00d79129a82e58
 MD5 (patch-bk) = a1458a452098452961cd8e5114092a41
 MD5 (patch-bl) = 11c5b30d4da4352b5a109bb805e409b5
 MD5 (patch-bm) = c1f055fbe88ab12f02393edb93a21d4f
-MD5 (patch-bn) = d638d7114e47a0ec9877211bcc0cfaba
-MD5 (patch-bo) = e2ee220c316ad8a3530b3ffb0bc069bc
-MD5 (patch-bp) = 6cacc40a5e145fa0d83179f0712fe4e5
+MD5 (patch-bn) = 91b201a67c6fdda1c58755ed469cd20f
+MD5 (patch-bo) = 4a6917e1d58055f5aeebcf5176830967
+MD5 (patch-bp) = 59e12d316e26e98f7abdc2543864f92d
 MD5 (patch-bq) = 28f7c23282edafb36d3754c022f44178
 MD5 (patch-br) = c9bded674e4e2d415f06da232cab26c4
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index b4cd5990634..5fa70633c17 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.1 1999/05/30 18:18:31 tron Exp $
+$NetBSD: patch-ag,v 1.2 2000/04/10 00:19:17 bad Exp $
 
---- dns/Makefile.orig	Sun May 30 18:49:12 1999
-+++ dns/Makefile	Sun May 30 18:49:12 1999
-@@ -0,0 +1,13 @@
-+#	$NetBSD: patch-ag,v 1.1 1999/05/30 18:18:31 tron Exp $
+--- dns/Makefile.orig	Sat Apr  8 22:14:35 2000
++++ dns/Makefile	Sat Apr  8 23:18:53 2000
+@@ -0,0 +1,16 @@
++#	$NetBSD: patch-ag,v 1.2 2000/04/10 00:19:17 bad Exp $
 +
 +LIB	= dns
 +SRCS	= dns_lookup.c dns_rr.c dns_strerror.c dns_strtype.c
@@ -11,6 +11,9 @@ $NetBSD: patch-ag,v 1.1 1999/05/30 18:18:31 tron Exp $
 +MKLINT=		no
 +MKPIC=		no
 +MKPROFILE=	no
++NOLINT=		yes
++NOPIC=		yes
++NOPROFILE=	yes
 +
 +# only needed during build
 +libinstall::
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index f55ff4c72d7..7ab4bf0d473 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,9 +1,9 @@
-$NetBSD: patch-ai,v 1.4 2000/04/09 08:10:20 simonb Exp $
+$NetBSD: patch-ai,v 1.5 2000/04/10 00:19:17 bad Exp $
 
 --- global/Makefile.orig	Sun May 30 18:49:13 1999
 +++ global/Makefile	Sun May 30 18:49:13 1999
-@@ -0,0 +1,32 @@
-+#	$NetBSD: patch-ai,v 1.4 2000/04/09 08:10:20 simonb Exp $
+@@ -0,0 +1,35 @@
++#	$NetBSD: patch-ai,v 1.5 2000/04/10 00:19:17 bad Exp $
 +
 +LIB	= global
 +
@@ -30,6 +30,9 @@ $NetBSD: patch-ai,v 1.4 2000/04/09 08:10:20 simonb Exp $
 +MKLINT=		no
 +MKPIC=		no
 +MKPROFILE=	no
++NOLINT=		yes
++NOPIC=		yes
++NOPROFILE=	yes
 +
 +# only needed during build
 +libinstall::
diff --git a/mail/postfix/patches/patch-ap b/mail/postfix/patches/patch-ap
index 5d5233245a6..96b96c008bd 100644
--- a/mail/postfix/patches/patch-ap
+++ b/mail/postfix/patches/patch-ap
@@ -1,9 +1,9 @@
-$NetBSD: patch-ap,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-ap,v 1.2 2000/04/10 00:19:17 bad Exp $
 
---- masterlib/Makefile.orig	Sun May 30 18:49:13 1999
-+++ masterlib/Makefile	Sun May 30 18:49:13 1999
-@@ -0,0 +1,14 @@
-+#	$NetBSD: patch-ap,v 1.1 1999/05/30 18:18:32 tron Exp $
+--- masterlib/Makefile.orig	Sat Apr  8 22:14:35 2000
++++ masterlib/Makefile	Sat Apr  8 23:32:22 2000
+@@ -0,0 +1,17 @@
++#	$NetBSD: patch-ap,v 1.2 2000/04/10 00:19:17 bad Exp $
 +
 +.PATH: ${.CURDIR}/../master
 +LIB=	master
@@ -12,6 +12,9 @@ $NetBSD: patch-ap,v 1.1 1999/05/30 18:18:32 tron Exp $
 +MKLINT=		no
 +MKPIC=		no
 +MKPROFILE=	no
++NOLINT=		yes
++NOPIC=		yes
++NOPROFILE=	yes
 +
 +# only needed during build
 +libinstall::
diff --git a/mail/postfix/patches/patch-av b/mail/postfix/patches/patch-av
index 9d2bd22ab5d..b68473923e6 100644
--- a/mail/postfix/patches/patch-av
+++ b/mail/postfix/patches/patch-av
@@ -1,9 +1,9 @@
-$NetBSD: patch-av,v 1.2 1999/08/26 13:05:08 mrg Exp $
+$NetBSD: patch-av,v 1.3 2000/04/10 00:19:17 bad Exp $
 
 --- postdrop/Makefile.orig	Sun May 30 18:49:13 1999
 +++ postdrop/Makefile	Sun May 30 18:49:13 1999
 @@ -0,0 +1,20 @@
-+#	$NetBSD: patch-av,v 1.2 1999/08/26 13:05:08 mrg Exp $
++#	$NetBSD: patch-av,v 1.3 2000/04/10 00:19:17 bad Exp $
 +.include "../conf/main.cf"
 +
 +PROG=	postdrop
@@ -19,7 +19,7 @@ $NetBSD: patch-av,v 1.2 1999/08/26 13:05:08 mrg Exp $
 +
 +.if !POSTFIX_NOSETGID
 +BINGRP=	maildrop
-+BINMODE=2755
++BINMODE=2555
 +.endif
 +
 +.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bj b/mail/postfix/patches/patch-bj
index 75d56f01e3b..f6666a2e720 100644
--- a/mail/postfix/patches/patch-bj
+++ b/mail/postfix/patches/patch-bj
@@ -1,9 +1,9 @@
-$NetBSD: patch-bj,v 1.3 2000/04/09 08:10:21 simonb Exp $
+$NetBSD: patch-bj,v 1.4 2000/04/10 00:19:17 bad Exp $
 
 --- util/Makefile.orig	Sun May 30 18:49:14 1999
 +++ util/Makefile	Sun May 30 18:49:14 1999
-@@ -0,0 +1,34 @@
-+#	$NetBSD: patch-bj,v 1.3 2000/04/09 08:10:21 simonb Exp $
+@@ -0,0 +1,38 @@
++#	$NetBSD: patch-bj,v 1.4 2000/04/10 00:19:17 bad Exp $
 +
 +LIB=	util
 +SRCS	= argv.c argv_split.c attr.c basename.c binhash.c chroot_uid.c \
@@ -29,9 +29,13 @@ $NetBSD: patch-bj,v 1.3 2000/04/09 08:10:21 simonb Exp $
 +	stream_connect.c stream_trigger.c dict_regexp.c mac_expand.c \
 +	clean_env.c watchdog.c spawn_command.c sane_rename.c sane_link.c
 +
++
 +MKLINT=		no
 +MKPIC=		no
 +MKPROFILE=	no
++NOLINT=		yes
++NOPIC=		yes
++NOPROFILE=	yes
 +
 +# only needed during build
 +libinstall::
diff --git a/mail/postfix/patches/patch-bn b/mail/postfix/patches/patch-bn
index 41a9f54a4a7..488bbb9af4d 100644
--- a/mail/postfix/patches/patch-bn
+++ b/mail/postfix/patches/patch-bn
@@ -1,8 +1,8 @@
-$NetBSD: patch-bn,v 1.1 1999/08/18 23:30:26 thorpej Exp $
+$NetBSD: patch-bn,v 1.2 2000/04/10 00:19:17 bad Exp $
 
---- master/multi_server.c.orig	Tue Aug 17 17:32:22 1999
-+++ master/multi_server.c	Tue Aug 17 17:34:32 1999
-@@ -270,7 +270,7 @@
+--- master/multi_server.c.orig	Tue Nov  9 16:38:32 1999
++++ master/multi_server.c	Sat Apr  8 20:46:49 2000
+@@ -258,7 +258,7 @@
  
  static void multi_server_accept_local(int unused_event, char *context)
  {
@@ -11,7 +11,7 @@ $NetBSD: patch-bn,v 1.1 1999/08/18 23:30:26 thorpej Exp $
      int     time_left = -1;
      int     fd;
  
-@@ -310,7 +310,7 @@
+@@ -292,7 +292,7 @@
  
  static void multi_server_accept_inet(int unused_event, char *context)
  {
@@ -20,7 +20,7 @@ $NetBSD: patch-bn,v 1.1 1999/08/18 23:30:26 thorpej Exp $
      int     time_left = -1;
      int     fd;
  
-@@ -580,7 +580,7 @@
+@@ -557,7 +557,7 @@
      if (var_idle_limit > 0)
  	event_request_timer(multi_server_timeout, (char *) 0, var_idle_limit);
      for (fd = MASTER_LISTEN_FD; fd < MASTER_LISTEN_FD + socket_count; fd++) {
diff --git a/mail/postfix/patches/patch-bo b/mail/postfix/patches/patch-bo
index 2bd1414806b..f1e76d0e380 100644
--- a/mail/postfix/patches/patch-bo
+++ b/mail/postfix/patches/patch-bo
@@ -1,8 +1,8 @@
-$NetBSD: patch-bo,v 1.1 1999/08/18 23:30:26 thorpej Exp $
+$NetBSD: patch-bo,v 1.2 2000/04/10 00:19:17 bad Exp $
 
---- master/single_server.c.orig	Tue Aug 17 17:36:40 1999
-+++ master/single_server.c	Tue Aug 17 17:37:06 1999
-@@ -241,7 +241,7 @@
+--- master/single_server.c.orig	Tue Nov  9 16:38:32 1999
++++ master/single_server.c	Sat Apr  8 20:46:49 2000
+@@ -229,7 +229,7 @@
  
  static void single_server_accept_local(int unused_event, char *context)
  {
@@ -11,7 +11,7 @@ $NetBSD: patch-bo,v 1.1 1999/08/18 23:30:26 thorpej Exp $
      int     time_left = -1;
      int     fd;
  
-@@ -280,7 +280,7 @@
+@@ -262,7 +262,7 @@
  
  static void single_server_accept_inet(int unused_event, char *context)
  {
@@ -20,7 +20,7 @@ $NetBSD: patch-bo,v 1.1 1999/08/18 23:30:26 thorpej Exp $
      int     time_left = -1;
      int     fd;
  
-@@ -549,7 +549,7 @@
+@@ -526,7 +526,7 @@
      if (var_idle_limit > 0)
  	event_request_timer(single_server_timeout, (char *) 0, var_idle_limit);
      for (fd = MASTER_LISTEN_FD; fd < MASTER_LISTEN_FD + socket_count; fd++) {
diff --git a/mail/postfix/patches/patch-bp b/mail/postfix/patches/patch-bp
index 1b5d050cb29..cae467578f9 100644
--- a/mail/postfix/patches/patch-bp
+++ b/mail/postfix/patches/patch-bp
@@ -1,8 +1,8 @@
-$NetBSD: patch-bp,v 1.1 1999/08/18 23:30:26 thorpej Exp $
+$NetBSD: patch-bp,v 1.2 2000/04/10 00:19:17 bad Exp $
 
---- master/trigger_server.c.orig	Tue Aug 17 17:38:48 1999
-+++ master/trigger_server.c	Tue Aug 17 17:39:14 1999
-@@ -240,7 +240,7 @@
+--- master/trigger_server.c.orig	Tue Nov  9 16:38:32 1999
++++ master/trigger_server.c	Sat Apr  8 20:46:49 2000
+@@ -228,7 +228,7 @@
  static void trigger_server_accept_fifo(int unused_event, char *context)
  {
      char   *myname = "trigger_server_accept_fifo";
@@ -11,7 +11,7 @@ $NetBSD: patch-bp,v 1.1 1999/08/18 23:30:26 thorpej Exp $
  
      if (trigger_server_lock != 0
  	&& myflock(vstream_fileno(trigger_server_lock), MYFLOCK_NONE) < 0)
-@@ -269,7 +269,7 @@
+@@ -251,7 +251,7 @@
  static void trigger_server_accept_local(int unused_event, char *context)
  {
      char   *myname = "trigger_server_accept_local";
@@ -20,7 +20,7 @@ $NetBSD: patch-bp,v 1.1 1999/08/18 23:30:26 thorpej Exp $
      int     time_left = 0;
      int     fd;
  
-@@ -561,7 +561,7 @@
+@@ -538,7 +538,7 @@
      if (var_idle_limit > 0)
  	event_request_timer(trigger_server_timeout, (char *) 0, var_idle_limit);
      for (fd = MASTER_LISTEN_FD; fd < MASTER_LISTEN_FD + socket_count; fd++) {
diff --git a/mail/postfix/pkg/PLIST b/mail/postfix/pkg/PLIST
index 23c111987c5..f6d4d2e347b 100644
--- a/mail/postfix/pkg/PLIST
+++ b/mail/postfix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2000/04/09 08:10:21 simonb Exp $
+@comment $NetBSD: PLIST,v 1.8 2000/04/10 00:19:18 bad Exp $
 etc/mailer.conf.postfix
 libexec/postfix/bounce
 libexec/postfix/cleanup
@@ -113,5 +113,8 @@ share/postfix/virtual
 @dirrm share/doc/postfix
 @dirrm libexec/postfix
 @exec mkdir -p /etc/postfix
+@exec if [ ! -f /etc/postfix/main.cf ]; then cp %D/share/postfix/main.cf /etc/postfix ; fi
+@exec if [ ! -f /etc/postfix/master.cf ]; then cp %D/share/postfix/master.cf /etc/postfix ; fi
+@exec if [ ! -d /var/spool/postfix ]; then mkdir /var/spool/postfix; chmod 755 /var/spool/postfix ; fi
 @exec ln -sf %D/share/postfix/postfix-script /etc/postfix
 @unexec rm -f /etc/postfix/postfix-script