From bc5e2600ff6eedb6bcfdd9bdb4f0979e7eee9369 Mon Sep 17 00:00:00 2001 From: jperkin Date: Thu, 12 Sep 2013 11:03:10 +0000 Subject: Add CATMAN_SECTION_SUFFIX support. --- pkgtools/pkg_install/Makefile | 3 ++- pkgtools/pkg_install/files/add/Makefile.in | 6 +++++- pkgtools/pkg_install/files/admin/Makefile.in | 8 +++++++- pkgtools/pkg_install/files/create/Makefile.in | 6 +++++- pkgtools/pkg_install/files/delete/Makefile.in | 6 +++++- pkgtools/pkg_install/files/info/Makefile.in | 6 +++++- pkgtools/pkg_install/files/lib/Makefile.in | 8 +++++++- pkgtools/pkg_install/files/view/Makefile.in | 14 +++++++++++--- 8 files changed, 47 insertions(+), 10 deletions(-) (limited to 'pkgtools/pkg_install') diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index db77a57c3aa..2c2eb91fc3d 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.198 2013/09/02 10:28:44 jperkin Exp $ +# $NetBSD: Makefile,v 1.199 2013/09/12 11:03:10 jperkin Exp $ # Notes to package maintainers: # @@ -68,6 +68,7 @@ CPPFLAGS+= -DDEF_UMASK=${DEF_UMASK} MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} MAKE_ENV+= OPSYS=${OPSYS:Q} +MAKE_ENV+= CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q} MAKE_ENV+= MANINSTALL=${MANINSTALL:Q} PKG_DBDIR?= /var/db/pkg diff --git a/pkgtools/pkg_install/files/add/Makefile.in b/pkgtools/pkg_install/files/add/Makefile.in index 647e71454e5..1b313d845bc 100644 --- a/pkgtools/pkg_install/files/add/Makefile.in +++ b/pkgtools/pkg_install/files/add/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.27 2012/10/21 09:08:56 joerg Exp $ +# $NetBSD: Makefile.in,v 1.28 2013/09/12 11:03:10 jperkin Exp $ srcdir= @srcdir@ @@ -50,5 +50,9 @@ install: $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall) $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) +. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) + $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1 +. else $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0 +. endif .endif diff --git a/pkgtools/pkg_install/files/admin/Makefile.in b/pkgtools/pkg_install/files/admin/Makefile.in index 26b3a13e12d..bfbc61cb92d 100644 --- a/pkgtools/pkg_install/files/admin/Makefile.in +++ b/pkgtools/pkg_install/files/admin/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.25 2012/10/21 09:08:56 joerg Exp $ +# $NetBSD: Makefile.in,v 1.26 2013/09/12 11:03:10 jperkin Exp $ srcdir= @srcdir@ @@ -65,9 +65,15 @@ install: .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall) $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) $(INSTALL) -m 755 -d ${DESTDIR}$(cat8dir) +. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) + $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1 + $(INSTALL) -m 444 audit-packages.cat ${DESTDIR}$(cat8dir)/audit-packages.8 + $(INSTALL) -m 444 download-vulnerability-list.cat ${DESTDIR}$(cat8dir)/download-vulnerability-list.8 +. else $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0 $(INSTALL) -m 444 audit-packages.cat ${DESTDIR}$(cat8dir)/audit-packages.0 $(INSTALL) -m 444 download-vulnerability-list.cat ${DESTDIR}$(cat8dir)/download-vulnerability-list.0 +. endif .endif audit-packages: audit-packages.sh.in diff --git a/pkgtools/pkg_install/files/create/Makefile.in b/pkgtools/pkg_install/files/create/Makefile.in index 75b024a845d..c03822a1e3f 100644 --- a/pkgtools/pkg_install/files/create/Makefile.in +++ b/pkgtools/pkg_install/files/create/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.23 2012/10/21 09:08:56 joerg Exp $ +# $NetBSD: Makefile.in,v 1.24 2013/09/12 11:03:10 jperkin Exp $ srcdir= @srcdir@ @@ -56,5 +56,9 @@ install: $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall) $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) +. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) + $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1 +. else $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0 +. endif .endif diff --git a/pkgtools/pkg_install/files/delete/Makefile.in b/pkgtools/pkg_install/files/delete/Makefile.in index e60ddaf8998..d4f9a4c9404 100644 --- a/pkgtools/pkg_install/files/delete/Makefile.in +++ b/pkgtools/pkg_install/files/delete/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.20 2012/10/21 09:08:56 joerg Exp $ +# $NetBSD: Makefile.in,v 1.21 2013/09/12 11:03:10 jperkin Exp $ srcdir= @srcdir@ @@ -50,5 +50,9 @@ install: $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall) $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) +. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) + $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1 +. else $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0 +. endif .endif diff --git a/pkgtools/pkg_install/files/info/Makefile.in b/pkgtools/pkg_install/files/info/Makefile.in index 5f874a3ab0d..4bb232ef2a3 100644 --- a/pkgtools/pkg_install/files/info/Makefile.in +++ b/pkgtools/pkg_install/files/info/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.26 2012/10/21 09:08:57 joerg Exp $ +# $NetBSD: Makefile.in,v 1.27 2013/09/12 11:03:10 jperkin Exp $ srcdir= @srcdir@ @@ -54,5 +54,9 @@ install: $(INSTALL) -m 444 $(PROG).1 ${DESTDIR}$(man1dir)/$(PROG).1 .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall) $(INSTALL) -m 755 -d ${DESTDIR}$(cat1dir) +. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) + $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).1 +. else $(INSTALL) -m 444 $(PROG).cat ${DESTDIR}$(cat1dir)/$(PROG).0 +. endif .endif diff --git a/pkgtools/pkg_install/files/lib/Makefile.in b/pkgtools/pkg_install/files/lib/Makefile.in index 2613315eab8..dbf5d616300 100644 --- a/pkgtools/pkg_install/files/lib/Makefile.in +++ b/pkgtools/pkg_install/files/lib/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.33 2012/05/15 16:43:54 christos Exp $ +# $NetBSD: Makefile.in,v 1.34 2013/09/12 11:03:10 jperkin Exp $ srcdir= @srcdir@ @@ -65,7 +65,13 @@ install: .if defined(MANINSTALL) && !empty(MANINSTALL:Mcatinstall) $(INSTALL) -m 755 -d ${DESTDIR}$(cat5dir) $(INSTALL) -m 755 -d ${DESTDIR}$(cat7dir) +. if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss]) + $(INSTALL) -m 444 pkg_summary.cat ${DESTDIR}$(cat5dir)/pkg_summary.5 + $(INSTALL) -m 444 pkg_install.conf.cat ${DESTDIR}$(cat5dir)/pkg_install.conf.5 + $(INSTALL) -m 444 pkgsrc.cat ${DESTDIR}$(cat7dir)/pkgsrc.7 +. else $(INSTALL) -m 444 pkg_summary.cat ${DESTDIR}$(cat5dir)/pkg_summary.0 $(INSTALL) -m 444 pkg_install.conf.cat ${DESTDIR}$(cat5dir)/pkg_install.conf.0 $(INSTALL) -m 444 pkgsrc.cat ${DESTDIR}$(cat7dir)/pkgsrc.0 +. endif .endif diff --git a/pkgtools/pkg_install/files/view/Makefile.in b/pkgtools/pkg_install/files/view/Makefile.in index 1f11af028a5..4a79ca8422d 100644 --- a/pkgtools/pkg_install/files/view/Makefile.in +++ b/pkgtools/pkg_install/files/view/Makefile.in @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.in,v 1.6 2008/03/10 12:14:32 wiz Exp $ +# $NetBSD: Makefile.in,v 1.7 2013/09/12 11:03:10 jperkin Exp $ prefix= @prefix@ exec_prefix= @exec_prefix@ @@ -30,6 +30,14 @@ install: @for script in $(SCRIPTS); do \ echo "$(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1"; \ $(INSTALL) -m 444 $$script.1 ${DESTDIR}$(man1dir)/$$script.1; \ - echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0"; \ - $(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0; \ + case "$(CATMAN_SECTION_SUFFIX)" in \ + [Yy][Ee][Ss]) \ + echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.1"; \ + $(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.1; \ + ;; \ + *) \ + echo "$(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0"; \ + $(INSTALL) -m 444 $$script.cat1 ${DESTDIR}$(cat1dir)/$$script.0; \ + ;; \ + esac; \ done -- cgit v1.2.3