From 5b4cbb078514801f921af8d95c3558473dca2256 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Tue, 13 Sep 2011 08:37:47 +0000
Subject: [PATCH] libgda is needed by the symbol-db plugin, which we don't
 build on OpenBSD. though GDA_CFLAGS is used in various Makefile's. So instead
 of changing dozens of files, we just drop the LIB_DEPENDS and keep the
 BUILD_DEPENDS.

---
 x11/gnome/anjuta/Makefile                   | 11 +++++++--
 x11/gnome/anjuta/patches/patch-configure    | 21 ----------------
 x11/gnome/anjuta/patches/patch-configure_ac | 27 +++++++++++++++++++++
 3 files changed, 36 insertions(+), 23 deletions(-)
 delete mode 100644 x11/gnome/anjuta/patches/patch-configure
 create mode 100644 x11/gnome/anjuta/patches/patch-configure_ac

diff --git a/x11/gnome/anjuta/Makefile b/x11/gnome/anjuta/Makefile
index 3ab95d7d4c8..03f1c7029a4 100644
--- a/x11/gnome/anjuta/Makefile
+++ b/x11/gnome/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2011/09/12 20:20:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.32 2011/09/13 08:37:47 jasper Exp $
 
 SHARED_ONLY=		Yes
 
@@ -6,6 +6,7 @@ COMMENT=		versatile IDE for GNOME
 
 GNOME_PROJECT=		anjuta
 GNOME_VERSION=		3.1.91
+REVISION=		0
 
 SHARED_LIBS +=  anjuta-3             0.0      # 0.0
 
@@ -43,6 +44,10 @@ WANTLIB += ${MODPY_WANTLIB}
 
 BUILD_DEPENDS=		devel/autogen>=5.6.5 \
 			devel/gobject-introspection
+# libgda is needed by the symbol-db plugin, which we don't build on OpenBSD.
+# though GDA_CFLAGS is used in various Makefile's. So instead of changing
+# dozens of files, we just drop the LIB_DEPENDS and keep the BUILD_DEPENDS.
+BUILD_DEPENDS+=		x11/gnome/libgda
 RUN_DEPENDS=		misc/shared-mime-info
 LIB_DEPENDS=		${MODPY_LIB_DEPENDS} \
 			devel/glade \
@@ -52,7 +57,6 @@ LIB_DEPENDS=		${MODPY_LIB_DEPENDS} \
 			textproc/icu4c \
 			x11/gnome/devhelp \
 			x11/gnome/gdl \
-			x11/gnome/libgda \
 			x11/gtksourceview3
 
 # XXX: Remove when updating to a stable release
@@ -62,6 +66,9 @@ LIBTOOL_FLAGS=		--tag=disable-static
 DESKTOP_FILES=		Yes
 MODGNOME_HELP_FILES=	Yes
 
+AUTOCONF_VERSION=	2.68
+
+CONFIGURE_STYLE=	autoconf gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-plugin-subversion \
 			--enable-gtk-doc=no \
diff --git a/x11/gnome/anjuta/patches/patch-configure b/x11/gnome/anjuta/patches/patch-configure
deleted file mode 100644
index e7bff9af797..00000000000
--- a/x11/gnome/anjuta/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2011/09/12 07:26:20 ajacoutot Exp $
-
-Let configure pickup the right bison; can be removed when updating
-to a stable release.
-
---- configure.orig	Mon Jul 25 10:55:12 2011
-+++ configure	Wed Jul 27 12:12:47 2011
-@@ -4733,9 +4733,10 @@ fi
- done
- test -n "$YACC" || YACC="yacc"
- 
--if test "$YACC" != "bison -y"; then
--	as_fn_error $? "bison is required" "$LINENO" 5
--fi
-+#if test "$YACC" != "bison -y"; then
-+#	as_fn_error $? "bison is required" "$LINENO" 5
-+#fi
-+YACC="bison -y"
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/x11/gnome/anjuta/patches/patch-configure_ac b/x11/gnome/anjuta/patches/patch-configure_ac
new file mode 100644
index 00000000000..238190f5005
--- /dev/null
+++ b/x11/gnome/anjuta/patches/patch-configure_ac
@@ -0,0 +1,27 @@
+$OpenBSD: patch-configure_ac,v 1.1 2011/09/13 08:37:47 jasper Exp $
+--- configure.ac.orig	Mon Sep  5 14:29:14 2011
++++ configure.ac	Tue Sep 13 10:24:13 2011
+@@ -79,10 +79,7 @@ AC_PROG_LEX
+ if test "$LEX" != "flex"; then
+ 	AC_MSG_ERROR(flex is required)
+ fi
+-AC_PROG_YACC
+-if test "$YACC" != "bison -y"; then
+-	AC_MSG_ERROR(bison is required)
+-fi
++YACC="bison -y"
+ AC_LANG([C])
+ AC_LANG([C++])
+ AC_PROG_CXX
+@@ -285,10 +282,7 @@ fi
+ 
+ AM_CONDITIONAL(HAVE_PYTHON, [test x$have_python = xyes])
+ 
+-PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
+-     [libgda-5.0 >= $GDA5_REQUIRED],,
+-     [PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB],
+-         [libgda-4.0 >= $GDA4_REQUIRED])])
++PKG_CHECK_MODULES([PLUGIN_SYMBOL_DB], [])
+ 
+ dnl Setup Anjuta Library flags
+ dnl --------------------------