- Update to 1.0.1.

- Use OPTIONS.
- Make dependencies on anthy and m17nlib optional.

12 files changed, 243 insertions, 239 deletions

diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index b3f69700fb51..1a12edee204d 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,90 +6,136 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	0.4.9.1
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://uim.freedesktop.org/releases/ \
-		http://www.tuhep.phys.tohoku.ac.jp/~jhpark/uim/:byeoru
+MASTER_SITES=	http://uim.freedesktop.org/releases/
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Input method library
 
-LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy \
-		m17n.1:${PORTSDIR}/devel/m17n-lib
-
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_PERL5_BUILD=yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
-USE_GNOME=	lthack gnometarget glib20
+USE_GNOME=	gnometarget glib20
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_AUTOTOOLS=	libtool:13:inc
+USE_AUTOTOOLS=	libtool:15
+
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+
+CONFIGURE_ARGS=	--enable-emacs
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib  -L${LOCALBASE}/lib"
-DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
-PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
-BYEORU_FILES=	byeoru.scm byeoru-custom.scm byeoru-key-custom.scm \
-		byeoru-symbols.scm byeoru-dic.scm
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${BYEORU_FILES:S/$/:byeoru/}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+OPTIONS=	GTK "Enable GTK support" off \
+		QT "Enable QT support" off \
+		GNOME "Enable GNOME support" off \
+		ANTHY "Enable Anthy support" off \
+		CANNA "Enable Canna support" off \
+		M17NLIB "Enable m17lib support" off \
+		PRIME "Enable PRIME support" off \
+		SCIM "Enable SCIM support" off \
+		SKK "Enable SKK support" off
 
 MAN1=		uim-xim.1
+DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
+PLIST_SUB=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == ia64
-BROKEN=		"Segfault during build on ia64"
-.endif
-
-.if ${HAVE_GNOME:Mgtk20}
+.if defined(WITH_GTK) && !defined(WITHOUT_GTK)
 USE_GNOME+=	gtk20
+CONFIGURE_ARGS+=--with-gtk2
 PLIST_SUB+=	GTK=""
 .else
+CONFIGURE_ARGS+=--without-gtk2
 PLIST_SUB+=	GTK="@comment "
 .endif
 
-.if ${HAVE_GNOME:Mgnomepanel}
+.if defined(WITH_QT) && !defined(WITHOUT_QT)
+LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
+CONFIGURE_ARGS+=--with-qt
+CONFIGURE_ENV+=	QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
+		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include" LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib"
+PLIST_SUB+=	QT=""
+.else
+CONFIGURE_ARGS+=--without-qt
+PLIST_SUB+=	QT="@comment "
+.endif
+
+.if defined(WITH_GNOME) && !defined(WITHOUT_GNOME)
 USE_GNOME+=	gnomepanel
+CONFIGURE_ARGS+=--with-gnome2 --enable-applet
 PLIST_SUB+=	GNOME=""
 .else
+CONFIGURE_ARGS+=--without-gnome2 --disable-applet
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
-.if exists(${X11BASE}/bin/scim) || defined(WITH_SCIM)
-USE_GCC=	3.4
-LIB_DEPENDS=	scim-1.0.9:${PORTSDIR}/textproc/scim
-CONFIGURE_ARGS+=--with-scim
-PLIST_SUB+=	SCIM=""
+.if defined(WITH_ANTHY) && !defined(WITHOUT_ANTHY)
+LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
+CONFIGURE_ARGS+=--with-anthy
+PLIST_SUB+=	ANTHY=""
 .else
-PLIST_SUB+=	SCIM="@comment "
+CONFIGURE_ARGS+=--without-anthy
+PLIST_SUB+=	ANTHY="@comment "
 .endif
 
-.if exists(${LOCALBASE}/sbin/cannaserver) || defined(WITH_CANNA)
-LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
+.if defined(WITH_CANNA) && !defined(WITHOUT_CANNA)
+LIB_DEPENDS+=	canna.1:${PORTSDIR}/japanese/Canna
 CONFIGURE_ARGS+=--with-canna
 PLIST_SUB+=	CANNA=""
 .else
+CONFIGURE_ARGS+=--without-canna
 PLIST_SUB+=	CANNA="@comment "
 .endif
 
