[pkgsrc/trunk]: pkgsrc/mail/sendmail 8.13.8nb2:

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f791737a6399
branches:  trunk
changeset: 519963:f791737a6399
user:      tv <tv%pkgsrc.org@localhost>
date:      Thu Oct 12 21:04:27 2006 +0000

description:
8.13.8nb2:

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.

Make sure SMRSH_CMDDIR gets to the compile defs.  Fixes PR pkg/34513.

diffstat:

 mail/sendmail/MESSAGE              |  11 ++++++++++-
 mail/sendmail/Makefile             |  18 ++++++++++++------
 mail/sendmail/Makefile.common      |   5 +++--
 mail/sendmail/files/site.config.m4 |   8 ++++++--
 4 files changed, 31 insertions(+), 11 deletions(-)

diffs (106 lines):

diff -r 4c78948db65b -r f791737a6399 mail/sendmail/MESSAGE
--- a/mail/sendmail/MESSAGE     Thu Oct 12 20:52:40 2006 +0000
+++ b/mail/sendmail/MESSAGE     Thu Oct 12 21:04:27 2006 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/02/10 22:17:24 adrianp Exp $
+$NetBSD: MESSAGE,v 1.5 2006/10/12 21:04:27 tv Exp $
 
 To use "${PKGNAME}" as the system's mail transport agent you have
 to install "${PREFIX}/share/examples/sendmail/mailer.conf" as global
@@ -9,4 +9,13 @@
 
 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 -r 4c78948db65b -r f791737a6399 mail/sendmail/Makefile
--- a/mail/sendmail/Makefile    Thu Oct 12 20:52:40 2006 +0000
+++ b/mail/sendmail/Makefile    Thu Oct 12 21:04:27 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.92 2006/09/05 20:01:37 tv Exp $
+# $NetBSD: Makefile,v 1.93 2006/10/12 21:04:27 tv Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
 PKGNAME=       sendmail-${DIST_VERS}
-PKGREVISION=   1
+PKGREVISION=   2
 COMMENT=       The well known Mail Transport Agent
 
 CONFLICTS+=    courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
@@ -15,6 +15,16 @@
 PLIST_SUBST+=  SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
 RCD_SCRIPTS=   sendmail smmsp
 
+# 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
+
+PKG_GROUPS=            smmsp
+PKG_USERS=             smmsp:smmsp
+PKG_GECOS.smmsp=       Sendmail Message Submission Program
+
 SUBST_CLASSES+=                paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     ../mailer.conf include/sm/conf.h smrsh/smrsh.8 cf/cf/Makefile
@@ -92,10 +102,6 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${PREFIX}/share/doc/sendmail
        ${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${PREFIX}/share/doc/sendmail
 
-PKG_GROUPS=            smmsp
-PKG_USERS=             smmsp:smmsp
-PKG_GECOS.smmsp=       Sendmail Message Submission Program
-
 .include "../../mk/bsd.pkg.mk"
 
 # has to be below include for bsd.pkg.mk, else substition fails
diff -r 4c78948db65b -r f791737a6399 mail/sendmail/Makefile.common
--- a/mail/sendmail/Makefile.common     Thu Oct 12 20:52:40 2006 +0000
+++ b/mail/sendmail/Makefile.common     Thu Oct 12 21:04:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2006/08/09 21:23:00 tv Exp $
+# $NetBSD: Makefile.common,v 1.39 2006/10/12 21:04:27 tv Exp $
 #
 # Makefile fragment shared with libmilter
 #
@@ -23,7 +23,8 @@
 
 MAKE_ENV+=     BSD_BINOWN=${BINOWN:Q} BSD_BINGRP=${BINGRP:Q} \
                BSD_MANOWN=${MANOWN:Q} BSD_MANGRP=${MANGRP:Q} \
-               BUILDLINK_DIR=${BUILDLINK_DIR:Q}
+               BUILDLINK_DIR=${BUILDLINK_DIR:Q} \
+               SMRSH_CMDDIR=${SMRSH_CMDDIR:Q}
 SITECONFIG=    ${WRKSRC}/devtools/Site/site.config.m4
 
 BUILD_DEFS+=    SMRSH_CMDDIR
diff -r 4c78948db65b -r f791737a6399 mail/sendmail/files/site.config.m4
--- a/mail/sendmail/files/site.config.m4        Thu Oct 12 20:52:40 2006 +0000
+++ b/mail/sendmail/files/site.config.m4        Thu Oct 12 21:04:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: site.config.m4,v 1.5 2006/06/08 02:26:32 jlam Exp $
+# $NetBSD: site.config.m4,v 1.6 2006/10/12 21:04:27 tv Exp $
 
 # pathnames specific to pkgsrc
 #
@@ -16,5 +16,9 @@
 define(`confMAN4EXT', `4')
 define(`confMAN5EXT', `5')
 define(`confMAN8EXT', `8')
-APPENDDEF(`confENVDEF', `-I${PREFIX}/include')
+APPENDDEF(`confENVDEF', `-I${PREFIX}/include -DSMRSH_CMDDIR=${SMRSH_CMDDIR}')
 APPENDDEF(`confLIBS', `-L${PREFIX}/lib')
+
+# the following are handled by pkgsrc
+define(`confINST_DEP',`')
+define(`confNO_STATISTICS_INSTALL')