Do SUBST_SED in post-configure rather than post-patch to ease patch

maintenance. Set INSTALLATION_DIRS appropriately. Add VARBASE to
BUILD_DEFS. Fix paths in man pages.

4 files changed, 17 insertions, 16 deletions

diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 87aaeeededa..e46785148ba 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/03/09 12:01:24 schmonz Exp $
+# $NetBSD: Makefile,v 1.27 2007/03/24 06:49:02 schmonz Exp $
 
 DISTNAME=		nullmailer-1.03
 CATEGORIES=		mail
@@ -51,14 +51,15 @@ SUBST_FILES.paths+=	doc/nullmailer-send.8 doc/nullmailer-queue.8
 SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@VARBASE@,${VARBASE},g'
 SUBST_SED.paths+=	-e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_STAGE.paths=	post-patch
+SUBST_STAGE.paths=	post-configure
+
+INSTALLATION_DIRS=	share/doc/${PKGBASE} share/examples/${PKGBASE}
+BUILD_DEFS+=		VARBASE
 
 post-extract:
 	${CP} ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nullmailer
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nullmailer
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog	\
 		HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer
 	${INSTALL_DATA} ${WRKDIR}/mailer.conf				\
diff --git a/mail/nullmailer/distinfo b/mail/nullmailer/distinfo
index f585d1e8c6b..ee77ec23087 100644
--- a/mail/nullmailer/distinfo
+++ b/mail/nullmailer/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/07/01 19:33:30 schmonz Exp $
+$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 (patch-aa) = dc2ca7a43598e3057f7903319581d3d529d3326f
-SHA1 (patch-ab) = 533eb2fe3203a27809f598ffedeb4f17d5e364c5
-SHA1 (patch-ac) = bcd8e868b9e8dbe5379d2a181515f358fbf1e92c
+SHA1 (patch-ab) = a8bbf42d43b2e8aec3cedea9715c31b94c7b7ddf
+SHA1 (patch-ac) = 6e8f3e4ab3f11ceefdaede505b52db24d8a34fde
diff --git a/mail/nullmailer/patches/patch-ab b/mail/nullmailer/patches/patch-ab
index c8454a85a32..d1490ed5af7 100644
--- a/mail/nullmailer/patches/patch-ab
+++ b/mail/nullmailer/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2006/07/01 19:33:30 schmonz Exp $
+$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
@@ -7,19 +7,19 @@ $NetBSD: patch-ab,v 1.5 2006/07/01 19:33:30 schmonz Exp $
  .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
-+.B /etc/pkg/nullmailer
++.B @PKG_SYSCONFDIR@/nullmailer
  The configuration directory.
  .TP
 -.B /usr/local/libexec/nullmailer
-+.B /usr/pkg/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 12d965aefe1..9cb10f93b1f 100644
--- a/mail/nullmailer/patches/patch-ac
+++ b/mail/nullmailer/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2006/07/01 19:33:30 schmonz Exp $
+$NetBSD: patch-ac,v 1.5 2007/03/24 06:49:02 schmonz Exp $
 
 --- doc/nullmailer-queue.8.orig	2002-12-23 12:29:20.000000000 -0500
 +++ doc/nullmailer-queue.8
@@ -7,15 +7,15 @@ $NetBSD: patch-ac,v 1.4 2006/07/01 19:33:30 schmonz Exp $
  .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.