-post-extract:
-	for i in ${BYEORU_FILES}; do \
-		${CAT} ${DISTDIR}/$$i >${WRKSRC}/scm/$$i; \
-	done
+.if defined(WITH_M17NLIB) && !defined(WITHOUT_M17NLIB)
+LIB_DEPENDS+=	m17n.1:${PORTSDIR}/devel/m17n-lib
+CONFIGURE_ARGS+=--with-m17nlib
+PLIST_SUB+=	M17NLIB=""
+.else
+CONFIGURE_ARGS+=--without-m17nlib
+PLIST_SUB+=	M17NLIB="@comment "
+.endif
+
+.if defined(WITH_PRIME) && !defined(WITHOUT_PRIME)
+BUILD_DEPENDS+=	prime:${PORTSDIR}/japanese/prime
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+CONFIGURE_ARGS+=--with-prime
+PLIST_SUB+=	PRIME=""
+.else
+CONFIGURE_ARGS+=--without-prime
+PLIST_SUB+=	PRIME="@comment "
+.endif
+
+.if defined(WITH_SCIM) && !defined(WITHOUT_SCIM)
+USE_GCC=	3.4
+LIB_DEPENDS+=	scim-1.0.9:${PORTSDIR}/textproc/scim
+CONFIGURE_ARGS+=--with-scim
+PLIST_SUB+=	SCIM=""
+.else
+CONFIGURE_ARGS+=--without-scim
+PLIST_SUB+=	SCIM="@comment "
+.endif
+
+.if defined(WITH_SKK) && !defined(WITHOUT_SKK)
+RUN_DEPENDS+=	${LOCALBASE}/share/skk/SKK-JISYO.L:${PORTSDIR}/japanese/skk-jisyo
+.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm
 
 .if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${DOCSDIR_JA}
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.ja ${DOCSDIR_JA}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${CAT} ${PKGMESSAGE}
+	${MKDIR} ${DOCSDIR_JA}
+	${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DOCSDIR}/KEY
+	${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.fep
+	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DOCSDIR_JA}/README.fep
+	${INSTALL_DATA} ${WRKSRC}/xim/README ${DOCSDIR}/README.xim
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 3abbf18f729f..d80d16d60ecb 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,18 +1,3 @@
-MD5 (uim-0.4.9.1.tar.gz) = 0e2625cc926917d7864c4d0c341c535a
-SHA256 (uim-0.4.9.1.tar.gz) = caad8b67e892f6bff08640dba799ecde97218dec0dd58581e7ccbfa15e870dfc
-SIZE (uim-0.4.9.1.tar.gz) = 1602849
-MD5 (byeoru.scm) = 705eb5e99bccad6265eaaf0941d0ac88
-SHA256 (byeoru.scm) = 06517e1c31b350fb48248747bb8245aad0afe76f16129cecfb41fcfcc8c87065
-SIZE (byeoru.scm) = 68232
-MD5 (byeoru-custom.scm) = e38397bfad45cec132b234b53c6b7279
-SHA256 (byeoru-custom.scm) = e221cfe1007b921009279c5de945e1f055bd7ccb19662f7e75dd0b348ffaed31
-SIZE (byeoru-custom.scm) = 5664
-MD5 (byeoru-key-custom.scm) = 583381445b69fe23cb3d20afeedf5c3a
-SHA256 (byeoru-key-custom.scm) = cb99ed2fbe1cac7a1f4056f834b15428d119d918e28ff0a332235ee4eb00f3e8
-SIZE (byeoru-key-custom.scm) = 4254
-MD5 (byeoru-symbols.scm) = ea7f88d399cdf2f06908b884188f2e84
-SHA256 (byeoru-symbols.scm) = 526f187a9e2dd9c3996f4fcdcb5af915cfe0da89eae8c84c54d5c38f5480b6de
-SIZE (byeoru-symbols.scm) = 12379
-MD5 (byeoru-dic.scm) = cee301bd14f261f8a35a695238595dd5
-SHA256 (byeoru-dic.scm) = 9322999fc523c632d2b751015273a1c1d69479808136666764c210ef0c4be7fa
-SIZE (byeoru-dic.scm) = 1246039
+MD5 (uim-1.0.1.tar.gz) = 1de96cb9ca0c570c0d04678a95f9c75a
+SHA256 (uim-1.0.1.tar.gz) = cfd3a906763d0474576fd07b0ffcfbc829075a750fc4fe28dcb4e37999e4d57f
+SIZE (uim-1.0.1.tar.gz) = 1924484
diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in
index c73f080216db..c7c93b8da70e 100644
--- a/textproc/uim/files/patch-Makefile.in
+++ b/textproc/uim/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Wed Apr  7 13:38:51 2004
-+++ Makefile.in	Wed Apr  7 23:23:22 2004
-@@ -201,7 +201,7 @@
- 
- DISTCLEANFILES = uim.pc intltool-extract intltool-merge intltool-update
+--- Makefile.in.orig	Fri Dec 16 17:11:10 2005
++++ Makefile.in	Sat Dec 24 03:01:18 2005
+@@ -335,7 +335,7 @@
+ 	uim.pc.in ChangeLog.old uim.desktop autogen.sh
  
