mail/postfix-current, for experimental postfix code - based on mail/postfix

53 files changed, 1224 insertions, 0 deletions

diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
new file mode 100644
index 00000000000..9663526378d
--- /dev/null
+++ b/mail/postfix-current/Makefile
@@ -0,0 +1,78 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+DISTNAME=	postfix-19991231-pl08
+PKGNAME=	postfix-19991231pl08
+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
+
+pre-configure:
+	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
+	${CP} ${WRKSRC}/util/sys_defs.h ${WRKSRC}/util/sys_defs.h.dist
+	${CP} ${WRKSRC}/Makefile.inc ${WRKSRC}/Makefile.inc.dist
+	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
+	    < ${WRKSRC}/conf/main.cf.dist \
+	    > ${WRKSRC}/conf/main.cf
+	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
+	    < ${WRKSRC}/util/sys_defs.h.dist \
+	    > ${WRKSRC}/util/sys_defs.h
+	capitalopsys=`${ECHO} ${OPSYS} | ${TR} a-z A-Z`; \
+	osmajorversion=`${ECHO} ${OS_VERSION} | ${SED} -e 's/\..*//g'`; \
+	${SED} -e 's:@OPSYS@:'$$capitalopsys$$osmajorversion':g' \
+	    < ${WRKSRC}/Makefile.inc.dist \
+	    > ${WRKSRC}/Makefile.inc
+
+post-build:
+	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
+	  <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix
+
+pre-install:
+	${MKDIR} /etc/postfix ${PREFIX}/share/postfix \
+	  ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/postfix
+	${CHOWN} root:wheel ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
+	${CHMOD} 755 ${PREFIX}/share/postfix ${PREFIX}/libexec/postfix
+
+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-current/files/mailer.conf b/mail/postfix-current/files/mailer.conf
new file mode 100644
index 00000000000..357201bc83c
--- /dev/null
+++ b/mail/postfix-current/files/mailer.conf
@@ -0,0 +1,8 @@
+#	$NetBSD: mailer.conf,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+#
+# Use "postfix" as replacement for "sendmail".
+#
+sendmail	@@PREFIX@@/libexec/postfix/sendmail
+send-mail	@@PREFIX@@/libexec/postfix/sendmail
+mailq		@@PREFIX@@/libexec/postfix/sendmail
+newaliases	@@PREFIX@@/libexec/postfix/sendmail
diff --git a/mail/postfix-current/files/md5 b/mail/postfix-current/files/md5
new file mode 100644
index 00000000000..e0f841ea04e
--- /dev/null
+++ b/mail/postfix-current/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+MD5 (postfix/postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63
diff --git a/mail/postfix-current/files/patch-sum b/mail/postfix-current/files/patch-sum
new file mode 100644
index 00000000000..dcc5a92a89b
--- /dev/null
+++ b/mail/postfix-current/files/patch-sum
@@ -0,0 +1,46 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+MD5 (patch-aa) = cdf2646ba580757237d38ddd98768214
+MD5 (patch-ab) = 8b503cf0ecfaffdfefa2273631588d30
+MD5 (patch-ac) = f3fad6009dea8f0f849e22fcabd80288
+MD5 (patch-ad) = bf813cc9662f4058539812e060107fb0
+MD5 (patch-ae) = 8fe4ad7a6e51f2b7f8a4fd8fd78521bc
+MD5 (patch-af) = 75ac9870384f28958d4d3645dc45fff6
+MD5 (patch-ag) = 63fcea403fe1b39b33d3c1e85a837596
+MD5 (patch-ah) = e91ff490a3ebc60961dd51130b329abe
+MD5 (patch-ai) = d0314cf936b97e233b38e8a0ec8b414f
+MD5 (patch-aj) = 5ed99c0ab3b69bbd1458c0f5959d590d
+MD5 (patch-ak) = 3ce753b4951c5b52f8f0c0873189481c
+MD5 (patch-al) = def9b532bd501c1f34c6f8406930de6e
+MD5 (patch-am) = 3c626e1cd80ba665bd37014c9d3fae5f
+MD5 (patch-an) = 6400743b1c91b6205d6f0cdf8d7fb217
+MD5 (patch-ao) = 0f4a77f784d002436c547955e395fa56
+MD5 (patch-ap) = f84c707949ef39bc29c4d9e95bcd69e6
+MD5 (patch-aq) = 4fc570318ff31051b4f0a414f7b64820
+MD5 (patch-ar) = 84145a057da22048a28fab8045e1c6b0
+MD5 (patch-as) = fba1db7ecf68552d044c4b271abb7b63
+MD5 (patch-at) = d5fb4d465181eb5e7583c5ffe60389e1
+MD5 (patch-au) = c9d97f19cef0dee0c03d7b0bb32b35e2
+MD5 (patch-av) = 7debe7c54d4fdec98e8c6c51d390418c
+MD5 (patch-aw) = 83cc8e90e2a96dc3e026f6ce1ea0e6e4
+MD5 (patch-ax) = a3e1244663ffffa265f48fcfa9623c2e
+MD5 (patch-ay) = 5b1335204503b8c51c21b9cd4a93c0b5
+MD5 (patch-az) = 5601483df73e98e016633ea60f17bac8
+MD5 (patch-ba) = 9d70d14adbf7ac59e640f7930b8e3af4
+MD5 (patch-bb) = 6b70f7d04a400f4ac0886fb297c2d7f4
+MD5 (patch-bc) = e24c0d26974bc690d5894edc3ef6b89a
+MD5 (patch-bd) = d7fbec231f0a41126b8f218e30266d85
+MD5 (patch-be) = d7794d507fb32bb37163b7504f1fee7a
+MD5 (patch-bf) = 63efb6aae91377d64ae451f33a7876f1
+MD5 (patch-bg) = e9736ad6d9acca114990fc536e00ff27
+MD5 (patch-bh) = 5737c42e63da705c0a0b819430fbc9b2
+MD5 (patch-bi) = c7a20901f9342b7ba3d3fa5723f1a451
+MD5 (patch-bj) = eb8f1125d5acfba0ff00d79129a82e58
+MD5 (patch-bk) = a1458a452098452961cd8e5114092a41
+MD5 (patch-bl) = 11c5b30d4da4352b5a109bb805e409b5
+MD5 (patch-bm) = c1f055fbe88ab12f02393edb93a21d4f
+MD5 (patch-bn) = 91b201a67c6fdda1c58755ed469cd20f
+MD5 (patch-bo) = 4a6917e1d58055f5aeebcf5176830967
+MD5 (patch-bp) = 59e12d316e26e98f7abdc2543864f92d
+MD5 (patch-bq) = 28f7c23282edafb36d3754c022f44178
+MD5 (patch-br) = 10ba47d1052dfc35b8e9f9bfe2ad1bb3
diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa
new file mode 100644
index 00000000000..dcc0c0d4bfa
--- /dev/null
+++ b/mail/postfix-current/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- Makefile.orig	Tue May 18 23:37:51 1999
++++ Makefile	Sun May 30 18:49:12 1999
+@@ -1,3 +1,17 @@
++#	$NetBSD: patch-aa,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
++
++# NOTE THAT THE BELOW DOES NOT CONTAIN `etc'!
++SUBDIR= util global dns master masterlib postfix sendmail error \
++	pickup cleanup smtpd local trivial-rewrite qmgr smtp bounce pipe \
++	showq postalias postcat postconf postdrop postkick postlock postlog \
++	postmap postsuper postfix-script conf
++
++SUBDIR+=man
++
++# not yet included: html
++# not needed: smtpstone fsstone
++
++.include <bsd.subdir.mk>
+ # Usage: 
+ #	make makefiles [CC=compiler] [OPT=compiler-flags] [DEBUG=debug-flags]
+ #
diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab
new file mode 100644
index 00000000000..2e89f4b5152
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ab
@@ -0,0 +1,37 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1 2000/08/14 04:33:24 itojun 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 -D@OPSYS@ -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-current/patches/patch-ac b/mail/postfix-current/patches/patch-ac
new file mode 100644
index 00000000000..dd1763f8bf2
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun 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} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-ad b/mail/postfix-current/patches/patch-ad
new file mode 100644
index 00000000000..bb37c662d90
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun 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} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-ae b/mail/postfix-current/patches/patch-ae
new file mode 100644
index 00000000000..9bc4d936574
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- conf/Makefile.orig	Sun May 30 18:49:12 1999
++++ conf/Makefile	Sun May 30 18:49:12 1999
+@@ -0,0 +1,16 @@
++#	$NetBSD: patch-ae,v 1.1.1.1 2000/08/14 04:33:24 itojun 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-regexp.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-current/patches/patch-af b/mail/postfix-current/patches/patch-af
new file mode 100644
index 00000000000..08d2d781d4c
--- /dev/null
+++ b/mail/postfix-current/patches/patch-af
@@ -0,0 +1,52 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- conf/main.cf.orig	Fri Jan  7 01:52:45 2000
++++ conf/main.cf	Thu Mar  2 10:56:58 2000
+@@ -1,3 +1,5 @@
++#	$NetBSD: patch-af,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.
+ # 
+@@ -17,14 +19,19 @@
+ # The command_directory parameter specifies the location of all
+ # postXXX commands.  The default value is $program_directory.
+ #
+-command_directory = /usr/sbin
++command_directory = __PREFIX/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 = __PREFIX/libexec/postfix
++
++# Shared files and etc directory
++etc_directory = /etc/postfix
++share_directory = __PREFIX/share/postfix
++man_directory = __PREFIX/man
+ 
+ # QUEUE AND PROCESS OWNERSHIP
+ #
+@@ -41,7 +48,7 @@
+ # 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
+ # 
+@@ -376,8 +383,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-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
new file mode 100644
index 00000000000..5aa5a7a1bb1
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ag
@@ -0,0 +1,21 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1.1 2000/08/14 04:33:24 itojun Exp $
++
++LIB	= dns
++SRCS	= dns_lookup.c dns_rr.c dns_strerror.c dns_strtype.c
++
++MKLINT=		no
++MKPIC=		no
++MKPROFILE=	no
++NOLINT=		yes
++NOPIC=		yes
++NOPROFILE=	yes
++
++# only needed during build
++libinstall::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix-current/patches/patch-ah b/mail/postfix-current/patches/patch-ah
new file mode 100644
index 00000000000..de7f9e1602c
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1 2000/08/14 04:33:24 itojun 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-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
new file mode 100644
index 00000000000..bbf59169c43
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ai
@@ -0,0 +1,40 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- global/Makefile.orig	Sun May 30 18:49:13 1999
++++ global/Makefile	Sun May 30 18:49:13 1999
+@@ -0,0 +1,35 @@
++#	$NetBSD: patch-ai,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
++
++LIB	= global
++
++SRCS	= been_here.c bounce.c canon_addr.c cleanup_strerror.c clnt_stream.c \
++	debug_peer.c debug_process.c defer.c deliver_completed.c \
++	deliver_flock.c deliver_pass.c deliver_request.c domain_list.c \
++	dot_lockfile.c dot_lockfile_as.c ext_prop.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_conf.c \
++	mail_conf_bool.c mail_conf_int.c mail_conf_raw.c mail_conf_str.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
++
++MKLINT=		no
++MKPIC=		no
++MKPROFILE=	no
++NOLINT=		yes
++NOPIC=		yes
++NOPROFILE=	yes
++
++# only needed during build
++libinstall::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix-current/patches/patch-aj b/mail/postfix-current/patches/patch-aj
new file mode 100644
index 00000000000..633366b5e09
--- /dev/null
+++ b/mail/postfix-current/patches/patch-aj
@@ -0,0 +1,23 @@
+$NetBSD: patch-aj,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1.1 2000/08/14 04:33:24 itojun 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 maildir.c biff_notify.c unknown.c \
++	local_expand.c
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-ak b/mail/postfix-current/patches/patch-ak
new file mode 100644
index 00000000000..0b1346381e2
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ak
@@ -0,0 +1,17 @@
+$NetBSD: patch-ak,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1 2000/08/14 04:33:24 itojun 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-current/patches/patch-al b/mail/postfix-current/patches/patch-al
new file mode 100644
index 00000000000..9b29ad70d17
--- /dev/null
+++ b/mail/postfix-current/patches/patch-al
@@ -0,0 +1,15 @@
+$NetBSD: patch-al,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1 2000/08/14 04:33:24 itojun 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-current/patches/patch-am b/mail/postfix-current/patches/patch-am
new file mode 100644
index 00000000000..d26fea192c6
--- /dev/null
+++ b/mail/postfix-current/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../../conf/main.cf"
++MANDIR= ${man_directory}
++
++MAN=	bounce.8 error.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-current/patches/patch-an b/mail/postfix-current/patches/patch-an
new file mode 100644
index 00000000000..e4027df104f
--- /dev/null
+++ b/mail/postfix-current/patches/patch-an
@@ -0,0 +1,10 @@
+$NetBSD: patch-an,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1 2000/08/14 04:33:24 itojun Exp $
++
++SUBDIR+=man1 man5 man8
++
++.include <bsd.subdir.mk>
diff --git a/mail/postfix-current/patches/patch-ao b/mail/postfix-current/patches/patch-ao
new file mode 100644
index 00000000000..5585ad7e287
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ao
@@ -0,0 +1,22 @@
+$NetBSD: patch-ao,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1.1 2000/08/14 04:33:24 itojun 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 multi_server.c single_server.c \
++	trigger_server.c master_proto.c
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-ap b/mail/postfix-current/patches/patch-ap
new file mode 100644
index 00000000000..2716c485496
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ap
@@ -0,0 +1,22 @@
+$NetBSD: patch-ap,v 1.1.1.1 2000/08/14 04:33:24 itojun 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.1.1.1 2000/08/14 04:33:24 itojun 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
++NOLINT=		yes
++NOPIC=		yes
++NOPROFILE=	yes
++
++# only needed during build
++libinstall::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix-current/patches/patch-aq b/mail/postfix-current/patches/patch-aq
new file mode 100644
index 00000000000..557aeeabb57
--- /dev/null
+++ b/mail/postfix-current/patches/patch-aq
@@ -0,0 +1,17 @@
+$NetBSD: patch-aq,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	pickup
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-ar b/mail/postfix-current/patches/patch-ar
new file mode 100644
index 00000000000..474d1a1672e
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ar
@@ -0,0 +1,17 @@
+$NetBSD: patch-ar,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	pipe
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-as b/mail/postfix-current/patches/patch-as
new file mode 100644
index 00000000000..3858e3d8421
--- /dev/null
+++ b/mail/postfix-current/patches/patch-as
@@ -0,0 +1,17 @@
+$NetBSD: patch-as,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	postalias
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-at b/mail/postfix-current/patches/patch-at
new file mode 100644
index 00000000000..bda228af584
--- /dev/null
+++ b/mail/postfix-current/patches/patch-at
@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	postcat
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-au b/mail/postfix-current/patches/patch-au
new file mode 100644
index 00000000000..adec775ad7c
--- /dev/null
+++ b/mail/postfix-current/patches/patch-au
@@ -0,0 +1,33 @@
+$NetBSD: patch-au,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1.1 2000/08/14 04:33:24 itojun 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} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++AWK?=	awk
++${GENSRCS}: ${.CURDIR}/../global/mail_params.h
++	$(AWK) -f $(.CURDIR)/extract.awk $(.CURDIR)/../*/*.c
++
++# XXX
++${PSRCS}: ${GENSRCS}
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-av b/mail/postfix-current/patches/patch-av
new file mode 100644
index 00000000000..8248242daff
--- /dev/null
+++ b/mail/postfix-current/patches/patch-av
@@ -0,0 +1,25 @@
+$NetBSD: patch-av,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++
++PROG=	postdrop
++BINDIR=	${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include "bsd.own.mk"
++
++.if !POSTFIX_NOSETGID
++BINGRP=	maildrop
++BINMODE=2555
++.endif
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-aw b/mail/postfix-current/patches/patch-aw
new file mode 100644
index 00000000000..41f458c161c
--- /dev/null
+++ b/mail/postfix-current/patches/patch-aw
@@ -0,0 +1,17 @@
+$NetBSD: patch-aw,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=postfix
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-ax b/mail/postfix-current/patches/patch-ax
new file mode 100644
index 00000000000..c3c7d83d6f4
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ax
@@ -0,0 +1,24 @@
+$NetBSD: patch-ax,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- postfix-script/Makefile.orig	Sun May 30 20:37:40 1999
++++ postfix-script/Makefile	Sun May 30 20:40:07 1999
+@@ -0,0 +1,19 @@
++#	$NetBSD: patch-ax,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++
++.PATH:		${.CURDIR}/../conf
++
++BINDIR=		${PREFIX}/share/postfix
++FILESDIR=	${PREFIX}/share/doc/postfix
++
++# 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-current/patches/patch-ay b/mail/postfix-current/patches/patch-ay
new file mode 100644
index 00000000000..ffdf6bdb560
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ay
@@ -0,0 +1,17 @@
+$NetBSD: patch-ay,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	postkick
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-az b/mail/postfix-current/patches/patch-az
new file mode 100644
index 00000000000..b5f87ec355c
--- /dev/null
+++ b/mail/postfix-current/patches/patch-az
@@ -0,0 +1,17 @@
+$NetBSD: patch-az,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	postlock
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-ba b/mail/postfix-current/patches/patch-ba
new file mode 100644
index 00000000000..ae917c6c69a
--- /dev/null
+++ b/mail/postfix-current/patches/patch-ba
@@ -0,0 +1,17 @@
+$NetBSD: patch-ba,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	postlog
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-bb b/mail/postfix-current/patches/patch-bb
new file mode 100644
index 00000000000..915ca360fbb
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bb
@@ -0,0 +1,17 @@
+$NetBSD: patch-bb,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	postmap
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-bc b/mail/postfix-current/patches/patch-bc
new file mode 100644
index 00000000000..c0fea3a79d5
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bc
@@ -0,0 +1,17 @@
+$NetBSD: patch-bc,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	postsuper
++BINDIR=${command_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-bd b/mail/postfix-current/patches/patch-bd
new file mode 100644
index 00000000000..8b88c024d0e
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bd
@@ -0,0 +1,21 @@
+$NetBSD: patch-bd,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun 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} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-be b/mail/postfix-current/patches/patch-be
new file mode 100644
index 00000000000..fee23f418fc
--- /dev/null
+++ b/mail/postfix-current/patches/patch-be
@@ -0,0 +1,17 @@
+$NetBSD: patch-be,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	sendmail
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-bf b/mail/postfix-current/patches/patch-bf
new file mode 100644
index 00000000000..5e0c6f23d7e
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bf
@@ -0,0 +1,17 @@
+$NetBSD: patch-bf,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun Exp $
++.include "../conf/main.cf"
++PROG=	showq
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-bg b/mail/postfix-current/patches/patch-bg
new file mode 100644
index 00000000000..5800404d794
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bg
@@ -0,0 +1,22 @@
+$NetBSD: patch-bg,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun 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} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-bh b/mail/postfix-current/patches/patch-bh
new file mode 100644
index 00000000000..09d6cc97fca
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bh
@@ -0,0 +1,22 @@
+$NetBSD: patch-bh,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1.1 2000/08/14 04:33:24 itojun 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 \
++	smtpd_peer.c
++
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/patches/patch-bi b/mail/postfix-current/patches/patch-bi
new file mode 100644
index 00000000000..b7d308583f1
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bi
@@ -0,0 +1,21 @@
+$NetBSD: patch-bi,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:24 itojun 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} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
++
++
diff --git a/mail/postfix-current/patches/patch-bj b/mail/postfix-current/patches/patch-bj
new file mode 100644
index 00000000000..678a7fa8c4e
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bj
@@ -0,0 +1,43 @@
+$NetBSD: patch-bj,v 1.1.1.1 2000/08/14 04:33:25 itojun Exp $
+
+--- util/Makefile.orig	Sun May 30 18:49:14 1999
++++ util/Makefile	Sun May 30 18:49:14 1999
+@@ -0,0 +1,38 @@
++#	$NetBSD: patch-bj,v 1.1.1.1 2000/08/14 04:33:25 itojun 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_mysql.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 \
++	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 stream_listen.c \
++	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::
++
++.include <bsd.lib.mk>
diff --git a/mail/postfix-current/patches/patch-bk b/mail/postfix-current/patches/patch-bk
new file mode 100644
index 00000000000..a35c20d677c
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bk
@@ -0,0 +1,13 @@
+$NetBSD: patch-bk,v 1.1.1.1 2000/08/14 04:33:25 itojun Exp $
+
+--- util/sys_defs.h.orig	Thu Nov 18 14:27:15 1999
++++ util/sys_defs.h	Thu Nov 18 14:27:16 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:__PREFIX/sbin:__PREFIX/bin"
+ #define USE_STATFS
+ #define STATFS_IN_SYS_MOUNT_H
+ #define HAS_POSIX_REGEXP
diff --git a/mail/postfix-current/patches/patch-bl b/mail/postfix-current/patches/patch-bl
new file mode 100644
index 00000000000..d2b7b8ff402
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bl
@@ -0,0 +1,12 @@
+$NetBSD: patch-bl,v 1.1.1.1 2000/08/14 04:33:25 itojun Exp $
+
+--- util/fifo_rdonly_bug.c.orig	Tue Aug 17 17:19:00 1999
++++ util/fifo_rdonly_bug.c	Tue Aug 17 17:22:45 1999
+@@ -31,6 +31,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <fcntl.h>
++#include <string.h>
+ 
+ #define FIFO_PATH	"test-fifo"
+ #define TRIGGER_DELAY	5
diff --git a/mail/postfix-current/patches/patch-bm b/mail/postfix-current/patches/patch-bm
new file mode 100644
index 00000000000..95484c77a01
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bm
@@ -0,0 +1,14 @@
+$NetBSD: patch-bm,v 1.1.1.1 2000/08/14 04:33:25 itojun Exp $
+
+*** util/fifo_rdwr_bug.c.orig	Tue Aug 17 17:24:20 1999
+--- util/fifo_rdwr_bug.c	Tue Aug 17 17:24:35 1999
+***************
+*** 32,37 ****
+--- 32,38 ----
+  #include <signal.h>
+  #include <unistd.h>
+  #include <stdlib.h>
++ #include <string.h>
+  
+  #define FIFO_PATH       "test-fifo"
+  #define perrorexit(s)   { perror(s); exit(1); }
diff --git a/mail/postfix-current/patches/patch-bn b/mail/postfix-current/patches/patch-bn
new file mode 100644
index 00000000000..fcdb9317ca7
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bn
@@ -0,0 +1,31 @@
+$NetBSD: patch-bn,v 1.1.1.1 2000/08/14 04:33:25 itojun Exp $
+
+--- 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)
+ {
+-    int     listen_fd = (int) context;
++    int     listen_fd = (int) (long) context;
+     int     time_left = -1;
+     int     fd;
+ 
+@@ -292,7 +292,7 @@
+ 
+ static void multi_server_accept_inet(int unused_event, char *context)
+ {
+-    int     listen_fd = (int) context;
++    int     listen_fd = (int) (long) context;
+     int     time_left = -1;
+     int     fd;
+ 
+@@ -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++) {
+-	event_enable_read(fd, multi_server_accept, (char *) fd);
++	event_enable_read(fd, multi_server_accept, (char *) (long) fd);
+ 	close_on_exec(fd, CLOSE_ON_EXEC);
+     }
+     event_enable_read(MASTER_STATUS_FD, multi_server_abort, (char *) 0);
diff --git a/mail/postfix-current/patches/patch-bo b/mail/postfix-current/patches/patch-bo
new file mode 100644
index 00000000000..985a6b89f0f
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bo
@@ -0,0 +1,31 @@
+$NetBSD: patch-bo,v 1.1.1.1 2000/08/14 04:33:26 itojun Exp $
+
+--- 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)
+ {
+-    int     listen_fd = (int) context;
++    int     listen_fd = (int) (long) context;
+     int     time_left = -1;
+     int     fd;
+ 
+@@ -262,7 +262,7 @@
+ 
+ static void single_server_accept_inet(int unused_event, char *context)
+ {
+-    int     listen_fd = (int) context;
++    int     listen_fd = (int) (long) context;
+     int     time_left = -1;
+     int     fd;
+ 
+@@ -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++) {
+-	event_enable_read(fd, single_server_accept, (char *) fd);
++	event_enable_read(fd, single_server_accept, (char *) (long) fd);
+ 	close_on_exec(fd, CLOSE_ON_EXEC);
+     }
+     event_enable_read(MASTER_STATUS_FD, single_server_abort, (char *) 0);
diff --git a/mail/postfix-current/patches/patch-bp b/mail/postfix-current/patches/patch-bp
new file mode 100644
index 00000000000..742b26c04dd
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bp
@@ -0,0 +1,31 @@
+$NetBSD: patch-bp,v 1.1.1.1 2000/08/14 04:33:26 itojun Exp $
+
+--- 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";
+-    int     listen_fd = (int) context;
++    int     listen_fd = (int) (long) context;
+ 
+     if (trigger_server_lock != 0
+ 	&& myflock(vstream_fileno(trigger_server_lock), MYFLOCK_NONE) < 0)
+@@ -251,7 +251,7 @@
+ static void trigger_server_accept_local(int unused_event, char *context)
+ {
+     char   *myname = "trigger_server_accept_local";
+-    int     listen_fd = (int) context;
++    int     listen_fd = (int) (long) context;
+     int     time_left = 0;
+     int     fd;
+ 
+@@ -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++) {
+-	event_enable_read(fd, trigger_server_accept, (char *) fd);
++	event_enable_read(fd, trigger_server_accept, (char *) (long) fd);
+ 	close_on_exec(fd, CLOSE_ON_EXEC);
+     }
+     event_enable_read(MASTER_STATUS_FD, trigger_server_abort, (char *) 0);
diff --git a/mail/postfix-current/patches/patch-bq b/mail/postfix-current/patches/patch-bq
new file mode 100644
index 00000000000..5f3f81237f7
--- /dev/null
+++ b/mail/postfix-current/patches/patch-bq
@@ -0,0 +1,12 @@
+$NetBSD: patch-bq,v 1.1.1.1 2000/08/14 04:33:26 itojun Exp $
+
+--- local/file.c.orig	Tue Aug 17 19:02:28 1999
++++ local/file.c	Tue Aug 17 19:02:50 1999
+@@ -50,6 +50,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <string.h>
+ 
+ /* Utility library. */
+ 
diff --git a/mail/postfix-current/patches/patch-br b/mail/postfix-current/patches/patch-br
new file mode 100644
index 00000000000..d27483c3f90
--- /dev/null
+++ b/mail/postfix-current/patches/patch-br
@@ -0,0 +1,17 @@
+$NetBSD: patch-br,v 1.1.1.1 2000/08/14 04:33:26 itojun Exp $
+
+--- 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.1.1 2000/08/14 04:33:26 itojun Exp $
++.include "../conf/main.cf"
++PROG=	error
++BINDIR=${daemon_directory}
++
++DPADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL}
++LDADD+= ${LIBPMASTER} ${LIBPGLOBAL} ${LIBPUTIL} ${AUXLIBS}
++
++# XXX
++NOMAN=1
++
++.include <bsd.prog.mk>
diff --git a/mail/postfix-current/pkg/COMMENT b/mail/postfix-current/pkg/COMMENT
new file mode 100644
index 00000000000..194c0a89ae0
--- /dev/null
+++ b/mail/postfix-current/pkg/COMMENT
@@ -0,0 +1 @@
+postfix smtp server and tools
diff --git a/mail/postfix-current/pkg/DESCR b/mail/postfix-current/pkg/DESCR
new file mode 100644
index 00000000000..dd023b67fac
--- /dev/null
+++ b/mail/postfix-current/pkg/DESCR
@@ -0,0 +1,13 @@
+Postfix aims to be an alternative to the widely-used sendmail
+program.  Sendmail is responsible for 70% of all e-mail delivered
+on the Internet.  With an estimated 100 million users, that's an
+estimated 10 billion (10^10) messages daily. A stunning number.
+
+Although IBM supported the Postfix development, it abstains from
+control over its evolution. The goal is to have Postfix installed
+on as many systems as possible. To this end, the software is given
+away with no strings attached to it, so that it can evolve with
+input from and under control by its users.
+
+In other words, IBM releases Postfix only once. I will be around
+to guide its development for a limited time.
diff --git a/mail/postfix-current/pkg/PLIST b/mail/postfix-current/pkg/PLIST
new file mode 100644
index 00000000000..2c0de5ae0fe
--- /dev/null
+++ b/mail/postfix-current/pkg/PLIST
@@ -0,0 +1,64 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/14 04:33:27 itojun Exp $
+etc/mailer.conf.postfix
+libexec/postfix/bounce
+libexec/postfix/cleanup
+libexec/postfix/error
+libexec/postfix/local
+libexec/postfix/master
+libexec/postfix/pickup
+libexec/postfix/pipe
+libexec/postfix/qmgr
+libexec/postfix/sendmail
+libexec/postfix/showq
+libexec/postfix/smtp
+libexec/postfix/smtpd
+libexec/postfix/trivial-rewrite
+sbin/postalias
+sbin/postcat
+sbin/postconf
+sbin/postdrop
+sbin/postfix
+sbin/postkick
+sbin/postlock
+sbin/postlog
+sbin/postmap
+sbin/postsuper
+share/doc/postfix/LICENSE
+share/postfix/LICENSE
+share/postfix/Makefile
+share/postfix/access
+share/postfix/aliases
+share/postfix/canonical
+share/postfix/main.cf
+share/postfix/master.cf
+share/postfix/postfix-script
+share/postfix/postfix-script-nosgid
+share/postfix/postfix-script-sgid
+share/postfix/relocated
+share/postfix/sample-aliases.cf
+share/postfix/sample-canonical.cf
+share/postfix/sample-debug.cf
+share/postfix/sample-ldap.cf
+share/postfix/sample-local.cf
+share/postfix/sample-misc.cf
+share/postfix/sample-pcre.cf
+share/postfix/sample-rate.cf
+share/postfix/sample-regexp.cf
+share/postfix/sample-relocated.cf
+share/postfix/sample-resource.cf
+share/postfix/sample-rewrite.cf
+share/postfix/sample-smtp.cf
+share/postfix/sample-smtpd.cf
+share/postfix/sample-transport.cf
+share/postfix/sample-virtual.cf
+share/postfix/transport
+share/postfix/virtual
+@dirrm share/postfix
+@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
diff --git a/mail/postfix-current/pkg/PLIST.catinstall b/mail/postfix-current/pkg/PLIST.catinstall
new file mode 100644
index 00000000000..9da1d8f93a1
--- /dev/null
+++ b/mail/postfix-current/pkg/PLIST.catinstall
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST.catinstall,v 1.1.1.1 2000/08/14 04:33:27 itojun 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-current/pkg/PLIST.maninstall b/mail/postfix-current/pkg/PLIST.maninstall
new file mode 100644
index 00000000000..5eb3441bb9b
--- /dev/null
+++ b/mail/postfix-current/pkg/PLIST.maninstall
@@ -0,0 +1,29 @@
+@comment $NetBSD: PLIST.maninstall,v 1.1.1.1 2000/08/14 04:33:27 itojun 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