- Update to 1.4.1.

- Update WWW entry in pkg-descr.

26 files changed, 182 insertions, 80 deletions

diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 6d16e5517791..e972e7f39c34 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	uim-el
-PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	textproc
-MASTER_SITES=	http://uim.freedesktop.org/releases/
+MASTER_SITES=	http://uim.googlecode.com/files/ \
+		http://uim.freedesktop.org/releases/uim/stable/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	uim-${PORTVERSION}
 
@@ -31,7 +31,8 @@ BUILD_WRKSRC=	${WRKSRC}/emacs
 INSTALL_WRKSRC=	${WRKSRC}/emacs
 
 CONFIGURE_ARGS?=--enable-emacs --with-lispdir=${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}
-CONFIGURE_ENV=	EMACS=${EMACS_CMD}
+CONFIGURE_ENV=	EMACS="${EMACS_CMD}" CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LIBS="${LIBS} -L${LOCALBASE}/lib"
 
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim-el
 PLIST_SUB+=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo
index 575e16c35744..2d120f98144e 100644
--- a/textproc/uim-el/distinfo
+++ b/textproc/uim-el/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.3.1.tar.gz) = 6b90d3247cb9244701db59941a4e1f09
-SHA256 (uim-1.3.1.tar.gz) = 12943eddc9131a82c512620af00dc8c1d8e33570b914a8a07227573d603aa513
-SIZE (uim-1.3.1.tar.gz) = 2186681
+MD5 (uim-1.4.1.tar.gz) = 69c9882f88c8eaebcc9bf22370fb3f1a
+SHA256 (uim-1.4.1.tar.gz) = 14e5df46f4536a4bfffb80bcd168bc8649bb2562f059edd6369a92ac380ec752
+SIZE (uim-1.4.1.tar.gz) = 3564166
diff --git a/textproc/uim-el/files/patch-sigscheme_configure b/textproc/uim-el/files/patch-sigscheme_configure
new file mode 100644
index 000000000000..149b508b56ea
--- /dev/null
+++ b/textproc/uim-el/files/patch-sigscheme_configure
@@ -0,0 +1,13 @@
+--- sigscheme/configure.orig	2007-09-25 00:33:59.000000000 +0900
++++ sigscheme/configure	2007-09-25 00:34:05.000000000 +0900
+@@ -44974,7 +44974,9 @@
+   _ax_feature_list_expanded=''
+   for feature in $ax_feature_list_all; do
+     _ax_feature_val=`eval echo '${'use_$feature'}'`
+-    _ax_feature_val=${_ax_feature_val:no}
++    if test -z $_ax_feature_val; then
++      _ax_feature_val=no
++    fi
+     if test "x$_ax_feature_val" != xno; then
+       _ax_feature_list_expanded="$_ax_feature_list_expanded $feature"
+     fi
diff --git a/textproc/uim-el/pkg-descr b/textproc/uim-el/pkg-descr
index 746182bd7689..c95d028310e8 100644
--- a/textproc/uim-el/pkg-descr
+++ b/textproc/uim-el/pkg-descr
@@ -10,4 +10,4 @@ And currently it supports following input methods.
 
 This port installs Emacs lisp files for uim.
 
-WWW: http://uim.freedesktop.org/wiki/
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim-gnome/Makefile b/textproc/uim-gnome/Makefile
index 927546afb6f2..6f44a3407318 100644
--- a/textproc/uim-gnome/Makefile
+++ b/textproc/uim-gnome/Makefile
@@ -10,12 +10,12 @@ PKGNAMESUFFIX=	-gnome
 COMMENT=	GNOME applets of uim input method
 
 USE_GNOME=	gtk20 gnomepanel
-LIB_DEPENDS=	uim.4:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	uim-pref-gtk:${PORTSDIR}/textproc/uim-gtk
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
-CONFIGURE_ARGS=	--with-gtk2 --with-gnome2 --enable-applet
+CONFIGURE_ARGS=	--with-gtk2 --enable-gnome-applet
 
 UIM_SLAVE=	yes
 
diff --git a/textproc/uim-gnome/pkg-descr b/textproc/uim-gnome/pkg-descr
index e37490054a55..ce50b062da4e 100644
--- a/textproc/uim-gnome/pkg-descr
+++ b/textproc/uim-gnome/pkg-descr
@@ -1,3 +1,3 @@
 GNOME applets of uim input method.
 
