CVS commit: pkgsrc/mail/dot-forward

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jan  2 03:48:11 UTC 2017

Modified Files:
        pkgsrc/mail/dot-forward: Makefile distinfo
        pkgsrc/mail/dot-forward/patches: patch-aa patch-hier.c

Log Message:
Support PKGMANDIR and quell pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/mail/dot-forward/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mail/dot-forward/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/dot-forward/patches/patch-aa \
    pkgsrc/mail/dot-forward/patches/patch-hier.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/dot-forward/Makefile
diff -u pkgsrc/mail/dot-forward/Makefile:1.23 pkgsrc/mail/dot-forward/Makefile:1.24
--- pkgsrc/mail/dot-forward/Makefile:1.23       Mon Oct  8 12:19:08 2012
+++ pkgsrc/mail/dot-forward/Makefile    Mon Jan  2 03:48:11 2017
@@ -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"

Index: pkgsrc/mail/dot-forward/distinfo
diff -u pkgsrc/mail/dot-forward/distinfo:1.5 pkgsrc/mail/dot-forward/distinfo:1.6
--- pkgsrc/mail/dot-forward/distinfo:1.5        Tue Nov  3 23:27:03 2015
+++ pkgsrc/mail/dot-forward/distinfo    Mon Jan  2 03:48:11 2017
@@ -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

Index: pkgsrc/mail/dot-forward/patches/patch-aa
diff -u pkgsrc/mail/dot-forward/patches/patch-aa:1.1 pkgsrc/mail/dot-forward/patches/patch-aa:1.2
--- pkgsrc/mail/dot-forward/patches/patch-aa:1.1        Mon Mar 15 17:28:10 2010
+++ pkgsrc/mail/dot-forward/patches/patch-aa    Mon Jan  2 03:48:11 2017
@@ -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
Index: pkgsrc/mail/dot-forward/patches/patch-hier.c
diff -u pkgsrc/mail/dot-forward/patches/patch-hier.c:1.1 pkgsrc/mail/dot-forward/patches/patch-hier.c:1.2
--- pkgsrc/mail/dot-forward/patches/patch-hier.c:1.1    Mon Mar 12 21:49:49 2012
+++ pkgsrc/mail/dot-forward/patches/patch-hier.c        Mon Jan  2 03:48:11 2017
@@ -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);
  }