diff options
author | taca <taca> | 2007-08-02 15:03:09 +0000 |
---|---|---|
committer | taca <taca> | 2007-08-02 15:03:09 +0000 |
commit | 9dd80598c8b13542cf5769722c1926d1b0800e16 (patch) | |
tree | a36b11299f4e69c3d46c65923e558d72d296b910 | |
parent | ff0d88bdb1ed76d342ed8b4671270be9ec682238 (diff) | |
download | pkgsrc-9dd80598c8b13542cf5769722c1926d1b0800e16.tar.gz |
Update chasen to 2.4.1.
pkgsrc change:
o Add DESTDIR supoprt.
o Update MASTER_SITES and HOMEPAGE.
chasen changes from 2.3.3 to 2.4.1.
----------------------------------------------------------------------
ChaSen 2.4.1 (2007/07/03)
----------------------------------------------------------------------
- bug fix
https://sourceforge.jp/tracker/index.php?func=detail&aid=10259&group_id=2619&atid=9708
----------------------------------------------------------------------
ChaSen 2.4.0 (2007/03/30)
----------------------------------------------------------------------
- bug fix
- -s option (re-analysis)
-rw-r--r-- | textproc/chasen-base/Makefile | 15 | ||||
-rw-r--r-- | textproc/chasen-base/PLIST | 9 | ||||
-rw-r--r-- | textproc/chasen-base/distinfo | 22 | ||||
-rw-r--r-- | textproc/chasen-base/patches/patch-ak | 12 | ||||
-rw-r--r-- | textproc/chasen-base/patches/patch-al | 13 | ||||
-rw-r--r-- | textproc/chasen-base/patches/patch-am | 21 | ||||
-rw-r--r-- | textproc/chasen-base/patches/patch-an | 215 | ||||
-rw-r--r-- | textproc/chasen-base/patches/patch-ao | 16 | ||||
-rw-r--r-- | textproc/chasen/Makefile | 9 | ||||
-rw-r--r-- | textproc/chasen/Makefile.common | 12 |
10 files changed, 173 insertions, 171 deletions
diff --git a/textproc/chasen-base/Makefile b/textproc/chasen-base/Makefile index bdf296dab44..df6337f71e9 100644 --- a/textproc/chasen-base/Makefile +++ b/textproc/chasen-base/Makefile @@ -1,24 +1,21 @@ -# $NetBSD: Makefile,v 1.16 2006/07/19 19:14:39 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2007/08/02 15:03:10 taca Exp $ # DISTNAME= chasen-${CHASEN_VERSION} PKGNAME= chasen-base-${CHASEN_VERSION} -PKGREVISION= 2 CATEGORIES= japanese textproc -MASTER_SITES= http://chasen.aist-nara.ac.jp/stable/chasen/ - -PATCHFILES= chasen-2.3.3.20030821.patch \ - chasen-2.3.3.20030822.patch -PATCH_SITES= ${MASTER_SITES} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP:=chasen-legacy/26168/} MAINTAINER= tech-pkg-ja@jp.NetBSD.org -HOMEPAGE= http://chasen.aist-nara.ac.jp/ +HOMEPAGE= http://chasen-legacy.sourceforge.jp/ COMMENT= ChaSen, Japanese Morphological Analysis System GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -OWN_DIRS= ${CHASEN_DICDIR} +OWN_DIRS= ${PREFIX}/${CHASEN_DICDIR} + +PKG_DESTDIR_SUPPORT= user-destdir .include "../../textproc/chasen/Makefile.common" .include "../../converters/libiconv/buildlink3.mk" diff --git a/textproc/chasen-base/PLIST b/textproc/chasen-base/PLIST index 0a3a554e43d..387519e57fd 100644 --- a/textproc/chasen-base/PLIST +++ b/textproc/chasen-base/PLIST @@ -1,9 +1,12 @@ -@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:54 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2007/08/02 15:03:10 taca Exp $ bin/chasen bin/chasen-config include/chasen.h lib/libchasen.la +lib/libchasen.so +lib/libchasen.so.2 +lib/libchasen.so.2.0.4 sbin/makeda sbin/makemat -@dirrm share/chasen/dic -@dirrm share/chasen +@dirrm ${CHASEN_DICDIR} +@dirrm ${CHASEN_DIR} diff --git a/textproc/chasen-base/distinfo b/textproc/chasen-base/distinfo index f7c9ecb7318..ae4f59488c2 100644 --- a/textproc/chasen-base/distinfo +++ b/textproc/chasen-base/distinfo @@ -1,18 +1,10 @@ -$NetBSD: distinfo,v 1.7 2005/08/18 15:37:17 taca Exp $ +$NetBSD: distinfo,v 1.8 2007/08/02 15:03:10 taca Exp $ -SHA1 (chasen-2.3.3.tar.gz) = 711f5717ee284d26aa5616292f7aaffaef11d03a -RMD160 (chasen-2.3.3.tar.gz) = 2f2416f82fb0341023314a4672e442fed86207a9 -Size (chasen-2.3.3.tar.gz) = 425981 bytes -SHA1 (chasen-2.3.3.20030821.patch) = c608e5e613bc8a9758436681846047099610bf4a -RMD160 (chasen-2.3.3.20030821.patch) = a7e581132abc3ae89eb109b25b917d704ca006bf -Size (chasen-2.3.3.20030821.patch) = 3496 bytes -SHA1 (chasen-2.3.3.20030822.patch) = 0728884dcdf6983a3e32774111e7996a43008722 -RMD160 (chasen-2.3.3.20030822.patch) = 30c2ff84ad8b68271fcd7656d9972e7392a806f5 -Size (chasen-2.3.3.20030822.patch) = 2007 bytes +SHA1 (chasen-2.4.1.tar.gz) = 2dca85bc4cd7b3f77e9729f0b75c884be6ac29d5 +RMD160 (chasen-2.4.1.tar.gz) = cf614af761e0b3175daaffcebabaa9c13da00cae +Size (chasen-2.4.1.tar.gz) = 856462 bytes SHA1 (patch-ai) = 7a9ffd640c275c1361e34591d08c1ce519df5dc7 SHA1 (patch-aj) = 8c440610abaa31b22950ef41149736feefc968e8 -SHA1 (patch-ak) = 05afdb444ef6a59cb2f9c86617b6dba8332ac5f3 -SHA1 (patch-al) = a1069b648d7c352923dd27a193f93b87b4bf3e8a -SHA1 (patch-am) = 25965ca10b35e564cd0358a1949c7a90a8596b55 -SHA1 (patch-an) = e24d8cb3f1ffa9b2b601b417e94f5eb533782aa5 -SHA1 (patch-ao) = 0d8c9f054393bef86c0a4c12fac92bc6ff696c2b +SHA1 (patch-ak) = 39d16817f60d93fbe376446b111a05a590928a23 +SHA1 (patch-am) = ba8cb194ca74fc313dee6854874b129a7e70d040 +SHA1 (patch-an) = 423696afe03b870a9e8570bb923955ea1c6be5f1 diff --git a/textproc/chasen-base/patches/patch-ak b/textproc/chasen-base/patches/patch-ak index 16a567556ff..3a382ae323b 100644 --- a/textproc/chasen-base/patches/patch-ak +++ b/textproc/chasen-base/patches/patch-ak @@ -1,13 +1,13 @@ -$NetBSD: patch-ak,v 1.3 2004/05/06 13:32:38 taca Exp $ +$NetBSD: patch-ak,v 1.4 2007/08/02 15:03:10 taca Exp $ ---- mkchadic/Makefile.in.orig 2003-08-15 13:00:56.000000000 +0900 +--- mkchadic/Makefile.in.orig 2007-07-03 15:55:27.000000000 +0900 +++ mkchadic/Makefile.in -@@ -96,7 +96,7 @@ LINK = $(LIBTOOL) --mode=link \ +@@ -184,7 +184,7 @@ LDADD = $(top_builddir)/lib/libchasen.la + LINK = $(LIBTOOL) --mode=link \ $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ - -pkglibexecdir = ${libexecdir}/chasen +pkglibexecdir = ${sbindir} - pkglibexec_PROGRAMS = makemat makeda - makemat_SOURCES = makemat.c + makeda_SOURCES = translate.c dumpdic.c + all: all-am diff --git a/textproc/chasen-base/patches/patch-al b/textproc/chasen-base/patches/patch-al deleted file mode 100644 index e2fd1e580ba..00000000000 --- a/textproc/chasen-base/patches/patch-al +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-al,v 1.1 2004/06/01 08:23:29 shannonjr Exp $ - ---- lib/dartsdic.cpp.orig 2003-07-30 10:06:57.000000000 -0600 -+++ lib/dartsdic.cpp -@@ -177,7 +177,7 @@ da_build_dump(da_build_t* builder, char* - lex_indices.push_back(i->second); - } - lens[size] = key.size(); -- (const char*)keys[size] = key.data(); -+ keys[size] = const_cast<char*>(key.data()); - vals[size] = redump_lex(lens[size], lex_indices, tmpfile, lexfile); - if (vals[size] < 0) { - std::cerr << "Unexpected error at " << key << std::endl; diff --git a/textproc/chasen-base/patches/patch-am b/textproc/chasen-base/patches/patch-am index cea822bee49..5cf25b8072e 100644 --- a/textproc/chasen-base/patches/patch-am +++ b/textproc/chasen-base/patches/patch-am @@ -1,23 +1,22 @@ -$NetBSD: patch-am,v 1.1 2004/06/09 05:42:31 taca Exp $ +$NetBSD: patch-am,v 1.2 2007/08/02 15:03:11 taca Exp $ ---- configure.in.orig Fri Aug 15 12:58:57 2003 +--- configure.in.orig 2007-07-03 14:52:16.000000000 +0900 +++ configure.in -@@ -26,7 +26,7 @@ dnl Checks for header files. +@@ -33,7 +33,7 @@ dnl Checks for header files. AC_HEADER_STDC - AC_CHECK_HEADERS(fcntl.h limits.h sys/file.h sys/stat.h unistd.h) - AC_CHECK_HEADERS(sys/param.h sys/types.h netinet/in.h) --AC_CHECK_HEADERS(io.h windows.h) -+AC_CHECK_HEADERS(io.h windows.h iconv.h) + AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h]) + AC_CHECK_HEADERS([sys/param.h sys/types.h netinet/in.h]) +-AC_CHECK_HEADERS([io.h windows.h]) ++AC_CHECK_HEADERS([io.h windows.h iconv.h]) - AC_MSG_CHECKING([for darts.h]) - AC_ARG_WITH(darts, -@@ -55,8 +55,13 @@ AC_ARG_WITH(libiconv, + + # Checks for typedefs, structures, and compiler characteristics. +@@ -76,8 +76,12 @@ AC_ARG_WITH(libiconv, AC_SUBST(ICONV_CFLAGS) fi]) -AC_CHECK_LIB(iconv, iconv, [], [ - AC_CHECK_HEADER(iconv.h, [], AC_MSG_ERROR([ChaSen needs iconv]))]) -+AC_MSG_CHECKING([iconv()]) +save_libs="$LIBS" +LIBS="$LIBS -liconv" +ac_cv_lib_iconv_iconv=no diff --git a/textproc/chasen-base/patches/patch-an b/textproc/chasen-base/patches/patch-an index 46296a1213b..2ab5b11c97f 100644 --- a/textproc/chasen-base/patches/patch-an +++ b/textproc/chasen-base/patches/patch-an @@ -1,56 +1,71 @@ -$NetBSD: patch-an,v 1.1 2004/06/09 05:42:31 taca Exp $ +$NetBSD: patch-an,v 1.2 2007/08/02 15:03:11 taca Exp $ ---- configure.orig Fri Aug 15 13:00:58 2003 +--- configure.orig 2007-07-03 15:27:07.000000000 +0900 +++ configure -@@ -8497,13 +8497,10 @@ if test "${with_libiconv+set}" = set; th - fi; +@@ -20608,7 +20608,8 @@ done --echo "$as_me:$LINENO: checking for iconv in -liconv" >&5 --echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6 + +-for ac_header in io.h windows.h ++ ++for ac_header in io.h windows.h iconv.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then +@@ -22331,32 +22332,20 @@ if test "${with_libiconv+set}" = set; th + fi + + +- +-{ echo "$as_me:$LINENO: checking for iconv in -liconv" >&5 +-echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6; } -if test "${ac_cv_lib_iconv_iconv+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-liconv $LIBS" -+echo "$as_me:$LINENO: checking iconv()" >&5 -+echo $ECHO_N "checking iconv()... $ECHO_C" >&6 +save_libs="$LIBS" +LIBS="$LIBS -liconv" ++ac_cv_lib_iconv_iconv=no cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" - #include "confdefs.h" -@@ -8512,9 +8509,7 @@ cat >conftest.$ac_ext <<_ACEOF - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif -char iconv (); +#include <iconv.h> - #ifdef F77_DUMMY_MAIN - # ifdef __cplusplus - extern "C" -@@ -8524,7 +8519,7 @@ char iconv (); int main () { --iconv (); +-return iconv (); +iconv(0, 0, 0, 0, 0) ; return 0; } -@@ -8545,135 +8540,12 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - else +@@ -22384,160 +22373,15 @@ else echo "$as_me: failed program was:" >&5 - cat conftest.$ac_ext >&5 --ac_cv_lib_iconv_iconv=no --fi --rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_iconv_iconv=no ++ { { echo "$as_me:$LINENO: error: ChaSen needs iconv" >&5 ++echo "$as_me: error: ChaSen needs iconv" >&2;} ++ { (exit 1); exit 1; }; } + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi --echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5 --echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6 + { echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5 + echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6; } -if test $ac_cv_lib_iconv_iconv = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBICONV 1 @@ -61,121 +76,141 @@ $NetBSD: patch-an,v 1.1 2004/06/09 05:42:31 taca Exp $ -else - - if test "${ac_cv_header_iconv_h+set}" = set; then -- echo "$as_me:$LINENO: checking for iconv.h" >&5 --echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6 +- { echo "$as_me:$LINENO: checking for iconv.h" >&5 +-echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi --echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 --echo "${ECHO_T}$ac_cv_header_iconv_h" >&6 +-{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 +-echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } -else - # Is the header compilable? --echo "$as_me:$LINENO: checking iconv.h usability" >&5 --echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6 +-{ echo "$as_me:$LINENO: checking iconv.h usability" >&5 +-echo $ECHO_N "checking iconv.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ -$ac_includes_default -#include <iconv.h> -_ACEOF -rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 - ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 --cat conftest.$ac_ext >&5 --ac_header_compiler=no +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- ac_header_compiler=no -fi --rm -f conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? --echo "$as_me:$LINENO: checking iconv.h presence" >&5 --echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6 +-{ echo "$as_me:$LINENO: checking iconv.h presence" >&5 +-echo $ECHO_N "checking iconv.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF --#line $LINENO "configure" --#include "confdefs.h" +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ -#include <iconv.h> -_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +-if { (ac_try="$ac_cpp conftest.$ac_ext" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? -- egrep -v '^ *\+' conftest.er1 >conftest.err +- grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then +- (exit $ac_status); } >/dev/null && { +- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || +- test ! -s conftest.err +- }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -- cat conftest.$ac_ext >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- - ac_header_preproc=no -fi +- -rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 +-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? --case $ac_header_compiler:$ac_header_preproc in -- yes:no ) +-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in +- yes:no: ) - { echo "$as_me:$LINENO: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;};; -- no:yes ) +- { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;} +- ac_header_preproc=yes +- ;; +- no:yes:* ) - { echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: iconv.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: iconv.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: iconv.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;};; +-echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;} +- +- ;; -esac --echo "$as_me:$LINENO: checking for iconv.h" >&5 --echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6 +-{ echo "$as_me:$LINENO: checking for iconv.h" >&5 +-echo $ECHO_N "checking for iconv.h... $ECHO_C" >&6; } -if test "${ac_cv_header_iconv_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_iconv_h=$ac_header_preproc -fi --echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 --echo "${ECHO_T}$ac_cv_header_iconv_h" >&6 +-{ echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5 +-echo "${ECHO_T}$ac_cv_header_iconv_h" >&6; } - -fi -if test $ac_cv_header_iconv_h = yes; then - : -else - { { echo "$as_me:$LINENO: error: ChaSen needs iconv" >&5 -+{ { echo "$as_me:$LINENO: error: ChaSen needs iconv" >&5 - echo "$as_me: error: ChaSen needs iconv" >&2;} - { (exit 1); exit 1; }; } - fi +-echo "$as_me: error: ChaSen needs iconv" >&2;} +- { (exit 1); exit 1; }; } +-fi - - -fi - -- -+echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5 -+echo "${ECHO_T}$ac_cv_lib_iconv_iconv" >&6 - echo "$as_me:$LINENO: checking iconv args" >&5 + diff --git a/textproc/chasen-base/patches/patch-ao b/textproc/chasen-base/patches/patch-ao deleted file mode 100644 index 1ab4c724fe4..00000000000 --- a/textproc/chasen-base/patches/patch-ao +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2005/08/18 15:37:17 taca Exp $ - ---- lib/print.c.orig 2005-08-15 10:50:12.000000000 +0900 -+++ lib/print.c -@@ -326,6 +326,11 @@ set_ruby(char *dest, char *midasi, char - int stat = 0; - int plen, maxplen = 0; - -+ if (yomi[0] == '\0') { -+ strcpy(d, m); -+ return; -+ } -+ - for (;;) { - for (; *y; y += cha_tok_mblen(Cha_tokenizer, y, 4 /* XXX */)) { - if (stat == 0) { diff --git a/textproc/chasen/Makefile b/textproc/chasen/Makefile index 2924291e7b7..585c34ba5f2 100644 --- a/textproc/chasen/Makefile +++ b/textproc/chasen/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.8 2005/08/18 15:46:23 taca Exp $ +# $NetBSD: Makefile,v 1.9 2007/08/02 15:03:09 taca Exp $ # DISTNAME= chasen-${CHASEN_VERSION} -PKGREVISION= 1 CATEGORIES= japanese textproc MASTER_SITES= # empty DISTFILES= # empty MAINTAINER= tech-pkg-ja@jp.NetBSD.org -HOMEPAGE= http://chasen.aist-nara.ac.jp/ -COMMENT= ChaSen, Japanese Morphological Analysis System +HOMEPAGE= http://chasen-legacy.sourceforge.jp/ +COMMENT= meta package of ChaSen, Japanese Morphological Analysis System DEPENDS+= chasen-base>=${CHASEN_VERSION}:../../textproc/chasen-base DEPENDS+= ipadic>=2.6.3:../../textproc/ipadic @@ -18,6 +17,8 @@ NO_CHECKSUM= yes NO_CONFIGURE= yes NO_BUILD= yes +PKG_DESTDIR_SUPPORT= user-destdir + do-install: # empty .include "Makefile.common" diff --git a/textproc/chasen/Makefile.common b/textproc/chasen/Makefile.common index b43c638f18b..6616fdd5ce8 100644 --- a/textproc/chasen/Makefile.common +++ b/textproc/chasen/Makefile.common @@ -1,11 +1,15 @@ -# $NetBSD: Makefile.common,v 1.6 2007/02/22 19:27:13 wiz Exp $ +# $NetBSD: Makefile.common,v 1.7 2007/08/02 15:03:09 taca Exp $ # -CHASEN_VERSION= 2.3.3 +CHASEN_VERSION= 2.4.1 .include "../../mk/bsd.prefs.mk" PKG_SYSCONFSUBDIR?= chasen -CHASEN_DICDIR?= ${PREFIX}/share/chasen/dic +CHASEN_DIR?= share/chasen +CHASEN_DICDIR?= ${CHASEN_DIR}/dic CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ - --with-dicdir=${CHASEN_DICDIR:Q} + --with-dicdir=${PREFIX}/${CHASEN_DICDIR:Q} + +PLIST_SUBST+= CHASEN_DIR=${CHASEN_DIR:Q} \ + CHASEN_DICDIR=${CHASEN_DICDIR:Q} |