Sat Sep 18 03:08:31 2010 UTC ()
Update uim to 1.6.0.
Based on PR#43872 by YAMASHIRO, Jun.
some fixes and improvements by me.

uim Changelog:
  - New IM uim-social-ime
  - New IM uim-ajax-ime
  - New IM uim-yahoo-jp
  - Support Wubi86 and ZhengMa tables with Generic IM
  - Improved uim-tutcode with many nice features with table style
    candidate window
  - Stable Qt4 bridge
  - Annotation system
  - Internal plugin system reorganization
  - uim-elatin enhancement
  - Japanese multiple-segment IM enhancement


(obache)
diff -r1.43 -r1.44 pkgsrc/inputmethod/uim/Makefile
diff -r1.3 -r1.4 pkgsrc/inputmethod/uim/Makefile.common
diff -r1.15 -r1.16 pkgsrc/inputmethod/uim/PLIST
diff -r1.12 -r1.13 pkgsrc/inputmethod/uim/buildlink3.mk
diff -r1.16 -r1.17 pkgsrc/inputmethod/uim/distinfo
diff -r1.20 -r1.21 pkgsrc/inputmethod/uim/options.mk
diff -r1.2 -r1.3 pkgsrc/inputmethod/uim/patches/patch-ab
cvs diff -r1.43 -r1.44 pkgsrc/inputmethod/uim/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/Makefile 2010/09/14 11:13:13 1.43
+++ pkgsrc/inputmethod/uim/Makefile 2010/09/18 03:08:30 1.44
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1# $NetBSD: Makefile,v 1.43 2010/09/14 11:13:13 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2010/09/18 03:08:30 obache Exp $
2# 2#
3 3
4.include "../../inputmethod/uim/Makefile.common" 4.include "../../inputmethod/uim/Makefile.common"
5 5
6PKGREVISION= 2 
7 
8COMMENT= Multilingual input method library 6COMMENT= Multilingual input method library
9 7
10CONFLICTS+= uim-qt4-immodule-[0-9]* 8CONFLICTS+= uim-qt4-immodule-[0-9]*
11 9
12PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
13 11
14USE_LIBTOOL= YES 12USE_LIBTOOL= YES
15USE_PKGLOCALEDIR= YES 13USE_PKGLOCALEDIR= YES
16USE_TOOLS+= gmake intltool pkg-config msgfmt 14USE_TOOLS+= gmake intltool pkg-config msgfmt
17USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
18PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in 16PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in
19GNU_CONFIGURE= YES 17GNU_CONFIGURE= YES
20CONFIGURE_ARGS+= --disable-emacs 18CONFIGURE_ARGS+= --disable-emacs
cvs diff -r1.3 -r1.4 pkgsrc/inputmethod/uim/Makefile.common (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/Makefile.common 2010/05/15 06:50:03 1.3
+++ pkgsrc/inputmethod/uim/Makefile.common 2010/09/18 03:08:31 1.4
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.common,v 1.3 2010/05/15 06:50:03 obache Exp $ 1# $NetBSD: Makefile.common,v 1.4 2010/09/18 03:08:31 obache Exp $
2# 2#
3# used by inputmethod/uim/Makefile 3# used by inputmethod/uim/Makefile
4# used by inputmethod/uim-elisp/Makefile 4# used by inputmethod/uim-elisp/Makefile
5 5
6UIM_VERSION= 1.5.7 6UIM_VERSION= 1.6.0
7DISTNAME= uim-${UIM_VERSION} 7DISTNAME= uim-${UIM_VERSION}
8CATEGORIES= inputmethod 8CATEGORIES= inputmethod
9MASTER_SITES= http://uim.googlecode.com/files/ 9MASTER_SITES= http://uim.googlecode.com/files/
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= VEG03617@nifty.com 12MAINTAINER= VEG03617@nifty.com
13HOMEPAGE= http://code.google.com/p/uim/ 13HOMEPAGE= http://code.google.com/p/uim/
14 14
15DISTINFO_FILE= ${.CURDIR}/../../inputmethod/uim/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../inputmethod/uim/distinfo
16PATCHDIR= ${.CURDIR}/../../inputmethod/uim/patches 16PATCHDIR= ${.CURDIR}/../../inputmethod/uim/patches
cvs diff -r1.15 -r1.16 pkgsrc/inputmethod/uim/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/PLIST 2010/08/05 13:23:20 1.15
+++ pkgsrc/inputmethod/uim/PLIST 2010/09/18 03:08:31 1.16
@@ -1,271 +1,398 @@ @@ -1,271 +1,398 @@
1@comment $NetBSD: PLIST,v 1.15 2010/08/05 13:23:20 obache Exp $ 1@comment $NetBSD: PLIST,v 1.16 2010/09/18 03:08:31 obache Exp $
2${PLIST.qt3}bin/uim-chardict-qt 2${PLIST.qt3}bin/uim-chardict-qt
3${PLIST.qt}bin/uim-chardict-qt4 3${PLIST.qt}bin/uim-chardict-qt4
4${PLIST.uim-dict-gtk}bin/uim-dict-gtk 4${PLIST.uim-dict-gtk}bin/uim-dict-gtk
5${PLIST.fep}bin/uim-fep 5${PLIST.fep}bin/uim-fep
6${PLIST.fep}bin/uim-fep-tick 6${PLIST.fep}bin/uim-fep-tick
 7bin/uim-help
7${PLIST.gtk}bin/uim-im-switcher-gtk 8${PLIST.gtk}bin/uim-im-switcher-gtk
8${PLIST.qt3}bin/uim-im-switcher-qt 9${PLIST.qt3}bin/uim-im-switcher-qt
9${PLIST.qt}bin/uim-im-switcher-qt4 10${PLIST.qt}bin/uim-im-switcher-qt4
10${PLIST.gtk}bin/uim-input-pad-ja 11${PLIST.gtk}bin/uim-input-pad-ja
11${PLIST.m17nlib}bin/uim-m17nlib-relink-icons 12${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
12bin/uim-module-manager 13bin/uim-module-manager
13${PLIST.gtk}bin/uim-pref-gtk 14${PLIST.gtk}bin/uim-pref-gtk
14${PLIST.qt3}bin/uim-pref-qt 15${PLIST.qt3}bin/uim-pref-qt
15${PLIST.qt}bin/uim-pref-qt4 16${PLIST.qt}bin/uim-pref-qt4
16bin/uim-sh 17bin/uim-sh
17${PLIST.gtk}bin/uim-toolbar-gtk 18${PLIST.gtk}bin/uim-toolbar-gtk
18${PLIST.gtk}bin/uim-toolbar-gtk-systray 19${PLIST.gtk}bin/uim-toolbar-gtk-systray
19${PLIST.qt3}bin/uim-toolbar-qt 20${PLIST.qt3}bin/uim-toolbar-qt
20${PLIST.qt}bin/uim-toolbar-qt4 21${PLIST.qt}bin/uim-toolbar-qt4
21${PLIST.xim}bin/uim-xim 22${PLIST.xim}bin/uim-xim
22include/uim/plugin.h 23include/uim/dynlib.h
23include/uim/uim-custom.h 24include/uim/uim-custom.h
24include/uim/uim-helper.h 25include/uim/uim-helper.h
25include/uim/uim-im-switcher.h 26include/uim/uim-im-switcher.h
26include/uim/uim-notify.h 27include/uim/uim-notify.h
27include/uim/uim-posix.h 28include/uim/uim-posix.h
28include/uim/uim-scm-abbrev.h 29include/uim/uim-scm-abbrev.h
29include/uim/uim-scm.h 30include/uim/uim-scm.h
30include/uim/uim-util.h 31include/uim/uim-util.h
31include/uim/uim.h 32include/uim/uim.h
32${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server 33${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
33${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la 34${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
34${PLIST.kde3}lib/kde3/uim_panelapplet.la 35${PLIST.kde3}lib/kde3/uim_panelapplet.la
35${PLIST.kde}lib/kde4/uim_panelapplet.la 36${PLIST.kde}lib/kde4/uim_panelapplet.la
36lib/libuim-custom.la 37lib/libuim-custom.la
37lib/libuim-scm.la 38lib/libuim-scm.la
38lib/libuim.la 39lib/libuim.la
39lib/pkgconfig/uim.pc 40lib/pkgconfig/uim.pc
40${PLIST.anthy}lib/uim/plugin/libuim-anthy.la 41${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
41${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la 42${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la
42${PLIST.canna}lib/uim/plugin/libuim-canna.la 43${PLIST.curl}lib/uim/plugin/libuim-curl.la
43lib/uim/plugin/libuim-custom-enabler.la 44lib/uim/plugin/libuim-custom-enabler.la
 45${PLIST.eb}lib/uim/plugin/libuim-eb.la
44${PLIST.editline}lib/uim/plugin/libuim-editline.la 46${PLIST.editline}lib/uim/plugin/libuim-editline.la
 47${PLIST.expat}lib/uim/plugin/libuim-expat.la
 48${PLIST.ffi}lib/uim/plugin/libuim-ffi.la
 49lib/uim/plugin/libuim-fileio.la
45lib/uim/plugin/libuim-look.la 50lib/uim/plugin/libuim-look.la
46${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la 51${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la
47${PLIST.prime}lib/uim/plugin/libuim-prime.la 52${PLIST.openssl}lib/uim/plugin/libuim-openssl.la
48${PLIST.sj3}lib/uim/plugin/libuim-sj3.la 53${PLIST.sqlite}lib/uim/plugin/libuim-sqlite3.la
 54lib/uim/plugin/libuim-lolevel.la
 55lib/uim/plugin/libuim-process.la
49lib/uim/plugin/libuim-skk.la 56lib/uim/plugin/libuim-skk.la
 57lib/uim/plugin/libuim-socket.la
50${PLIST.wnn}lib/uim/plugin/libuim-wnn.la 58${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
51${PLIST.gtk}libexec/uim-candwin-gtk 59${PLIST.gtk}libexec/uim-candwin-gtk
52${PLIST.qt3}libexec/uim-candwin-qt 60${PLIST.qt3}libexec/uim-candwin-qt
53${PLIST.qt}libexec/uim-candwin-qt4 61${PLIST.qt}libexec/uim-candwin-qt4
 62${PLIST.gtk}libexec/uim-candwin-tbl-gtk
54libexec/uim-helper-server 63libexec/uim-helper-server
55${PLIST.gnome}libexec/uim-toolbar-applet 64${PLIST.gnome}libexec/uim-toolbar-applet
56${PLIST.xim}man/man1/uim-xim.1 65${PLIST.xim}man/man1/uim-xim.1
57${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la 66${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la
58share/applications/uim.desktop 67share/applications/uim.desktop
59share/doc/uim/COMPATIBILITY 68share/doc/uim/COMPATIBILITY
60share/doc/uim/CUSTOM 69share/doc/uim/CUSTOM
61share/doc/uim/DOT-UIM 70share/doc/uim/DOT-UIM
62share/doc/uim/HELPER-CANDWIN 71share/doc/uim/HELPER-CANDWIN
63share/doc/uim/HELPER-PROTOCOL 72share/doc/uim/HELPER-PROTOCOL
64share/doc/uim/KEY 73share/doc/uim/KEY
65share/doc/uim/PLUGIN 74share/doc/uim/PLUGIN
66share/doc/uim/README 75share/doc/uim/README
67share/doc/uim/UIM-SCM 76share/doc/uim/UIM-SCM
68share/doc/uim/UIM-SH 77share/doc/uim/UIM-SH
69${PLIST.fep}share/doc/uim/uim-fep/README 78${PLIST.fep}share/doc/uim/uim-fep/README
70${PLIST.fep}share/doc/uim/uim-fep/README.ja 79${PLIST.fep}share/doc/uim/uim-fep/README.ja
71${PLIST.kde3}share/kde/apps/kicker/applets/uimapplet.desktop 80${PLIST.kde3}share/kde/apps/kicker/applets/uimapplet.desktop
72${PLIST.kde}share/kde4/apps/kicker/applets/uimapplet.desktop 81${PLIST.kde}share/kde4/apps/kicker/applets/uimapplet.desktop
73share/locale/fr/LC_MESSAGES/uim.mo 82share/locale/fr/LC_MESSAGES/uim.mo
74share/locale/ja/LC_MESSAGES/uim.mo 83share/locale/ja/LC_MESSAGES/uim.mo
75${PLIST.qt3}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo 84${PLIST.qt3}share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo
76${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo 85${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
77share/locale/ko/LC_MESSAGES/uim.mo 86share/locale/ko/LC_MESSAGES/uim.mo
78share/uim/action.scm 87share/uim/action.scm
 88share/uim/ajax-ime-custom.scm
 89share/uim/ajax-ime-key-custom.scm
 90share/uim/ajax-ime.scm
 91share/uim/annotation-dict.scm
 92share/uim/annotation-eb.scm
 93share/uim/annotation-filter.scm
 94share/uim/annotation.scm
79share/uim/anthy-custom.scm 95share/uim/anthy-custom.scm
80share/uim/anthy-key-custom.scm 96share/uim/anthy-key-custom.scm
81share/uim/anthy-utf8-custom.scm 97share/uim/anthy-utf8-custom.scm
82share/uim/anthy-utf8.scm 98share/uim/anthy-utf8.scm
83share/uim/anthy.scm 99share/uim/anthy.scm
84share/uim/byeoru-custom.scm 100share/uim/byeoru-custom.scm
85share/uim/byeoru-dic.scm 101share/uim/byeoru-dic.scm
86share/uim/byeoru-key-custom.scm 102share/uim/byeoru-key-custom.scm
87share/uim/byeoru-symbols.scm 103share/uim/byeoru-symbols.scm
88share/uim/byeoru.scm 104share/uim/byeoru.scm
89share/uim/canna-custom.scm 105share/uim/canna-custom.scm
90share/uim/canna-key-custom.scm 106share/uim/canna-key-custom.scm
91share/uim/canna.scm 107share/uim/canna.scm
 108share/uim/cannav3-socket.scm
 109share/uim/composer.scm
 110share/uim/ct.scm
92share/uim/custom-rt.scm 111share/uim/custom-rt.scm
93share/uim/custom.scm 112share/uim/custom.scm
94share/uim/default.scm 113share/uim/default.scm
95share/uim/deprecated-util.scm 114share/uim/deprecated-util.scm
 115share/uim/dict-socket.scm
96share/uim/direct.scm 116share/uim/direct.scm
 117share/uim/dynlib.scm
97share/uim/editline.scm 118share/uim/editline.scm
98share/uim/elatin-custom.scm 119share/uim/elatin-custom.scm
99share/uim/elatin-rules.scm 120share/uim/elatin-rules.scm
100share/uim/elatin.scm 121share/uim/elatin.scm
 122share/uim/event.scm
 123share/uim/fileio.scm
101share/uim/generic-custom.scm 124share/uim/generic-custom.scm
102share/uim/generic-key-custom.scm 125share/uim/generic-key-custom.scm
 126share/uim/generic-predict.scm
103share/uim/generic.scm 127share/uim/generic.scm
104share/uim/hangul.scm 128share/uim/hangul.scm
105share/uim/hangul2.scm 129share/uim/hangul2.scm
106share/uim/hangul3.scm 130share/uim/hangul3.scm
107${PLIST.helperdata}share/uim/helperdata/bushu.t 131${PLIST.helperdata}share/uim/helperdata/bushu.t
108${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml 132${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml
 133share/uim/http-client.scm
 134share/uim/http-server.scm
109share/uim/i18n.scm 135share/uim/i18n.scm
110share/uim/ichar.scm 136share/uim/ichar.scm
111share/uim/im-custom.scm 137share/uim/im-custom.scm
112share/uim/im-switcher.scm 138share/uim/im-switcher.scm
113share/uim/im.scm 139share/uim/im.scm
114share/uim/init.scm 140share/uim/init.scm
 141share/uim/input-parse.scm
115share/uim/installed-modules.scm 142share/uim/installed-modules.scm
116share/uim/ipa-x-sampa.scm 143share/uim/ipa-x-sampa.scm
117share/uim/iso-639-1.scm 144share/uim/iso-639-1.scm
 145share/uim/japanese-act.scm
118share/uim/japanese-azik.scm 146share/uim/japanese-azik.scm
 147share/uim/japanese-custom.scm
119share/uim/japanese-kana.scm 148share/uim/japanese-kana.scm
 149share/uim/japanese-kzik.scm
120share/uim/japanese.scm 150share/uim/japanese.scm
121share/uim/key.scm 151share/uim/key.scm
122share/uim/latin.scm 152share/uim/latin.scm
123share/uim/lazy-load.scm 153share/uim/lazy-load.scm
124share/uim/lib/sigscheme-init.scm 154share/uim/lib/sigscheme-init.scm
125share/uim/lib/srfi-0.scm 155share/uim/lib/srfi-0.scm
126share/uim/lib/srfi-1.scm 156share/uim/lib/srfi-1.scm
127share/uim/lib/srfi-43.scm 157share/uim/lib/srfi-43.scm
128share/uim/lib/srfi-55.scm 158share/uim/lib/srfi-55.scm
129share/uim/lib/srfi-69.scm 159share/uim/lib/srfi-69.scm
130share/uim/lib/srfi-9.scm 160share/uim/lib/srfi-9.scm
131share/uim/lib/srfi-95.scm 161share/uim/lib/srfi-95.scm
132share/uim/lib/unittest.scm 162share/uim/lib/unittest.scm
 163share/uim/light-record.scm
133share/uim/load-action.scm 164share/uim/load-action.scm
134share/uim/loader.scm 165share/uim/loader.scm
 166share/uim/lolevel.scm
135share/uim/look-custom.scm 167share/uim/look-custom.scm
136share/uim/look.scm 168share/uim/look.scm
137share/uim/m17nlib.scm 169share/uim/m17nlib.scm
 170share/uim/match.scm
138share/uim/mana-custom.scm 171share/uim/mana-custom.scm
139share/uim/mana-key-custom.scm 172share/uim/mana-key-custom.scm
140share/uim/mana.scm 173share/uim/mana.scm
 174share/uim/ng-action.scm
 175share/uim/ng-key.scm
 176share/uim/openssl.scm
141share/uim/pinyin-big5.scm 177share/uim/pinyin-big5.scm
 178share/uim/pixmaps/ajax-ime.png
 179share/uim/pixmaps/ajax-ime.svg
142share/uim/pixmaps/anthy.png 180share/uim/pixmaps/anthy.png
143${PLIST.anthy}share/uim/pixmaps/anthy-utf8.png 181${PLIST.anthy}share/uim/pixmaps/anthy-utf8.png
144share/uim/pixmaps/byeoru.png 182share/uim/pixmaps/byeoru.png
145share/uim/pixmaps/byeoru.svg 183share/uim/pixmaps/byeoru.svg
146share/uim/pixmaps/canna.png 184share/uim/pixmaps/canna.png
147share/uim/pixmaps/direct.png 185share/uim/pixmaps/direct.png
148share/uim/pixmaps/direct.svg 186share/uim/pixmaps/direct.svg
 187share/uim/pixmaps/direct_dark_background.png
 188share/uim/pixmaps/direct_dark_background.svg
149share/uim/pixmaps/direct_input.png 189share/uim/pixmaps/direct_input.png
150share/uim/pixmaps/direct_input.svg 190share/uim/pixmaps/direct_input.svg
 191share/uim/pixmaps/direct_input_dark_background.png
 192share/uim/pixmaps/direct_input_dark_background.svg
151share/uim/pixmaps/elatin.png 193share/uim/pixmaps/elatin.png
152share/uim/pixmaps/elatin.svg 194share/uim/pixmaps/elatin.svg
153share/uim/pixmaps/hangul2.png 195share/uim/pixmaps/hangul2.png
154share/uim/pixmaps/hangul2.svg 196share/uim/pixmaps/hangul2.svg
155share/uim/pixmaps/hangul3.png 197share/uim/pixmaps/hangul3.png
156share/uim/pixmaps/hangul3.svg 198share/uim/pixmaps/hangul3.svg
157share/uim/pixmaps/im_subst.svg 199share/uim/pixmaps/im_subst.svg
158share/uim/pixmaps/im_switcher.png 200share/uim/pixmaps/im_switcher.png
159share/uim/pixmaps/im_switcher.svg 201share/uim/pixmaps/im_switcher.svg
160share/uim/pixmaps/ipa-x-sampa.png 202share/uim/pixmaps/ipa-x-sampa.png
161share/uim/pixmaps/ipa-x-sampa.svg 203share/uim/pixmaps/ipa-x-sampa.svg
 204share/uim/pixmaps/ja_act.png
 205share/uim/pixmaps/ja_act.svg
 206share/uim/pixmaps/ja_act_dark_background.png
 207share/uim/pixmaps/ja_act_dark_background.svg
162share/uim/pixmaps/ja_azik.png 208share/uim/pixmaps/ja_azik.png
163share/uim/pixmaps/ja_azik.svg 209share/uim/pixmaps/ja_azik.svg
 210share/uim/pixmaps/ja_azik_dark_background.png
 211share/uim/pixmaps/ja_azik_dark_background.svg
164share/uim/pixmaps/ja_direct.png 212share/uim/pixmaps/ja_direct.png
165share/uim/pixmaps/ja_direct.svg 213share/uim/pixmaps/ja_direct.svg
 214share/uim/pixmaps/ja_direct_dark_background.png
 215share/uim/pixmaps/ja_direct_dark_background.svg
166share/uim/pixmaps/ja_fullwidth_alnum.png 216share/uim/pixmaps/ja_fullwidth_alnum.png
167share/uim/pixmaps/ja_fullwidth_alnum.svg 217share/uim/pixmaps/ja_fullwidth_alnum.svg
 218share/uim/pixmaps/ja_fullwidth_alnum_dark_background.png
 219share/uim/pixmaps/ja_fullwidth_alnum_dark_background.svg
168share/uim/pixmaps/ja_halfkana.png 220share/uim/pixmaps/ja_halfkana.png
169share/uim/pixmaps/ja_halfkana.svg 221share/uim/pixmaps/ja_halfkana.svg
 222share/uim/pixmaps/ja_halfkana_dark_background.png
 223share/uim/pixmaps/ja_halfkana_dark_background.svg
170share/uim/pixmaps/ja_halfwidth_alnum.png 224share/uim/pixmaps/ja_halfwidth_alnum.png
171share/uim/pixmaps/ja_halfwidth_alnum.svg 225share/uim/pixmaps/ja_halfwidth_alnum.svg
 226share/uim/pixmaps/ja_halfwidth_alnum_dark_background.png
 227share/uim/pixmaps/ja_halfwidth_alnum_dark_background.svg
172share/uim/pixmaps/ja_hiragana.png 228share/uim/pixmaps/ja_hiragana.png
173share/uim/pixmaps/ja_hiragana.svg 229share/uim/pixmaps/ja_hiragana.svg
 230share/uim/pixmaps/ja_hiragana_dark_background.png
 231share/uim/pixmaps/ja_hiragana_dark_background.svg
174share/uim/pixmaps/ja_kana.png 232share/uim/pixmaps/ja_kana.png
175share/uim/pixmaps/ja_kana.svg 233share/uim/pixmaps/ja_kana.svg
 234share/uim/pixmaps/ja_kana_dark_background.png
 235share/uim/pixmaps/ja_kana_dark_background.svg
176share/uim/pixmaps/ja_katakana.png 236share/uim/pixmaps/ja_katakana.png
177share/uim/pixmaps/ja_katakana.svg 237share/uim/pixmaps/ja_katakana.svg
 238share/uim/pixmaps/ja_katakana_dark_background.png
 239share/uim/pixmaps/ja_katakana_dark_background.svg
 240share/uim/pixmaps/ja_kzik.png
 241share/uim/pixmaps/ja_kzik.svg
 242share/uim/pixmaps/ja_kzik_dark_background.png
 243share/uim/pixmaps/ja_kzik_dark_background.svg
178share/uim/pixmaps/ja_nicola.png 244share/uim/pixmaps/ja_nicola.png
179share/uim/pixmaps/ja_nicola.svg 245share/uim/pixmaps/ja_nicola.svg
180share/uim/pixmaps/ja_pocketbell.png 246share/uim/pixmaps/ja_pocketbell.png
181share/uim/pixmaps/ja_pocketbell.svg 247share/uim/pixmaps/ja_pocketbell.svg
182share/uim/pixmaps/ja_romaji.png 248share/uim/pixmaps/ja_romaji.png
183share/uim/pixmaps/ja_romaji.svg 249share/uim/pixmaps/ja_romaji.svg
 250share/uim/pixmaps/ja_romaji_dark_background.png
 251share/uim/pixmaps/ja_romaji_dark_background.svg
184share/uim/pixmaps/ko_direct.png 252share/uim/pixmaps/ko_direct.png
185share/uim/pixmaps/ko_direct.svg 253share/uim/pixmaps/ko_direct.svg
 254share/uim/pixmaps/ko_direct_dark_background.png
 255share/uim/pixmaps/ko_direct_dark_background.svg
186share/uim/pixmaps/ko_hangulchar.png 256share/uim/pixmaps/ko_hangulchar.png
187share/uim/pixmaps/ko_hangulchar.svg 257share/uim/pixmaps/ko_hangulchar.svg
 258share/uim/pixmaps/ko_hangulchar_dark_background.png
 259share/uim/pixmaps/ko_hangulchar_dark_background.svg
188share/uim/pixmaps/ko_hangulword.png 260share/uim/pixmaps/ko_hangulword.png
189share/uim/pixmaps/ko_hangulword.svg 261share/uim/pixmaps/ko_hangulword.svg
 262share/uim/pixmaps/ko_hangulword_dark_background.png
 263share/uim/pixmaps/ko_hangulword_dark_background.svg
190share/uim/pixmaps/latin.png 264share/uim/pixmaps/latin.png
191share/uim/pixmaps/latin.svg 265share/uim/pixmaps/latin.svg
192share/uim/pixmaps/look.png 266share/uim/pixmaps/look.png
193share/uim/pixmaps/look.svg 267share/uim/pixmaps/look.svg
194share/uim/pixmaps/mana.png 268share/uim/pixmaps/mana.png
195share/uim/pixmaps/mana.svg 269share/uim/pixmaps/mana.svg
196share/uim/pixmaps/null.png 270share/uim/pixmaps/null.png
197share/uim/pixmaps/off.png 271share/uim/pixmaps/off.png
198share/uim/pixmaps/off.svg 272share/uim/pixmaps/off.svg
 273share/uim/pixmaps/off_dark_background.png
 274share/uim/pixmaps/off_dark_background.svg
199share/uim/pixmaps/on.png 275share/uim/pixmaps/on.png
200share/uim/pixmaps/on.svg 276share/uim/pixmaps/on.svg
 277share/uim/pixmaps/on_dark_background.png
 278share/uim/pixmaps/on_dark_background.svg
201share/uim/pixmaps/pinyin-big5.png 279share/uim/pixmaps/pinyin-big5.png
202share/uim/pixmaps/pinyin-big5.svg 280share/uim/pixmaps/pinyin-big5.svg
203share/uim/pixmaps/prime.png 281share/uim/pixmaps/prime.png
204share/uim/pixmaps/prime_mode_application.png 282share/uim/pixmaps/prime_mode_application.png
205share/uim/pixmaps/prime_mode_application.svg 283share/uim/pixmaps/prime_mode_application.svg
 284share/uim/pixmaps/prime_mode_application_dark_background.png
 285share/uim/pixmaps/prime_mode_application_dark_background.svg
206share/uim/pixmaps/py.png 286share/uim/pixmaps/py.png
207share/uim/pixmaps/py.svg 287share/uim/pixmaps/py.svg
208share/uim/pixmaps/pyunihan.png 288share/uim/pixmaps/pyunihan.png
209share/uim/pixmaps/pyunihan.svg 289share/uim/pixmaps/pyunihan.svg
210share/uim/pixmaps/romaja.png 290share/uim/pixmaps/romaja.png
211share/uim/pixmaps/romaja.svg 291share/uim/pixmaps/romaja.svg
212share/uim/pixmaps/scim.png 292share/uim/pixmaps/scim.png
213share/uim/pixmaps/scim.svg 293share/uim/pixmaps/scim.svg
214share/uim/pixmaps/sj3.png 294share/uim/pixmaps/sj3.png
215share/uim/pixmaps/sj3.svg 295share/uim/pixmaps/sj3.svg
216share/uim/pixmaps/skk.png 296share/uim/pixmaps/skk.png
217share/uim/pixmaps/skk.svg 297share/uim/pixmaps/skk.svg
 298share/uim/pixmaps/skk_dark_background.png
 299share/uim/pixmaps/skk_dark_background.svg
 300share/uim/pixmaps/social-ime.png
 301share/uim/pixmaps/social-ime.svg
218share/uim/pixmaps/tcode.png 302share/uim/pixmaps/tcode.png
219share/uim/pixmaps/tcode.svg 303share/uim/pixmaps/tcode.svg
 304share/uim/pixmaps/tcode_dark_background.png
 305share/uim/pixmaps/tcode_dark_background.svg
220share/uim/pixmaps/trycode.png 306share/uim/pixmaps/trycode.png
221share/uim/pixmaps/trycode.svg 307share/uim/pixmaps/trycode.svg
 308share/uim/pixmaps/trycode_dark_background.png
 309share/uim/pixmaps/trycode_dark_background.svg
222share/uim/pixmaps/tutcode.png 310share/uim/pixmaps/tutcode.png
223share/uim/pixmaps/tutcode.svg 311share/uim/pixmaps/tutcode.svg
 312share/uim/pixmaps/tutcode_dark_background.png
 313share/uim/pixmaps/tutcode_dark_background.svg
224share/uim/pixmaps/uim-dict.png 314share/uim/pixmaps/uim-dict.png
225share/uim/pixmaps/uim-dict.svg 315share/uim/pixmaps/uim-dict.svg
226share/uim/pixmaps/uim-gray.png 316share/uim/pixmaps/uim-gray.png
227share/uim/pixmaps/uim-icon.png 317share/uim/pixmaps/uim-icon.png
228share/uim/pixmaps/uim-icon48.png 318share/uim/pixmaps/uim-icon48.png
229share/uim/pixmaps/uim-icon64.png 319share/uim/pixmaps/uim-icon64.png
230share/uim/pixmaps/unknown.png 320share/uim/pixmaps/unknown.png
231share/uim/pixmaps/unknown.svg 321share/uim/pixmaps/unknown.svg
 322share/uim/pixmaps/unknown_dark_background.png
 323share/uim/pixmaps/unknown_dark_background.svg
232share/uim/pixmaps/viqr.png 324share/uim/pixmaps/viqr.png
233share/uim/pixmaps/viqr.svg 325share/uim/pixmaps/viqr.svg
 326share/uim/pixmaps/wb86.png
 327share/uim/pixmaps/wb86.svg
 328share/uim/pixmaps/wb86_dark_background.png
 329share/uim/pixmaps/wb86_dark_background.svg
234share/uim/pixmaps/wnn.png 330share/uim/pixmaps/wnn.png
235share/uim/pixmaps/wnn.svg 331share/uim/pixmaps/wnn.svg
 332share/uim/pixmaps/yahoo-jp.png
 333share/uim/pixmaps/yahoo-jp.svg
 334share/uim/pixmaps/zm.png
 335share/uim/pixmaps/zm.svg
 336share/uim/pixmaps/zm_dark_background.png
 337share/uim/pixmaps/zm_dark_background.svg
236share/uim/plugin.scm 338share/uim/plugin.scm
 339share/uim/predict-custom.scm
 340share/uim/predict-look-skk.scm
 341share/uim/predict-look.scm
 342share/uim/predict-sqlite3.scm
 343share/uim/pregexp.scm
237share/uim/prime-custom.scm 344share/uim/prime-custom.scm
238share/uim/prime-key-custom.scm 345share/uim/prime-key-custom.scm
239share/uim/prime.scm 346share/uim/prime.scm
 347share/uim/process.scm
240share/uim/py.scm 348share/uim/py.scm
241share/uim/pyload.scm 349share/uim/pyload.scm
242share/uim/pyunihan.scm 350share/uim/pyunihan.scm
243share/uim/rk.scm 351share/uim/rk.scm
244share/uim/romaja.scm 352share/uim/romaja.scm
245share/uim/scim.scm 353share/uim/scim.scm
246share/uim/sj3-custom.scm 354share/uim/sj3-custom.scm
247share/uim/sj3-key-custom.scm 355share/uim/sj3-key-custom.scm
248share/uim/sj3.scm 356share/uim/sj3.scm
 357share/uim/sj3v2-socket.scm
249share/uim/skk-custom.scm 358share/uim/skk-custom.scm
250share/uim/skk-dialog.scm 359share/uim/skk-dialog.scm
251share/uim/skk-editor.scm 360share/uim/skk-editor.scm
252share/uim/skk-key-custom.scm 361share/uim/skk-key-custom.scm
253share/uim/skk.scm 362share/uim/skk.scm
 363share/uim/social-ime-custom.scm
 364share/uim/social-ime-key-custom.scm
 365share/uim/social-ime.scm
 366share/uim/socket.scm
 367share/uim/sqlite3.scm
 368share/uim/sxml-tools.scm
 369share/uim/sxpathlib.scm
 370share/uim/tables/wb86.table
 371share/uim/tables/zm.table
254share/uim/tcode.scm 372share/uim/tcode.scm
 373share/uim/trec.scm
255share/uim/trycode.scm 374share/uim/trycode.scm
256share/uim/tutcode-bushudic.scm 375share/uim/tutcode-bushudic.scm
257share/uim/tutcode-custom.scm 376share/uim/tutcode-custom.scm
 377share/uim/tutcode-dialog.scm
 378share/uim/tutcode-editor.scm
258share/uim/tutcode-key-custom.scm 379share/uim/tutcode-key-custom.scm
259share/uim/tutcode-kigoudic.scm 380share/uim/tutcode-kigoudic.scm
260share/uim/tutcode-rule.scm 381share/uim/tutcode-rule.scm
261share/uim/tutcode.scm 382share/uim/tutcode.scm
 383share/uim/uim-help.scm
262share/uim/uim-module-manager.scm 384share/uim/uim-module-manager.scm
263share/uim/uim-sh.scm 385share/uim/uim-sh.scm
264share/uim/ustr.scm 386share/uim/ustr.scm
265share/uim/util.scm 387share/uim/util.scm
266share/uim/viqr.scm 388share/uim/viqr.scm
 389share/uim/wlos.scm
267share/uim/wnn-custom.scm 390share/uim/wnn-custom.scm
268share/uim/wnn-key-custom.scm 391share/uim/wnn-key-custom.scm
269share/uim/wnn.scm 392share/uim/wnn.scm
 393share/uim/xmload.scm
 394share/uim/yahoo-jp-custom.scm
 395share/uim/yahoo-jp-key-custom.scm
 396share/uim/yahoo-jp.scm
270share/uim/zaurus.scm 397share/uim/zaurus.scm
271@pkgdir lib/uim/notify 398@pkgdir lib/uim/notify
cvs diff -r1.12 -r1.13 pkgsrc/inputmethod/uim/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/buildlink3.mk 2010/01/05 02:10:13 1.12
+++ pkgsrc/inputmethod/uim/buildlink3.mk 2010/09/18 03:08:31 1.13
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: buildlink3.mk,v 1.12 2010/01/05 02:10:13 obache Exp $ 1# $NetBSD: buildlink3.mk,v 1.13 2010/09/18 03:08:31 obache Exp $
2 2
3BUILDLINK_TREE+= uim 3BUILDLINK_TREE+= uim
4 4
5.if !defined(UIM_BUILDLINK3_MK) 5.if !defined(UIM_BUILDLINK3_MK)
6UIM_BUILDLINK3_MK:= 6UIM_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.uim+= uim>=1.5.1 8BUILDLINK_API_DEPENDS.uim+= uim>=1.5.1
9BUILDLINK_ABI_DEPENDS.uim?= uim>=1.5.1 9BUILDLINK_ABI_DEPENDS.uim?= uim>=1.6.0
10BUILDLINK_PKGSRCDIR.uim?= ../../inputmethod/uim 10BUILDLINK_PKGSRCDIR.uim?= ../../inputmethod/uim
11 11
12.include "../../devel/gettext-lib/buildlink3.mk" 12.include "../../devel/gettext-lib/buildlink3.mk"
13.include "../../devel/libgcroots/buildlink3.mk" 13.include "../../devel/libgcroots/buildlink3.mk"
14.endif # UIM_BUILDLINK3_MK 14.endif # UIM_BUILDLINK3_MK
15 15
16BUILDLINK_TREE+= -uim 16BUILDLINK_TREE+= -uim
cvs diff -r1.16 -r1.17 pkgsrc/inputmethod/uim/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/distinfo 2010/01/20 11:06:07 1.16
+++ pkgsrc/inputmethod/uim/distinfo 2010/09/18 03:08:31 1.17
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.16 2010/01/20 11:06:07 obache Exp $ 1$NetBSD: distinfo,v 1.17 2010/09/18 03:08:31 obache Exp $
2 2
3SHA1 (uim-1.5.7.tar.bz2) = fbea2590286ddc857a7824d8544cb08842f4299f 3SHA1 (uim-1.6.0.tar.bz2) = d27f2ca8136da0702c82f0522911d06b2b8f8ea7
4RMD160 (uim-1.5.7.tar.bz2) = 037677cd583c2b69293fbbc1c0393756d7c7adac 4RMD160 (uim-1.6.0.tar.bz2) = 14881fe9ff1af64cee1317d0b51af69294377e47
5Size (uim-1.5.7.tar.bz2) = 3330555 bytes 5Size (uim-1.6.0.tar.bz2) = 6154925 bytes
6SHA1 (patch-ab) = 81693dd1b62bec4deb99b469a0b8e53ff11e86a8 6SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5
7SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791 7SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
cvs diff -r1.20 -r1.21 pkgsrc/inputmethod/uim/options.mk (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/options.mk 2010/05/15 07:05:57 1.20
+++ pkgsrc/inputmethod/uim/options.mk 2010/09/18 03:08:31 1.21
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: options.mk,v 1.20 2010/05/15 07:05:57 obache Exp $ 1# $NetBSD: options.mk,v 1.21 2010/09/18 03:08:31 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.uim 3PKG_OPTIONS_VAR= PKG_OPTIONS.uim
4#PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk m17nlib prime sj3 uim-fep wnn xim 4#PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep wnn xim
5PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk m17nlib prime sj3 uim-fep xim 5PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep xim
6PKG_OPTIONS_OPTIONAL_GROUPS= kde qt 6PKG_OPTIONS_OPTIONAL_GROUPS= kde qt
7PKG_OPTIONS_GROUP.kde= kde kde3 7PKG_OPTIONS_GROUP.kde= kde kde3
8PKG_OPTIONS_GROUP.qt= qt qt3 8PKG_OPTIONS_GROUP.qt= qt qt3
9PKG_SUGGESTED_OPTIONS= anthy canna gtk uim-fep xim 9PKG_SUGGESTED_OPTIONS= anthy canna gtk uim-fep xim
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13.if !empty(PKG_OPTIONS:Mqt) 13.if !empty(PKG_OPTIONS:Mqt)
14. if !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3) 14. if !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)
15PKG_FAIL_REASON+= "'qt' conflict with 'qt3' or 'kde3' option" 15PKG_FAIL_REASON+= "'qt' conflict with 'qt3' or 'kde3' option"
16. endif 16. endif
17.endif 17.endif
18.if !empty(PKG_OPTIONS:Mqt3) 18.if !empty(PKG_OPTIONS:Mqt3)
19. if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) 19. if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
20PKG_FAIL_REASON+= "'qt3' conflict with 'qt' or 'kde' option" 20PKG_FAIL_REASON+= "'qt3' conflict with 'qt' or 'kde' option"
21. endif 21. endif
22.endif 22.endif
23 23
24PLIST_VARS+= helperdata uim-dict-gtk fep 24PLIST_VARS+= helperdata uim-dict-gtk fep
25PLIST_VARS+= anthy canna gnome gtk kde kde3 m17nlib prime qt qt3 sj3 wnn xim 25PLIST_VARS+= anthy curl eb expat ffi gnome gtk kde kde3 m17nlib openssl qt qt3 sqlite wnn xim
26 26
27.if !empty(PKG_OPTIONS:Mxim) 27.if !empty(PKG_OPTIONS:Mxim)
28.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXext/buildlink3.mk" 29.include "../../x11/libXext/buildlink3.mk"
30.include "../../x11/xextproto/buildlink3.mk" 30.include "../../x11/xextproto/buildlink3.mk"
31CONFIGURE_ARGS+= --with-x 31CONFIGURE_ARGS+= --with-x
32PLIST.xim= yes 32PLIST.xim= yes
33.else 33.else
34SUBST_CLASSES+= xim 34SUBST_CLASSES+= xim
35SUBST_STAGE.xim= pre-configure 35SUBST_STAGE.xim= pre-configure
36SUBST_FILES.xim= configure 36SUBST_FILES.xim= configure
37SUBST_SED.xim= -e 's;use_xim="yes";use_xim="no";g' 37SUBST_SED.xim= -e 's;use_xim="yes";use_xim="no";g'
38.endif 38.endif
@@ -46,61 +46,80 @@ INSTALLATION_DIRS+= share/doc/uim/uim-fe @@ -46,61 +46,80 @@ INSTALLATION_DIRS+= share/doc/uim/uim-fe
46 46
47post-install: install-fep-doc 47post-install: install-fep-doc
48 48
49.PHONY: install-fep-doc 49.PHONY: install-fep-doc
50install-fep-doc: 50install-fep-doc:
51 ${INSTALL_DATA} ${WRKSRC}/fep/README ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep 51 ${INSTALL_DATA} ${WRKSRC}/fep/README ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep
52 ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep 52 ${INSTALL_DATA} ${WRKSRC}/fep/README.ja ${DESTDIR}${PREFIX}/share/doc/uim/uim-fep
53.else 53.else
54CONFIGURE_ARGS+= --disable-fep 54CONFIGURE_ARGS+= --disable-fep
55.endif 55.endif
56 56
57.if !empty(PKG_OPTIONS:Manthy) 57.if !empty(PKG_OPTIONS:Manthy)
58. include "../../inputmethod/anthy/buildlink3.mk" 58. include "../../inputmethod/anthy/buildlink3.mk"
59CONFIGURE_ARGS+= --enable-dict --with-anthy-utf8 59CONFIGURE_ARGS+= --with-anthy-utf8
60PLIST.anthy= yes 60PLIST.anthy= yes
61. if !empty(PKG_OPTIONS:Mgtk) 
62PLIST.uim-dict-gtk= yes 
63. endif 
64.else 61.else
65CONFIGURE_ARGS+= --without-anthy 62CONFIGURE_ARGS+= --without-anthy
66.endif 63.endif
67 64
68.if !empty(PKG_OPTIONS:Mcanna) 65.if !empty(PKG_OPTIONS:Mcanna)
69. include "../../inputmethod/canna-lib/buildlink3.mk" 
70CONFIGURE_ARGS+= --with-canna 66CONFIGURE_ARGS+= --with-canna
71PLIST.canna= yes 67.endif
 68
 69.if !empty(PKG_OPTIONS:Mcurl)
 70. include "../../www/curl/buildlink3.mk"
 71CONFIGURE_ARGS+= --with-curl
 72PLIST.curl= yes
72.endif 73.endif
73 74
74.if !empty(PKG_OPTIONS:Meb) 75.if !empty(PKG_OPTIONS:Meb)
75.include "../../textproc/eb/buildlink3.mk" 76.include "../../textproc/eb/buildlink3.mk"
76CONFIGURE_ARGS+= --with-eb 77CONFIGURE_ARGS+= --with-eb
77CONFIGURE_ARGS+= --with-eb-conf=${PKG_SYSCONFDIR}/eb.conf 78CONFIGURE_ARGS+= --with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
 79PLIST.eb= yes
 80.endif
 81
 82.if !empty(PKG_OPTIONS:Mexpat)
 83. include "../../textproc/expat/buildlink3.mk"
 84CONFIGURE_ARGS+= --with-expat=${BUILDLINK_PREFIX.expat}
 85PLIST.expat= yes
 86.endif
 87
 88.if !empty(PKG_OPTIONS:Mffi)
 89. include "../../devel/libffi/buildlink3.mk"
 90CONFIGURE_ARGS+= --with-ffi
 91PLIST.ffi= yes
78.endif 92.endif
79 93
80.if !empty(PKG_OPTIONS:Mgnome) 94.if !empty(PKG_OPTIONS:Mgnome)
81. include "../../x11/gnome-panel/buildlink3.mk" 95. include "../../x11/gnome-panel/buildlink3.mk"
82. include "../../devel/libgnomeui/buildlink3.mk" 96. include "../../devel/libgnomeui/buildlink3.mk"
83CFLAGS+= -I$(BUILDLINK_PREFIX.libgnomeui)/include/libgnomeui-2.0 
84BUILDLINK_TRANSFORM+= l:panel-applet-2:panel-applet-2:gnomeui-2 
85PLIST.gnome= yes 97PLIST.gnome= yes
86.else 98.else
87CONFIGURE_ARGS+= --disable-gnome-applet 99CONFIGURE_ARGS+= --disable-gnome-applet
88.endif 100.endif
89 101
90.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome) 102.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
91GTK2_IMMODULES= YES 103GTK2_IMMODULES= YES
92.include "../../x11/gtk2/modules.mk" 104.include "../../x11/gtk2/modules.mk"
93PLIST.gtk= yes 105PLIST.gtk= yes
 106. if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna)
 107. if !empty(PKG_OPTIONS:Mcanna)
 108. include "../../inputmethod/canna-lib/buildlink3.mk"
 109. endif
 110CONFIGURE_ARGS+= --enable-dict
 111PLIST.uim-dict-gtk= yes
 112. endif
94.else 113.else
95CONFIGURE_ARGS+= --without-gtk2 114CONFIGURE_ARGS+= --without-gtk2
96.endif 115.endif
97 116
98.if !empty(PKG_OPTIONS:Mkde3) 117.if !empty(PKG_OPTIONS:Mkde3)
99. include "../../x11/kdelibs3/buildlink3.mk" 118. include "../../x11/kdelibs3/buildlink3.mk"
100. include "../../x11/qt3-libs/buildlink3.mk" 119. include "../../x11/qt3-libs/buildlink3.mk"
101CONFIGURE_ARGS+= --enable-kde-applet 120CONFIGURE_ARGS+= --enable-kde-applet
102PLIST.kde3= yes 121PLIST.kde3= yes
103.endif 122.endif
104 123
105.if !empty(PKG_OPTIONS:Mkde) 124.if !empty(PKG_OPTIONS:Mkde)
106. include "../../x11/kdelibs4/buildlink3.mk" 125. include "../../x11/kdelibs4/buildlink3.mk"
@@ -128,34 +147,51 @@ CONFIGURE_ARGS+= --without-m17nlib @@ -128,34 +147,51 @@ CONFIGURE_ARGS+= --without-m17nlib
128CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc 147CONFIGURE_ARGS+= --with-qt CXXFLAGS=-lc
129PLIST.helperdata= yes 148PLIST.helperdata= yes
130PLIST.qt3= yes 149PLIST.qt3= yes
131.endif 150.endif
132 151
133.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) 152.if !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
134. include "../../x11/qt4-libs/buildlink3.mk" 153. include "../../x11/qt4-libs/buildlink3.mk"
135. include "../../x11/qt4-tools/buildlink3.mk" 154. include "../../x11/qt4-tools/buildlink3.mk"
136CONFIGURE_ARGS+= --with-qt4 --with-qt4-immodule 155CONFIGURE_ARGS+= --with-qt4 --with-qt4-immodule
137PLIST.helperdata= yes 156PLIST.helperdata= yes
138PLIST.qt= yes 157PLIST.qt= yes
139.endif 158.endif
140 159
 160.if !empty(PKG_OPTIONS:Mopenssl)
 161. include "../../security/openssl/buildlink3.mk"
 162CONFIGURE_ARGS+= --enable-openssl
 163# XXX: https://bugs.freedesktop.org/show_bug.cgi?id=30249
 164#CONFIGURE_ARGS+= --with-openssl-dir=${SSLBASE:Q}
 165PLIST.openssl= yes
 166.endif
 167
141.if !empty(PKG_OPTIONS:Mprime) 168.if !empty(PKG_OPTIONS:Mprime)
142. include "../../inputmethod/prime/buildlink3.mk" 
143CONFIGURE_ARGS+= --with-prime 169CONFIGURE_ARGS+= --with-prime
144PLIST.prime= yes 
145.endif 170.endif
146 171
147.if !empty(PKG_OPTIONS:Msj3) 172.if !empty(PKG_OPTIONS:Msj3)
148. include "../../inputmethod/sj3-client/buildlink3.mk" 
149CONFIGURE_ARGS+= --with-sj3 173CONFIGURE_ARGS+= --with-sj3
150CONFIGURE_ARGS+= SJ3_CFLAGS=-I${BUILDLINK_PREFIX.sj3-lib}/includes 174.endif
151CONFIGURE_ARGS+= SJ3_LIBS="-L${BUILDLINK_PREFIX.sj3-lib}/lib -lsj3lib" 175
152PLIST.sj3= yes 176# For input prediction
 177.if !empty(PKG_OPTIONS:Msqlite)
 178. include "../../databases/sqlite3/buildlink3.mk"
 179CONFIGURE_ARGS+= --with-sqlite3
 180PLIST.sqlite3= yes
153.endif 181.endif
154 182
155#.if !empty(PKG_OPTIONS:Mwnn) 183#.if !empty(PKG_OPTIONS:Mwnn)
156#. include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" 184#. include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
157#CONFIGURE_ARGS+= --with-wnn 185#CONFIGURE_ARGS+= --with-wnn
158#CONFIGURE_ARGS+= --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn 186#CONFIGURE_ARGS+= --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
159#CONFIGURE_ARGS+= --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib 187#CONFIGURE_ARGS+= --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
160#PLIST.wnn= yes 188#PLIST.wnn= yes
161#.endif 189#.endif
 190
 191.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
 192CONFIGURE_ARGS+= --enable-default-toolkit=gtk
 193.elif !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
 194CONFIGURE_ARGS+= --enable-default-toolkit=qt4
 195.elif !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)
 196CONFIGURE_ARGS+= --enable-default-toolkit=qt
 197.endif
cvs diff -r1.2 -r1.3 pkgsrc/inputmethod/uim/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/patches/Attic/patch-ab 2009/01/23 13:40:32 1.2
+++ pkgsrc/inputmethod/uim/patches/Attic/patch-ab 2010/09/18 03:08:31 1.3
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ab,v 1.2 2009/01/23 13:40:32 obache Exp $ 1$NetBSD: patch-ab,v 1.3 2010/09/18 03:08:31 obache Exp $
2 2
3Avoid to install of header files of sigscheme, conflict with lang/sigscheme. 3Avoid to install of header files of sigscheme, conflict with lang/sigscheme.
4 4
5--- sigscheme/src/Makefile.in.orig 2009-01-21 11:48:58.000000000 +0000 5--- sigscheme/src/Makefile.in.orig 2010-08-11 07:29:39.000000000 +0000
6+++ sigscheme/src/Makefile.in 6+++ sigscheme/src/Makefile.in
7@@ -22,7 +22,7 @@ 7@@ -22,7 +22,7 @@
 8
8 VPATH = @srcdir@ 9 VPATH = @srcdir@
9 pkgdatadir = $(datadir)/@PACKAGE@ 10 pkgdatadir = $(datadir)/@PACKAGE@
10 pkglibdir = $(libdir)/@PACKAGE@ 
11-pkgincludedir = $(includedir)/@PACKAGE@ 11-pkgincludedir = $(includedir)/@PACKAGE@
12+pkgincludedir =  12+pkgincludedir =
 13 pkglibdir = $(libdir)/@PACKAGE@
 14 pkglibexecdir = $(libexecdir)/@PACKAGE@
13 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd 15 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
14 install_sh_DATA = $(install_sh) -c -m 644 
15 install_sh_PROGRAM = $(install_sh) -c