7 files changed, 65 insertions, 78 deletions

diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index 3ebdf1c69830..b9b6da14a2e5 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -6,64 +6,76 @@
 #
 
 PORTNAME=	man-doc
-PORTVERSION=	5.3
+PORTVERSION=	5.4.20050911
 CATEGORIES=	japanese
-DISTFILES=	# none
+.if !defined(WITH_CVS)
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	hrs
+.else
+DISTFILES=	# empty
+.endif
 
 MAINTAINER=	kuriyama@FreeBSD.org
-COMMENT=	Japanese online manual pages corresponding to /usr/share/man/man*
+COMMENT=	Japanese translation of FreeBSD manual pages
+
+RUN_DEPENDS=	jman:${PORTSDIR}/japanese/man
 
-PREFIX?=	/usr
 NO_MTREE=	yes
-WRKSRC=		${WRKDIR}/man
-PLIST=		${WRKDIR}/PLIST
+WRKSRC=		${WRKDIR}/${DISTNAME}
+PLIST=		${WRKDIR}/pkg-plist
+MAKE_ENV=	MANDIR=${MANDIR}
 
-MANSECS=	1 2 5 6 7 8 9
-JAMANDIR?=	/usr/opt/doc/ja_JP.eucJP/man
+MANSECS=	man1 man2 man3 man4 man4/man4.i386 \
+		man5 man6 man7 man8 man8/man8.i386 man9
+CVSROOT?=	/home/ncvs
+CVS_CMD?=	/usr/bin/cvs
+JAMANDIR?=	doc/ja_JP.eucJP/man
+MANDIR?=	${PREFIX}/man/ja/man
 
+.if defined(WITH_CVS)
 do-extract:
-	@if [ ! -d ${JAMANDIR} ]; then \
-	  ${ECHO} "You need the Japanese manual source in"; \
-	  ${ECHO} "\"${JAMANDIR}\""; \
-	  ${ECHO} "in order to build this port."; \
-	  exit 1; \
-	fi
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKSRC}
-	@(cd ${JAMANDIR}; ${CP} Makefile Makefile.inc  ${WRKSRC})
-.for sec in ${MANSECS}
-	@if [ -d ${JAMANDIR}/man${sec} ]; then \
-		${CP} -R ${JAMANDIR}/man${sec} ${WRKSRC}/ ; \
-		${ECHO_CMD} >>${WRKSRC}/man${sec}/Makefile; \
-		${ECHO_CMD} pages-list: >>${WRKSRC}/man${sec}/Makefile; \
-		${ECHO_CMD} "	@echo \$${MAN${sec}} \$${MLINKS}" \
-			>>${WRKSRC}/man${sec}/Makefile; \
-	fi
-.endfor
+	${MKDIR} ${WRKSRC}
+	cd ${WRKDIR} && \
+		${CVS_CMD} -R -d ${CVSROOT} co -P -d ${DISTNAME} ${JAMANDIR}
+.endif
 
 post-build:
