diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2007-08-16 16:32:28 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2007-08-16 16:32:28 +0000 |
| commit | 49a68e13971b8f0e2c0ac93c507cbe40c4a80ab0 (patch) | |
| tree | f348da6c78dc3d0e5cd9d51d67ca82121ce20a22 /japanese/tomoe/files | |
| parent | Makes CFLAGS neater (no repetative -O*) (diff) | |
Update to 0.6.0.
Notes
Notes:
svn path=/head/; revision=197814
Diffstat (limited to 'japanese/tomoe/files')
| -rw-r--r-- | japanese/tomoe/files/patch-configure | 33 | ||||
| -rw-r--r-- | japanese/tomoe/files/patch-module::dict::Makefile.in | 20 |
2 files changed, 31 insertions, 22 deletions
diff --git a/japanese/tomoe/files/patch-configure b/japanese/tomoe/files/patch-configure index 7e2c4198883f..e76e023d9909 100644 --- a/japanese/tomoe/files/patch-configure +++ b/japanese/tomoe/files/patch-configure @@ -1,22 +1,31 @@ Index: configure diff -u configure.orig configure ---- configure.orig Fri Jan 12 01:41:01 2007 -+++ configure Fri Jan 12 01:47:51 2007 -@@ -21716,7 +21716,7 @@ +--- configure.orig 2007-08-16 02:29:47.000000000 +0900 ++++ configure 2007-08-16 04:00:10.000000000 +0900 +@@ -23914,7 +23914,7 @@ + echo "${ECHO_T}yes" >&6; } + use_est=yes fi - - --if test "$est_exists" = "yes"; then -+if test x"$with_est" = "xyes" -a "$est_exists" = "yes"; then - WITH_EST_TRUE= - WITH_EST_FALSE='#' +- if test x"$use_est" = "xyes"; then ++ if test x"$with_est" = "xyes" -a x"$use_est" = "xyes"; then + USE_EST_TRUE= + USE_EST_FALSE='#' else -@@ -22374,7 +22374,7 @@ - fi +@@ -24970,7 +24970,7 @@ + -if test "x$MYSQL_CONFIG" != "xmysql_config-not-found"; then +if test x"$with_mysql" = "xyes" -a "x$MYSQL_CONFIG" != "xmysql_config-not-found"; then - enable_mysql=yes + use_mysql=yes MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags` MYSQL_LIBS=`$MYSQL_CONFIG --libs` +@@ -26677,7 +26677,7 @@ + "modify-itlocaledir":C) + sed \ + -i'' \ +- -e "s/^itlocaledir = /itlocaledir = \$(datadir)\/locale\n#itlocaledir = /" \ ++ -e "s/^itlocaledir = .*/itlocaledir = \$(datadir)\/locale/" \ + po/Makefile + ;; + "po/stamp-it":C) diff --git a/japanese/tomoe/files/patch-module::dict::Makefile.in b/japanese/tomoe/files/patch-module::dict::Makefile.in index 4bf80a357a2b..8a8b8eb326eb 100644 --- a/japanese/tomoe/files/patch-module::dict::Makefile.in +++ b/japanese/tomoe/files/patch-module::dict::Makefile.in @@ -1,13 +1,13 @@ Index: module/dict/Makefile.in diff -u module/dict/Makefile.in.orig module/dict/Makefile.in ---- module/dict/Makefile.in.orig Sat Jan 6 17:19:56 2007 -+++ module/dict/Makefile.in Sat Jan 6 20:19:38 2007 -@@ -694,7 +694,7 @@ - @WITH_UNIHAN_TRUE@ cd $(top_builddir)/data && $(MAKE) $(AM_MAKEFLAGS) kanjidic2.xml +--- module/dict/Makefile.in.orig 2007-08-15 03:35:25.000000000 +0900 ++++ module/dict/Makefile.in 2007-08-15 03:39:54.000000000 +0900 +@@ -727,7 +727,7 @@ + @USE_UNIHAN_TRUE@ cd $(top_builddir)/data && $(MAKE) $(AM_MAKEFLAGS) kanjidic2.xml - @WITH_UNIHAN_TRUE@tomoe-unihan-data.h: unihan-compiler.rb Unihan.stamp $(top_builddir)/data/kanjidic2.xml --@WITH_UNIHAN_TRUE@ $(RUBY) -I$(top_srcdir)/ext/ruby -I$(top_builddir)/ext/ruby/.libs \ -+@WITH_UNIHAN_TRUE@ env LD_LIBRARY_PATH=$(top_srcdir)/lib/.libs:/usr/local/lib:/usr/lib:/lib $(RUBY) -I$(top_srcdir)/ext/ruby -I$(top_builddir)/ext/ruby/.libs \ - @WITH_UNIHAN_TRUE@ -I$(top_srcdir)/test unihan-compiler.rb \ - @WITH_UNIHAN_TRUE@ Unihan.txt $(top_srcdir)/data/kanjidic2.xml > $@.tmp || exit 1; - @WITH_UNIHAN_TRUE@ mv $@.tmp $@ + @USE_UNIHAN_TRUE@tomoe-unihan-data.h: unihan-compiler.rb Unihan.stamp $(top_builddir)/data/kanjidic2.xml +-@USE_UNIHAN_TRUE@ $(RUBY) -I$(top_srcdir)/bindings/ruby -I$(top_builddir)/bindings/ruby/.libs \ ++@USE_UNIHAN_TRUE@ env LD_LIBRARY_PATH=$(top_srcdir)/lib/.libs:/usr/local/lib:/usr/lib:/lib $(RUBY) -I$(top_srcdir)/bindings/ruby -I$(top_builddir)/bindings/ruby/.libs \ + @USE_UNIHAN_TRUE@ -I$(top_srcdir)/test unihan-compiler.rb \ + @USE_UNIHAN_TRUE@ Unihan.txt $(top_srcdir)/data/kanjidic2.xml > $@.tmp || exit 1; + @USE_UNIHAN_TRUE@ mv $@.tmp $@ |