Add Solaris support and move the libwrap support from patch-ab to patch-aa.

9 files changed, 89 insertions, 40 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 6ea2d7c1d0f..71df98ea481 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/06/14 07:30:23 kleink Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/14 13:02:16 veego Exp $
 
 DISTNAME=	sendmail.8.9.3
 PKGNAME=	sendmail-8.9.3
@@ -34,14 +34,18 @@ BUILD_DEFS+=    USE_INET6
 MAKE_ENV+=	CONFIG="-f ${WRKSRC}/site.config-v6"
 .endif
 
+.if ${OPSYS} == "SunOS"
+USE_DB2?=	YES
+.else
 USE_DB2?=	NO
+.endif
 
 .if ${USE_DB2} == YES
 DEPENDS+=	db-2.7.7:../../databases/db
 
 MAKE_ENV+=	DB_ENVDEF="-I${LOCALBASE}/include/db2" \
 		DB_LIBS="-L${LOCALBASE}/lib -ldb2"
-PLIST_SRC=	${WRKDIR}/PLIST
+PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 .else
 MAKE_ENV+=	DB_ENVDEF="" DB_LIBS=""
 .endif
@@ -71,7 +75,7 @@ post-build:
 	${ECHO} >>${MESSAGE_FILE} ""
 	${ECHO} >>${MESSAGE_FILE} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all"
 	${ECHO} >>${MESSAGE_FILE} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"."
-	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+	${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} > ${PLIST_SRC}
 	${ECHO} >>${PLIST_SRC} "@exec mv -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || true"
 	${ECHO} >>${PLIST_SRC} "@unexec mv -f /usr/sbin/makemap.8.8 /usr/sbin/makemap || true"
 .endif
diff --git a/mail/sendmail/files/patch-sum b/mail/sendmail/files/patch-sum
index 45139ad664b..4951d710ea8 100644
--- a/mail/sendmail/files/patch-sum
+++ b/mail/sendmail/files/patch-sum
@@ -1,4 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/06/14 07:30:23 kleink Exp $
+$NetBSD: patch-sum,v 1.4 2000/06/14 13:02:18 veego Exp $
 
-MD5 (patch-aa) = b678944a13c676198b3c0c62b9e82939
-MD5 (patch-ab) = 38e9dd26e2ca9b0bedf478342ab9f503
+MD5 (patch-aa) = 51b51b2f4a0e7e7ae43d7dce87bb2839
+MD5 (patch-ac) = 8992bc4367ca2837c86188d062b928ab
+MD5 (patch-ad) = da51c3f50ad35e54a9c232553f374c2c
diff --git a/mail/sendmail/patches/patch-aa b/mail/sendmail/patches/patch-aa
index 3989f29493d..a62aaf8479c 100644
--- a/mail/sendmail/patches/patch-aa
+++ b/mail/sendmail/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2000/06/14 07:30:24 kleink Exp $
+$NetBSD: patch-aa,v 1.9 2000/06/14 13:02:18 veego Exp $
 
 --- BuildTools/OS/NetBSD.orig	Tue Dec 29 18:39:50 1998
 +++ BuildTools/OS/NetBSD	Tue Jun 13 19:34:47 2000
