Apply fixes by Julio Merino in PR pkg/18224:

	- remove bogus dependency on oaf
	- missing dependencies

2 files changed, 50 insertions, 21 deletions

diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile
index 3ebb6530738..be8eaa777da 100644
--- a/devel/GConf2/Makefile
+++ b/devel/GConf2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/09/10 16:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/14 07:58:03 rh Exp $
 #
 
 DISTNAME=		GConf-1.2.1
 PKGNAME=		${DISTNAME:S/GConf/GConf2/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.1/sources/GConf/}
 EXTRACT_SUFX=		.tar.bz2
@@ -14,15 +14,22 @@ COMMENT=		configuration database system used by GNOME (v2)
 
 BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+USE_GNU_GETTEXT=	yes
+USE_BUILDLINK2=		yes
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+USE_GMAKE=		yes
+USE_PERL5=		build
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-.include "../../databases/db3/buildlink.mk"
-.include "../../devel/glib2/buildlink.mk"
-.include "../../net/ORBit2/buildlink.mk"
-.include "../../textproc/libxml2/buildlink.mk"
-.include "../../x11/gtk2/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/ptl2/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../net/linc/buildlink2.mk"
+.include "../../textproc/gtk-doc/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/GConf2/buildlink2.mk b/devel/GConf2/buildlink2.mk
index 0919fd5a5ef..d5e28ce0c9a 100644
--- a/devel/GConf2/buildlink2.mk
+++ b/devel/GConf2/buildlink2.mk
@@ -1,22 +1,44 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/09/11 09:13:08 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2002/09/14 07:58:03 rh Exp $
+#
+# This Makefile fragment is included by packages that use GConf2.
+#
+# This file was created automatically using createbuildlink 2.0.
+#
 
 .if !defined(GCONF2_BUILDLINK2_MK)
 GCONF2_BUILDLINK2_MK=	# defined
 
-BUILDLINK_PACKAGES+=		gconf2
-BUILDLINK_DEPENDS.gconf2?=	GConf2>=1.2.1nb1
-BUILDLINK_PKGSRCDIR.gconf2?=	../../devel/GConf2
+BUILDLINK_PACKAGES+=			GConf2
+BUILDLINK_DEPENDS.GConf2?=		GConf2>=1.2.1nb2
+BUILDLINK_PKGSRCDIR.GConf2?=		../../devel/GConf2
 
-EVAL_PREFIX+=				BUILDLINK_PREFIX.gconf2=GConf2
-BUILDLINK_PREFIX.gconf2_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.gconf2=			include/gconf/2/gconf/*
-BUILDLINK_FILES.gconf2+=		lib/libgconf-2*
+EVAL_PREFIX+=	BUILDLINK_PREFIX.GConf2=GConf2
+BUILDLINK_PREFIX.GConf2_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-changeset.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-client.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-engine.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-enum-types.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-error.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-listeners.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-schema.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf-value.h
+BUILDLINK_FILES.GConf2+=	include/gconf/2/gconf/gconf.h
+BUILDLINK_FILES.GConf2+=	lib/GConf/2/libgconfbackend-xml.*
+BUILDLINK_FILES.GConf2+=	lib/libgconf-2.*
+BUILDLINK_FILES.GConf2+=	lib/pkgconfig/gconf-2.0.pc
 
-.include "../../databases/db3/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
+.include "../../devel/ptl2/buildlink2.mk"
+.include "../../net/ORBit2/buildlink2.mk"
+.include "../../net/linc/buildlink2.mk"
+.include "../../textproc/gtk-doc/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 
-BUILDLINK_TARGETS+=	gconf2-buildlink
+BUILDLINK_TARGETS+=	GConf2-buildlink
 
-gconf2-buildlink: _BUILDLINK_USE
+GConf2-buildlink: _BUILDLINK_USE
 
 .endif	# GCONF2_BUILDLINK2_MK