Add skk-jisyo-cdb, SKK dictionary files in another format.

Submitted by:	YANO Toru <toru@maid.ne.jp>
		KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp>

7 files changed, 48 insertions, 14 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 5772e2dce69e..0781f2e4cadf 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -343,6 +343,7 @@
     SUBDIR += skk
     SUBDIR += skk-elisp
     SUBDIR += skk-jisyo
+    SUBDIR += skk-jisyo-cdb
     SUBDIR += skk-tools
     SUBDIR += skk10-elisp-emacs20
     SUBDIR += skkfep
diff --git a/japanese/skk-jisyo-cdb/Makefile b/japanese/skk-jisyo-cdb/Makefile
new file mode 100644
index 000000000000..05c55afeb9c0
--- /dev/null
+++ b/japanese/skk-jisyo-cdb/Makefile
@@ -0,0 +1,21 @@
+# New ports collection makefile for:	skk-jisyo-cdb
+# Date created:		13 Sep 2002
+# Whom:			KOMATSU Shinichiro <koma2@jiro.c.u-tokyo.ac.jp>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	skk-jisyo-cdb
+PORTREVISION=	0
+
+MAINTAINER=	toru@tkd.ne.jp
+
+SKK_JISYO_SUFFIX=	.cdb
+
+MASTERDIR=	${.CURDIR}/../skk-jisyo
+
+MD5_FILE=	${.CURDIR}/distinfo
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/skk-jisyo-cdb/distinfo b/japanese/skk-jisyo-cdb/distinfo
new file mode 100644
index 000000000000..0af3f279b37a
--- /dev/null
+++ b/japanese/skk-jisyo-cdb/distinfo
@@ -0,0 +1,3 @@
+MD5 (skk-jisyo/SKK-JISYO.L.200209.cdb.gz) = a9d71b6adde938003d2aed5a88a1b977
+MD5 (skk-jisyo/SKK-JISYO.M.200209.cdb.gz) = a0a29422cddf584c87855cdc4b65247d
+MD5 (skk-jisyo/SKK-JISYO.S.200209.cdb.gz) = aee63a2f15668d91265be8aa5fdb444f
diff --git a/japanese/skk-jisyo-cdb/pkg-comment b/japanese/skk-jisyo-cdb/pkg-comment
new file mode 100644
index 000000000000..2bf728f96959
--- /dev/null
+++ b/japanese/skk-jisyo-cdb/pkg-comment
@@ -0,0 +1 @@
+CDB jisyo (dictionary) files for the SKK Japanese-input software
diff --git a/japanese/skk-jisyo-cdb/pkg-descr b/japanese/skk-jisyo-cdb/pkg-descr
new file mode 100644
index 000000000000..0bb34440c606
--- /dev/null
+++ b/japanese/skk-jisyo-cdb/pkg-descr
@@ -0,0 +1,5 @@
+SKK (Simple Kana Kanji Convertor) is a very fast and efficient Japanese
+input method system, written in emacs-lisp. This package provides CDB
+jisyo files (kana-kanji conversion dictionaries). 
+
+WWW: http://openlab.ring.gr.jp/skk/
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index 97fd732376b7..01b8393790a4 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 #
 
-PORTNAME=	skk-jisyo
-PORTVERSION=	200209
+PORTNAME?=	skk-jisyo
+PORTVERSION?=	200209
 CATEGORIES=	japanese
 MASTER_SITES?=	http://www.tkd.ne.jp/~toru/skk/
-DISTFILES?=	SKK-JISYO.L.${PORTVERSION}.gz \
-		SKK-JISYO.M.${PORTVERSION}.gz \
-		SKK-JISYO.S.${PORTVERSION}.gz
-DIST_SUBDIR=	${PORTNAME}
+DISTFILES?=	SKK-JISYO.L.${PORTVERSION}${SKK_JISYO_SUFFIX}.gz \
+		SKK-JISYO.M.${PORTVERSION}${SKK_JISYO_SUFFIX}.gz \
+		SKK-JISYO.S.${PORTVERSION}${SKK_JISYO_SUFFIX}.gz
+DIST_SUBDIR=	skk-jisyo
 
-MAINTAINER=	yoichi@FreeBSD.org
+MAINTAINER?=	yoichi@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
@@ -22,15 +22,18 @@ EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	-p
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 
-SKKDIR=	${PREFIX}/share/skk
+SKKDIR?=		share/skk
 SKK_JISYO_TYPE?=	L M S
+SKK_JISYO_SUFFIX?=	# empty
+
+PLIST_SUB=	SKKDIR=${SKKDIR} JISYO_SUFFIX=${SKK_JISYO_SUFFIX}
 
 post-extract:
 	@(cd ${WRKDIR}; ${GUNZIP_CMD} *.gz)
 do-install:
-	${MKDIR} ${SKKDIR}
+	${MKDIR} ${PREFIX}/${SKKDIR}
 .for i in ${SKK_JISYO_TYPE}
-	${INSTALL_DATA} ${WRKSRC}/SKK-JISYO.${i}.${PORTVERSION} ${SKKDIR}/SKK-JISYO.${i}
+	${INSTALL_DATA} ${WRKSRC}/SKK-JISYO.${i}.${PORTVERSION}${SKK_JISYO_SUFFIX} ${PREFIX}/${SKKDIR}/SKK-JISYO.${i}${SKK_JISYO_SUFFIX}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/japanese/skk-jisyo/pkg-plist b/japanese/skk-jisyo/pkg-plist
index 01d1e088024b..7fee972746ab 100644
--- a/japanese/skk-jisyo/pkg-plist
+++ b/japanese/skk-jisyo/pkg-plist
@@ -1,4 +1,4 @@
-share/skk/SKK-JISYO.L
-share/skk/SKK-JISYO.M
-share/skk/SKK-JISYO.S
-@dirrm share/skk
+%%SKKDIR%%/SKK-JISYO.L%%JISYO_SUFFIX%%
+%%SKKDIR%%/SKK-JISYO.M%%JISYO_SUFFIX%%
+%%SKKDIR%%/SKK-JISYO.S%%JISYO_SUFFIX%%
+@dirrm %%SKKDIR%%