From c1d9b0ce4df02fafb2fcc23fc51cdac7d316e870 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 8 Apr 2011 07:37:24 +0000
Subject: [PATCH] Add vala support (it's only a build dep). Regen patches while
 here.

ok jasper@
---
 inputmethods/ibus/Makefile                      | 9 +++++----
 inputmethods/ibus/patches/patch-src_Makefile_in | 8 ++++----
 inputmethods/ibus/pkg/PLIST                     | 5 ++++-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/inputmethods/ibus/Makefile b/inputmethods/ibus/Makefile
index 37fc96643f8..65d9da1944f 100644
--- a/inputmethods/ibus/Makefile
+++ b/inputmethods/ibus/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.14 2011/04/07 19:23:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.15 2011/04/08 07:37:24 ajacoutot Exp $
 
 SHARED_ONLY =	Yes
 
 COMMENT =	intelligent input bus framework
 
 DISTNAME =	ibus-1.3.9
-REVISION =	1
+REVISION =	2
 
 SHARED_LIBS =	ibus	1.0	# 2.0
 
@@ -36,7 +36,8 @@ MODULES =	devel/gconf2 \
 
 BUILD_DEPENDS =	devel/gobject-introspection \
 		devel/iso-codes \
-		x11/dbus-python
+		x11/dbus-python \
+		lang/vala
 RUN_DEPENDS =	devel/iso-codes \
 		devel/desktop-file-utils \
 		devel/py-notify \
@@ -53,7 +54,7 @@ LIBTOOL_FLAGS =	--tag=disable-static
 
 CONFIGURE_STYLE = gnu
 CONFIGURE_ARGS = --disable-silent-rules \
-		 --disable-vala \
+		 --enable-vala \
 		 --enable-introspection \
 		 --enable-gtk-doc-html=no
 CONFIGURE_ENV =	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/inputmethods/ibus/patches/patch-src_Makefile_in b/inputmethods/ibus/patches/patch-src_Makefile_in
index 01c8e7a2eaa..b2ac72e5caa 100644
--- a/inputmethods/ibus/patches/patch-src_Makefile_in
+++ b/inputmethods/ibus/patches/patch-src_Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2010/08/19 18:56:14 fgsch Exp $
---- src/Makefile.in.orig	Mon Aug 16 15:41:20 2010
-+++ src/Makefile.in	Mon Aug 16 15:41:22 2010
-@@ -574,7 +574,7 @@ libibus_la_LIBADD = \
+$OpenBSD: patch-src_Makefile_in,v 1.2 2011/04/08 07:37:24 ajacoutot Exp $
+--- src/Makefile.in.orig	Thu Nov 25 03:25:46 2010
++++ src/Makefile.in	Fri Apr  8 07:42:52 2011
+@@ -577,7 +577,7 @@ libibus_la_LIBADD = \
  
  libibus_la_LDFLAGS = \
  	-export-symbols-regex "ibus_.*" \
diff --git a/inputmethods/ibus/pkg/PLIST b/inputmethods/ibus/pkg/PLIST
index 21ed97e692f..088d422b714 100644
--- a/inputmethods/ibus/pkg/PLIST
+++ b/inputmethods/ibus/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.7 2011/04/07 19:23:05 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/04/08 07:37:24 ajacoutot Exp $
 @bin bin/ibus-daemon
 bin/ibus-setup
 include/ibus-1.0/
@@ -323,6 +323,9 @@ share/locale/vi/LC_MESSAGES/ibus.mo
 share/locale/zh_CN/LC_MESSAGES/ibus.mo
 share/locale/zh_HK/LC_MESSAGES/ibus.mo
 share/locale/zh_TW/LC_MESSAGES/ibus.mo
+share/vala/
+share/vala/vapi/
+share/vala/vapi/ibus-1.0.vapi
 @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
 ${SCHEMAS_INSTDIR}/
 ${SCHEMAS_INSTDIR}/ibus.schemas