pkg/44989: inputmethod/uim, inputmethod/uim-elisp, devel/libgcroots: update to new version

[yamajun%ofug.net@localhost]

>Number:         44989
>Category:       pkg
>Synopsis:       inputmethod/uim, inputmethod/uim-elisp, devel/libgcroots: 
>update to new version
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 23 19:20:01 +0000 2011
>Originator:     YAMASHIRO, Jun
>Release:        NetBSD/amd64 5.99.48
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun 5.99.48 NetBSD 5.99.48 (YAMAJUN) #40: Fri Apr  8 10:52:42 JST 
2011  yamajun@local:/usr/src/sys/arch/amd64/compile/YAMAJUN amd64
>Description:
* Update libgcroots to 0.2.3 required by uim-1.7.0.
* Update UIM(and elisp) to 1.7.0.

Package ChangeLog:
* Add gtk3 option.

UIM ChangeLog:
What's New (in 1.7.0)
----------
 - Fix regression in Wubi86 and ZhengMa tables in 1.7.0-alpha

What's New in 1.7.0-alpha
-------------------------

 - GTK+3 bridge
 - GTK+3 and GNOME3 tools
 - Improved uim-tutcode
 - Generic completion support with Google Suggest


>How-To-Repeat:

>Fix:
How to fix inputmethod/uim:
Apply this patch at pkgsrc/inputmethod

diff -Nru uim.orig/Makefile uim/Makefile
--- uim.orig/Makefile   2011-04-26 11:37:55.000000000 +0900
+++ uim/Makefile        2011-05-19 13:55:48.000000000 +0900
@@ -3,7 +3,6 @@
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=           1
 COMMENT=               Multilingual input method library
 
 CONFLICTS+=            uim-qt4-immodule-[0-9]*
diff -Nru uim.orig/Makefile.common uim/Makefile.common
--- uim.orig/Makefile.common    2011-04-13 22:45:16.000000000 +0900
+++ uim/Makefile.common 2011-05-19 13:54:38.000000000 +0900
@@ -3,7 +3,7 @@
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=           1.6.1
+UIM_VERSION=           1.7.0
 DISTNAME=              uim-${UIM_VERSION}
 CATEGORIES=            inputmethod
 MASTER_SITES=          http://uim.googlecode.com/files/
diff -Nru uim.orig/PLIST uim/PLIST
--- uim.orig/PLIST      2011-04-13 22:45:16.000000000 +0900
+++ uim/PLIST   2011-05-19 13:51:19.000000000 +0900
@@ -2,21 +2,27 @@
 ${PLIST.qt3}bin/uim-chardict-qt
 ${PLIST.qt}bin/uim-chardict-qt4
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
+${PLIST.uim-dict-gtk3}bin/uim-dict-gtk3
 ${PLIST.fep}bin/uim-fep
 ${PLIST.fep}bin/uim-fep-tick
 bin/uim-help
 ${PLIST.gtk}bin/uim-im-switcher-gtk
+${PLIST.gtk3}bin/uim-im-switcher-gtk3
 ${PLIST.qt3}bin/uim-im-switcher-qt
 ${PLIST.qt}bin/uim-im-switcher-qt4
 ${PLIST.gtk}bin/uim-input-pad-ja