+ DISTCLEANFILES = uim.pc intltool-extract intltool-merge intltool-update po/.intltool-merge-cache
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = uim.pc
- 
- noinst_PROGRAMS = $(gtk_entry) uim-agent
+ desktopdir = $(datadir)/applications
+ desktop_in_files = uim.desktop.in
diff --git a/textproc/uim/files/patch-configure b/textproc/uim/files/patch-configure
deleted file mode 100644
index 71bd426e8d70..000000000000
--- a/textproc/uim/files/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
---- configure.orig	Sun Aug  1 22:33:54 2004
-+++ configure	Sun Aug  1 22:34:13 2004
-@@ -19203,18 +19203,6 @@
- echo "$as_me: error: perl 5.x required for intltool" >&2;}
-    { (exit 1); exit 1; }; }
- fi
--if test "x" != "xno-xml"; then
--   echo "$as_me:$LINENO: checking for XML::Parser" >&5
--echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6
--   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
--       echo "$as_me:$LINENO: result: ok" >&5
--echo "${ECHO_T}ok" >&6
--   else
--       { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
--   { (exit 1); exit 1; }; }
--   fi
--fi
- 
- # Remove file type tags (using []) from po/POTFILES.
- 
diff --git a/textproc/uim/files/patch-emacs_Makefile.in b/textproc/uim/files/patch-emacs_Makefile.in
new file mode 100644
index 000000000000..41b7fb305fd0
--- /dev/null
+++ b/textproc/uim/files/patch-emacs_Makefile.in
@@ -0,0 +1,18 @@
+--- emacs/Makefile.in.orig	Fri Dec 16 17:10:53 2005
++++ emacs/Makefile.in	Sat Dec 24 07:41:33 2005
+@@ -670,15 +670,6 @@
+ distclean-libtool:
+ 	-rm -f libtool
+ uninstall-info-am:
+-install-dist_uimel_lispDATA: $(dist_uimel_lisp_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(uimel_lispdir)" || $(mkdir_p) "$(DESTDIR)$(uimel_lispdir)"
+-	@list='$(dist_uimel_lisp_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(dist_uimel_lispDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(uimel_lispdir)/$$f'"; \
+-	  $(dist_uimel_lispDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(uimel_lispdir)/$$f"; \
+-	done
+ 
+ uninstall-dist_uimel_lispDATA:
+ 	@$(NORMAL_UNINSTALL)
diff --git a/textproc/uim/files/patch-gtk:Makefile.in b/textproc/uim/files/patch-gtk:Makefile.in
index ac634886e5e4..6750131592fe 100644
--- a/textproc/uim/files/patch-gtk:Makefile.in
+++ b/textproc/uim/files/patch-gtk:Makefile.in
@@ -1,25 +1,25 @@
---- gtk/Makefile.in.orig	Wed Mar  2 02:29:13 2005
-+++ gtk/Makefile.in	Wed Mar  2 02:37:44 2005
-@@ -308,15 +308,15 @@
- 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
- moduleLTLIBRARIES_INSTALL = $(INSTALL)
+--- gtk/Makefile.in.orig	Fri Dec 16 17:10:56 2005
++++ gtk/Makefile.in	Sat Dec 24 03:04:10 2005
+@@ -381,15 +381,15 @@
+ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-moduleLTLIBRARIES: $(module_LTLIBRARIES)
 -	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(moduledir)
+-	test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
 -	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
 -	  if test -f $$p; then \
--	    f="`echo $$p | sed -e 's|^.*/||'`"; \
--	    echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \
--	    $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \
+-	    f=$(am__strip_dir) \
+-	    echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
+-	    $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
 -	  else :; fi; \
 -	done
 +@GTK2_TRUE@	@$(NORMAL_INSTALL)
-+@GTK2_TRUE@	$(mkinstalldirs) $(DESTDIR)$(moduledir)
++@GTK2_TRUE@	test -z "$(moduledir)" || $(mkdir_p) "$(DESTDIR)$(moduledir)"
 +@GTK2_TRUE@	@list='$(module_LTLIBRARIES)'; for p in $$list; do \
 +@GTK2_TRUE@	  if test -f $$p; then \
-+@GTK2_TRUE@	    f="`echo $$p | sed -e 's|^.*/||'`"; \
-+@GTK2_TRUE@	    echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f"; \
-+@GTK2_TRUE@	    $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(moduledir)/$$f; \
++@GTK2_TRUE@	    f=$(am__strip_dir) \
++@GTK2_TRUE@	    echo " $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(moduledir)/$$f'"; \
++@GTK2_TRUE@	    $(LIBTOOL) --mode=install $(moduleLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(moduledir)/$$f"; \
 +@GTK2_TRUE@	  else :; fi; \
 +@GTK2_TRUE@	done
  
diff --git a/textproc/uim/files/patch-helper:Makefile.in b/textproc/uim/files/patch-helper:Makefile.in
index b2c7abf24154..7b67242c125c 100644
--- a/textproc/uim/files/patch-helper:Makefile.in
+++ b/textproc/uim/files/patch-helper:Makefile.in
@@ -1,9 +1,9 @@
---- helper/Makefile.in.orig	Wed Apr  7 05:45:42 2004
-+++ helper/Makefile.in	Wed Apr  7 22:21:03 2004
-@@ -203,7 +203,7 @@
- 
- @APPLET_TRUE@uim_helper_applet_SOURCES = helper-applet.c helper-toolbar-common-gtk.c
- 
+--- helper/Makefile.in.orig	Fri Dec 16 17:10:59 2005
++++ helper/Makefile.in	Sat Dec 24 03:05:26 2005
+@@ -422,7 +422,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@ @GNOME2_CFLAGS@ -Wall
+ @APPLET_TRUE@uim_toolbar_applet_SOURCES = toolbar-applet-gnome.c toolbar-common-gtk.c
 -@APPLET_TRUE@serverdir = $(libdir)/bonobo/servers
 +@APPLET_TRUE@serverdir = $(prefix)/libdata/bonobo/servers
  @APPLET_TRUE@server_DATA = GNOME_UimApplet.server
diff --git a/textproc/uim/files/patch-scm:Makefile.in b/textproc/uim/files/patch-scm:Makefile.in
deleted file mode 100644
index f6476fc0ce15..000000000000
--- a/textproc/uim/files/patch-scm:Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- scm/Makefile.in.orig	Tue Nov 22 03:25:25 2005
-+++ scm/Makefile.in	Tue Nov 22 03:27:10 2005
-@@ -283,6 +283,8 @@
-  tcode.scm \
-  tutcode.scm tutcode-key-custom.scm \
-  hangul.scm hangul2.scm hangul3.scm romaja.scm \
-+ byeoru.scm byeoru-dic.scm byeoru-symbols.scm \
-+ byeoru-custom.scm byeoru-key-custom.scm \
-  viqr.scm \
-  ipa-x-sampa.scm \
-  latin.scm \
-@@ -293,7 +295,7 @@
-  uim-module-manager.scm\
- $(am__append_1)
- 
--module_names = "pyload" $(am__append_2) $(am__append_3) $(am__append_4) $(am__append_5) "tcode" "tutcode" "hangul" "viqr" "ipa-x-sampa" "latin" $(am__append_6) $(am__append_7)
-+module_names = "pyload" $(am__append_2) $(am__append_3) $(am__append_4) $(am__append_5) "tcode" "tutcode" "byeoru" "hangul" "viqr" "ipa-x-sampa" "latin" $(am__append_6) $(am__append_7)
- subdir = scm
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/textproc/uim/files/patch-uim:scim.cpp b/textproc/uim/files/patch-uim:scim.cpp
index 863f6e36452f..c0176673863d 100644
--- a/textproc/uim/files/patch-uim:scim.cpp
+++ b/textproc/uim/files/patch-uim:scim.cpp
@@ -1,6 +1,14 @@
---- uim/scim.cpp.orig	Wed Sep 21 00:27:36 2005
-+++ uim/scim.cpp	Wed Sep 21 00:29:33 2005
-@@ -175,7 +175,7 @@
+--- uim/scim.cpp.orig	Wed Dec  7 21:39:32 2005
++++ uim/scim.cpp	Sat Dec 24 04:13:02 2005
+@@ -43,7 +43,6 @@
+ #include "uim.h"
+ #include "uim-scm.h"
+ #include "uim-compat-scm.h"
+-#include "context.h"
+ 
+ using namespace scim;
+ 
+@@ -175,7 +174,7 @@
              return uim_scm_f();
          }
  
