summaryrefslogtreecommitdiff
path: root/mail/sendmail88
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2000-02-13 00:14:48 +0000
committertron <tron@pkgsrc.org>2000-02-13 00:14:48 +0000
commitb22b8d4d3a1908b8f3ecdc196d3e5e19ddd00ce0 (patch)
tree9cc6a2cf56f8c2f34658c3112d67fd569a29bb20 /mail/sendmail88
parentd69778581aaed976d3903cfc94d60ba4acfa503d (diff)
downloadpkgsrc-b22b8d4d3a1908b8f3ecdc196d3e5e19ddd00ce0.tar.gz
Initial import of "sendmail88" package:
The well known Mail Transport Agent This package replaces the "sendmail" 8.8.8 distribution in the main source tree.
Diffstat (limited to 'mail/sendmail88')
-rw-r--r--mail/sendmail88/Makefile142
-rw-r--r--mail/sendmail88/files/Makefile5
-rw-r--r--mail/sendmail88/files/Makefile.inc4
-rw-r--r--mail/sendmail88/files/mailer.conf8
-rw-r--r--mail/sendmail88/files/md53
-rw-r--r--mail/sendmail88/files/netbsd-proto.mc50
-rw-r--r--mail/sendmail88/files/patch-sum31
-rw-r--r--mail/sendmail88/patches/patch-aa95
-rw-r--r--mail/sendmail88/patches/patch-ab10
-rw-r--r--mail/sendmail88/patches/patch-ac31
-rw-r--r--mail/sendmail88/patches/patch-ad17
-rw-r--r--mail/sendmail88/patches/patch-ae13
-rw-r--r--mail/sendmail88/patches/patch-af13
-rw-r--r--mail/sendmail88/patches/patch-ag15
-rw-r--r--mail/sendmail88/patches/patch-ah13
-rw-r--r--mail/sendmail88/patches/patch-ai13
-rw-r--r--mail/sendmail88/patches/patch-aj21
-rw-r--r--mail/sendmail88/patches/patch-ak13
-rw-r--r--mail/sendmail88/patches/patch-al22
-rw-r--r--mail/sendmail88/patches/patch-am16
-rw-r--r--mail/sendmail88/patches/patch-an13
-rw-r--r--mail/sendmail88/patches/patch-ao13
-rw-r--r--mail/sendmail88/patches/patch-ap17
-rw-r--r--mail/sendmail88/patches/patch-aq37
-rw-r--r--mail/sendmail88/patches/patch-ar13
-rw-r--r--mail/sendmail88/patches/patch-as62
-rw-r--r--mail/sendmail88/patches/patch-at37
-rw-r--r--mail/sendmail88/patches/patch-au13
-rw-r--r--mail/sendmail88/patches/patch-av50
-rw-r--r--mail/sendmail88/patches/patch-aw46
-rw-r--r--mail/sendmail88/patches/patch-ax20
-rw-r--r--mail/sendmail88/patches/patch-ay21
-rw-r--r--mail/sendmail88/patches/patch-az12
-rw-r--r--mail/sendmail88/patches/patch-ba21
-rw-r--r--mail/sendmail88/patches/patch-bb13
-rw-r--r--mail/sendmail88/patches/patch-bc61
-rw-r--r--mail/sendmail88/pkg/COMMENT1
-rw-r--r--mail/sendmail88/pkg/DESCR8
-rw-r--r--mail/sendmail88/pkg/MESSAGE5
-rw-r--r--mail/sendmail88/pkg/PLIST114
-rw-r--r--mail/sendmail88/pkg/PLIST.catinstall9
-rw-r--r--mail/sendmail88/pkg/PLIST.maninstall9
42 files changed, 1130 insertions, 0 deletions
diff --git a/mail/sendmail88/Makefile b/mail/sendmail88/Makefile
new file mode 100644
index 00000000000..d17d29b92dd
--- /dev/null
+++ b/mail/sendmail88/Makefile
@@ -0,0 +1,142 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+DISTNAME= sendmail.8.8.8
+PKGNAME= sendmail-8.8.8
+CATEGORIES= mail
+MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
+ ftp://ftp.cert.dfn.de/pub/tools/net/sendmail/ \
+ ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/
+
+MAINTAINER= packages@netbsd.org
+HOMEPAGE= http://www.sendmail.org/
+
+MANCOMPRESSED_IF_MANZ= YES
+MESSAGE_FILE= ${WRKSRC}/MESSAGE
+WRKSRC= ${WRKDIR}/${PKGNAME}
+
+M4DIR= ${PREFIX}/share/sendmail
+M4FILES= README domain/Berkeley.EDU.m4 \
+ domain/CS.Berkeley.EDU.m4 \
+ domain/EECS.Berkeley.EDU.m4 \
+ domain/S2K.Berkeley.EDU.m4 \
+ domain/generic.m4 \
+ domain/berkeley-only.m4 \
+ feature/allmasquerade.m4 \
+ feature/always_add_domain.m4 \
+ feature/bestmx_is_local.m4 \
+ feature/bitdomain.m4 \
+ feature/domaintable.m4 \
+ feature/genericstable.m4 \
+ feature/limited_masquerade.m4 \
+ feature/local_procmail.m4 \
+ feature/mailertable.m4 \
+ feature/masquerade_entire_domain.m4 \
+ feature/masquerade_envelope.m4 \
+ feature/nocanonify.m4 \
+ feature/nodns.m4 \
+ feature/notsticky.m4 \
+ feature/nouucp.m4 \
+ feature/nullclient.m4 \
+ feature/redirect.m4 \
+ feature/smrsh.m4 \
+ feature/stickyhost.m4 \
+ feature/use_ct_file.m4 \
+ feature/use_cw_file.m4 \
+ feature/uucpdomain.m4 \
+ feature/virtusertable.m4 \
+ hack/cssubdomain.m4 \
+ m4/cf.m4 \
+ m4/cfhead.m4 m4/nullrelay.m4 \
+ m4/proto.m4 \
+ m4/version.m4 \
+ mailer/cyrus.m4 \
+ mailer/fax.m4 \
+ mailer/local.m4 \
+ mailer/mail11.m4 \
+ mailer/phquery.m4 \
+ mailer/pop.m4 \
+ mailer/procmail.m4 \
+ mailer/smtp.m4 \
+ mailer/usenet.m4 \
+ mailer/uucp.m4 \
+ ostype/aix2.m4 \
+ ostype/aix3.m4 \
+ ostype/aix4.m4 \
+ ostype/altos.m4 \
+ ostype/amdahl-uts.m4 \
+ ostype/aux.m4 \
+ ostype/bsd4.3.m4 \
+ ostype/bsd4.4.m4 \
+ ostype/bsdi1.0.m4 \
+ ostype/bsdi2.0.m4 \
+ ostype/dgux.m4 \
+ ostype/domainos.m4 \
+ ostype/dynix3.2.m4 \
+ ostype/gnuhurd.m4 \
+ ostype/hpux10.m4 \
+ ostype/hpux9.m4 \
+ ostype/irix4.m4 \
+ ostype/irix5.m4 \
+ ostype/irix6.m4 \
+ ostype/isc4.1.m4 \
+ ostype/linux.m4 \
+ ostype/maxion.m4 \
+ ostype/mklinux.m4 \
+ ostype/nextstep.m4 \
+ ostype/osf1.m4 \
+ ostype/powerux.m4 \
+ ostype/ptx2.m4 \
+ ostype/riscos4.5.m4 \
+ ostype/sco3.2.m4 \
+ ostype/sco-uw-2.1.m4 \
+ ostype/sinix.m4 \
+ ostype/solaris2.m4 \
+ ostype/solaris2.ml.m4 \
+ ostype/sunos3.5.m4 \
+ ostype/sunos4.1.m4 \
+ ostype/svr4.m4 \
+ ostype/ultrix4.m4 \
+ ostype/unknown.m4 \
+ ostype/uxpds.m4 \
+ sh/makeinfo.sh \
+ siteconfig/uucp.cogsci.m4 \
+ siteconfig/uucp.old.arpa.m4 \
+ siteconfig/uucp.ucbarpa.m4 \
+ siteconfig/uucp.ucbvax.m4
+
+post-extract:
+ @${CHMOD} -R +w ${WRKSRC}
+
+do-configure:
+ cd ${WRKSRC}; \
+ for FILE in ${FILESDIR}/${MAKEFILE} ${FILESDIR}/${MAKEFILE}.inc \
+ ${FILESDIR}/mailer.conf ${PKGDIR}/MESSAGE; do \
+ ${CP} $${FILE} .; \
+ done; \
+ ${CP} ${FILESDIR}/netbsd-proto.mc ${WRKSRC}/cf/cf; \
+ for FILE in MESSAGE cf/README cf/feature/smrsh.m4 mailer.conf; do \
+ ${CP} $${FILE} tempfile; \
+ ${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \
+ -e 's#@@PREFIX@@#${PREFIX}#g' \
+ <tempfile >$${FILE}; \
+ ${RM} -f tempfile; \
+ done
+
+pre-install:
+ ${MKDIR} ${PREFIX}/libexec/sendmail ${M4DIR} ${M4DIR}/cf \
+ ${M4DIR}/domain ${M4DIR}/feature ${M4DIR}/hack ${M4DIR}/m4 \
+ ${M4DIR}/mailer ${M4DIR}/ostype ${M4DIR}/siteconfig \
+ ${M4DIR}/mailer ${M4DIR}/sh
+
+post-install:
+ ${INSTALL_DATA} ${WRKSRC}/mailer.conf \
+ ${PREFIX}/etc/mailer.conf.sendmail
+ for FILE in ${M4FILES}; do \
+ ${INSTALL_DATA} ${WRKSRC}/cf/$${FILE} ${M4DIR}/$${FILE}; \
+ done
+
+.include "../../mk/bsd.pkg.mk"
+
+.for OPT in ${MANINSTALL}
+PLIST_SRC+= ${PKGDIR}/PLIST.${OPT}
+.endfor
diff --git a/mail/sendmail88/files/Makefile b/mail/sendmail88/files/Makefile
new file mode 100644
index 00000000000..5871f84e88f
--- /dev/null
+++ b/mail/sendmail88/files/Makefile
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+SUBDIR= src mailstats makemap praliases smrsh cf/cf
+
+.include <bsd.subdir.mk>
diff --git a/mail/sendmail88/files/Makefile.inc b/mail/sendmail88/files/Makefile.inc
new file mode 100644
index 00000000000..72b6078528c
--- /dev/null
+++ b/mail/sendmail88/files/Makefile.inc
@@ -0,0 +1,4 @@
+# $NetBSD: Makefile.inc,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+BINDIR?= ${PREFIX}/sbin
+MANDIR= ${PREFIX}/man
diff --git a/mail/sendmail88/files/mailer.conf b/mail/sendmail88/files/mailer.conf
new file mode 100644
index 00000000000..67ef2ca9ad9
--- /dev/null
+++ b/mail/sendmail88/files/mailer.conf
@@ -0,0 +1,8 @@
+# $NetBSD: mailer.conf,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+#
+# Execute the "real" sendmail program, named @@PREFIX@@/libexec/sendmail/sendmail
+#
+sendmail @@PREFIX@@/libexec/sendmail/sendmail
+send-mail @@PREFIX@@/libexec/sendmail/sendmail
+mailq @@PREFIX@@/libexec/sendmail/sendmail
+newaliases @@PREFIX@@/libexec/sendmail/sendmail
diff --git a/mail/sendmail88/files/md5 b/mail/sendmail88/files/md5
new file mode 100644
index 00000000000..f61ee4ad956
--- /dev/null
+++ b/mail/sendmail88/files/md5
@@ -0,0 +1,3 @@
+$NetBSD: md5,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+MD5 (sendmail.8.8.8.tar.gz) = 692422857393566a0a6724ab995da66b
diff --git a/mail/sendmail88/files/netbsd-proto.mc b/mail/sendmail88/files/netbsd-proto.mc
new file mode 100644
index 00000000000..1e33b0df5a6
--- /dev/null
+++ b/mail/sendmail88/files/netbsd-proto.mc
@@ -0,0 +1,50 @@
+divert(-1)
+#
+# Copyright (c) 1994 Adam Glass
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+# The Regents of the University of California. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+# must display the following acknowledgement:
+# This product includes software developed by the University of
+# California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+# may be used to endorse or promote products derived from this software
+# without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#
+# This is the prototype file for a configuration that supports nothing
+# but basic SMTP connections via TCP.
+#
+# You may want to add an OSTYPE macro to get the location of various
+# support files for your operating system environment.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)netbsd-proto.mc $Revision: 1.1.1.1 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`confAUTO_REBUILD', True)dnl
diff --git a/mail/sendmail88/files/patch-sum b/mail/sendmail88/files/patch-sum
new file mode 100644
index 00000000000..1a60fec7ee6
--- /dev/null
+++ b/mail/sendmail88/files/patch-sum
@@ -0,0 +1,31 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+MD5 (patch-aa) = 9356ba449bec09eef780069e862cdf67
+MD5 (patch-ab) = eb789dfeb2aa702e4900acf5a1b91ae3
+MD5 (patch-ac) = 574282255a5690447e9076e42c55185b
+MD5 (patch-ad) = a59c7efffbdab19f8288bf298951abb2
+MD5 (patch-ae) = 413bced1e1a4f4d52b223b51cab17c4e
+MD5 (patch-af) = 5ce13ed123f098538b84276dbd24f461
+MD5 (patch-ag) = 8cc2b807599879ee066a566785530172
+MD5 (patch-ah) = 5edfa92a3d27cd2329f50756aa0833b7
+MD5 (patch-ai) = 258c7a7fa0fd4f22a2141f26a4707ec5
+MD5 (patch-aj) = fb6d1ffc91b7d99587a20630a8806eae
+MD5 (patch-ak) = 2c579d3684d85d15a31ef91e4a618b8f
+MD5 (patch-al) = 2abb11221d707ce2a784d0f8102bc1fb
+MD5 (patch-am) = ea5a85cb8a2a678014367772be53cc6d
+MD5 (patch-an) = 5efab09601b8f10e8eef3b42e6e6cd63
+MD5 (patch-ao) = 8266a6edbbf0cbd2f51fe73cdb0702f8
+MD5 (patch-ap) = df4635534ac94915e8d1242e154bdf9f
+MD5 (patch-aq) = d615a9022c632da4e23b61b27ecf88f7
+MD5 (patch-ar) = 08a2d4f73b9feff75b7004037128c4e1
+MD5 (patch-as) = b6292723d7565884647892d57a1cff3f
+MD5 (patch-at) = 83d56bee896c4135bf140b9c423b1beb
+MD5 (patch-au) = 4c2e7408e7b67e71c726d06d8be5ddae
+MD5 (patch-av) = f4c241b4aad3e860cd50176ded4e3a1c
+MD5 (patch-aw) = 5348bccdc7716c18ad5b142987be587f
+MD5 (patch-ax) = d8b60de2c8a5f45d65a4a1fdfca3fe28
+MD5 (patch-ay) = 4a85f908bc514fbe12b97ef63f1fddc1
+MD5 (patch-az) = cade3f7af2a371722a7fe92ca1188cf3
+MD5 (patch-ba) = f371629738a955bc838c28447e26c666
+MD5 (patch-bb) = a06bb4bdab30b16560a1404fc792f911
+MD5 (patch-bc) = e78c6c90587d50b9fddede6e0c8ac267
diff --git a/mail/sendmail88/patches/patch-aa b/mail/sendmail88/patches/patch-aa
new file mode 100644
index 00000000000..040c7a0ae53
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aa
@@ -0,0 +1,95 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/cf/Makefile.orig Mon Apr 7 23:39:36 1997
++++ cf/cf/Makefile Sat Feb 12 23:29:03 2000
+@@ -1,3 +1,5 @@
++# $NetBSD: patch-aa,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
++#
+ # @(#)Makefile 8.19 (Berkeley) 1/14/97
+
+ #
+@@ -11,7 +13,6 @@
+ #
+
+ M4= m4
+-#M4= /usr/src/usr.bin/m4/obj/m4
+ CFDIR= ..
+ CHMOD= chmod
+ ROMODE= 444
+@@ -21,24 +22,29 @@
+
+ .mc.cf:
+ $(RM) $@
+- (cd ${.CURDIR} && $(M4) ${CFDIR}/m4/cf.m4 ${@:R}.mc > obj/$@)
++ (cd ${.CURDIR} && $(M4) ${@:R}.mc > ${.OBJDIR}/$@)
+ $(CHMOD) $(ROMODE) $@
+
+-ALL= generic-bsd4.4.cf generic-hpux9.cf generic-hpux10.cf \
+- generic-osf1.cf generic-solaris2.cf \
+- generic-sunos4.1.cf generic-ultrix4.cf \
+- cs-hpux9.cf cs-osf1.cf cs-solaris2.cf \
+- cs-sunos4.1.cf cs-ultrix4.cf \
+- s2k-osf1.cf s2k-ultrix4.cf \
+- chez.cs.cf huginn.cs.cf mail.cs.cf mail.eecs.cf mailspool.cs.cf \
+- python.cs.cf ucbarpa.cf ucbvax.cf vangogh.cs.cf knecht.cf
++ALL= netbsd-proto.cf
++
++OTHERS= clientproto.cf tcpproto.cf uucpproto.cf
++
++FILES= clientproto.mc netbsd-proto.mc tcpproto.mc uucpproto.mc Makefile
+
+-all: $(ALL)
++FILESDIR= ${PREFIX}/share/sendmail/cf
+
+-clean cleandir:
++realall: $(ALL)
++
++others: $(OTHERS)
++
++clean cleandir distclean:
+ $(RM) $(ALL) core
+
+-depend install:
++realdepend:
++
++distribution:
++ ${INSTALL} -c -o root -g wheel -m 444 netbsd-proto.cf \
++ ${DESTDIR}/etc/sendmail.cf
+
+ # this is overkill, but....
+ M4FILES=\
+@@ -78,29 +84,7 @@
+ ${CFDIR}/mailer/smtp.m4 \
+ ${CFDIR}/mailer/usenet.m4 \
+ ${CFDIR}/mailer/uucp.m4 \
+- ${CFDIR}/ostype/aix3.m4 \
+- ${CFDIR}/ostype/amdahl-uts.m4 \
+- ${CFDIR}/ostype/aux.m4 \
+- ${CFDIR}/ostype/bsd4.3.m4 \
+ ${CFDIR}/ostype/bsd4.4.m4 \
+- ${CFDIR}/ostype/bsdi1.0.m4 \
+- ${CFDIR}/ostype/dgux.m4 \
+- ${CFDIR}/ostype/domainos.m4 \
+- ${CFDIR}/ostype/dynix3.2.m4 \
+- ${CFDIR}/ostype/hpux9.m4 \
+- ${CFDIR}/ostype/irix4.m4 \
+- ${CFDIR}/ostype/irix5.m4 \
+- ${CFDIR}/ostype/linux.m4 \
+- ${CFDIR}/ostype/nextstep.m4 \
+- ${CFDIR}/ostype/osf1.m4 \
+- ${CFDIR}/ostype/ptx2.m4 \
+- ${CFDIR}/ostype/riscos4.5.m4 \
+- ${CFDIR}/ostype/sco3.2.m4 \
+- ${CFDIR}/ostype/solaris2.m4 \
+- ${CFDIR}/ostype/sunos3.5.m4 \
+- ${CFDIR}/ostype/sunos4.1.m4 \
+- ${CFDIR}/ostype/svr4.m4 \
+- ${CFDIR}/ostype/ultrix4.m4 \
+ ${CFDIR}/siteconfig/uucp.cogsci.m4 \
+ ${CFDIR}/siteconfig/uucp.old.arpa.m4 \
+ ${CFDIR}/siteconfig/uucp.ucbarpa.m4 \
+@@ -109,3 +93,4 @@
+ $(ALL): $(M4FILES)
+
+ .include <bsd.prog.mk>
++.include <bsd.files.mk>
diff --git a/mail/sendmail88/patches/patch-ab b/mail/sendmail88/patches/patch-ab
new file mode 100644
index 00000000000..04d7fd3e163
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ab
@@ -0,0 +1,10 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/feature/smrsh.m4.orig Mon Apr 7 23:39:39 1997
++++ cf/feature/smrsh.m4 Sat Feb 12 23:28:26 2000
+@@ -39,4 +39,4 @@
+
+ ifdef(`_MAILER_local_',
+ `errprint(`*** FEATURE(smrsh) must occur before MAILER(local)')')dnl
+-define(`LOCAL_SHELL_PATH', ifelse(_ARG_, `', `/usr/local/etc/smrsh', _ARG_))
++define(`LOCAL_SHELL_PATH', ifelse(_ARG_, `', `/usr/pkg/libexec/sendmail/smrsh', _ARG_))
diff --git a/mail/sendmail88/patches/patch-ac b/mail/sendmail88/patches/patch-ac
new file mode 100644
index 00000000000..ae8af9d9c43
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ac
@@ -0,0 +1,31 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/m4/proto.m4.orig Fri Aug 1 02:26:36 1997
++++ cf/m4/proto.m4 Sat Feb 12 23:28:26 2000
+@@ -148,22 +148,22 @@
+ # Mailer table (overriding domains)
+ ifdef(`MAILER_TABLE',
+ `Kmailertable MAILER_TABLE',
+- `#Kmailertable dbm /etc/mailertable')
++ `#Kmailertable hash /etc/mailertable')
+
+ # Domain table (adding domains)
+ ifdef(`DOMAIN_TABLE',
+ `Kdomaintable DOMAIN_TABLE',
+- `#Kdomaintable dbm /etc/domaintable')
++ `#Kdomaintable hash /etc/domaintable')
+
+ # Generics table (mapping outgoing addresses)
+ ifdef(`GENERICS_TABLE',
+ `Kgenerics GENERICS_TABLE',
+- `#Kgenerics dbm /etc/genericstable')
++ `#Kgenerics hash /etc/genericstable')
+
+ # Virtual user table (maps incoming users)
+ ifdef(`VIRTUSER_TABLE',
+ `Kvirtuser VIRTUSER_TABLE',
+- `#Kvirtuser dbm /etc/virtusertable')
++ `#Kvirtuser hash /etc/virtusertable')
+
+ # who I send unqualified names to (null means deliver locally)
+ DR`'ifdef(`LOCAL_RELAY', LOCAL_RELAY)
diff --git a/mail/sendmail88/patches/patch-ad b/mail/sendmail88/patches/patch-ad
new file mode 100644
index 00000000000..8cd9029c073
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- cf/README.orig Tue Sep 23 17:42:00 1997
++++ cf/README Sat Feb 12 23:28:26 2000
+@@ -730,9 +730,9 @@
+ smrsh Use the SendMail Restricted SHell (smrsh) provided
+ with the distribution instead of /bin/sh for mailing
+ to programs. This improves the ability of the local
+- system administrator to control what gets run via
+- e-mail. If an argument is provided it is used as the
+- pathname to smrsh; otherwise, /usr/local/etc/smrsh is
++ system administrator to control what gets run via e-mail.
++ If an argument is provided it is used as the pathname to
++ smrsh; otherwise, /usr/pkg/libexec/sendmail/smrsh is
+ assumed.
+
+
diff --git a/mail/sendmail88/patches/patch-ae b/mail/sendmail88/patches/patch-ae
new file mode 100644
index 00000000000..536f471f312
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- contrib/bitdomain.c.orig Fri Oct 27 16:22:19 1995
++++ contrib/bitdomain.c Sat Feb 12 23:28:26 2000
+@@ -51,7 +51,7 @@
+ {
+ int opt;
+
+- while ((opt = getopt(argc, argv, "o:")) != EOF) {
++ while ((opt = getopt(argc, argv, "o:")) != -1) {
+ switch (opt) {
+ case 'o':
+ if (!freopen(optarg, "w", stdout)) {
diff --git a/mail/sendmail88/patches/patch-af b/mail/sendmail88/patches/patch-af
new file mode 100644
index 00000000000..3f7a42e8b66
--- /dev/null
+++ b/mail/sendmail88/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mail.local/mail.local.c.orig Sat Aug 2 16:20:08 1997
++++ mail.local/mail.local.c Sat Feb 12 23:28:26 2000
+@@ -220,7 +220,7 @@
+ #endif
+
+ from = NULL;
+- while ((ch = getopt(argc, argv, "df:r:")) != EOF)
++ while ((ch = getopt(argc, argv, "df:r:")) != -1)
+ switch(ch) {
+ case 'd': /* Backward compatible. */
+ break;
diff --git a/mail/sendmail88/patches/patch-ag b/mail/sendmail88/patches/patch-ag
new file mode 100644
index 00000000000..9b079786ae0
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mailstats/Makefile.orig Sat Sep 21 20:38:18 1996
++++ mailstats/Makefile Sat Feb 12 23:28:26 2000
+@@ -1,8 +1,7 @@
+ # @(#)Makefile 8.2 (Berkeley) 9/21/96
+
+ PROG= mailstats
+-MAN8= mailstats.0
+-CFLAGS+=-I${.CURDIR}/../src
++MAN= mailstats.8
++CPPFLAGS+=-I${.CURDIR}/../src
+
+-.include "../../Makefile.inc"
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-ah b/mail/sendmail88/patches/patch-ah
new file mode 100644
index 00000000000..ff7a034e0aa
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mailstats/mailstats.8.orig Sat Sep 21 20:31:16 1996
++++ mailstats/mailstats.8 Sat Feb 12 23:28:26 2000
+@@ -1,7 +1,7 @@
+ .\" @(#)mailstats.8 8.1 (Berkeley) 9/21/96
+ .Dd April 25, 1996
+ .Dt MAILSTATS 1
+-.Os BSD 3
++.Os
+ .Sh NAME
+ .Nm mailstats
+ .Nd display mail statistics
diff --git a/mail/sendmail88/patches/patch-ai b/mail/sendmail88/patches/patch-ai
new file mode 100644
index 00000000000..4c4b04c9870
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- mailstats/mailstats.c.orig Fri May 30 21:05:20 1997
++++ mailstats/mailstats.c Sat Feb 12 23:28:26 2000
+@@ -73,7 +73,7 @@
+ cfile = _PATH_SENDMAILCF;
+ sfile = NULL;
+ mnames = TRUE;
+- while ((ch = getopt(argc, argv, "C:f:o")) != EOF)
++ while ((ch = getopt(argc, argv, "C:f:o")) != -1)
+ {
+ switch (ch)
+ {
diff --git a/mail/sendmail88/patches/patch-aj b/mail/sendmail88/patches/patch-aj
new file mode 100644
index 00000000000..f4635614517
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aj
@@ -0,0 +1,21 @@
+$NetBSD: patch-aj,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- makemap/Makefile.orig Wed Jun 11 01:03:15 1997
++++ makemap/Makefile Sat Feb 12 23:28:26 2000
+@@ -1,13 +1,10 @@
+ # @(#)Makefile 8.4 (Berkeley) 6/10/97
+
+ PROG= makemap
+-MAN8= makemap.0
+-CFLAGS+=-I${.CURDIR}/../src -DNEWDB -DNOT_SENDMAIL
++MAN= makemap.8
++CPPFLAGS+=-I${.CURDIR}/../src -DNEWDB -DNOT_SENDMAIL
+
+ SRCS= makemap.c safefile.c
+
+-safefile.c: ${.CURDIR}/../src/safefile.c
+- ln -s ${.CURDIR}/../src/safefile.c
+-
+-.include "../../Makefile.inc"
++.PATH: ${.CURDIR}/../src
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-ak b/mail/sendmail88/patches/patch-ak
new file mode 100644
index 00000000000..bcba8676465
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- makemap/makemap.8.orig Wed Jul 23 17:03:35 1997
++++ makemap/makemap.8 Sat Feb 12 23:28:26 2000
+@@ -33,7 +33,7 @@
+ .\"
+ .Dd November 16, 1992
+ .Dt MAKEMAP 8
+-.Os BSD 4.4
++.Os
+ .Sh NAME
+ .Nm makemap
+ .Nd create database maps for sendmail
diff --git a/mail/sendmail88/patches/patch-al b/mail/sendmail88/patches/patch-al
new file mode 100644
index 00000000000..bab2dac2caf
--- /dev/null
+++ b/mail/sendmail88/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- makemap/makemap.c.orig Tue Sep 23 18:11:10 1997
++++ makemap/makemap.c Sat Feb 12 23:28:26 2000
+@@ -37,7 +37,7 @@
+ #endif /* not lint */
+
+ #include <sys/types.h>
+-#include <sys/errno.h>
++#include <errno.h>
+ #ifndef ISC_UNIX
+ # include <sys/file.h>
+ #endif
+@@ -152,7 +152,7 @@
+ #else
+ #define OPTIONS "Ndforv"
+ #endif
+- while ((opt = getopt(argc, argv, OPTIONS)) != EOF)
++ while ((opt = getopt(argc, argv, OPTIONS)) != -1)
+ {
+ switch (opt)
+ {
diff --git a/mail/sendmail88/patches/patch-am b/mail/sendmail88/patches/patch-am
new file mode 100644
index 00000000000..8c9a138f766
--- /dev/null
+++ b/mail/sendmail88/patches/patch-am
@@ -0,0 +1,16 @@
+$NetBSD: patch-am,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- praliases/Makefile.orig Sat Sep 21 20:30:41 1996
++++ praliases/Makefile Sat Feb 12 23:28:26 2000
+@@ -1,9 +1,7 @@
+ # @(#)Makefile 8.2 (Berkeley) 9/21/96
+
+ PROG= praliases
+-MAN8= praliases.0
+-CFLAGS+=-I${.CURDIR}/../src
+-DPADD= ${LIBDBM}
++MAN= praliases.8
++CPPFLAGS+=-I${.CURDIR}/../src
+
+-.include "../../Makefile.inc"
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-an b/mail/sendmail88/patches/patch-an
new file mode 100644
index 00000000000..8e1986e06e0
--- /dev/null
+++ b/mail/sendmail88/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- praliases/praliases.8.orig Sat Sep 21 20:29:04 1996
++++ praliases/praliases.8 Sat Feb 12 23:28:27 2000
+@@ -1,7 +1,7 @@
+ .\" @(#)praliases.8 8.1 (Berkeley) 9/21/96
+ .Dd April 25, 1996
+ .Dt PRALIASES 1
+-.Os BSD 3
++.Os
+ .Sh NAME
+ .Nm praliases
+ .Nd display system mail aliases
diff --git a/mail/sendmail88/patches/patch-ao b/mail/sendmail88/patches/patch-ao
new file mode 100644
index 00000000000..a6d1f92f228
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- praliases/praliases.c.orig Thu May 29 01:52:17 1997
++++ praliases/praliases.c Sat Feb 12 23:28:27 2000
+@@ -67,7 +67,7 @@
+ #endif
+
+ filename = "/etc/aliases";
+- while ((ch = getopt(argc, argv, "f:")) != EOF)
++ while ((ch = getopt(argc, argv, "f:")) != -1)
+ switch((char)ch) {
+ case 'f':
+ filename = optarg;
diff --git a/mail/sendmail88/patches/patch-ap b/mail/sendmail88/patches/patch-ap
new file mode 100644
index 00000000000..a0b946efab4
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ap
@@ -0,0 +1,17 @@
+$NetBSD: patch-ap,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- smrsh/Makefile.orig Sun Jul 2 17:34:31 1995
++++ smrsh/Makefile Sat Feb 12 23:28:27 2000
+@@ -1,8 +1,9 @@
+ # @(#)Makefile 8.1 (Berkeley) 7/2/95
+
++BINDIR= ${PREFIX}/libexec/sendmail
+ PROG= smrsh
+-MAN8= smrsh.0
+-CFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
++MAN= smrsh.8
++CPPFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
++CPPFLAGS+=-DCMDDIR=\"${PREFIX}/libexec/sendmail/sm.bin\"
+
+-.include "../../Makefile.inc"
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-aq b/mail/sendmail88/patches/patch-aq
new file mode 100644
index 00000000000..52bd08b1521
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aq
@@ -0,0 +1,37 @@
+$NetBSD: patch-aq,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+
+--- smrsh/smrsh.8.orig Wed Jan 10 01:53:51 1996
++++ smrsh/smrsh.8 Sat Feb 12 23:28:27 2000
+@@ -59,7 +59,7 @@
+ Briefly,
+ .I smrsh
+ limits programs to be in the directory
+-/usr/adm/sm.bin,
++/usr/libexec/sm.bin,
+ allowing the system administrator to choose the set of acceptable commands.
+ It also rejects any commands with the characters
+ `\`', `<', `>', `|', `;', `&', `$', `(', `)', `\er' (carriage return),
+@@ -73,10 +73,10 @@
+ and
+ ``vacation''
+ all actually forward to
+-``/usr/adm/sm.bin/vacation''.
++``/usr/libexec/sm.bin/vacation''.
+ .PP
+ System administrators should be conservative about populating
+-/usr/adm/sm.bin.
++/usr/libexec/sm.bin.
+ Reasonable additions are
+ .IR vacation (1),
+ .IR procmail (1),
+@@ -98,8 +98,8 @@
+ (defaults to ``/bin:/usr/bin:/usr/ucb'')
+ and/or \-DCMDBIN=\e"\fIdir\fP\e"
+ to change the default program directory
+-(defaults to ``/usr/adm/sm.bin'').
++(defaults to ``/usr/libexec/sm.bin'').
+ .SH FILES
+-/usr/adm/sm.bin \- directory for restricted programs
++/usr/libexec/sm.bin \- directory for restricted programs
+ .SH SEE ALSO
+ sendmail(8)
diff --git a/mail/sendmail88/patches/patch-ar b/mail/sendmail88/patches/patch-ar
new file mode 100644
index 00000000000..5952e6e85f4
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- smrsh/smrsh.c.orig Mon Oct 20 01:04:08 1997
++++ smrsh/smrsh.c Sat Feb 12 23:28:27 2000
+@@ -80,7 +80,7 @@
+
+ /* directory in which all commands must reside */
+ #ifndef CMDDIR
+-# define CMDDIR "/usr/adm/sm.bin"
++# define CMDDIR "/usr/libexec/sm.bin"
+ #endif
+
+ /* characters disallowed in the shell "-c" argument */
diff --git a/mail/sendmail88/patches/patch-as b/mail/sendmail88/patches/patch-as
new file mode 100644
index 00000000000..6c85cb0900f
--- /dev/null
+++ b/mail/sendmail88/patches/patch-as
@@ -0,0 +1,62 @@
+$NetBSD: patch-as,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/Makefile.orig Fri Mar 28 18:06:01 1997
++++ src/Makefile Sat Feb 12 23:28:27 2000
+@@ -5,6 +5,8 @@
+ # the "makesendmail" script. #
+ #########################################################################
+
++.include <bsd.own.mk>
++
+ PROG= sendmail
+
+ # define the database format to use for aliases et al. Can be -DNEWDB (for
+@@ -15,33 +17,32 @@
+ # databases are read, but the new format will be used on any rebuilds. On
+ # really gnarly systems, you can set this to null; it will crawl like a high
+ # spiral snail, but it will work.
+-DBMDEF= -DNEWDB
++DBMDEF= -DNEWDB -DNIS
+
+-CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
++CPPFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO -DTCPWRAPPERS
++LDADD+=-lwrap
++DPADD+=${LIBWRAP}
+
+ SRCS= alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
+ deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \
+ mci.c mime.c parseaddr.c queue.c readcf.c recipient.c safefile.c \
+ savemail.c srvrsmtp.c stab.c stats.c sysexits.c trace.c udb.c \
+ usersmtp.c util.c version.c
+-DPADD=
+-LDADD=
+-MAN1= mailq.0 newaliases.0
+-MAN5= aliases.0
+-MAN8= sendmail.0
+-LINKS= /usr/sbin/sendmail /usr/bin/newaliases \
+- /usr/sbin/sendmail /usr/bin/mailq
+-BINDIR= /usr/sbin
++MAN= aliases.5 mailq.1 newaliases.1 sendmail.8
++# symlinks are now made by the mailwrapper make file
++#SYMLINKS= /usr/sbin/sendmail /usr/bin/newaliases \
++# /usr/sbin/sendmail /usr/bin/mailq
++BINDIR= ${PREFIX}/libexec/sendmail
+ BINOWN= root
+ BINGRP= kmem
+ BINMODE=6555
++.if ${MKSHARE} != "no"
++FILES=sendmail.hf
++FILESDIR=${PREFIX}/share/misc
++.endif
+
+-beforeinstall:
+-# install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+-# ${DESTDIR}/etc/sendmail.fc
+- install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
++afterinstall:
++ ${INSTALL} ${INSTPRIV} -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+ ${DESTDIR}/var/log/sendmail.st
+- install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
+- ${DESTDIR}/usr/share/misc
+
+ .include <bsd.prog.mk>
diff --git a/mail/sendmail88/patches/patch-at b/mail/sendmail88/patches/patch-at
new file mode 100644
index 00000000000..f7b1ef9f921
--- /dev/null
+++ b/mail/sendmail88/patches/patch-at
@@ -0,0 +1,37 @@
+$NetBSD: patch-at,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/aliases.5.orig Sun Feb 2 01:24:50 1997
++++ src/aliases.5 Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt ALIASES 5
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm aliases
+ .Nd aliases file for sendmail
+@@ -83,7 +83,6 @@
+ .Sh SEE ALSO
+ .Xr newaliases 1 ,
+ .Xr dbopen 3 ,
+-.Xr dbm 3 ,
+ .Xr sendmail 8
+ .Rs
+ .%T "SENDMAIL Installation and Operation Guide"
+@@ -91,15 +90,6 @@
+ .Rs
+ .%T "SENDMAIL An Internetwork Mail Router"
+ .Re
+-.Sh BUGS
+-If you have compiled
+-.Xr sendmail
+-with DBM support instead of NEWDB,
+-you may have encountered problems in
+-.Xr dbm 3
+-restricting a single alias to about 1000 bytes of information.
+-You can get longer aliases by ``chaining''; that is, make the last name in
+-the alias be a dummy name which is a continuation alias.
+ .Sh HISTORY
+ The
+ .Nm
diff --git a/mail/sendmail88/patches/patch-au b/mail/sendmail88/patches/patch-au
new file mode 100644
index 00000000000..fa90200b215
--- /dev/null
+++ b/mail/sendmail88/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/arpadate.c.orig Sun Feb 2 01:24:49 1997
++++ src/arpadate.c Sat Feb 12 23:28:27 2000
+@@ -86,7 +86,7 @@
+ register struct tm *lt;
+ time_t t;
+ struct tm gmt;
+- char *tz;
++ const char *tz;
+ static char b[43 + TZNAME_MAX];
+
+ /*
diff --git a/mail/sendmail88/patches/patch-av b/mail/sendmail88/patches/patch-av
new file mode 100644
index 00000000000..b56fedd46ae
--- /dev/null
+++ b/mail/sendmail88/patches/patch-av
@@ -0,0 +1,50 @@
+$NetBSD: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/conf.c.orig Mon Oct 20 17:41:38 1997
++++ src/conf.c Sat Feb 12 23:28:27 2000
+@@ -1973,7 +1973,7 @@
+
+ /* Non Apollo stuff removed by Don Lewis 11/15/93 */
+ #ifndef lint
+-static char rcsid[] = "@(#)$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";
++static char rcsid[] = "@(#)$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";
+ #endif /* !lint */
+
+ #ifdef apollo
+@@ -2939,7 +2939,7 @@
+ * causing nast effects.
+ **************************************************************/
+
+-/*static char _id[] = "$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";*/
++/*static char _id[] = "$Id: patch-av,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $";*/
+ static void sm_dopr();
+ static char *DoprEnd;
+ static int SnprfOverflow;
+@@ -2997,7 +2997,7 @@
+
+ static void fmtstr __P((char *value, int ljust, int len, int zpad, int maxwidth));
+ static void fmtnum __P((long value, int base, int dosign, int ljust, int len, int zpad));
+-static void dostr __P(( char * , int ));
++static void dostr __P(( const char * , int ));
+ static char *output;
+ static void dopr_outch __P(( int c ));
+ static int SyslogErrno;
+@@ -3218,7 +3218,7 @@
+
+ static void
+ dostr( str , cut)
+- char *str;
++ const char *str;
+ int cut;
+ {
+ if (cut) {
+@@ -3315,8 +3315,7 @@
+ char *shell;
+ {
+ #if HASGETUSERSHELL
+- register char *p;
+- extern char *getusershell();
++ register const char *p;
+
+ if (shell == NULL || shell[0] == '\0' || wordinclass(user, 't') ||
+ ConfigLevel <= 1)
diff --git a/mail/sendmail88/patches/patch-aw b/mail/sendmail88/patches/patch-aw
new file mode 100644
index 00000000000..1fcfcc906b0
--- /dev/null
+++ b/mail/sendmail88/patches/patch-aw
@@ -0,0 +1,46 @@
+$NetBSD: patch-aw,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/daemon.c.orig Thu Oct 23 19:26:05 1997
++++ src/daemon.c Sat Feb 12 23:28:27 2000
+@@ -814,15 +814,13 @@
+
+ if (host[0] == '[')
+ {
+- long hid;
+ register char *p = strchr(host, ']');
+
+ if (p != NULL)
+ {
+ *p = '\0';
+ #if NETINET
+- hid = inet_addr(&host[1]);
+- if (hid == INADDR_NONE)
++ if (inet_aton(&host[1], &addr.sin.sin_addr) == 0)
+ #endif
+ {
+ /* try it as a host name (avoid MX lookup) */
+@@ -856,7 +854,6 @@
+ }
+ #if NETINET
+ addr.sin.sin_family = AF_INET; /*XXX*/
+- addr.sin.sin_addr.s_addr = hid;
+ #endif
+ }
+ else
+@@ -1131,6 +1128,7 @@
+ {
+ (void) strcpy(hostbuf, "localhost");
+ }
++ hostbuf[size - 1] = '\0';
+ hp = sm_gethostbyname(hostbuf);
+ if (hp == NULL)
+ return NULL;
+@@ -1721,7 +1719,7 @@
+ if ((cp = strchr(name, ']')) == NULL)
+ return (NULL);
+ *cp = '\0';
+- in_addr.s_addr = inet_addr(&name[1]);
++ (void) inet_aton(&name[1], &in_addr);
+ *cp = ']';
+
+ /* nope -- ask the name server */
diff --git a/mail/sendmail88/patches/patch-ax b/mail/sendmail88/patches/patch-ax
new file mode 100644
index 00000000000..7ebca8306c9
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ax
@@ -0,0 +1,20 @@
+$NetBSD: patch-ax,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/domain.c.orig Sat Aug 2 20:06:53 1997
++++ src/domain.c Sat Feb 12 23:28:27 2000
+@@ -362,13 +362,14 @@
+ if (host[0] == '[')
+ {
+ register char *p;
++ struct in_addr junk;
+
+ /* this may be an MX suppression-style address */
+ p = strchr(MXHostBuf, ']');
+ if (p != NULL)
+ {
+ *p = '\0';
+- if (inet_addr(&MXHostBuf[1]) != INADDR_NONE)
++ if (inet_aton(&MXHostBuf[1], &junk) != 0)
+ {
+ nmx++;
+ *p = ']';
diff --git a/mail/sendmail88/patches/patch-ay b/mail/sendmail88/patches/patch-ay
new file mode 100644
index 00000000000..44c5f57cfa9
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ay
@@ -0,0 +1,21 @@
+$NetBSD: patch-ay,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/mailq.1.orig Sun Feb 2 01:24:53 1997
++++ src/mailq.1 Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt MAILQ 1
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm mailq
+ .Nd print the mail queue
+@@ -81,6 +81,7 @@
+ .Nm mailq
+ utility exits 0 on success, and >0 if an error occurs.
+ .Sh SEE ALSO
++.Xr mailer.conf 5 ,
+ .Xr sendmail 8
+ .Sh HISTORY
+ The
diff --git a/mail/sendmail88/patches/patch-az b/mail/sendmail88/patches/patch-az
new file mode 100644
index 00000000000..cdc12dc877e
--- /dev/null
+++ b/mail/sendmail88/patches/patch-az
@@ -0,0 +1,12 @@
+$NetBSD: patch-az,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/map.c.orig Tue Oct 21 14:28:06 1997
++++ src/map.c Sat Feb 12 23:28:27 2000
+@@ -1139,6 +1139,7 @@
+ ndbm_map_store(map, "YP_LAST_MODIFIED", buf);
+
+ (void) gethostname(buf, sizeof buf);
++ buf[sizeof(buf) - 1] = '\0';
+ ndbm_map_store(map, "YP_MASTER_NAME", buf);
+
+ map->map_mflags = save_mflags;
diff --git a/mail/sendmail88/patches/patch-ba b/mail/sendmail88/patches/patch-ba
new file mode 100644
index 00000000000..4f7f3296102
--- /dev/null
+++ b/mail/sendmail88/patches/patch-ba
@@ -0,0 +1,21 @@
+$NetBSD: patch-ba,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/newaliases.1.orig Sun Feb 2 01:24:51 1997
++++ src/newaliases.1 Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt NEWALIASES 1
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm newaliases
+ .Nd rebuild the data base for the mail aliases file
+@@ -61,6 +61,7 @@
+ .El
+ .Sh SEE ALSO
+ .Xr aliases 5 ,
++.Xr mailer.conf 5 ,
+ .Xr sendmail 8
+ .Sh HISTORY
+ The
diff --git a/mail/sendmail88/patches/patch-bb b/mail/sendmail88/patches/patch-bb
new file mode 100644
index 00000000000..6d0d9e7622a
--- /dev/null
+++ b/mail/sendmail88/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/queue.c.orig Sat Oct 4 18:46:18 1997
++++ src/queue.c Sat Feb 12 23:28:27 2000
+@@ -1070,6 +1070,8 @@
+ (void) closedir(f);
+ wn++;
+
++ if (WorkList == NULL)
++ return (0);
+ wc = min(wn, WorkListSize);
+ if (wc > MaxQueueRun && MaxQueueRun > 0)
+ wc = MaxQueueRun;
diff --git a/mail/sendmail88/patches/patch-bc b/mail/sendmail88/patches/patch-bc
new file mode 100644
index 00000000000..21704981739
--- /dev/null
+++ b/mail/sendmail88/patches/patch-bc
@@ -0,0 +1,61 @@
+$NetBSD: patch-bc,v 1.1.1.1 2000/02/13 00:14:49 tron Exp $
+
+--- src/sendmail.8.orig Sun Feb 2 01:24:50 1997
++++ src/sendmail.8 Sat Feb 12 23:28:27 2000
+@@ -34,7 +34,7 @@
+ .\"
+ .Dd February 1, 1997
+ .Dt SENDMAIL 8
+-.Os BSD 4
++.Os
+ .Sh NAME
+ .Nm sendmail
+ .Nd an electronic mail transport agent
+@@ -142,9 +142,9 @@
+ Verify mode is normally used for validating
+ users or mailing lists.
+ .It Fl C Ns Ar file
+-Use alternate configuration file.
++Use alternative configuration file.
+ .Nm Sendmail
+-refuses to run as root if an alternate configuration file is specified.
++refuses to run as root if an alternative configuration file is specified.
+ .It Fl d Ns Ar X
+ Set debugging value to
+ .Ar X .
+@@ -268,7 +268,7 @@
+ .Ql hdrs
+ to return only the headers.
+ .It Fl r Ns Ar name
+-An alternate and obsolete form of the
++An alternative and obsolete form of the
+ .Fl f
+ flag.
+ .It Fl t
+@@ -324,7 +324,7 @@
+ The options are:
+ .Bl -tag -width Fl
+ .It Li AliasFile= Ns Ar file
+-Use alternate alias file.
++Use alternative alias file.
+ .It Li HoldExpensive
+ On mailers that are considered ``expensive'' to connect to,
+ don't initiate immediate connection.
+@@ -576,13 +576,14 @@
+ The process id of the daemon
+ .El
+ .Sh SEE ALSO
+-.Xr binmail 1 ,
+ .Xr mail 1 ,
+-.Xr rmail 1 ,
+ .Xr syslog 3 ,
+ .Xr aliases 5 ,
++.Xr mailer.conf 5 ,
+ .Xr mailaddr 7 ,
+-.Xr rc 8 ;
++.Xr mail.local 8 ,
++.Xr rc 8 ,
++.Xr rmail 8 ;
+ .Pp
+ DARPA
+ Internet Request For Comments
diff --git a/mail/sendmail88/pkg/COMMENT b/mail/sendmail88/pkg/COMMENT
new file mode 100644
index 00000000000..41cca76bfe8
--- /dev/null
+++ b/mail/sendmail88/pkg/COMMENT
@@ -0,0 +1 @@
+The well known Mail Transport Agent
diff --git a/mail/sendmail88/pkg/DESCR b/mail/sendmail88/pkg/DESCR
new file mode 100644
index 00000000000..3dd2e5933dd
--- /dev/null
+++ b/mail/sendmail88/pkg/DESCR
@@ -0,0 +1,8 @@
+Sendmail acts a unified "post office" to which all mail can be submitted.
+Address interpretation is controlled by a production system, which can
+parse both domain-based addressing and old-style "ad hoc" addresses.
+The production system is powerful enough to rewrite addresses in the message
+header to conform to the standards of a number of common target networks,
+including old (NCP/RFC733) Arpanet, new (TCP/RFC822) Arpanet, UUCP, and
+Phonenet. Sendmail also implements an SMTP server, message queueing, and
+aliasing.
diff --git a/mail/sendmail88/pkg/MESSAGE b/mail/sendmail88/pkg/MESSAGE
new file mode 100644
index 00000000000..a0d6221c0fd
--- /dev/null
+++ b/mail/sendmail88/pkg/MESSAGE
@@ -0,0 +1,5 @@
+To use "@@PKGNAME@@" as the system's mail transport agent you have
+to install "@@PREFIX@@/etc/mailer.conf.sendmail" as global mailwrapper
+configuration file. The command below will do that for you:
+
+ln -fs @@PREFIX@@/etc/mailer.conf.sendmail /etc/mailer.conf
diff --git a/mail/sendmail88/pkg/PLIST b/mail/sendmail88/pkg/PLIST
new file mode 100644
index 00000000000..4f9c3c73881
--- /dev/null
+++ b/mail/sendmail88/pkg/PLIST
@@ -0,0 +1,114 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+etc/mailer.conf.sendmail
+libexec/sendmail/sendmail
+libexec/sendmail/smrsh
+sbin/mailstats
+sbin/makemap
+sbin/praliases
+share/misc/sendmail.hf
+share/sendmail/siteconfig/uucp.cogsci.m4
+share/sendmail/siteconfig/uucp.old.arpa.m4
+share/sendmail/siteconfig/uucp.ucbarpa.m4
+share/sendmail/siteconfig/uucp.ucbvax.m4
+share/sendmail/cf/Makefile
+share/sendmail/cf/clientproto.mc
+share/sendmail/cf/netbsd-proto.mc
+share/sendmail/cf/tcpproto.mc
+share/sendmail/cf/uucpproto.mc
+share/sendmail/domain/Berkeley.EDU.m4
+share/sendmail/domain/CS.Berkeley.EDU.m4
+share/sendmail/domain/EECS.Berkeley.EDU.m4
+share/sendmail/domain/S2K.Berkeley.EDU.m4
+share/sendmail/domain/generic.m4
+share/sendmail/domain/berkeley-only.m4
+share/sendmail/feature/virtusertable.m4
+share/sendmail/feature/allmasquerade.m4
+share/sendmail/feature/always_add_domain.m4
+share/sendmail/feature/bestmx_is_local.m4
+share/sendmail/feature/bitdomain.m4
+share/sendmail/feature/domaintable.m4
+share/sendmail/feature/genericstable.m4
+share/sendmail/feature/limited_masquerade.m4
+share/sendmail/feature/local_procmail.m4
+share/sendmail/feature/mailertable.m4
+share/sendmail/feature/masquerade_entire_domain.m4
+share/sendmail/feature/nocanonify.m4
+share/sendmail/feature/masquerade_envelope.m4
+share/sendmail/feature/nodns.m4
+share/sendmail/feature/notsticky.m4
+share/sendmail/feature/nouucp.m4
+share/sendmail/feature/nullclient.m4
+share/sendmail/feature/redirect.m4
+share/sendmail/feature/smrsh.m4
+share/sendmail/feature/stickyhost.m4
+share/sendmail/feature/use_ct_file.m4
+share/sendmail/feature/use_cw_file.m4
+share/sendmail/feature/uucpdomain.m4
+share/sendmail/hack/cssubdomain.m4
+share/sendmail/m4/cf.m4
+share/sendmail/m4/cfhead.m4
+share/sendmail/m4/nullrelay.m4
+share/sendmail/m4/proto.m4
+share/sendmail/m4/version.m4
+share/sendmail/mailer/uucp.m4
+share/sendmail/mailer/fax.m4
+share/sendmail/mailer/local.m4
+share/sendmail/mailer/mail11.m4
+share/sendmail/mailer/phquery.m4
+share/sendmail/mailer/pop.m4
+share/sendmail/mailer/procmail.m4
+share/sendmail/mailer/smtp.m4
+share/sendmail/mailer/usenet.m4
+share/sendmail/mailer/cyrus.m4
+share/sendmail/ostype/aix2.m4
+share/sendmail/ostype/aix3.m4
+share/sendmail/ostype/aix4.m4
+share/sendmail/ostype/altos.m4
+share/sendmail/ostype/amdahl-uts.m4
+share/sendmail/ostype/aux.m4
+share/sendmail/ostype/bsd4.3.m4
+share/sendmail/ostype/bsd4.4.m4
+share/sendmail/ostype/bsdi1.0.m4
+share/sendmail/ostype/bsdi2.0.m4
+share/sendmail/ostype/dgux.m4
+share/sendmail/ostype/domainos.m4
+share/sendmail/ostype/dynix3.2.m4
+share/sendmail/ostype/gnuhurd.m4
+share/sendmail/ostype/hpux10.m4
+share/sendmail/ostype/hpux9.m4
+share/sendmail/ostype/irix4.m4
+share/sendmail/ostype/irix5.m4
+share/sendmail/ostype/irix6.m4
+share/sendmail/ostype/isc4.1.m4
+share/sendmail/ostype/linux.m4
+share/sendmail/ostype/maxion.m4
+share/sendmail/ostype/mklinux.m4
+share/sendmail/ostype/nextstep.m4
+share/sendmail/ostype/osf1.m4
+share/sendmail/ostype/powerux.m4
+share/sendmail/ostype/ptx2.m4
+share/sendmail/ostype/riscos4.5.m4
+share/sendmail/ostype/sco3.2.m4
+share/sendmail/ostype/sco-uw-2.1.m4
+share/sendmail/ostype/sinix.m4
+share/sendmail/ostype/solaris2.m4
+share/sendmail/ostype/solaris2.ml.m4
+share/sendmail/ostype/sunos3.5.m4
+share/sendmail/ostype/sunos4.1.m4
+share/sendmail/ostype/svr4.m4
+share/sendmail/ostype/ultrix4.m4
+share/sendmail/ostype/unknown.m4
+share/sendmail/ostype/uxpds.m4
+share/sendmail/sh/makeinfo.sh
+share/sendmail/README
+@dirrm libexec/sendmail
+@dirrm share/sendmail/siteconfig
+@dirrm share/sendmail/sh
+@dirrm share/sendmail/ostype
+@dirrm share/sendmail/mailer
+@dirrm share/sendmail/m4
+@dirrm share/sendmail/hack
+@dirrm share/sendmail/feature
+@dirrm share/sendmail/domain
+@unexec rm -rf %D/share/sendmail/cf
+@dirrm share/sendmail
diff --git a/mail/sendmail88/pkg/PLIST.catinstall b/mail/sendmail88/pkg/PLIST.catinstall
new file mode 100644
index 00000000000..0fa563b626c
--- /dev/null
+++ b/mail/sendmail88/pkg/PLIST.catinstall
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.catinstall,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+man/cat1/mailq.0
+man/cat1/newaliases.0
+man/cat5/aliases.0
+man/cat8/makemap.0
+man/cat8/smrsh.0
+man/cat8/mailstats.0
+man/cat8/praliases.0
+man/cat8/sendmail.0
diff --git a/mail/sendmail88/pkg/PLIST.maninstall b/mail/sendmail88/pkg/PLIST.maninstall
new file mode 100644
index 00000000000..9d5ec4315a3
--- /dev/null
+++ b/mail/sendmail88/pkg/PLIST.maninstall
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.maninstall,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+man/man1/mailq.1
+man/man1/newaliases.1
+man/man5/aliases.5
+man/man8/makemap.8
+man/man8/smrsh.8
+man/man8/mailstats.8
+man/man8/praliases.8
+man/man8/sendmail.8