 @@ -1,107 +1,108 @@
-# $NetBSD: Makefile,v 1.109 2010/03/12 13:19:49 obache Exp $
+# $NetBSD: Makefile,v 1.110 2012/07/27 17:46:01 jnemeth Exp $
 PKGNAME=	sendmail-${DIST_VERS}
 COMMENT=	The well known Mail Transport Agent
 PKGREVISION=	1
 CONFLICTS+=	courier-mta-[0-9]* fastforward>=0.51nb2 postfix-[0-9]*
 CONFLICTS+=	esmtp>=1.2
 PKG_DESTDIR_SUPPORT=	user-destdir
 .include "options.mk"
 .include "../../mail/sendmail/Makefile.common"
 USE_TOOLS+=	pax
 MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 SMRSH_CMDDIR?=	${PREFIX}/libexec/sm.bin
 PLIST_SUBST+=	SMRSH_CMDDIR=${SMRSH_CMDDIR}
 RCD_SCRIPTS=	sendmail smmsp
 BUILD_DEFS+=	VARBASE
 # 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+=	/${VARBASE}/spool/clientmqueue smmsp smmsp 0770
 MAKE_DIRS_PERMS+=	/${VARBASE}/spool/mqueue ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700
 SPECIAL_PERMS+=		libexec/sendmail/sendmail ${REAL_ROOT_USER} smmsp 2555
 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 smrsh/smrsh.8 cf/cf/Makefile
 SUBST_SED.paths+=	-e "s|@@BINGRP@@|${BINGRP}|g"
 SUBST_SED.paths+=	-e "s|@@BINOWN@@|${BINOWN}|g"
 SUBST_SED.paths+=	-e "s|@@INSTALL@@|${INSTALL}|g"
 SUBST_SED.paths+=	-e "s|@@PREFIX@@|${PREFIX}|g"
 SUBST_SED.paths+=	-e "s|@@SMRSH_CMDDIR@@|${SMRSH_CMDDIR}|g"
 SUBST_MESSAGE.paths=	Fixing paths.
 REPLACE_PERL=		contrib/socketmapClient.pl contrib/socketmapServer.pl
 INSTALLATION_DIRS=	bin lib sbin
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 INSTALLATION_DIRS+=	${PREFIX}/libexec/sendmail ${SMRSH_CMDDIR}
 INSTALLATION_DIRS+=	${PREFIX}/share/examples/sendmail
 INSTALLATION_DIRS+=	${PREFIX}/share/sendmail ${PREFIX}/share/doc/sendmail
 post-patch: make-sendmail-siteconfig
 .if !empty(PKG_OPTIONS:Mtcpwrappers)
 	cat ${FILESDIR}/site.config.m4-tcpwrappers >>${SITECONFIG}
 .endif
 .if !empty(PKG_OPTIONS:Mldap)
 	cat ${FILESDIR}/site.config.m4-ldap >>${SITECONFIG}
 .endif
 .if !empty(PKG_OPTIONS:Mdb2)
 	cat ${FILESDIR}/site.config.m4-db2 >>${SITECONFIG}
 .endif
 .if !empty(PKG_OPTIONS:Mdb4)
 	cat ${FILESDIR}/site.config.m4-db4 >>${SITECONFIG}
 .endif
 .if !empty(PKG_OPTIONS:Mtls)
 	cat ${FILESDIR}/site.config.m4-starttls >>${SITECONFIG}
 .endif
 .if !empty(PKG_OPTIONS:Msasl)
 	cat ${FILESDIR}/site.config.m4-sasl2 >>${SITECONFIG}
 .endif
 post-extract:
 	cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
 do-build:
 	(cd ${WRKSRC} && env ${MAKE_ENV} ./Build)
 post-build:
 	cp ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
 	cp ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf \
 		${DESTDIR}${PREFIX}/share/examples/sendmail/
 	cd ${WRKSRC}/cf && pax -rw -pp -pm -s',^.*\.orig$$,,' . ${DESTDIR}${PREFIX}/share/sendmail
 	${INSTALL_DATA} ${WRKSRC}/obj.`${UNAME} -srm | tr \  . | tr \/ - | sed s/sun4./sun4/`/libsm/libsm.a \
 		${DESTDIR}${PREFIX}/lib
 	${INSTALL_DATA} \
 		${WRKSRC}/obj.`${UNAME} -srm | tr \  . | tr \/ - | sed s/sun4./sun4/`/libsmutil/libsmutil.a \
 		${DESTDIR}${PREFIX}/lib
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/socketmap*.pl \
 		${DESTDIR}${PREFIX}/share/examples/sendmail/
 	${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${DESTDIR}${PREFIX}/share/doc/sendmail
 	${INSTALL_DATA} ${WRKSRC}/cf/README ${DESTDIR}${PREFIX}/share/doc/sendmail
 	${INSTALL_DATA} ${WRKSRC}/sendmail/SECURITY ${DESTDIR}${PREFIX}/share/doc/sendmail
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${DESTDIR}${PREFIX}/share/doc/sendmail
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${DESTDIR}${PREFIX}/share/doc/sendmail
 .include "../../mk/bsd.pkg.mk"
 # has to be below include for bsd.pkg.mk, else substition fails
 OBJDIR!=	${ECHO} obj.`${UNAME} -srm | tr \  . | tr \/ -`

 @@ -1,58 +1,60 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: sendmail.sh,v 1.1 2006/06/06 22:03:36 adrianp Exp $
+# $NetBSD: sendmail.sh,v 1.2 2012/07/27 17:46:01 jnemeth Exp $
+#
 # PROVIDE: mail
 # REQUIRE: LOGIN
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational
 . /etc/rc.subr
 name="sendmail"
 rcvar=$name
 command="/usr/sbin/${name}"
 pidfile="@VARBASE@/run/${name}.pid"
 required_files="/etc/mail/sendmail.cf"
 start_precmd="sendmail_precmd"
 extra_commands="reload"
 makemap="@PREFIX@/sbin/makemap"
 newaliases="@PREFIX@/bin/newaliases"
 smbin="@PREFIX@/libexec/sendmail/sendmail"
 check_files="aliases access genericstable virtusertable domaintable mailertable"
 sendmail_flags="-Lsm-mta -bd -q30m"
 sendmail_precmd()
+{
 	# check modifications on /etc/mail/ databases
 	for f in ${check_files}; do
 		if [ -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then
 			if [ ! "/etc/mail/$f" -ot "/etc/mail/$f.db" ]; then
 				echo \
 	    "${name}: /etc/mail/$f newer than /etc/mail/$f.db, regenerating"
 				if [ "x$f" = "xaliases" ]; then
 					${newaliases}
 				else
 					${makemap} hash \
 						/etc/mail/$f < /etc/mail/$f
 				fi
 			fi
 		fi
 	done
 	# check existence on /etc/mail/ databases
 	for f in ${check_files}; do
 		if [ ! -r "/etc/mail/$f.db" ] && [ -r "/etc/mail/$f" ]; then
 			echo "${name}: /etc/mail/$f.db not present, generating"
 			if [ "x$f" = "xaliases" ]; then
 				${newaliases}
 			else
 				${makemap} hash /etc/mail/$f < /etc/mail/$f
 			fi
 		fi
 	done
+}
 load_rc_config $name
 run_rc_command "$1"

 @@ -1,28 +1,30 @@
 #!@RCD_SCRIPTS_SHELL@
+#
-# $NetBSD: smmsp.sh,v 1.1 2006/06/06 22:03:36 adrianp Exp $
+# $NetBSD: smmsp.sh,v 1.2 2012/07/27 17:46:01 jnemeth Exp $
+#
 # REQUIRE: mail
 #	The only function of the smmsp process is to push locally
 #	collected mail (which got stuck in the local client queue)
 #	to a more fully functional smtp relay.  It is not a fully
 #	functional smtp daemon.
+#
 #	It can, however, be used as a completely unprivileged
 #	replacement for hosts that were previously using a "null
 #	client" configuration and a smart relay.
 . /etc/rc.subr
 name="smmsp"
 rcvar=$name
 command="/usr/sbin/sendmail"
 pidfile="@VARBASE@/spool/clientmqueue/sm-client.pid"
 required_files="/etc/mail/submit.cf"
 extra_commands="reload"
 smbin="@PREFIX@/libexec/sendmail/sendmail"
 smmsp_flags="-Lsm-msp-queue -Ac -q30m"
 load_rc_config $name
 run_rc_command "$1"