Major cleanup:

- Use Sleepycat Software's DB library from "db-2.7.3" package.
- Install complete package because we need a tools using the new DB
  library.

5 files changed, 64 insertions, 28 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index f65063d04c3..787a4f63553 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/04/08 23:00:33 tron Exp $
+# $NetBSD: Makefile,v 1.2 1999/04/10 16:41:21 tron Exp $
 
 DISTNAME=	sendmail.8.9.3
 PKGNAME=	sendmail-8.9.3
@@ -9,16 +9,17 @@ MASTER_SITES=	ftp://ftp.sendmail.org/pub/sendmail/ \
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.sendmail.org/
 
+DEPENDS+=	db-2.7.3:../../databases/db
+
 LICENSE=	no-profit
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 NO_CONFIGURE=	yes
+MAKE_ENV+=	MANOWN="${MANOWN}" MANGRP="${MANGRP}" MANMODE="${MANMODE}"
+
+MESSAGE_FILE=	${WRKDIR}/MESSAGE
 WRKSRC=		${WRKDIR}/${PKGNAME}
 OBJDIR!=	echo obj.`uname -srm | tr \  .`
 
-LIBEXECDIR=	${PREFIX}/libexec/sendmail
-SBINDIR=	${PREFIX}/sbin
-
 post-build:
 	${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \
 	  -e 's#@@PREFIX@@#${PREFIX}#g' \
@@ -26,19 +27,11 @@ post-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
 	  <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail
 
-do-install:
+pre-install:
+	${MKDIR} ${PREFIX}/libexec/sendmail
+
+post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf.sendmail ${PREFIX}/etc
-	${MKDIR} -p ${LIBEXECDIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${OBJDIR}/sendmail ${LIBEXECDIR}
-	${CHMOD} u+s ${LIBEXECDIR}/sendmail
-.for SECTION in 1 5 8
-	${INSTALL_DATA} ${WRKSRC}/src/${OBJDIR}/*.${SECTION} \
-	  ${PREFIX}/man/man${SECTION}
-.endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/mailstats/${OBJDIR}/mailstats ${SBINDIR}
-	${INSTALL_DATA} ${WRKSRC}/mailstats/${OBJDIR}/*.8 ${PREFIX}/man/man8
-	${INSTALL_PROGRAM} ${WRKSRC}/praliases/${OBJDIR}/praliases ${SBINDIR}
-	${INSTALL_DATA} ${WRKSRC}/praliases/${OBJDIR}/*.8 ${PREFIX}/man/man8
 	${CP} -pr ${WRKSRC}/cf ${PREFIX}/share/sendmail
 	${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/sendmail
 
diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
index 652e84e3c1f..06c9e2a87e8 100644
--- a/mail/sendmail/patches/patch-aa
+++ b/mail/sendmail/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/04/08 23:00:33 tron Exp $
+$NetBSD: patch-aa,v 1.2 1999/04/10 16:41:21 tron Exp $
 
 --- src/Makefile.m4.orig	Sun Jan 24 00:51:41 1999
-+++ src/Makefile.m4	Fri Apr  9 00:28:36 1999
++++ src/Makefile.m4	Sat Apr 10 18:04:54 1999
 @@ -27,7 +27,7 @@
  MAPDEF=	ifdef(`confMAPDEF', `confMAPDEF')
  
@@ -20,3 +20,14 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/04/08 23:00:33 tron Exp $
  
  # location of sendmail binary (usually /usr/sbin or /usr/lib)
  BINDIR=	${DESTDIR}ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
+@@ -87,10 +87,6 @@
+ BINOWN=	ifdef(`confSBINOWN', `confSBINOWN', `root')
+ BINGRP=	ifdef(`confSBINGRP', `confSBINGRP', `kmem')
+ BINMODE=ifdef(`confSBINMODE', `confSBINMODE', `4555')
+-
+-MANOWN=	ifdef(`confMANOWN', `confMANOWN', `bin')
+-MANGRP=	ifdef(`confMANGRP', `confMANGRP', `bin')
+-MANMODE=ifdef(`confMANMODE', `confMANMODE', `444')
+ 
+ MANROOT=${DESTDIR}ifdef(`confMANROOT', `confMANROOT', `/usr/share/man/cat')
+ MAN1=	${MANROOT}ifdef(`confMAN1', `confMAN1', `1')
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
new file mode 100644
index 00000000000..a3dd373d86c
--- /dev/null
+++ b/mail/sendmail/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.1 1999/04/10 16:41:21 tron Exp $
+
+--- BuildTools/OS/NetBSD.orig	Tue Dec 29 18:39:50 1998
++++ BuildTools/OS/NetBSD	Sat Apr 10 18:22:57 1999
+@@ -1,4 +1,14 @@
+ #	@(#)NetBSD	8.6	(Berkeley)	3/12/1998
+ define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
+-define(`confENVDEF', ` -DNETISO')
++define(`confENVDEF', ` -DNETISO -I${PREFIX}/include/db2')
+ define(`confDEPEND_TYPE', `CC-M')
++define(`confLIBS', `-L${PREFIX}/lib -ldb2')
++define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
++define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
++define(`confSBINDIR', `${PREFIX}/sbin')
++define(`confUBINDIR', `${PREFIX}/bin')
++define(`confHFDIR', `${PREFIX}/share/misc')
++define(`confMANROOT', `${PREFIX}/man/cat')
++define(`confMAN1EXT', `0')
++define(`confMAN5EXT', `0')
++define(`confMAN8EXT', `0')
diff --git a/mail/sendmail/pkg/MESSAGE b/mail/sendmail/pkg/MESSAGE
index a0d6221c0fd..38a5acf4d81 100644
--- a/mail/sendmail/pkg/MESSAGE
+++ b/mail/sendmail/pkg/MESSAGE
@@ -3,3 +3,6 @@ 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
+
+If you are upgrading from "sendmail" 8.8.x don't forget to rebuild all
+databases with "newaliases" and "makemap".
diff --git a/mail/sendmail/pkg/PLIST b/mail/sendmail/pkg/PLIST
index 050cc272b20..3e17e602f60 100644
--- a/mail/sendmail/pkg/PLIST
+++ b/mail/sendmail/pkg/PLIST
@@ -1,14 +1,23 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/08 23:00:33 tron Exp $
-sbin/mailstats
-sbin/praliases
+@comment $NetBSD: PLIST,v 1.2 1999/04/10 16:41:22 tron Exp $
+bin/newaliases
+bin/mailq
+bin/hoststat
+bin/purgestat
 etc/mailer.conf.sendmail
 libexec/sendmail/sendmail
-man/man1/newaliases.1
-man/man1/mailq.1
-man/man5/aliases.5
-man/man8/praliases.8
-man/man8/mailstats.8
-man/man8/sendmail.8
+libexec/sendmail/smrsh
+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
+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