Update to 1.7.0.

14 files changed, 31 insertions, 27 deletions

diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 2d36c5168247..6c59ac112588 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uim-el
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index 14c8968b78b5..0faf212e8c42 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uim-1.6.1.tar.bz2) = ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
-SIZE (uim-1.6.1.tar.bz2) = 6192431
+SHA256 (uim-1.7.0.tar.bz2) = aa5da7324622df1471f3fdd217e809423695f857cdcec2d750f08748ffde65e8
+SIZE (uim-1.7.0.tar.bz2) = 6402469
diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile
index b3dc23373340..7ab7f3a84bb6 100644
--- a/textproc/uim-gnome/Makefile
+++ b/textproc/uim-gnome/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-gnome
 COMMENT=	GNOME applets of uim input method
 
 USE_GNOME=	gtk20 gnomepanel libgnomeui
-LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.8:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 660c3b449d74..c0afcff65c3a 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-gtk
 COMMENT=	GTK+ modules of uim input method
 
 USE_GNOME=	gtk20
-LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.8:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index a6e074f886b4..9b3e9cca8599 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-kde
 
 COMMENT=	KDE panel applet of uim input method
 
-LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.8:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	uim-pref-qt:${PORTSDIR}/textproc/uim-qt
 
 USE_GCC=	4.2+
diff --git a/textproc/uim-kde4/Makefile b/textproc/uim-kde4/Makefile
index d8a20f3a3a03..2d452af4b907 100644
--- a/textproc/uim-kde4/Makefile
+++ b/textproc/uim-kde4/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-kde4
 COMMENT=	KDE4 panel applet of uim input method
 
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.8:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	uim-pref-qt4:${PORTSDIR}/textproc/uim-qt4
 
 USE_GCC=	4.2+
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index 03bd1eca3cbf..40763f002e48 100644
--- a/textproc/uim-m17nlib/Makefile
+++ b/textproc/uim-m17nlib/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Uim plugin using m17n library input method
 
 BUILD_DEPENDS=	m17n-db:${PORTSDIR}/devel/m17n-db
 LIB_DEPENDS=	m17n.4:${PORTSDIR}/devel/m17n-lib \
-		uim.7:${PORTSDIR}/textproc/uim
+		uim.8:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	m17n-db:${PORTSDIR}/devel/m17n-db
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index a9d5d7f984e9..207f92683bad 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -12,7 +12,7 @@ COMMENT=	QT modules of uim input method
 USE_QT_VER=	3
 USE_AUTOTOOLS=	libtool
 
-LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.8:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index 3edcabb188a2..9be3f428f2ff 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -9,7 +9,7 @@ PKGNAMESUFFIX=	-qt4
 
 COMMENT=	Qt4 modules of uim input method
 
-LIB_DEPENDS=	uim.7:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.8:${PORTSDIR}/textproc/uim
 
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build qt3support uic
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 6570aa28028e..618e59e9fa49 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	1.6.1
+PORTVERSION=	1.7.0
 CATEGORIES?=	textproc
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 14c8968b78b5..0faf212e8c42 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uim-1.6.1.tar.bz2) = ee23965e26e6e9c52bdc37d87e66da9de2a491221b5f1989942f3666e9a44914
-SIZE (uim-1.6.1.tar.bz2) = 6192431
+SHA256 (uim-1.7.0.tar.bz2) = aa5da7324622df1471f3fdd217e809423695f857cdcec2d750f08748ffde65e8
+SIZE (uim-1.7.0.tar.bz2) = 6402469
diff --git a/textproc/uim/files/extra-patch-gtk_Makefile.in b/textproc/uim/files/extra-patch-gtk_Makefile.in
index 84d2f6f6d215..606969264255 100644
--- a/textproc/uim/files/extra-patch-gtk_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk_Makefile.in
@@ -1,22 +1,25 @@
---- gtk/Makefile.in.orig	2010-08-11 16:30:55.000000000 +0900
-+++ gtk/Makefile.in	2010-10-16 21:33:40.000000000 +0900
-@@ -85,8 +85,6 @@
+--- gtk/Makefile.in.orig	2011-05-17 13:16:12.000000000 +0900
++++ gtk/Makefile.in	2011-05-29 02:29:01.000000000 +0900
+@@ -82,10 +82,6 @@
    sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
  am__installdirs = "$(DESTDIR)$(moduledir)"
  LTLIBRARIES = $(module_LTLIBRARIES)
 -@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@	$(top_builddir)/uim/libuim.la $(am__append_1)
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim-counted-init.la \
+-@GTK2_TRUE@	$(am__append_1)
  am__im_uim_la_SOURCES_DIST = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
  	key-util-gtk.h uim-cand-win-gtk.c uim-cand-win-gtk.h \
  	uim-cand-win-tbl-gtk.c uim-cand-win-tbl-gtk.h \
-@@ -452,8 +450,8 @@
+@@ -443,9 +439,8 @@
  @GTK2_TRUE@module_LTLIBRARIES = $(im_uim_la)
  @GTK2_TRUE@im_uim_la_SOURCES = $(IM_UIM_SOURCES)
  @GTK2_TRUE@im_uim_la_LDFLAGS = -module -avoid-version @GTK2_LIBS@
 -@GTK2_TRUE@im_uim_la_LIBADD = $(top_builddir)/uim/libuim-scm.la \
--@GTK2_TRUE@	$(top_builddir)/uim/libuim.la $(am__append_1)
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
+-@GTK2_TRUE@	$(top_builddir)/uim/libuim-counted-init.la \
 +@GTK2_TRUE@im_uim_la_LIBADD = -luim-scm \
-+@GTK2_TRUE@	-luim $(am__append_1)
++@GTK2_TRUE@	-luim \
+ @GTK2_TRUE@	$(am__append_1)
  @GTK2_TRUE@IM_UIM_SOURCES = \
  @GTK2_TRUE@	gtk-im-uim.c gtk-im-uim.h key-util-gtk.c key-util-gtk.h \
- @GTK2_TRUE@	uim-cand-win-gtk.c uim-cand-win-gtk.h \
diff --git a/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt b/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt
index 233edf9148df..29436386c833 100644
--- a/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt
+++ b/textproc/uim/files/extra-patch-qt4_toolbar_CMakeLists.txt
@@ -1,11 +1,11 @@
---- qt4/toolbar/CMakeLists.txt.orig	2010-10-17 02:55:35.000000000 +0900
-+++ qt4/toolbar/CMakeLists.txt	2010-10-17 02:56:00.000000000 +0900
-@@ -15,8 +15,6 @@
+--- qt4/toolbar/CMakeLists.txt.orig	2011-05-11 02:45:18.000000000 +0900
++++ qt4/toolbar/CMakeLists.txt	2011-05-29 03:23:18.000000000 +0900
+@@ -16,8 +16,6 @@
   
  kde4_add_plugin(plasma_applet_uim ${uim_SRCS})
  target_link_libraries(plasma_applet_uim ${KDE4_PLASMA_LIBS} ${KDE4_KDEUI_LIBS}
--        ${CMAKE_SOURCE_DIR}/../../uim/.libs/libuim.so
--        ${CMAKE_SOURCE_DIR}/../../uim/.libs/libuim-scm.so
+-        ${CMAKE_BINARY_DIR}/../../../uim/.libs/libuim.so
+-        ${CMAKE_BINARY_DIR}/../../../uim/.libs/libuim-scm.so
          -luim -luim-scm)
   
  install(TARGETS plasma_applet_uim DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index cde41615db50..fe490bc0db48 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -32,7 +32,7 @@ lib/libuim-scm.so.1
 lib/libuim.a
 lib/libuim.la
 lib/libuim.so
-lib/libuim.so.7
+lib/libuim.so.8
 lib/uim/plugin/libuim-custom-enabler.a
 lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-custom-enabler.so
@@ -321,6 +321,7 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/pixmaps/zm_dark_background.svg
 %%DATADIR%%/plugin.scm
 %%DATADIR%%/predict-custom.scm
+%%DATADIR%%/predict-google-suggest.scm
 %%DATADIR%%/predict-look-skk.scm
 %%DATADIR%%/predict-look.scm
 %%DATADIR%%/predict-sqlite3.scm