Update ibus to 1.3.9, ibus-anthy to 1.2.5 and ibus-skk to 1.3.5. Been using them for a bit without problems. OK?
f.- Index: ibus/Makefile =================================================================== RCS file: /cvs/ports/inputmethods/ibus/Makefile,v retrieving revision 1.11 diff -N -u -p ibus/Makefile --- ibus/Makefile 17 Nov 2010 08:05:16 -0000 1.11 +++ ibus/Makefile 9 Jan 2011 15:45:54 -0000 @@ -4,13 +4,13 @@ SHARED_ONLY = Yes COMMENT = intelligent input bus framework -DISTNAME = ibus-1.3.8 +DISTNAME = ibus-1.3.9 SHARED_LIBS = ibus 1.0 # 2.0 CATEGORIES = inputmethods chinese japanese korean -HOMEPAGE = http://ibus.googlecode.com/ +HOMEPAGE = http://code.google.com/p/ibus/ # LGPLv2+ PERMIT_PACKAGE_CDROM = Yes @@ -26,7 +26,7 @@ WANTLIB = GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamag pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs \ xcb xcb-render xcb-shm z -MASTER_SITES = ${HOMEPAGE}/files/ +MASTER_SITES = http://ibus.googlecode.com/files/ MODULES = devel/gconf2 \ devel/gettext \ @@ -50,8 +50,7 @@ USE_LIBTOOL = Yes LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --disable-silent-rules \ +CONFIGURE_ARGS = --disable-silent-rules \ --disable-vala \ --enable-introspection=no \ --enable-gtk-doc-html=no Index: ibus/distinfo =================================================================== RCS file: /cvs/ports/inputmethods/ibus/distinfo,v retrieving revision 1.2 diff -N -u -p ibus/distinfo --- ibus/distinfo 11 Nov 2010 09:42:11 -0000 1.2 +++ ibus/distinfo 9 Jan 2011 15:45:54 -0000 @@ -1,5 +1,5 @@ -MD5 (ibus-1.3.8.tar.gz) = bTRSaONJby5r46bzo7oZ6g== -RMD160 (ibus-1.3.8.tar.gz) = yaDRWdiBAydmbd0toYwZ7yTJEQY= -SHA1 (ibus-1.3.8.tar.gz) = wc8ciXvST4vs+lISfQWOq7sZm44= -SHA256 (ibus-1.3.8.tar.gz) = 2FB1F/XlukVLJmNYGxEz3yH9unSgd5AiWeGIRc3SRo0= -SIZE (ibus-1.3.8.tar.gz) = 1379038 +MD5 (ibus-1.3.9.tar.gz) = VzRaPBz+N844JfYiFnbc/g== +RMD160 (ibus-1.3.9.tar.gz) = jPhxLSk2m7GTTA2dZs5fFZU6YNA= +SHA1 (ibus-1.3.9.tar.gz) = PqqVvSqGyfriP9yA3XDSfw77cTg= +SHA256 (ibus-1.3.9.tar.gz) = snhKZoZm76iuBObxz/V0mRfNGK3Qo5odAg7Mnz31KF0= +SIZE (ibus-1.3.9.tar.gz) = 1380081 Index: ibus/patches/patch-bus_Makefile_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-bus_Makefile_in,v retrieving revision 1.1.1.1 diff -N -u -p ibus/patches/patch-bus_Makefile_in --- ibus/patches/patch-bus_Makefile_in 19 Aug 2010 18:56:14 -0000 1.1.1.1 +++ /dev/null 9 Jan 2011 15:00:54 -0000 @@ -1,27 +0,0 @@ -$OpenBSD: patch-bus_Makefile_in,v 1.1.1.1 2010/08/19 18:56:14 fgsch Exp $ ---- bus/Makefile.in.orig Tue Aug 3 10:00:31 2010 -+++ bus/Makefile.in Wed Aug 18 20:43:09 2010 -@@ -395,11 +395,6 @@ AM_LDADD = \ - $(libibus) \ - $(NULL) - --xdgautostart_DATA = \ -- ibus.desktop \ -- $(NULL) -- --xdgautostartdir = $(sysconfdir)/xdg/autostart - desktopdir = $(datadir)/applications - desktop_in_files = ibus.desktop.in - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) -@@ -1183,9 +1178,8 @@ $(libibus): - $(MAKE) -C $(top_builddir)/src - - test: ibus-daemon -- $(ENV) \ -- G_DEBUG=fatal_warnings \ -- $(builddir)/ibus-daemon -v -+ G_DEBUG=fatal_warnings \ -+ $(builddir)/ibus-daemon -v - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Index: ibus/patches/patch-setup_Makefile_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-setup_Makefile_in,v retrieving revision 1.1.1.1 diff -N -u -p ibus/patches/patch-setup_Makefile_in --- ibus/patches/patch-setup_Makefile_in 19 Aug 2010 18:56:14 -0000 1.1.1.1 +++ /dev/null 9 Jan 2011 15:00:54 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-setup_Makefile_in,v 1.1.1.1 2010/08/19 18:56:14 fgsch Exp $ ---- setup/Makefile.in.orig Tue Aug 3 10:00:32 2010 -+++ setup/Makefile.in Wed Aug 18 15:35:51 2010 -@@ -664,12 +664,11 @@ uninstall-am: uninstall-binSCRIPTS uninstall-desktopDA - @INTLTOOL_DESKTOP_RULE@ - - test: -- $(ENV) \ -- PYTHONPATH=$(top_srcdir) \ -- IBUS_PREFIX="@prefix@" \ -- IBUS_LOCALEDIR="@localedir@" \ -- $(PYTHON) \ -- $(srcdir)/main.py -+ PYTHONPATH=$(top_srcdir) \ -+ IBUS_PREFIX="@prefix@" \ -+ IBUS_LOCALEDIR="@localedir@" \ -+ $(PYTHON) \ -+ $(srcdir)/main.py - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Index: ibus/patches/patch-setup_ibus-setup_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-setup_ibus-setup_in,v retrieving revision 1.1.1.1 diff -N -u -p ibus/patches/patch-setup_ibus-setup_in --- ibus/patches/patch-setup_ibus-setup_in 19 Aug 2010 18:56:14 -0000 1.1.1.1 +++ /dev/null 9 Jan 2011 15:00:54 -0000 @@ -1,10 +0,0 @@ -$OpenBSD: patch-setup_ibus-setup_in,v 1.1.1.1 2010/08/19 18:56:14 fgsch Exp $ ---- setup/ibus-setup.in.orig Mon Aug 16 16:48:08 2010 -+++ setup/ibus-setup.in Mon Aug 16 16:48:29 2010 -@@ -26,5 +26,5 @@ datarootd...@datarootdir@ - export ibus_pref...@prefix@ - export ibus_datarootd...@datarootdir@ - export ibus_localed...@localedir@ --exec python @prefix@/share/ibus/setup/main.py $@ -+exec @PYTHON@ @prefix@/share/ibus/setup/main.py $@ - Index: ibus/patches/patch-ui_gtk_Makefile_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-ui_gtk_Makefile_in,v retrieving revision 1.1.1.1 diff -N -u -p ibus/patches/patch-ui_gtk_Makefile_in --- ibus/patches/patch-ui_gtk_Makefile_in 19 Aug 2010 18:56:14 -0000 1.1.1.1 +++ /dev/null 9 Jan 2011 15:00:54 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-ui_gtk_Makefile_in,v 1.1.1.1 2010/08/19 18:56:14 fgsch Exp $ ---- ui/gtk/Makefile.in.orig Tue Aug 3 10:00:33 2010 -+++ ui/gtk/Makefile.in Wed Aug 18 15:35:51 2010 -@@ -652,12 +652,12 @@ gtkpanel.xml: gtkpanel.xml.in - ) > $@ - - test: -- $(ENV) DBUS_DEBUG=true \ -- ibus_pref...@prefix@ \ -- ibus_datarootd...@datarootdir@ \ -- ibus_localed...@localedir@ \ -- PYTHONPATH=$(top_srcdir) \ -- $(PYTHON) $(srcdir)/main.py -+ DBUS_DEBUG=true \ -+ ibus_pref...@prefix@ \ -+ ibus_datarootd...@datarootdir@ \ -+ ibus_localed...@localedir@ \ -+ PYTHONPATH=$(top_srcdir) \ -+ $(PYTHON) $(srcdir)/main.py - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. Index: ibus/patches/patch-ui_gtk_ibus-ui-gtk_in =================================================================== RCS file: /cvs/ports/inputmethods/ibus/patches/patch-ui_gtk_ibus-ui-gtk_in,v retrieving revision 1.1.1.1 diff -N -u -p ibus/patches/patch-ui_gtk_ibus-ui-gtk_in --- ibus/patches/patch-ui_gtk_ibus-ui-gtk_in 19 Aug 2010 18:56:14 -0000 1.1.1.1 +++ /dev/null 9 Jan 2011 15:00:54 -0000 @@ -1,10 +0,0 @@ -$OpenBSD: patch-ui_gtk_ibus-ui-gtk_in,v 1.1.1.1 2010/08/19 18:56:14 fgsch Exp $ ---- ui/gtk/ibus-ui-gtk.in.orig Tue Aug 17 05:45:08 2010 -+++ ui/gtk/ibus-ui-gtk.in Tue Aug 17 05:45:36 2010 -@@ -27,5 +27,5 @@ export ibus_pref...@prefix@ - export ibus_datarootd...@datarootdir@ - export ibus_localed...@localedir@ - --exec python @prefix@/share/ibus/ui/gtk/main.py $@ -+exec @PYTHON@ @prefix@/share/ibus/ui/gtk/main.py $@ - Index: ibus-anthy/Makefile =================================================================== RCS file: /cvs/ports/inputmethods/ibus-anthy/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- ibus-anthy/Makefile 17 Nov 2010 08:05:16 -0000 1.4 +++ ibus-anthy/Makefile 9 Jan 2011 15:45:57 -0000 @@ -2,7 +2,7 @@ COMMENT = japanese input engine for ibus -DISTNAME = ibus-anthy-1.2.4 +DISTNAME = ibus-anthy-1.2.5 CATEGORIES = inputmethods japanese @@ -14,8 +14,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = anthy anthydic m util -WANTLIB += ${MODPY_WANTLIB} +WANTLIB = anthy anthydic m util ${MODPY_WANTLIB} MASTER_SITES = http://ibus.googlecode.com/files/ @@ -33,7 +32,6 @@ LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ DATADIRNAME="share" .include <bsd.port.mk> Index: ibus-anthy/distinfo =================================================================== RCS file: /cvs/ports/inputmethods/ibus-anthy/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- ibus-anthy/distinfo 11 Nov 2010 09:42:52 -0000 1.2 +++ ibus-anthy/distinfo 9 Jan 2011 15:45:57 -0000 @@ -1,5 +1,5 @@ -MD5 (ibus-anthy-1.2.4.tar.gz) = SOETNVD6bx7U+orqGnPcEA== -RMD160 (ibus-anthy-1.2.4.tar.gz) = pP4muK6mFB+oZXeRhwVf05O78Jw= -SHA1 (ibus-anthy-1.2.4.tar.gz) = x37f6Y6N9o2AFZxonywhBw16eW4= -SHA256 (ibus-anthy-1.2.4.tar.gz) = b7IqKERbjG1OQuvBY5aHCfqrGpA6JpmqHOMLTBHgZzY= -SIZE (ibus-anthy-1.2.4.tar.gz) = 496158 +MD5 (ibus-anthy-1.2.5.tar.gz) = ALRMh0YW15egEX0IfPMzQQ== +RMD160 (ibus-anthy-1.2.5.tar.gz) = ETpERqUF2hPbipHgz2nmMcnAVnE= +SHA1 (ibus-anthy-1.2.5.tar.gz) = CfuYMeWN3o3n1Inn1AUyOzkFaNs= +SHA256 (ibus-anthy-1.2.5.tar.gz) = XMLPzD2Ic+dUx1fLc95thiU3tHDxq+tGxLHIE/4GdEk= +SIZE (ibus-anthy-1.2.5.tar.gz) = 500228 Index: ibus-skk/Makefile =================================================================== RCS file: /cvs/ports/inputmethods/ibus-skk/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- ibus-skk/Makefile 20 Nov 2010 16:59:56 -0000 1.3 +++ ibus-skk/Makefile 9 Jan 2011 15:45:57 -0000 @@ -2,7 +2,7 @@ COMMENT = japanese skk input engine for ibus -DISTNAME = ibus-skk-1.3.3 +DISTNAME = ibus-skk-1.3.5 CATEGORIES = inputmethods japanese Index: ibus-skk/distinfo =================================================================== RCS file: /cvs/ports/inputmethods/ibus-skk/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- ibus-skk/distinfo 20 Nov 2010 16:59:56 -0000 1.2 +++ ibus-skk/distinfo 9 Jan 2011 15:45:57 -0000 @@ -1,5 +1,5 @@ -MD5 (ibus-skk-1.3.3.tar.gz) = Br1X7fb9dWtKU2Zvr9SPfw== -RMD160 (ibus-skk-1.3.3.tar.gz) = mnHsfRiWdmDbklNbALJhsf503ts= -SHA1 (ibus-skk-1.3.3.tar.gz) = zTxCg+dTatTf6f6nYEaSmuGhFvQ= -SHA256 (ibus-skk-1.3.3.tar.gz) = AGbpcnm9O9et67cVchwQvI9Q4T5H5Kwx6rfxMtnI/fg= -SIZE (ibus-skk-1.3.3.tar.gz) = 432428 +MD5 (ibus-skk-1.3.5.tar.gz) = o7Al2JZJ7SbWzdSIOU3hnA== +RMD160 (ibus-skk-1.3.5.tar.gz) = xf12KalUpiKIGBqwnb0RnqAa4qA= +SHA1 (ibus-skk-1.3.5.tar.gz) = Spzn7RCt0ZFxM7RP1ges/XPVoks= +SHA256 (ibus-skk-1.3.5.tar.gz) = j4othRjJwQ7qCxT2NdzWUddcthr34/gY/BzlHJiQGWE= +SIZE (ibus-skk-1.3.5.tar.gz) = 433203 Index: ibus-skk/pkg/PLIST =================================================================== RCS file: /cvs/ports/inputmethods/ibus-skk/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- ibus-skk/pkg/PLIST 20 Nov 2010 16:59:56 -0000 1.2 +++ ibus-skk/pkg/PLIST 9 Jan 2011 15:45:57 -0000 @@ -16,6 +16,9 @@ share/ibus-skk/engine/kzik.pyo share/ibus-skk/engine/main.py share/ibus-skk/engine/main.pyc share/ibus-skk/engine/main.pyo +share/ibus-skk/engine/nicola.py +share/ibus-skk/engine/nicola.pyc +share/ibus-skk/engine/nicola.pyo share/ibus-skk/engine/skk.py share/ibus-skk/engine/skk.pyc share/ibus-skk/engine/skk.pyo