-WWW: http://uim.freedesktop.org/wiki/
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 6a64949c5e25..b68512fa5e27 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.4:${PORTSDIR}/textproc/uim
+LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim-gtk/pkg-descr b/textproc/uim-gtk/pkg-descr
index fc78ed82a9a0..6e510ecbdd65 100644
--- a/textproc/uim-gtk/pkg-descr
+++ b/textproc/uim-gtk/pkg-descr
@@ -1,3 +1,3 @@
 GTK+ modules of uim input method.
 
-WWW: http://uim.freedesktop.org/wiki/
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim-kde/Makefile b/textproc/uim-kde/Makefile
index 35ddaae1b792..838e8809db38 100644
--- a/textproc/uim-kde/Makefile
+++ b/textproc/uim-kde/Makefile
@@ -9,17 +9,17 @@ PKGNAMESUFFIX=	-kde
 
 COMMENT=	KDE panel applet of uim input method
 
-LIB_DEPENDS=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 \
-		uim.4:${PORTSDIR}/textproc/uim
-RUN_DEPENDS=	uim-pref-qt:${PORTSDIR}/textproc/uim-qt
-
 USE_KDELIBS_VER=3
+USE_QT_VER=	3
 USE_AUTOTOOLS=	libtool:15
 
+LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
+RUN_DEPENDS=	uim-pref-qt:${PORTSDIR}/textproc/uim-qt
+
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt --enable-pref --enable-default-toolkit=qt \
-		--enable-kde-applet=yes
+		--enable-kde-applet
 CONFIGURE_ENV=	QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
 		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		CXX="${CXX} -lc" \
@@ -28,14 +28,6 @@ CONFIGURE_ENV=	QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
 UIM_SLAVE=	yes
 
-# This is normally handled by defining USE_QT_VER ...
-
-.if defined(PACKAGE_BUILDING)
-TMPDIR?=	/tmp
-MAKE_ENV+=	TMPDIR="${TMPDIR}"
-CONFIGURE_ENV+=	TMPDIR="${TMPDIR}"
-.endif
-
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in
 
 .if defined(WITHOUT_X11)
@@ -43,7 +35,7 @@ IGNORE=		requires X11
 .endif
 
 do-build:
-	(cd ${WRKSRC}/qt && ${GMAKE} LIBTOOL=${WRKSRC}/libtool LIBS="-luim -luim-custom" uim_panelapplet.la)
+	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} LIBTOOL=${WRKSRC}/libtool LIBS="-luim -luim-custom" uim_panelapplet.la)
 
 do-install:
 	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install-appletLTLIBRARIES install-lnkDATA)
diff --git a/textproc/uim-kde/pkg-descr b/textproc/uim-kde/pkg-descr
index c92c3c50cda3..f07872eb5055 100644
--- a/textproc/uim-kde/pkg-descr
+++ b/textproc/uim-kde/pkg-descr
@@ -1,3 +1,3 @@
 KDE panel applet of uim input method.
 
-WWW: http://uim.freedesktop.org/wiki/
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim-m17nlib/Makefile b/textproc/uim-m17nlib/Makefile
index e5623a9f2af0..6bc733237ce2 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.1:${PORTSDIR}/devel/m17n-lib \
-		uim.4:${PORTSDIR}/textproc/uim
+		uim.5:${PORTSDIR}/textproc/uim
 RUN_DEPENDS=	m17n-db:${PORTSDIR}/devel/m17n-db
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
diff --git a/textproc/uim-m17nlib/pkg-descr b/textproc/uim-m17nlib/pkg-descr
index 9c1f1ed7eadf..9c6db5f0f7b0 100644
--- a/textproc/uim-m17nlib/pkg-descr
+++ b/textproc/uim-m17nlib/pkg-descr
@@ -1,3 +1,3 @@
 uim plugin using m17n library input method.
 
-WWW: http://uim.freedesktop.org/wiki/
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile
index 2b715a28c69f..5840a7c0841b 100644
--- a/textproc/uim-qt/Makefile
+++ b/textproc/uim-qt/Makefile
@@ -9,19 +9,15 @@ PKGNAMESUFFIX=	-qt
 
 COMMENT=	QT modules of uim input method
 
