3 files changed, 60 insertions, 21 deletions

diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index edccde42d19d..37f5222f87ca 100644
--- a/japanese/eijiro-fpw/Makefile
+++ b/japanese/eijiro-fpw/Makefile
@@ -13,8 +13,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
-		nkf:${PORTSDIR}/japanese/nkf \
+BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
+		${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
@@ -23,10 +23,24 @@ USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/eijiro-fpw${PORTVERSION}
 DICT_PATH?=	/cdrom
 SRCFILE?=	eijiro52.txt
-MAKE_ENV=	PORT_SRCFILE=${DICT_PATH}/${SRCFILE}
+
+# For eijiro included in a book sold by ALC Inc.
+# (http://www.alc.co.jp/alcshop/eng/eijiro/)
+.if exists(${DICT_PATH}/eijiro-original)
+BUILD_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
+
+CDROM_PATH:=	${DICT_PATH}
+DICT_PATH:=	${WRKDIR}
+.else
+CDROM_PATH=	${NONEXISTENT}
+.endif
+
+MAKE_ARGS:=	PORT_SRCFILE=${DICT_PATH}/${SRCFILE}
 
 post-extract:
-	@if [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
+	@if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \
+	  lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \
+	elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \
 	  ${ECHO} "Specify the Eijiro Dictionary file with the full path"; \
@@ -40,8 +54,8 @@ post-extract:
 	${CP} ${LOCALBASE}/share/doc/freepwing/fpwutils.mk ${WRKSRC}
 
 post-build:
-	cd ${WRKSRC}; nkf -eSd catalogs.sjis > catalogs.txt; \
-	fpwmake catalogs
+	cd ${WRKSRC}; ${CP} catalogs.sjis catalogs.txt; \
+	${SETENV} CATDUMPFLAGS="-e sjis" fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/eijiro-fpw/eijiro/data
diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile
index 9a2ed784cd8c..b328c2d2d4ff 100644
--- a/japanese/otojiro-fpw/Makefile
+++ b/japanese/otojiro-fpw/Makefile
@@ -14,8 +14,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.a/a/}-src
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
-		nkf:${PORTSDIR}/japanese/nkf \
+BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
+		${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
@@ -24,10 +24,25 @@ USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/otojiro-fpw${PORTVERSION:S/.a/a/}
 DICT_PATH?=	/cdrom
 SRCFILE?=	otojiro.txt
-MAKE_ENV=	OTOJIRO_FILE=${DICT_PATH}/${SRCFILE}
 
-pre-extract::
-	@if [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
+# For eijiro included in a book sold by ALC Inc.
+# (http://www.alc.co.jp/alcshop/eng/eijiro/)
+.if exists(${DICT_PATH}/eijiro-original)
+BUILD_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
+
+CDROM_PATH:=	${DICT_PATH}
+DICT_PATH:=	${WRKDIR}
+.else
+CDROM_PATH=	${NONEXISTENT}
+.endif
+
+MAKE_ENV:=	OTOJIRO_FILE=${DICT_PATH}/${SRCFILE}
+
+post-extract:
+	@if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \
+	  ${MKDIR} ${WRKDIR}; \
+	  lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \
+	elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \
 	  ${ECHO} "Specify the Otojiro Dictionary file with the full path"; \
@@ -39,14 +54,9 @@ pre-extract::
 	  ${FALSE}; \
 	fi
 
-post-build:
-## To delete CR after NL
-	cd ${WRKSRC}; ${MV} catalogs.txt catalogs.txt.org; \
-	nkf -sSd catalogs.txt.org > catalogs.txt; \
-	fpwmake catalogs
-
 do-build:
-	cd ${WRKSRC}; ${ENV} ${MAKE_ENV} fpwmake
+	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} fpwmake; \
+	fpwmake catalogs
 
 do-install:
 	${MKDIR} ${PREFIX}/share/dict/otojiro-fpw/otojiro/data
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index b53758e095b2..9f3c772444e0 100644
--- a/japanese/waeijiro-fpw/Makefile
+++ b/japanese/waeijiro-fpw/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	http://www.dsl.gr.jp/~tf/
 
 MAINTAINER=	taoka@FreeBSD.org
 
-BUILD_DEPENDS=	${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
+BUILD_DEPENDS=	${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
+		${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
 
 RESTRICTED=	"The original dictionary is not free"
@@ -22,10 +23,24 @@ NO_PACKAGE=	"The original dictionary is not free"
 USE_GMAKE=	yes
 DICT_PATH?=	/cdrom
 SRCFILE?=	waeiji52.txt
-MAKE_ENV=	SRC_DICT=${DICT_PATH}/${SRCFILE}
+
+# For eijiro included in a book sold by ALC Inc.
+# (http://www.alc.co.jp/alcshop/eng/eijiro/)
+.if exists(${DICT_PATH}/eijiro-original)
+BUILD_DEPENDS+=	lha:${PORTSDIR}/archivers/lha
+
+CDROM_PATH:=	${DICT_PATH}
+DICT_PATH:=	${WRKDIR}
+.else
+CDROM_PATH=	${NONEXISTENT}
+.endif
+
+MAKE_ARGS:=	SRC_DICT=${DICT_PATH}/${SRCFILE}
 
 post-extract:
-	@if [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
+	@if [ -f ${CDROM_PATH}/eijiro-original/*.exe ]; then \
+	  lha xiw=${WRKDIR} ${CDROM_PATH}/eijiro-original/*.exe '*/${SRCFILE}'; \
+	elif [ ! -f ${DICT_PATH}/${SRCFILE} ]; then \
 	  ${ECHO} "###################################################"; \
 	  ${ECHO} "I cannot find a file ${DICT_PATH}/${SRCFILE}"; \
 	  ${ECHO} "Specify the Waeijiro Dictionary file with the full path"; \