3 files changed, 6 insertions, 25 deletions

diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index fafbb735cd68..34685ef861e3 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	scim-canna
-PORTVERSION=	0.1.3
-PORTREVISION=	2
+PORTVERSION=	1.0.0
+PORTREVISION=	0
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
-MASTER_SITE_SUBDIR=	scim-imengine/16250
+MASTER_SITE_SUBDIR=	scim-imengine/18849
 
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	SCIM IMEngine module using Canna
diff --git a/japanese/scim-canna/distinfo b/japanese/scim-canna/distinfo
index e166ac53d534..28d46eb63206 100644
--- a/japanese/scim-canna/distinfo
+++ b/japanese/scim-canna/distinfo
@@ -1,3 +1,3 @@
-MD5 (scim-canna-0.1.3.tar.gz) = 80f7f6838ff0933a24972ec267c8bb65
-SHA256 (scim-canna-0.1.3.tar.gz) = 15352d09e6d1d9f187ce2eaa51e7d61f5c5584dd6b67d7fe8b2de4014488334a
-SIZE (scim-canna-0.1.3.tar.gz) = 497619
+MD5 (scim-canna-1.0.0.tar.gz) = d995202e2715f320a6fcdc0e140a9c82
+SHA256 (scim-canna-1.0.0.tar.gz) = 3295879fcb312627778047cfc6a819e07ef52c71eeea388c73a39abdbdac5af5
+SIZE (scim-canna-1.0.0.tar.gz) = 500666
diff --git a/japanese/scim-canna/files/patch-configure b/japanese/scim-canna/files/patch-configure
deleted file mode 100644
index 07c17fa107de..000000000000
--- a/japanese/scim-canna/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Thu Dec 29 09:36:37 2005
-+++ configure	Thu Dec 29 09:36:43 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_CANNA_MAJOR_VERSION SCIM_CANNA_MINOR_VERSION SCIM_CANNA_MICRO_VERSION SCIM_CANNA_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 SCIM_CFLAGS SCIM_LIBS SCIM_GTKUTILS_CFLAGS SCIM_GTKUTILS_LIBS SCIM_VERSION SCIM_BUILD_SETUP_TRUE SCIM_BUILD_SETUP_FALSE SCIM_BUILD_SETUP ac_aux_dir CANNA_LIBS CANNA_CFLAGS SCIM_DEBUG_FLAGS SCIM_ICONDIR SCIM_MODULEDIR 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_CANNA_MAJOR_VERSION SCIM_CANNA_MINOR_VERSION SCIM_CANNA_MICRO_VERSION SCIM_CANNA_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 SCIM_CFLAGS SCIM_LIBS SCIM_GTKUTILS_CFLAGS SCIM_GTKUTILS_LIBS SCIM_VERSION SCIM_BUILD_SETUP_TRUE SCIM_BUILD_SETUP_FALSE SCIM_BUILD_SETUP ac_aux_dir CANNA_LIBS CANNA_CFLAGS SCIM_DEBUG_FLAGS SCIM_ICONDIR SCIM_MODULEDIR LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -31626,6 +31626,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,@SCIM_CFLAGS@,$SCIM_CFLAGS,;t t
- s,@SCIM_LIBS@,$SCIM_LIBS,;t t