Update to 1.2.1.

6 files changed, 60 insertions, 59 deletions

diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index aed983710b41..d0a53950b99f 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	1.1.1
-PORTREVISION?=	1
+PORTVERSION=	1.2.1
 CATEGORIES?=	textproc
 MASTER_SITES=	http://uim.freedesktop.org/releases/
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 65ebbbea85f4..5926f96435bf 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.1.1.tar.gz) = 9af3eced661e19a8f42fedcd77f1af07
-SHA256 (uim-1.1.1.tar.gz) = 26a7dfc258cd1c1c52f67680488804e75184db2f0ed5f4699eb4c325fb389c5a
-SIZE (uim-1.1.1.tar.gz) = 2093501
+MD5 (uim-1.2.1.tar.gz) = c27e96ea57e5fcd38ddc72876a1d6d1c
+SHA256 (uim-1.2.1.tar.gz) = e2f257df389a516885ccfb18a068f7c153425cfb31de8487106e9e33bb1dcfbc
+SIZE (uim-1.2.1.tar.gz) = 2149696
diff --git a/textproc/uim/files/extra-patch-gtk_Makefile.in b/textproc/uim/files/extra-patch-gtk_Makefile.in
index 4f95ce363b72..fe390c6ded04 100644
--- a/textproc/uim/files/extra-patch-gtk_Makefile.in
+++ b/textproc/uim/files/extra-patch-gtk_Makefile.in
@@ -1,20 +1,20 @@
---- gtk/Makefile.in.orig	Fri Jun  9 10:47:02 2006
-+++ gtk/Makefile.in	Tue Jun 13 00:19:08 2006
+--- gtk/Makefile.in.orig	Mon Aug 14 13:28:19 2006
++++ gtk/Makefile.in	Mon Aug 21 01:05:26 2006
 @@ -64,8 +64,6 @@
  moduleLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(module_LTLIBRARIES)
  am__DEPENDENCIES_1 =
 -@GTK2_TRUE@im_uim_la_DEPENDENCIES = $(top_builddir)/uim/libuim.la \
 -@GTK2_TRUE@	$(am__DEPENDENCIES_1)
- am__im_uim_la_SOURCES_DIST = gtk-im-uim.c key-util-gtk.c \
+ 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 \
- 	caret-state-indicator.c caret-state-indicator.h uim-eb.c \
-@@ -356,7 +354,7 @@
+ 	caret-state-indicator.c caret-state-indicator.h compose.c \
+@@ -361,7 +359,7 @@
  @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.la $(EBLIB_LIBS)
 +@GTK2_TRUE@im_uim_la_LIBADD = $(EBLIB_LIBS)
- @GTK2_TRUE@IM_UIM_SOURCES = gtk-im-uim.c key-util-gtk.c key-util-gtk.h \
- @GTK2_TRUE@	uim-cand-win-gtk.c uim-cand-win-gtk.h \
- @GTK2_TRUE@	caret-state-indicator.c caret-state-indicator.h \
+ @GTK2_TRUE@IM_UIM_SOURCES = gtk-im-uim.c gtk-im-uim.h key-util-gtk.c \
+ @GTK2_TRUE@	key-util-gtk.h uim-cand-win-gtk.c \
+ @GTK2_TRUE@	uim-cand-win-gtk.h caret-state-indicator.c \
diff --git a/textproc/uim/files/extra-patch-helper_Makefile.in b/textproc/uim/files/extra-patch-helper_Makefile.in
index fd76fdaa6482..b68e98d43b26 100644
--- a/textproc/uim/files/extra-patch-helper_Makefile.in
+++ b/textproc/uim/files/extra-patch-helper_Makefile.in
@@ -1,19 +1,22 @@
---- helper/Makefile.in.orig	Fri Jun  9 10:47:03 2006
-+++ helper/Makefile.in	Tue Jun 13 00:37:25 2006
-@@ -80,8 +80,6 @@
+--- helper/Makefile.in.orig	Mon Aug 21 00:57:13 2006
++++ helper/Makefile.in	Mon Aug 21 00:57:24 2006
+@@ -87,8 +87,6 @@
  @GTK2_TRUE@	uim_candwin_gtk-candwin-gtk.$(OBJEXT) \
  @GTK2_TRUE@	uim_candwin_gtk-caret-state-indicator.$(OBJEXT)
  uim_candwin_gtk_OBJECTS = $(am_uim_candwin_gtk_OBJECTS)
 -@GTK2_TRUE@uim_candwin_gtk_DEPENDENCIES =  \
 -@GTK2_TRUE@	$(top_builddir)/uim/libuim.la
