Switch back to one PLIST file by adding a site.config.m4-solaris for the

manpage extensions and directories.

5 files changed, 24 insertions, 23 deletions

diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index da0e6a590e0..6903f12391d 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2001/09/09 16:41:40 taca Exp $
+# $NetBSD: Makefile,v 1.41 2001/10/19 08:51:31 veego Exp $
 
 DISTNAME=	sendmail.8.11.6
 PKGNAME=	sendmail-8.11.6nb1
@@ -72,6 +72,9 @@ post-patch:
 	${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >> ${SITECONFIG}
 	${ECHO} -n ' TCPWRAPPERS' >> ${DESCR_SRC}
 .endif
+.if ${OPSYS} == "SunOS"
+	${CAT} ${FILESDIR}/site.config.m4-solaris >> ${SITECONFIG}
+.endif
 .if defined(USE_LDAP) && ${USE_LDAP} == YES
 	${CAT} ${FILESDIR}/site.config.m4-ldap >> ${SITECONFIG}
 	${ECHO} -n ' LDAP' >> ${DESCR_SRC}
@@ -92,7 +95,7 @@ do-build:
 post-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
 	  <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail
-	${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} > ${PLIST_SRC}
+	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
 	${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
 .if ${USE_DB2} == YES
 	${ECHO} "" >> ${MESSAGE_SRC}
diff --git a/mail/sendmail/files/site.config.m4-solaris b/mail/sendmail/files/site.config.m4-solaris
new file mode 100644
index 00000000000..461a09f9b69
--- /dev/null
+++ b/mail/sendmail/files/site.config.m4-solaris
@@ -0,0 +1,9 @@
+# $NetBSD: site.config.m4-solaris,v 1.1 2001/10/19 08:51:32 veego Exp $
+
+# man pathnames specific for Solaris
+#
+define(`confMAN1EXT', `0')
+define(`confMAN3EXT', `0')
+define(`confMAN4EXT', `0')
+define(`confMAN5EXT', `0')
+define(`confMAN8EXT', `0')
diff --git a/mail/sendmail/pkg/PLIST.common b/mail/sendmail/pkg/PLIST
index bd874268884..606dadc1293 100644
--- a/mail/sendmail/pkg/PLIST.common
+++ b/mail/sendmail/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.7 2001/05/29 03:31:26 itojun Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/10/19 08:51:32 veego Exp $
 bin/newaliases
 bin/mailq
 bin/hoststat
@@ -7,6 +7,15 @@ bin/vacation
 etc/mailer.conf.sendmail
 libexec/sendmail/sendmail
 libexec/sendmail/smrsh
+man/cat1/mailq.0
+man/cat1/newaliases.0
+man/cat1/vacation.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
deleted file mode 100644
index fe68ad1f6ff..00000000000
--- a/mail/sendmail/pkg/PLIST.netbsd
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.netbsd,v 1.2 2000/09/05 11:58:07 wiz Exp $
-man/cat1/mailq.0
-man/cat1/newaliases.0
-man/cat1/vacation.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
deleted file mode 100644
index 13127d5fb73..00000000000
--- a/mail/sendmail/pkg/PLIST.solaris
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD: PLIST.solaris,v 1.2 2000/09/05 11:58:07 wiz Exp $
-man/man1/mailq.1
-man/man1/newaliases.1
-man/man1/vacation.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