+${PLIST.gtk3}bin/uim-input-pad-ja-gtk3
 ${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
 bin/uim-module-manager
 ${PLIST.gtk}bin/uim-pref-gtk
+${PLIST.gtk3}bin/uim-pref-gtk3
 ${PLIST.qt3}bin/uim-pref-qt
 ${PLIST.qt}bin/uim-pref-qt4
 bin/uim-sh
 ${PLIST.gtk}bin/uim-toolbar-gtk
 ${PLIST.gtk}bin/uim-toolbar-gtk-systray
+${PLIST.gtk3}bin/uim-toolbar-gtk3
+${PLIST.gtk3}bin/uim-toolbar-gtk3-systray
 ${PLIST.qt3}bin/uim-toolbar-qt
 ${PLIST.qt}bin/uim-toolbar-qt4
 ${PLIST.xim}bin/uim-xim
@@ -32,6 +38,7 @@
 include/uim/uim.h
 ${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
 ${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
+${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-uim.la
 ${PLIST.kde3}lib/kde3/uim_panelapplet.la
 ${PLIST.kde}lib/kde4/uim_panelapplet.la
 lib/libuim-custom.la
@@ -57,11 +64,14 @@
 lib/uim/plugin/libuim-socket.la
 ${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
 ${PLIST.gtk}libexec/uim-candwin-gtk
+${PLIST.gtk3}libexec/uim-candwin-gtk3
 ${PLIST.qt3}libexec/uim-candwin-qt
 ${PLIST.qt}libexec/uim-candwin-qt4
 ${PLIST.gtk}libexec/uim-candwin-tbl-gtk
+${PLIST.gtk3}libexec/uim-candwin-tbl-gtk3
 libexec/uim-helper-server
 ${PLIST.gnome}libexec/uim-toolbar-applet
+${PLIST.gnome3}libexec/uim-toolbar-applet-gnome3
 ${PLIST.xim}man/man1/uim-xim.1
 ${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la
 share/applications/uim.desktop
@@ -129,7 +139,7 @@
 share/uim/hangul2.scm
 share/uim/hangul3.scm
 ${PLIST.helperdata}share/uim/helperdata/bushu.t
-${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml
+${PLIST.uim-dict-helperdata}share/uim/helperdata/uim-dict-ui.xml
 share/uim/http-client.scm
 share/uim/http-server.scm
 share/uim/i18n.scm
diff -Nru uim.orig/distinfo uim/distinfo
--- uim.orig/distinfo   2011-04-13 22:45:16.000000000 +0900
+++ uim/distinfo        2011-05-19 13:51:19.000000000 +0900
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.18 2011/04/13 13:45:16 obache Exp $
 
-SHA1 (uim-1.6.1.tar.bz2) = 412bb2df6041185084e2f64fb73357389bf992b5
-RMD160 (uim-1.6.1.tar.bz2) = 26c4e30f59c8eb005189d6778333079c81f8489c
-Size (uim-1.6.1.tar.bz2) = 6192431 bytes
+SHA1 (uim-1.7.0.tar.bz2) = b79ed80c2557e804e6d3d2771a213a29cd932a73
+RMD160 (uim-1.7.0.tar.bz2) = e866f4270e60d0590a0a37331f3ccf64d7e48fbf
+Size (uim-1.7.0.tar.bz2) = 6402469 bytes
 SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5
 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
diff -Nru uim.orig/options.mk uim/options.mk
--- uim.orig/options.mk 2011-04-13 22:45:16.000000000 +0900
+++ uim/options.mk      2011-05-19 13:57:11.000000000 +0900
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.23 2011/04/13 13:45:16 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uim
-#PKG_SUPPORTED_OPTIONS=        anthy canna curl eb expat ffi gnome gtk m17nlib 
openssl prime sj3 sqlite uim-fep wnn xim
-PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gtk m17nlib openssl 
prime sj3 sqlite uim-fep xim
+#PKG_SUPPORTED_OPTIONS=        anthy canna curl eb expat ffi gnome gnome3 gtk 
gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn xim
+PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 
m17nlib openssl prime sj3 sqlite uim-fep xim
 PKG_OPTIONS_OPTIONAL_GROUPS=   kde qt
 PKG_OPTIONS_GROUP.kde= kde kde3
 PKG_OPTIONS_GROUP.qt=  qt qt3
@@ -21,8 +21,8 @@
 .  endif
 .endif
 
-PLIST_VARS+=           helperdata uim-dict-gtk fep
-PLIST_VARS+=           anthy curl eb expat ffi gnome gtk kde kde3 m17nlib 
openssl qt qt3 sqlite wnn xim
+PLIST_VARS+=           helperdata uim-dict-gtk uim-dict-gtk3 
uim-dict-helperdata fep
+PLIST_VARS+=           anthy curl eb expat ffi gnome gnome3 gtk gtk3 kde kde3 
m17nlib openssl qt qt3 sqlite wnn xim
 
 .if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libX11/buildlink3.mk"
@@ -100,6 +100,14 @@
 CONFIGURE_ARGS+=       --disable-gnome-applet
 .endif
 
+# No gnome3 packages
+#.if !empty(PKG_OPTIONS:Mgnome3)
+#.  include "../../x11/gnome-panel/buildlink3.mk"
+#.  include "../../devel/libgnomeui/buildlink3.mk"
+#CONFIGURE_ARGS+=      --enable-gnome3-applet
+#PLIST.gnome3=         yes
+#.endif
+
 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
 GTK2_IMMODULES=                YES
 .include "../../x11/gtk2/modules.mk"
@@ -110,11 +118,27 @@
 .    endif
 CONFIGURE_ARGS+=       --enable-dict
 PLIST.uim-dict-gtk=    yes
+PLIST.uim-dict-helperdata=     yes
 .  endif
 .else
 CONFIGURE_ARGS+=       --without-gtk2
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
+GTK3_IMMODULES=                YES
+.include "../../x11/gtk3/modules.mk"
+PLIST.gtk3=            yes
+CONFIGURE_ARGS+=       --with-gtk3
+.  if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna)
+.    if !empty(PKG_OPTIONS:Mcanna)
+.      include "../../inputmethod/canna-lib/buildlink3.mk"
+.    endif
+CONFIGURE_ARGS+=       --enable-dict
+PLIST.uim-dict-gtk3=   yes
+PLIST.uim-dict-helperdata=     yes
+.  endif
+.endif
+
 .if !empty(PKG_OPTIONS:Mkde3)
 .  include "../../x11/kdelibs3/buildlink3.mk"
 .  include "../../x11/qt3-libs/buildlink3.mk"
@@ -191,6 +215,8 @@
 
 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
 CONFIGURE_ARGS+=       --enable-default-toolkit=gtk
+.elif !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
+CONFIGURE_ARGS+=       --enable-default-toolkit=gtk3
 .elif !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
 CONFIGURE_ARGS+=       --enable-default-toolkit=qt4
 .elif !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)



How to fix inputmethod/uim-elisp:
Apply this patch at pkgsrc/inputmethod

diff -Nru uim-elisp.orig/Makefile uim-elisp/Makefile
--- uim-elisp.orig/Makefile     2011-05-19 14:24:03.000000000 +0900
+++ uim-elisp/Makefile  2011-05-19 14:24:13.000000000 +0900
@@ -2,7 +2,6 @@
 
 .include               "../../inputmethod/uim/Makefile.common"
 PKGNAME=               ${EMACS_PKGNAME_PREFIX}uim-elisp-${UIM_VERSION}
-PKGREVISION=           1
 CATEGORIES=            inputmethod editors
 
 COMMENT=               Emacs LISP for inputmethod/uim




How to fix devel/libgcroots:
Apply this patch at pkgsrc/devel

diff -Nru libgcroots.orig/Makefile libgcroots/Makefile
--- libgcroots.orig/Makefile    2010-05-17 13:19:45.000000000 +0900
+++ libgcroots/Makefile 2011-05-19 13:52:29.000000000 +0900
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.3 2010/05/15 13:04:12 obache Exp $
 #
 
-DISTNAME=      libgcroots-0.2.2
+DISTNAME=      libgcroots-0.2.3
 CATEGORIES=    devel
 MASTER_SITES=  http://sigscheme.googlecode.com/files/
 
diff -Nru libgcroots.orig/distinfo libgcroots/distinfo
--- libgcroots.orig/distinfo    2010-01-23 23:38:38.000000000 +0900
+++ libgcroots/distinfo 2011-05-19 13:52:29.000000000 +0900
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.2 2009/11/22 10:53:10 obache Exp $
 
-SHA1 (libgcroots-0.2.2.tar.gz) = bd3e0080e3e3136301c5ecf9eb31cccb39113dc3
-RMD160 (libgcroots-0.2.2.tar.gz) = 7d07f731e6a5189e7cd40260c4e7bd1b70931bfc
-Size (libgcroots-0.2.2.tar.gz) = 369803 bytes
+SHA1 (libgcroots-0.2.3.tar.gz) = 0542e8ca20f465c0cd7355a426dea89a9b7be3af
+RMD160 (libgcroots-0.2.3.tar.gz) = eef2db5ea64e6ba20ec68b01b4f0621f45e0ecab
+Size (libgcroots-0.2.3.tar.gz) = 379193 bytes