From owner-ports-jp@jp.freebsd.org  Thu Sep 21 13:44:22 2000
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id NAA15466;
	Thu, 21 Sep 2000 13:44:22 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from iris.s-fine.co.jp (pfa63a3.osakjk02.ap.so-net.ne.jp [210.250.99.163])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id NAA15461
	for <ports-jp@jp.freebsd.org>; Thu, 21 Sep 2000 13:44:20 +0900 (JST)
	(envelope-from toru@maid.ne.jp)
Received: from localhost (localhost.s-fine.co.jp [127.0.0.1])
	by iris.s-fine.co.jp (8.11.0/3.7W-ppp) with ESMTP id e8L4hp241462
	for <ports-jp@jp.freebsd.org>; Thu, 21 Sep 2000 13:43:51 +0900 (JST)
Date: Thu, 21 Sep 2000 13:43:51 +0900 (JST)
Message-Id: <20000921.134351.34607023.toru@maid.ne.jp>
To: ports-jp@jp.freebsd.org
From: Yano Toru (=?iso-2022-jp?B?GyRCTHBMbhsoQiAbJEJEKhsoQg==?=)
 <toru@maid.ne.jp>
In-Reply-To: <20000921.133552.02300190.toru@maid.ne.jp>
References: <20000921.121016.68036387.toru@maid.ne.jp>
	<20000921.133552.02300190.toru@maid.ne.jp>
X-Mailer: Mew version 1.95b57 on Emacs 20.7 / Mule 4.1
 =?iso-2022-jp?B?KBskQjAqGyhCKQ==?=
Mime-Version: 1.0
Content-Type: Multipart/Mixed;
 boundary="--Next_Part(Thu_Sep_21_13:43:51_2000_966)--"
Content-Transfer-Encoding: 7bit
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10118
Subject: [ports-jp 10118] Re: wdic-fpw error
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: toru@maid.ne.jp

----Next_Part(Thu_Sep_21_13:43:51_2000_966)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit

$BLpLn$G$9!#(B
# $BEY!9$9$_$^$;$s!#(B