diff --git a/textproc/uim/pkg-descr b/textproc/uim/pkg-descr
index 7cd3f45d9086..247b2e6f641e 100644
--- a/textproc/uim/pkg-descr
+++ b/textproc/uim/pkg-descr
@@ -2,10 +2,8 @@ uim aims for multilingual input method library.
 It works as an XIM server or an input module of GTK+ 2.x.
 And currently it supports following input methods.
 
-  Chinese:    Pinyin
-  Japanese:   Anthy, Prime, SKK, T-code, TUT-code
-  Korean:     Hangul, Romaja
-  Vietnamese: VIQR
-  Other:      IPA
+  Chinese:    New Pinyin (Simplified), Pinyin (Unicode), Pinyin (Traditional)
+  Japanese:   Anthy, Canna, Prime, SKK, T-code, TUT-code
+  Korean:     Byeoru, Hangul (2-beol), Hangul (3-beol), Hangul (Romaja)
 
-WWW: http://freedesktop.org/Software/uim
+WWW: http://uim.freedesktop.org/
diff --git a/textproc/uim/pkg-message b/textproc/uim/pkg-message
deleted file mode 100644
index 105b9e235239..000000000000
--- a/textproc/uim/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
-UIM configuration changed after uim-0.4.4.
-
-# Before 0.4.4:
-GTK_IM_MODULE=uim-anthy; export GTK_IM_MODULE
-XMODIFIERS=@im=uim-anthy; export XMODIFIERS
-# After 0.4.4:
-GTK_IM_MODULE=uim; export GTK_IM_MODULE
-XMODIFIERS=@im=uim; export XMODIFIERS
-
-And specify your favorite input method to your ~/.uim
-(define default-im-name 'anthy)
-
-SEE ALSO:
-in English:
-http://freedesktop.org/pipermail/uim/2004-October/000659.html
-in Japanese:
-http://lists.sourceforge.jp/mailman/archives/anthy-dev/2004-October/001135.html
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index c5f828f44367..fc023a235fd8 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -1,17 +1,19 @@
+%%QT%%bin/uim-chardict-qt
+bin/uim-el-agent
 bin/uim-fep
 bin/uim-fep-tick
-bin/uim-helper-server
-bin/uim-module-manager
-bin/uim-sh
-%%GTK%%bin/uim-candwin-gtk
-%%GTK%%bin/uim-helper-candwin-gtk
 %%GTK%%bin/uim-helper-toolbar-gtk
 %%GTK%%bin/uim-helper-toolbar-gtk-systray
 %%GTK%%bin/uim-im-switcher-gtk
+%%QT%%bin/uim-im-switcher-qt
 %%GTK%%bin/uim-input-pad-ja
+bin/uim-module-manager
 %%GTK%%bin/uim-pref-gtk
+%%QT%%bin/uim-pref-qt
+bin/uim-sh
 %%GTK%%bin/uim-toolbar-gtk
 %%GTK%%bin/uim-toolbar-gtk-systray
+%%QT%%bin/uim-toolbar-qt
 bin/uim-xim
 include/uim/plugin.h
 include/uim/uim-compat-scm.h
@@ -25,108 +27,113 @@ include/uim/uim.h
 %%GTK%%lib/gtk-2.0/2.4.0/immodules/im-uim.so
 lib/libuim-custom.a
 lib/libuim-custom.so
-lib/libuim-custom.so.0
+lib/libuim-custom.so.1
 lib/libuim.a
 lib/libuim.so
-lib/libuim.so.0
-lib/uim/plugin/libuim-anthy.so
+lib/libuim.so.1
+%%ANTHY%%lib/uim/plugin/libuim-anthy.so
 %%CANNA%%lib/uim/plugin/libuim-canna.so
 lib/uim/plugin/libuim-custom-enabler.so
-lib/uim/plugin/libuim-m17nlib.so
+%%M17NLIB%%lib/uim/plugin/libuim-m17nlib.so
+%%PRIME%%lib/uim/plugin/libuim-prime.so
 %%SCIM%%lib/uim/plugin/libuim-scim.so
 lib/uim/plugin/libuim-skk.so
 libdata/pkgconfig/uim.pc
+%%GTK%%libexec/uim-candwin-gtk
+%%QT%%libexec/uim-candwin-qt
+libexec/uim-helper-server
 %%GNOME%%libexec/uim-helper-applet
 %%GNOME%%libexec/uim-toolbar-applet
-%%PORTDOCS%%%%DOCSDIR_JA%%/README.ja
-%%PORTDOCS%%%%DOCSDIR%%/README
 share/applications/uim.desktop
 share/locale/fr/LC_MESSAGES/uim.mo
 share/locale/ja/LC_MESSAGES/uim.mo
-share/uim/PY.scm
-share/uim/action.scm
-share/uim/anthy-custom.scm
-share/uim/anthy-key-custom.scm
-share/uim/anthy.scm
-share/uim/canna-custom.scm
-share/uim/canna-key-custom.scm
-share/uim/canna.scm
-share/uim/custom-rt.scm
-share/uim/custom.scm
-share/uim/default.scm
-share/uim/direct.scm
-share/uim/generic-custom.scm
-share/uim/generic-key-custom.scm
-share/uim/generic.scm
-share/uim/byeoru.scm
-share/uim/byeoru-custom.scm
-share/uim/byeoru-key-custom.scm
-share/uim/byeoru-symbols.scm
-share/uim/byeoru-dic.scm
-share/uim/hangul.scm
-share/uim/hangul2.scm
-share/uim/hangul3.scm
-share/uim/i18n.scm
-share/uim/im-custom.scm
-share/uim/im.scm
-share/uim/init.scm
-share/uim/installed-modules.scm
-share/uim/ipa-x-sampa.scm
-share/uim/japanese-azik.scm
-share/uim/japanese-kana.scm
-share/uim/japanese.scm
-share/uim/key.scm
-share/uim/latin.scm
-share/uim/lazy-load.scm
-share/uim/load-action.scm
-share/uim/loader.scm
-share/uim/m17nlib.scm
-share/uim/manage-modules.scm
-share/uim/pinyin-big5.scm
-share/uim/pixmaps/configure-qt.png
-share/uim/pixmaps/switcher-icon.png
-share/uim/pixmaps/uim-icon.png
-share/uim/plugin.scm
-share/uim/prime-custom.scm
-share/uim/prime-key-custom.scm
-share/uim/prime.scm
-share/uim/pyload.scm
-share/uim/pyunihan.scm
-share/uim/rk.scm
-share/uim/romaja.scm
-share/uim/scim.scm
-share/uim/skk-custom.scm
-share/uim/skk-dialog.scm
-share/uim/skk-editor.scm
-share/uim/skk-key-custom.scm
-share/uim/skk.scm
-share/uim/spellcheck-custom.scm
-share/uim/spellcheck.scm
-share/uim/tables/japanese-azik.table
-share/uim/tables/japanese-kana.table
-share/uim/tables/japanese-roma.table
-share/uim/tables/japanese-tcode.table
-share/uim/tables/japanese-tutcode.table
-share/uim/tables/korean-hangul2.table
-share/uim/tables/korean-hangul3.table
-share/uim/tcode.scm
-share/uim/tutcode-key-custom.scm
-share/uim/tutcode.scm
-share/uim/uim-db.scm
-share/uim/uim-module-manager.scm
-share/uim/uim-sh.scm
-share/uim/ustr.scm
-share/uim/util.scm
-share/uim/viqr.scm
-share/uim/zaurus.scm
+share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
+share/locale/ko/LC_MESSAGES/uim.mo
+%%PORTDOCS%%%%DOCSDIR_JA%%/README.fep
+%%PORTDOCS%%%%DOCSDIR%%/KEY
+%%PORTDOCS%%%%DOCSDIR%%/README.fep
+%%PORTDOCS%%%%DOCSDIR%%/README.xim
+%%DATADIR%%/action.scm
+%%DATADIR%%/anthy-custom.scm
+%%DATADIR%%/anthy-key-custom.scm
+%%DATADIR%%/anthy.scm
+%%DATADIR%%/canna-custom.scm
+%%DATADIR%%/canna-key-custom.scm
+%%DATADIR%%/canna.scm
+%%DATADIR%%/custom-rt.scm
+%%DATADIR%%/custom.scm
+%%DATADIR%%/default.scm
+%%DATADIR%%/direct.scm
+%%DATADIR%%/generic-custom.scm
+%%DATADIR%%/generic-key-custom.scm
+%%DATADIR%%/generic.scm
+%%DATADIR%%/byeoru.scm
+%%DATADIR%%/byeoru-custom.scm
+%%DATADIR%%/byeoru-key-custom.scm
+%%DATADIR%%/byeoru-symbols.scm
+%%DATADIR%%/byeoru-dic.scm
+%%DATADIR%%/hangul.scm
+%%DATADIR%%/hangul2.scm
+%%DATADIR%%/hangul3.scm
+%%GNOME%%%%DATADIR%%/helperdata/bushu.t
+%%DATADIR%%/i18n.scm
+%%DATADIR%%/im-custom.scm
+%%DATADIR%%/im.scm
+%%DATADIR%%/init.scm
+%%DATADIR%%/installed-modules.scm
+%%DATADIR%%/ipa-x-sampa.scm
+%%DATADIR%%/japanese-azik.scm
+%%DATADIR%%/japanese-kana.scm
+%%DATADIR%%/japanese.scm
+%%DATADIR%%/key.scm
+%%DATADIR%%/latin.scm
+%%DATADIR%%/lazy-load.scm
+%%DATADIR%%/load-action.scm
+%%DATADIR%%/loader.scm
+%%DATADIR%%/m17nlib.scm
+%%DATADIR%%/mana-custom.scm
+%%DATADIR%%/mana-key-custom.scm
+%%DATADIR%%/mana.scm
+%%DATADIR%%/manage-modules.scm
+%%DATADIR%%/pinyin-big5.scm
+%%DATADIR%%/pixmaps/configure-qt.png
+%%DATADIR%%/pixmaps/switcher-icon.png
+%%DATADIR%%/pixmaps/uim-icon.png
+%%DATADIR%%/plugin.scm
+%%DATADIR%%/prime-custom.scm
+%%DATADIR%%/prime-key-custom.scm
+%%DATADIR%%/prime.scm
+%%DATADIR%%/py.scm
+%%DATADIR%%/pyload.scm
+%%DATADIR%%/pyunihan.scm
+%%DATADIR%%/rk.scm
+%%DATADIR%%/romaja.scm
+%%DATADIR%%/scim.scm
+%%DATADIR%%/skk-custom.scm
+%%DATADIR%%/skk-dialog.scm
+%%DATADIR%%/skk-editor.scm
+%%DATADIR%%/skk-key-custom.scm
+%%DATADIR%%/skk.scm
+%%DATADIR%%/spellcheck-custom.scm
+%%DATADIR%%/spellcheck.scm
+%%DATADIR%%/tcode.scm
+%%DATADIR%%/tutcode-key-custom.scm
+%%DATADIR%%/tutcode.scm
+%%DATADIR%%/uim-db.scm
+%%DATADIR%%/uim-module-manager.scm
+%%DATADIR%%/uim-sh.scm
+%%DATADIR%%/ustr.scm
+%%DATADIR%%/util.scm
+%%DATADIR%%/viqr.scm
+%%DATADIR%%/zaurus.scm
 @dirrm include/uim
 @dirrm lib/uim/plugin
 @dirrm lib/uim
 @unexec rmdir %D/share/applications 2>/dev/null || true
+%%GNOME%%@dirrm %%DATADIR%%/helperdata
 %%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/uim/tables
-@dirrm share/uim/pixmaps
-@dirrm share/uim
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
 %%GTK%%@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
 %%GTK%%@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules