Update to 5.4

* Buildlink gobject-introspection

Changelog:
5.4     A couple of introspection fixes
5.3     A number of introspection and build fixes
5.2.1   Fixed GIR params for introspection (broken build)
5.2     Optional introspection introduced
        Some minor fixes (runtime and build-time)
5.1     Expanding APIs for GNOME 3 needs (bumped soname):
        - converting ISO codes to translatable names (it was private, now public)
        - search by pattern
        Using to X11 API throgh pkg-config
        One race condition eliminated
        XInput2 version checking: looking for support of DevicePresence

5 files changed, 21 insertions, 20 deletions

diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 9f0a93df305..3713a4c3134 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2014/10/09 14:07:15 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2016/03/12 11:12:40 ryoon Exp $
 #
 
-DISTNAME=	libxklavier-5.0
-PKGREVISION=	5
+DISTNAME=	libxklavier-5.4
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gswitchit/}
+MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/libxklavier/libxklavier-5.4.tar.bz2/13af74dcb6011ecedf1e3ed122bd31fa/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -12,7 +11,7 @@ HOMEPAGE=	http://freedesktop.org/Software/LibXklavier
 COMMENT=	High-level API for the X Keyboard Extension (XKB)
 LICENSE=	gnu-lgpl-v2
 
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
@@ -35,6 +34,7 @@ TOOLS_NOOP+=	gtkdoc-rebase
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
diff --git a/x11/libxklavier/PLIST b/x11/libxklavier/PLIST
index fb8bc253a78..c2f7a1b92e4 100644
--- a/x11/libxklavier/PLIST
+++ b/x11/libxklavier/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/08/09 08:04:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/03/12 11:12:40 ryoon Exp $
 include/libxklavier/xkl-enum-types.h
 include/libxklavier/xkl_config_item.h
 include/libxklavier/xkl_config_rec.h
@@ -6,20 +6,21 @@ include/libxklavier/xkl_config_registry.h
 include/libxklavier/xkl_engine.h
 include/libxklavier/xkl_engine_marshal.h
 include/libxklavier/xklavier.h
+lib/girepository-1.0/Xkl-1.0.typelib
 lib/libxklavier.la
 lib/pkgconfig/libxklavier.pc
+share/gir-1.0/Xkl-1.0.gir
 share/gtk-doc/html/libxklavier/XklConfigItem.html
 share/gtk-doc/html/libxklavier/XklConfigRec.html
 share/gtk-doc/html/libxklavier/XklConfigRegistry.html
-share/gtk-doc/html/libxklavier/XklEngine.html
 share/gtk-doc/html/libxklavier/ch01.html
 share/gtk-doc/html/libxklavier/ch02.html
 share/gtk-doc/html/libxklavier/home.png
 share/gtk-doc/html/libxklavier/index.html
 share/gtk-doc/html/libxklavier/index.sgml
 share/gtk-doc/html/libxklavier/left.png
+share/gtk-doc/html/libxklavier/libxklavier-xkl-engine.html
 share/gtk-doc/html/libxklavier/libxklavier-xklavier.html
-share/gtk-doc/html/libxklavier/libxklavier.devhelp
 share/gtk-doc/html/libxklavier/libxklavier.devhelp2
 share/gtk-doc/html/libxklavier/right.png
 share/gtk-doc/html/libxklavier/style.css
diff --git a/x11/libxklavier/buildlink3.mk b/x11/libxklavier/buildlink3.mk
index 0f098f5a8c5..2d148c8e8d7 100644
--- a/x11/libxklavier/buildlink3.mk
+++ b/x11/libxklavier/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2012/06/14 07:43:23 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2016/03/12 11:12:40 ryoon Exp $
 
 BUILDLINK_TREE+=	libxklavier
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libxklavier
 LIBXKLAVIER_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libxklavier+=	libxklavier>=3.0
-BUILDLINK_ABI_DEPENDS.libxklavier+=	libxklavier>=5.0nb4
+BUILDLINK_ABI_DEPENDS.libxklavier+=	libxklavier>=5.4
 BUILDLINK_PKGSRCDIR.libxklavier?=	../../x11/libxklavier
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 0b09e492058..8302aa38522 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2015/11/04 03:28:48 agc Exp $
+$NetBSD: distinfo,v 1.25 2016/03/12 11:12:40 ryoon Exp $
 
-SHA1 (libxklavier-5.0.tar.bz2) = e914adc00a7b1d39c5057aa415a5181856a697ae
-RMD160 (libxklavier-5.0.tar.bz2) = 771dffe92efa1b992ea6ee78535c81d859a2b090
-SHA512 (libxklavier-5.0.tar.bz2) = 2abeb5a85cf6808ffcd0e463a5b9b145803af6c66f95cb6dcb51afe7d8b4f7b71a2e6a1a8a965140ef2d3aa8c1777127fc23e431658056233fdeeb0001e98425
-Size (libxklavier-5.0.tar.bz2) = 357862 bytes
-SHA1 (patch-ab) = 02f3f5adf6ec9d4c6dd985ca0d9869f963f9e445
+SHA1 (libxklavier-5.4.tar.bz2) = 6bd04a332700ad43d518167beaafbf734e94bd35
+RMD160 (libxklavier-5.4.tar.bz2) = 0f150c12365264eb68608fac46fb6c7b39628d4e
+SHA512 (libxklavier-5.4.tar.bz2) = e9342d94f6cd67e900e44d9751ee0d8c75bec8e3a7b30989612bd71a5f890be52ff843465162dbbe0bfc9004da76e1d47158a4671b8f915e51c91f9d82f7baae
+Size (libxklavier-5.4.tar.bz2) = 390428 bytes
+SHA1 (patch-ab) = 15f02943f7a34cb737a8e78264ade06a83b6a1b0
 SHA1 (patch-ac) = 868223a0e551e6372d9e00c04324889a34f134cc
diff --git a/x11/libxklavier/patches/patch-ab b/x11/libxklavier/patches/patch-ab
index 2f76c632c76..62273fa5c00 100644
--- a/x11/libxklavier/patches/patch-ab
+++ b/x11/libxklavier/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.10 2009/08/09 08:04:24 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2016/03/12 11:12:40 ryoon Exp $
 
---- Makefile.in.orig	2009-06-28 13:09:35.000000000 +0000
+--- Makefile.in.orig	2013-04-23 23:03:22.000000000 +0000
 +++ Makefile.in
-@@ -216,7 +216,7 @@ top_build_prefix = @top_build_prefix@
+@@ -353,7 +353,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 -SUBDIRS = libxklavier doc tests
 +SUBDIRS = libxklavier doc
  EXTRA_DIST = libxklavier.spec libxklavier.spec.in \