Support PKGMANDIR and quell pkglint.

4 files changed, 27 insertions, 11 deletions

diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index 2bba87fa38c..6ba18faf27a 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2012/10/08 12:19:08 asau Exp $
+# $NetBSD: Makefile,v 1.24 2017/01/02 03:48:11 schmonz Exp $
 #
 
 DISTNAME=		dot-forward-0.71
@@ -19,5 +19,12 @@ DJB_BUILD_TARGETS=	install instcheck
 
 DJB_RESTRICTED=		no
 
+INSTALLATION_DIRS=	${PKGMANDIR}
+
+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/dot-forward/distinfo b/mail/dot-forward/distinfo
index fda8bf4ebd7..f064ba91bfc 100644
--- a/mail/dot-forward/distinfo
+++ b/mail/dot-forward/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 23:27:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/01/02 03:48:11 schmonz Exp $
 
 SHA1 (dot-forward-0.71.tar.gz) = 2adacc13bb43fcf7ae13d3fbeaadd2649ff91137
 RMD160 (dot-forward-0.71.tar.gz) = 1e5fd7558296cf213274e6e80944ba26fed74c79
 SHA512 (dot-forward-0.71.tar.gz) = f37a30eabf3a7e7258bfbe9178218d053a5164a9698fbc34954eb8bd588fe2bbf61ffd85f5b817e3ce65d7c0efac1735b59b11faa4d425e2df4089769af94b8b
 Size (dot-forward-0.71.tar.gz) = 26352 bytes
-SHA1 (patch-aa) = ae2cd9f340d25f721203c65505e3a5426d295313
-SHA1 (patch-hier.c) = 848dedac7428f8b731361bbd9e272dc0a320a62f
+SHA1 (patch-aa) = 12b5e6df169a213ec47bafa141d0b586ddef63ae
+SHA1 (patch-hier.c) = ebedb97f1d8495d333bbb4de8702eba165e97a5e
diff --git a/mail/dot-forward/patches/patch-aa b/mail/dot-forward/patches/patch-aa
index f49dbc97454..6616fc033cb 100644
--- a/mail/dot-forward/patches/patch-aa
+++ b/mail/dot-forward/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.1 2010/03/15 17:28:10 schmonz Exp $
+$NetBSD: patch-aa,v 1.2 2017/01/02 03:48:11 schmonz Exp $
+
+DESTDIR support.
 
 --- Makefile.orig	1998-05-19 10:15:50.000000000 +0000
 +++ Makefile
diff --git a/mail/dot-forward/patches/patch-hier.c b/mail/dot-forward/patches/patch-hier.c
index 8557fcc14fb..2981483a154 100644
--- a/mail/dot-forward/patches/patch-hier.c
+++ b/mail/dot-forward/patches/patch-hier.c
@@ -1,15 +1,22 @@
-$NetBSD: patch-hier.c,v 1.1 2012/03/12 21:49:49 joerg Exp $
+$NetBSD: patch-hier.c,v 1.2 2017/01/02 03:48:11 schmonz Exp $
 
---- hier.c.orig	2012-03-12 21:06:14.000000000 +0000
+Install docs following hier(7), and don't install catpages.
+
+--- hier.c.orig	1998-05-19 10:15:50.000000000 +0000
 +++ hier.c
-@@ -7,10 +7,8 @@ void hier()
+@@ -5,12 +5,10 @@ void hier()
+   h(auto_qmail,-1,-1,0755);
+ 
    d(auto_qmail,"bin",-1,-1,0755);
-   d(auto_qmail,"man",-1,-1,0755);
-   d(auto_qmail,"man/man1",-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","dot-forward",-1,-1,0755);
  
-   c(auto_qmail,"man/man1","dot-forward.1",-1,-1,0644);
+-  c(auto_qmail,"man/man1","dot-forward.1",-1,-1,0644);
 -  c(auto_qmail,"man/cat1","dot-forward.0",-1,-1,0644);
++  c(auto_qmail,"@PKGMANDIR@/man1","dot-forward.1",-1,-1,0644);
  }