6 files changed, 13 insertions, 37 deletions

diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index d9a2ae15c9a0..7c020150e3df 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	dbskkd-cdb
 PORTVERSION=	1.01
+PORTREVISION=	1
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.ne.jp/asahi/bdx/info/software/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -14,44 +15,30 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	matusita@FreeBSD.org
 
+RUN_DEPENDS=	${LOCALBASE}/${SKKDIR}/SKK-JISYO.${SKKJISYO_TYPE}.cdb:${PORTSDIR}/japanese/skk-jisyo-cdb
+
 CDB_DISTNAME=	cdb-0.55
 
-SKKJISYO_SIZE?=	L
-SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
+SKKDIR?=	share/skk
+SKKJISYO_TYPE?=	L
 DOCS=		Release-Notes.English Release-Notes.Japanese LICENSE
 
-MAKE_ENV+=	SKKJISYO=${SKKJISYO}
-PLIST_SUB=	JISYONAME=${SKKJISYO}
+MAKE_ENV+=	SKKDIR=${SKKDIR} SKKJISYO=SKK-JISYO.${SKKJISYO_TYPE}
 
 post-patch:
 .for docs in ${DOCS}
-	${SED} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%JISYONAME%%!${SKKJISYO}!g" < ${WRKSRC}/${docs} > ${WRKSRC}/.tmp
+	${SED} -e "s!%%PREFIX%%!${PREFIX}!g" -e "s!%%SKKDIR%%!${SKKDIR}!g" -e "s!%%JISYONAME%%!SKK-JISYO.${SKKJISYO_TYPE}!g" < ${WRKSRC}/${docs} > ${WRKSRC}/.tmp
 	${MV} -f ${WRKSRC}/.tmp ${WRKSRC}/${docs}
 .endfor
 
 post-install:
