Update libskk to 1.0.2 (and introduce introspection support).

Noteworthy changes in version 1.0.2 (2014-09-09)
------------------------------------------------

 * Migrate to libgee 0.8 from 0.6 (Issue#29).
 * rules: new ACT09 rule contributed by Naoki Mizuno (Issue#28).
 * Consume key event for "commit" command (Issue#26).  Use
   "commit-unhandled" for the previous behavior.
 * Comsume C-j in abbrev mode (Issue#24).

5 files changed, 44 insertions, 12 deletions

diff --git a/inputmethod/libskk/Makefile b/inputmethod/libskk/Makefile
index c2041ee6183..d9ac4149ee0 100644
--- a/inputmethod/libskk/Makefile
+++ b/inputmethod/libskk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2013/06/16 00:30:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2014/09/10 09:34:45 obache Exp $
 #
 
-DISTNAME=	libskk-1.0.1
+DISTNAME=	libskk-1.0.2
 CATEGORIES=	inputmethod
-MASTER_SITES=	http://cdn.bitbucket.org/libskk/libskk/downloads/
+MASTER_SITES=	https://github.com/ueno/libskk/releases/download/${PKGVERSION_NOREV}/
 
 MAINTAINER=	obache@NetBSD.org
 HOMEPAGE=	http://github.com/ueno/libskk/
@@ -19,9 +19,11 @@ PKGCONFIG_OVERRIDE+=	libskk/libskk.pc.in
 
 CONFIGURE_ARGS+=	--localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 
+.include "options.mk"
+
 TEST_TARGET=		check
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgee/buildlink3.mk"
+.include "../../devel/libgee0.8/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/inputmethod/libskk/PLIST b/inputmethod/libskk/PLIST
index e2599972e2c..e7393f98b77 100644
--- a/inputmethod/libskk/PLIST
+++ b/inputmethod/libskk/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/16 00:30:53 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/09/10 09:34:45 obache Exp $
 bin/skk
 include/libskk/libskk.h
+${PLIST.introspection}lib/girepository-1.0/Skk-1.0.typelib
 lib/libskk.la
 lib/pkgconfig/libskk.pc
 man/man1/skk.1
+${PLIST.introspection}share/gir-1.0/Skk-1.0.gir
 share/libskk/rules/README.rules
 share/libskk/rules/act/keymap/default.json
 share/libskk/rules/act/keymap/hankaku-katakana.json
@@ -13,6 +15,14 @@ share/libskk/rules/act/keymap/latin.json
 share/libskk/rules/act/keymap/wide-latin.json
 share/libskk/rules/act/metadata.json
 share/libskk/rules/act/rom-kana/default.json
+share/libskk/rules/act09/keymap/default.json
+share/libskk/rules/act09/keymap/hankaku-katakana.json
+share/libskk/rules/act09/keymap/hiragana.json
+share/libskk/rules/act09/keymap/katakana.json
+share/libskk/rules/act09/keymap/latin.json
+share/libskk/rules/act09/keymap/wide-latin.json
+share/libskk/rules/act09/metadata.json
+share/libskk/rules/act09/rom-kana/default.json
 share/libskk/rules/azik/keymap/common.json
 share/libskk/rules/azik/keymap/default.json
 share/libskk/rules/azik/keymap/hankaku-katakana.json
diff --git a/inputmethod/libskk/buildlink3.mk b/inputmethod/libskk/buildlink3.mk
index e9c4b634a7f..86c1f49b9db 100644
--- a/inputmethod/libskk/buildlink3.mk
+++ b/inputmethod/libskk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/09/15 10:05:14 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2014/09/10 09:34:45 obache Exp $
 #
 
 BUILDLINK_TREE+=	libskk
@@ -7,11 +7,11 @@ BUILDLINK_TREE+=	libskk
 LIBSKK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libskk+=	libskk>=0.0.12
-BUILDLINK_ABI_DEPENDS.libskk?=	libskk>=0.0.13nb1
+BUILDLINK_ABI_DEPENDS.libskk+=	libskk>=1.0.2
 BUILDLINK_PKGSRCDIR.libskk?=	../../inputmethod/libskk
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgee/buildlink3.mk"
+.include "../../devel/libgee0.8/buildlink3.mk"
 .include "../../textproc/json-glib/buildlink3.mk"
 .endif	# LIBSKK_BUILDLINK3_MK
 
diff --git a/inputmethod/libskk/distinfo b/inputmethod/libskk/distinfo
index b6ed75fec96..804194f57bb 100644
--- a/inputmethod/libskk/distinfo
+++ b/inputmethod/libskk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2013/06/17 11:45:58 joerg Exp $
+$NetBSD: distinfo,v 1.7 2014/09/10 09:34:45 obache Exp $
 
-SHA1 (libskk-1.0.1.tar.gz) = 8b9e1edb6506418812f0a4d23777611de2194017
-RMD160 (libskk-1.0.1.tar.gz) = 9bea9e32f9906262e7189203e9c7d9cb0b1b6d73
-Size (libskk-1.0.1.tar.gz) = 860453 bytes
+SHA1 (libskk-1.0.2.tar.gz) = 1d3c1881c41c33c81a79646f4ed580a630b90520
+RMD160 (libskk-1.0.2.tar.gz) = 87ac69baef98133d4fc487ff368400221367205c
+Size (libskk-1.0.2.tar.gz) = 867572 bytes
diff --git a/inputmethod/libskk/options.mk b/inputmethod/libskk/options.mk
new file mode 100644
index 00000000000..bde3511257f
--- /dev/null
+++ b/inputmethod/libskk/options.mk
@@ -0,0 +1,20 @@
+# $NetBSD: options.mk,v 1.1 2014/09/10 09:34:45 obache Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libskk
+PKG_SUPPORTED_OPTIONS=	introspection
+PKG_SUGGESTED_OPTIONS=	introspection
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	introspection
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+PLIST.introspection=		yes
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.9.0
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
+.else
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif