--DocE+STaALJfprDB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

The current db-3 pkg does not build (needs update).
While checking for easy options to get some gnome related stuff updated
anyway, I found the easiest way for me seemed to be using db-4 all over
(since apparently gnome-panel (and others) -> openldap -> db4 need it
anyway).

This patch seems to work for me. Apply if you like...

Martin

--DocE+STaALJfprDB
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=patch

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf/Makefile,v
retrieving revision 1.44
diff -c -u -r1.44 Makefile
--- Makefile	27 Apr 2004 04:59:42 -0000	1.44
+++ Makefile	5 Jul 2004 21:01:59 -0000
@@ -22,7 +22,7 @@
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	gconf.pc.in
 
-CPPFLAGS+=		-I${BUILDLINK_PREFIX.db3}/include/db3
+# CPPFLAGS+=		-I${BUILDLINK_PREFIX.db3}/include/db3
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 pre-build:
@@ -38,8 +38,10 @@
 	    ${PREFIX}/etc/gconf/1/path
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../databases/db3/buildlink3.mk"
+# .include "../../databases/db3/buildlink3.mk"
 .include "../../devel/oaf/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf/buildlink3.mk,v
retrieving revision 1.3
diff -c -u -r1.3 buildlink3.mk
--- buildlink3.mk	18 Mar 2004 09:12:09 -0000	1.3
+++ buildlink3.mk	5 Jul 2004 21:01:59 -0000
@@ -15,7 +15,8 @@
 BUILDLINK_PKGSRCDIR.GConf?=	../../devel/GConf
 .endif	# GCONF_BUILDLINK3_MK
 
-.include "../../databases/db3/buildlink3.mk"
+# .include "../../databases/db3/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/oaf/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"

--DocE+STaALJfprDB--