- am__uim_dict_gtk_SOURCES_DIST = dict-main-gtk.c dict-anthy.c \
- 	dict-anthy.h dict-canna.c dict-canna.h dict-word-win-gtk.c \
- 	dict-word-win-gtk.h dict-word-list-win-gtk.c \
-@@ -100,19 +98,14 @@
- @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@	uim_dict_gtk-dict-dict.$(OBJEXT) \
- @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@	uim_dict_gtk-dict-cclass-dialog.$(OBJEXT)
+ am__uim_dict_gtk_SOURCES_DIST = dict-main-gtk.c dict-canna-cclass.c \
+ 	dict-canna-cclass.h dict-word-win-gtk.c dict-word-win-gtk.h \
+ 	dict-word-list-win-gtk.c dict-word-list-win-gtk.h dict-util.c \
+@@ -111,22 +109,14 @@
+ @DICT_TRUE@@GTK2_TRUE@	$(am__objects_1) $(am__objects_2)
  uim_dict_gtk_OBJECTS = $(am_uim_dict_gtk_OBJECTS)
--@ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_DEPENDENCIES = $(top_builddir)/uim/libuim.la
+ am__DEPENDENCIES_1 =
+-@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_DEPENDENCIES =  \
+-@DICT_TRUE@@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
+-@DICT_TRUE@@GTK2_TRUE@	$(am__DEPENDENCIES_1) \
+-@DICT_TRUE@@GTK2_TRUE@	$(am__DEPENDENCIES_1)
  am__uim_im_switcher_gtk_SOURCES_DIST = im-switcher-gtk.c
  @GTK2_TRUE@am_uim_im_switcher_gtk_OBJECTS =  \
  @GTK2_TRUE@	uim_im_switcher_gtk-im-switcher-gtk.$(OBJEXT)
@@ -29,7 +32,7 @@
  am__uim_pref_gtk_SOURCES_DIST = pref-gtk.c pref-gtk-custom-widgets.c \
  	pref-gtk-custom-widgets.h ../gtk/key-util-gtk.c \
  	../gtk/key-util-gtk.h
-@@ -120,23 +113,17 @@
+@@ -134,23 +124,17 @@
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	uim_pref_gtk-pref-gtk-custom-widgets.$(OBJEXT) \
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@	uim_pref_gtk-key-util-gtk.$(OBJEXT)
  uim_pref_gtk_OBJECTS = $(am_uim_pref_gtk_OBJECTS)
@@ -53,7 +56,7 @@
  am__uim_toolbar_gtk_systray_SOURCES_DIST = toolbar-systray-gtk.c \
  	toolbar-common-gtk.c eggtrayicon.c eggtrayicon.h
  @GTK2_TRUE@am_uim_toolbar_gtk_systray_OBJECTS = uim_toolbar_gtk_systray-toolbar-systray-gtk.$(OBJEXT) \
-@@ -144,8 +131,6 @@
+@@ -158,8 +142,6 @@
  @GTK2_TRUE@	uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT)
  uim_toolbar_gtk_systray_OBJECTS =  \
  	$(am_uim_toolbar_gtk_systray_OBJECTS)
@@ -62,9 +65,9 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/uim
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -429,8 +414,7 @@
+@@ -447,8 +429,7 @@
  uim_pixmapsdir = @uim_pixmapsdir@
- EXTRA_DIST = GNOME_UimApplet.server.in.in uim-dict-ui.xml
+ EXTRA_DIST = GNOME_UimApplet.server.in.in uim-dict-ui.xml.in
  helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\"
 -@APPLET_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_LIBS@ \
 -@APPLET_TRUE@			   $(top_builddir)/uim/libuim.la
@@ -72,7 +75,7 @@
  
  @APPLET_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
  @APPLET_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_CFLAGS@
-@@ -446,38 +430,37 @@
+@@ -464,34 +445,32 @@
  @GTK2_TRUE@			   ../gtk/caret-state-indicator.c \
  @GTK2_TRUE@			   ../gtk/caret-state-indicator.h
  
@@ -108,13 +111,16 @@
  
 -@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-custom.la \
 -@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@			$(top_builddir)/uim/libuim.la
+-
 +@GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_LDADD = @GTK2_LIBS@
- 
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
  @GTK2_4_TRUE@@GTK2_TRUE@@PREF_TRUE@uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ -Wall