-LIB_DEPENDS=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33 \
-		uim.4:${PORTSDIR}/textproc/uim
-
-BROKEN=		fails to deinstall cleanly
-DEPRECATED=		"${BROKEN}"
-EXPIRATION_DATE=	2007-11-29
-
+USE_QT_VER=	3
 USE_AUTOTOOLS=	libtool:15
 
+LIB_DEPENDS=	uim.5:${PORTSDIR}/textproc/uim
+
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
 CONFIGURE_ARGS=	--with-qt --enable-pref --enable-default-toolkit=qt \
-		--enable-kde-applet=no
+		--disable-kde-applet
 CONFIGURE_ENV=	QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
 		CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
@@ -29,22 +25,15 @@ CONFIGURE_ENV=	QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
 UIM_SLAVE=	yes
 
-# This is normally handled by defining USE_QT_VER ...
-
-.if defined(PACKAGE_BUILDING)
-TMPDIR?=	/tmp
-MAKE_ENV+=	TMPDIR="${TMPDIR}"
-CONFIGURE_ENV+=	TMPDIR="${TMPDIR}"
-.endif
-
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-qt_Makefile.in \
+		${PATCHDIR}/extra-patch-qt_chardict_po_Makefile.in.in
 
 .if defined(WITHOUT_X11)
 IGNORE=		requires X11
 .endif
 
 do-build:
-	(cd ${WRKSRC}/qt && ${GMAKE} LIBTOOL=${WRKSRC}/libtool LIBS="-luim -luim-custom")
+	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} LIBS="-luim -luim-custom")
 
 do-install:
 	(cd ${WRKSRC}/qt && ${SETENV} ${MAKE_ENV} ${GMAKE} install)
diff --git a/textproc/uim-qt/pkg-descr b/textproc/uim-qt/pkg-descr
index e9317fc8a4cd..4ae941be8779 100644
--- a/textproc/uim-qt/pkg-descr
+++ b/textproc/uim-qt/pkg-descr
@@ -1,3 +1,3 @@
 QT modules of uim input method.
 
-WWW: http://uim.freedesktop.org/wiki/
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 5aeb268b249b..6e00797e8c20 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTVERSION=	1.4.1
 CATEGORIES?=	textproc
-MASTER_SITES=	http://uim.freedesktop.org/releases/
+MASTER_SITES=	http://uim.googlecode.com/files/ \
+		http://uim.freedesktop.org/releases/uim/stable/
 .if !defined(UIM_SLAVE) && defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 .endif
@@ -48,7 +48,9 @@ CONFIGURE_ENV?=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 MAN1=		uim-xim.1
 .endif
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/uim
-PLIST_SUB=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}"
+DOCSDIR_SIGSCHEME=	${PREFIX}/share/doc/uim/sigscheme
+PLIST_SUB=	DOCSDIR_JA="${DOCSDIR_JA:S,^${PREFIX}/,,}" \
+		DOCSDIR_SIGSCHEME="${DOCSDIR_SIGSCHEME:S,^${PREFIX}/,,}"
 .endif
 
 .if defined(WITHOUT_X11)
@@ -59,21 +61,23 @@ PLIST_SUB+=	X11=""
 
 .include <bsd.port.pre.mk>
 
-.for _x in x xft gtk2 qt gnome2 anthy canna m17nlib prime scim dict
+.for _x in x xft gtk2 qt anthy canna m17nlib prime scim dict
 .if ${CONFIGURE_ARGS:M--with-${_x}} == ""
 CONFIGURE_ARGS+=--without-${_x}
 .endif
 .endfor
-.if ${CONFIGURE_ARGS:M--enable-applet} == ""
-CONFIGURE_ARGS+=--disable-applet
+.for _x in gnome kde
+.if ${CONFIGURE_ARGS:M--enable-${_x}-applet} == ""
+CONFIGURE_ARGS+=--disable-${_x}-applet
 .endif
+.endfor
 
 post-patch:
 	${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/scm/skk-custom.scm
 
 do-build:
 .if !defined(UIM_SLAVE)
-.for d in replace uim scm xim po fep emacs pixmaps
+.for d in replace sigscheme uim scm xim po fep emacs pixmaps
 	cd ${WRKSRC}/${d} && ${GMAKE}
 .endfor
 	cd ${WRKSRC}/helper && ${GMAKE}
@@ -82,7 +86,7 @@ do-build:
 do-install:
 .if !defined(UIM_SLAVE)
 	cd ${WRKSRC} && ${GMAKE} install-data-am
-.for d in uim scm xim po fep emacs pixmaps
+.for d in sigscheme uim scm xim po fep emacs pixmaps
 	cd ${WRKSRC}/${d} && ${GMAKE} install
 .endfor
 	cd ${WRKSRC}/helper && ${GMAKE} install-libexecPROGRAMS
@@ -95,6 +99,7 @@ post-install:
 	${MKDIR} ${DOCSDIR_JA}
 	${INSTALL_DATA} ${WRKSRC}/doc/KEY ${DOCSDIR}/KEY
 	${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.fep
+	${INSTALL_DATA} ${WRKSRC}/fep/README ${DOCSDIR}/README.key
 	${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DOCSDIR_JA}/README.fep
 	${INSTALL_DATA} ${WRKSRC}/xim/README ${DOCSDIR}/README.xim
 .endif
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 575e16c35744..2d120f98144e 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,3 +1,3 @@
-MD5 (uim-1.3.1.tar.gz) = 6b90d3247cb9244701db59941a4e1f09
-SHA256 (uim-1.3.1.tar.gz) = 12943eddc9131a82c512620af00dc8c1d8e33570b914a8a07227573d603aa513
-SIZE (uim-1.3.1.tar.gz) = 2186681
+MD5 (uim-1.4.1.tar.gz) = 69c9882f88c8eaebcc9bf22370fb3f1a
+SHA256 (uim-1.4.1.tar.gz) = 14e5df46f4536a4bfffb80bcd168bc8649bb2562f059edd6369a92ac380ec752
+SIZE (uim-1.4.1.tar.gz) = 3564166
diff --git a/textproc/uim/files/extra-patch-qt_chardict_po_Makefile.in.in b/textproc/uim/files/extra-patch-qt_chardict_po_Makefile.in.in
new file mode 100644
index 000000000000..3c6c678e68df
--- /dev/null
+++ b/textproc/uim/files/extra-patch-qt_chardict_po_Makefile.in.in
@@ -0,0 +1,11 @@
+--- qt/chardict/po/Makefile.in.in.orig	2007-09-25 23:38:28.000000000 +0900
++++ qt/chardict/po/Makefile.in.in	2007-09-25 23:39:06.000000000 +0900
+@@ -33,7 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
++DATADIRNAME = share
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+ subdir = po
+ install_sh = @install_sh@
diff --git a/textproc/uim/files/extra-patch-uim_Makefile.in b/textproc/uim/files/extra-patch-uim_Makefile.in
index 2157084d0a27..eb419babcd6c 100644
--- a/textproc/uim/files/extra-patch-uim_Makefile.in
+++ b/textproc/uim/files/extra-patch-uim_Makefile.in
@@ -1,6 +1,6 @@
---- uim/Makefile.in.orig	Wed Jan  3 21:08:38 2007
-+++ uim/Makefile.in	Wed Jan  3 21:16:23 2007
-@@ -85,8 +85,6 @@
+--- uim/Makefile.in.orig	2007-03-15 05:37:42.000000000 +0900
++++ uim/Makefile.in	2007-09-25 22:15:09.000000000 +0900
+@@ -86,8 +86,6 @@
  libLTLIBRARIES_INSTALL = $(INSTALL)
  uim_pluginLTLIBRARIES_INSTALL = $(INSTALL)
  LTLIBRARIES = $(lib_LTLIBRARIES) $(uim_plugin_LTLIBRARIES)
@@ -9,7 +9,7 @@
  am__libuim_anthy_la_SOURCES_DIST = anthy.c
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_OBJECTS = libuim_anthy_la-anthy.lo
  libuim_anthy_la_OBJECTS = $(am_libuim_anthy_la_OBJECTS)
-@@ -95,7 +93,6 @@
+@@ -96,7 +94,6 @@
  	$(libuim_anthy_la_LDFLAGS) $(LDFLAGS) -o $@
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@am_libuim_anthy_la_rpath =  \
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@	-rpath $(uim_plugindir)
@@ -17,7 +17,7 @@
  am__libuim_canna_la_SOURCES_DIST = canna.c
  @CANNA_TRUE@am_libuim_canna_la_OBJECTS = libuim_canna_la-canna.lo
  libuim_canna_la_OBJECTS = $(am_libuim_canna_la_OBJECTS)
-@@ -117,7 +114,6 @@
+@@ -118,7 +115,6 @@
  libuim_custom_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libuim_custom_la_LDFLAGS) $(LDFLAGS) -o $@
@@ -25,7 +25,7 @@
  am__libuim_m17nlib_la_SOURCES_DIST = m17nlib.c
  @M17NLIB_TRUE@am_libuim_m17nlib_la_OBJECTS =  \
  @M17NLIB_TRUE@	libuim_m17nlib_la-m17nlib.lo
-@@ -126,7 +122,6 @@
+@@ -127,7 +123,6 @@
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libuim_m17nlib_la_LDFLAGS) $(LDFLAGS) -o $@
  @M17NLIB_TRUE@am_libuim_m17nlib_la_rpath = -rpath $(uim_plugindir)
