Update to 1.00. From the changelog:

- Fixed problem with multiple arguments to protocol modules.
  Thanks Sascha Silbe.

- Fixed extraneous spaces in SMTP sender.

- Made permissions on queued files more strict.

- Handle the "-bs" flag in the sendmail wrapper by dieing when we see it.

- Fixed the address parser handling domain names with trailing periods.

- Fixed bug in header parsing that would cause the last header line to
  be repeated if there was no body.

- Fixed bug in handling headers containing CR+LF line endings.

pkgsrc changes:
* Replace @exec and @unexec in PLIST with bsd.pkginstall.mk incantations
* sort PLIST
* Honor VARBASE in manpages and rc.d script
* Enable logging in rc.d script
* Allow rc.d script to start nullmailer without rc.subr
* Take MAINTAINER.

10 files changed, 93 insertions, 64 deletions

diff --git a/mail/nullmailer/DEINSTALL b/mail/nullmailer/DEINSTALL
new file mode 100644
index 00000000000..08a441f9ab0
--- /dev/null
+++ b/mail/nullmailer/DEINSTALL
@@ -0,0 +1,11 @@
+# $NetBSD: DEINSTALL,v 1.1 2005/08/20 02:20:45 schmonz Exp $
+
+VARBASE=@VARBASE@
+
+case "${STAGE}" in
+
+POST-DEINSTALL)
+	${RM} -f ${VARBASE}/spool/nullmailer/trigger
+	;;
+
+esac
diff --git a/mail/nullmailer/INSTALL b/mail/nullmailer/INSTALL
new file mode 100644
index 00000000000..a403115d18a
--- /dev/null
+++ b/mail/nullmailer/INSTALL
@@ -0,0 +1,10 @@
+# $NetBSD: INSTALL,v 1.1 2005/08/20 02:20:45 schmonz Exp $
+
+VARBASE=@VARBASE@
+
+case "${STAGE}" in
+
+POST-INSTALL)
+	mkfifo ${VARBASE}/spool/nullmailer/trigger
+	;;
+esac
diff --git a/mail/nullmailer/MESSAGE b/mail/nullmailer/MESSAGE
index 722e5e56d4c..bf1f0ead918 100644
--- a/mail/nullmailer/MESSAGE
+++ b/mail/nullmailer/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2004/10/11 22:14:51 reed Exp $
+$NetBSD: MESSAGE,v 1.5 2005/08/20 02:20:45 schmonz Exp $
 
 To use nullmailer, you will need to perform the following steps:
 
@@ -9,11 +9,12 @@ To use nullmailer, you will need to perform the following steps:
 
 	smtp.relayhost.domain	smtp
 
-2. Back up /etc/mailer.conf and copy nullmailer's own one from
+2. Back up /etc/mailer.conf and copy nullmailer's from
    ${PREFIX}/share/examples/nullmailer/mailer.conf
 
