Update to 19990601

7 files changed, 33 insertions, 53 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index c9f4b1ea079..20511b71e7b 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 1999/06/26 16:55:27 christos Exp $
+# $NetBSD: Makefile,v 1.9 1999/06/27 00:11:02 christos Exp $
 
-DISTNAME=	postfix-19990317-pl05
-PKGNAME=	postfix-19990317p05
+DISTNAME=	postfix-19990601
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
@@ -9,6 +8,7 @@ MAINTAINER=	christos@netbsd.org
 HOMEPAGE=	http://www.postfix.org/
 
 MIRROR_DISTFILE= no
+EXTRACT_SUFX=_tar.gz
 
 pre-patch:
 	${CP} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
diff --git a/mail/postfix/files/md5 b/mail/postfix/files/md5
index db8ebc63265..7f839d96e17 100644
--- a/mail/postfix/files/md5
+++ b/mail/postfix/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1 1999/05/29 20:57:18 christos Exp $
+$NetBSD: md5,v 1.2 1999/06/27 00:11:03 christos Exp $
 
-MD5 (postfix-19990317-pl05.tar.gz) = 0a3e09a297de5ddf7456c9f206f977b9
+MD5 (postfix-19990601_tar.gz) = adf54dfceb7950587b3e1a0966e84026
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 653c695155c..19a90ea565b 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,14 +1,14 @@
-$NetBSD: patch-ai,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-ai,v 1.2 1999/06/27 00:11:03 christos Exp $
 
 --- global/Makefile.orig	Sun May 30 18:49:13 1999
 +++ global/Makefile	Sun May 30 18:49:13 1999
-@@ -0,0 +1,31 @@
-+#	$NetBSD: patch-ai,v 1.1 1999/05/30 18:18:32 tron Exp $
+@@ -0,0 +1,33 @@
++#	$NetBSD: patch-ai,v 1.2 1999/06/27 00:11:03 christos Exp $
 +
 +LIB	= global
 +
-+SRCS	= been_here.c bounce.c canon_addr.c clean_env.c cleanup_strerror.c \
-+	config.c config_bool.c config_int.c config_str.c debug_peer.c \
++SRCS	= been_here.c bounce.c canon_addr.c cleanup_strerror.c \
++	debug_peer.c \
 +	debug_process.c defer.c deliver_completed.c deliver_flock.c \
 +	deliver_request.c domain_list.c dot_lockfile.c file_id.c \
 +	header_opts.c is_header.c mail_addr.c mail_addr_crunch.c \
@@ -24,7 +24,9 @@ $NetBSD: patch-ai,v 1.1 1999/05/30 18:18:32 tron Exp $
 +	resolve_clnt.c resolve_local.c rewrite_clnt.c sent.c smtp_stream.c \
 +	split_addr.c string_list.c sys_exits.c timed_ipc.c tok822_find.c \
 +	tok822_node.c tok822_parse.c tok822_resolve.c tok822_rewrite.c \
-+	tok822_tree.c clnt_stream.c deliver_pass.c
++	tok822_tree.c clnt_stream.c deliver_pass.c ext_prop.c mail_conf.c \
++	mail_conf_bool.c mail_conf_int.c mail_conf_raw.c mail_conf_str.c \
++	mail_version.c rec2stream.c recdump.c stream2rec.c
 +
 +MKLINT=		no
 +MKPIC=		no
diff --git a/mail/postfix/patches/patch-aj b/mail/postfix/patches/patch-aj
index 1d13bdd4597..2ecce0e7958 100644
--- a/mail/postfix/patches/patch-aj
+++ b/mail/postfix/patches/patch-aj
@@ -1,9 +1,9 @@
-$NetBSD: patch-aj,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-aj,v 1.2 1999/06/27 00:11:03 christos Exp $
 
 --- local/Makefile.orig	Sun May 30 18:49:13 1999
 +++ local/Makefile	Sun May 30 18:49:13 1999
-@@ -0,0 +1,17 @@
-+#	$NetBSD: patch-aj,v 1.1 1999/05/30 18:18:32 tron Exp $
+@@ -0,0 +1,18 @@
++#	$NetBSD: patch-aj,v 1.2 1999/06/27 00:11:03 christos Exp $
 +
 +.include "../conf/main.cf"
 +PROG=	local
@@ -11,7 +11,8 @@ $NetBSD: patch-aj,v 1.1 1999/05/30 18:18:32 tron Exp $
 +
 +SRCS	= alias.c command.c delivered.c dotforward.c file.c forward.c \
 +	include.c indirect.c local.c mailbox.c recipient.c resolve.c token.c \
-+	deliver_attr.c feature.c maildir.c biff_notify.c unknown.c
++	deliver_attr.c feature.c maildir.c biff_notify.c unknown.c \
++	local_expand.c
 +
 +DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
 +LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
diff --git a/mail/postfix/patches/patch-ao b/mail/postfix/patches/patch-ao
index 568cb475987..82ec0a3c9d0 100644
--- a/mail/postfix/patches/patch-ao
+++ b/mail/postfix/patches/patch-ao
@@ -1,16 +1,17 @@
-$NetBSD: patch-ao,v 1.1 1999/05/30 18:18:32 tron Exp $
+$NetBSD: patch-ao,v 1.2 1999/06/27 00:11:03 christos Exp $
 
 --- master/Makefile.orig	Sun May 30 18:49:13 1999
 +++ master/Makefile	Sun May 30 18:49:13 1999