-	@${RM} -f ${PLIST}
-	@for sec in ${MANSECS}; do \
-	 if [ -d ${WRKSRC}/man$${sec} ]; then \
-		cd ${WRKSRC}/man$${sec}; \
-		list=`${MAKE} pages-list`; \
-		set `${ECHO_CMD} $$list " "|${SED} 's/\.\([^.]*\) /.\1 \1 /g'`; \
-		while : ; do \
-			case $$# in \
-				0) break;; \
-				[1]) ${ECHO_CMD} "can not happen"; break;; \
-			esac; \
-			${ECHO_CMD} share/man/ja/man$$2/$$1.gz; shift 2; \
+	for SEC in ${MANSECS}; do \
+		SECNUM=$${SEC%%/*}; \
+		cd ${WRKSRC}/$${SEC} && \
+		SUBDIR=`${MAKE} -VMANSUBDIR` && \
+		for F in `${MAKE} -VMAN`; do \
+			${ECHO_CMD} "man/ja/$${SECNUM}$${SUBDIR}/$${F}.gz"; \
+		done; \
+		set -- `${MAKE} -VMLINKS`; while :; do \
+		case $$# in \
+		[01])	break ;; \
+		*)	m=$$2; \
+			num=$${m##*.}; \
+			${ECHO_CMD} "man/ja/man$${num}/$${m}.gz"; \
+			shift 2;\
+		esac; \
 		done; \
-	 fi; \
-	done|${SORT}|uniq >>${PLIST}
+		if [ "x$${SUBDIR}" != "x" ]; then  \
+			${ECHO_CMD} "@dirrm man/ja/$${SECNUM}$${SUBDIR}"; \
+		fi; \
+	done | ${SORT} -r | uniq > ${PLIST}
 
-pre-install:
-.for sec in ${MANSECS}
-	@${MKDIR} ${PREFIX}/share/man/ja/man${sec}
-.endfor
+pre-su-install:
+	for SEC in ${MANSECS}; do \
+		SECNUM=$${SEC%%/*}; \
+		cd ${WRKSRC}/$${SEC} && \
+		SUBDIR=`${MAKE} -VMANSUBDIR` && \
+		${MKDIR} ${PREFIX}/man/ja/$${SECNUM}$${SUBDIR}; \
+	done
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
+# XXX: make gendist generates distfile.  Use with WITH_CVS.
+gendist: extract
+	cd ${WRKDIR} && \
+		${FIND} . -type d -a -name CVS | ${XARGS} ${RM} -rf && \
+		${TAR} czf ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}
+
 .include <bsd.port.mk>
diff --git a/japanese/man-doc/distinfo b/japanese/man-doc/distinfo
new file mode 100644
index 000000000000..188865eeff4d
--- /dev/null
+++ b/japanese/man-doc/distinfo
@@ -0,0 +1,2 @@
+MD5 (man-doc-5.4.20050911.tar.gz) = cf14679fa83c4721dec40d48a91a1492
+SIZE (man-doc-5.4.20050911.tar.gz) = 3399483
diff --git a/japanese/man-doc/files/patch-aa b/japanese/man-doc/files/patch-aa
deleted file mode 100644
index d31badca2cee..000000000000
--- a/japanese/man-doc/files/patch-aa
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.orig	Tue Mar 17 16:08:32 1998
-+++ Makefile	Tue Mar 17 16:16:26 1998
-@@ -1,4 +1,4 @@
--BINDIR= /usr/share
-+BINDIR= ${PREFIX}/share
- SUBDIR= man1 man8
- 
- makedb:
diff --git a/japanese/man-doc/files/patch-ab b/japanese/man-doc/files/patch-ab
deleted file mode 100644
index 444e8c88c6e7..000000000000
--- a/japanese/man-doc/files/patch-ab
+++ /dev/null
@@ -1,8 +0,0 @@
---- Makefile.inc.orig	Tue Mar 17 16:08:32 1998
-+++ Makefile.inc	Tue Mar 17 16:16:48 1998
-@@ -1,3 +1,3 @@
--PREFIX=		/usr/share
--MANDIR=		${PREFIX}/man/ja/man
-+PREFIX?=	/usr
-+MANDIR=		${PREFIX}/share/man/ja/man
- MROFF_CMD=	/usr/local/bin/groff -Tnippon -man
diff --git a/japanese/man-doc/pkg-descr b/japanese/man-doc/pkg-descr
index 52fe223d83fb..2d4ab1268f4d 100644
--- a/japanese/man-doc/pkg-descr
+++ b/japanese/man-doc/pkg-descr
@@ -1,9 +1,3 @@
-This is the Japanese manual.  Note that to build it, you need the
-source to be on your machine, in which case you can build and install
-it by just going to /usr/opt/doc/ja/man and typing
-"make all install".  (It will also be built automatically if you have
-DOC_LANG set to "ja" or have ALLLANG set to anything during a "make 
-world".)
-
-In other words, this pretty useless as a port, but is here so I can
-build a package.
+This is a Japanese translation of FreeBSD manual pages.
+Note that to build it, you need the CVS repository in
+${CVSROOT} (/home/ncvs by default) on your machine.
diff --git a/japanese/man-doc/pkg-message b/japanese/man-doc/pkg-message
index 14d6e5c8f0c7..7da4a02fe014 100644
--- a/japanese/man-doc/pkg-message
+++ b/japanese/man-doc/pkg-message
@@ -1,22 +1,16 @@
 ***********************************************************************
 * Japanese online manual has been successfully installed.             *
 *                                                                     *
-* (0) First, you may need to install ja-man-1.1j or later:            *
-*        # pkg_add ja-man-1.1j.tgz                                    *
-*                                                                     *
-* (1) Then, see jman(1) with following command sequence:              *
+* (1) To read jman(1), use the following command sequence:            *
 *        % setenv LC_CTYPE ja_JP.eucJP                                *
 *        % setenv PAGER jless                                         *
 *        % jman jman                                                  *
 *                                                                     *
-* (2) To get more info, please visit following web page (Japanese):   *
+* (2) For more info, please visit following web page (Japanese):      *
 *        Jpman project <URL:http://www.jp.FreeBSD.org/man-jp/>        *
 *                                                                     *
 * (3) If you have any questions, comments, bug reports, suggestions,  *
 *     and/or requests for modifications, please send e-mail to:       *
 *        Jpman project mailing list <man-jp@jp.FreeBSD.org>           *
 *                                                                     *
-*     When we receive your reports, we will be pleased to append your *
-*     name to the contributor list on the above web page with great   *
-*     thanks.                                                         *
 ***********************************************************************
diff --git a/japanese/man-doc/pkg-plist b/japanese/man-doc/pkg-plist
index 0dad01c61795..3f0385ce707a 100644
--- a/japanese/man-doc/pkg-plist
+++ b/japanese/man-doc/pkg-plist
@@ -1 +1,2 @@
-@message
+@comment $FreeBSD$
+@comment intentionally left empty