[23374] trunk/dports/textproc/chasen

source_changes at macosforge.org source_changes at macosforge.org
Thu Mar 29 22:51:12 PDT 2007


Revision: 23374
          http://trac.macosforge.org/projects/macports/changeset/23374
Author:   takanori at macports.org
Date:     2007-03-29 22:51:11 -0700 (Thu, 29 Mar 2007)

Log Message:
-----------
Version bump to 2.4.0.

Modified Paths:
--------------
    trunk/dports/textproc/chasen/Portfile

Added Paths:
-----------
    trunk/dports/textproc/chasen/files/patch-configure.diff

Removed Paths:
-------------
    trunk/dports/textproc/chasen/files/configure.diff
    trunk/dports/textproc/chasen/files/dartsdic.cpp.patch

Modified: trunk/dports/textproc/chasen/Portfile
===================================================================
--- trunk/dports/textproc/chasen/Portfile	2007-03-30 05:22:02 UTC (rev 23373)
+++ trunk/dports/textproc/chasen/Portfile	2007-03-30 05:51:11 UTC (rev 23374)
@@ -2,8 +2,7 @@
 
 PortSystem        1.0
 name              chasen
-version           2.3.3
-revision	  3
+version           2.4.0
 set ipa		  ipadic-2.7.0
 categories        textproc japanese
 maintainers       takanori at macports.org
@@ -16,24 +15,19 @@
 		  This version of chasen treats encoding of input as EUC-JP, and its output is \
 		  encoded as EUC-JP by default.
 platforms         darwin
-homepage          http://chasen.naist.jp/hiki/ChaSen/
-master_sites      http://chasen.naist.jp/stable/chasen/:chasen \
+homepage          http://chasen-legacy.sourceforge.jp/
+set sfjpid_chasen 24693
+set sfjpid_ipadic 24435
+master_sites      http://keihanna.dl.sourceforge.jp/chasen-legacy/${sfjpid_chasen}/:chasen \
+		  http://osdn.dl.sourceforge.jp/chasen-legacy/${sfjpid_chasen}/:chasen \
+		  http://keihanna.dl.sourceforge.jp/ipadic/${sfjpid_ipadic}/:ipadic \
+		  http://osdn.dl.sourceforge.jp/ipadic/${sfjpid_ipadic}/:ipadic \
 		  http://chasen.naist.jp/stable/ipadic/:ipadic
-distfiles	  ${name}-${version}.tar.gz:chasen \
-		  chasen-2.3.3.20030821.patch:chasen \
-		  chasen-2.3.3.20030822.patch:chasen
-extract.only	  ${name}-${version}.tar.gz
-patchfiles	  configure.diff dartsdic.cpp.patch
-
-checksums	  ${name}-${version}.tar.gz md5 629e90d9490bac95606c38c2d344cc5f \
-					    sha1 711f5717ee284d26aa5616292f7aaffaef11d03a \
-					    rmd160 2f2416f82fb0341023314a4672e442fed86207a9 \
-		  chasen-2.3.3.20030821.patch md5 44b14a50c8269f982fc0d59cb580ecc5 \
-					      sha1 c608e5e613bc8a9758436681846047099610bf4a \
-					      rmd160 a7e581132abc3ae89eb109b25b917d704ca006bf \
-		  chasen-2.3.3.20030822.patch md5 22466f08c3916b415d222508fdcc9bbe \
-					      sha1 0728884dcdf6983a3e32774111e7996a43008722 \
-					      rmd160 30c2ff84ad8b68271fcd7656d9972e7392a806f5 \
+distfiles	  ${distname}.tar.gz:chasen
+patchfiles	  patch-configure.diff
+checksums	  ${name}-${version}.tar.gz md5 1cd014ed31c211c5de3993541a618747 \
+					    sha1 19ba6a350189c4a678bcf66b5a24282e954609c0 \
+					    rmd160 927dd61298ad3d605e39c09bd0d65ac439ab2d22 \
 		  ${ipa}.tar.gz md5 f36d315cae25b086a889b7090c674977 \
 		  		sha1 52784d8abb3361eafec83ab543be63cf087f9eb2 \
 				rmd160 5e37c750801df63439032be4954c4b63a44012cb
@@ -44,8 +38,9 @@
 depends_build	port:nkf
 
 post-extract	{
-		system "cd ${worksrcpath} && patch -p0 < ${distpath}/chasen-2.3.3.20030821.patch"
-		system "cd ${worksrcpath} && patch -p0 < ${distpath}/chasen-2.3.3.20030822.patch"
+		foreach f {tests/test-chasen.sh tests/test-dic.sh} {
+			file attributes ${worksrcpath}/${f} -permissions 0755
+		}
 }
 
 configure.args	--libexecdir=${prefix}/lib --with-darts=${prefix}/include --with-libiconv=${prefix}
