3 files changed, 59 insertions, 43 deletions
diff --git a/mail/nullmailer/patches/patch-aa b/mail/nullmailer/patches/patch-aa
index 01254355419..03e4bfdcfed 100644
--- a/mail/nullmailer/patches/patch-aa
+++ b/mail/nullmailer/patches/patch-aa
@@ -1,13 +1,18 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/04 01:15:25 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/17 01:45:32 jtb Exp $
 
---- lib/mergelib.sh.orig	Thu May  2 09:42:12 2002
-+++ lib/mergelib.sh	Thu May  2 09:44:41 2002
-@@ -4,7 +4,7 @@
- tmpdir=".libmerge.$archive.$$.$RANDOM.$USER"
- mkdir "$tmpdir"
- cd "$tmpdir"
--trap 'cd ..; rm -rf "$tmpdir"' EXIT
-+trap 'cd ..; rm -rf "$tmpdir"'
- for input in "$@"; do
- 	dir="`basename "$input"`"
- 	mkdir "$dir"
+--- 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-ab b/mail/nullmailer/patches/patch-ab
index caf378edd5a..5ceb56a682f 100644
--- a/mail/nullmailer/patches/patch-ab
+++ b/mail/nullmailer/patches/patch-ab
@@ -1,18 +1,25 @@
-$NetBSD: patch-ab,v 1.1 2002/05/14 00:35:24 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2003/02/17 01:45:32 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:
+--- doc/nullmailer-send.8.orig	Fri Jan  3 20:50:07 2003
++++ 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
+ The message queue.
+ .TP
+-.B /var/nullmailer/trigger
++.B /var/spool/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),
diff --git a/mail/nullmailer/patches/patch-ac b/mail/nullmailer/patches/patch-ac
index 480960c9ae7..ff3783fe22f 100644
--- a/mail/nullmailer/patches/patch-ac
+++ b/mail/nullmailer/patches/patch-ac
@@ -1,17 +1,21 @@
-$NetBSD: patch-ac,v 1.1 2002/05/14 00:35:24 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2003/02/17 01:45:32 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.
+--- doc/nullmailer-queue.8.orig	Mon Dec 23 17:29:20 2002
++++ 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 /usr/local/etc/nullmailer
-+.B @PKG_SYSCONFDIR@/nullmailer
- The configuration directory.
+-.B /var/nullmailer/queue
++.B /var/spool/nullmailer/queue
+ The directory into which the completed messages are moved.
  .TP
--.B /usr/local/libexec/nullmailer
-+.B @PREFIX@/libexec/nullmailer
- The protocol program directory.
- .SH SEE ALSO
- nullmailer-queue(8),
+-.B /var/nullmailer/tmp
++.B /var/spool/nullmailer/tmp
+ The directory in which messages are formed temporarily.
+ .TP
+-.B /var/nullmailer/trigger
++.B /var/spool/nullmailer/trigger
+ A pipe used to trigger
+ .BR nullmailer-send
+ to immediately start sending the message from the queue.