Sat Aug 19 00:24:13 2017 UTC ()
pkgtools/pkg: Install manpages into ${PKGMANDIR}.

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


(jlam)
diff -r1.20 -r1.21 pkgsrc/pkgtools/pkg/Makefile
diff -r1.10 -r1.11 pkgsrc/pkgtools/pkg/distinfo
diff -r1.1 -r0 pkgsrc/pkgtools/pkg/patches/patch-docs_Makefile.am
cvs diff -r1.20 -r1.21 pkgsrc/pkgtools/pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg/Makefile 2017/05/29 11:09:46 1.20
+++ pkgsrc/pkgtools/pkg/Makefile 2017/08/19 00:24:13 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2017/05/29 11:09:46 jperkin Exp $ 1# $NetBSD: Makefile,v 1.21 2017/08/19 00:24:13 jlam Exp $
2 2
3DISTNAME= pkg-1.9.99.4 3DISTNAME= pkg-1.9.99.4
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= pkgtools 5CATEGORIES= pkgtools
6MASTER_SITES= http://files.etoilebsd.net/pkg/ 6MASTER_SITES= http://files.etoilebsd.net/pkg/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= khorben@defora.org 9MAINTAINER= khorben@defora.org
10HOMEPAGE= https://wiki.freebsd.org/pkgng 10HOMEPAGE= https://wiki.freebsd.org/pkgng
11COMMENT= Package management tool for FreeBSD 11COMMENT= Package management tool for FreeBSD
12LICENSE= 2-clause-bsd 12LICENSE= 2-clause-bsd
13 13
14BOOTSTRAP_PKG= yes 14BOOTSTRAP_PKG= yes
@@ -83,26 +83,29 @@ SUBST_CLASSES+= config @@ -83,26 +83,29 @@ SUBST_CLASSES+= config
83SUBST_STAGE.config= post-patch 83SUBST_STAGE.config= post-patch
84SUBST_FILES.config= libpkg/pkg_config.c 84SUBST_FILES.config= libpkg/pkg_config.c
85SUBST_SED.config= -e "s|/usr/ports|${PKG.portsdir}|g" \ 85SUBST_SED.config= -e "s|/usr/ports|${PKG.portsdir}|g" \
86 -e "s|/var/db/pkg|${PKGNG_DBDIR}|g" \ 86 -e "s|/var/db/pkg|${PKGNG_DBDIR}|g" \
87 -e "s|/var/cache/pkg|${VARBASE}/cache/pkgng|g" 87 -e "s|/var/cache/pkg|${VARBASE}/cache/pkgng|g"
88SUBST_MESSAGE.config= Update pkg(8) defaults. 88SUBST_MESSAGE.config= Update pkg(8) defaults.
89 89
90SUBST_CLASSES+= vuxml 90SUBST_CLASSES+= vuxml
91SUBST_STAGE.vuxml= post-patch 91SUBST_STAGE.vuxml= post-patch
92SUBST_FILES.vuxml= libpkg/pkg_audit.c 92SUBST_FILES.vuxml= libpkg/pkg_audit.c
93SUBST_SED.vuxml= -e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|" 93SUBST_SED.vuxml= -e "s|https://vuxml.FreeBSD.org/freebsd|http://muscles.dragonflybsd.org/pkgsrc-vuxml/reports|"
94SUBST_MESSAGE.vuxml= Direct audit reports to Pkgsrc vuxml 94SUBST_MESSAGE.vuxml= Direct audit reports to Pkgsrc vuxml
95 95
 96# Install manpages under ${PKGMANDIR}.
 97INSTALL_MAKE_FLAGS+= mandir=${PREFIX:Q}/${PKGMANDIR:Q}
 98
96.if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path 99.if defined(PACKAGE_BUILDING) # set by Synth which has custom location, so use default path
97PKG.portsdir?= /usr/pkgsrc 100PKG.portsdir?= /usr/pkgsrc
98.else 101.else
99PKG.portsdir?= ${PKGSRCDIR} 102PKG.portsdir?= ${PKGSRCDIR}
100.endif 103.endif
101 104
102# DragonFly SSL libraries are private. pkg(8) is the one exception of a userland 105# DragonFly SSL libraries are private. pkg(8) is the one exception of a userland
103# program that is allowed to link to them due to bootstrap reasons 106# program that is allowed to link to them due to bootstrap reasons
104.if exists(/usr/lib/priv/libprivate_ssl.so) 107.if exists(/usr/lib/priv/libprivate_ssl.so)
105BUILDLINK_PASSTHRU_RPATHDIRS= /lib/priv 108BUILDLINK_PASSTHRU_RPATHDIRS= /lib/priv
106.endif 109.endif
107 110
108post-patch: 111post-patch:
cvs diff -r1.10 -r1.11 pkgsrc/pkgtools/pkg/distinfo (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg/distinfo 2016/11/21 14:04:35 1.10
+++ pkgsrc/pkgtools/pkg/distinfo 2017/08/19 00:24:13 1.11
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.10 2016/11/21 14:04:35 marino Exp $ 1$NetBSD: distinfo,v 1.11 2017/08/19 00:24:13 jlam Exp $
2 2
3SHA1 (pkg-1.9.99.4.tar.xz) = e7f2f5c9481c6a4f5e05e08818ea8f114fc1bfcf 3SHA1 (pkg-1.9.99.4.tar.xz) = e7f2f5c9481c6a4f5e05e08818ea8f114fc1bfcf
4RMD160 (pkg-1.9.99.4.tar.xz) = 320f9866503d028f4f54f466a9ebc86cc9378331 4RMD160 (pkg-1.9.99.4.tar.xz) = 320f9866503d028f4f54f466a9ebc86cc9378331
5SHA512 (pkg-1.9.99.4.tar.xz) = eb4b01e26cffec6b6cd5604a81ba515eadcce09b4742876285bf8f510591c122665a1e598c100266f943439d0b2867b5a6e5702bc174ea302688bb73e0128d8b 5SHA512 (pkg-1.9.99.4.tar.xz) = eb4b01e26cffec6b6cd5604a81ba515eadcce09b4742876285bf8f510591c122665a1e598c100266f943439d0b2867b5a6e5702bc174ea302688bb73e0128d8b
6Size (pkg-1.9.99.4.tar.xz) = 1923452 bytes 6Size (pkg-1.9.99.4.tar.xz) = 1923452 bytes
7SHA1 (patch-docs_Makefile.am) = aa6d5c9310c644d13d55c3176cd186c37cccc7c2 
File Deleted: pkgsrc/pkgtools/pkg/patches/Attic/patch-docs_Makefile.am