>Number:         18224
>Category:       pkg
>Synopsis:       Incorrect dependancy in devel/GConf2 (plus some fixes)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Sep 07 13:18:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6G
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar 1.6G NetBSD 1.6G (DARKSTAR) #10: Wed Sep 4 15:25:12 CEST 2002 jmmv@darkstar:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	This PR has two purposes. The first one is the most important.
	The buildlink2.mk file of devel/GConf2 uses `oaf'. This is WRONG.
	oaf is not required by GConf2 itself. oaf is part of GNOME 1!
	Using this dependancy in the Makefile also includes gnome-libs
	(version 1), which make GNOME 2 packages depend on a serie of
	GNOME 1 libraries.

	This might be causing some of the problems described in pkg/18223
	(i.e., linking together libraries of different versions). Hmm...
	is this possible? ;)

	Well, and the second part of the PR is to do some fixes in the
	current package. I have been tracking the configuration process
	and noticed several needed things not explicitly marked as
	dependancies.

	buildlink.mk file is obsolete (no package uses it). Please remove.

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf2/Makefile,v
retrieving revision 1.3
diff -u -u -r1.3 Makefile
--- Makefile	2002/09/07 00:36:53	1.3
+++ Makefile	2002/09/07 20:12:38
@@ -3,6 +3,7 @@
 
 DISTNAME=		GConf-1.2.1
 PKGNAME=		${DISTNAME:S/GConf/GConf2/}
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=2.0.1/sources/GConf/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,16 +13,27 @@
 COMMENT=		configuration database system used by GNOME (v2)
 
 BUILD_USES_MSGFMT=	yes
+BUILD_DEPENDS+=		gtk-doc>=0.6:../../textproc/gtk-doc
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+GNU_CONFIGURE=		yes
+USE_BUILDLINK2=		yes
+USE_GMAKE=		yes
+USE_GNU_GETTEXT=	yes
+USE_PERL5=		yes
 
+USE_LIBTOOL=		yes
 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"
+# We disable the BDB backend. It does not work in this GConf2 version.
+# When it does, databases/db3 will be required.
+CONFIGURE_ENV+=		enable_bdbbackend="no"
+
+.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/libxml2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
Index: buildlink2.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/GConf2/buildlink2.mk,v
retrieving revision 1.2
diff -u -u -r1.2 buildlink2.mk
--- buildlink2.mk	2002/08/25 19:22:16	1.2
+++ buildlink2.mk	2002/09/07 20:12:38
@@ -4,17 +4,23 @@
 GCONF2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		gconf2
-BUILDLINK_DEPENDS.gconf2?=	GConf2>=1.1.10
+BUILDLINK_DEPENDS.gconf2?=	GConf2>=1.1.10nb1
 BUILDLINK_PKGSRCDIR.gconf2?=	../../devel/GConf2
 
 EVAL_PREFIX+=				BUILDLINK_PREFIX.gconf2=GConf2
 BUILDLINK_PREFIX.gconf2_DEFAULT=	${X11PREFIX}
 BUILDLINK_FILES.gconf2=			include/gconf/2/gconf/*
 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/oaf/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/libxml2/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gconf2-buildlink
 
>Release-Note:
>Audit-Trail:
>Unformatted: