Add MANZ,MKCATPAGES support.

4 files changed, 63 insertions, 25 deletions

diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 117c93363db..aaf124e1c15 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/06/10 15:52:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 1999/11/02 11:11:42 sakamoto Exp $
 
 DISTNAME=	NetBSD1.3I-jman-19990531
 PKGNAME=	ja-man-19990531
@@ -11,14 +11,20 @@ HOMEPAGE=	ftp://ftp.spa.is.uec.ac.jp/pub/NetBSD/jman/index.html
 DEPENDS=	ja-less-332:../../japanese/less \
 		ja-groff-0.99:../../japanese/groff
 
-PLIST_SRC=	${PKGDIR}/PLIST
-.if exists(${PKGDIR}/PLIST.${MACHINE})
-PLIST_SRC+=	${PKGDIR}/PLIST.${MACHINE}
-.endif
+JAMANDIR=	ja_JP.EUC
+PLIST_SUBST+=	JAMANDIR=${JAMANDIR}
+MAKE_ENV+=	JAMANDIR=${JAMANDIR}
+
+PLIST_SRC=	${WRKDIR}/PLIST
 
 MESSAGE_SRC=    ${PKGDIR}/MESSAGE
 MESSAGE_FILE=   ${WRKDIR}/.MESSAGE
 
+.include "../../mk/bsd.prefs.mk"
+.ifdef MANZ
+MANCOMPRESSED=  yes
+.endif
+
 post-extract:
 	@${GTAR} cCf ${PREFIX}/share/groff/tmac - tmac.andoc tmac.doc \
 	    mdoc/doc-common mdoc/doc-ditroff mdoc/doc-nroff mdoc/doc-syms | \
@@ -32,11 +38,26 @@ do-build:
 	@${SED} -e 's|$${BINDIR}|${PREFIX}/bin|g' \
 		-e 's|$${JMANCONFDIR}|${PREFIX}/etc|g' ${WRKSRC}/jman/jman.sh \
 		> ${WRKSRC}/jman/jman
-	@${SED} -e 's|$${PREFIX}|${PREFIX}|g' ${WRKSRC}/jman/jman.conf \
+	@${SED} -e 's|$${PREFIX}|${PREFIX}|g' \
+		-e 's|$${LOCALBASE}|${LOCALBASE}|g' \
+		-e 's|$${X11BASE}|${X11BASE}|g' \
+		-e 's|$${JAMANDIR}|${JAMANDIR}|g' \
+		${WRKSRC}/jman/jman.conf \
 		> ${WRKSRC}/jman/jman.conf.t
 
 pre-install:
 	@${SED} -e 's|$${PREFIX}|${PREFIX}|' ${MESSAGE_SRC} > ${MESSAGE_FILE}