- @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_SOURCES = dict-main-gtk.c dict-anthy.c dict-anthy.h dict-canna.c dict-canna.h dict-word-win-gtk.c dict-word-win-gtk.h dict-word-list-win-gtk.c dict-word-list-win-gtk.h dict-util.c dict-util.h dict-word-list-view-gtk.c dict-word-list-view-gtk.h dict-word.c dict-word.h dict-dict.c dict-dict.h dict-cclass-dialog.c dict-cclass-dialog.h
--@ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim.la @ANTHY_LIBS@
-+@ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ @ANTHY_LIBS@
- @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir)
- @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CFLAGS = @GTK2_CFLAGS@
- @ANTHY_TRUE@@DICT_TRUE@@GTK2_TRUE@uim_dict_uidir = $(datadir)/uim/helperdata
+ @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_SOURCES = dict-main-gtk.c \
+@@ -506,7 +485,6 @@
+ @DICT_TRUE@@GTK2_TRUE@	dict-cclass-dialog.h $(am__append_4) \
+ @DICT_TRUE@@GTK2_TRUE@	$(am__append_7)
+ @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_LDADD = @GTK2_LIBS@ \
+-@DICT_TRUE@@GTK2_TRUE@	$(top_builddir)/uim/libuim.la \
+ @DICT_TRUE@@GTK2_TRUE@	$(am__append_5) $(am__append_8)
+ @DICT_TRUE@@GTK2_TRUE@uim_dict_gtk_CPPFLAGS = $(helper_defs) \
+ @DICT_TRUE@@GTK2_TRUE@	-I$(top_srcdir) -I$(top_builddir) \
diff --git a/textproc/uim/files/extra-patch-qt_Makefile.in b/textproc/uim/files/extra-patch-qt_Makefile.in
index 75eca66fe42c..e2686f6c9d52 100644
--- a/textproc/uim/files/extra-patch-qt_Makefile.in
+++ b/textproc/uim/files/extra-patch-qt_Makefile.in
@@ -1,6 +1,6 @@
---- qt/Makefile.in.orig	Tue Jun 13 00:43:06 2006
-+++ qt/Makefile.in	Tue Jun 13 00:47:10 2006
-@@ -96,8 +96,6 @@
+--- qt/Makefile.in.orig	Mon Aug 14 13:28:21 2006
++++ qt/Makefile.in	Mon Aug 21 01:27:53 2006
+@@ -95,8 +95,6 @@
  	"$(DESTDIR)$(libexecdir)"
  extraLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(extra_LTLIBRARIES) $(noinst_LTLIBRARIES)
@@ -9,7 +9,7 @@
  am__libquiminputcontextplugin_la_SOURCES_DIST =  \
  	immodule-candidatewindow.cpp immodule-qhelpermanager.cpp \
  	immodule-plugin.cpp immodule-candidatewindow.h \
-@@ -116,8 +114,6 @@
+@@ -118,8 +116,6 @@
  	$(am_libquiminputcontextplugin_la_OBJECTS)
  @QT_IMMODULE_TRUE@@QT_TRUE@am_libquiminputcontextplugin_la_rpath =  \
  @QT_IMMODULE_TRUE@@QT_TRUE@	-rpath $(extradir)
@@ -18,24 +18,22 @@
  am__libtoolbarcommon_la_SOURCES_DIST =  \
  	toolbar-common-quimhelpertoolbar.cpp \
  	toolbar-common-uimstateindicator.cpp qtgettext.h \
-@@ -136,7 +132,6 @@
+@@ -138,14 +134,11 @@
  @QT_TRUE@am_uim_candwin_qt_OBJECTS =  \
  @QT_TRUE@	uim_candwin_qt-candwin-qt.$(OBJEXT)
  uim_candwin_qt_OBJECTS = $(am_uim_candwin_qt_OBJECTS)
 -@QT_TRUE@uim_candwin_qt_DEPENDENCIES = $(top_builddir)/uim/libuim.la
  am__uim_im_switcher_qt_SOURCES_DIST = switcher-qt.cpp switcher-qt.h \
- 	qtgettext.h $(top_srcdir)/replace/os_dep.h
- am__objects_1 =
-@@ -145,8 +140,6 @@
- @QT_TRUE@	$(am__objects_1)
+ 	qtgettext.h
+ @QT_TRUE@am_uim_im_switcher_qt_OBJECTS =  \
+ @QT_TRUE@	uim_im_switcher_qt-switcher-qt.$(OBJEXT)
  uim_im_switcher_qt_OBJECTS = $(am_uim_im_switcher_qt_OBJECTS)
- @NEED_SETENV_C_TRUE@@QT_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/replace/libreplace.la
 -@QT_TRUE@uim_im_switcher_qt_DEPENDENCIES =  \
--@QT_TRUE@	$(top_builddir)/uim/libuim.la $(am__DEPENDENCIES_1)
+-@QT_TRUE@	$(top_builddir)/uim/libuim.la
  am__uim_pref_qt_SOURCES_DIST = pref-qt.cpp pref-customwidgets.cpp \
  	pref-kseparator.cpp qtgettext.h pref-qt.h pref-customwidgets.h \
  	pref-kseparator.h
