[pkgsrc/trunk]: pkgsrc/pkgtools/pkg pkgtools/pkg: Install manpages into ${PKG...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1d452e5d5c12
branches:  trunk
changeset: 366890:1d452e5d5c12
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Aug 19 00:24:13 2017 +0000

description:
pkgtools/pkg: Install manpages into ${PKGMANDIR}.

Pass "mandir=..." when running "make install" to pass the correct
location for installed manpages under ${PKGMANDIR}.

diffstat:

 pkgtools/pkg/Makefile                       |   5 ++++-
 pkgtools/pkg/distinfo                       |   3 +--
 pkgtools/pkg/patches/patch-docs_Makefile.am |  15 ---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diffs (50 lines):

diff -r 8b4e276448ea -r 1d452e5d5c12 pkgtools/pkg/Makefile
--- a/pkgtools/pkg/Makefile     Sat Aug 19 00:23:58 2017 +0000
+++ b/pkgtools/pkg/Makefile     Sat Aug 19 00:24:13 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/05/29 11:09:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2017/08/19 00:24:13 jlam Exp $
 
 DISTNAME=      pkg-1.9.99.4
 PKGREVISION=   1
@@ -93,6 +93,9 @@
 SUBST_SED.vuxml=       -e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|"
 SUBST_MESSAGE.vuxml=   Direct audit reports to Pkgsrc vuxml
 
+# Install manpages under ${PKGMANDIR}.
+INSTALL_MAKE_FLAGS+=   mandir=${PREFIX:Q}/${PKGMANDIR:Q}
+
 .if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path
 PKG.portsdir?= /usr/pkgsrc
 .else
diff -r 8b4e276448ea -r 1d452e5d5c12 pkgtools/pkg/distinfo
--- a/pkgtools/pkg/distinfo     Sat Aug 19 00:23:58 2017 +0000
+++ b/pkgtools/pkg/distinfo     Sat Aug 19 00:24:13 2017 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.10 2016/11/21 14:04:35 marino Exp $
+$NetBSD: distinfo,v 1.11 2017/08/19 00:24:13 jlam Exp $
 
 SHA1 (pkg-1.9.99.4.tar.xz) = e7f2f5c9481c6a4f5e05e08818ea8f114fc1bfcf
 RMD160 (pkg-1.9.99.4.tar.xz) = 320f9866503d028f4f54f466a9ebc86cc9378331
 SHA512 (pkg-1.9.99.4.tar.xz) = eb4b01e26cffec6b6cd5604a81ba515eadcce09b4742876285bf8f510591c122665a1e598c100266f943439d0b2867b5a6e5702bc174ea302688bb73e0128d8b
 Size (pkg-1.9.99.4.tar.xz) = 1923452 bytes
-SHA1 (patch-docs_Makefile.am) = aa6d5c9310c644d13d55c3176cd186c37cccc7c2
diff -r 8b4e276448ea -r 1d452e5d5c12 pkgtools/pkg/patches/patch-docs_Makefile.am
--- a/pkgtools/pkg/patches/patch-docs_Makefile.am       Sat Aug 19 00:23:58 2017 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-docs_Makefile.am,v 1.1 2016/04/01 13:11:14 jperkin Exp $
-
-Support PKGMANDIR.
-
---- docs/Makefile.am.orig      2015-06-11 13:46:28.000000000 +0000
-+++ docs/Makefile.am
-@@ -35,7 +35,7 @@ dist_man_MANS=       pkg-add.8 \
-               pkg_printf.3 \
-               pkg_repos.3
- 
--mandir=       $(prefix)/man
-+mandir=       $(prefix)/${PKGMANDIR}
- 
- EXTRA_DIST=   fix-xrefs
- .PHONY: run-fix-xrefs