-@@ -0,0 +1,16 @@
-+#	$NetBSD: patch-ao,v 1.1 1999/05/30 18:18:32 tron Exp $
+@@ -0,0 +1,17 @@
++#	$NetBSD: patch-ao,v 1.2 1999/06/27 00:11:03 christos Exp $
 +
 +.include "../conf/main.cf"
 +PROG=	master
 +BINDIR=${daemon_directory}
 +SRCS    = master.c master_conf.c master_ent.c master_sig.c master_avail.c \
-+        master_spawn.c master_service.c master_status.c master_listen.c \
-+        master_vars.c master_wakeup.c
++	master_spawn.c master_service.c master_status.c master_listen.c \
++	master_vars.c master_wakeup.c multi_server.c single_server.c \
++	trigger_server.c master_proto.c
 +
 +DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
 +LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
diff --git a/mail/postfix/patches/patch-bj b/mail/postfix/patches/patch-bj
index add26ff4301..1853449c444 100644
--- a/mail/postfix/patches/patch-bj
+++ b/mail/postfix/patches/patch-bj
@@ -1,9 +1,9 @@
-$NetBSD: patch-bj,v 1.1 1999/05/30 18:18:33 tron Exp $
+$NetBSD: patch-bj,v 1.2 1999/06/27 00:11:03 christos Exp $
 
 --- util/Makefile.orig	Sun May 30 18:49:14 1999
 +++ util/Makefile	Sun May 30 18:49:14 1999
-@@ -0,0 +1,32 @@
-+#	$NetBSD: patch-bj,v 1.1 1999/05/30 18:18:33 tron Exp $
+@@ -0,0 +1,35 @@
++#	$NetBSD: patch-bj,v 1.2 1999/06/27 00:11:03 christos Exp $
 +
 +LIB=	util
 +SRCS=	argv.c argv_split.c attr.c basename.c binhash.c chroot_uid.c \
@@ -19,13 +19,16 @@ $NetBSD: patch-bj,v 1.1 1999/05/30 18:18:33 tron Exp $
 +	msg_vstream.c mvect.c myflock.c mymalloc.c mystrtok.c name_mask.c \
 +	non_blocking.c open_as.c open_limit.c open_lock.c peekfd.c \
 +	percentm.c posix_signals.c printable.c read_wait.c readable.c \
-+	readline.c ring.c safe_getenv.c safe_open.c sane_accept.c \
++	readlline.c ring.c safe_getenv.c safe_open.c sane_accept.c \
 +	scan_dir.c set_eugid.c set_ugid.c sigdelay.c skipblanks.c \
 +	split_at.c stat_as.c sys_compat.c timed_connect.c timed_wait.c \
 +	translit.c trimblanks.c unix_connect.c unix_listen.c unix_trigger.c \
 +	unsafe.c username.c valid_hostname.c vbuf.c vbuf_print.c \
 +	vstream.c vstream_popen.c vstring.c vstring_vstream.c writable.c \
-+	write_buf.c write_wait.c dict_unix.c dict_pcre.c
++	write_buf.c write_wait.c dict_unix.c dict_pcre.c clean_env.c \
++	dict_regexp.c fifo_open.c fifo_rdonly_bug.c fifo_rdwr_bug.c \
++	mac_expand.c select_bug.c stream_connect.c stream_listen.c \
++	stream_trigger.c
 +
 +MKLINT=		no
 +MKPIC=		no
diff --git a/mail/postfix/pkg/PLIST b/mail/postfix/pkg/PLIST
index 84804a60653..5a93779f06c 100644
--- a/mail/postfix/pkg/PLIST
+++ b/mail/postfix/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/05/30 18:18:33 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/06/27 00:11:04 christos Exp $
 etc/mailer.conf.postfix
 libexec/postfix/master
 sbin/postfix
@@ -51,16 +51,6 @@ share/postfix/sample-transport.cf
 share/postfix/sample-virtual.cf
 share/postfix/transport
 share/postfix/virtual
-man/man1/postcat.1
-man/man1/postfix.1
-man/man1/postlog.1
-man/man1/postconf.1
-man/man1/postkick.1
-man/man1/postmap.1
-man/man1/postalias.1
-man/man1/postdrop.1
-man/man1/postlock.1
-man/man1/postsuper.1
 man/cat1/postcat.0
 man/cat1/postfix.0
 man/cat1/postlog.0
@@ -71,28 +61,11 @@ man/cat1/postalias.0
 man/cat1/postdrop.0
 man/cat1/postlock.0
 man/cat1/postsuper.0
-man/man5/access.5
-man/man5/canonical.5
-man/man5/relocated.5
-man/man5/transport.5
-man/man5/virtual.5
 man/cat5/access.0
 man/cat5/canonical.0
 man/cat5/relocated.0
 man/cat5/transport.0
 man/cat5/virtual.0
-man/man8/bounce.8
-man/man8/defer.8
-man/man8/local.8
-man/man8/pipe.8
-man/man8/smtp.8
-man/man8/cleanup.8
-man/man8/master.8
-man/man8/qmgr.8
-man/man8/smtpd.8
-man/man8/pickup.8
-man/man8/showq.8
-man/man8/trivial-rewrite.8
 man/cat8/bounce.0
 man/cat8/defer.0
 man/cat8/local.0