@@ -7,9 +7,9 @@ $NetBSD: patch-aa,v 1.8 2000/06/14 07:30:24 kleink Exp $
 -define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX')
 -define(`confENVDEF', ` -DNETISO')
 +define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX ${LDAP_CONF}')
-+define(`confENVDEF', ` -DNETISO ${DB_ENVDEF} ${LDAP_ENVDEF}')
++define(`confENVDEF', ` -DNETISO -DTCPWRAPPERS ${DB_ENVDEF} ${LDAP_ENVDEF}')
  define(`confDEPEND_TYPE', `CC-M')
-+define(`confLIBS', `${DB_LIBS} ${LDAP_LIBS} ${LDFLAGS}')
++define(`confLIBS', `-lwrap ${DB_LIBS} ${LDAP_LIBS} ${LDFLAGS}')
 +define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
 +define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
 +define(`confSBINDIR', `${PREFIX}/sbin')
diff --git a/mail/sendmail/patches/patch-ab b/mail/sendmail/patches/patch-ab
deleted file mode 100644
index 56e3687b7b6..00000000000
--- a/mail/sendmail/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 1999/06/30 10:02:59 tron Exp $
-
---- src/Makefile.m4.orig	Wed Jun 30 11:58:18 1999
-+++ src/Makefile.m4	Wed Jun 30 11:58:40 1999
-@@ -27,7 +27,7 @@
- MAPDEF=	ifdef(`confMAPDEF', `confMAPDEF')
- 
- # environment definitions (e.g., -D_AIX3)
--ENVDEF=	ifdef(`confENVDEF', `confENVDEF')
-+ENVDEF=	ifdef(`confENVDEF', `confENVDEF') -DTCPWRAPPERS
- 
- # see also conf.h for additional compilation flags
- 
-@@ -42,7 +42,7 @@
- 
- # libraries required on your system
- #  delete -l44bsd if you are not running BIND 4.9.x
--LIBS=	ifdef(`confLIBS', `confLIBS')
-+LIBS=	ifdef(`confLIBS', `confLIBS') -lwrap
- 
- # location of sendmail binary (usually /usr/sbin or /usr/lib)
- BINDIR=	${DESTDIR}ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin')
diff --git a/mail/sendmail/patches/patch-ac b/mail/sendmail/patches/patch-ac
new file mode 100644
index 00000000000..e57b2383b29
--- /dev/null
+++ b/mail/sendmail/patches/patch-ac
@@ -0,0 +1,28 @@
+--- BuildTools/OS/SunOS.5.7~	Mon Jan 18 02:30:45 1999
++++ BuildTools/OS/SunOS.5.7	Wed Jun 14 11:07:52 2000
+@@ -1,14 +1,19 @@
+ #	@(#)SunOS.5.7	8.11	(Berkeley)	3/21/1998
+ define(`confCC', `gcc')
+ define(`confBEFORE', `sysexits.h')
+-define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+-define(`confENVDEF', `-DSOLARIS=20700 ')
+-define(`confLIBS', `-lsocket -lnsl')
+-define(`confMBINDIR', `/usr/lib')
+-define(`confEBINDIR', `/usr/lib')
++define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX ${LDAP_CONF}')
++define(`confENVDEF', `-DSOLARIS=20700 ${DB_ENVDEF} ${LDAP_ENVDEF}')
++define(`confLIBS', `-lsocket -lnsl ${DB_LIBS} ${LDAP_LIBS} ${LDFLAGS}')
++define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
++define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
++define(`confSBINDIR', `${PREFIX}/sbin')
++define(`confUBINDIR', `${PREFIX}/bin')
++define(`confNROFF', `/usr/bin/cat')
++define(`confMANDOC', `')
++define(`confMANROOT', `${PREFIX}/man/man')
+ define(`confSBINGRP', `sys')
+ define(`confSTDIR', `/etc/mail')
+-define(`confHFDIR', `/etc/mail')
++define(`confHFDIR', `${PREFIX}/share/misc')
+ define(`confINSTALL', `${BUILDBIN}/install.sh')
+ define(`confDEPEND_TYPE', `CC-M')
+ PUSHDIVERT(3)
diff --git a/mail/sendmail/patches/patch-ad b/mail/sendmail/patches/patch-ad
new file mode 100644
index 00000000000..9f7165ec400
--- /dev/null
+++ b/mail/sendmail/patches/patch-ad
@@ -0,0 +1,28 @@
+--- BuildTools/OS/SunOS.5.8	Mon Jan 18 02:31:23 1999
++++ BuildTools/OS/SunOS.5.8	Wed Jun 14 12:16:00 2000
+@@ -1,14 +1,19 @@
+ #	@(#)SunOS.5.8	8.1	(Berkeley)	1/17/1999
+ define(`confCC', `gcc')
+ define(`confBEFORE', `sysexits.h')
+-define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX')
+-define(`confENVDEF', `-DSOLARIS=20800 ')
+-define(`confLIBS', `-lsocket -lnsl')
+-define(`confMBINDIR', `/usr/lib')
+-define(`confEBINDIR', `/usr/lib')
++define(`confMAPDEF', `-DNDBM -DNIS -DNISPLUS -DMAP_REGEX ${LDAP_CONF}')
++define(`confENVDEF', `-DSOLARIS=20800 ${DB_ENVDEF} ${LDAP_ENVDEF}')
++define(`confLIBS', `-lsocket -lnsl ${DB_LIBS} ${LDAP_LIBS} ${LDFLAGS}')
++define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
++define(`confEBINDIR', `${PREFIX}/libexec/sendmail')
++define(`confSBINDIR', `${PREFIX}/sbin')
++define(`confUBINDIR', `${PREFIX}/bin')
++define(`confNROFF', `/usr/bin/cat')
++define(`confMANDOC', `')
++define(`confMANROOT', `${PREFIX}/man/man')
+ define(`confSBINGRP', `sys')
+ define(`confSTDIR', `/etc/mail')
+-define(`confHFDIR', `/etc/mail')
++define(`confHFDIR', `${PREFIX}/share/misc')
+ define(`confINSTALL', `${BUILDBIN}/install.sh')
+ define(`confDEPEND_TYPE', `CC-M')
+ PUSHDIVERT(3)
diff --git a/mail/sendmail/pkg/PLIST b/mail/sendmail/pkg/PLIST.common
index 222e30f8d96..3d08ca1bab7 100644
--- a/mail/sendmail/pkg/PLIST
+++ b/mail/sendmail/pkg/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/12/01 21:31:04 tron Exp $
+@comment $NetBSD: PLIST.common,v 1.1 2000/06/14 13:02:24 veego Exp $
 bin/newaliases
 bin/mailq
 bin/hoststat
@@ -6,14 +6,6 @@ bin/purgestat
 etc/mailer.conf.sendmail
 libexec/sendmail/sendmail
 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
diff --git a/mail/sendmail/pkg/PLIST.netbsd b/mail/sendmail/pkg/PLIST.netbsd
new file mode 100644
index 00000000000..57f7420d079
--- /dev/null
+++ b/mail/sendmail/pkg/PLIST.netbsd
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.netbsd,v 1.1 2000/06/14 13:02:26 veego 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/sendmail/pkg/PLIST.solaris b/mail/sendmail/pkg/PLIST.solaris
new file mode 100644
index 00000000000..174860c4495
--- /dev/null
+++ b/mail/sendmail/pkg/PLIST.solaris
@@ -0,0 +1,9 @@
+@comment $NetBSD: PLIST.solaris,v 1.1 2000/06/14 13:02:28 veego 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