CVS commit: pkgsrc/pkgtools/pkglint

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat Feb 13 15:30:23 UTC 2021

Modified Files:
        pkgsrc/pkgtools/pkglint: Makefile PLIST

Log Message:
pkgtools/pkglint: fix manpage and catpage installation

Reported by Chris Pinnock via private mail.


To generate a diff of this commit:
cvs rdiff -u -r1.677 -r1.678 pkgsrc/pkgtools/pkglint/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/pkgtools/pkglint/PLIST

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

Modified files:

Index: pkgsrc/pkgtools/pkglint/Makefile
diff -u pkgsrc/pkgtools/pkglint/Makefile:1.677 pkgsrc/pkgtools/pkglint/Makefile:1.678
--- pkgsrc/pkgtools/pkglint/Makefile:1.677      Sat Jan 23 14:23:09 2021
+++ pkgsrc/pkgtools/pkglint/Makefile    Sat Feb 13 15:30:23 2021
@@ -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 @@ WRKSRC=             ${WRKDIR}/src   # Is set uncondit
 
 .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"

Index: pkgsrc/pkgtools/pkglint/PLIST
diff -u pkgsrc/pkgtools/pkglint/PLIST:1.27 pkgsrc/pkgtools/pkglint/PLIST:1.28
--- pkgsrc/pkgtools/pkglint/PLIST:1.27  Sun Jun 14 11:35:54 2020
+++ pkgsrc/pkgtools/pkglint/PLIST       Sat Feb 13 15:30:23 2021
@@ -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.go
 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