8.12.11nb5:

Don't install .cf files to /etc/mail directly at all; offer a message
about how to install them instead.  Don't create /etc/mail/statistics.
Create mqueue dirs at install via MAKE_DIRS.  Should fix PR pkg/20852.

While here, fixup manpages to act like mail/sendmail so that they are
uniform across build platforms.

5 files changed, 48 insertions, 18 deletions

diff --git a/mail/sendmail812/MESSAGE b/mail/sendmail812/MESSAGE
index 74ddf6200f7..6e86a15da3b 100644
--- a/mail/sendmail812/MESSAGE
+++ b/mail/sendmail812/MESSAGE
@@ -1,9 +1,21 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2004/08/30 19:56:45 adrianp Exp $
+$NetBSD: MESSAGE,v 1.2 2006/10/12 21:05:25 tv Exp $
 
 To use "${PKGNAME}" as the system's mail transport agent you have
 to install "${PREFIX}/share/examples/sendmail/mailer.conf" as global
 mailwrapper configuration file.  The command below will do that for you:
 
 ln -fs ${PREFIX}/share/examples/sendmail/mailer.conf /etc/mailer.conf
+
+If you are changing the database format used by sendmail you must run
+"newaliases" and "makemap" in order to re-create the databases.
+
+You may also need to install (and/or customize) the configuration files
+for Sendmail before it will be operational.  "cd" to the directory
+
+    ${PREFIX}/share/sendmail/cf
+
+and read the file README for instructions on creating and installing
+configuration files.
+
 ===========================================================================
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 5988b302808..6b21c723b21 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2006/09/05 20:06:06 tv Exp $
+# $NetBSD: Makefile,v 1.14 2006/10/12 21:05:25 tv Exp $
 
 .include "options.mk"
 .include "../../mail/sendmail812/Makefile.common"
 
 PKGNAME=	sendmail-${DIST_VERS}
-PKGREVISION=	4
+PKGREVISION=	5
 COMMENT=	The well known Mail Transport Agent
 HAS_SIG=	yes
 
@@ -17,6 +17,12 @@ PKG_GROUPS=		smmsp
 PKG_USERS=		smmsp:smmsp
 PKG_GECOS.smmsp=	Sendmail Message Submission Program
 
+# Not OWN_DIRS, so that the admin doesn't get a suggestion to delete the
+# queue dirs if they are nonempty at deinstall (probably undesirable).
+#
+MAKE_DIRS_PERMS+=	/var/spool/clientmqueue smmsp smmsp 0770
+MAKE_DIRS_PERMS+=	/var/spool/mqueue ${ROOT_USER} ${ROOT_GROUP} 0755
+
 post-patch: make-sendmail-siteconfig
 .if !empty(PKG_OPTIONS:Mtcpwrappers)
 	${CAT} ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
index 4637b991db3..4ee6ec7a356 100644
--- a/mail/sendmail812/Makefile.common
+++ b/mail/sendmail812/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.12 2006/06/13 20:34:38 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.13 2006/10/12 21:05:25 tv Exp $
 #
-# Makefile fragment shared with libmilter
+# Makefile fragment [formerly] shared with libmilter
 #
 
 DISTNAME=	sendmail.${DIST_VERS}
diff --git a/mail/sendmail812/PLIST b/mail/sendmail812/PLIST
index 51268edbd27..70955766ba7 100644
--- a/mail/sendmail812/PLIST
+++ b/mail/sendmail812/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/30 19:56:44 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/10/12 21:05:25 tv Exp $
 bin/hoststat
 bin/mailq
 bin/newaliases
@@ -8,16 +8,16 @@ lib/libsm.a
 lib/libsmutil.a
 libexec/sendmail/sendmail
 libexec/sendmail/smrsh
-man/cat1/mailq.0
-man/cat1/newaliases.0
-man/cat1/vacation.0
-man/cat5/aliases.0
-man/cat8/editmap.0
-man/cat8/mailstats.0
-man/cat8/makemap.0
-man/cat8/praliases.0
-man/cat8/sendmail.0
-man/cat8/smrsh.0
+man/man1/mailq.1
+man/man1/newaliases.1
+man/man1/vacation.1
+man/man5/aliases.5
+man/man8/editmap.8
+man/man8/mailstats.8
+man/man8/makemap.8
+man/man8/praliases.8
+man/man8/sendmail.8
+man/man8/smrsh.8
 sbin/editmap
 sbin/mailstats
 sbin/makemap
diff --git a/mail/sendmail812/files/site.config.m4 b/mail/sendmail812/files/site.config.m4
index c0f2f025461..b2fd5331d7c 100644
--- a/mail/sendmail812/files/site.config.m4
+++ b/mail/sendmail812/files/site.config.m4
@@ -1,4 +1,4 @@
-# $NetBSD: site.config.m4,v 1.1.1.1 2004/08/30 19:56:46 adrianp Exp $
+# $NetBSD: site.config.m4,v 1.2 2006/10/12 21:05:25 tv Exp $
 
 # pathnames specific to pkgsrc
 #
@@ -7,6 +7,18 @@ define(`confMBINDIR', `${PREFIX}/libexec/sendmail')
 define(`confSBINDIR', `${PREFIX}/sbin')
 define(`confUBINDIR', `${PREFIX}/bin')
 define(`confHFDIR', `${PREFIX}/share/misc')
-define(`confMANROOT', `${PREFIX}/man/cat')
+define(`confINSTALL_RAWMAN', 'yes')
+define(`confDONT_INSTALL_CATMAN', 'yes')
+define(`confMANROOT', `${PREFIX}/${PKGMANDIR}/man')
+define(`confMANROOTMAN', `${PREFIX}/${PKGMANDIR}/man')
+define(`confMAN1EXT', `1')
+define(`confMAN3EXT', `3')
+define(`confMAN4EXT', `4')
+define(`confMAN5EXT', `5')
+define(`confMAN8EXT', `8')
 APPENDDEF(`confENVDEF', `-I${PREFIX}/include')
 APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
+
+# the following are handled by pkgsrc
+define(`confINST_DEP',`')
+define(`confNO_STATISTICS_INSTALL')