Sun May 29 06:13:57 2011 UTC ()
Update uim to 1.7.0.
Based on PR#44989 by YAMASHIRO, Jun.  add a missing PLIST entry.

Overview of changes from 1.7.0-alpha to 1.7.0
=============================================
* Fixes
  - Generic IM
    * Fix sort order of Wubi86 and Zhengma tables in 1.7.0-alpha

  - GTK+3 bridge
    * Avoid repeated changes of subwindow size in some annotation text

Overview of changes from 1.6.x to 1.7.0-alpha
=============================================
* New features
  - GTK+3 bridge
  - uim-candwin-gtk3
  - uim-candwin-tbl-gtk3
  - uim-dict-gtk3
  - uim-im-switcher-gtk3
  - uim-input-pad-ja-gtk3
  - uim-pref-gtk3
  - uim-toolbar-gtk3
  - uim-toolbar-gtk3-systray
    * Support GTK+3

  - uim-toolbar-applet-gnome3
    * Support GNOME3

* Fixes
  - uim Scheme library
    * Fix im-acquire-text brokeness

  - uim-toolbar-qt4
    * Fix bug: Can't set starting position of Qt4 toolbar (#34034)

  - uim-notify
    * Fix compilation with libnotify >= 0.7.0

  - uim-tutcode
    * Fix behavior with interactive bushu conversion

  - uim-skk
    * Fix crash upon an illegal line in SKK dictionary

  - Emacs bridge
    * Don't disturb other leim's modelines (#35318)

  - Qt4 bridge
    * Fix crash of applications upon exit when widget style of
      QGtkStyle is used

  - uim-dict-gtk
    * Fix a minor bug

* Enhancements
  - uim-tutcode
    * Postfix mazegaki conversion
    * Postfix bushu conversion
    * Add inflection support for postfix and prefix mazegaki conversion
    * Kanji code (JIS/Kuten/Unicode) input mode
    * History input mode

  - libuim
    * Support locale with EUC-JIS-2004 and EUC-JISX0213 encodings

  - generic-predict
    * Add support for completion with Google Suggest

* Others
  - GTK+2 bridge
    * Discard support for version below 2.14.


(obache)
diff -r1.48 -r1.49 pkgsrc/inputmethod/uim/Makefile
diff -r1.5 -r1.6 pkgsrc/inputmethod/uim/Makefile.common
diff -r1.17 -r1.18 pkgsrc/inputmethod/uim/PLIST
diff -r1.18 -r1.19 pkgsrc/inputmethod/uim/distinfo
diff -r1.23 -r1.24 pkgsrc/inputmethod/uim/options.mk
diff -r1.5 -r1.6 pkgsrc/inputmethod/uim-elisp/Makefile
cvs diff -r1.48 -r1.49 pkgsrc/inputmethod/uim/Makefile (expand / switch to unified diff)

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

--- pkgsrc/inputmethod/uim/Makefile.common 2011/04/13 13:45:16 1.5
+++ pkgsrc/inputmethod/uim/Makefile.common 2011/05/29 06:13:57 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile.common,v 1.5 2011/04/13 13:45:16 obache Exp $ 1# $NetBSD: Makefile.common,v 1.6 2011/05/29 06:13:57 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.6.1 6UIM_VERSION= 1.7.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.17 -r1.18 pkgsrc/inputmethod/uim/PLIST (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/PLIST 2011/04/13 13:45:16 1.17
+++ pkgsrc/inputmethod/uim/PLIST 2011/05/29 06:13:57 1.18
@@ -1,77 +1,87 @@ @@ -1,77 +1,87 @@
1@comment $NetBSD: PLIST,v 1.17 2011/04/13 13:45:16 obache Exp $ 1@comment $NetBSD: PLIST,v 1.18 2011/05/29 06:13:57 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.uim-dict-gtk3}bin/uim-dict-gtk3
5${PLIST.fep}bin/uim-fep 6${PLIST.fep}bin/uim-fep
6${PLIST.fep}bin/uim-fep-tick 7${PLIST.fep}bin/uim-fep-tick
7bin/uim-help 8bin/uim-help
8${PLIST.gtk}bin/uim-im-switcher-gtk 9${PLIST.gtk}bin/uim-im-switcher-gtk
 10${PLIST.gtk3}bin/uim-im-switcher-gtk3
