Use CATMAN_SECTION_SUFFIX in packages which perform their own catman

page installation.

8 files changed, 36 insertions, 8 deletions

diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile
index b672a24730b..7ba5d91f895 100644
--- a/archivers/pax/Makefile
+++ b/archivers/pax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2012/09/11 19:46:59 asau Exp $
+# $NetBSD: Makefile,v 1.49 2013/09/12 11:18:40 jperkin Exp $
 
 DISTNAME=		pax-20080110
 PKGREVISION=		2
@@ -13,6 +13,7 @@ COMMENT=		POSIX standard archiver with many extensions
 BOOTSTRAP_PKG=	yes
 CHECK_PERMS=		no
 
+MAKE_ENV+=		CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
 MAKE_ENV+=		MANINSTALL=${MANINSTALL:Q}
 
 USE_FEATURES=		nbcompat
diff --git a/archivers/pax/files/Makefile.in b/archivers/pax/files/Makefile.in
index 35e797c4947..c54cc465d22 100644
--- a/archivers/pax/files/Makefile.in
+++ b/archivers/pax/files/Makefile.in
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.in,v 1.12 2012/03/04 19:50:21 joerg Exp $
+#	$NetBSD: Makefile.in,v 1.13 2013/09/12 11:18:40 jperkin Exp $
 
 srcdir=		@srcdir@
 
@@ -55,7 +55,13 @@ install:
 	$(INSTALL) -m 444 tar.1 $(DESTDIR)$(man1dir)/$$(echo tar | sed '$(program_transform_name)').1
 .if !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).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').1
+	$(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').1
+	$(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').1
+.  else
 	$(INSTALL) -m 444 $(PROG).cat1 $(DESTDIR)$(cat1dir)/$$(echo $(PROG) | sed '$(program_transform_name)').0
 	$(INSTALL) -m 444 cpio.cat1 $(DESTDIR)$(cat1dir)/$$(echo cpio | sed '$(program_transform_name)').0
 	$(INSTALL) -m 444 tar.cat1 $(DESTDIR)$(cat1dir)/$$(echo tar | sed '$(program_transform_name)').0
+.  endif
 .endif
diff --git a/net/tnftp/Makefile b/net/tnftp/Makefile
index d8614fdb1ad..e45b6f3ecd5 100644
--- a/net/tnftp/Makefile
+++ b/net/tnftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2013/07/15 02:02:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.33 2013/09/12 11:18:40 jperkin Exp $
 
 DISTNAME=		tnftp-20070806
 SVR4_PKGNAME=		tnftp
@@ -23,6 +23,7 @@ CHECK_PERMS=		no
 OPSYSVARS+=		MAKE_ENV
 MAKE_ENV.SunOS+=	CPPFLAGS=""
 
+MAKE_ENV+=		CATMAN_SECTION_SUFFIX=${CATMAN_SECTION_SUFFIX:Q}
 MAKE_ENV+=		MANINSTALL=${MANINSTALL:Q}
 
 .include "options.mk"
diff --git a/net/tnftp/files/src/Makefile.in b/net/tnftp/files/src/Makefile.in
index 59756faa66f..533adbfa77a 100644
--- a/net/tnftp/files/src/Makefile.in
+++ b/net/tnftp/files/src/Makefile.in
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.in,v 1.7 2012/03/04 19:49:41 joerg Exp $
+#	$NetBSD: Makefile.in,v 1.8 2013/09/12 11:18:40 jperkin Exp $
 #
 
 srcdir	= @srcdir@
@@ -44,7 +44,11 @@ install: all
 	${INSTALL} -m 555 ${PROG} ${DESTDIR}${bindir}/`echo ${PROG}|sed '$(transform)'`
 .if !empty(MANINSTALL:Mcatinstall)
 	-mkdir -p ${DESTDIR}${mandircat1}
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.1
+.  else
 	${INSTALL} -m 444 ${srcdir}/${PROG}.cat1 ${DESTDIR}${mandircat1}/`echo ${PROG}|sed '$(transform)'`.0
+.  endif
 .endif
 
 clean:
diff --git a/pkgtools/lintpkgsrc/Makefile b/pkgtools/lintpkgsrc/Makefile
index 23cfca3f993..af6521eea4c 100644
--- a/pkgtools/lintpkgsrc/Makefile
+++ b/pkgtools/lintpkgsrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/05/31 12:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2013/09/12 11:18:40 jperkin Exp $
 
 DISTNAME=	lintpkgsrc-4.86
 PKGREVISION=	1
@@ -42,7 +42,11 @@ do-extract:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/lintpkgsrc.pl ${DESTDIR}${PREFIX}/bin/lintpkgsrc
 .if !empty(MANINSTALL:Mcatinstall)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/lintpkgsrc.1
+.  else
 	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+.  endif
 .endif
 .if !empty(MANINSTALL:Mmaninstall)
 	${INSTALL_MAN} ${WRKSRC}/lintpkgsrc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile
index 181329737b9..be6496b8858 100644
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2013/05/31 12:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2013/09/12 11:18:40 jperkin Exp $
 #
 
 DISTNAME=	pkgdepgraph-2.8
@@ -53,7 +53,11 @@ do-build:
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgdepgraph ${DESTDIR}${PREFIX}/bin/pkgdepgraph
 .if !empty(MANINSTALL:Mcatinstall)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkgdepgraph.1
+.  else
 	${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+.  endif
 .endif
 .if !empty(MANINSTALL:Mmaninstall)
 	${INSTALL_MAN} ${WRKSRC}/pkgdepgraph.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index 2348a9ecb9f..ae3d57773e8 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2013/05/31 12:41:46 wiz Exp $
+# $NetBSD: Makefile,v 1.81 2013/09/12 11:18:40 jperkin Exp $
 #
 
 DISTNAME=	pkgdiff-1.4
@@ -68,7 +68,11 @@ do-install:
 .for f in mkpatches patchdiff pkgdiff pkgvi feedback-patches
 	${INSTALL_SCRIPT} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin
 .  if !empty(MANINSTALL:Mcatinstall)
+.    if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	${INSTALL_MAN} ${WRKSRC}/${f}.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/${f}.1
+.    else
 	${INSTALL_MAN} ${WRKSRC}/${f}.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+.    endif
 .  endif
 .  if !empty(MANINSTALL:Mmaninstall)
 	${INSTALL_MAN} ${FILESDIR}/${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index b79a47cd1c1..944ea2057cd 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.433 2013/08/15 17:57:44 wiz Exp $
+# $NetBSD: Makefile,v 1.434 2013/09/12 11:18:41 jperkin Exp $
 
 # Note: if you update the version number, please have a look at the
 # changes between the CVS tag "pkglint_current" and HEAD.
@@ -71,7 +71,11 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkglint.pl ${DESTDIR}${PREFIX}/bin/pkglint
 	${INSTALL_SCRIPT} ${WRKSRC}/plist-clash.pl ${DESTDIR}${PREFIX}/bin/plist-clash
 .if !empty(MANINSTALL:Mcatinstall)
+.  if defined(CATMAN_SECTION_SUFFIX) && !empty(CATMAN_SECTION_SUFFIX:M[Yy][Ee][Ss])
+	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1/pkglint.1
+.  else
 	${INSTALL_MAN} ${WRKSRC}/pkglint.0 ${DESTDIR}${PREFIX}/${PKGMANDIR}/cat1
+.  endif
 .endif
 .if !empty(MANINSTALL:Mmaninstall)
 	${INSTALL_MAN} ${WRKSRC}/pkglint.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1