Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

8 files changed, 61 insertions, 20 deletions

diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index dc077480d53..0e2b2ce2af7 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2002/03/24 19:53:40 rh Exp $
+# $NetBSD: Makefile,v 1.77 2002/08/25 18:40:30 jlam Exp $
 
 DISTNAME=		gnome-libs-1.4.1.4
 CATEGORIES=		x11 gnome
@@ -23,7 +23,7 @@ CONFIGURE_ENV+=		LOCALBASE=${LOCALBASE} \
 			X11BASE=${X11BASE} \
 			PKGLOCALEDIR=${PKGLOCALEDIR}
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 LOCALSTATEDIR=		/var/gnome
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
@@ -33,9 +33,9 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE} \
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
+.  include "../../databases/db/buildlink2.mk"
 
-CPPFLAGS+=		-I${BUILDLINK_DIR}/include/db2
+CPPFLAGS+=		-I${BUILDLINK_PREFIX.db}/include/db2
 
 pre-configure:
 	${MV} ${WRKSRC}/configure ${WRKSRC}/configure-pre-db-sub && \
@@ -63,11 +63,11 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \
 		${LOCALBASE}/share/aclocal/libart.m4
 
-.include "../../audio/esound/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../graphics/imlib/buildlink.mk"
-.include "../../graphics/xpm/buildlink.mk"
-.include "../../net/ORBit/buildlink.mk"
-.include "../../x11/gtk/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../net/ORBit/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST
index add4dcc2008..3ad23a5e873 100644
--- a/x11/gnome-libs/PLIST
+++ b/x11/gnome-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/07/01 10:10:00 agc Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/08/25 18:40:30 jlam Exp $
 bin/dns-helper
 bin/gconfigger
 bin/gnome-bug
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index b9c99f98f16..9766a2e235b 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.17 2002/07/14 01:19:15 rh Exp $
+# $NetBSD: buildlink.mk,v 1.18 2002/08/25 18:40:31 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
diff --git a/x11/gnome-libs/buildlink2.mk b/x11/gnome-libs/buildlink2.mk
new file mode 100644
index 00000000000..2d45f1405fe
--- /dev/null
+++ b/x11/gnome-libs/buildlink2.mk
@@ -0,0 +1,41 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:40:31 jlam Exp $
+
+.if !defined(GNOME_LIBS_BUILDLINK2_MK)
+GNOME_LIBS_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			gnome-libs
+BUILDLINK_DEPENDS.gnome-libs?=		gnome-libs>=1.4.1.4
+BUILDLINK_PKGSRCDIR.gnome-libs?=	../../x11/gnome-libs
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-libs=gnome-libs
+BUILDLINK_PREFIX.gnome-libs_DEFAULT=	${X11PREFIX}
+BUILDLINK_FILES.gnome-libs=	include/gnome-1.0/gnome.h
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/gtk-xmhtml/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libart_lgpl/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnome/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnomeui/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/libgnorba/*
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/popt-gnome.h
+BUILDLINK_FILES.gnome-libs+=	include/gnome-1.0/zvt/*
+BUILDLINK_FILES.gnome-libs+=	lib/gnome-libs/*/*
+BUILDLINK_FILES.gnome-libs+=	lib/libart_lgpl.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnome.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnomesupport.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnomeui.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnorba.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgnorbagtk.*
+BUILDLINK_FILES.gnome-libs+=	lib/libgtkxmhtml.*
+BUILDLINK_FILES.gnome-libs+=	lib/libzvt.*
+
+.include "../../audio/esound/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../graphics/imlib/buildlink2.mk"
+.include "../../graphics/xpm/buildlink2.mk"
+.include "../../net/ORBit/buildlink2.mk"
+.include "../../x11/gtk/buildlink2.mk"
+
+BUILDLINK_TARGETS+=		gnome-libs-buildlink
+
+gnome-libs-buildlink: _BUILDLINK_USE
+
+.endif	# GNOME_LIBS_BUILDLINK2_MK
diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo
index a41390daa47..2c9f94092e5 100644
--- a/x11/gnome-libs/distinfo
+++ b/x11/gnome-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2002/08/01 13:25:54 tron Exp $
+$NetBSD: distinfo,v 1.14 2002/08/25 18:40:31 jlam Exp $
 
 SHA1 (gnome-libs-1.4.1.4.tar.gz) = 3315752f9d4e8392c5e7b902d45cc7b795cdd63a
 Size (gnome-libs-1.4.1.4.tar.gz) = 3631342 bytes
-SHA1 (patch-aa) = ed906dfe8164bacabbe4f2922eecd10125a76b26
+SHA1 (patch-aa) = bcc6ba3d4375a38fe8b515725aff4903e6df1be7
 SHA1 (patch-ab) = 13a6c8c58a1acfb61150d13408fa260a82f49484
 SHA1 (patch-ac) = 601cb8850ab9497fb9ab25843d1e9fd47306256e
 SHA1 (patch-ad) = 10e46c8965137c8c0a3acf177898ca07fb4c90fa
diff --git a/x11/gnome-libs/patches/patch-aa b/x11/gnome-libs/patches/patch-aa
index 147f0413f3b..ecd77adabf0 100644
--- a/x11/gnome-libs/patches/patch-aa
+++ b/x11/gnome-libs/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $
+$NetBSD: patch-aa,v 1.17 2002/08/25 18:40:32 jlam Exp $
 
 --- configure.orig	Tue Jan 22 14:35:12 2002
 +++ configure
@@ -12,8 +12,8 @@ $NetBSD: patch-aa,v 1.16 2002/03/24 19:53:42 rh Exp $
 -  GLIB_LDFLAGS=`echo $GTK_LIBS | sed -e 's/\(-L[^ ]*\) .*$/\1/' -e 's/^.*\(-L[^ ]*\)$/\1/'`
 -fi 
 -GLIB_LIBS="$GLIB_LDFLAGS `echo $GTK_LIBS | sed 's/^.*\(-lglib[^ ]*\).*$/\1/'`"
-+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
-+GLIB_LIBS="`$GLIB_CONFIG --libs`"
++GLIB_CFLAGS="`glib-config --cflags`"
++GLIB_LIBS="`glib-config --libs`"
 +GLIB_LDFLAGS="$GLIB_LIBS"
  
  
diff --git a/x11/gnome-libs/patches/patch-ac b/x11/gnome-libs/patches/patch-ac
index 1159a9fd0a8..a4a70c0fb88 100644
--- a/x11/gnome-libs/patches/patch-ac
+++ b/x11/gnome-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.12 2002/08/01 13:25:55 tron Exp $
+$NetBSD: patch-ac,v 1.13 2002/08/25 18:40:32 jlam Exp $
 
 --- zvt/subshell-includes.h.orig	Fri Jun 15 02:04:52 2001
 +++ zvt/subshell-includes.h	Thu Aug  1 15:15:35 2002
diff --git a/x11/gnome-libs/patches/patch-az b/x11/gnome-libs/patches/patch-az
index 371c60d66ae..f57724934cc 100644
--- a/x11/gnome-libs/patches/patch-az
+++ b/x11/gnome-libs/patches/patch-az
@@ -1,4 +1,4 @@
-$NetBSD: patch-az,v 1.1 2002/07/01 10:10:01 agc Exp $
+$NetBSD: patch-az,v 1.2 2002/08/25 18:40:32 jlam Exp $
 
 --- libart_lgpl/doc/Makefile.in	2002/06/28 10:35:09	1.1
 +++ libart_lgpl/doc/Makefile.in	2002/06/28 10:35:23