- Update to 0.4.6.

- Don't make ${X11BASE}/lib/gtk-2.0/2.4.0/immodules directory if gtk2
  isn't installed. [1]
- Add WITH_SCIM and WITH_CANNA knobs.
- This update also includes the security fix for libuim privilege escalation
  problelm. [2]

Security:	CAN-2005-0503
Security:	http://lists.freedesktop.org/pipermail/uim/2005-February/000996.html
Security:	setuid programs linked against libuim cause privilege escalation.
Reported by:	pointyhat via kris and krion [1], nectar [2]

3 files changed, 65 insertions, 15 deletions

diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index 9c3369e3a3aa..03d20bb578bb 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	uim
-PORTVERSION=	0.4.5
+PORTVERSION=	0.4.6
 CATEGORIES=	japanese x11
-MASTER_SITES=	http://xem.jp/~tkng/
-#		http://freedesktop.org/Software/UimDownload/
+MASTER_SITES=	http://uim.freedesktop.org/releases/
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Input method library
@@ -17,8 +16,6 @@ COMMENT=	Input method library
 LIB_DEPENDS=	anthy.1:${PORTSDIR}/japanese/anthy \
 		m17n.1:${PORTSDIR}/devel/m17n-lib
 
-BROKEN=		Incomplete pkg-plist
-
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_PERL5_BUILD=yes
@@ -30,7 +27,6 @@ USE_ICONV=	yes
 USE_INC_LIBTOOL_VER=13
 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}/,,}"
 
@@ -50,6 +46,21 @@ PLIST_SUB+=	GNOME=""
 PLIST_SUB+=	GNOME="@comment "
 .endif
 
+.if exists(${X11BASE}/bin/scim) || defined(WITH_SCIM)
+LIB_DEPENDS=	scim-1.0.5:${PORTSDIR}/textproc/scim
+PLIST_SUB+=	SCIM=""
+.else
+PLIST_SUB+=	SCIM="@comment "
+.endif
+
+.if exists(${LOCALBASE}/sbin/cannaserver) || defined(WITH_CANNA)
+LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
+CONFIGURE_ARGS+=--with-canna
+PLIST_SUB+=	CANNA=""
+.else
+PLIST_SUB+=	CANNA="@comment "
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's,/usr,${LOCALBASE},' ${WRKSRC}/scm/skk.scm ${WRKSRC}/scm/custom.scm
 
diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo
index 47d01760d2d3..199bd328f50b 100644
--- a/textproc/uim/distinfo
+++ b/textproc/uim/distinfo
@@ -1,2 +1,2 @@
-MD5 (uim-0.4.5.tar.gz) = 3979e20d8375fcd1691d74949e5b626c
-SIZE (uim-0.4.5.tar.gz) = 1112696
+MD5 (uim-0.4.6.tar.gz) = a61636b7eb4cab6c09eb3d661d1d7db4
+SIZE (uim-0.4.6.tar.gz) = 1467039
diff --git a/textproc/uim/pkg-plist b/textproc/uim/pkg-plist
index 7544e1ccfe57..88a6a0edfbae 100644
--- a/textproc/uim/pkg-plist
+++ b/textproc/uim/pkg-plist
@@ -6,11 +6,15 @@ bin/uim-sh
 %%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%%bin/uim-im-switcher-gtk
 %%GTK%%bin/uim-input-pad-ja
+%%GTK%%bin/uim-pref-gtk
 %%GTK%%bin/uim-toolbar-gtk
 %%GTK%%bin/uim-toolbar-gtk-systray
 bin/uim-xim
+include/uim/plugin.h
+include/uim/uim-compat-scm.h
+include/uim/uim-custom.h
 include/uim/uim-helper.h
 include/uim/uim-im-switcher.h
 include/uim/uim-scm.h
@@ -18,45 +22,75 @@ include/uim/uim-util.h
 include/uim/uim.h
 %%GNOME%%libdata/bonobo/servers/GNOME_UimApplet.server
 %%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.a
 lib/libuim.so
 lib/libuim.so.0
+lib/uim/plugin/libuim-anthy.so
+%%CANNA%%lib/uim/plugin/libuim-canna.so
+lib/uim/plugin/libuim-custom-enabler.so
+%%SCIM%%lib/uim/plugin/libuim-scim.so
+lib/uim/plugin/libuim-skk.so
 libdata/pkgconfig/uim.pc
 %%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/default-im.scm
-share/uim/generic-key.scm
+share/uim/direct.scm
+share/uim/generic-custom.scm
+share/uim/generic-key-custom.scm
 share/uim/generic.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
-share/uim/hk.scm
 share/uim/i18n.scm
-share/uim/icons/alphabet_a.png
+share/uim/im-custom.scm
 share/uim/im.scm
-share/uim/ipa.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/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/skk-custom.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
@@ -66,16 +100,21 @@ 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-sh.scm
+share/uim/ustr.scm
 share/uim/util.scm
 share/uim/viqr.scm
 share/uim/zaurus.scm
 @dirrm include/uim
+@dirrm lib/uim/plugin
+@dirrm lib/uim
+@unexec rmdir %D/share/applications 2>/dev/null || true
 %%PORTDOCS%%@dirrm %%DOCSDIR_JA%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm share/uim/tables
-@dirrm share/uim/icons
+@dirrm share/uim/pixmaps
 @dirrm share/uim
 %%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