[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint pkgtools/pkglint: fix manpage and cat...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8102abb0a1cc
branches:  trunk
changeset: 446824:8102abb0a1cc
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Feb 13 15:30:23 2021 +0000

description:
pkgtools/pkglint: fix manpage and catpage installation

Reported by Chris Pinnock via private mail.

diffstat:

 pkgtools/pkglint/Makefile |  19 +++++++++++++------
 pkgtools/pkglint/PLIST    |   7 ++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r a3a8d5117c48 -r 8102abb0a1cc pkgtools/pkglint/Makefile
--- a/pkgtools/pkglint/Makefile Sat Feb 13 15:30:07 2021 +0000
+++ b/pkgtools/pkglint/Makefile Sat Feb 13 15:30:23 2021 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.677 2021/01/23 14:23:09 bsiegert Exp $
+# $NetBSD: Makefile,v 1.678 2021/02/13 15:30:23 rillig Exp $
 
 PKGNAME=       pkglint-20.4.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    pkgtools
 DISTNAME=      tools
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=golang/}
@@ -62,18 +62,25 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-do-install-man: .PHONY
+PLIST_VARS+=           catinstall0 catinstall maninstall
 .if ${MANINSTALL:Mcatinstall}
+INSTALLATION_DIRS+=    man/cat1
 .  if ${CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]}
-       ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
+PLIST.catinstall=      yes
 .  else
-       ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+PLIST.catinstall0=     yes
 .  endif
 .endif
 .if ${MANINSTALL:Mmaninstall}
-       ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+INSTALLATION_DIRS+=    man/man1
+PLIST.maninstall=      yes
 .endif
 
+do-install-man: .PHONY
+       ${PLIST.catinstall:D:U\:} ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
+       ${PLIST.catinstall0:D:U\:} ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/
+       ${PLIST.maninstall:D:U\:} ${INSTALL_MAN} ${WRKSRC.pkglint}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
+
 .include "../../devel/go-check/buildlink3.mk"
 .include "../../security/go-crypto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r a3a8d5117c48 -r 8102abb0a1cc pkgtools/pkglint/PLIST
--- a/pkgtools/pkglint/PLIST    Sat Feb 13 15:30:07 2021 +0000
+++ b/pkgtools/pkglint/PLIST    Sat Feb 13 15:30:23 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2020/06/14 11:35:54 rillig Exp $
+@comment $NetBSD: PLIST,v 1.28 2021/02/13 15:30:23 rillig Exp $
 bin/pkglint
 gopkg/pkg/${GO_PLATFORM}/netbsd.org/pkglint.a
 gopkg/pkg/${GO_PLATFORM}/netbsd.org/pkglint/getopt.a
@@ -140,5 +140,6 @@
 gopkg/src/netbsd.org/pkglint/vartype_test.go
 gopkg/src/netbsd.org/pkglint/vartypecheck.go
 gopkg/src/netbsd.org/pkglint/vartypecheck_test.go
-man/man1/pkglint.1
-@pkgdir man/cat1
+${PLIST.catinstall0}man/cat1/pkglint.0
+${PLIST.catinstall}man/cat1/pkglint.1
+${PLIST.maninstall}man/man1/pkglint.1