CVS commit: pkgsrc/pkgtools/bootstrap-mk-files

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue May  9 17:02:32 UTC 2023

Modified Files:
        pkgsrc/pkgtools/bootstrap-mk-files: Makefile
        pkgsrc/pkgtools/bootstrap-mk-files/files/mods: OpenBSD.bsd.own.mk.in

Log Message:
Update to 20230509. Changes:

- OpenBSD: don't install catpages by default.

While here, fix pkglint warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/pkgtools/bootstrap-mk-files/Makefile
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in

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

Modified files:

Index: pkgsrc/pkgtools/bootstrap-mk-files/Makefile
diff -u pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.58 pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.59
--- pkgsrc/pkgtools/bootstrap-mk-files/Makefile:1.58    Sat Feb 25 11:27:27 2023
+++ pkgsrc/pkgtools/bootstrap-mk-files/Makefile Tue May  9 17:02:31 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2023/02/25 11:27:27 jperkin Exp $
+# $NetBSD: Makefile,v 1.59 2023/05/09 17:02:31 schmonz Exp $
 
-PKGNAME=       bootstrap-mk-files-20230225
+PKGNAME=       bootstrap-mk-files-20230509
 CATEGORIES=    pkgtools
 
 CONFLICTS+=    mk-files-[0-9]*
@@ -10,7 +10,7 @@ HOMEPAGE=     https://www.pkgsrc.org/
 COMMENT=       *.mk files for the bootstrap bmake utility
 LICENSE=       original-bsd
 
-NO_PKGTOOLS_REQD_CHECK=        # defined
+NO_PKGTOOLS_REQD_CHECK=        yes
 BOOTSTRAP_PKG=         yes
 
 NO_BUILD=      yes
@@ -20,7 +20,7 @@ USE_TOOLS+=   sed
 INSTALLATION_DIRS=     share/mk
 
 do-extract:
-       @${CP} -R ${FILESDIR} ${WRKSRC}
+       ${RUN} ${CP} -R ${FILESDIR} ${WRKSRC}
 
 do-configure:
        cd ${WRKSRC}; for file in bsd.* sys.mk; do                      \

Index: pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in
diff -u pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in:1.6 pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in:1.7
--- pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in:1.6     Sat Sep  1 21:56:04 2018
+++ pkgsrc/pkgtools/bootstrap-mk-files/files/mods/OpenBSD.bsd.own.mk.in Tue May  9 17:02:32 2023
@@ -1,4 +1,4 @@
-#      $NetBSD: OpenBSD.bsd.own.mk.in,v 1.6 2018/09/01 21:56:04 tnn Exp $
+#      $NetBSD: OpenBSD.bsd.own.mk.in,v 1.7 2023/05/09 17:02:32 schmonz Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -34,7 +34,7 @@ MANDIR?=      /usr/share/man
 MANGRP?=       wheel
 MANOWN?=       root
 MANMODE?=      ${NONBINMODE}
-MANINSTALL?=   maninstall catinstall
+MANINSTALL?=   ${_MANINSTALL}
 
 INFODIR?=      /usr/share/info
 INFOGRP?=      wheel
@@ -191,7 +191,7 @@ PRINTOBJDIR=        printf "xxx: .MAKE\n\t@echo
 # The NOxxx variables should only be used by Makefiles.
 #
 
-MKCATPAGES?=yes
+MKCATPAGES?=no
 
 .if defined(NODOC)
 MKDOC=no
@@ -201,6 +201,11 @@ MKDOC=no
 MKDOC?=yes
 .endif
 
+_MANINSTALL=   maninstall
+.if ${MKCATPAGES} != "no"
+_MANINSTALL+=  catinstall
+.endif
+
 MKINFO?=yes
 
 .if defined(NOLINKLIB)