@@ -33,7 +33,7 @@
  am__libuim_mana_la_SOURCES_DIST = mana.c
  @MANA_TRUE@am_libuim_mana_la_OBJECTS = libuim_mana_la-mana.lo
  libuim_mana_la_OBJECTS = $(am_libuim_mana_la_OBJECTS)
-@@ -134,7 +129,6 @@
+@@ -135,7 +130,6 @@
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libuim_mana_la_LDFLAGS) $(LDFLAGS) -o $@
  @MANA_TRUE@am_libuim_mana_la_rpath = -rpath $(uim_plugindir)
@@ -41,7 +41,7 @@
  am__libuim_prime_la_SOURCES_DIST = prime.c
  @PRIME_TRUE@am_libuim_prime_la_OBJECTS = libuim_prime_la-prime.lo
  libuim_prime_la_OBJECTS = $(am_libuim_prime_la_OBJECTS)
-@@ -142,7 +136,6 @@
+@@ -143,7 +137,6 @@
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(libuim_prime_la_LDFLAGS) $(LDFLAGS) -o $@
  @PRIME_TRUE@am_libuim_prime_la_rpath = -rpath $(uim_plugindir)
@@ -49,14 +49,14 @@
  am__libuim_scim_la_SOURCES_DIST = scim.cpp
  @SCIM_TRUE@am_libuim_scim_la_OBJECTS = libuim_scim_la-scim.lo
  libuim_scim_la_OBJECTS = $(am_libuim_scim_la_OBJECTS)
-@@ -494,27 +487,27 @@
- 	$(am__append_5)
+@@ -497,27 +490,27 @@
+ 	uim-helper-client.c intl.c uim-ipc.c plugin.c $(am__append_5)
  libuim_custom_la_SOURCES = uim-custom.c
  @M17NLIB_TRUE@libuim_m17nlib_la_SOURCES = m17nlib.c
 -@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim.la
 +@M17NLIB_TRUE@libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim
  @M17NLIB_TRUE@libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
- @M17NLIB_TRUE@libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir)
+ @M17NLIB_TRUE@libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@
  @SCIM_TRUE@libuim_scim_la_SOURCES = scim.cpp
 -@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ libuim.la
 +@SCIM_TRUE@libuim_scim_la_LIBADD = @SCIM_LIBS@ -luim
@@ -64,7 +64,7 @@
  @SCIM_TRUE@libuim_scim_la_CXXFLAGS = -I$(top_srcdir) @SCIM_CFLAGS@
  @CANNA_TRUE@libuim_canna_la_SOURCES = canna.c
 -@CANNA_TRUE@libuim_canna_la_LIBADD = libuim.la -lcanna
-+@CANNA_TRUE@libuim_canna_la_LIBADD = -lcanna -luim
++@CANNA_TRUE@libuim_canna_la_LIBADD = -luim -lcanna
  @CANNA_TRUE@libuim_canna_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
  @CANNA_TRUE@libuim_canna_la_CPPFLAGS = -I$(top_srcdir)
  @ANTHY_TRUE@@ENABLE_ANTHY_STATIC_FALSE@libuim_anthy_la_SOURCES = anthy.c
