From f4555e717fdafabea3b65d8346f92d08cc738a84 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 30 Nov 2004 18:25:56 +0000
Subject: Disable db3 backend in GConf1:

  (1) The Berkeley DB storage backend requires DB-3.x, and used an
      experimental feature of DB-3.x.

  (2) There is a pretty severe bug that "prevents serious use of the
      Berkeley DB backend", according to the documentation included
      with the GConf sources.

  (3) GConf2, the successor to GConf, doesn't build with the Berkeley
      DB storage backend either.

Suggested by jlam.

Bump PKGREVISION.
Remove db3 bl3 inclusion from bl3 file, and bump BUILDLINK_DEPENDS
for it.

This fixes the gnucash build problems noted in PR 28423.
---
 devel/GConf/Makefile      | 9 ++++-----
 devel/GConf/PLIST         | 3 +--
 devel/GConf/buildlink3.mk | 6 ++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 9fbf225460a..d46be4a9f9b 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: Makefile,v 1.46 2004/11/30 18:25:56 wiz Exp $
 #
 
 DISTNAME=		GConf-1.0.9
-PKGREVISION=		6
+PKGREVISION=		7
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/1.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -16,13 +16,13 @@ BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
+USE_X11=		YES
 GNU_CONFIGURE=		YES
+MAKE_FLAGS+=		AM_MAKEFLAGS="BDBBACKEND="
 
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	gconf.pc.in
 
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.db3}/include/db3
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 pre-build:
@@ -38,7 +38,6 @@ post-install:
 	    ${PREFIX}/etc/gconf/1/path
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../databases/db3/buildlink3.mk"
 .include "../../devel/oaf/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index f0da877f466..6668f7aeae8 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2004/09/22 08:09:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.16 2004/11/30 18:25:56 wiz Exp $
 bin/gconf-config
 bin/gconf-config-1
 bin/gconf-sanity-check-1
@@ -18,7 +18,6 @@ include/gconf/1/gconf/gconf-listeners.h
 include/gconf/1/gconf/gconf-schema.h
 include/gconf/1/gconf/gconf-value.h
 include/gconf/1/gconf/gconf.h
-lib/GConf/1/libgconfbackend-bdb.la
 lib/GConf/1/libgconfbackend-xml.la
 lib/libgconf-1.la
 lib/libgconf-gtk-1.la
diff --git a/devel/GConf/buildlink3.mk b/devel/GConf/buildlink3.mk
index fca797302f8..62e5ec718b2 100644
--- a/devel/GConf/buildlink3.mk
+++ b/devel/GConf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/10/03 00:13:24 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/11/30 18:25:56 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GCONF_BUILDLINK3_MK:=	${GCONF_BUILDLINK3_MK}+
@@ -11,12 +11,10 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:NGConf}
 BUILDLINK_PACKAGES+=	GConf
 
 .if !empty(GCONF_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf+=	GConf>=1.0.9nb5
-BUILDLINK_RECOMMENDED.GConf+=	GConf>=1.0.9nb6
+BUILDLINK_DEPENDS.GConf+=	GConf>=1.0.9nb7
 BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
 .endif	# GCONF_BUILDLINK3_MK
 
-.include "../../databases/db3/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/oaf/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
-- 
cgit v1.2.3