-3. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy
-   ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/nullmailer to /etc/rc.d/nullmailer and add
+3. If you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy
+   ${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/nullmailer to
+   ${RCD_SCRIPTS_DIR}/nullmailer and add
 
 	nullmailer=YES
 
@@ -23,7 +24,7 @@ To use nullmailer, you will need to perform the following steps:
 4. Stop any other running MTA. Now start nullmailer by issuing the
    command
 
-	/etc/rc.d/nullmailer start
+	${RCD_SCRIPTS_DIR}/nullmailer start
 
 5. You may need to add further configuration files to the directory
    ${PKG_SYSCONFDIR}/nullmailer.  These include the `adminaddr',
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index a6726681c0a..26c293d38d7 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:21 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/20 02:20:45 schmonz Exp $
 
-DISTNAME=		nullmailer-1.00RC7
-PKGNAME=		${DISTNAME:S/0RC7/.0rc7/}
-PKGREVISION=		1
+DISTNAME=		nullmailer-1.00
 CATEGORIES=		mail
-MASTER_SITES=		http://untroubled.org/nullmailer/
+MASTER_SITES=		${HOMEPAGE}
 
-MAINTAINER=		tech-pkg@NetBSD.org
+MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://untroubled.org/nullmailer/
 COMMENT=		Simple relay-only mail transport agent
 
@@ -30,17 +28,37 @@ PKG_USERS?=		${NULLMAILER_USER}:${NULLMAILER_GROUP}
 MAKE_ENV+=		NULLMAILER_GROUP=${NULLMAILER_GROUP}
 MAKE_ENV+=		NULLMAILER_USER=${NULLMAILER_USER}
 
-PLIST_SUBST+=		NULLMAILER_GROUP=${NULLMAILER_GROUP}		\
+PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}		\
+			NULLMAILER_GROUP=${NULLMAILER_GROUP}		\
+			NULLMAILER_USER=${NULLMAILER_USER}
+
+FILES_SUBST+=		VARBASE=${VARBASE}				\
+			NULLMAILER_GROUP=${NULLMAILER_GROUP}		\
 			NULLMAILER_USER=${NULLMAILER_USER}
 
 RCD_SCRIPTS=		nullmailer
 
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/nullmailer
+.for i in nullmailer nullmailer/queue nullmailer/tmp
+OWN_DIRS_PERMS+=	${VARBASE}/spool/${i} ${NULLMAILER_USER}	\
+			${NULLMAILER_GROUP} 700
+.endfor
+SPECIAL_PERMS+=		libexec/nullmailer/mailq			\
+			${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
+SPECIAL_PERMS+=		libexec/nullmailer/nullmailer-queue		\
+			${NULLMAILER_USER} ${NULLMAILER_GROUP} 4555
+SPECIAL_PERMS+=		${VARBASE}/spool/nullmailer/trigger		\
+			${NULLMAILER_USER} ${NULLMAILER_GROUP} 0600
+INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
+DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
+
 post-configure:
 	@${SED} ${FILES_SUBST_SED} ${FILESDIR}/mailer.conf	>	\
 		${WRKDIR}/mailer.conf
-	@${MV} ${WRKSRC}/doc/nullmailer-send.8 ${WRKDIR}/nullmailer-send.8
-	@${SED} ${FILES_SUBST_SED} ${WRKDIR}/nullmailer-send.8	>	\
-		${WRKSRC}/doc/nullmailer-send.8
+	@cd ${WRKSRC}/doc; for i in nullmailer-send nullmailer-queue; do\
+		${SED} ${FILES_SUBST_SED} $${i}.8 > $${i}.8.new;	\
+		${MV} -f $${i}.8.new $${i}.8;				\
+	done
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nullmailer
diff --git a/mail/nullmailer/PLIST b/mail/nullmailer/PLIST
index db175beb5e3..09d333c5ab8 100644
--- a/mail/nullmailer/PLIST
+++ b/mail/nullmailer/PLIST
@@ -1,12 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2005/05/02 20:34:00 reed Exp $
+@comment $NetBSD: PLIST,v 1.8 2005/08/20 02:20:45 schmonz Exp $
 libexec/nullmailer/mailq
-share/examples/rc.d/nullmailer
-@exec ${CHMOD} u+s %D/libexec/nullmailer/mailq
-@exec ${CHOWN} ${NULLMAILER_USER}:${NULLMAILER_GROUP} %D/libexec/nullmailer/mailq
 libexec/nullmailer/nullmailer-inject
 libexec/nullmailer/nullmailer-queue
-@exec ${CHMOD} u+s %D/libexec/nullmailer/nullmailer-queue
-@exec ${CHOWN} ${NULLMAILER_USER}:${NULLMAILER_GROUP} %D/libexec/nullmailer/nullmailer-queue
 libexec/nullmailer/nullmailer-send
 libexec/nullmailer/qmqp
 libexec/nullmailer/sendmail
@@ -25,17 +20,7 @@ share/doc/nullmailer/NEWS
 share/doc/nullmailer/README
 share/doc/nullmailer/TODO
 share/examples/nullmailer/mailer.conf
-@exec ${MKDIR} /var/spool/nullmailer
-@exec ${MKDIR} /var/spool/nullmailer/queue
-@exec ${MKDIR} /var/spool/nullmailer/tmp
-@exec mkfifo /var/spool/nullmailer/trigger
-@exec ${CHMOD} 600 /var/spool/nullmailer/trigger
-@exec ${CHOWN} -R ${NULLMAILER_USER}:${NULLMAILER_GROUP} /var/spool/nullmailer/*
-@dirrm libexec/nullmailer
+share/examples/rc.d/nullmailer
 @dirrm share/examples/nullmailer
 @dirrm share/doc/nullmailer
-@unexec ${RMDIR} ${PKG_SYSCONFDIR}/nullmailer 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} /var/spool/nullmailer/queue 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} /var/spool/nullmailer/tmp 2>/dev/null || ${TRUE}
-@unexec ${RM} -f /var/spool/nullmailer/trigger 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} /var/spool/nullmailer 2>/dev/null || ${TRUE}
+@dirrm libexec/nullmailer
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index a3607c5e638..a2dea44e07e 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 09:59:25 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/08/20 02:20:45 schmonz Exp $
 
-SHA1 (nullmailer-1.00RC7.tar.gz) = 9e9babbba203eb353cb581c17e097c8489992b41
-RMD160 (nullmailer-1.00RC7.tar.gz) = 29e8e7292a335940e19ad3306808ca7a0f597350
-Size (nullmailer-1.00RC7.tar.gz) = 115253 bytes
-SHA1 (patch-aa) = cc5ee1356d9759c53579e1115d409a0af0d80a3e
-SHA1 (patch-ab) = b730da62ec28d1210d826d13cc49eb431ae2fb04
-SHA1 (patch-ac) = 7bc58b34b5a1d341dd91d2ce86a11dc962282a6e
+SHA1 (nullmailer-1.00.tar.gz) = e17b524b857b0a2eaf97df78e040f6e804764f4d
+RMD160 (nullmailer-1.00.tar.gz) = cd45934be7a8a9391f31452fe56b6166cb730306
+Size (nullmailer-1.00.tar.gz) = 170605 bytes
+SHA1 (patch-aa) = ede0d17c4041b56e07a72850cfece80c22c7203a
+SHA1 (patch-ab) = 85695e4c3e2d2fbe9a1a907107c8d0ec585b07fc
+SHA1 (patch-ac) = 6e8f3e4ab3f11ceefdaede505b52db24d8a34fde
diff --git a/mail/nullmailer/files/nullmailer.sh b/mail/nullmailer/files/nullmailer.sh
index 7c483ed95b2..bb719f9fb4c 100644
--- a/mail/nullmailer/files/nullmailer.sh
+++ b/mail/nullmailer/files/nullmailer.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-#	$NetBSD: nullmailer.sh,v 1.1 2004/08/30 14:34:11 schmonz Exp $
+# $NetBSD: nullmailer.sh,v 1.2 2005/08/20 02:20:45 schmonz Exp $
 #
 # PROVIDE: mail
 # REQUIRE: LOGIN
@@ -10,16 +10,20 @@ if [ -f /etc/rc.subr ]; then
 fi
 
 name="nullmailer"
-rcvar=$name
-
-nullmailer_user="nullmail"
-nullmailer_group="nullmail"
-
+rcvar=${name}
+required_files="@PKG_SYSCONFDIR@/nullmailer/remotes"
+required_files="${required_files} @VARBASE@/spool/nullmailer/trigger"
+required_dirs="@VARBASE@/spool/nullmailer/queue @VARBASE@/spool/nullmailer/tmp"
 command="@PREFIX@/libexec/nullmailer/nullmailer-send"
-command_args=" > /dev/null 2>&1 &"
+command_args="2>&1 | logger -t nullmailer -p mail.info &"
 
-required_files="@PKG_SYSCONFDIR@/nullmailer/remotes /var/spool/nullmailer/trigger"
-required_dirs="/var/spool/nullmailer/queue /var/spool/nullmailer/tmp"
+nullmailer_user="@NULLMAILER_USER@"
+nullmailer_group="@NULLMAILER_GROUP@"
 
-load_rc_config $name
-run_rc_command "$1"
+if [ -f /etc/rc.subr ]; then
+	load_rc_config $name
+	run_rc_command "$1"
+else
+	@ECHO_N@ " ${name}"
+	${command} ${nullmailer_flags} ${command_args}
+fi
diff --git a/mail/nullmailer/patches/patch-aa b/mail/nullmailer/patches/patch-aa
index 03e4bfdcfed..deb0de7349a 100644
--- a/mail/nullmailer/patches/patch-aa
+++ b/mail/nullmailer/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/02/17 01:45:32 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2005/08/20 02:20:45 schmonz Exp $
 
---- Makefile.in.orig	Mon May 13 17:39:12 2002
-+++ Makefile.in	Mon May 13 17:38:58 2002
-@@ -365,10 +365,10 @@
+--- Makefile.in.orig	2005-02-28 12:39:50.000000000 -0500
++++ Makefile.in
+@@ -584,10 +584,10 @@ install-data-local:
  	chmod 600 $(DESTDIR)$(localstatedir)/trigger
  
  install-root:
diff --git a/mail/nullmailer/patches/patch-ab b/mail/nullmailer/patches/patch-ab
index 5ceb56a682f..c9af6f516cf 100644
--- a/mail/nullmailer/patches/patch-ab
+++ b/mail/nullmailer/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2003/02/17 01:45:32 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2005/08/20 02:20:45 schmonz Exp $
 
---- doc/nullmailer-send.8.orig	Fri Jan  3 20:50:07 2003
+--- doc/nullmailer-send.8.orig	2003-01-03 15:50:07.000000000 -0500
 +++ doc/nullmailer-send.8
 @@ -66,16 +66,16 @@ For example, to connect to port 2525 on 
  Blank lines and lines starting with a pound are ignored.
  .SH FILES
  .TP
 -.B /var/nullmailer/queue
-+.B /var/spool/nullmailer/queue
++.B @VARBASE@/spool/nullmailer/queue
  The message queue.
  .TP
 -.B /var/nullmailer/trigger
-+.B /var/spool/nullmailer/trigger
++.B @VARBASE@/spool/nullmailer/trigger
  A trigger file to cause immediate delivery.
  .TP
 -.B /usr/local/etc/nullmailer
diff --git a/mail/nullmailer/patches/patch-ac b/mail/nullmailer/patches/patch-ac
index ff3783fe22f..23c5c4200fe 100644
--- a/mail/nullmailer/patches/patch-ac
+++ b/mail/nullmailer/patches/patch-ac
@@ -1,21 +1,21 @@
-$NetBSD: patch-ac,v 1.2 2003/02/17 01:45:32 jtb Exp $
+$NetBSD: patch-ac,v 1.3 2005/08/20 02:20:45 schmonz Exp $
 
---- doc/nullmailer-queue.8.orig	Mon Dec 23 17:29:20 2002
+--- doc/nullmailer-queue.8.orig	2002-12-23 12:29:20.000000000 -0500
 +++ doc/nullmailer-queue.8
 @@ -30,13 +30,13 @@ This is provided to allow local daemons 
  being bounced by your relay host.
  .SH OTHER FILES
  .TP
 -.B /var/nullmailer/queue
-+.B /var/spool/nullmailer/queue
++.B @VARBASE@/spool/nullmailer/queue
  The directory into which the completed messages are moved.
  .TP
 -.B /var/nullmailer/tmp
-+.B /var/spool/nullmailer/tmp
++.B @VARBASE@/spool/nullmailer/tmp
  The directory in which messages are formed temporarily.
  .TP
 -.B /var/nullmailer/trigger
-+.B /var/spool/nullmailer/trigger
++.B @VARBASE@/spool/nullmailer/trigger
  A pipe used to trigger
  .BR nullmailer-send
  to immediately start sending the message from the queue.