9${PLIST.qt3}bin/uim-im-switcher-qt 11${PLIST.qt3}bin/uim-im-switcher-qt
10${PLIST.qt}bin/uim-im-switcher-qt4 12${PLIST.qt}bin/uim-im-switcher-qt4
11${PLIST.gtk}bin/uim-input-pad-ja 13${PLIST.gtk}bin/uim-input-pad-ja
 14${PLIST.gtk3}bin/uim-input-pad-ja-gtk3
12${PLIST.m17nlib}bin/uim-m17nlib-relink-icons 15${PLIST.m17nlib}bin/uim-m17nlib-relink-icons
13bin/uim-module-manager 16bin/uim-module-manager
14${PLIST.gtk}bin/uim-pref-gtk 17${PLIST.gtk}bin/uim-pref-gtk
 18${PLIST.gtk3}bin/uim-pref-gtk3
15${PLIST.qt3}bin/uim-pref-qt 19${PLIST.qt3}bin/uim-pref-qt
16${PLIST.qt}bin/uim-pref-qt4 20${PLIST.qt}bin/uim-pref-qt4
17bin/uim-sh 21bin/uim-sh
18${PLIST.gtk}bin/uim-toolbar-gtk 22${PLIST.gtk}bin/uim-toolbar-gtk
19${PLIST.gtk}bin/uim-toolbar-gtk-systray 23${PLIST.gtk}bin/uim-toolbar-gtk-systray
 24${PLIST.gtk3}bin/uim-toolbar-gtk3
 25${PLIST.gtk3}bin/uim-toolbar-gtk3-systray
