diff options
| author | itojun <itojun> | 2000-08-14 04:39:59 +0000 |
|---|---|---|
| committer | itojun <itojun> | 2000-08-14 04:39:59 +0000 |
| commit | 146fb6016862acbc27d706c4011d991af058824a (patch) | |
| tree | fefd2c9ec3204bc2beed9599ad024ea8e4cfeca6 /mail/postfix-current | |
| parent | d58216745627d5d45cd6cb3053f259eccb57c45f (diff) | |
| download | pkgsrc-146fb6016862acbc27d706c4011d991af058824a.tar.gz | |
postfix 20000531 + IPv6 patch (not sure if it works right - please test).
uses postfix Makefiles, not patches/*.
experimental.
Diffstat (limited to 'mail/postfix-current')
50 files changed, 271 insertions, 1091 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 9663526378d..c56cc47856c 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,27 +1,26 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $ +# $NetBSD: Makefile,v 1.2 2000/08/14 04:39:59 itojun Exp $ -DISTNAME= postfix-19991231-pl08 -PKGNAME= postfix-19991231pl08 +DISTNAME= snapshot-20000531 +PKGNAME= postfix-20000531 CATEGORIES= mail -MASTER_SITES= ftp://postfix.cloud9.net/official/ +MASTER_SITES= ftp://postfix.cloud9.net/experimental/ -.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/ +PATCHFILES= postfix-20000531snap-v6-20000814b.diff.gz +PATCH_SITES= ftp://ftp.kame.net/pub/kame/misc/ PATCH_DIST_STRIP= -p1 -.endif -MAINTAINER= christos@netbsd.org +MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.postfix.org/ MIRROR_DISTFILE= no -MANCOMPRESSED_IF_MANZ= yes DIST_SUBDIR= postfix POSTFIX_SPOOL= /var/spool/postfix +.include "../../mk/bsd.prefs.mk" +# automagically determines IPv6 support +BUILD_DEFS+= USE_INET6 + .if defined(POSTFIX_PCRE) && ${POSTFIX_PCRE} == YES DEPENDS+= pcre-2.08:../../devel/pcre CFLAGS+= -DHAS_PCRE -I${LOCALBASE}/include @@ -29,41 +28,36 @@ 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 +ALL_TARGET= #empty 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 + ${CP} ${WRKSRC}/INSTALL.sh ${WRKSRC}/INSTALL.sh.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 + ${SED} -e 's:__PREFIX:'${PREFIX}':g' \ + < ${WRKSRC}/INSTALL.sh.dist \ + > ${WRKSRC}/INSTALL.sh + +do-configure: + (cd ${WRKSRC}; ${MAKE} makefiles) post-build: ${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \ - <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix + <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.postfix pre-install: ${MKDIR} /etc/postfix ${PREFIX}/share/postfix \ - ${PREFIX}/share/doc/postfix ${PREFIX}/libexec/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 @@ -72,7 +66,9 @@ post-install: ${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 + ${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/md5 b/mail/postfix-current/files/md5 index e0f841ea04e..74a60896d18 100644 --- a/mail/postfix-current/files/md5 +++ b/mail/postfix-current/files/md5 @@ -1,3 +1,4 @@ -$NetBSD: md5,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $ +$NetBSD: md5,v 1.2 2000/08/14 04:39:59 itojun Exp $ -MD5 (postfix/postfix-19991231-pl08.tar.gz) = 0461524d91c87b03c80cc640ec953a63 +MD5 (postfix/snapshot-20000531.tar.gz) = 5b25b37dc40e9982ec443cae1bda8c10 +MD5 (postfix/postfix-20000531snap-v6-20000814b.diff.gz) = e54eaf478fa509b160a0a5c3f285c643 diff --git a/mail/postfix-current/files/patch-sum b/mail/postfix-current/files/patch-sum index dcc5a92a89b..ae9a6508902 100644 --- a/mail/postfix-current/files/patch-sum +++ b/mail/postfix-current/files/patch-sum @@ -1,46 +1,3 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/08/14 04:33:24 itojun Exp $ +$NetBSD: patch-sum,v 1.2 2000/08/14 04:39:59 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 +MD5 (patch-aa) = a8d58f76bb5f25f4bcb4ab349860afa4 diff --git a/mail/postfix-current/patches/patch-aa b/mail/postfix-current/patches/patch-aa index dcc0c0d4bfa..ed218f859d0 100644 --- a/mail/postfix-current/patches/patch-aa +++ b/mail/postfix-current/patches/patch-aa @@ -1,22 +1,195 @@ -$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] - # +$NetBSD: patch-aa,v 1.2 2000/08/14 04:39:59 itojun Exp $ +--- INSTALL.sh.orig Tue Apr 18 07:05:36 2000 ++++ INSTALL.sh Mon Aug 14 13:20:45 2000 +@@ -8,35 +8,35 @@ + +-cat <<EOF +- +-Warning: this script replaces existing sendmail or Postfix programs. +-Make backups if you want to be able to recover. +- +-In addition to doing a fresh install, this script can change an +-existing installation from using a world-writable maildrop to a +-group-writable one. It cannot be used to change Postfix queue +-file/directory ownership. +- +-Before installing files, this script prompts you for some definitions. +-Most definitions will be remembered, so you have to specify them +-only once. All definitions have a reasonable default value. +- +- install_root - prefix for installed file names (for package building) +- +- tempdir - where to write scratch files +- +- config_directory - directory with Postfix configuration files. +- daemon_directory - directory with Postfix daemon programs. +- command_directory - directory with Postfix administrative commands. +- queue_directory - directory with Postfix queues. +- +- sendmail_path - full pathname of the Postfix sendmail command. +- newaliases_path - full pathname of the Postfix newaliases command. +- mailq_path - full pathname of the Postfix mailq command. +- +- mail_owner - owner of Postfix queue files. +- +- setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12. +- manpages - "no" or path to man tree. Example: /usr/local/man. +- +-EOF ++#cat <<EOF ++# ++#Warning: this script replaces existing sendmail or Postfix programs. ++#Make backups if you want to be able to recover. ++# ++#In addition to doing a fresh install, this script can change an ++#existing installation from using a world-writable maildrop to a ++#group-writable one. It cannot be used to change Postfix queue ++#file/directory ownership. ++# ++#Before installing files, this script prompts you for some definitions. ++#Most definitions will be remembered, so you have to specify them ++#only once. All definitions have a reasonable default value. ++# ++# install_root - prefix for installed file names (for package building) ++# ++# tempdir - where to write scratch files ++# ++# config_directory - directory with Postfix configuration files. ++# daemon_directory - directory with Postfix daemon programs. ++# command_directory - directory with Postfix administrative commands. ++# queue_directory - directory with Postfix queues. ++# ++# sendmail_path - full pathname of the Postfix sendmail command. ++# newaliases_path - full pathname of the Postfix newaliases command. ++# mailq_path - full pathname of the Postfix mailq command. ++# ++# mail_owner - owner of Postfix queue files. ++# ++# setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12. ++# manpages - "no" or path to man tree. Example: /usr/local/man. ++# ++#EOF + +@@ -104,17 +104,14 @@ + +-install_root=/ ++install_root=__PREFIX + tempdir=`pwd` +-config_directory=/etc/postfix +-daemon_directory=/usr/libexec/postfix +-command_directory=/usr/sbin ++config_directory=/share/postfix ++daemon_directory=/libexec/postfix ++command_directory=/sbin + queue_directory=/var/spool/postfix +-if [ -f /usr/lib/sendmail ] +- then sendmail_path=/usr/lib/sendmail +- else sendmail_path=/usr/sbin/sendmail +-fi +-newaliases_path=/usr/bin/newaliases +-mailq_path=/usr/bin/mailq ++sendmail_path=/sbin/sendmail ++#newaliases_path=/usr/bin/newaliases ++#mailq_path=/usr/bin/mailq + mail_owner=postfix + setgid=no +-manpages=/usr/local/man ++manpages=/man + +@@ -122,14 +119,14 @@ + +-for name in install_root tempdir config_directory +-do +- while : +- do +- eval echo \$n "$name: [\$$name]\ \$c" +- read ans +- case $ans in +- "") break;; +- *) eval $name=\$ans; break;; +- esac +- done +-done ++#for name in install_root tempdir config_directory ++#do ++# while : ++# do ++# eval echo \$n "$name: [\$$name]\ \$c" ++# read ans ++# case $ans in ++# "") break;; ++# *) eval $name=\$ans; break;; ++# esac ++# done ++#done + +@@ -166,16 +163,16 @@ + +-for name in daemon_directory command_directory \ +- queue_directory sendmail_path newaliases_path mailq_path mail_owner\ +- setgid manpages +-do +- while : +- do +- eval echo \$n "$name: [\$$name]\ \$c" +- read ans +- case $ans in +- "") break;; +- *) eval $name=\$ans; break;; +- esac +- done +-done ++#for name in daemon_directory command_directory \ ++# queue_directory sendmail_path newaliases_path mailq_path mail_owner\ ++# setgid manpages ++#do ++# while : ++# do ++# eval echo \$n "$name: [\$$name]\ \$c" ++# read ans ++# case $ans in ++# "") break;; ++# *) eval $name=\$ans; break;; ++# esac ++# done ++#done + +@@ -227,6 +224,6 @@ + COMMAND_DIRECTORY=$install_root$command_directory +-QUEUE_DIRECTORY=$install_root$queue_directory ++QUEUE_DIRECTORY=$queue_directory + SENDMAIL_PATH=$install_root$sendmail_path +-NEWALIASES_PATH=$install_root$newaliases_path +-MAILQ_PATH=$install_root$mailq_path ++#NEWALIASES_PATH=$install_root$newaliases_path ++#MAILQ_PATH=$install_root$mailq_path + MANPAGES=$install_root$manpages +@@ -239,3 +236,3 @@ + test -d $QUEUE_DIRECTORY || mkdir -p $QUEUE_DIRECTORY || exit 1 +-for path in $SENDMAIL_PATH $NEWALIASES_PATH $MAILQ_PATH ++for path in $SENDMAIL_PATH + do +@@ -259,4 +256,4 @@ + compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1 +- compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH +- compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH ++# compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH ++# compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH + } +@@ -292,9 +289,9 @@ + +-(echo "# This file was generated by $0" +-for name in sendmail_path newaliases_path mailq_path setgid manpages +-do +- eval echo $name=\$$name +-done) >$tempdir/junk || exit 1 +-compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1 +-rm -f $tempdir/junk ++#(echo "# This file was generated by $0" ++#for name in sendmail_path newaliases_path mailq_path setgid manpages ++#do ++# eval echo $name=\$$name ++#done) >$tempdir/junk || exit 1 ++#compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1 ++#rm -f $tempdir/junk + diff --git a/mail/postfix-current/patches/patch-ab b/mail/postfix-current/patches/patch-ab deleted file mode 100644 index 2e89f4b5152..00000000000 --- a/mail/postfix-current/patches/patch-ab +++ /dev/null @@ -1,37 +0,0 @@ -$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 deleted file mode 100644 index dd1763f8bf2..00000000000 --- a/mail/postfix-current/patches/patch-ac +++ /dev/null @@ -1,20 +0,0 @@ -$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 deleted file mode 100644 index bb37c662d90..00000000000 --- a/mail/postfix-current/patches/patch-ad +++ /dev/null @@ -1,23 +0,0 @@ -$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 deleted file mode 100644 index 9bc4d936574..00000000000 --- a/mail/postfix-current/patches/patch-ae +++ /dev/null @@ -1,21 +0,0 @@ -$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 deleted file mode 100644 index 08d2d781d4c..00000000000 --- a/mail/postfix-current/patches/patch-af +++ /dev/null @@ -1,52 +0,0 @@ -$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 deleted file mode 100644 index 5aa5a7a1bb1..00000000000 --- a/mail/postfix-current/patches/patch-ag +++ /dev/null @@ -1,21 +0,0 @@ -$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 deleted file mode 100644 index de7f9e1602c..00000000000 --- a/mail/postfix-current/patches/patch-ah +++ /dev/null @@ -1,16 +0,0 @@ -$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 deleted file mode 100644 index bbf59169c43..00000000000 --- a/mail/postfix-current/patches/patch-ai +++ /dev/null @@ -1,40 +0,0 @@ -$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 deleted file mode 100644 index 633366b5e09..00000000000 --- a/mail/postfix-current/patches/patch-aj +++ /dev/null @@ -1,23 +0,0 @@ -$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 deleted file mode 100644 index 0b1346381e2..00000000000 --- a/mail/postfix-current/patches/patch-ak +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 9b29ad70d17..00000000000 --- a/mail/postfix-current/patches/patch-al +++ /dev/null @@ -1,15 +0,0 @@ -$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 deleted file mode 100644 index d26fea192c6..00000000000 --- a/mail/postfix-current/patches/patch-am +++ /dev/null @@ -1,16 +0,0 @@ -$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 deleted file mode 100644 index e4027df104f..00000000000 --- a/mail/postfix-current/patches/patch-an +++ /dev/null @@ -1,10 +0,0 @@ -$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 deleted file mode 100644 index 5585ad7e287..00000000000 --- a/mail/postfix-current/patches/patch-ao +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index 2716c485496..00000000000 --- a/mail/postfix-current/patches/patch-ap +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index 557aeeabb57..00000000000 --- a/mail/postfix-current/patches/patch-aq +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 474d1a1672e..00000000000 --- a/mail/postfix-current/patches/patch-ar +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 3858e3d8421..00000000000 --- a/mail/postfix-current/patches/patch-as +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index bda228af584..00000000000 --- a/mail/postfix-current/patches/patch-at +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index adec775ad7c..00000000000 --- a/mail/postfix-current/patches/patch-au +++ /dev/null @@ -1,33 +0,0 @@ -$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 deleted file mode 100644 index 8248242daff..00000000000 --- a/mail/postfix-current/patches/patch-av +++ /dev/null @@ -1,25 +0,0 @@ -$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 deleted file mode 100644 index 41f458c161c..00000000000 --- a/mail/postfix-current/patches/patch-aw +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index c3c7d83d6f4..00000000000 --- a/mail/postfix-current/patches/patch-ax +++ /dev/null @@ -1,24 +0,0 @@ -$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 deleted file mode 100644 index ffdf6bdb560..00000000000 --- a/mail/postfix-current/patches/patch-ay +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index b5f87ec355c..00000000000 --- a/mail/postfix-current/patches/patch-az +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index ae917c6c69a..00000000000 --- a/mail/postfix-current/patches/patch-ba +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 915ca360fbb..00000000000 --- a/mail/postfix-current/patches/patch-bb +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index c0fea3a79d5..00000000000 --- a/mail/postfix-current/patches/patch-bc +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 8b88c024d0e..00000000000 --- a/mail/postfix-current/patches/patch-bd +++ /dev/null @@ -1,21 +0,0 @@ -$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 deleted file mode 100644 index fee23f418fc..00000000000 --- a/mail/postfix-current/patches/patch-be +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 5e0c6f23d7e..00000000000 --- a/mail/postfix-current/patches/patch-bf +++ /dev/null @@ -1,17 +0,0 @@ -$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 deleted file mode 100644 index 5800404d794..00000000000 --- a/mail/postfix-current/patches/patch-bg +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index 09d6cc97fca..00000000000 --- a/mail/postfix-current/patches/patch-bh +++ /dev/null @@ -1,22 +0,0 @@ -$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 deleted file mode 100644 index b7d308583f1..00000000000 --- a/mail/postfix-current/patches/patch-bi +++ /dev/null @@ -1,21 +0,0 @@ -$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 deleted file mode 100644 index 678a7fa8c4e..00000000000 --- a/mail/postfix-current/patches/patch-bj +++ /dev/null @@ -1,43 +0,0 @@ -$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 deleted file mode 100644 index a35c20d677c..00000000000 --- a/mail/postfix-current/patches/patch-bk +++ /dev/null @@ -1,13 +0,0 @@ -$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 deleted file mode 100644 index d2b7b8ff402..00000000000 --- a/mail/postfix-current/patches/patch-bl +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index 95484c77a01..00000000000 --- a/mail/postfix-current/patches/patch-bm +++ /dev/null @@ -1,14 +0,0 @@ -$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 deleted file mode 100644 index fcdb9317ca7..00000000000 --- a/mail/postfix-current/patches/patch-bn +++ /dev/null @@ -1,31 +0,0 @@ -$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 deleted file mode 100644 index 985a6b89f0f..00000000000 --- a/mail/postfix-current/patches/patch-bo +++ /dev/null @@ -1,31 +0,0 @@ -$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 deleted file mode 100644 index 742b26c04dd..00000000000 --- a/mail/postfix-current/patches/patch-bp +++ /dev/null @@ -1,31 +0,0 @@ -$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 deleted file mode 100644 index 5f3f81237f7..00000000000 --- a/mail/postfix-current/patches/patch-bq +++ /dev/null @@ -1,12 +0,0 @@ -$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 deleted file mode 100644 index d27483c3f90..00000000000 --- a/mail/postfix-current/patches/patch-br +++ /dev/null @@ -1,17 +0,0 @@ -$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/PLIST b/mail/postfix-current/pkg/PLIST index 2c0de5ae0fe..a7cf4294fe5 100644 --- a/mail/postfix-current/pkg/PLIST +++ b/mail/postfix-current/pkg/PLIST @@ -1,14 +1,15 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/14 04:33:27 itojun Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/08/14 04:40:04 itojun Exp $ etc/mailer.conf.postfix libexec/postfix/bounce libexec/postfix/cleanup libexec/postfix/error +libexec/postfix/lmtp libexec/postfix/local libexec/postfix/master +libexec/postfix/nqmgr libexec/postfix/pickup libexec/postfix/pipe libexec/postfix/qmgr -libexec/postfix/sendmail libexec/postfix/showq libexec/postfix/smtp libexec/postfix/smtpd @@ -23,21 +24,27 @@ sbin/postlock sbin/postlog sbin/postmap sbin/postsuper -share/doc/postfix/LICENSE +sbin/sendmail share/postfix/LICENSE -share/postfix/Makefile share/postfix/access share/postfix/aliases share/postfix/canonical share/postfix/main.cf +share/postfix/main.cf.default +share/postfix/main.cf.dist share/postfix/master.cf +share/postfix/pcre_table share/postfix/postfix-script +share/postfix/postfix-script-diff share/postfix/postfix-script-nosgid share/postfix/postfix-script-sgid +share/postfix/regexp_table share/postfix/relocated share/postfix/sample-aliases.cf +share/postfix/sample-auth.cf share/postfix/sample-canonical.cf share/postfix/sample-debug.cf +share/postfix/sample-filter.cf share/postfix/sample-ldap.cf share/postfix/sample-local.cf share/postfix/sample-misc.cf @@ -53,6 +60,41 @@ share/postfix/sample-transport.cf share/postfix/sample-virtual.cf share/postfix/transport share/postfix/virtual +man/man1/mailq.1 +man/man1/newaliases.1 +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/man1/sendmail.1 +man/man5/access.5 +man/man5/aliases.5 +man/man5/canonical.5 +man/man5/pcre_table.5 +man/man5/regexp_table.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/lmtp.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 @dirrm share/postfix @dirrm share/doc/postfix @dirrm libexec/postfix diff --git a/mail/postfix-current/pkg/PLIST.catinstall b/mail/postfix-current/pkg/PLIST.catinstall deleted file mode 100644 index 9da1d8f93a1..00000000000 --- a/mail/postfix-current/pkg/PLIST.catinstall +++ /dev/null @@ -1,29 +0,0 @@ -@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 deleted file mode 100644 index 5eb3441bb9b..00000000000 --- a/mail/postfix-current/pkg/PLIST.maninstall +++ /dev/null @@ -1,29 +0,0 @@ -@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 |