@@ -63,7 +58,6 @@
 variant ipadic	{
 	# Japanese dictionaries for ChaSen
 	distfiles-append ${ipa}.tar.gz:ipadic
-	extract.only-append ${ipa}.tar.gz
 	post-destroot {
 		foreach {enc c} {UTF-8 w EUC-JP e Shift_JIS s} {
 			file mkdir ${workpath}/${ipa}-${enc}
@@ -78,10 +72,10 @@
 		}
 		system "ln -sf chasenrc-EUC-JP ${destroot}${prefix}/etc/chasenrc"
 
-		xinstall -m 755 -d ${destroot}${prefix}/share/doc/ipadic/doc
+		xinstall -m 755 -d ${destroot}${prefix}/share/doc/chasen-ipadic/doc
 
-		xinstall -m 644 -W ${workpath}/${ipa} AUTHORS COPYING ChangeLog INSTALL INSTALL-ja NEWS README ${destroot}${prefix}/share/doc/ipadic
-		xinstall -m 644 ${workpath}/${ipa}/doc/ipadic-ja.pdf ${destroot}${prefix}/share/doc/ipadic/doc
+		xinstall -m 644 -W ${workpath}/${ipa} AUTHORS COPYING ChangeLog INSTALL INSTALL-ja NEWS README ${destroot}${prefix}/share/doc/chasen-ipadic
+		xinstall -m 644 ${workpath}/${ipa}/doc/ipadic-ja.pdf ${destroot}${prefix}/share/doc/chasen-ipadic/doc
 	}
 
 	post-activate	{
@@ -93,5 +87,5 @@
 }
 
 livecheck.check regex
-livecheck.url	http://chasen.naist.jp/hiki/ChaSen/?%C3%E3%E4%A5%A4%CE%C7%DB%C9%DB
-livecheck.regex ${name}-(\[0-9.a-z\]+)\\.tar
+livecheck.url	http://chasen-legacy.sourceforge.jp/
+livecheck.regex ${name}-(\[0-9.a-z\-\]+)

Deleted: trunk/dports/textproc/chasen/files/configure.diff
===================================================================
--- trunk/dports/textproc/chasen/files/configure.diff	2007-03-30 05:22:02 UTC (rev 23373)
+++ trunk/dports/textproc/chasen/files/configure.diff	2007-03-30 05:51:11 UTC (rev 23374)
@@ -1,31 +0,0 @@
---- configure~	2003-08-15 13:00:58.000000000 +0900
-+++ configure	2006-02-20 07:52:29.000000000 +0900
-@@ -8497,8 +8497,8 @@
- fi;
- 
- 
--echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
--echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6
-+echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
-+echo $ECHO_N "checking for libiconv in -liconv... $ECHO_C" >&6
- if test "${ac_cv_lib_iconv_iconv+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8514,7 +8514,7 @@
- #endif
- /* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
--char iconv ();
-+char libiconv ();
- #ifdef F77_DUMMY_MAIN
- #  ifdef __cplusplus
-      extern "C"
-@@ -8524,7 +8524,7 @@
- int
- main ()
- {
--iconv ();
-+libiconv ();
-   ;
-   return 0;
- }

Deleted: trunk/dports/textproc/chasen/files/dartsdic.cpp.patch
===================================================================
--- trunk/dports/textproc/chasen/files/dartsdic.cpp.patch	2007-03-30 05:22:02 UTC (rev 23373)
+++ trunk/dports/textproc/chasen/files/dartsdic.cpp.patch	2007-03-30 05:51:11 UTC (rev 23374)
@@ -1,20 +0,0 @@
---- lib/dartsdic.cpp.orig	Thu Jul 31 01:06:57 2003
-+++ lib/dartsdic.cpp	Wed Jan 25 09:30:23 2006
-@@ -68,7 +68,7 @@
- 
-     da = (darts_t*)cha_malloc(sizeof(darts_t));
-     da->da_mmap = cha_mmap_file(daname);
--    darts->setArray(cha_mmap_map(da->da_mmap));
-+    darts->set_array(cha_mmap_map(da->da_mmap));
-     da->da = darts;
-     da->lex_mmap = cha_mmap_file(lexname);
-     da->dat_mmap = cha_mmap_file(datname);
-@@ -177,7 +177,7 @@
- 	    lex_indices.push_back(i->second);
- 	}
- 	lens[size] = key.size();
--	(const char*)keys[size] = key.data();
-+	keys[size] = (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;

Copied: trunk/dports/textproc/chasen/files/patch-configure.diff (from rev 23058, trunk/dports/textproc/chasen/files/configure.diff)
===================================================================
--- trunk/dports/textproc/chasen/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/textproc/chasen/files/patch-configure.diff	2007-03-30 05:51:11 UTC (rev 23374)
@@ -0,0 +1,27 @@
+--- configure.orig	2007-03-22 17:23:24.000000000 +0900
++++ configure	2007-03-24 12:14:40.000000000 +0900
+@@ -22318,8 +22318,8 @@
+ 
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
+-echo $ECHO_N "checking for iconv in -liconv... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
++echo $ECHO_N "checking for libiconv in -liconv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_iconv_iconv+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -22338,11 +22338,11 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char iconv ();
++char libiconv ();
+ int
+ main ()
+ {
+-return iconv ();
++return libiconv ();
+   ;
+   return 0;
+ }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070329/ab2720d8/attachment.html


More information about the macports-changes mailing list