Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/nullmailer/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- Makefile	26 Nov 2007 08:27:24 -0000	1.29
+++ Makefile	4 Oct 2009 12:20:32 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.29 2007/11/26 08:27:24 plunky Exp $
 
-DISTNAME=		nullmailer-1.03
+DISTNAME=		nullmailer-1.04
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE:Q}
 
@@ -8,9 +8,13 @@
 HOMEPAGE=		http://untroubled.org/nullmailer/
 COMMENT=		Simple relay-only mail transport agent
 
+LICENSE=		gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/spool
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/libexec/nullmailer
 CONFIGURE_ARGS+=	--sbindir=${PREFIX}/libexec/nullmailer
@@ -23,15 +27,15 @@
 NULLMAILER_USER?=	nullmail
 PKG_GROUPS=		${NULLMAILER_GROUP}
 PKG_USERS=		${NULLMAILER_USER}:${NULLMAILER_GROUP}
-PKG_GROUPS_VARS+=	NULLMAILER_GROUP
-PKG_USERS_VARS+=	NULLMAILER_USER
+PKG_GROUPS_VARS=	NULLMAILER_GROUP
+PKG_USERS_VARS=		NULLMAILER_USER
 
-MAKE_ENV+=		NULLMAILER_GROUP=${NULLMAILER_GROUP:Q}
-MAKE_ENV+=		NULLMAILER_USER=${NULLMAILER_USER:Q}
+MAKE_ENV+=		NULLMAILER_GROUP=${NULLMAILER_GROUP}
+MAKE_ENV+=		NULLMAILER_USER=${NULLMAILER_USER}
 
-FILES_SUBST+=		VARBASE=${VARBASE:Q}				\
-			NULLMAILER_GROUP=${NULLMAILER_GROUP:Q}		\
-			NULLMAILER_USER=${NULLMAILER_USER:Q}
+FILES_SUBST+=		VARBASE=${VARBASE}				\
+			NULLMAILER_GROUP=${NULLMAILER_GROUP}		\
+			NULLMAILER_USER=${NULLMAILER_USER}
 
 RCD_SCRIPTS=		nullmailer
 
@@ -61,8 +65,8 @@
 
 post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog	\
-		HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer
+		HOWTO NEWS README TODO ${DESTDIR}${PREFIX}/share/doc/nullmailer
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf				\
-		${PREFIX}/share/examples/nullmailer/
+		${DESTDIR}${PREFIX}/share/examples/nullmailer/
 
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/nullmailer/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo	24 Mar 2007 06:49:02 -0000	1.10
+++ distinfo	4 Oct 2009 12:20:32 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.10 2007/03/24 06:49:02 schmonz Exp $
 
-SHA1 (nullmailer-1.03.tar.gz) = 95ed13bd0d4e05f5f66bb1a022e9424f892df3b2
-RMD160 (nullmailer-1.03.tar.gz) = b4b6244eb86a7c01330f0a65338a204c07794e23
-Size (nullmailer-1.03.tar.gz) = 172250 bytes
+SHA1 (nullmailer-1.04.tar.gz) = f3815fec726a776be050a6be59b91e696779f5a9
+RMD160 (nullmailer-1.04.tar.gz) = 13deaf37a392dfd7b57ac61b50d496dfdb9c362f
+Size (nullmailer-1.04.tar.gz) = 176867 bytes
 SHA1 (patch-aa) = dc2ca7a43598e3057f7903319581d3d529d3326f
-SHA1 (patch-ab) = a8bbf42d43b2e8aec3cedea9715c31b94c7b7ddf
+SHA1 (patch-ab) = 12e7d0381a9b43888b4809799b7d2c5775bc8b6d
 SHA1 (patch-ac) = 6e8f3e4ab3f11ceefdaede505b52db24d8a34fde
Index: files/nullmailer.sh
===================================================================
RCS file: /cvsroot/pkgsrc/mail/nullmailer/files/nullmailer.sh,v
retrieving revision 1.2
diff -u -r1.2 nullmailer.sh
--- files/nullmailer.sh	20 Aug 2005 02:20:45 -0000	1.2
+++ files/nullmailer.sh	4 Oct 2009 12:20:32 -0000
@@ -5,9 +5,7 @@
 # PROVIDE: mail
 # REQUIRE: LOGIN
 
-if [ -f /etc/rc.subr ]; then
-    . /etc/rc.subr
-fi
+$rc_subr_loaded . /etc/rc.subr
 
 name="nullmailer"
 rcvar=${name}
@@ -15,15 +13,16 @@
 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="2>&1 | logger -t nullmailer -p mail.info &"
+start_cmd="nullmailer_start"
 
 nullmailer_user="@NULLMAILER_USER@"
 nullmailer_group="@NULLMAILER_GROUP@"
 
-if [ -f /etc/rc.subr ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO_N@ " ${name}"
-	${command} ${nullmailer_flags} ${command_args}
-fi
+nullmailer_start()
+{
+
+	${command} 2>&1 | logger -t ${name} -p mail.info &
+}
+
+load_rc_config $name
+run_rc_command "$1"
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/mail/nullmailer/patches/patch-ab,v
retrieving revision 1.6
diff -u -r1.6 patch-ab
--- patches/patch-ab	24 Mar 2007 06:49:02 -0000	1.6
+++ patches/patch-ab	4 Oct 2009 12:20:32 -0000
@@ -1,9 +1,9 @@
 $NetBSD: patch-ab,v 1.6 2007/03/24 06:49:02 schmonz Exp $
 
---- doc/nullmailer-send.8.orig	2006-06-23 11:19:40.000000000 -0400
+--- doc/nullmailer-send.8.orig	2007-10-09 17:35:44.000000000 +0100
 +++ doc/nullmailer-send.8
-@@ -74,16 +74,16 @@ PLAIN method, use:
- Blank lines and lines starting with a pound are ignored.
+@@ -94,16 +94,16 @@ If this is set to
+ will wait forever for messages to complete sending.
  .SH FILES
  .TP
 -.B /var/nullmailer/queue