>Number:         31061
>Category:       pkg
>Synopsis:       update inputmethod/uim to uim-0.4.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Aug 24 18:16:00 +0000 2005
>Originator:     Yamashiro Jun
>Release:        NetBSD 3.99.7
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun.mydomain 3.99.7 NetBSD 3.99.7 (YAMAJUN) #1: Sat Jul 30 16:50:31 JST 2005  yamajun@yamajun.mydomain:/usr/obj/sys/arch/i386/compile/YAMAJUN i386
>Description:
Update to uim-0.4.8 
>How-To-Repeat:

>Fix:
Apply this patch to pkgsrc/inputmethod/uim .

diff -bru uim.orig/Makefile uim/Makefile
--- uim.orig/Makefile	2005-08-13 02:11:24.000000000 +0900
+++ uim/Makefile	2005-08-25 02:52:33.000000000 +0900
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.12 2005/08/10 20:56:18 jlam Exp $
 #
 
-DISTNAME=		uim-0.4.6
+DISTNAME=		uim-0.4.8
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.freedesktop.org/releases/
 
diff -bru uim.orig/PLIST.common uim/PLIST.common
--- uim.orig/PLIST.common	2005-06-12 22:26:01.000000000 +0900
+++ uim/PLIST.common	2005-08-25 02:51:33.000000000 +0900
@@ -3,6 +3,7 @@
 bin/uim-fep-tick
 bin/uim-helper-server
 bin/uim-input-pad-ja
+bin/uim-module-manager
 bin/uim-sh
 bin/uim-xim
 include/uim/plugin.h
@@ -18,6 +19,7 @@
 lib/pkgconfig/uim.pc
 lib/uim/plugin/libuim-custom-enabler.la
 lib/uim/plugin/libuim-skk.la
+man/man1/uim-xim.1
 share/applications/uim.desktop
 share/doc/uim/HELPER-CANDWIN
 share/doc/uim/HELPER-PROTOCOL
@@ -69,6 +71,7 @@
 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
@@ -77,7 +80,9 @@
 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
@@ -93,6 +98,8 @@
 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
diff -bru uim.orig/buildlink3.mk uim/buildlink3.mk
--- uim.orig/buildlink3.mk	2005-03-30 03:47:52.000000000 +0900
+++ uim/buildlink3.mk	2005-08-25 02:52:41.000000000 +0900
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2005/03/29 18:47:52 wiz Exp $
+# $NetBSD$
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 UIM_BUILDLINK3_MK:=	${UIM_BUILDLINK3_MK}+
diff -bru uim.orig/distinfo uim/distinfo
--- uim.orig/distinfo	2005-03-31 14:02:10.000000000 +0900
+++ uim/distinfo	2005-08-25 02:51:33.000000000 +0900
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/03/29 18:47:52 wiz Exp $
+$NetBSD$
 
-SHA1 (uim-0.4.6.tar.gz) = 34cfe11c88817a39913d3fc66adb90ec86f75f2c
-RMD160 (uim-0.4.6.tar.gz) = 258266aac3d0fe0b876f0345543d01c8ae21e0af
-Size (uim-0.4.6.tar.gz) = 1467039 bytes
+SHA1 (uim-0.4.8.tar.gz) = aaaa5b63aa3f76b7c5cabfd80245f34d678c67db
+RMD160 (uim-0.4.8.tar.gz) = c0883027306ea1f21e1a78593b1b626151ad94a1
+Size (uim-0.4.8.tar.gz) = 1600984 bytes
diff -bru uim.orig/options.mk uim/options.mk
--- uim.orig/options.mk	2005-06-12 22:26:02.000000000 +0900
+++ uim/options.mk	2005-08-25 02:51:33.000000000 +0900
@@ -13,6 +13,8 @@
 .if !empty(PKG_OPTIONS:Manthy)
 .include "../../inputmethod/anthy/buildlink3.mk"
 PLIST_SRC+=		PLIST.anthy
+.else
+CONFIGURE_ARGS+=	--without-anthy
 .endif
 
 .if !empty(PKG_OPTIONS:Mcanna)
@@ -30,6 +32,8 @@
 .if !empty(PKG_OPTIONS:Mgtk)
 .include "../../x11/gtk2/modules.mk"
 PLIST_SRC+=		PLIST.gtk
+.else
+CONFIGURE_ARGS+=	--without-gtk2
 .endif
 
 .if !empty(PKG_OPTIONS:Mqt)