3 files changed, 7 insertions, 28 deletions

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