+.if ${MKCATPAGES} == no
+	@${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST > ${PLIST_SRC}
+.if exists(${PKGDIR}/PLIST.${MACHINE})
+	@${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
+.endif
+.else
+	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+.if exists(${PKGDIR}/PLIST.${MACHINE})
+	@${CAT} ${PKGDIR}/PLIST.${MACHINE} >> ${PLIST_SRC}
+.endif
+.endif
 
 do-install:
 	for f in tmac.andoc tmac.doc \
diff --git a/japanese/man/files/patch-sum b/japanese/man/files/patch-sum
index d08a65c3341..fd040279853 100644
--- a/japanese/man/files/patch-sum
+++ b/japanese/man/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:18 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/02 11:11:43 sakamoto Exp $
 
 MD5 (patch-aa) = eadea4ae1a503a7db7f8fd56256a7eed
-MD5 (patch-ab) = 531f65f460f704260712982fbfff9be1
-MD5 (patch-ac) = 086f102bafdba3cd392e9f34d5c3fc73
+MD5 (patch-ab) = d2d5fab66c0bc783f37cc95793c383c0
+MD5 (patch-ac) = 103cc5f48b0a02f5e3e049bec91a9b23
 MD5 (patch-ad) = 96e49267652861dfb42450371714f9f0
 MD5 (patch-ae) = e6fce0211b4bcf260eda78080541d410
 MD5 (patch-af) = 3d6e708fd149b36e3637bb4778c8bc81
diff --git a/japanese/man/patches/patch-ab b/japanese/man/patches/patch-ab
index c5f42823a24..f70ec28c106 100644
--- a/japanese/man/patches/patch-ab
+++ b/japanese/man/patches/patch-ab
@@ -1,6 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
---- ./jman/jman.conf.orig	Thu Jan 28 07:16:18 1999
-+++ ./jman/jman.conf	Mon May 31 16:18:47 1999
+$NetBSD: patch-ab,v 1.2 1999/11/02 11:11:43 sakamoto Exp $
+--- jman/jman.conf.orig	Thu Jan 28 07:16:18 1999
++++ jman/jman.conf	Tue Nov  2 18:30:01 1999
+@@ -6,7 +6,7 @@
+ # The whatis/apropos database.
+ _whatdb		/usr/share/man/whatis.db
+-_whatdb		/usr/X11R6/man/whatis.db
++_whatdb		${X11BASE}/man/whatis.db
+ _whatdb		/usr/X11/man/whatis.db
+-_whatdb		/usr/pkg/man/whatis.db
++_whatdb		${LOCALBASE}/man/whatis.db
+ _whatdb		/usr/local/man/whatis.db
+ 
 @@ -19,12 +19,12 @@
  _build		.0.Z		/usr/bin/zcat %s
  _build		.0.gz		/usr/bin/gunzip -c %s
@@ -22,22 +32,29 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
 +_build		.me		${PREFIX}/bin/jgnroff -Tnippon -me %s 2>/dev/null | cat -s
  
  # Sections and their directories.
-@@ -33,5 +33,5 @@
+@@ -33,10 +33,10 @@
  
  # default
 -_default	/usr/local/jman/ /usr/{share,X11R6,X11,pkg,local}/man/
-+_default	${PREFIX}/man/ja_JP.EUC/ /usr/{share,X11R6,X11,pkg,local}/man/
++_default	{${LOCALBASE},${X11BASE}}/{man/${JAMANDIR}/,man/} /usr/{share,X11,local}/man/}
  
  # Other sections that represent complete man subdirectories.
+-X11R6		/usr/X11R6/man/
++X11R6		${X11BASE}/man/
+ X11		/usr/X11/man/
+-packages	/usr/pkg/man/
++packages	${LOCALBASE}/man/
+ local		/usr/local/man/
+ 
 @@ -44,15 +44,15 @@
  
  # Specific section/directory combinations.
 -1		/usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}1
 -2		/usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}2
 -3		/usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}3
-+1		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}1
-+2		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}2
-+3		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}3
++1		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}1
++2		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}2
++3		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}3
  3F		/usr/local/man/cat3f
  3f		/usr/local/man/cat3f
 -4		/usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}4
@@ -46,11 +63,11 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
 -7		/usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}7
 -8		/usr/{local,share,X11R6,X11,pkg}/{jman/,man/}{cat,man}8
 -9		/usr/{local,share}/{jman/,man/}{cat,man}9
-+4		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}4
-+5		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}5
-+6		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}6
-+7		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}7
-+8		/usr/{local,share,X11R6,X11,pkg}/{man/ja_JP.EUC/,man/}{cat,man}8
-+9		/usr/{local,share}/{man/ja_JP.EUC/,man/}{cat,man}9
++4		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}4
++5		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}5
++6		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}6
++7		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11}/{man/${JAMANDIR},man}/{cat,man}7
++8		{${LOCALBASE},${X11BASE},/usr/local,/usr/share,/usr/X11R6,/usr/X11,/usr/pkg}/{man/${JAMANDIR},man}/{cat,man}8
++9		{${LOCALBASE},/usr/share}/{man/${JAMANDIR},man}/{cat,man}9
  l		/usr/{X11R6,X11,pkg,local}/man/{cat,man}l
  n		/usr/{X11R6,X11,pkg,local}/man/{cat,man}n
diff --git a/japanese/man/patches/patch-ac b/japanese/man/patches/patch-ac
index d72390cafee..ea0a291952e 100644
--- a/japanese/man/patches/patch-ac
+++ b/japanese/man/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
+$NetBSD: patch-ac,v 1.2 1999/11/02 11:11:43 sakamoto Exp $
 --- ./man/Makefile.inc.orig	Tue Jul 28 01:25:43 1998
 +++ ./man/Makefile.inc	Mon May 31 16:18:47 1999
 @@ -1,9 +1,9 @@
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1.1.1 1999/06/08 10:01:21 sakamoto Exp $
 -		${TMACDIR}/mdoc/doc-nroff \
 -		${TMACDIR}/mdoc/doc-syms
 +NROFF=		jgnroff -Tnippon
-+MANDIR=		${PREFIX}/man/ja_JP.EUC
++MANDIR=		${PREFIX}/man/${JAMANDIR}
 +TMACDIR=	${PREFIX}/share/groff/tmac
 +CATDEPS=	${TMACDIR}/tmac.andocj \
 +		${TMACDIR}/tmac.docj \