Patch one file per patch file.

37 files changed, 780 insertions, 3 deletions

diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab
new file mode 100644
index 00000000000..549435516fe
--- /dev/null
+++ b/mail/postfix/patches/patch-ab
@@ -0,0 +1,37 @@
+$NetBSD: patch-ab,v 1.1 1999/05/30 18:18:31 tron Exp $
+
+--- Makefile.inc.orig	Sun May 30 18:49:12 1999
++++ Makefile.inc	Sun May 30 18:49:12 1999
+@@ -0,0 +1,32 @@
++#	$NetBSD: patch-ab,v 1.1 1999/05/30 18:18:31 tron Exp $
++
++WARNS?=	0
++
++DOBJDIR!=cd $(.CURDIR)/../dns; \
++	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
++
++MOBJDIR!=cd $(.CURDIR)/../masterlib; \
++	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
++
++GOBJDIR!=cd $(.CURDIR)/../global; \
++	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
++
++UOBJDIR!=cd $(.CURDIR)/../util; \
++	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
++
++CPPFLAGS+= -Wno-comment -DNETBSD1 -I${.CURDIR}/ \
++	-I${.CURDIR}/../master -I${.CURDIR}/../global -I${.CURDIR}/../util \
++	-I${.CURDIR}/../dns
++
++
++LIBPDNS=	${DOBJDIR}/libdns.a
++LIBPMASTER=	${MOBJDIR}/libmaster.a
++LIBPGLOBAL=	${GOBJDIR}/libglobal.a
++LIBPUTIL=	${UOBJDIR}/libutil.a
++
++#LDADD=    
++#DPADD=  ${MOBJDIR}/libmaster.a ${GOBJDIR}/libglobal.a ${UOBJDIR}/libutil.a
++
++.if exists(${.CURDIR}/../../Makefile.inc)
++.include "${.CURDIR}/../../Makefile.inc"
++.endif
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
new file mode 100644
index 00000000000..eb41debcccf
--- /dev/null
+++ b/mail/postfix/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1 1999/05/30 18:18:31 tron Exp $
+
+--- bounce/Makefile.orig	Sun May 30 18:49:12 1999
++++ bounce/Makefile	Sun May 30 18:49:12 1999
+@@ -0,0 +1,15 @@
++#	$NetBSD: patch-ac,v 1.1 1999/05/30 18:18:31 tron Exp $
++.include "../conf/main.cf"
++PROG=	bounce
++BINDIR=${daemon_directory}
++
++SRCS	= bounce.c bounce_append_service.c bounce_notify_service.c \
++	bounce_cleanup.c
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ad b/mail/postfix/patches/patch-ad
new file mode 100644
index 00000000000..9d000a85802
--- /dev/null
+++ b/mail/postfix/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 1999/05/30 18:18:31 tron Exp $
+
+--- cleanup/Makefile.orig	Sun May 30 18:49:12 1999
++++ cleanup/Makefile	Sun May 30 18:49:12 1999
+@@ -0,0 +1,18 @@
++#	$NetBSD: patch-ad,v 1.1 1999/05/30 18:18:31 tron Exp $
++.include "../conf/main.cf"
++
++PROG=	cleanup
++BINDIR=${daemon_directory}
++
++SRCS	= cleanup.c cleanup_out.c cleanup_envelope.c cleanup_message.c \
++	cleanup_extracted.c cleanup_state.c cleanup_skip.c cleanup_rewrite.c \
++	cleanup_map11.c cleanup_map1n.c cleanup_masquerade.c \
++	cleanup_out_recipient.c
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae
new file mode 100644
index 00000000000..6ebf1018283
--- /dev/null
+++ b/mail/postfix/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 1999/05/30 18:18:31 tron Exp $
+
+--- conf/Makefile.orig	Sun May 30 18:49:12 1999
++++ conf/Makefile	Sun May 30 18:49:12 1999
+@@ -0,0 +1,17 @@
++#	$NetBSD: patch-ae,v 1.1 1999/05/30 18:18:31 tron Exp $
++.include "../conf/main.cf"
++
++BINDIR=		${share_directory}
++
++
++FILES=		LICENSE Makefile access aliases canonical main.cf master.cf \
++		relocated sample-aliases.cf sample-canonical.cf \
++		sample-debug.cf sample-ldap.cf sample-local.cf \
++		sample-misc.cf sample-pcre.cf sample-rate.cf \
++		sample-relocated.cf sample-resource.cf \
++		sample-rewrite.cf sample-smtp.cf sample-smtpd.cf \
++		sample-transport.cf sample-virtual.cf transport virtual 
++SCRIPTS=	postfix-script-sgid postfix-script-nosgid
++
++.include <bsd.prog.mk>
++
diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af
new file mode 100644
index 00000000000..20d253b783a
--- /dev/null
+++ b/mail/postfix/patches/patch-af
@@ -0,0 +1,66 @@
+$NetBSD: patch-af,v 1.1 1999/05/30 18:18:31 tron Exp $
+
+--- conf/main.cf.orig	Wed Mar 17 23:35:48 1999
++++ conf/main.cf	Sun May 30 18:49:15 1999
+@@ -1,3 +1,5 @@
++#	$NetBSD: patch-af,v 1.1 1999/05/30 18:18:31 tron Exp $
++#
+ # Global Postfix configuration file. This file lists only a subset
+ # of all 100+ parameters. See the sample-xxx.cf files for a full list.
+ # 
+@@ -18,19 +20,24 @@
+ # Postfix support programs and daemons. This setting can be overruled
+ # with the command_directory and daemon_directory parameters.
+ #
+-program_directory = /some/where/postfix/bin
++#program_directory = /some/where/postfix/bin
+ 
+ # The command_directory parameter specifies the location of all
+ # postXXX commands.  The default value is $program_directory.
+ #
+-#command_directory = /usr/sbin
++command_directory = /usr/pkg/sbin
+ 
+ # The daemon_directory parameter specifies the location of all Postfix
+ # daemon programs (i.e. programs listed in the master.cf file). The
+ # default value is $program_directory. This directory must be owned
+ # by root.
+ #
+-#daemon_directory = /usr/libexec/postfix
++daemon_directory = /usr/pkg/libexec/postfix
++
++# Shared files and etc directory
++etc_directory = /etc/postfix
++share_directory = /usr/pkg/share/postfix
++man_directory = /usr/pkg/man
+ 
+ # QUEUE AND PROCESS OWNERSHIP
+ #
+@@ -40,14 +47,14 @@
+ # OWNS NO OTHER FILES OR PROCESSES ON THE SYSTEM.  In particular,
+ # don't specify nobody or daemon. PLEASE USE A DEDICATED USER.
+ #
+-#mail_owner = postfix
++mail_owner = postfix
+ 
+ # The default_privs parameter specifies the default rights used by
+ # the local delivery agent for delivery to external file or command.
+ # These rights are used in the absence of a recipient user context.
+ # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER.
+ #
+-#default_privs = nobody
++default_privs = nobody
+ 
+ # INTERNET HOST AND DOMAIN NAMES
+ # 
+@@ -347,8 +354,7 @@
+ # the process marches on. If you use an X-based debugger, be sure to
+ # set up your XAUTHORITY environment variable before starting Postfix.
+ #
+-debugger_command =
+-	 PATH=/usr/bin:/usr/X11R6/bin
+-	 xxgdb $daemon_directory/$process_name $process_id & sleep 5
++debugger_command = PATH=/usr/bin:/usr/X11R6/bin; \
++	xxgdb $daemon_directory/$process_name $process_id & sleep 5
+ 
+ # Other configurable parameters.
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
new file mode 100644
index 00000000000..b4cd5990634
--- /dev/null
+++ b/mail/postfix/patches/patch-ag
@@ -0,0 +1,18 @@
+$NetBSD: patch-ag,v 1.1 1999/05/30 18:18:31 tron 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 $
++
++LIB	= dns
++SRCS	= dns_lookup.c dns_rr.c dns_strerror.c dns_strtype.c
++
++MKLINT=		no
++MKPIC=		no
++MKPROFILE=	no
++
++# only needed during build
++libinstall::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix/patches/patch-ah b/mail/postfix/patches/patch-ah
new file mode 100644
index 00000000000..02abb203eb8
--- /dev/null
+++ b/mail/postfix/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 1999/05/30 18:18:31 tron Exp $
+
+--- etc/Makefile.orig	Sun May 30 18:49:12 1999
++++ etc/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,11 @@
++#	$NetBSD: patch-ah,v 1.1 1999/05/30 18:18:31 tron Exp $
++
++.PATH:		${.CURDIR}/../conf
++.include "../conf/main.cf"
++
++BINDIR=		${etc_directory}
++FILES=		main.cf master.cf aliases
++
++distribution: install
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
new file mode 100644
index 00000000000..653c695155c
--- /dev/null
+++ b/mail/postfix/patches/patch-ai
@@ -0,0 +1,36 @@
+$NetBSD: patch-ai,v 1.1 1999/05/30 18:18:32 tron 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 $
++
++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 \
++	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 \
++	mail_addr_find.c mail_addr_map.c mail_command_read.c \
++	mail_command_write.c mail_connect.c mail_copy.c mail_date.c \
++	mail_error.c mail_flush.c mail_open_ok.c mail_params.c \
++	mail_pathname.c mail_print.c mail_queue.c mail_run.c mail_scan.c \
++	mail_scan_dir.c mail_stream.c mail_task.c mail_trigger.c maps.c \
++	mark_corrupt.c mkmap_db.c mkmap_dbm.c mkmap_open.c mynetworks.c \
++	mypwd.c namadr_list.c off_cvt.c opened.c own_inet_addr.c \
++	peer_name.c pipe_command.c post_mail.c quote_822_local.c \
++	rec_streamlf.c rec_type.c recipient_list.c record.c remove.c \
++	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
++
++MKLINT=		no
++MKPIC=		no
++MKPROFILE=	no
++
++# only needed during build
++libinstall::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix/patches/patch-aj b/mail/postfix/patches/patch-aj
new file mode 100644
index 00000000000..1d13bdd4597
--- /dev/null
+++ b/mail/postfix/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 1999/05/30 18:18:32 tron 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 $
++
++.include "../conf/main.cf"
++PROG=	local
++BINDIR=${daemon_directory}
++
++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
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ak b/mail/postfix/patches/patch-ak
new file mode 100644
index 00000000000..44ffebc74e2
--- /dev/null
+++ b/mail/postfix/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- man/man1/Makefile.orig	Sun May 30 18:49:13 1999
++++ man/man1/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-ak,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../../conf/main.cf"
++MANDIR= ${man_directory}
++
++MAN=	postcat.1 postfix.1 postlog.1 \
++	postconf.1 postkick.1 postmap.1 \
++	postalias.1 postdrop.1 postlock.1 postsuper.1
++
++# XXX notyet:
++# mailq.1 sendmail.1 newaliases.1
++
++.include <bsd.man.mk>
diff --git a/mail/postfix/patches/patch-al b/mail/postfix/patches/patch-al
new file mode 100644
index 00000000000..bd8fe282028
--- /dev/null
+++ b/mail/postfix/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- man/man5/Makefile.orig	Sun May 30 18:49:13 1999
++++ man/man5/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,10 @@
++#	$NetBSD: patch-al,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../../conf/main.cf"
++MANDIR= ${man_directory}
++
++MAN=	access.5 canonical.5 relocated.5 transport.5 virtual.5
++
++# XXX notyet:
++# aliases.5
++
++.include <bsd.man.mk>
diff --git a/mail/postfix/patches/patch-am b/mail/postfix/patches/patch-am
new file mode 100644
index 00000000000..c7a8e3b38f8
--- /dev/null
+++ b/mail/postfix/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- man/man8/Makefile.orig	Sun May 30 18:49:13 1999
++++ man/man8/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,11 @@
++#	$NetBSD: patch-am,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../../conf/main.cf"
++MANDIR= ${man_directory}
++
++MAN=	bounce.8 local.8 pipe.8 smtp.8 \
++	cleanup.8 master.8 qmgr.8 smtpd.8 \
++	pickup.8 showq.8 trivial-rewrite.8
++
++MLINKS=	bounce.8 defer.8
++
++.include <bsd.man.mk>
diff --git a/mail/postfix/patches/patch-an b/mail/postfix/patches/patch-an
new file mode 100644
index 00000000000..a534f41c834
--- /dev/null
+++ b/mail/postfix/patches/patch-an
@@ -0,0 +1,10 @@
+$NetBSD: patch-an,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- man/Makefile.orig	Sun May 30 18:49:13 1999
++++ man/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,5 @@
++#	$NetBSD: patch-an,v 1.1 1999/05/30 18:18:32 tron Exp $
++
++SUBDIR+=man1 man5 man8
++
++.include <bsd.subdir.mk>
diff --git a/mail/postfix/patches/patch-ao b/mail/postfix/patches/patch-ao
new file mode 100644
index 00000000000..568cb475987
--- /dev/null
+++ b/mail/postfix/patches/patch-ao
@@ -0,0 +1,21 @@
+$NetBSD: patch-ao,v 1.1 1999/05/30 18:18:32 tron 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 $
++
++.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
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ap b/mail/postfix/patches/patch-ap
new file mode 100644
index 00000000000..5d5233245a6
--- /dev/null
+++ b/mail/postfix/patches/patch-ap
@@ -0,0 +1,19 @@
+$NetBSD: patch-ap,v 1.1 1999/05/30 18:18:32 tron 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 $
++
++.PATH: ${.CURDIR}/../master
++LIB=	master
++SRCS	= single_server.c multi_server.c trigger_server.c master_proto.c
++
++MKLINT=		no
++MKPIC=		no
++MKPROFILE=	no
++
++# only needed during build
++libinstall::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix/patches/patch-aq b/mail/postfix/patches/patch-aq
new file mode 100644
index 00000000000..762586c1fa6
--- /dev/null
+++ b/mail/postfix/patches/patch-aq
@@ -0,0 +1,17 @@
+$NetBSD: patch-aq,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- pickup/Makefile.orig	Sun May 30 18:49:13 1999
++++ pickup/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-aq,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++PROG=	pickup
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ar b/mail/postfix/patches/patch-ar
new file mode 100644
index 00000000000..ecf4f57091e
--- /dev/null
+++ b/mail/postfix/patches/patch-ar
@@ -0,0 +1,17 @@
+$NetBSD: patch-ar,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- pipe/Makefile.orig	Sun May 30 18:49:13 1999
++++ pipe/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-ar,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++PROG=	pipe
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-as b/mail/postfix/patches/patch-as
new file mode 100644
index 00000000000..aa2ee4d3698
--- /dev/null
+++ b/mail/postfix/patches/patch-as
@@ -0,0 +1,17 @@
+$NetBSD: patch-as,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- postalias/Makefile.orig	Sun May 30 18:49:13 1999
++++ postalias/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-as,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++PROG=	postalias
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-at b/mail/postfix/patches/patch-at
new file mode 100644
index 00000000000..b29485d9273
--- /dev/null
+++ b/mail/postfix/patches/patch-at
@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- postcat/Makefile.orig	Sun May 30 18:49:13 1999
++++ postcat/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-at,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++PROG=	postcat
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-au b/mail/postfix/patches/patch-au
new file mode 100644
index 00000000000..0c660e18898
--- /dev/null
+++ b/mail/postfix/patches/patch-au
@@ -0,0 +1,32 @@
+$NetBSD: patch-au,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- postconf/Makefile.orig	Sun May 30 18:49:13 1999
++++ postconf/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,27 @@
++#	$NetBSD: patch-au,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++PROG=	postconf
++BINDIR=${command_directory}
++
++PSRCS=	postconf.c
++GENSRCS=bool_table.h bool_vars.h int_table.h int_vars.h str_table.h \
++	str_vars.h
++SRCS=	${PSRCS} ${GENSRCS}
++
++CLEANFILES+= ${GENSRCS}
++
++CPPFLAGS+= -I${.OBJDIR}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++${GENSRCS}: ${.CURDIR}/../global/mail_params.h
++	sh ${.CURDIR}/extract.sh ${.CURDIR}/../*/*.c
++
++# XXX
++${PSRCS}: ${GENSRCS}
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-av b/mail/postfix/patches/patch-av
new file mode 100644
index 00000000000..34706c8057c
--- /dev/null
+++ b/mail/postfix/patches/patch-av
@@ -0,0 +1,20 @@
+$NetBSD: patch-av,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- postdrop/Makefile.orig	Sun May 30 18:49:13 1999
++++ postdrop/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,15 @@
++#	$NetBSD: patch-av,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++
++PROG=	postdrop
++BINDIR=	${command_directory}
++BINGRP=	maildrop
++BINMODE=2755
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-aw b/mail/postfix/patches/patch-aw
new file mode 100644
index 00000000000..4ee75afa28c
--- /dev/null
+++ b/mail/postfix/patches/patch-aw
@@ -0,0 +1,17 @@
+$NetBSD: patch-aw,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- postfix/Makefile.orig	Sun May 30 18:49:13 1999
++++ postfix/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-aw,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++PROG=postfix
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ax b/mail/postfix/patches/patch-ax
new file mode 100644
index 00000000000..b95fc141267
--- /dev/null
+++ b/mail/postfix/patches/patch-ax
@@ -0,0 +1,23 @@
+$NetBSD: patch-ax,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- postfix-script/Makefile.orig	Sun May 30 18:49:13 1999
++++ postfix-script/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,18 @@
++#	$NetBSD: patch-ax,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++
++.PATH:		${.CURDIR}/../conf
++
++BINDIR=		${etc_directory}
++
++# XXX
++.include <bsd.own.mk>
++.if POSTFIX_NOSETGID
++SCRIPTS=	postfix-script-nosgid
++.else
++SCRIPTS=	postfix-script-sgid
++.endif
++SCRIPTSNAME=	postfix-script
++FILES=	LICENSE
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ay b/mail/postfix/patches/patch-ay
new file mode 100644
index 00000000000..982a1fd4db6
--- /dev/null
+++ b/mail/postfix/patches/patch-ay
@@ -0,0 +1,17 @@
+$NetBSD: patch-ay,v 1.1 1999/05/30 18:18:32 tron Exp $
+
+--- postkick/Makefile.orig	Sun May 30 18:49:14 1999
++++ postkick/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-ay,v 1.1 1999/05/30 18:18:32 tron Exp $
++.include "../conf/main.cf"
++PROG=	postkick
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-az b/mail/postfix/patches/patch-az
new file mode 100644
index 00000000000..625f1b804a7
--- /dev/null
+++ b/mail/postfix/patches/patch-az
@@ -0,0 +1,17 @@
+$NetBSD: patch-az,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- postlock/Makefile.orig	Sun May 30 18:49:14 1999
++++ postlock/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-az,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	postlock
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-ba b/mail/postfix/patches/patch-ba
new file mode 100644
index 00000000000..93cca3f3346
--- /dev/null
+++ b/mail/postfix/patches/patch-ba
@@ -0,0 +1,17 @@
+$NetBSD: patch-ba,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- postlog/Makefile.orig	Sun May 30 18:49:14 1999
++++ postlog/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-ba,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	postlog
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bb b/mail/postfix/patches/patch-bb
new file mode 100644
index 00000000000..f11417dcde2
--- /dev/null
+++ b/mail/postfix/patches/patch-bb
@@ -0,0 +1,17 @@
+$NetBSD: patch-bb,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- postmap/Makefile.orig	Sun May 30 18:49:14 1999
++++ postmap/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-bb,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	postmap
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bc b/mail/postfix/patches/patch-bc
new file mode 100644
index 00000000000..e9d149d4dc7
--- /dev/null
+++ b/mail/postfix/patches/patch-bc
@@ -0,0 +1,17 @@
+$NetBSD: patch-bc,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- postsuper/Makefile.orig	Sun May 30 18:49:14 1999
++++ postsuper/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-bc,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	postsuper
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bd b/mail/postfix/patches/patch-bd
new file mode 100644
index 00000000000..3b2b086a5a7
--- /dev/null
+++ b/mail/postfix/patches/patch-bd
@@ -0,0 +1,21 @@
+$NetBSD: patch-bd,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- qmgr/Makefile.orig	Sun May 30 18:49:14 1999
++++ qmgr/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,16 @@
++#	$NetBSD: patch-bd,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	qmgr
++BINDIR=${daemon_directory}
++
++SRCS	= qmgr.c qmgr_active.c qmgr_transport.c qmgr_queue.c qmgr_entry.c \
++	qmgr_message.c qmgr_deliver.c qmgr_move.c qmgr_rcpt_list.c \
++	qmgr_defer.c qmgr_enable.c qmgr_scan.c qmgr_bounce.c
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-be b/mail/postfix/patches/patch-be
new file mode 100644
index 00000000000..40b412181db
--- /dev/null
+++ b/mail/postfix/patches/patch-be
@@ -0,0 +1,17 @@
+$NetBSD: patch-be,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- sendmail/Makefile.orig	Sun May 30 18:49:14 1999
++++ sendmail/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-be,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	sendmail
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bf b/mail/postfix/patches/patch-bf
new file mode 100644
index 00000000000..b434d744466
--- /dev/null
+++ b/mail/postfix/patches/patch-bf
@@ -0,0 +1,17 @@
+$NetBSD: patch-bf,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- showq/Makefile.orig	Sun May 30 18:49:14 1999
++++ showq/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,12 @@
++#	$NetBSD: patch-bf,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	showq
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bg b/mail/postfix/patches/patch-bg
new file mode 100644
index 00000000000..0426f5edd58
--- /dev/null
+++ b/mail/postfix/patches/patch-bg
@@ -0,0 +1,22 @@
+$NetBSD: patch-bg,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- smtp/Makefile.orig	Sun May 30 18:49:14 1999
++++ smtp/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,17 @@
++#	$NetBSD: patch-bg,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	smtp
++BINDIR=${daemon_directory}
++
++SRCS	= smtp.c quote_821_local.c smtp_connect.c smtp_proto.c smtp_chat.c \
++	smtp_session.c smtp_addr.c smtp_trouble.c smtp_unalias.c smtp_state.c
++
++LIBS	= ../lib/libmaster.a ../lib/libglobal.a ../lib/libdns.a ../lib/libutil.a
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bh b/mail/postfix/patches/patch-bh
new file mode 100644
index 00000000000..94900666f52
--- /dev/null
+++ b/mail/postfix/patches/patch-bh
@@ -0,0 +1,21 @@
+$NetBSD: patch-bh,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- smtpd/Makefile.orig	Sun May 30 18:49:14 1999
++++ smtpd/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,16 @@
++#	$NetBSD: patch-bh,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++
++PROG=	smtpd
++BINDIR=${daemon_directory}
++
++SRCS	= smtpd.c smtpd_token.c smtpd_check.c smtpd_chat.c smtpd_state.c
++
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix/patches/patch-bi b/mail/postfix/patches/patch-bi
new file mode 100644
index 00000000000..f023f339475
--- /dev/null
+++ b/mail/postfix/patches/patch-bi
@@ -0,0 +1,21 @@
+$NetBSD: patch-bi,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- trivial-rewrite/Makefile.orig	Sun May 30 18:49:14 1999
++++ trivial-rewrite/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,16 @@
++#	$NetBSD: patch-bi,v 1.1 1999/05/30 18:18:33 tron Exp $
++.include "../conf/main.cf"
++PROG=	trivial-rewrite
++BINDIR=${daemon_directory}
++
++SRCS	= trivial-rewrite.c rewrite.c resolve.c transport.c
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
++
++
diff --git a/mail/postfix/patches/patch-bj b/mail/postfix/patches/patch-bj
new file mode 100644
index 00000000000..add26ff4301
--- /dev/null
+++ b/mail/postfix/patches/patch-bj
@@ -0,0 +1,37 @@
+$NetBSD: patch-bj,v 1.1 1999/05/30 18:18:33 tron 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 $
++
++LIB=	util
++SRCS=	argv.c argv_split.c attr.c basename.c binhash.c chroot_uid.c \
++	close_on_exec.c concatenate.c dict.c dict_db.c dict_dbm.c \
++	dict_env.c dict_ht.c dict_ldap.c dict_ni.c dict_nis.c \
++	dict_nisplus.c dict_open.c dir_forest.c doze.c environ.c \
++	events.c exec_command.c fifo_listen.c fifo_trigger.c file_limit.c \
++	find_inet.c fsspace.c fullname.c get_domainname.c get_hostname.c \
++	htable.c inet_addr_host.c inet_addr_list.c inet_addr_local.c \
++	inet_connect.c inet_listen.c inet_trigger.c inet_util.c \
++	line_wrap.c lowercase.c lstat_as.c mac_parse.c make_dirs.c \
++	match_list.c match_ops.c msg.c msg_output.c msg_syslog.c \
++	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 \
++	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
++
++MKLINT=		no
++MKPIC=		no
++MKPROFILE=	no
++
++# only needed during build
++libinstall::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix/patches/patch-bk b/mail/postfix/patches/patch-bk
new file mode 100644
index 00000000000..b85ad5acb07
--- /dev/null
+++ b/mail/postfix/patches/patch-bk
@@ -0,0 +1,13 @@
+$NetBSD: patch-bk,v 1.1 1999/05/30 18:18:33 tron Exp $
+
+--- util/sys_defs.h.orig	Sat Mar 20 02:16:34 1999
++++ util/sys_defs.h	Sun May 30 18:49:15 1999
+@@ -33,7 +33,7 @@
+ #define DEF_DB_TYPE	"hash"
+ #define ALIAS_DB_MAP	"hash:/etc/aliases"
+ #define GETTIMEOFDAY(t)	gettimeofday(t,(struct timezone *) 0)
+-#define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
++#define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin:/usr/pkg/sbin:/usr/pkg/bin"
+ #define USE_STATFS
+ #define STATFS_IN_SYS_MOUNT_H
+ #endif
diff --git a/mail/postfix/pkg/PLIST b/mail/postfix/pkg/PLIST
index 1be9067f84b..84804a60653 100644
--- a/mail/postfix/pkg/PLIST
+++ b/mail/postfix/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 1999/05/30 11:50:38 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/05/30 18:18:33 tron Exp $
+etc/mailer.conf.postfix
 libexec/postfix/master
 sbin/postfix
 sbin/postdrop
@@ -21,8 +22,8 @@ sbin/postlock
 sbin/postlog
 sbin/postmap
 sbin/postsuper
-/etc/postfix/postfix-script
-/etc/postfix/LICENSE
+share/doc/postfix/LICENSE
+share/postfix/postfix-script
 share/postfix/postfix-script-sgid
 share/postfix/postfix-script-nosgid
 share/postfix/LICENSE
@@ -105,4 +106,8 @@ man/cat8/pickup.0
 man/cat8/showq.0
 man/cat8/trivial-rewrite.0
 @dirrm share/postfix
+@dirrm share/doc/postfix
 @dirrm libexec/postfix
+@exec mkdir -p /etc/postfix
+@exec ln -sf %D/share/postfix/postfix-script /etc/postfix
+@unexec rm -f /etc/postfix/postfix-script