Allow specification of the NULLMAILER_USER and NULLMAILER_GROUP.

Fix paths in manual pages.

5 files changed, 87 insertions, 11 deletions

diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index f9cec8c3807..20e1fffaf7b 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,18 +1,43 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/05/04 01:15:25 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2002/05/14 00:35:24 jtb Exp $
 
-DISTNAME=	nullmailer-1.00RC5
-CATEGORIES=	mail
-MASTER_SITES=	http://untroubled.org/nullmailer/
+DISTNAME=		nullmailer-1.00RC5
+CATEGORIES=		mail
+MASTER_SITES=		http://untroubled.org/nullmailer/
 
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://untroubled.org/nullmailer/
-COMMENT=	Simple relay-only mail transport agent
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://untroubled.org/nullmailer/
+COMMENT=		Simple relay-only mail transport agent
 
-GNU_CONFIGURE=	# defined
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR} --localstatedir=/var
+
+INSTALL_TARGET=		install install-data-local install-root
+
+.include "../../mk/bsd.prefs.mk"
+
+NULLMAILER_GROUP?=	nullmail
+NULLMAILER_USER?=	nullmail
+PKG_GROUPS?=		${NULLMAILER_GROUP}
+PKG_USERS?=		${NULLMAILER_USER}
+
+MAKE_ENV+=		NULLMAILER_GROUP=${NULLMAILER_GROUP}
+MAKE_ENV+=		NULLMAILER_USER=${NULLMAILER_USER}
+
+PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}		\
+			NULLMAILER_GROUP=${NULLMAILER_GROUP}		\
+			NULLMAILER_USER=${NULLMAILER_USER}
+
+pre-configure:
+	for f in ${WRKSRC}/doc/nullmailer-send.8; do			\
+		${SED} -e 's:@PREFIX@:${PREFIX}:g'			\
+			-e 's:@PKG_SYSCONFDIR@:${PKG_SYSCONFDIR}:g'	\
+		$$f > $$f.tmp && ${MV} -f $$f.tmp $$f;			\
+	done
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nullmailer
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog	\
 		HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/nullmailer/PLIST b/mail/nullmailer/PLIST
index 1be13e207b6..36b0cbb7e07 100644
--- a/mail/nullmailer/PLIST
+++ b/mail/nullmailer/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/04 01:15:25 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/14 00:35:24 jtb Exp $
 bin/mailq
+@exec ${CHMOD} u+s %D/bin/mailq
+@exec ${CHOWN} ${NULLMAILER_USER}:${NULLMAILER_GROUP} %D/bin/mailq
 bin/nullmailer-inject
 libexec/nullmailer/qmqp
 libexec/nullmailer/smtp
@@ -7,6 +9,8 @@ man/man1/nullmailer-inject.1
 man/man1/sendmail.1
 man/man7/nullmailer.7
 sbin/nullmailer-queue
+@exec ${CHMOD} u+s %D/sbin/nullmailer-queue
+@exec ${CHOWN} ${NULLMAILER_USER}:${NULLMAILER_GROUP} %D/sbin/nullmailer-queue
 sbin/nullmailer-send
 sbin/sendmail
 share/doc/nullmailer/AUTHORS
@@ -17,6 +21,16 @@ share/doc/nullmailer/HOWTO
 share/doc/nullmailer/NEWS
 share/doc/nullmailer/README
 share/doc/nullmailer/TODO
-@dirrm share/doc/nullmailer
+@exec ${MKDIR} /var/nullmailer
+@exec ${MKDIR} /var/nullmailer/queue
+@exec ${MKDIR} /var/nullmailer/tmp
+@exec mkfifo /var/nullmailer/trigger
+@exec ${CHMOD} 600 /var/nullmailer/trigger
+@exec ${CHOWN} -R ${NULLMAILER_USER}:${NULLMAILER_GROUP} /var/nullmailer/*
 @dirrm libexec/nullmailer
-@dirrm etc/nullmailer
+@dirrm share/doc/nullmailer
+@unexec ${RMDIR} ${PKG_SYSCONFDIR}/nullmailer 2>/dev/null || true
+@unexec ${RMDIR} /var/nullmailer/queue 2>/dev/null || true
+@unexec ${RMDIR} /var/nullmailer/tmp 2>/dev/null || true
+@unexec ${RM} -f /var/nullmailer/trigger 2>/dev/null || true
+@unexec ${RMDIR} /var/nullmailer 2>/dev/null || true
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index b26ebedea5f..e16922fda82 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -2,3 +2,5 @@
 SHA1 (nullmailer-1.00RC5.tar.gz) = 5d47098fc5cdbf2db3b40ef2c81e83867e7a7410
 Size (nullmailer-1.00RC5.tar.gz) = 111691 bytes
 SHA1 (patch-aa) = d7ceeca053ca504232c4a50037e4985315b4ebf5
+SHA1 (patch-ab) = cc5ee1356d9759c53579e1115d409a0af0d80a3e
+SHA1 (patch-ac) = f8c8b1df4fe97ca2ab4780a58be707fe79e83e55
diff --git a/mail/nullmailer/patches/patch-ab b/mail/nullmailer/patches/patch-ab
new file mode 100644
index 00000000000..caf378edd5a
--- /dev/null
+++ b/mail/nullmailer/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2002/05/14 00:35:24 jtb Exp $
+
+--- Makefile.in.orig	Mon May 13 17:39:12 2002
++++ Makefile.in	Mon May 13 17:38:58 2002
+@@ -365,10 +365,10 @@
+ 	chmod 600 $(DESTDIR)$(localstatedir)/trigger
+ 
+ install-root:
+-	chown nullmail $(DESTDIR)$(localstatedir)/*
+-	chown nullmail $(DESTDIR)$(sbindir)/nullmailer-queue
++	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(localstatedir)/*
++	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(sbindir)/nullmailer-queue
+ 	chmod u+s $(DESTDIR)$(sbindir)/nullmailer-queue
+-	chown nullmail $(DESTDIR)$(bindir)/mailq
++	chown ${NULLMAILER_USER}:${NULLMAILER_GROUP} $(DESTDIR)$(bindir)/mailq
+ 	chmod u+s $(DESTDIR)$(bindir)/mailq
+ 
+ dist-hook:
diff --git a/mail/nullmailer/patches/patch-ac b/mail/nullmailer/patches/patch-ac
new file mode 100644
index 00000000000..480960c9ae7
--- /dev/null
+++ b/mail/nullmailer/patches/patch-ac
@@ -0,0 +1,17 @@
+$NetBSD: patch-ac,v 1.1 2002/05/14 00:35:24 jtb Exp $
+
+--- doc/nullmailer-send.8.orig	Tue May 14 01:33:23 2002
++++ doc/nullmailer-send.8	Tue May 14 01:33:55 2002
+@@ -61,10 +61,10 @@
+ .B /var/nullmailer/trigger
+ A trigger file to cause immediate delivery.
+ .TP
+-.B /usr/local/etc/nullmailer
++.B @PKG_SYSCONFDIR@/nullmailer
+ The configuration directory.
+ .TP
+-.B /usr/local/libexec/nullmailer
++.B @PREFIX@/libexec/nullmailer
+ The protocol program directory.
+ .SH SEE ALSO
+ nullmailer-queue(8),