-@@ -158,9 +151,6 @@
+@@ -157,9 +150,6 @@
  @PREF_TRUE@@QT_TRUE@	uim_pref_qt-pref-keyeditformbase.$(OBJEXT)
  uim_pref_qt_OBJECTS = $(am_uim_pref_qt_OBJECTS) \
  	$(nodist_uim_pref_qt_OBJECTS)
@@ -45,7 +43,7 @@
  am__uim_toolbar_qt_SOURCES_DIST = toolbar-standalone-qt.cpp \
  	toolbar-standalone-qt.h qtgettext.h \
  	toolbar-common-quimhelpertoolbar.h \
-@@ -168,8 +158,7 @@
+@@ -167,8 +157,7 @@
  @QT_TRUE@am_uim_toolbar_qt_OBJECTS =  \
  @QT_TRUE@	uim_toolbar_qt-toolbar-standalone-qt.$(OBJEXT)
  uim_toolbar_qt_OBJECTS = $(am_uim_toolbar_qt_OBJECTS)
@@ -55,7 +53,7 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/uim
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -496,7 +485,6 @@
+@@ -502,7 +491,6 @@
  
  @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_IMMODULE_TRUE@@QT_TRUE@libquiminputcontextplugin_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@@ -63,7 +61,7 @@
  
  # Toolbar Common
  @QT_TRUE@noinst_LTLIBRARIES = libtoolbarcommon.la
-@@ -505,7 +493,6 @@
+@@ -511,7 +499,6 @@
  
  @QT_TRUE@libtoolbarcommon_la_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_TRUE@libtoolbarcommon_la_LDFLAGS = $(QT_LDFLAGS) -avoid-version
@@ -71,7 +69,7 @@
  
  # Toolbar Standalone
  @QT_TRUE@uim_toolbar_qt_SOURCES = toolbar-standalone-qt.cpp toolbar-standalone-qt.h qtgettext.h \
-@@ -513,21 +500,18 @@
+@@ -519,19 +506,17 @@
  
  @QT_TRUE@uim_toolbar_qt_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_TRUE@uim_toolbar_qt_LDFLAGS = $(QT_LDFLAGS)
@@ -85,16 +83,14 @@
 -@QT_TRUE@uim_candwin_qt_LDADD = $(top_builddir)/uim/libuim.la
  
  # Switcher
- @QT_TRUE@uim_im_switcher_qt_SOURCES = switcher-qt.cpp switcher-qt.h \
- @QT_TRUE@	qtgettext.h $(am__append_8)
+ @QT_TRUE@uim_im_switcher_qt_SOURCES = switcher-qt.cpp switcher-qt.h qtgettext.h
  @QT_TRUE@uim_im_switcher_qt_CXXFLAGS = $(QT_CXXFLAGS)
  @QT_TRUE@uim_im_switcher_qt_LDFLAGS = $(QT_LDFLAGS)
--@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim.la \
--@QT_TRUE@	$(am__append_9)
+-@QT_TRUE@uim_im_switcher_qt_LDADD = $(top_builddir)/uim/libuim.la
  
  # Pref
  @PREF_TRUE@@QT_TRUE@nodist_uim_pref_qt_SOURCES = \
-@@ -543,7 +527,6 @@
+@@ -547,7 +532,6 @@
  
  @PREF_TRUE@@QT_TRUE@uim_pref_qt_CXXFLAGS = $(QT_CXXFLAGS)
  @PREF_TRUE@@QT_TRUE@uim_pref_qt_LDFLAGS = $(QT_LDFLAGS)
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index b672612753ff..d3ff2e315178 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -20,7 +20,7 @@ lib/libuim-custom.so.2
 lib/libuim.a
 lib/libuim.la
 lib/libuim.so
-lib/libuim.so.2
+lib/libuim.so.3
 lib/uim/plugin/libuim-custom-enabler.a
 lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-custom-enabler.so
@@ -101,10 +101,10 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/pixmaps/ja_direct.svg
 %%DATADIR%%/pixmaps/ja_fullwidth_alnum.png
 %%DATADIR%%/pixmaps/ja_fullwidth_alnum.svg
+%%DATADIR%%/pixmaps/ja_halfkana.png
+%%DATADIR%%/pixmaps/ja_halfkana.svg
 %%DATADIR%%/pixmaps/ja_halfwidth_alnum.png
 %%DATADIR%%/pixmaps/ja_halfwidth_alnum.svg
-%%DATADIR%%/pixmaps/ja_halfwidth_katakana.png
-%%DATADIR%%/pixmaps/ja_halfwidth_katakana.svg
 %%DATADIR%%/pixmaps/ja_hiragana.png
 %%DATADIR%%/pixmaps/ja_hiragana.svg
 %%DATADIR%%/pixmaps/ja_kana.png