20${PLIST.qt3}bin/uim-toolbar-qt 26${PLIST.qt3}bin/uim-toolbar-qt
21${PLIST.qt}bin/uim-toolbar-qt4 27${PLIST.qt}bin/uim-toolbar-qt4
22${PLIST.xim}bin/uim-xim 28${PLIST.xim}bin/uim-xim
23include/uim/dynlib.h 29include/uim/dynlib.h
24include/uim/uim-custom.h 30include/uim/uim-custom.h
25include/uim/uim-helper.h 31include/uim/uim-helper.h
26include/uim/uim-im-switcher.h 32include/uim/uim-im-switcher.h
27include/uim/uim-notify.h 33include/uim/uim-notify.h
28include/uim/uim-posix.h 34include/uim/uim-posix.h
29include/uim/uim-scm-abbrev.h 35include/uim/uim-scm-abbrev.h
30include/uim/uim-scm.h 36include/uim/uim-scm.h
31include/uim/uim-util.h 37include/uim/uim-util.h
32include/uim/uim.h 38include/uim/uim.h
33${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server 39${PLIST.gnome}lib/bonobo/servers/GNOME_UimApplet.server
34${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la 40${PLIST.gtk}lib/gtk-2.0/2.10.0/immodules/im-uim.la
 41${PLIST.gtk3}lib/gtk-3.0/3.0.0/immodules/im-uim.la
35${PLIST.kde3}lib/kde3/uim_panelapplet.la 42${PLIST.kde3}lib/kde3/uim_panelapplet.la
36${PLIST.kde}lib/kde4/uim_panelapplet.la 43${PLIST.kde}lib/kde4/uim_panelapplet.la
37lib/libuim-custom.la 44lib/libuim-custom.la
38lib/libuim-scm.la 45lib/libuim-scm.la
39lib/libuim.la 46lib/libuim.la
40lib/pkgconfig/uim.pc 47lib/pkgconfig/uim.pc
41${PLIST.anthy}lib/uim/plugin/libuim-anthy.la 48${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
42${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la 49${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la
43${PLIST.curl}lib/uim/plugin/libuim-curl.la 50${PLIST.curl}lib/uim/plugin/libuim-curl.la
44lib/uim/plugin/libuim-custom-enabler.la 51lib/uim/plugin/libuim-custom-enabler.la
45${PLIST.eb}lib/uim/plugin/libuim-eb.la 52${PLIST.eb}lib/uim/plugin/libuim-eb.la
46${PLIST.editline}lib/uim/plugin/libuim-editline.la 53${PLIST.editline}lib/uim/plugin/libuim-editline.la
47${PLIST.expat}lib/uim/plugin/libuim-expat.la 54${PLIST.expat}lib/uim/plugin/libuim-expat.la
48${PLIST.ffi}lib/uim/plugin/libuim-ffi.la 55${PLIST.ffi}lib/uim/plugin/libuim-ffi.la
49lib/uim/plugin/libuim-fileio.la 56lib/uim/plugin/libuim-fileio.la
50lib/uim/plugin/libuim-lolevel.la 57lib/uim/plugin/libuim-lolevel.la
51lib/uim/plugin/libuim-look.la 58lib/uim/plugin/libuim-look.la
52${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la 59${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la
53${PLIST.openssl}lib/uim/plugin/libuim-openssl.la 60${PLIST.openssl}lib/uim/plugin/libuim-openssl.la
54${PLIST.sqlite}lib/uim/plugin/libuim-sqlite3.la 61${PLIST.sqlite}lib/uim/plugin/libuim-sqlite3.la
55lib/uim/plugin/libuim-process.la 62lib/uim/plugin/libuim-process.la
56lib/uim/plugin/libuim-skk.la 63lib/uim/plugin/libuim-skk.la
57lib/uim/plugin/libuim-socket.la 64lib/uim/plugin/libuim-socket.la
58${PLIST.wnn}lib/uim/plugin/libuim-wnn.la 65${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
59${PLIST.gtk}libexec/uim-candwin-gtk 66${PLIST.gtk}libexec/uim-candwin-gtk
 67${PLIST.gtk3}libexec/uim-candwin-gtk3
60${PLIST.qt3}libexec/uim-candwin-qt 68${PLIST.qt3}libexec/uim-candwin-qt
61${PLIST.qt}libexec/uim-candwin-qt4 69${PLIST.qt}libexec/uim-candwin-qt4
62${PLIST.gtk}libexec/uim-candwin-tbl-gtk 70${PLIST.gtk}libexec/uim-candwin-tbl-gtk
 71${PLIST.gtk3}libexec/uim-candwin-tbl-gtk3
63libexec/uim-helper-server 72libexec/uim-helper-server
64${PLIST.gnome}libexec/uim-toolbar-applet 73${PLIST.gnome}libexec/uim-toolbar-applet
 74${PLIST.gnome3}libexec/uim-toolbar-applet-gnome3
65${PLIST.xim}man/man1/uim-xim.1 75${PLIST.xim}man/man1/uim-xim.1
66${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la 76${PLIST.qt}qt4/plugins/inputmethods/libuiminputcontextplugin.la
67share/applications/uim.desktop 77share/applications/uim.desktop
68share/doc/uim/COMPATIBILITY 78share/doc/uim/COMPATIBILITY
69share/doc/uim/CUSTOM 79share/doc/uim/CUSTOM
70share/doc/uim/DOT-UIM 80share/doc/uim/DOT-UIM
71share/doc/uim/HELPER-CANDWIN 81share/doc/uim/HELPER-CANDWIN
72share/doc/uim/HELPER-PROTOCOL 82share/doc/uim/HELPER-PROTOCOL
73share/doc/uim/KEY 83share/doc/uim/KEY
74share/doc/uim/PLUGIN 84share/doc/uim/PLUGIN
75share/doc/uim/README 85share/doc/uim/README
76share/doc/uim/UIM-SCM 86share/doc/uim/UIM-SCM
77share/doc/uim/UIM-SH 87share/doc/uim/UIM-SH
@@ -119,27 +129,27 @@ share/uim/editline.scm @@ -119,27 +129,27 @@ share/uim/editline.scm
119share/uim/elatin-custom.scm 129share/uim/elatin-custom.scm
120share/uim/elatin-rules.scm 130share/uim/elatin-rules.scm
121share/uim/elatin.scm 131share/uim/elatin.scm
122share/uim/event.scm 132share/uim/event.scm
123share/uim/fileio.scm 133share/uim/fileio.scm
124share/uim/generic-custom.scm 134share/uim/generic-custom.scm
125share/uim/generic-key-custom.scm 135share/uim/generic-key-custom.scm
126share/uim/generic-predict.scm 136share/uim/generic-predict.scm
127share/uim/generic.scm 137share/uim/generic.scm
128share/uim/hangul.scm 138share/uim/hangul.scm
129share/uim/hangul2.scm 139share/uim/hangul2.scm
130share/uim/hangul3.scm 140share/uim/hangul3.scm
131${PLIST.helperdata}share/uim/helperdata/bushu.t 141${PLIST.helperdata}share/uim/helperdata/bushu.t
132${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml 142${PLIST.uim-dict-helperdata}share/uim/helperdata/uim-dict-ui.xml
133share/uim/http-client.scm 143share/uim/http-client.scm
134share/uim/http-server.scm 144share/uim/http-server.scm
135share/uim/i18n.scm 145share/uim/i18n.scm
136share/uim/ichar.scm 146share/uim/ichar.scm
137share/uim/im-custom.scm 147share/uim/im-custom.scm
138share/uim/im-switcher.scm 148share/uim/im-switcher.scm
139share/uim/im.scm 149share/uim/im.scm
140share/uim/init.scm 150share/uim/init.scm
141share/uim/input-parse.scm 151share/uim/input-parse.scm
142share/uim/installed-modules.scm 152share/uim/installed-modules.scm
143share/uim/ipa-x-sampa.scm 153share/uim/ipa-x-sampa.scm
144share/uim/iso-639-1.scm 154share/uim/iso-639-1.scm
145share/uim/japanese-act.scm 155share/uim/japanese-act.scm
@@ -327,26 +337,27 @@ share/uim/pixmaps/wb86.png @@ -327,26 +337,27 @@ share/uim/pixmaps/wb86.png
327share/uim/pixmaps/wb86.svg 337share/uim/pixmaps/wb86.svg
328share/uim/pixmaps/wb86_dark_background.png 338share/uim/pixmaps/wb86_dark_background.png
329share/uim/pixmaps/wb86_dark_background.svg 339share/uim/pixmaps/wb86_dark_background.svg
330share/uim/pixmaps/wnn.png 340share/uim/pixmaps/wnn.png
331share/uim/pixmaps/wnn.svg 341share/uim/pixmaps/wnn.svg
332share/uim/pixmaps/yahoo-jp.png 342share/uim/pixmaps/yahoo-jp.png
333share/uim/pixmaps/yahoo-jp.svg 343share/uim/pixmaps/yahoo-jp.svg
334share/uim/pixmaps/zm.png 344share/uim/pixmaps/zm.png
335share/uim/pixmaps/zm.svg 345share/uim/pixmaps/zm.svg
336share/uim/pixmaps/zm_dark_background.png 346share/uim/pixmaps/zm_dark_background.png
337share/uim/pixmaps/zm_dark_background.svg 347share/uim/pixmaps/zm_dark_background.svg
338share/uim/plugin.scm 348share/uim/plugin.scm
339share/uim/predict-custom.scm 349share/uim/predict-custom.scm
 350share/uim/predict-google-suggest.scm
340share/uim/predict-look-skk.scm 351share/uim/predict-look-skk.scm
341share/uim/predict-look.scm 352share/uim/predict-look.scm
342share/uim/predict-sqlite3.scm 353share/uim/predict-sqlite3.scm
343share/uim/pregexp.scm 354share/uim/pregexp.scm
344share/uim/prime-custom.scm 355share/uim/prime-custom.scm
345share/uim/prime-key-custom.scm 356share/uim/prime-key-custom.scm
346share/uim/prime.scm 357share/uim/prime.scm
347share/uim/process.scm 358share/uim/process.scm
348share/uim/py.scm 359share/uim/py.scm
349share/uim/pyload.scm 360share/uim/pyload.scm
350share/uim/pyunihan.scm 361share/uim/pyunihan.scm
351share/uim/rk.scm 362share/uim/rk.scm
352share/uim/romaja.scm 363share/uim/romaja.scm
cvs diff -r1.18 -r1.19 pkgsrc/inputmethod/uim/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/distinfo 2011/04/13 13:45:16 1.18
+++ pkgsrc/inputmethod/uim/distinfo 2011/05/29 06:13:57 1.19
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.18 2011/04/13 13:45:16 obache Exp $ 1$NetBSD: distinfo,v 1.19 2011/05/29 06:13:57 obache Exp $
2 2
3SHA1 (uim-1.6.1.tar.bz2) = 412bb2df6041185084e2f64fb73357389bf992b5 3SHA1 (uim-1.7.0.tar.bz2) = b79ed80c2557e804e6d3d2771a213a29cd932a73
4RMD160 (uim-1.6.1.tar.bz2) = 26c4e30f59c8eb005189d6778333079c81f8489c 4RMD160 (uim-1.7.0.tar.bz2) = e866f4270e60d0590a0a37331f3ccf64d7e48fbf
5Size (uim-1.6.1.tar.bz2) = 6192431 bytes 5Size (uim-1.7.0.tar.bz2) = 6402469 bytes
6SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5 6SHA1 (patch-ab) = d5bf71cf3ecea94bed70e05c1b0e6f77ac5766c5
7SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791 7SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
cvs diff -r1.23 -r1.24 pkgsrc/inputmethod/uim/options.mk (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim/options.mk 2011/04/13 13:45:16 1.23
+++ pkgsrc/inputmethod/uim/options.mk 2011/05/29 06:13:57 1.24
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: options.mk,v 1.23 2011/04/13 13:45:16 obache Exp $ 1# $NetBSD: options.mk,v 1.24 2011/05/29 06:13:57 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.uim 3PKG_OPTIONS_VAR= PKG_OPTIONS.uim
4#PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep wnn xim 4#PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 m17nlib openssl prime sj3 sqlite uim-fep wnn xim
5PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gtk m17nlib openssl prime sj3 sqlite uim-fep xim 5PKG_SUPPORTED_OPTIONS= anthy canna curl eb expat ffi gnome gnome3 gtk gtk3 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 gtk uim-fep xim 9PKG_SUGGESTED_OPTIONS= anthy 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 uim-dict-gtk3 uim-dict-helperdata fep
25PLIST_VARS+= anthy curl eb expat ffi gnome gtk kde kde3 m17nlib openssl qt qt3 sqlite wnn xim 25PLIST_VARS+= anthy curl eb expat ffi gnome gnome3 gtk gtk3 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
@@ -90,41 +90,64 @@ PLIST.expat= yes @@ -90,41 +90,64 @@ PLIST.expat= yes
90. include "../../devel/libffi/buildlink3.mk" 90. include "../../devel/libffi/buildlink3.mk"
91CONFIGURE_ARGS+= --with-ffi 91CONFIGURE_ARGS+= --with-ffi
92PLIST.ffi= yes 92PLIST.ffi= yes
93.endif 93.endif
94 94
95.if !empty(PKG_OPTIONS:Mgnome) 95.if !empty(PKG_OPTIONS:Mgnome)
96. include "../../x11/gnome-panel/buildlink3.mk" 96. include "../../x11/gnome-panel/buildlink3.mk"
97. include "../../devel/libgnomeui/buildlink3.mk" 97. include "../../devel/libgnomeui/buildlink3.mk"
98PLIST.gnome= yes 98PLIST.gnome= yes
99.else 99.else
100CONFIGURE_ARGS+= --disable-gnome-applet 100CONFIGURE_ARGS+= --disable-gnome-applet
101.endif 101.endif
102 102
 103# No gnome3 packages
 104#.if !empty(PKG_OPTIONS:Mgnome3)
 105#. include "../../x11/gnome-panel/buildlink3.mk"
 106#. include "../../devel/libgnomeui/buildlink3.mk"
 107#CONFIGURE_ARGS+= --enable-gnome3-applet
 108#PLIST.gnome3= yes
 109#.endif
 110
103.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome) 111.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
104GTK2_IMMODULES= YES 112GTK2_IMMODULES= YES
105.include "../../x11/gtk2/modules.mk" 113.include "../../x11/gtk2/modules.mk"
106PLIST.gtk= yes 114PLIST.gtk= yes
107. if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna) 115. if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna)
108. if !empty(PKG_OPTIONS:Mcanna) 116. if !empty(PKG_OPTIONS:Mcanna)
109. include "../../inputmethod/canna-lib/buildlink3.mk" 117. include "../../inputmethod/canna-lib/buildlink3.mk"
110. endif 118. endif
111CONFIGURE_ARGS+= --enable-dict 119CONFIGURE_ARGS+= --enable-dict
112PLIST.uim-dict-gtk= yes 120PLIST.uim-dict-gtk= yes
 121PLIST.uim-dict-helperdata= yes
113. endif 122. endif
114.else 123.else
115CONFIGURE_ARGS+= --without-gtk2 124CONFIGURE_ARGS+= --without-gtk2
116.endif 125.endif
117 126
 127.if !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
 128GTK3_IMMODULES= YES
 129.include "../../x11/gtk3/modules.mk"
 130PLIST.gtk3= yes
 131. if !empty(PKG_OPTIONS:Manthy) || !empty(PKG_OPTIONS:Mcanna)
 132. if !empty(PKG_OPTIONS:Mcanna)
 133. include "../../inputmethod/canna-lib/buildlink3.mk"
 134. endif
 135CONFIGURE_ARGS+= --enable-dict
 136PLIST.uim-dict-gtk3= yes
 137PLIST.uim-dict-helperdata= yes
 138. endif
 139.endif
 140
118.if !empty(PKG_OPTIONS:Mkde3) 141.if !empty(PKG_OPTIONS:Mkde3)
119. include "../../x11/kdelibs3/buildlink3.mk" 142. include "../../x11/kdelibs3/buildlink3.mk"
120. include "../../x11/qt3-libs/buildlink3.mk" 143. include "../../x11/qt3-libs/buildlink3.mk"
121CONFIGURE_ARGS+= --enable-kde-applet 144CONFIGURE_ARGS+= --enable-kde-applet
122PLIST.kde3= yes 145PLIST.kde3= yes
123.endif 146.endif
124 147
125.if !empty(PKG_OPTIONS:Mkde) 148.if !empty(PKG_OPTIONS:Mkde)
126. include "../../x11/kdelibs4/buildlink3.mk" 149. include "../../x11/kdelibs4/buildlink3.mk"
127. include "../../x11/qt4-libs/buildlink3.mk" 150. include "../../x11/qt4-libs/buildlink3.mk"
128CONFIGURE_ARGS+= --enable-kde4-applet 151CONFIGURE_ARGS+= --enable-kde4-applet
129PLIST.kde= yes 152PLIST.kde= yes
130.else 153.else
@@ -181,18 +204,20 @@ CONFIGURE_ARGS+= --with-sqlite3 @@ -181,18 +204,20 @@ CONFIGURE_ARGS+= --with-sqlite3
181PLIST.sqlite= yes 204PLIST.sqlite= yes
182.endif 205.endif
183 206
184#.if !empty(PKG_OPTIONS:Mwnn) 207#.if !empty(PKG_OPTIONS:Mwnn)
185#. include "../../inputmethod/ja-freewnn-lib/buildlink3.mk" 208#. include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
186#CONFIGURE_ARGS+= --with-wnn 209#CONFIGURE_ARGS+= --with-wnn
187#CONFIGURE_ARGS+= --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn 210#CONFIGURE_ARGS+= --with-wnn-includes=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/include/wnn
188#CONFIGURE_ARGS+= --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib 211#CONFIGURE_ARGS+= --with-wnn-libraries=${BUILDLINK_PREFIX.ja-FreeWnn-lib}/lib
189#PLIST.wnn= yes 212#PLIST.wnn= yes
190#.endif 213#.endif
191 214
192.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome) 215.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mgnome)
193CONFIGURE_ARGS+= --enable-default-toolkit=gtk 216CONFIGURE_ARGS+= --enable-default-toolkit=gtk
 217.elif !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mgnome3)
 218CONFIGURE_ARGS+= --enable-default-toolkit=gtk3
194.elif !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde) 219.elif !empty(PKG_OPTIONS:Mqt) || !empty(PKG_OPTIONS:Mkde)
195CONFIGURE_ARGS+= --enable-default-toolkit=qt4 220CONFIGURE_ARGS+= --enable-default-toolkit=qt4
196.elif !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3) 221.elif !empty(PKG_OPTIONS:Mqt3) || !empty(PKG_OPTIONS:Mkde3)
197CONFIGURE_ARGS+= --enable-default-toolkit=qt 222CONFIGURE_ARGS+= --enable-default-toolkit=qt
198.endif 223.endif
cvs diff -r1.5 -r1.6 pkgsrc/inputmethod/uim-elisp/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/inputmethod/uim-elisp/Attic/Makefile 2011/04/22 13:43:58 1.5
+++ pkgsrc/inputmethod/uim-elisp/Attic/Makefile 2011/05/29 06:13:57 1.6
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2011/04/22 13:43:58 obache Exp $ 1# $NetBSD: Makefile,v 1.6 2011/05/29 06:13:57 obache Exp $
2 2
3.include "../../inputmethod/uim/Makefile.common" 3.include "../../inputmethod/uim/Makefile.common"
4PKGNAME= ${EMACS_PKGNAME_PREFIX}uim-elisp-${UIM_VERSION} 4PKGNAME= ${EMACS_PKGNAME_PREFIX}uim-elisp-${UIM_VERSION}
5PKGREVISION= 1 
6CATEGORIES= inputmethod editors 5CATEGORIES= inputmethod editors
7 6
8COMMENT= Emacs LISP for inputmethod/uim 7COMMENT= Emacs LISP for inputmethod/uim
9 8
10PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
11 10
12USE_TOOLS+= gmake intltool msgfmt pkg-config  11USE_TOOLS+= gmake intltool msgfmt pkg-config
13USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
14GNU_CONFIGURE= YES 13GNU_CONFIGURE= YES
15CONFIGURE_ARGS+= --with-libgcroots=installed 14CONFIGURE_ARGS+= --with-libgcroots=installed
16CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX} 15CONFIGURE_ARGS+= --with-lispdir=${EMACS_LISPPREFIX}
17CONFIGURE_ARGS+= --without-x 16CONFIGURE_ARGS+= --without-x
18CONFIGURE_ARGS+= --with-libedit=no 17CONFIGURE_ARGS+= --with-libedit=no