From 2ece17c7a42288b211714e9a03a4c818f9ad8bb9 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Mon, 25 Apr 2016 18:00:29 +0000
Subject: [PATCH] - update to libxkbcommon-0.6.0

---
 x11/xkbcommon/Makefile                  | 17 ++++++++++-------
 x11/xkbcommon/distinfo                  |  4 ++--
 x11/xkbcommon/patches/patch-Makefile_in | 15 ---------------
 3 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 x11/xkbcommon/patches/patch-Makefile_in

diff --git a/x11/xkbcommon/Makefile b/x11/xkbcommon/Makefile
index db3d8a02f5c..610d6b9577f 100644
--- a/x11/xkbcommon/Makefile
+++ b/x11/xkbcommon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2014/10/19 14:30:12 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2016/04/25 18:00:29 jasper Exp $
 
 COMMENT=		library to handle keyboard descriptions
 
-DISTNAME=		libxkbcommon-0.5.0
-SHARED_LIBS +=	xkbcommon            1.0      # unknown
+DISTNAME=		libxkbcommon-0.6.0
+SHARED_LIBS +=	xkbcommon            1.1      # unknown
 SHARED_LIBS +=	xkbcommon-x11        1.0      # unknown
 CATEGORIES=		x11 inputmethods
 
@@ -20,14 +20,17 @@ EXTRACT_SUFX=		.tar.xz
 
 WANTLIB += Xau Xdmcp pthread-stubs xcb xcb-xkb
 
+BUILD_DEPENDS =		devel/bison
+
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--without-doxygen
+CONFIGURE_ENV +=	YACC=${LOCALBASE}/bin/bison
 
+TEST_DEPENDS =		shells/bash
 TEST_IS_INTERACTIVE=	x11
 
-# our pre-historic bison has been mummified and put into a museum.
-# so generate parser.c with a fresh young bison that still roams the plains.
-post-extract:
-	cp ${FILESDIR}/parser.c ${WRKSRC}/src/xkbcomp/
+# XXX: This test still fails
+pre-test:
+	sed -i 's,bin/bash,${LOCALBASE}/bin/bash,' ${WRKSRC}/test/symbols-leak-test.bash
 
 .include <bsd.port.mk>
diff --git a/x11/xkbcommon/distinfo b/x11/xkbcommon/distinfo
index dd0ae573af2..a935d4d7bf7 100644
--- a/x11/xkbcommon/distinfo
+++ b/x11/xkbcommon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libxkbcommon-0.5.0.tar.xz) = kL14JHQrmm9Sps+A4srdb1NJz2AKNY0IJgdyYVuJ0Zw=
-SIZE (libxkbcommon-0.5.0.tar.xz) = 615504
+SHA256 (libxkbcommon-0.6.0.tar.xz) = aSNew6ExlN6pVV15lLxFSLPuIAcOBaE1r1NyqVgUnvA=
+SIZE (libxkbcommon-0.6.0.tar.xz) = 608700
diff --git a/x11/xkbcommon/patches/patch-Makefile_in b/x11/xkbcommon/patches/patch-Makefile_in
deleted file mode 100644
index 9fee9fe6af4..00000000000
--- a/x11/xkbcommon/patches/patch-Makefile_in
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.3 2014/10/19 14:30:12 jasper Exp $
-
-- pre-generated parser.c is used
-
---- Makefile.in.orig	Sat Oct 18 15:42:51 2014
-+++ Makefile.in	Sun Oct 19 10:57:33 2014
-@@ -2260,8 +2260,6 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
- 	uninstall-xkbcommonincludeHEADERS
- 
- 
--src/xkbcomp/parser.c: $(top_builddir)/src/$(am__dirstamp) $(top_builddir)/src/xkbcomp/$(am__dirstamp)
--src/xkbcomp/parser.h: $(top_builddir)/src/$(am__dirstamp) $(top_builddir)/src/xkbcomp/$(am__dirstamp)
- 
- # Documentation
-