* change *.glade to *.ui

* add gtk3 support
* support both ibus 1.3 & 1.4.
* fix crash with mouse capture
* fix build problem.
* swtich to GPLv3.

4 files changed, 29 insertions, 15 deletions

diff --git a/inputmethod/ibus-unikey/Makefile b/inputmethod/ibus-unikey/Makefile
index c9a4aa71389..3feccf772c1 100644
--- a/inputmethod/ibus-unikey/Makefile
+++ b/inputmethod/ibus-unikey/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2011/11/01 06:01:52 sbd Exp $
+# $NetBSD: Makefile,v 1.8 2011/12/04 13:10:39 obache Exp $
 #
 
-DISTNAME=	ibus-unikey-0.5.1
-PKGREVISION=	4
+DISTNAME=	ibus-unikey-0.6.0
 CATEGORIES=	inputmethod
 MASTER_SITES=	http://ibus-unikey.googlecode.com/files/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://code.google.com/p/ibus-unikey/
 COMMENT=	Vietnamese Input Method Engine for IBUS using Unikey IME
-LICENSE=	gnu-gpl-v2
+LICENSE=	gnu-gpl-v3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,11 +16,10 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake pkg-config
+USE_TOOLS+=		gmake pkg-config intltool msgfmt
+
+CONFIGURE_ARGS+=	--with-gtk-version=2
 
-PYTHON_FOR_BUILD_ONLY=	yes
-.include "../../lang/python/pyversion.mk"
-.include "../../devel/GConf/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/inputmethod/ibus-unikey/PLIST b/inputmethod/ibus-unikey/PLIST
index a9bcafd3164..11d3487cee7 100644
--- a/inputmethod/ibus-unikey/PLIST
+++ b/inputmethod/ibus-unikey/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/08/07 02:22:26 obache Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/12/04 13:10:39 obache Exp $
 libexec/ibus-engine-unikey
 libexec/ibus-setup-unikey
 share/ibus-unikey/icons/ibus-unikey.png
-share/ibus-unikey/setup/setup-macro.glade
-share/ibus-unikey/setup/setup-main.glade
+share/ibus-unikey/ui/setup-macro.ui
+share/ibus-unikey/ui/setup-main.ui
 share/ibus/component/unikey.xml
 share/locale/vi/LC_MESSAGES/ibus-unikey.mo
diff --git a/inputmethod/ibus-unikey/distinfo b/inputmethod/ibus-unikey/distinfo
index 7848069e855..3cead573245 100644
--- a/inputmethod/ibus-unikey/distinfo
+++ b/inputmethod/ibus-unikey/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2010/09/16 10:09:07 obache Exp $
+$NetBSD: distinfo,v 1.3 2011/12/04 13:10:39 obache Exp $
 
-SHA1 (ibus-unikey-0.5.1.tar.gz) = 01f34cf6d32d7bffc862e9c6d3531113eccd7b3c
-RMD160 (ibus-unikey-0.5.1.tar.gz) = 8176ccf1bff44450e48def487ab4196f806a42ae
-Size (ibus-unikey-0.5.1.tar.gz) = 496451 bytes
+SHA1 (ibus-unikey-0.6.0.tar.gz) = 9cacf527273eb4f45f904e6b8fd3cc5f48a3e41a
+RMD160 (ibus-unikey-0.6.0.tar.gz) = d766792ee1165a97883b25d51640d920a789f5df
+Size (ibus-unikey-0.6.0.tar.gz) = 509952 bytes
 SHA1 (patch-aa) = 4d64f17e6a13b58aa77e75fe03d9405146657688
+SHA1 (patch-configure) = ccbd7f4d2c8395a1eaafb890a819de400e7fedfc
diff --git a/inputmethod/ibus-unikey/patches/patch-configure b/inputmethod/ibus-unikey/patches/patch-configure
new file mode 100644
index 00000000000..8c9961b2901
--- /dev/null
+++ b/inputmethod/ibus-unikey/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2011/12/04 13:10:39 obache Exp $
+
+* test(1) portability fix.
+
+--- configure.orig	2011-12-04 12:45:32.000000000 +0000
++++ configure
+@@ -18626,7 +18626,7 @@ if test "${with_gtk_version+set}" = set;
+ 
+ fi
+ 
+-if test "x$gtk_version" == "x3" || test "x$gtk_version" == "xgtk-3" || test "x$gtk_version" == "xgtk3"; then :
++if test "x$gtk_version" = "x3" || test "x$gtk_version" = "xgtk-3" || test "x$gtk_version" = "xgtk3"; then :
+   gtk_version="gtk+-3.0"
+ else
+   gtk_version="gtk+-2.0 >= 2.12"