diff --git a/textproc/uim/files/patch-Makefile.in b/textproc/uim/files/patch-Makefile.in
index c7c93b8da70e..f7281bebff4b 100644
--- a/textproc/uim/files/patch-Makefile.in
+++ b/textproc/uim/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- 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
+--- Makefile.in.orig	2007-03-15 05:37:43.000000000 +0900
++++ Makefile.in	2007-09-25 00:15:31.000000000 +0900
+@@ -316,7 +316,7 @@
+ 	uim.pc.in uim.desktop uim.spec.in uim.spec \
+ 	intltool-extract.in intltool-merge.in intltool-update.in
  
- DISTCLEANFILES = uim.pc intltool-extract intltool-merge intltool-update po/.intltool-merge-cache
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = uim.pc
diff --git a/textproc/uim/files/patch-po_Makefile.in.in b/textproc/uim/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..f46b94abb208
--- /dev/null
+++ b/textproc/uim/files/patch-po_Makefile.in.in
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig	2007-09-25 01:35:53.000000000 +0900
++++ po/Makefile.in.in	2007-09-25 01:36:59.000000000 +0900
+@@ -33,7 +33,7 @@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ libdir = @libdir@
+-DATADIRNAME = @DATADIRNAME@
++DATADIRNAME = share
+ itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+ subdir = po
+ install_sh = @install_sh@
diff --git a/textproc/uim/files/patch-sigscheme_Makefile.in b/textproc/uim/files/patch-sigscheme_Makefile.in
new file mode 100644
index 000000000000..dac3250269f3
--- /dev/null
+++ b/textproc/uim/files/patch-sigscheme_Makefile.in
@@ -0,0 +1,11 @@
+--- sigscheme/Makefile.in.orig	2007-09-25 01:30:22.000000000 +0900
++++ sigscheme/Makefile.in	2007-09-25 01:30:56.000000000 +0900
+@@ -282,7 +282,7 @@
+         compare-scm.sh runbench.sh runtest.sh runtest-tail-rec.sh \
+         make-report.sh make-dist.sh
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = sigscheme.pc
+ DISTCLEANFILES = sigscheme.pc tools/gnuify-changelog.pl $(DIST_SUM_LIST)
+ all: all-recursive
diff --git a/textproc/uim/files/patch-sigscheme_configure b/textproc/uim/files/patch-sigscheme_configure
new file mode 100644
index 000000000000..149b508b56ea
--- /dev/null
+++ b/textproc/uim/files/patch-sigscheme_configure
@@ -0,0 +1,13 @@
+--- sigscheme/configure.orig	2007-09-25 00:33:59.000000000 +0900
++++ sigscheme/configure	2007-09-25 00:34:05.000000000 +0900
+@@ -44974,7 +44974,9 @@
+   _ax_feature_list_expanded=''
+   for feature in $ax_feature_list_all; do
+     _ax_feature_val=`eval echo '${'use_$feature'}'`
+-    _ax_feature_val=${_ax_feature_val:no}
++    if test -z $_ax_feature_val; then
++      _ax_feature_val=no
++    fi
+     if test "x$_ax_feature_val" != xno; then
+       _ax_feature_list_expanded="$_ax_feature_list_expanded $feature"
+     fi
diff --git a/textproc/uim/files/patch-sigscheme_doc_Makefile.in b/textproc/uim/files/patch-sigscheme_doc_Makefile.in
new file mode 100644
index 000000000000..46c9c30d01b4
--- /dev/null
+++ b/textproc/uim/files/patch-sigscheme_doc_Makefile.in
@@ -0,0 +1,11 @@
+--- sigscheme/doc/Makefile.in.orig	2007-09-25 01:31:53.000000000 +0900
++++ sigscheme/doc/Makefile.in	2007-09-25 01:33:45.000000000 +0900
+@@ -151,7 +151,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = @docdir@
++docdir = $(prefix)/share/doc/uim/sigscheme
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
diff --git a/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in b/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
new file mode 100644
index 000000000000..bbdc4069ecd5
--- /dev/null
+++ b/textproc/uim/files/patch-sigscheme_libgcroots_Makefile.in
@@ -0,0 +1,11 @@
+--- sigscheme/libgcroots/Makefile.in.orig	2007-09-25 01:58:25.000000000 +0900
++++ sigscheme/libgcroots/Makefile.in	2007-09-25 01:59:00.000000000 +0900
+@@ -345,7 +345,7 @@
+ 	include/gc_config_macros.h include/private/gc_hdrs.h \
+ 	include/private/gc_locks.h include/private/gc_priv.h \
+ 	include/private/gcconfig.h
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = gcroots.pc
+ libgcroots_la_SOURCES = mark.c gcroots.c
+ 
diff --git a/textproc/uim/pkg-descr b/textproc/uim/pkg-descr
index a5e56fffbdd5..38176f4b36f7 100644
--- a/textproc/uim/pkg-descr
+++ b/textproc/uim/pkg-descr
@@ -6,4 +6,4 @@ And currently it supports following input methods.
   Japanese:   Anthy, Canna, Prime, SKK, T-code, TUT-code
   Korean:     Byeoru, Hangul (2-beol), Hangul (3-beol), Hangul (Romaja)
 
