Support PKGMANDIR.

3 files changed, 30 insertions, 15 deletions

diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 8a2fe2fdfd6..1d91607679f 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/10/08 12:19:11 asau Exp $
+# $NetBSD: Makefile,v 1.23 2016/12/31 17:51:25 schmonz Exp $
 #
 
 DISTNAME=		fastforward-0.51
@@ -15,11 +15,16 @@ DEPENDS+=		qmail>=1.03nb7:../../mail/qmail
 
 CONFLICTS+=		esmtp>=1.2 postfix-[0-9]* sendmail-[0-9]*
 
-BUILD_TARGETS=	install instcheck
+BUILD_TARGETS=		install instcheck
 
 DJB_RESTRICTED=		no
 
 SUBST_FILES.djbware+=	cdb_seek.c
 
+SUBST_CLASSES+=		paths
+SUBST_STAGE.paths=	do-configure
+SUBST_FILES.paths=	hier.c
+SUBST_SED.paths=	-e 's,@PKGMANDIR@,${PKGMANDIR},g'
+
 .include "../../mk/djbware.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/fastforward/distinfo b/mail/fastforward/distinfo
index 111e15e366b..7353e9185a4 100644
--- a/mail/fastforward/distinfo
+++ b/mail/fastforward/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 23:27:05 agc Exp $
+$NetBSD: distinfo,v 1.6 2016/12/31 17:51:25 schmonz Exp $
 
 SHA1 (fastforward-0.51.tar.gz) = 5a20d2a60d2de791d9a7fbbe6ddb1fdca567053e
 RMD160 (fastforward-0.51.tar.gz) = 84518647b43f0d32dd4fde198dd4712896e8ed25
 SHA512 (fastforward-0.51.tar.gz) = 7206f72dc7bb42d7e0cc63980eda7bc2b93c7ca6639db810f6d28476ab58d3e4bb6e441f4eef2149c5fe933c2f9effe2f2b3101d02cf9f6e922a678e7466b132
 Size (fastforward-0.51.tar.gz) = 40659 bytes
 SHA1 (patch-aa) = 6b0dfb2cf364fbc9eb86830585210c303a68ae5f
-SHA1 (patch-ab) = c64c375f29b403f0122cf18a1ec3df36dd8bfa1f
+SHA1 (patch-ab) = 0b294965aa54fe241ac70a5a3c48961b42088302
diff --git a/mail/fastforward/patches/patch-ab b/mail/fastforward/patches/patch-ab
index 864d41037a9..20114eabe79 100644
--- a/mail/fastforward/patches/patch-ab
+++ b/mail/fastforward/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2012/03/12 21:53:09 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2016/12/31 17:51:25 schmonz Exp $
 
 --- hier.c.orig	1998-05-19 16:25:42.000000000 +0000
 +++ hier.c
@@ -8,29 +8,32 @@ $NetBSD: patch-ab,v 1.2 2012/03/12 21:53:09 joerg Exp $
    d(auto_qmail,"bin",-1,-1,0755);
 -  d(auto_qmail,"doc",-1,-1,0755);
 -  d(auto_qmail,"doc/fastforward",-1,-1,0755);
+-  d(auto_qmail,"man",-1,-1,0755);
+-  d(auto_qmail,"man/man1",-1,-1,0755);
+-  d(auto_qmail,"man/cat1",-1,-1,0755);
 +  d(auto_qmail,"share",-1,-1,0755);
 +  d(auto_qmail,"share/doc",-1,-1,0755);
 +  d(auto_qmail,"share/doc/qmail",-1,-1,0755);
 +  d(auto_qmail,"share/doc/qmail/fastforward",-1,-1,0755);
-   d(auto_qmail,"man",-1,-1,0755);
-   d(auto_qmail,"man/man1",-1,-1,0755);
--  d(auto_qmail,"man/cat1",-1,-1,0755);
++  d(auto_qmail,"@PKGMANDIR@",-1,-1,0755);
++  d(auto_qmail,"@PKGMANDIR@/man1",-1,-1,0755);
  
    c(auto_qmail,"bin","fastforward",-1,-1,0755);
    c(auto_qmail,"bin","printforward",-1,-1,0755);
-@@ -19,7 +20,7 @@ void hier()
+@@ -19,21 +20,13 @@ void hier()
    c(auto_qmail,"bin","setmaillist",-1,-1,0755);
    c(auto_qmail,"bin","newinclude",-1,-1,0755);
  
 -  c(auto_qmail,"doc/fastforward","ALIASES",-1,-1,0644);
 +  c(auto_qmail,"share/doc/qmail/fastforward","ALIASES",-1,-1,0644);
  
-   c(auto_qmail,"man/man1","fastforward.1",-1,-1,0644);
-   c(auto_qmail,"man/man1","printforward.1",-1,-1,0644);
-@@ -28,12 +29,4 @@ void hier()
-   c(auto_qmail,"man/man1","printmaillist.1",-1,-1,0644);
-   c(auto_qmail,"man/man1","setmaillist.1",-1,-1,0644);
-   c(auto_qmail,"man/man1","newinclude.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","fastforward.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","printforward.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","setforward.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","newaliases.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","printmaillist.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","setmaillist.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","newinclude.1",-1,-1,0644);
 -
 -  c(auto_qmail,"man/cat1","fastforward.0",-1,-1,0644);
 -  c(auto_qmail,"man/cat1","printforward.0",-1,-1,0644);
@@ -39,4 +42,11 @@ $NetBSD: patch-ab,v 1.2 2012/03/12 21:53:09 joerg Exp $
 -  c(auto_qmail,"man/cat1","printmaillist.0",-1,-1,0644);
 -  c(auto_qmail,"man/cat1","setmaillist.0",-1,-1,0644);
 -  c(auto_qmail,"man/cat1","newinclude.0",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","fastforward.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","printforward.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","setforward.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","newaliases.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","printmaillist.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","setmaillist.1",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","newinclude.1",-1,-1,0644);
  }