From bc5d8067858859649dbf6a1664aaada0f63d6471 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 12 Oct 2006 21:04:27 +0000 Subject: 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. --- 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(-) (limited to 'mail/sendmail') diff --git a/mail/sendmail/MESSAGE b/mail/sendmail/MESSAGE index 442cfef9ec6..bd628b24a7f 100644 --- a/mail/sendmail/MESSAGE +++ b/mail/sendmail/MESSAGE @@ -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 @@ 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/sendmail/Makefile b/mail/sendmail/Makefile index 09002acda9c..bc7032f908b 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -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 @@ SMRSH_CMDDIR?= ${PREFIX}/libexec/sm.bin 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 @@ post-install: ${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 --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common index 0feea7191dd..6491e9c5c54 100644 --- a/mail/sendmail/Makefile.common +++ b/mail/sendmail/Makefile.common @@ -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 @@ DIST_VERS= 8.13.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 --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4 index 705d3c77da2..78b59a342fb 100644 --- a/mail/sendmail/files/site.config.m4 +++ b/mail/sendmail/files/site.config.m4 @@ -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(`confMAN3EXT', `3') 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') -- cgit v1.2.3