$BH/?.<T!'(B Yano Toru ($BLpLn(B $BD*(B) <toru@maid.ne.jp>
$BI=Bj(B  $B!'(B [ports-jp 10117] Re: wdic-fpw error
$BF|IU(B  $B!'(B Thu, 21 Sep 2000 13:35:52 +0900 (JST)

> $BLpLn$G$9!#(B
>   $B$A$c$s$H%$%s%9%H!<%k$N3NG'$r$7$?$N$rAwIU$7$^$9!#(B

  $B$H;W$C$?$1$I!"IU$$$F$J$+$C$?$N$G!"$3$l$KIU$1$^$9!#(B
---------+---------+---------+---------+---------+-----
Yano Toru ($BLpLn(B $BD*(B)  toru@tenchi.ne.jp
  Web : http://sakura.maid.ne.jp/
  Web : http://www.tenchi.ne.jp/~toru/
  ICQ : 44263504

----Next_Part(Thu_Sep_21_13:43:51_2000_966)--
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="wdic.diff"

diff -ruN wdic-fpw.orig/Makefile wdic-fpw/Makefile
--- wdic-fpw.orig/Makefile	Thu Sep 21 11:21:31 2000
+++ wdic-fpw/Makefile	Thu Sep 21 13:25:51 2000
@@ -19,6 +19,7 @@
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf \
 		fpwmake:${PORTSDIR}/japanese/freepwing \
 		catdump:${PORTSDIR}/japanese/epwutil \
+		lha:${PORTSDIR}/archivers/lha \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf
 
@@ -33,12 +34,9 @@
 		lha xqf ${DISTDIR}/$$i; \
 	done
 # join several dictionaris
-	${CAT} ${FILESDIR}/MOE_RAIL.H ${WRKSRC}/data/MOE[12].DIC ${WRKSRC}/data/RAIL.DIC > ${WRKSRC}/data/MOE_RAIL.DIC
-	${RM} ${WRKSRC}/data/MOE[12].DIC  ${WRKSRC}/data/RAIL.DIC
-	${CAT} ${FILESDIR}/YOGOPASO.H ${WRKSRC}/data/YOGO.DIC ${WRKSRC}/data/PASO.DIC > ${WRKSRC}/data/YOGOPASO.DIC
-	${RM}  ${WRKSRC}/data/PASO.DIC ${WRKSRC}/data/YOGO.DIC
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.org
-	${SED} 's,/usr/local/share/eb/data/wdc001,${PREFIX}/share/dict/wdc001-fpw,' \
-		${WRKSRC}/Makefile.org > ${WRKSRC}/Makefile
+	${CAT} ${FILESDIR}/MOE_RAIL.H ${WRKSRC}/data/moe[12].dic ${WRKSRC}/data/rail.dic > ${WRKSRC}/data/moe_rail.dic
+	${RM} ${WRKSRC}/data/moe[12].dic ${WRKSRC}/data/rail.dic
+	${CAT} ${FILESDIR}/YOGOPASO.H ${WRKSRC}/data/yogo.dic ${WRKSRC}/data/paso.dic > ${WRKSRC}/data/yogopaso.dic
+	${RM}  ${WRKSRC}/data/paso.dic ${WRKSRC}/data/yogo.dic
 
 .include <bsd.port.mk>
diff -ruN wdic-fpw.orig/Makefile~ wdic-fpw/Makefile~
--- wdic-fpw.orig/Makefile~	Thu Jan  1 09:00:00 1970
+++ wdic-fpw/Makefile~	Thu Sep 21 12:03:11 2000
@@ -0,0 +1,48 @@
+# New ports collection makefile for:	wdic - JIS X 4081 format version
+# Date created:        	2000.07.12
+# Whom:			Satoshi Taoka <taoka@FreeBSD.org>
+#
+# $FreeBSD: ports/japanese/wdic-fpw/Makefile,v 1.2 2000/07/19 15:46:48 taoka Exp $
+#
+
+PORTNAME=	wdic001-fpw
+PORTVERSION=	0.11
+CATEGORIES=	japanese
+MASTER_SITES=	http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/ \
+		http://www.wdic.org/file/ \
+		http://www.geocities.co.jp/SiliconValley-Bay/2872/
+DISTFILES=	${DICTFILES} wdc001fpw-${PORTVERSION}.tar.gz
+EXTRACT_ONLY=	wdc001fpw-${PORTVERSION}.tar.gz
+
+MAINTAINER=    	taoka@FreeBSD.org
+
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf \
+		fpwmake:${PORTSDIR}/japanese/freepwing \
+		catdump:${PORTSDIR}/japanese/epwutil \
+		lha:${PORTSDIR}/archivers/lha \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/NKF.pm:${PORTSDIR}/japanese/p5-nkf
+
+WRKSRC=		${WRKDIR}/wdc001-fpw${PORTVERSION}
+DICTFILES=	wdc001a.lzh wdc001b.lzh wdc001c.lzh wdc001d.lzh wdc001e.lzh \
+		wdc001f.lzh
+ALL_TARGET=	#
+
+post-extract:
+	cd ${WRKSRC}/data; \
+	for i in ${DICTFILES}; do \
+		lha xqf ${DISTDIR}/$$i; \
+	done
+# join several dictionaris
+	${CAT} ${FILESDIR}/MOE_RAIL.H ${WRKSRC}/data/moe[12].dic ${WRKSRC}/data/rail.dic > ${WRKSRC}/data/more_rail.dic
+	${RM} ${WRKSRC}/data/moe[12].dic ${WRKSRC}/data/rail.dic
+	${CAT} ${FILESDIR}/YOGOPASO.H ${WRKSRC}/data/yogo.dic ${WRKSRC}/data/paso.dic > ${WRKSRC}/data/yogopaso.dic
+	${RM}  ${WRKSRC}/data/paso.dic ${WRKSRC}/data/yogo.dic
+#	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.org
+#	${SED} 's,/usr/local/share/eb/data/wdc001,${PREFIX}/share/dict/wdc001-fpw,' \
+#		${WRKSRC}/Makefile.org > ${WRKSRC}/Makefile.tmp
+#	${SED} 's,.DIC,.dic,' \
+#		${WRKSRC}/Makefile.tmp > ${WRKSRC}/Makefile
+#	${RM}  ${WRKSRC}/Makefile.tmp
+
+.include <bsd.port.mk>
diff -ruN wdic-fpw.orig/patches/patch-aa wdic-fpw/patches/patch-aa
--- wdic-fpw.orig/patches/patch-aa	Thu Jan  1 09:00:00 1970
+++ wdic-fpw/patches/patch-aa	Thu Sep 21 12:01:18 2000
@@ -0,0 +1,51 @@
+--- Makefile.org	Fri May 12 16:17:44 2000
++++ Makefile	Thu Sep 21 12:00:38 2000
+@@ -1,7 +1,7 @@
+ PACKAGE = wdc001-fpw
+ 
+ SRCDIR  = $(PWD)/data
+-INSTALL_DIR = /usr/local/share/eb/data/wdc001
++INSTALL_DIR = /usr/local/share/dict/wdc001-fpw
+ WORKDIR = $(PWD)/wdc001
+ 
+ DICLIST = $(PWD)/DICLIST
+@@ -12,7 +12,7 @@
+ dictonary : $(DICLIST) depend 
+ 	@echo Covert dictonary format [JIS X4081]
+ 	for TEMP in `cat $(DICLIST)`; do \
+-	    echo Convert dictonary...$$TEMP\.DIC; \
++	    echo Convert dictonary...$$TEMP\.dic; \
+ 	    DICTDIR=$(WORKDIR)/$$TEMP; \
+ 	    ORGDIR=$(PWD); \
+ 	    echo Current directory:$$ORGDIR Entering dirrectory:$$DICTDIR; \
+@@ -30,7 +30,7 @@
+ 
+ depend : $(DICLIST) makedirs
+ 	for TEMP in `cat $(DICLIST)`; do \
+-	    DICNAME=$$TEMP\.DIC;\
++	    DICNAME=$$TEMP\.dic;\
+ 	    SRCDIC=$(SRCDIR)/$$DICNAME; \
+ 	    DISTDIC=$(WORKDIR)/$$TEMP/$$DICNAME; \
+ 	    if [ ! -r $$DISTDIC ]; then \
+@@ -54,10 +54,10 @@
+ clean :
+ 	for TEMP in `cat $(DICLIST)`; do \
+ 	    DISTDIR=$(WORKDIR)/$$TEMP; \
+-	    DICNAME=$(TEMP).DIC;\
++	    DICNAME=$(TEMP).dic;\
+ 	    rm -f $$DISTDIR/honmon; \
+ 	    rm -f $$DISTDIR/Makefile; \
+-	    rm -f $$DISTDIR/$$TEMP.DIC; \
++	    rm -f $$DISTDIR/$$TEMP.dic; \
+ 	    if [ -d $$DISTDIR/work ]; then \
+ 		rm -rf $$DISTDIR/work; \
+ 	    fi; \
+@@ -92,7 +92,7 @@
+ 
+ $(DICLIST) :
+ 	@echo Create source dictonaries list ....
+-	`ls $(SRCDIR)/*.DIC | sed 's/^.*\/\(.*\)\.DIC$$/\1/' > $(DICLIST)`
++	`ls $(SRCDIR)/*.dic | sed 's/^.*\/\(.*\)\.dic$$/\1/' > $(DICLIST)`
+ 	@echo done.
+ 
+ $(CTLGSRC) : $(DICLIST)
diff -ruN wdic-fpw.orig/patches/patch-ab wdic-fpw/patches/patch-ab
--- wdic-fpw.orig/patches/patch-ab	Thu Jan  1 09:00:00 1970
+++ wdic-fpw/patches/patch-ab	Thu Sep 21 12:07:51 2000
@@ -0,0 +1,11 @@
+--- wdc001fpw.orig	Thu Sep 21 12:05:58 2000
++++ wdc001fpw	Thu Sep 21 12:06:41 2000
+@@ -8,7 +8,7 @@
+ die "usage: $1 dictonary_file\n" if ( @ARGV != 1 );
+ 
+ # $B<-=q%U%!%$%kL>(B
+-$srcfile    = "$ARGV[0].DIC";
++$srcfile    = "$ARGV[0].dic";
+ 
+ # $B9`L\L><hF@(B
+ $entry_reg  = '^#(.*).*';
diff -ruN wdic-fpw.orig/patches/patch-ac wdic-fpw/patches/patch-ac
--- wdic-fpw.orig/patches/patch-ac	Thu Jan  1 09:00:00 1970
+++ wdic-fpw/patches/patch-ac	Thu Sep 21 13:19:04 2000
@@ -0,0 +1,11 @@
+--- crecatlog.orig	Thu Sep 21 13:18:13 2000
++++ crecatlog	Thu Sep 21 13:18:28 2000
+@@ -15,7 +15,7 @@
+ fi
+ 
+ for TEMP in `head -n 12 $LISTFILE | nkf -e`; do
+-    DICT=${DICTDIR}/${TEMP}.DIC
++    DICT=${DICTDIR}/${TEMP}.dic
+     if [ ! -r $DICT ]; then
+ 	echo Can not open $DICT
+ 	exit 1

----Next_Part(Thu_Sep_21_13:43:51_2000_966)----
