From 6396ba1586aa6bdd535f3472c20300cb4fce17b5 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 30 Sep 2005 12:43:35 +0000
Subject: Update to 0.4.9.1, from Yamashiro Jun in PR 31427.

ChangeLog (extracted manually, probably incomplete):

0.4.9.1:
Security fix:
If you are using setuid/setgid application which is linked to libuim,
you have to upgrade uim.

0.4.9:
Memory leak and bug fixes.

0.4.8:
Bug fixes and updates for uim-anthy, uim-prime, uim-skk, and uim-romaja.

0.4.7:
Many bug fixes.
---
 inputmethod/uim/Makefile     | 4 ++--
 inputmethod/uim/PLIST.common | 9 ++++++++-
 inputmethod/uim/distinfo     | 8 ++++----
 inputmethod/uim/options.mk   | 6 +++++-
 4 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'inputmethod/uim')

diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 8a24b714b9f..f8cd3f161b6 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:18 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/09/30 12:43:35 wiz Exp $
 #
 
-DISTNAME=		uim-0.4.6
+DISTNAME=		uim-0.4.9.1
 CATEGORIES=		inputmethod
 MASTER_SITES=		http://uim.freedesktop.org/releases/
 
diff --git a/inputmethod/uim/PLIST.common b/inputmethod/uim/PLIST.common
index 23c866b2c05..261d6fdfc07 100644
--- a/inputmethod/uim/PLIST.common
+++ b/inputmethod/uim/PLIST.common
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST.common,v 1.2 2005/06/03 05:10:11 uebayasi Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2005/09/30 12:43:35 wiz Exp $
 bin/uim-fep
 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/libuim.la
 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/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
@@ -77,7 +80,9 @@ 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
@@ -93,6 +98,8 @@ 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
diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index be2b1bb8f33..f992b043d6d 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/03/29 18:47:52 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/09/30 12:43:35 wiz Exp $
 
-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.9.1.tar.gz) = 9037499c47187aeee758ee2bfd60ba9d7d4f40ec
+RMD160 (uim-0.4.9.1.tar.gz) = a610157a3aabdd9c1f35718fd8dddce27ffc8831
+Size (uim-0.4.9.1.tar.gz) = 1602849 bytes
diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk
index 93002727b3c..c58193ae7bc 100644
--- a/inputmethod/uim/options.mk
+++ b/inputmethod/uim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2005/06/03 10:25:38 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2005/09/30 12:43:35 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.uim
 PKG_SUPPORTED_OPTIONS=	anthy canna eb gtk qt
@@ -13,6 +13,8 @@ PKG_OPTIONS_LEGACY_VARS+=	UIM_USE_QT:qt
 .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 @@ CONFIGURE_ARGS+=	--without-eb
 .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)
-- 
cgit v1.2.3