Hi,

This updates ibus-skk to 1.4.1. 
Lightly tested on amd64.
Comments? OK?

f.-


Index: Makefile
===================================================================
RCS file: /cvs/ports/inputmethods/ibus-skk/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile    3 Oct 2011 06:42:46 -0000       1.9
+++ Makefile    25 Oct 2012 00:16:42 -0000
@@ -2,8 +2,7 @@
 
 COMMENT =      japanese skk input engine for ibus
 
-DISTNAME =     ibus-skk-1.3.9
-REVISION =     0
+DISTNAME =     ibus-skk-1.4.1
 
 CATEGORIES =   inputmethods japanese
 
@@ -17,18 +16,31 @@ PERMIT_DISTFILES_FTP =      Yes
 
 MASTER_SITES = http://cloud.github.com/downloads/ueno/ibus-skk/
 
-MODULES =      lang/python \
+WANTLIB =      GL ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
+               Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 \
+               atk-bridge-2.0 atspi c cairo cairo-gobject dbus-1 drm \
+               expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 \
+               gee gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
+               gtk-3 harfbuzz ibus-1.0 icudata icule icuuc json-glib-1.0 \
+               m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
+               png pthread pthread-stubs skk stdc++ xcb xcb-render \
+               xcb-shm z
+
+MODULES =      devel/gettext \
                textproc/intltool
 
-BUILD_DEPENDS = devel/gettext
-RUN_DEPENDS =  inputmethods/ibus \
-               devel/gettext
+BUILD_DEPENDS = lang/vala
+LIB_DEPENDS =  inputmethods/ibus \
+               inputmethods/libskk
 
 USE_GMAKE =    Yes
 USE_LIBTOOL =  Yes
 
-CONFIGURE_STYLE =      gnu
-CONFIGURE_ENV =                CPPFLAGS="-I${LOCALBASE}/include" \
-                       LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV =        CPPFLAGS="-I${LOCALBASE}/include" \
+               LDFLAGS="-L${LOCALBASE}/lib"
+
+pre-configure:
+       ${SUBST_CMD} ${WRKSRC}/src/preferences.vala
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/inputmethods/ibus-skk/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo    25 Sep 2011 13:34:57 -0000      1.5
+++ distinfo    25 Oct 2012 00:16:42 -0000
@@ -1,5 +1,2 @@
-MD5 (ibus-skk-1.3.9.tar.gz) = QhFXAMlcE5Z6w6/qu3ED0Q==
-RMD160 (ibus-skk-1.3.9.tar.gz) = vaduFES11A4RLmEppeiCwWH+Tm4=
-SHA1 (ibus-skk-1.3.9.tar.gz) = yke1VkgRXANKRv8jqWU6fV7FOno=
-SHA256 (ibus-skk-1.3.9.tar.gz) = Z8YV9uBwZz4xLaUOESXy8GN7QODspPbqNDJfQTIrS6Y=
-SIZE (ibus-skk-1.3.9.tar.gz) = 459987
+SHA256 (ibus-skk-1.4.1.tar.gz) = NosRSgfwPV2RzzMyFflCmZXvu+pz7n7+Ljf7O7xtgd4=
+SIZE (ibus-skk-1.4.1.tar.gz) = 478018
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/inputmethods/ibus-skk/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure     10 Sep 2012 08:08:49 -0000      1.2
+++ patches/patch-configure     25 Oct 2012 00:16:42 -0000
@@ -2,9 +2,9 @@ $OpenBSD: patch-configure,v 1.2 2012/09/
 
 Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
 
---- configure.orig     Sun Oct  2 11:15:54 2011
-+++ configure  Sun Oct  2 11:16:28 2011
-@@ -6324,6 +6324,9 @@ else
+--- configure.orig     Thu Mar 29 02:56:50 2012
++++ configure  Thu Oct 25 01:09:59 2012
+@@ -6416,6 +6416,9 @@ else
  fi
  
      ;;
Index: patches/patch-setup_ibus-skk-preferences_ui_in
===================================================================
RCS file: patches/patch-setup_ibus-skk-preferences_ui_in
diff -N patches/patch-setup_ibus-skk-preferences_ui_in
--- patches/patch-setup_ibus-skk-preferences_ui_in      25 Sep 2011 13:34:57 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_ibus-skk-preferences_ui_in,v 1.1 2011/09/25 13:34:57 
fgsch Exp $
---- setup/ibus-skk-preferences.ui.in.orig      Tue Sep 20 11:02:58 2011
-+++ setup/ibus-skk-preferences.ui.in   Tue Sep 20 11:03:05 2011
-@@ -766,7 +766,7 @@
-     <data>
-       <row>
-         <col id="0" translatable="yes">Hiragana</col>
--        <col id="1">1</col>
-+        <col id="1">0</col>
-       </row>
-       <row>
-         <col id="0" translatable="yes">Latin</col>
Index: patches/patch-src_preferences_vala
===================================================================
RCS file: patches/patch-src_preferences_vala
diff -N patches/patch-src_preferences_vala
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_preferences_vala  25 Oct 2012 00:16:42 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/preferences.vala.orig  Thu Oct 25 01:10:30 2012
++++ src/preferences.vala       Thu Oct 25 01:10:39 2012
+@@ -75,7 +75,7 @@ public class Preferences : Object {
+             "type=file,file=%s/ibus-skk/user.dict,mode=readwrite".printf (
+                 Environment.get_user_config_dir ()));
+         dictionaries.add (
+-            "type=file,file=/usr/share/skk/SKK-JISYO.L,mode=readonly");
++            
"type=file,file=${LOCALBASE}/share/skk/SKK-JISYO.L,mode=readonly");
+         dictionaries.add (
+             "type=server,host=localhost,port=1178");
+         _default.set ("dictionaries",
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/inputmethods/ibus-skk/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST   25 Sep 2011 13:34:57 -0000      1.4
+++ pkg/PLIST   25 Oct 2012 00:16:42 -0000
@@ -1,39 +1,12 @@
 @comment $OpenBSD: PLIST,v 1.4 2011/09/25 13:34:57 fgsch Exp $
-bin/ibus-skk-convert-jisyo
-libexec/ibus-engine-skk
-libexec/ibus-setup-skk
+@bin libexec/ibus-engine-skk
+@bin libexec/ibus-setup-skk
+share/ibus/
 share/ibus-skk/
-share/ibus-skk/engine/
-share/ibus-skk/engine/engine.py
-share/ibus-skk/engine/engine.pyc
-share/ibus-skk/engine/engine.pyo
-share/ibus-skk/engine/factory.py
-share/ibus-skk/engine/factory.pyc
-share/ibus-skk/engine/factory.pyo
-share/ibus-skk/engine/kzik.py
-share/ibus-skk/engine/kzik.pyc
-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
-share/ibus-skk/engine/virtkbd.py
-share/ibus-skk/engine/virtkbd.pyc
-share/ibus-skk/engine/virtkbd.pyo
 share/ibus-skk/icons/
 share/ibus-skk/icons/ibus-skk.svg
 share/ibus-skk/setup/
-share/ibus-skk/setup/config.py
-share/ibus-skk/setup/config.pyc
-share/ibus-skk/setup/config.pyo
 share/ibus-skk/setup/ibus-skk-preferences.ui
-share/ibus-skk/setup/main.py
-share/ibus-skk/setup/main.pyc
-share/ibus-skk/setup/main.pyo
+share/ibus/component/
 share/ibus/component/skk.xml
 share/locale/ja/LC_MESSAGES/ibus-skk.mo

Reply via email to