Update ibus-handwrite to 3.0.0.

since all 2.x software bump to 3.0 when they ported to gtk3, same rules apply
to ibus-handwrite!

5 files changed, 14 insertions, 104 deletions

diff --git a/inputmethod/ibus-handwrite/Makefile b/inputmethod/ibus-handwrite/Makefile
index eb4f16eeaec..2622106ecd4 100644
--- a/inputmethod/ibus-handwrite/Makefile
+++ b/inputmethod/ibus-handwrite/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2014/05/05 00:48:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2014/08/28 10:27:28 obache Exp $
 #
 
-DISTNAME=	ibus-handwrite-2.1.4
-PKGREVISION=	19
+DISTNAME=	ibus-handwrite-3.0.0
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://ibus-handwrite.googlecode.com/files/
+MASTER_SITES=	https://github.com/microcai/ibus-handwrite/releases/download/${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	obache@NetBSD.org
@@ -30,8 +29,7 @@ SUBST_FILES.locale_dir=	src/main.c
 SUBST_VARS.locale_dir=	_PKGLOCALEDIR
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/gtkglext/buildlink3.mk"
 .include "../../inputmethod/ibus/buildlink3.mk"
 .include "../../inputmethod/zinnia/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/ibus-handwrite/distinfo b/inputmethod/ibus-handwrite/distinfo
index a208f12b21c..32e16d87ae2 100644
--- a/inputmethod/ibus-handwrite/distinfo
+++ b/inputmethod/ibus-handwrite/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.9 2014/05/01 07:48:51 obache Exp $
+$NetBSD: distinfo,v 1.10 2014/08/28 10:27:28 obache Exp $
 
-SHA1 (ibus-handwrite-2.1.4.tar.bz2) = 2798728c628dfa60a7c1c45c8a59882962c91b1e
-RMD160 (ibus-handwrite-2.1.4.tar.bz2) = 35e7288d5efcd98a01138d075b0455874730a4ea
-Size (ibus-handwrite-2.1.4.tar.bz2) = 237980 bytes
-SHA1 (patch-configure) = 66d3e86c3ac5de1bbd466bfca1fc1d709b2d1da6
-SHA1 (patch-configure.ac) = 0730abb2210c60b2feb1e9a3055568f4fbb11e2a
-SHA1 (patch-src_UI__gtk.c) = 29ae3155fdb6eee9d3444488ed558ad6476eec99
+SHA1 (ibus-handwrite-3.0.0.tar.bz2) = 157a7ec657fe013373777e6f7d49508cc6c502b0
+RMD160 (ibus-handwrite-3.0.0.tar.bz2) = ff233483b2d68fa4e43e2afd17bd010f07e6e82a
+Size (ibus-handwrite-3.0.0.tar.bz2) = 239452 bytes
+SHA1 (patch-src_UI__gtk.c) = 6243a09329fc6bb562a0c8edaa529e3905ec7583
 SHA1 (patch-src_main.c) = b8adc7218d9de5f6cabe8c4a0de73b8ae69b792d
diff --git a/inputmethod/ibus-handwrite/patches/patch-configure b/inputmethod/ibus-handwrite/patches/patch-configure
deleted file mode 100644
index bfee715f9ac..00000000000
--- a/inputmethod/ibus-handwrite/patches/patch-configure
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2011/12/16 10:51:18 obache Exp $
-
-* regen with patched configure.ac.
-
---- configure.orig	2011-03-25 05:28:36.000000000 +0000
-+++ configure
-@@ -5153,6 +5153,63 @@ cat >>confdefs.h <<_ACEOF
- _ACEOF
- 
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing atan2" >&5
-+$as_echo_n "checking for library containing atan2... " >&6; }
-+if ${ac_cv_search_atan2+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char atan2 ();
-+int
-+main ()
-+{
-+return atan2 ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' m; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_atan2=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if ${ac_cv_search_atan2+:} false; then :
-+  break
-+fi
-+done
-+if ${ac_cv_search_atan2+:} false; then :
-+
-+else
-+  ac_cv_search_atan2=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_atan2" >&5
-+$as_echo "$ac_cv_search_atan2" >&6; }
-+ac_res=$ac_cv_search_atan2
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+
- if test "x${enable_zinnia}" = "xyes"; then :
- 
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zinnia_recognizer_open in -lzinnia" >&5
diff --git a/inputmethod/ibus-handwrite/patches/patch-configure.ac b/inputmethod/ibus-handwrite/patches/patch-configure.ac
deleted file mode 100644
index f7075bd0bb7..00000000000
--- a/inputmethod/ibus-handwrite/patches/patch-configure.ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.1 2011/12/16 10:51:18 obache Exp $
-
-* Need to requirement of math library for atan2(3).
-  http://code.google.com/p/ibus-handwrite/issues/detail?id=19
-
---- configure.ac.orig	2011-03-25 05:28:26.000000000 +0000
-+++ configure.ac
-@@ -66,6 +66,8 @@ GETTEXT_PACKAGE="$PACKAGE_NAME"
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define to the read-only architecture-independent data directory.])
- 
-+AC_SEARCH_LIBS([atan2], [m])
-+
- AS_IF([test "x${enable_zinnia}" = "xyes"],
- 	[
- 		AC_CHECK_LIB(zinnia,[zinnia_recognizer_open],[],[have_zinnia=no])
diff --git a/inputmethod/ibus-handwrite/patches/patch-src_UI__gtk.c b/inputmethod/ibus-handwrite/patches/patch-src_UI__gtk.c
index 5ecd89d5e78..469a03a1298 100644
--- a/inputmethod/ibus-handwrite/patches/patch-src_UI__gtk.c
+++ b/inputmethod/ibus-handwrite/patches/patch-src_UI__gtk.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_UI__gtk.c,v 1.2 2014/05/01 07:48:51 obache Exp $
+$NetBSD: patch-src_UI__gtk.c,v 1.3 2014/08/28 10:27:28 obache Exp $
 
 * Nested functions are supported as an extension in GNU C.
   http://code.google.com/p/ibus-handwrite/issues/detail?id=20
 
---- src/UI_gtk.c.orig	2012-11-19 16:23:52.000000000 +0000
+--- src/UI_gtk.c.orig	2014-08-04 08:24:46.000000000 +0000
 +++ src/UI_gtk.c
-@@ -173,6 +173,11 @@ static void glwidget_realize(GtkWidget *
- 	}
+@@ -74,6 +74,11 @@ static gboolean paint_lines(GtkWidget *w
+ 	return TRUE;
  }
  
 +static void clicked(GtkButton *button, IBusHandwriteEngine *engine)
@@ -17,7 +17,7 @@ $NetBSD: patch-src_UI__gtk.c,v 1.2 2014/05/01 07:48:51 obache Exp $
  static void regen_loopuptable(GtkWidget * widget, IBusHandwriteEngine * engine)
  {
  	int i;
-@@ -195,11 +200,6 @@ static void regen_loopuptable(GtkWidget 
+@@ -98,11 +103,6 @@ static void regen_loopuptable(GtkWidget 
  
  		gtk_widget_show(bt);