-WWW: http://uim.freedesktop.org/wiki/
+WWW: http://code.google.com/p/uim/
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index c058091fa777..2158cfaabf63 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -5,6 +5,15 @@ bin/uim-fep-tick
 bin/uim-module-manager
 bin/uim-sh
 %%X11%%bin/uim-xim
+include/gcroots.h
+include/sigscheme/config-old.h
+include/sigscheme/config.h
+include/sigscheme/encoding-dummy.h
+include/sigscheme/global.h
+include/sigscheme/scmint.h
+include/sigscheme/sigscheme.h
+include/sigscheme/storage-common.h
+include/sigscheme/storage-compact.h
 include/uim/plugin.h
 include/uim/uim-compat-scm.h
 include/uim/uim-custom.h
@@ -13,6 +22,10 @@ include/uim/uim-im-switcher.h
 include/uim/uim-scm.h
 include/uim/uim-util.h
 include/uim/uim.h
+lib/libgcroots.a
+lib/libgcroots.la
+lib/libgcroots.so
+lib/libgcroots.so.0
 lib/libuim-custom.a
 lib/libuim-custom.la
 lib/libuim-custom.so
@@ -20,13 +33,15 @@ lib/libuim-custom.so.2
 lib/libuim.a
 lib/libuim.la
 lib/libuim.so
-lib/libuim.so.4
+lib/libuim.so.5
 lib/uim/plugin/libuim-custom-enabler.a
 lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-custom-enabler.so
 lib/uim/plugin/libuim-skk.a
 lib/uim/plugin/libuim-skk.la
 lib/uim/plugin/libuim-skk.so
+libdata/pkgconfig/gcroots.pc
+libdata/pkgconfig/sigscheme.pc
 libdata/pkgconfig/uim.pc
 %%X11%%libexec/uim-candwin-gtk
 libexec/uim-helper-server
@@ -37,7 +52,24 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%PORTDOCS%%%%DOCSDIR_JA%%/README.fep
 %%PORTDOCS%%%%DOCSDIR%%/KEY
 %%PORTDOCS%%%%DOCSDIR%%/README.fep
+%%PORTDOCS%%%%DOCSDIR%%/README.key
 %%PORTDOCS%%%%DOCSDIR%%/README.xim
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/design.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/design.txt
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/gc-protection.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/gc-protection.txt
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/global-obj.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/global-obj.txt
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/index.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/index.txt
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/release.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/release.txt
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/spec.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/spec.txt
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/style.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/style.txt
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/test-c.html
+%%PORTDOCS%%%%DOCSDIR_SIGSCHEME%%/test-c.txt
 %%DATADIR%%/action.scm
 %%DATADIR%%/anthy-custom.scm
 %%DATADIR%%/anthy-key-custom.scm
@@ -193,11 +225,13 @@ share/locale/ko/LC_MESSAGES/uim.mo
 %%DATADIR%%/util.scm
 %%DATADIR%%/viqr.scm
 %%DATADIR%%/zaurus.scm
+@dirrm include/sigscheme
 @dirrm include/uim
 @dirrm lib/uim/plugin
 @dirrm lib/uim
 @dirrmtry share/applications
 %%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
+%%PORTDOCS%%@dirrm %%DOCSDIR_SIGSCHEME%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/helperdata
 @dirrm %%DATADIR%%/pixmaps