From 3e4ed92f531ccc10728d27909807787217062905 Mon Sep 17 00:00:00 2001 From: taca Date: Fri, 23 Feb 2001 15:03:45 +0000 Subject: - Update chasen to 2.2.2. - Move CHASEN_VERSION to Makefile.common. 2001-02-21 Masayuki Asahara * lib/Makefile.am (DEFS): default chasenrc path (PREFIX/etc) * configure.in: version number update * README: version number update * README-ja: version number update * doc/manual.tex: * doc/manual-j.tex: modification for chasenrc path 2001-02-19 TAKAOKA Kazuma * lib/parse.c (utf8_check_undefword_len): Add UTF-8 tokenizer. (iso8859_check_undefword_len): Add ISO-8859-* tokenizer. 2001-02-13 Masayuki Asahara * doc/manual.tex: * doc/manual-j.tex: modification for manual. 2001-02-13 Masayuki Asahara * lib/*.c: lib/*.h: chasen/chasen.c: merged from the branch `release-2_2_0-patches' `fclose' problem Thanks to Takahiro Kambe the branch `release-2_2_0-patches' are obsolete. 2001-02-03 TAKAOKA Kazuma * lib/patfile.c: Use fgetc and fputc instead of egetc and eputc. 2001-02-02 Akira Kitauchi * lib/print.c: new output format '%i0'. 2001-01-14 Akira Kitauchi * lib/jfgets.c: Modified a bug in -j option. Now replaces "KANJI SPACES \n SPACES KANJI" with "KANJI KANJI" again. --- japanese/chasen-base/Makefile | 7 +++---- japanese/chasen-base/Makefile.common | 3 +++ japanese/chasen-base/files/md5 | 4 ++-- japanese/chasen-base/files/patch-sum | 9 +++------ japanese/chasen-base/patches/patch-aa | 21 --------------------- japanese/chasen-base/patches/patch-ab | 6 +++--- japanese/chasen-base/patches/patch-ac | 11 +---------- japanese/chasen-base/patches/patch-ae | 13 ------------- japanese/chasen-base/patches/patch-af | 10 ---------- japanese/chasen-base/pkg/PLIST | 5 +++-- 10 files changed, 18 insertions(+), 71 deletions(-) create mode 100644 japanese/chasen-base/Makefile.common delete mode 100644 japanese/chasen-base/patches/patch-aa delete mode 100644 japanese/chasen-base/patches/patch-ae delete mode 100644 japanese/chasen-base/patches/patch-af (limited to 'japanese') diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile index c34e74aaecc..3d381ee2ccf 100644 --- a/japanese/chasen-base/Makefile +++ b/japanese/chasen-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 15:25:14 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/02/23 15:03:45 taca Exp $ # DISTNAME= chasen-${CHASEN_VERSION} @@ -10,14 +10,13 @@ MAINTAINER= tech-pkg-ja@jp.netbsd.org HOMEPAGE= http://chasen.aist-nara.ac.jp/ COMMENT= ChaSen, Japanese Morphological Analysis System -CHASEN_VERSION= 2.2.1 - GNU_CONFIGURE= # defined USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig post-install: - mkdir ${LOCALBASE}/share/chasen/dic + ${MKDIR} ${LOCALBASE}/share/chasen/dic +.include "Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/japanese/chasen-base/Makefile.common b/japanese/chasen-base/Makefile.common new file mode 100644 index 00000000000..6153f76f33d --- /dev/null +++ b/japanese/chasen-base/Makefile.common @@ -0,0 +1,3 @@ +# $NetBSD: Makefile.common,v 1.1 2001/02/23 15:03:45 taca Exp $ +# +CHASEN_VERSION= 2.2.2 diff --git a/japanese/chasen-base/files/md5 b/japanese/chasen-base/files/md5 index cfd9ad01aa1..27f24654ad3 100644 --- a/japanese/chasen-base/files/md5 +++ b/japanese/chasen-base/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2001/01/10 14:45:03 taca Exp $ +$NetBSD: md5,v 1.2 2001/02/23 15:03:46 taca Exp $ -MD5 (chasen-2.2.1.tar.gz) = fcbe94a0c630cd8fae6747537336d209 +MD5 (chasen-2.2.2.tar.gz) = 2c9f5bcaf8f165993bfae30aff2c8a61 diff --git a/japanese/chasen-base/files/patch-sum b/japanese/chasen-base/files/patch-sum index 2a39b3be882..ed05368b442 100644 --- a/japanese/chasen-base/files/patch-sum +++ b/japanese/chasen-base/files/patch-sum @@ -1,8 +1,5 @@ -$NetBSD: patch-sum,v 1.2 2001/02/09 00:06:37 taca Exp $ +$NetBSD: patch-sum,v 1.3 2001/02/23 15:03:46 taca Exp $ -MD5 (patch-aa) = d4ad21c6e47c0f46db1458bbc868dced -MD5 (patch-ab) = dfa07e0350fe4680146c07eabdf4c379 -MD5 (patch-ac) = 7d66d6c9ccc2f05e5e3c2daefb4b94f2 +MD5 (patch-ab) = 52472b6615bc0439821a4ccd642fe034 +MD5 (patch-ac) = 21e7e18a6982499fa4adafebaded9dd6 MD5 (patch-ad) = ece2bd7f2783109a700ab1b643f10dd2 -MD5 (patch-ae) = 4e2b8a4830b89d7d870fa2b399e9ea87 -MD5 (patch-af) = 910becc178cc5d086f616a73cf08ba72 diff --git a/japanese/chasen-base/patches/patch-aa b/japanese/chasen-base/patches/patch-aa deleted file mode 100644 index ee79080ae1e..00000000000 --- a/japanese/chasen-base/patches/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/01/10 14:45:03 taca Exp $ - ---- chasen/chasen.c.orig Tue Dec 19 05:08:20 2000 -+++ chasen/chasen.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - #include "chalib.h" - #include "pat.h" -@@ -375,7 +376,7 @@ - #endif - rc = chasen_standalone(argv, output); - if (output != stdout) -- close(output); -+ fclose(output); - return rc; - } - } diff --git a/japanese/chasen-base/patches/patch-ab b/japanese/chasen-base/patches/patch-ab index 43a6c3c0e12..c7ca4249418 100644 --- a/japanese/chasen-base/patches/patch-ab +++ b/japanese/chasen-base/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/01/10 14:45:03 taca Exp $ +$NetBSD: patch-ab,v 1.2 2001/02/23 15:03:47 taca Exp $ ---- lib/print.c.orig Tue Dec 19 05:08:31 2000 +--- lib/print.c.orig Wed Feb 14 09:20:53 2001 +++ lib/print.c -@@ -166,14 +166,6 @@ +@@ -167,14 +167,6 @@ void cha_set_fput(server_mode) int server_mode; { diff --git a/japanese/chasen-base/patches/patch-ac b/japanese/chasen-base/patches/patch-ac index 44458acfc30..c11fa446ed0 100644 --- a/japanese/chasen-base/patches/patch-ac +++ b/japanese/chasen-base/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/01/10 14:45:03 taca Exp $ +$NetBSD: patch-ac,v 1.2 2001/02/23 15:03:47 taca Exp $ --- mkchadic/convdic.c.orig Wed Dec 6 14:13:44 2000 +++ mkchadic/convdic.c @@ -10,12 +10,3 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/01/10 14:45:03 taca Exp $ #include #define LINEMAX 8192 -@@ -296,7 +297,7 @@ - - if ((fp = fopen(file, "r")) == NULL) - return 0; -- close(fp); -+ fclose(fp); - return 1; - } - diff --git a/japanese/chasen-base/patches/patch-ae b/japanese/chasen-base/patches/patch-ae deleted file mode 100644 index 09a91f15cba..00000000000 --- a/japanese/chasen-base/patches/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/02/09 00:06:37 taca Exp $ - ---- lib/Makefile.in.orig Thu Dec 21 06:28:51 2000 -+++ lib/Makefile.in -@@ -82,7 +82,7 @@ - libchasen_la_LDFLAGS = -version-info $(LTVERSION) - - INCLUDES = -I.. --DEFS = -DRCPATH=\"$(pkgdatadir)/dic/ipadic/chasenrc\" @DEFS@ -+DEFS = -DRCPATH=\"$(sysconfdir)/chasenrc\" @DEFS@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - CONFIG_CLEAN_FILES = diff --git a/japanese/chasen-base/patches/patch-af b/japanese/chasen-base/patches/patch-af deleted file mode 100644 index 91bb1df5e0f..00000000000 --- a/japanese/chasen-base/patches/patch-af +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-af,v 1.1 2001/02/09 00:06:37 taca Exp $ - ---- lib/Makefile.am.orig Tue Dec 5 23:26:43 2000 -+++ lib/Makefile.am -@@ -10,4 +10,4 @@ - libchasen_la_LDFLAGS = -version-info $(LTVERSION) - - INCLUDES = -I.. --DEFS = -DRCPATH=\"$(pkgdatadir)/dic/ipadic/chasenrc\" @DEFS@ -+DEFS = -DRCPATH=\"$(sysconfdir)/chasenrc\" @DEFS@ diff --git a/japanese/chasen-base/pkg/PLIST b/japanese/chasen-base/pkg/PLIST index 35fc5a07522..82424b85307 100644 --- a/japanese/chasen-base/pkg/PLIST +++ b/japanese/chasen-base/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2001/01/10 14:45:03 taca Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/02/23 15:03:48 taca Exp $ bin/chasen bin/chasen-config include/chasen.h @@ -7,6 +7,7 @@ lib/libchasen.la lib/libchasen.so lib/libchasen.so.0 lib/libchasen.so.0.1 +libexec/chasen/convary libexec/chasen/convdic libexec/chasen/makeint libexec/chasen/makemat @@ -14,7 +15,7 @@ libexec/chasen/mkary libexec/chasen/pattool libexec/chasen/sortdic @dirrm libexec/chasen -@exec mkdir %D/share/chasen/dic >/dev/null 2>&1 || true +@exec mkdir -p %D/share/chasen/dic >/dev/null 2>&1 || true @dirrm share/chasen/dic share/chasen/doc/manual-j.pdf share/chasen/doc/manual-j.tex -- cgit v1.2.3