-	${MKDIR} ${PREFIX}/share/dbskkd-cdb ${PREFIX}/share/doc/dbskkd-cdb
-	${INSTALL_DATA} ${WRKSRC}/${SKKJISYO}.cdb ${PREFIX}/share/dbskkd-cdb
 .for docs in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${PREFIX}/share/doc/dbskkd-cdb
 .endfor
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_JISYO) || (exists(${LOCALBASE}/share/skk/${SKKJISYO}) \
-	&& !defined(WITHOUT_JISYO))
-pre-build::
-	${CP} ${LOCALBASE}/share/skk/${SKKJISYO} ${WRKSRC}
-.else
-BUILD_DEPENDS+=	${NONEXISTENT}:${.CURDIR}/../../japanese/skk-jisyo:extract
-pre-build::
-	${CP} ${WRKDIR}/../../../japanese/skk-jisyo/work/*/jisyo/${SKKJISYO} ${WRKSRC}
-.endif
-
 pre-build::
 	(cd ${WRKDIR}/${CDB_DISTNAME}; make it)
 	${CP} ${WRKDIR}/${CDB_DISTNAME}/libcdb.a ${WRKSRC}
 	${CP} ${WRKDIR}/${CDB_DISTNAME}/cdbmake ${WRKSRC}
-	(cd ${WRKSRC}; SKKJISYO=${SKKJISYO} ./makeskkcdb.sh)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/japanese/dbskkd-cdb/files/patch-aa b/japanese/dbskkd-cdb/files/patch-aa
index 27e5c1e27152..83c46120e1cf 100644
--- a/japanese/dbskkd-cdb/files/patch-aa
+++ b/japanese/dbskkd-cdb/files/patch-aa
@@ -6,7 +6,7 @@
  # please define SERVERDIR
 -SERVERDIR = /usr/local/libexec
 +SERVERDIR = ${PREFIX}/libexec
-+JISHOFILE = ${PREFIX}/share/dbskkd-cdb/${SKKJISYO}.cdb
++JISHOFILE = ${PREFIX}/${SKKDIR}/${SKKJISYO}.cdb
  # for FreeBSD-2.x and BSD/OS (without shlib)
  CC = gcc -O -g
  COMPAT =
diff --git a/japanese/dbskkd-cdb/files/patch-ab b/japanese/dbskkd-cdb/files/patch-ab
deleted file mode 100644
index dff95357e6a9..000000000000
--- a/japanese/dbskkd-cdb/files/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
---- makeskkcdb.sh.dist	Sat Dec 12 20:01:39 1998
-+++ makeskkcdb.sh	Fri Jun 18 14:36:58 1999
-@@ -1,4 +1,4 @@
- #!/bin/sh
- #$Id: makeskkcdb.sh,v 1.1 1998/12/12 11:01:36 kenji Exp $
--./skktocdbm.sh < /usr/local/share/skk/SKK-JISYO.L | \
--	cdbmake SKK-JISYO.L.cdb SKK-JISYO.L.tmp
-+./skktocdbm.sh < ./${SKKJISYO} | \
-+	./cdbmake ${SKKJISYO}.cdb ${SKKJISYO}.tmp
diff --git a/japanese/dbskkd-cdb/files/patch-ac b/japanese/dbskkd-cdb/files/patch-ac
index 5407e75f4b6f..31f5d6373bb2 100644
--- a/japanese/dbskkd-cdb/files/patch-ac
+++ b/japanese/dbskkd-cdb/files/patch-ac
@@ -9,7 +9,7 @@
     This script invokes skktocdbm.sh and
 -   redirect /usr/local/share/skk/SKK-JISYO.L as the stdin of skktocdbm.sh.
 -   The SKK-JISYO.L.cdb is created under the current directory as default.
-+   redirect %%PREFIX%%/share/skk/%%JISYONAME%% as the stdin of skktocdbm.sh.
++   redirect %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%% as the stdin of skktocdbm.sh.
 +   The %%JISYONAME%%.cdb is created under the current directory as default.
     Change the default pathnames if you need to do so.
  
@@ -28,7 +28,7 @@
  2. Set the pathname of JISHO_FILE in dbskkd-cdb.c to the directory
     where the cdb-style dictionary resides.
 -   The defaule value is /usr/local/share/skk/SKK-JISYO.L.cdb.
-+   The defaule value is %%PREFIX%%/share/dbskkd-cdb/%%JISYONAME%%.cdb.
++   The defaule value is %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%%.cdb.
  
  3. Setting the compile-time flag LOG_PEERINFO lets the dbskkd-cdb log the
     source address of the client connected to the server.  This flag is
diff --git a/japanese/dbskkd-cdb/files/patch-ad b/japanese/dbskkd-cdb/files/patch-ad
index 9a01491f9e53..51974470dafc 100644
--- a/japanese/dbskkd-cdb/files/patch-ad
+++ b/japanese/dbskkd-cdb/files/patch-ad
@@ -6,7 +6,7 @@
     $B<-=q%U%!%$%k$O(Bskktocdbm.sh$B$NI8=`F~NO$KM?$($k$h$&$K$J$C$F$$$k!#(B
 -   $B%G%U%)%k%H$O(B /usr/local/share/skk/SKK-JISYO.L$B$r;XDj$7$F$$$k!#(B
 -   $B$^$?!"%G%U%)%k%H$G$O%+%l%s%H%G%#%l%/%H%j$K(BSKK-JISYO.L.cdb$B$,:n$i$l$k!#(B
-+   $B%G%U%)%k%H$O(B %%PREFIX%%/share/skk/%%JISYONAME%%$B$r;XDj$7$F$$$k!#(B
++   $B%G%U%)%k%H$O(B %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%%$B$r;XDj$7$F$$$k!#(B
 +   $B$^$?!"%G%U%)%k%H$G$O%+%l%s%H%G%#%l%/%H%j$K(B%%JISYONAME%%.cdb$B$,:n$i$l$k!#(B
     $BI,MW$K1~$8$F%G%U%)%k%HCM$OJQ99$9$k$3$H!#(B
  
@@ -24,7 +24,7 @@
  
  2. dbskkd-cdb.c$B$N(BJISHO_FILE$B$r<B:]$K(Bcdb$B7A<0$K$7$?<-=q%U%!%$%k$N%Q%9L>$H$9$k!#(B
 -   $B%G%U%)%k%H$O(B /usr/local/share/skk/SKK-JISYO.L.cdb $B!#(B
-+   $B%G%U%)%k%H$O(B %%PREFIX%%/share/dbskkd-cdb/%%JISYONAME%%.cdb $B!#(B
++   $B%G%U%)%k%H$O(B %%PREFIX%%/%%SKKDIR%%/%%JISYONAME%%.cdb $B!#(B
  
  3. $B%3%s%Q%$%k%U%i%0$N(BLOG_PEERINFO$B$O(Btcp_wrapper$B$J$I$r;H$o$J$$:]$K(B
     $B$I$N%[%9%H$+$i@\B3$7$F$-$?$+$r5-O?$9$k$?$a$N$b$N$G$"$k!#(B
diff --git a/japanese/dbskkd-cdb/pkg-plist b/japanese/dbskkd-cdb/pkg-plist
index 015a614a4b3b..0d88b6a97997 100644
--- a/japanese/dbskkd-cdb/pkg-plist
+++ b/japanese/dbskkd-cdb/pkg-plist
@@ -1,7 +1,5 @@
 libexec/dbskkd-cdb
-share/dbskkd-cdb/%%JISYONAME%%.cdb
 share/doc/dbskkd-cdb/Release-Notes.English
 share/doc/dbskkd-cdb/Release-Notes.Japanese
 share/doc/dbskkd-cdb/LICENSE
-@dirrm share/dbskkd-cdb
 @dirrm share/doc/dbskkd-cdb