Update to 0.4.0.

12 files changed, 106 insertions, 132 deletions

diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 95c4f48b0fab..a8a9a8f8732b 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -6,28 +6,19 @@
 #
 
 PORTNAME=	libtomoe-gtk
-PORTVERSION=	0.1.0
-PORTREVISION=	1
+PORTVERSION=	0.4.0
+#PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=tomoe/17171
+MASTER_SITE_SUBDIR=tomoe/22894
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	TOMOE GTK+ library
 
 LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe
 
-USE_X_PREFIX=	yes
 USE_GNOME=	lthack gnomehack gtk20
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-
-PLIST_DIRS=	include/tomoe
-PLIST_FILES=	include/tomoe/tomoe_candidates_view.h \
-		include/tomoe/tomoe_canvas.h include/tomoe/tomoe-gtk.h \
-		include/tomoe/tomoe_window.h \
-		lib/libtomoe-gtk.a lib/libtomoe-gtk.la \
-		lib/libtomoe-gtk.so lib/libtomoe-gtk.so.0 \
-		libdata/pkgconfig/libtomoe-gtk.pc
+USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/japanese/libtomoe-gtk/distinfo b/japanese/libtomoe-gtk/distinfo
index 63beb61c45f1..c9c2aac9e0f0 100644
--- a/japanese/libtomoe-gtk/distinfo
+++ b/japanese/libtomoe-gtk/distinfo
@@ -1,3 +1,3 @@
-MD5 (libtomoe-gtk-0.1.0.tar.gz) = e9b887189ee408902a0f85d9b1cde06f
-SHA256 (libtomoe-gtk-0.1.0.tar.gz) = de00404262d5601edd953d2c83adc8e4897c2a34dfa2d8248f521136c266cc52
-SIZE (libtomoe-gtk-0.1.0.tar.gz) = 330885
+MD5 (libtomoe-gtk-0.4.0.tar.gz) = ccf5d11ea77cb57efc55c811d369bb19
+SHA256 (libtomoe-gtk-0.4.0.tar.gz) = 1761463a6af2c775949179acb83020fa73a3b7617a2f643b76165e1d7ec9d567
+SIZE (libtomoe-gtk-0.4.0.tar.gz) = 374896
diff --git a/japanese/libtomoe-gtk/files/patch-src::tomoe_canvas.c b/japanese/libtomoe-gtk/files/patch-src::tomoe_canvas.c
deleted file mode 100644
index 303bfb332b42..000000000000
--- a/japanese/libtomoe-gtk/files/patch-src::tomoe_canvas.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/tomoe_canvas.c
-diff -u -p src/tomoe_canvas.c.orig src/tomoe_canvas.c
---- src/tomoe_canvas.c.orig	Tue Oct 18 17:56:15 2005
-+++ src/tomoe_canvas.c	Mon Dec 19 03:53:30 2005
-@@ -1073,9 +1073,11 @@ draw_stroke (GList *stroke, TomoeCanvas 
-     
-     for (node = stroke; node; node = g_list_next (node)) {
-         GList *next = g_list_next (node);
-+        point *p1, *p2;
-         if (!next) break;
- 
--        point *p1 = (point*) node->data, *p2 = (point*) next->data;
-+        p1 = (point*) node->data;
-+        p2 = (point*) next->data;
-         tomoe_canvas_draw_line (canvas, p1, p2, FALSE);
-     }
-     draw_annotate (stroke, canvas, *index);
diff --git a/japanese/libtomoe-gtk/pkg-plist b/japanese/libtomoe-gtk/pkg-plist
new file mode 100644
index 000000000000..420bfce1e01c
--- /dev/null
+++ b/japanese/libtomoe-gtk/pkg-plist
@@ -0,0 +1,23 @@
+include/tomoe/gtk/tomoe-canvas.h
+include/tomoe/gtk/tomoe-char-table.h
+include/tomoe/gtk/tomoe-details.h
+include/tomoe/gtk/tomoe-edit-char.h
+include/tomoe/gtk/tomoe-edit-meta.h
+include/tomoe/gtk/tomoe-edit-strokes.h
+include/tomoe/gtk/tomoe-gtk.h
+include/tomoe/gtk/tomoe-reading-search.h
+include/tomoe/gtk/tomoe-scrollable.h
+include/tomoe/gtk/tomoe-stroke-search.h
+include/tomoe/gtk/tomoe-window.h
+@dirrm include/tomoe/gtk
+@dirrmtry include/tomoe
+lib/libtomoe-gtk.a
+lib/libtomoe-gtk.la
+lib/libtomoe-gtk.so
+lib/libtomoe-gtk.so.1
+libdata/pkgconfig/libtomoe-gtk.pc
+share/libtomoe-gtk/tomoe-data-view.png
+share/libtomoe-gtk/tomoe-dictionary.png
+share/libtomoe-gtk/tomoe-handwriting.png
+share/libtomoe-gtk/tomoe-search.png
+@dirrm share/libtomoe-gtk
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 73f563a4451f..a6b0fa7adc88 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	scim-tomoe
-PORTVERSION=	0.2.0
-PORTREVISION=	2
+PORTVERSION=	0.4.0
+#PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=scim-imengine/17173
+MASTER_SITE_SUBDIR=scim-imengine/22896
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Tomoe
 
 BUILD_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 LIB_DEPENDS=	tomoe.1:${PORTSDIR}/japanese/tomoe \
-		tomoe-gtk.0:${PORTSDIR}/japanese/libtomoe-gtk
+		tomoe-gtk.1:${PORTSDIR}/japanese/libtomoe-gtk
 
 USE_GNOME=	lthack
 USE_X_LIB=	yes
diff --git a/japanese/scim-tomoe/distinfo b/japanese/scim-tomoe/distinfo
index 438c32c81f10..c18db0e0bae0 100644
--- a/japanese/scim-tomoe/distinfo
+++ b/japanese/scim-tomoe/distinfo
@@ -1,3 +1,3 @@
-MD5 (scim-tomoe-0.2.0.tar.gz) = 55bc028af137ed5f99bab4ca042219cf
-SHA256 (scim-tomoe-0.2.0.tar.gz) = 68c1f60b1207f6436c707f8deff109bd963e2defbf0759e55b35a75fd9df9d93
-SIZE (scim-tomoe-0.2.0.tar.gz) = 500103
+MD5 (scim-tomoe-0.4.0.tar.gz) = 55bed4f803dea070052956c293e4b07f
+SHA256 (scim-tomoe-0.4.0.tar.gz) = 797e71c482dd7b56ebc1a1c3aa97a568b11974dcc8afb0e4a5a9d5a623738650
+SIZE (scim-tomoe-0.4.0.tar.gz) = 505168
diff --git a/japanese/scim-tomoe/files/patch-configure b/japanese/scim-tomoe/files/patch-configure
deleted file mode 100644
index 59682cd1b3ad..000000000000
--- a/japanese/scim-tomoe/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	Wed Dec 28 19:30:53 2005
-+++ configure	Wed Dec 28 19:32:26 2005
-@@ -465,7 +465,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SCIM_TOMOE_MAJOR_VERSION SCIM_TOMOE_MINOR_VERSION SCIM_TOMOE_MICRO_VERSION SCIM_TOMOE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBTOOL_DEPS PKG_CONFIG ac_pt_PKG_CONFIG SCIM_CFLAGS SCIM_LIBS GTK2_CFLAGS GTK2_LIBS LIBTOMOE_GTK_CFLAGS LIBTOMOE_GTK_LIBS TOMOE_CFLAGS TOMOE_LIBS SCIM_VERSION ac_aux_dir SCIM_DEBUG_FLAGS SCIM_DATADIR SCIM_ICONDIR SCIM_MODULEDIR SCIM_TOMOE_DATADIR LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SCIM_TOMOE_MAJOR_VERSION SCIM_TOMOE_MINOR_VERSION SCIM_TOMOE_MICRO_VERSION SCIM_TOMOE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os RANLIB ac_ct_RANLIB CPP EGREP ALLOCA GLIBC21 HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB GETTEXT_PACKAGE LN_S ECHO AR ac_ct_AR CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_LTDL_TRUE INSTALL_LTDL_FALSE CONVENIENCE_LTDL_TRUE CONVENIENCE_LTDL_FALSE LIBADD_DL LIBTOOL_DEPS LIBTOOL_EXPORT_OPTIONS PKG_CONFIG ac_pt_PKG_CONFIG SCIM_CFLAGS SCIM_LIBS GTK2_CFLAGS GTK2_LIBS LIBTOMOE_GTK_CFLAGS LIBTOMOE_GTK_LIBS TOMOE_CFLAGS TOMOE_LIBS SCIM_VERSION ac_aux_dir SCIM_DEBUG_FLAGS SCIM_DATADIR SCIM_ICONDIR SCIM_MODULEDIR SCIM_TOMOE_DATADIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -32464,6 +32464,7 @@
- s,@CONVENIENCE_LTDL_FALSE@,$CONVENIENCE_LTDL_FALSE,;t t
- s,@LIBADD_DL@,$LIBADD_DL,;t t
- s,@LIBTOOL_DEPS@,$LIBTOOL_DEPS,;t t
-+s,@LIBTOOL_EXPORT_OPTIONS@,$LIBTOOL_EXPORT_OPTIONS,;t t
- s,@PKG_CONFIG@,$PKG_CONFIG,;t t
- s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
- s,@SCIM_CFLAGS@,$SCIM_CFLAGS,;t t
diff --git a/japanese/tomoe/Makefile b/japanese/tomoe/Makefile
index d3f511047989..a38c60d2e483 100644
--- a/japanese/tomoe/Makefile
+++ b/japanese/tomoe/Makefile
@@ -6,24 +6,19 @@
 #
 
 PORTNAME=	tomoe
-PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTVERSION=	0.4.0
+#PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=tomoe/16048
+MASTER_SITE_SUBDIR=tomoe/22893
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	Tegaki Online MOji-ninshiki Engine
 
 USE_GNOME=	lthack gnomehack
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
-PLIST_DIRS=	include/tomoe share/tomoe
-PLIST_FILES=	bin/tomoe bin/tomoe1 include/tomoe/tomoe.h \
-		lib/libtomoe.a lib/libtomoe.la \
-		lib/libtomoe.so lib/libtomoe.so.1 \
-		libdata/pkgconfig/tomoe.pc \
-		share/tomoe/all.tdic share/tomoe/hiragana.tdic
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --git a/japanese/tomoe/distinfo b/japanese/tomoe/distinfo
index a3aaea6ccb80..5eec779ecdf1 100644
--- a/japanese/tomoe/distinfo
+++ b/japanese/tomoe/distinfo
@@ -1,3 +1,3 @@
-MD5 (tomoe-0.2.1.tar.gz) = 95eca127a1d519ff4e836b3d00d7fa84
-SHA256 (tomoe-0.2.1.tar.gz) = 3942e0ff0a3b945d0464b69fcc01092a582f2c4e173bd8877572706e584e0e9e
-SIZE (tomoe-0.2.1.tar.gz) = 574453
+MD5 (tomoe-0.4.0.tar.gz) = 239a78420d35f107c5ec9edd2fcf474a
+SHA256 (tomoe-0.4.0.tar.gz) = eee687c7b9b54d3c2b7d856b66a15275e71b45f7bf58d04cca8494f26ea1edc6
+SIZE (tomoe-0.4.0.tar.gz) = 2422289
diff --git a/japanese/tomoe/files/patch-lib::tomoe.c b/japanese/tomoe/files/patch-lib::tomoe.c
deleted file mode 100644
index 3d19a4ef2215..000000000000
--- a/japanese/tomoe/files/patch-lib::tomoe.c
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: lib/tomoe.c
-diff -u -p lib/tomoe.c.orig lib/tomoe.c
---- lib/tomoe.c.orig	Thu Aug 11 11:34:32 2005
-+++ lib/tomoe.c	Mon Dec 19 03:31:30 2005
-@@ -150,9 +150,9 @@ tomoe_get_matched (glyph *input, candida
-   {
-     candidate_private *cand;
-     int_array *adapted;
-+    int pj;
-     cand = cands->p[i];
-     adapted = cand->adapted_strokes;
--    int pj;
- 
-     pj = match_stroke_num(cand->index, input->stroke_num, adapted);
- 
-@@ -471,13 +471,14 @@ load_dictionaries (void)
-   stroke *strk = NULL;
-   point *pnt = NULL;
-   char line_buf[LINE_BUF_SIZE];
-+  FILE *fp;
- 
-   if (g_dict) return;
- 
-   g_dict = calloc (1, sizeof(dictionary));
-   dictionary_alloc_contents (g_dict, DICT_LETTER_INITIAL_SIZE);
- 
--  FILE *fp = fopen (TOMOEDATADIR "/all.tdic", "r");
-+  fp = fopen (TOMOEDATADIR "/all.tdic", "r");
-   while ((p = fgets (line_buf, LINE_BUF_SIZE, fp)) != NULL)
-   {
-     if (p[0] == '\n')
-@@ -766,8 +767,8 @@ get_candidates(stroke *input_stroke, poi
-   for (cand_index = 0; cand_index < cands->len; cand_index++)
-   {
-     tomoe_bool match_flag;
--    match_flag = FALSE;
-     int_array *adapted = NULL;
-+    match_flag = FALSE;
-     cand = cands->p[cand_index];
- 
-     adapted = int_array_copy (cand->adapted_strokes);
diff --git a/japanese/tomoe/files/patch-src::match.c b/japanese/tomoe/files/patch-src::match.c
deleted file mode 100644
index 11778ad5a839..000000000000
--- a/japanese/tomoe/files/patch-src::match.c
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: src/match.c
-diff -u -p src/match.c.orig src/match.c
---- src/match.c.orig	Mon Dec 27 13:36:00 2004
-+++ src/match.c	Mon Dec 19 03:33:58 2005
-@@ -547,10 +547,11 @@ load_data ()
-   letter *lttr = NULL;
-   stroke *strk = NULL;
-   point *pnt = NULL;
-+  FILE *fp;
- 
-   dictionary_alloc_contents(&dict, DICT_LETTER_INITIAL_SIZE);
- 
--  FILE *fp = fopen(TOMOEDATADIR "/all.tdic", "r");
-+  fp = fopen(TOMOEDATADIR "/all.tdic", "r");
-   while ((p = fgets(line_buf, LINE_BUF_SIZE, fp)) != NULL)
-     {
-       if (p[0] == '\n')
diff --git a/japanese/tomoe/pkg-plist b/japanese/tomoe/pkg-plist
new file mode 100644
index 000000000000..6dfbe846aea1
--- /dev/null
+++ b/japanese/tomoe/pkg-plist
@@ -0,0 +1,61 @@
+etc/tomoe/config
+@dirrm etc/tomoe
+include/tomoe/tomoe-candidate.h
+include/tomoe/tomoe-char.h
+include/tomoe/tomoe-config.h
+include/tomoe/tomoe-context.h
+include/tomoe/tomoe-dict.h
+include/tomoe/tomoe-enum-types.h
+include/tomoe/tomoe-module-impl.h
+include/tomoe/tomoe-module.h
+include/tomoe/tomoe-query.h
+include/tomoe/tomoe-reading.h
+include/tomoe/tomoe-recognizer.h
+include/tomoe/tomoe-shelf.h
+include/tomoe/tomoe-writing.h
+include/tomoe/tomoe.h
+@dirrmtry include/tomoe
+lib/libtomoe.a
+lib/libtomoe.la
+lib/libtomoe.so
+lib/libtomoe.so.1
+lib/tomoe/dict/libxml.a
+lib/tomoe/dict/libxml.la
+lib/tomoe/dict/libxml.so
+lib/tomoe/dict/libxml.so.1
+@dirrm lib/tomoe/dict
+lib/tomoe/recognizer/libsimple.a
+lib/tomoe/recognizer/libsimple.la
+lib/tomoe/recognizer/libsimple.so
+lib/tomoe/recognizer/libsimple.so.1
+@dirrm lib/tomoe/recognizer
+@dirrm lib/tomoe
+libdata/pkgconfig/tomoe.pc
+share/gtk-doc/html/tomoe/TomoeCandidate.html
+share/gtk-doc/html/tomoe/TomoeChar.html
+share/gtk-doc/html/tomoe/TomoeConfig.html
+share/gtk-doc/html/tomoe/TomoeContext.html
+share/gtk-doc/html/tomoe/TomoeDict.html
+share/gtk-doc/html/tomoe/TomoeQuery.html
+share/gtk-doc/html/tomoe/TomoeReading.html
+share/gtk-doc/html/tomoe/TomoeShelf.html
+share/gtk-doc/html/tomoe/TomoeWriting.html
+share/gtk-doc/html/tomoe/home.png
+share/gtk-doc/html/tomoe/index.html
+share/gtk-doc/html/tomoe/index.sgml
+share/gtk-doc/html/tomoe/ix01.html
+share/gtk-doc/html/tomoe/left.png
+share/gtk-doc/html/tomoe/right.png
+share/gtk-doc/html/tomoe/style.css
+share/gtk-doc/html/tomoe/tomoe-tomoe.html
+share/gtk-doc/html/tomoe/tomoe.devhelp
+share/gtk-doc/html/tomoe/tomoe.devhelp2
+share/gtk-doc/html/tomoe/tomoe.html
+share/gtk-doc/html/tomoe/up.png
+@dirrm share/gtk-doc/html/tomoe
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc
+share/tomoe/all.xml
+share/tomoe/kanjidic2.xml
+share/tomoe/tomoe-dict.dtd
+@dirrm share/tomoe