Hi, Here's an update to uim 1.5.3. Please test, thanks! I tested it on amd64 with uim-chewing.
Kevin
diff -ruN uim.orig/Makefile uim/Makefile --- uim.orig/Makefile Fri Oct 3 15:54:37 2008 +++ uim/Makefile Mon Oct 6 12:55:18 2008 @@ -8,15 +8,15 @@ SHARED_ONLY= Yes CATEGORIES= inputmethods japanese chinese -V= 1.4.1 +V= 1.5.3 DISTNAME= uim-$V -MASTER_SITES= http://uim.freedesktop.org/releases/uim/stable/ -HOMEPAGE= http://uim.freedesktop.org/wiki/ -PKGNAME-main= uim-$Vp0 -PKGNAME-gtk= uim-gtk-$Vp1 -PKGNAME-qt= uim-qt-$Vp1 +MASTER_SITES= http://uim.googlecode.com/files/ +HOMEPAGE= http://code.google.com/p/uim/ +PKGNAME-main= uim-$V +PKGNAME-gtk= uim-gtk-$V +PKGNAME-qt= uim-qt-$V PKGNAME-kde= uim-kde-$V -PKGNAME-gnome= uim-gnome-$Vp0 +PKGNAME-gnome= uim-gnome-$V # BSD PERMIT_PACKAGE_CDROM= Yes @@ -24,8 +24,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_FTP= Yes -SHARED_LIBS += gcroots 0.0 # .0.0 -SHARED_LIBS += uim 1.0 # .5.0 +SHARED_LIBS += gcroots 0.0 # .1.0 +SHARED_LIBS += uim-scm 0.0 # .0.0 +SHARED_LIBS += uim 1.0 # .6.0 SHARED_LIBS += uim-custom 0.0 # .2.0 MULTI_PACKAGES= -main -gtk -qt -kde -gnome @@ -34,11 +35,10 @@ MODULES=converters/libiconv devel/gettext x11/qt3 -USE_GMAKE=Yes -USE_LIBTOOL=Yes -USE_X11=Yes -AUTOCONF_VERSION= 2.61 -AUTOCONF_DIR= ${WRKDIST} ${WRKDIST}/sigscheme +USE_GMAKE= Yes +USE_LIBTOOL= Yes +USE_X11= Yes +AUTOCONF_VERSION= 2.62 SUBST_VARS= MODQT_PLUGINS @@ -93,10 +93,10 @@ CONFIGURE_ENV+= LDFLAGS='-L${MODQT_LIBDIR} -L${LOCALBASE}/lib -L${X11BASE}/lib' CONFIGURE_ENV+= QTDIR=${MODQT_QTDIR} QTPLUGINSDIR=${LOCALBASE}/${MODQT_PLUGINS} -CONFIGURE_ARGS= --without-canna --with-anthy --without-prime \ - --with-gtk2 --without-gnome2 \ - --with-qt --with-qt-immodule \ +CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ + --without-canna --with-anthy --without-prime \ + --with-gtk2 --with-qt --with-qt-immodule \ --enable-default-toolkit=gtk --without-m17nlib \ - --enable-pref --enable-dict - + --enable-pref --enable-dict + .include <bsd.port.mk> diff -ruN uim.orig/distinfo uim/distinfo --- uim.orig/distinfo Fri Oct 3 15:54:37 2008 +++ uim/distinfo Fri Oct 3 15:58:03 2008 @@ -1,5 +1,5 @@ -MD5 (uim-1.4.1.tar.gz) = acmIL4jI6uvMm/IjcPs/Gg== -RMD160 (uim-1.4.1.tar.gz) = h5aJsPTB3yKls+amJTrcUtR95vc= -SHA1 (uim-1.4.1.tar.gz) = dRWr7S2WEeiAWYOtW/r+gIqMk2A= -SHA256 (uim-1.4.1.tar.gz) = FOXfRvRTakv/+4C80Wi8hkm7JWLwWe3WNpqSrDgOx1I= -SIZE (uim-1.4.1.tar.gz) = 3564166 +MD5 (uim-1.5.3.tar.gz) = 5zzLzXVRneqcdfh3Xi538Q== +RMD160 (uim-1.5.3.tar.gz) = sJv+fC2w3XyDz2/SYYQkkDlY5/4= +SHA1 (uim-1.5.3.tar.gz) = 3hhcVQtVxOOUjtN6zMQSmLxs3Tw= +SHA256 (uim-1.5.3.tar.gz) = 4F5LveKN4CEu8UViDUnWv9YlxXAlbU8ACbrQ44T+DKU= +SIZE (uim-1.5.3.tar.gz) = 4309191 diff -ruN uim.orig/patches/patch-configure_ac uim/patches/patch-configure_ac --- uim.orig/patches/patch-configure_ac Fri Oct 3 15:54:37 2008 +++ uim/patches/patch-configure_ac Fri Oct 3 16:12:49 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2008/06/07 09:58:40 bernd Exp $ ---- configure.ac.orig Wed Mar 14 18:26:47 2007 -+++ configure.ac Sat Jun 7 11:37:24 2008 -@@ -794,15 +794,10 @@ if test x$use_qt = xyes ; then +--- configure.ac.orig Sun Sep 7 16:47:35 2008 ++++ configure.ac Fri Oct 3 16:09:47 2008 +@@ -1101,15 +1101,10 @@ if test x$use_qt = xyes ; then fi UIC=$HOST_UIC @@ -21,7 +21,7 @@ # Process for compiler & linker flags QT_CXXFLAGS="-I${QTINCDIR} -DQT_GENUINE_STR -DQT_NO_STL" -@@ -814,13 +809,10 @@ if test x$use_qt = xyes ; then +@@ -1121,13 +1116,10 @@ if test x$use_qt = xyes ; then LDFLAGS="$LDFLAGS $QT_LDFLAGS" AC_LANG_SAVE AC_LANG_CPLUSPLUS diff -ruN uim.orig/patches/patch-qt_Makefile_in uim/patches/patch-qt_Makefile_in --- uim.orig/patches/patch-qt_Makefile_in Fri Oct 3 15:54:37 2008 +++ uim/patches/patch-qt_Makefile_in Fri Oct 3 16:12:49 2008 @@ -1,12 +1,12 @@ $OpenBSD: patch-qt_Makefile_in,v 1.1 2007/04/08 14:58:04 espie Exp $ ---- qt/Makefile.in.orig Wed Mar 14 21:37:40 2007 -+++ qt/Makefile.in Sun Apr 8 13:15:24 2007 -@@ -564,7 +564,7 @@ EXTRA_DIST = pref-keyeditformbase.ui pref-olisteditfo - - @APPLET_KDE_TRUE@@[EMAIL PROTECTED] = [EMAIL PROTECTED]@ $(QT_CXXFLAGS) +--- qt/Makefile.in.orig Sun Sep 7 16:59:50 2008 ++++ qt/Makefile.in Fri Oct 3 16:12:40 2008 +@@ -613,7 +613,7 @@ EXTRA_DIST = pref-keyeditformbase.ui pref-olisteditfo @APPLET_KDE_TRUE@@[EMAIL PROTECTED] = -avoid-version -module -no-undefined -Wl,--no-undefined -Wl,--allow-shlib-undefined [EMAIL PROTECTED]@ $(QT_LDFLAGS) [EMAIL PROTECTED]@@[EMAIL PROTECTED] = $(top_builddir)/uim/libuim.la libtoolbarcommon.la -lkdeui -lkdecore [EMAIL PROTECTED]@@[EMAIL PROTECTED] = $(top_builddir)/uim/libuim.la libtoolbarcommon.la -lkdeui -lkdecore -Wl,-lc + @APPLET_KDE_TRUE@@[EMAIL PROTECTED] = $(top_builddir)/uim/libuim-scm.la \ + @APPLET_KDE_TRUE@@QT_TRUE@ $(top_builddir)/uim/libuim.la \ [EMAIL PROTECTED]@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore [EMAIL PROTECTED]@@QT_TRUE@ libtoolbarcommon.la -lkdeui -lkdecore -Wl,-lc + # Candidate Window - @[EMAIL PROTECTED] = candwin-qt.cpp candwin-qt.h qtgettext.h diff -ruN uim.orig/patches/patch-sigscheme_libgcroots_include_private_gcconfig_h uim/patches/patch-sigscheme_libgcroots_include_private_gcconfig_h --- uim.orig/patches/patch-sigscheme_libgcroots_include_private_gcconfig_h Fri Oct 3 15:54:37 2008 +++ uim/patches/patch-sigscheme_libgcroots_include_private_gcconfig_h Thu Jan 1 08:00:00 1970 @@ -1,25 +0,0 @@ -$OpenBSD: patch-sigscheme_libgcroots_include_private_gcconfig_h,v 1.2 2007/05/29 05:37:35 pvalchev Exp $ ---- sigscheme/libgcroots/include/private/gcconfig.h.orig Fri Jan 5 20:00:59 2007 -+++ sigscheme/libgcroots/include/private/gcconfig.h Mon May 28 23:36:16 2007 -@@ -83,6 +83,10 @@ - # define SPARC - # define mach_type_known - # endif -+# if defined(OPENBSD) && defined(__powerpc__) -+# define POWERPC -+# define mach_type_known -+# endif - # if defined(NETBSD) && (defined(m68k) || defined(__m68k__)) - # define M68K - # define mach_type_known -@@ -314,6 +318,10 @@ - # if defined(__OpenBSD__) && (defined(i386) || defined(__i386__)) - # define I386 - # define OPENBSD -+# define mach_type_known -+# endif -+# if defined(__OpenBSD__) && defined(__x86_64__) -+# define X86_64 - # define mach_type_known - # endif - # if defined(FREEBSD) && (defined(i386) || defined(__i386__)) diff -ruN uim.orig/patches/patch-sigscheme_m4_ax_feature_configurator_m4 uim/patches/patch-sigscheme_m4_ax_feature_configurator_m4 --- uim.orig/patches/patch-sigscheme_m4_ax_feature_configurator_m4 Fri Oct 3 15:54:37 2008 +++ uim/patches/patch-sigscheme_m4_ax_feature_configurator_m4 Thu Jan 1 08:00:00 1970 @@ -1,12 +0,0 @@ -$OpenBSD: patch-sigscheme_m4_ax_feature_configurator_m4,v 1.1 2007/04/08 14:58:04 espie Exp $ ---- sigscheme/m4/ax_feature_configurator.m4.orig Sun Dec 24 08:48:31 2006 -+++ sigscheme/m4/ax_feature_configurator.m4 Sun Apr 8 12:41:37 2007 -@@ -225,7 +225,7 @@ AC_DEFUN([AX_FEATURE_DETECT_CONFLICTS], [ - _ax_feature_list_expanded='' - for feature in $ax_feature_list_all; do - _ax_feature_val=AS_VAR_GET(AX_FEATURE_PREFIX_VAR[]$feature) -- _ax_feature_val=${_ax_feature_val:no} -+ _ax_feature_val=${_ax_feature_val:-no} - if test "x$_ax_feature_val" != xno; then - _ax_feature_list_expanded="$_ax_feature_list_expanded $feature" - fi diff -ruN uim.orig/pkg/PLIST-gnome uim/pkg/PLIST-gnome --- uim.orig/pkg/PLIST-gnome Fri Oct 3 15:54:37 2008 +++ uim/pkg/PLIST-gnome Fri Oct 3 16:26:58 2008 @@ -1,2 +1,2 @@ @comment $OpenBSD: PLIST-gnome,v 1.1 2007/04/08 14:58:04 espie Exp $ -libexec/uim-toolbar-applet [EMAIL PROTECTED] libexec/uim-toolbar-applet diff -ruN uim.orig/pkg/PLIST-gtk uim/pkg/PLIST-gtk --- uim.orig/pkg/PLIST-gtk Fri Oct 3 15:54:37 2008 +++ uim/pkg/PLIST-gtk Fri Oct 3 16:26:58 2008 @@ -1,19 +1,16 @@ @comment $OpenBSD: PLIST-gtk,v 1.3 2007/05/14 13:20:12 msf Exp $ -bin/uim-dict-gtk -bin/uim-im-switcher-gtk -bin/uim-input-pad-ja -bin/uim-pref-gtk -bin/uim-toolbar-gtk -bin/uim-toolbar-gtk-systray [EMAIL PROTECTED] lib/gtk-2.0/2.10.0/immodules/im-uim.a [EMAIL PROTECTED] lib/gtk-2.0/2.10.0/immodules/im-uim.la [EMAIL PROTECTED] bin/uim-dict-gtk [EMAIL PROTECTED] bin/uim-im-switcher-gtk [EMAIL PROTECTED] bin/uim-input-pad-ja [EMAIL PROTECTED] bin/uim-pref-gtk [EMAIL PROTECTED] bin/uim-toolbar-gtk [EMAIL PROTECTED] bin/uim-toolbar-gtk-systray lib/bonobo/ lib/bonobo/servers/ lib/bonobo/servers/GNOME_UimApplet.server -lib/gtk-2.0/ -lib/gtk-2.0/2.10.0/ -lib/gtk-2.0/2.10.0/immodules/ [EMAIL PROTECTED] lib/gtk-2.0/2.10.0/immodules/im-uim.a [EMAIL PROTECTED] lib/gtk-2.0/2.10.0/immodules/im-uim.la lib/gtk-2.0/2.10.0/immodules/im-uim.so -libexec/uim-candwin-gtk [EMAIL PROTECTED] libexec/uim-candwin-gtk @exec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules @unexec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules diff -ruN uim.orig/pkg/PLIST-kde uim/pkg/PLIST-kde --- uim.orig/pkg/PLIST-kde Fri Oct 3 15:54:37 2008 +++ uim/pkg/PLIST-kde Fri Oct 3 16:26:58 2008 @@ -1,9 +1,7 @@ @comment $OpenBSD: PLIST-kde,v 1.1 2007/04/08 14:58:04 espie Exp $ -lib/kde3/ lib/kde3/uim_panelapplet.a lib/kde3/uim_panelapplet.la lib/kde3/uim_panelapplet.so -share/apps/ share/apps/kicker/ share/apps/kicker/applets/ share/apps/kicker/applets/uimapplet.desktop diff -ruN uim.orig/pkg/PLIST-main uim/pkg/PLIST-main --- uim.orig/pkg/PLIST-main Fri Oct 3 15:54:37 2008 +++ uim/pkg/PLIST-main Mon Oct 6 13:07:22 2008 @@ -1,45 +1,47 @@ @comment $OpenBSD: PLIST-main,v 1.3 2007/12/18 15:56:16 ajacoutot Exp $ @pkgpath inputmethods/uim -bin/uim-el-agent -bin/uim-el-helper-agent -bin/uim-fep -bin/uim-fep-tick -bin/uim-module-manager -bin/uim-sh -bin/uim-xim [EMAIL PROTECTED] bin/uim-el-agent [EMAIL PROTECTED] bin/uim-el-helper-agent [EMAIL PROTECTED] bin/uim-fep [EMAIL PROTECTED] bin/uim-fep-tick [EMAIL PROTECTED] bin/uim-module-manager [EMAIL PROTECTED] bin/uim-sh [EMAIL PROTECTED] bin/uim-xim include/gcroots.h -include/libgcroots/ -include/sigscheme/ -include/sigscheme/config-old.h -include/sigscheme/config.h -include/sigscheme/encoding-dummy.h -include/sigscheme/global.h -include/sigscheme/scmint.h -include/sigscheme/sigscheme.h -include/sigscheme/storage-common.h -include/sigscheme/storage-compact.h include/uim/ include/uim/plugin.h -include/uim/uim-compat-scm.h include/uim/uim-custom.h include/uim/uim-helper.h include/uim/uim-im-switcher.h +include/uim/uim-notify.h +include/uim/uim-posix.h +include/uim/uim-scm-abbrev.h include/uim/uim-scm.h include/uim/uim-util.h include/uim/uim.h +lib/gtk-2.0/ +lib/gtk-2.0/2.10.0/ +lib/gtk-2.0/2.10.0/immodules/ +lib/kde3/ lib/libgcroots.a lib/libgcroots.la @lib lib/libgcroots.so.${LIBgcroots_VERSION} lib/libuim-custom.a lib/libuim-custom.la @lib lib/libuim-custom.so.${LIBuim-custom_VERSION} +lib/libuim-scm.a +lib/libuim-scm.la [EMAIL PROTECTED] lib/libuim-scm.so.${LIBuim-scm_VERSION} lib/libuim.a lib/libuim.la @lib lib/libuim.so.${LIBuim_VERSION} lib/pkgconfig/gcroots.pc -lib/pkgconfig/sigscheme.pc lib/pkgconfig/uim.pc +lib/qt3/ +${MODQT_PLUGINS}/ +${MODQT_PLUGINS}/inputmethods/ lib/uim/ +lib/uim/notify/ lib/uim/plugin/ lib/uim/plugin/libuim-anthy.a lib/uim/plugin/libuim-anthy.la @@ -47,30 +49,16 @@ lib/uim/plugin/libuim-custom-enabler.a lib/uim/plugin/libuim-custom-enabler.la lib/uim/plugin/libuim-custom-enabler.so +lib/uim/plugin/libuim-look.a +lib/uim/plugin/libuim-look.la +lib/uim/plugin/libuim-look.so lib/uim/plugin/libuim-skk.a lib/uim/plugin/libuim-skk.la lib/uim/plugin/libuim-skk.so -libexec/uim-helper-server [EMAIL PROTECTED] libexec/uim-helper-server @man man/man1/uim-xim.1 -share/applications/ share/applications/uim.desktop -share/doc/sigscheme/ -share/doc/sigscheme/design.html -share/doc/sigscheme/design.txt -share/doc/sigscheme/gc-protection.html -share/doc/sigscheme/gc-protection.txt -share/doc/sigscheme/global-obj.html -share/doc/sigscheme/global-obj.txt -share/doc/sigscheme/index.html -share/doc/sigscheme/index.txt -share/doc/sigscheme/release.html -share/doc/sigscheme/release.txt -share/doc/sigscheme/spec.html -share/doc/sigscheme/spec.txt -share/doc/sigscheme/style.html -share/doc/sigscheme/style.txt -share/doc/sigscheme/test-c.html -share/doc/sigscheme/test-c.txt +share/apps/ share/emacs/site-lisp/uim-el/ share/emacs/site-lisp/uim-el/uim-candidate.el share/emacs/site-lisp/uim-el/uim-debug.el @@ -81,6 +69,7 @@ share/emacs/site-lisp/uim-el/uim-preedit.el share/emacs/site-lisp/uim-el/uim-util.el share/emacs/site-lisp/uim-el/uim-var.el +share/emacs/site-lisp/uim-el/uim-version.el share/emacs/site-lisp/uim-el/uim.el share/locale/fr/LC_MESSAGES/uim.mo share/locale/ja/LC_MESSAGES/uim-chardict-qt.mo @@ -90,6 +79,8 @@ share/uim/action.scm share/uim/anthy-custom.scm share/uim/anthy-key-custom.scm +share/uim/anthy-utf8-custom.scm +share/uim/anthy-utf8.scm share/uim/anthy.scm share/uim/byeoru-custom.scm share/uim/byeoru-dic.scm @@ -102,7 +93,12 @@ share/uim/custom-rt.scm share/uim/custom.scm share/uim/default.scm +share/uim/deprecated-util.scm share/uim/direct.scm +share/uim/editline.scm +share/uim/elatin-custom.scm +share/uim/elatin-rules.scm +share/uim/elatin.scm share/uim/generic-custom.scm share/uim/generic-key-custom.scm share/uim/generic.scm @@ -113,20 +109,34 @@ share/uim/helperdata/bushu.t share/uim/helperdata/uim-dict-ui.xml share/uim/i18n.scm +share/uim/ichar.scm share/uim/im-custom.scm share/uim/im-switcher.scm share/uim/im.scm share/uim/init.scm share/uim/installed-modules.scm share/uim/ipa-x-sampa.scm +share/uim/iso-639-1.scm share/uim/japanese-azik.scm share/uim/japanese-kana.scm share/uim/japanese.scm share/uim/key.scm share/uim/latin.scm share/uim/lazy-load.scm +share/uim/lib/ +share/uim/lib/sigscheme-init.scm +share/uim/lib/srfi-0.scm +share/uim/lib/srfi-1.scm +share/uim/lib/srfi-43.scm +share/uim/lib/srfi-55.scm +share/uim/lib/srfi-69.scm +share/uim/lib/srfi-9.scm +share/uim/lib/srfi-95.scm +share/uim/lib/unittest.scm share/uim/load-action.scm share/uim/loader.scm +share/uim/look-custom.scm +share/uim/look.scm share/uim/m17nlib.scm share/uim/mana-custom.scm share/uim/mana-key-custom.scm @@ -141,6 +151,8 @@ share/uim/pixmaps/direct.svg share/uim/pixmaps/direct_input.png share/uim/pixmaps/direct_input.svg +share/uim/pixmaps/elatin.png +share/uim/pixmaps/elatin.svg share/uim/pixmaps/hangul2.png share/uim/pixmaps/hangul2.svg share/uim/pixmaps/hangul3.png @@ -180,6 +192,8 @@ share/uim/pixmaps/ko_hangulword.svg share/uim/pixmaps/latin.png share/uim/pixmaps/latin.svg +share/uim/pixmaps/look.png +share/uim/pixmaps/look.svg share/uim/pixmaps/mana.png share/uim/pixmaps/mana.svg share/uim/pixmaps/null.png @@ -200,6 +214,8 @@ share/uim/pixmaps/romaja.svg share/uim/pixmaps/scim.png share/uim/pixmaps/scim.svg +share/uim/pixmaps/sj3.png +share/uim/pixmaps/sj3.svg share/uim/pixmaps/skk.png share/uim/pixmaps/skk.svg share/uim/pixmaps/tcode.png @@ -218,6 +234,8 @@ share/uim/pixmaps/unknown.svg share/uim/pixmaps/viqr.png share/uim/pixmaps/viqr.svg +share/uim/pixmaps/wnn.png +share/uim/pixmaps/wnn.svg share/uim/plugin.scm share/uim/prime-custom.scm share/uim/prime-key-custom.scm @@ -228,23 +246,29 @@ share/uim/rk.scm share/uim/romaja.scm share/uim/scim.scm +share/uim/sj3-custom.scm +share/uim/sj3-key-custom.scm +share/uim/sj3.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 -share/uim/spellcheck-custom.scm -share/uim/spellcheck.scm share/uim/tcode.scm share/uim/trycode.scm +share/uim/tutcode-bushudic.scm +share/uim/tutcode-custom.scm share/uim/tutcode-key-custom.scm +share/uim/tutcode-rule.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 share/uim/viqr.scm +share/uim/wnn-custom.scm +share/uim/wnn-key-custom.scm +share/uim/wnn.scm share/uim/zaurus.scm @exec %D/bin/update-desktop-database @unexec %D/bin/update-desktop-database diff -ruN uim.orig/pkg/PLIST-qt uim/pkg/PLIST-qt --- uim.orig/pkg/PLIST-qt Fri Oct 3 15:54:37 2008 +++ uim/pkg/PLIST-qt Fri Oct 3 16:26:58 2008 @@ -1,9 +1,9 @@ @comment $OpenBSD: PLIST-qt,v 1.1 2006/10/19 09:35:16 espie Exp $ -bin/uim-chardict-qt -bin/uim-im-switcher-qt -bin/uim-pref-qt -bin/uim-toolbar-qt [EMAIL PROTECTED] bin/uim-chardict-qt [EMAIL PROTECTED] bin/uim-im-switcher-qt [EMAIL PROTECTED] bin/uim-pref-qt [EMAIL PROTECTED] bin/uim-toolbar-qt @comment ${MODQT_PLUGINS}/inputmethods/libquiminputcontextplugin.a @comment ${MODQT_PLUGINS}/inputmethods/libquiminputcontextplugin.la ${MODQT_PLUGINS}/inputmethods/libquiminputcontextplugin.so -libexec/uim-candwin-qt [EMAIL PROTECTED] libexec/uim-candwin-qt