From 690eb7c8263878cf6d4f8c34177661f4d525d37f Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 28 Aug 2002 16:49:38 +0000
Subject: [PATCH] buildlink1 -> buildlink2

---
 sysutils/gnome-vfs/Makefile         | 15 ++++----
 sysutils/gnome-vfs/distinfo         |  4 +-
 sysutils/gnome-vfs/patches/patch-ag | 58 +----------------------------
 3 files changed, 10 insertions(+), 67 deletions(-)

diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 12124e2b590f..b6d7c116c869 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2002/04/09 20:45:43 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2002/08/28 16:49:38 jlam Exp $
 
 DISTNAME=		gnome-vfs-1.0.3
 CATEGORIES=		sysutils gnome
@@ -10,16 +10,15 @@ COMMENT=		GNOME Virtual File System
 
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 
-CPPFLAGS+=		-D_POSIX_THREAD_SYSCALL_SOFT=1
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/GConf/buildlink2.mk"
 
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/GConf/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-vfs/distinfo b/sysutils/gnome-vfs/distinfo
index ad5a1ad657a4..de1de71f6e6d 100644
--- a/sysutils/gnome-vfs/distinfo
+++ b/sysutils/gnome-vfs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2002/04/09 20:44:24 jlam Exp $
+$NetBSD: distinfo,v 1.9 2002/08/28 16:49:38 jlam Exp $
 
 SHA1 (gnome-vfs-1.0.3.tar.gz) = 51b4ca77591ee83b35d3987f0f26740623c1fa0a
 Size (gnome-vfs-1.0.3.tar.gz) = 1211129 bytes
@@ -8,4 +8,4 @@ SHA1 (patch-ac) = 4da6d9b46d059710dcd8248dd9d23cb79e5253e1
 SHA1 (patch-ad) = cf959c7d8eb70dba844ea01e887e7487111d9cbd
 SHA1 (patch-ae) = a0906ba19a6953aca3b173f03fb1b2d9bf742a09
 SHA1 (patch-af) = c76c64801b643828f6cb8751131447335d39c28e
-SHA1 (patch-ag) = 7862d16ca47133e4d0c03391ba5f79ec730d14a1
+SHA1 (patch-ag) = 20260ccfc66aa977770a502b30f888c7039332a5
diff --git a/sysutils/gnome-vfs/patches/patch-ag b/sysutils/gnome-vfs/patches/patch-ag
index cf59e689f19d..602c30cb0bae 100644
--- a/sysutils/gnome-vfs/patches/patch-ag
+++ b/sysutils/gnome-vfs/patches/patch-ag
@@ -1,63 +1,7 @@
-$NetBSD: patch-ag,v 1.5 2002/04/09 20:44:25 jlam Exp $
+$NetBSD: patch-ag,v 1.6 2002/08/28 16:49:39 jlam Exp $
 
 --- configure.orig	Fri Oct 12 04:35:44 2001
 +++ configure
-@@ -5591,8 +5591,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 		
--		ORBIT_CFLAGS=`orbit-config --cflags client server`
--		ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
-+		ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server`
-+		ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server`
- 		
- 		
- 	else
-@@ -5609,8 +5609,8 @@
-   
- 		gnome_cv_gnorba_found=no
- 		if test x$gnome_cv_orbit_found = xyes; then
--			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+			GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+			GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 			if test -n "$GNORBA_LIBS"; then
- 				gnome_cv_gnorba_found=yes
- 			fi
-@@ -5630,8 +5630,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 		
--		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+		GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+		GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 		
- 		
- 	else
-@@ -5709,14 +5709,14 @@
- 	fi
- 
- 
--VFS_GNOME_CFLAGS="`gnome-config --cflags gnome`"
--VFS_GNOMEUI_CFLAGS="`gnome-config --cflags gnome gnomeui`"
--VFS_GNOMEGNORBA_CFLAGS="`gnome-config --cflags gnome gnomeui gnorba`"
--VFS_CAPPLET_CFLAGS="`gnome-config --cflags gnome gnomeui capplet`"
--VFS_GNOME_LIBS="`gnome-config --libs gnome`"
--VFS_GNOMEUI_LIBS="`gnome-config --libs gnome gnomeui`"
--VFS_GNOMEGNORBA_LIBS="`gnome-config --libs gnome gnomeui gnorba`"
--VFS_CAPPLET_LIBS="`gnome-config --libs gnome gnomeui capplet`"
-+VFS_GNOME_CFLAGS="`$GNOME_CONFIG --cflags gnome`"
-+VFS_GNOMEUI_CFLAGS="`$GNOME_CONFIG --cflags gnome gnomeui`"
-+VFS_GNOMEGNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnome gnomeui gnorba`"
-+VFS_CAPPLET_CFLAGS="`$GNOME_CONFIG --cflags gnome gnomeui capplet`"
-+VFS_GNOME_LIBS="`$GNOME_CONFIG --libs gnome`"
-+VFS_GNOMEUI_LIBS="`$GNOME_CONFIG --libs gnome gnomeui`"
-+VFS_GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs gnome gnomeui gnorba`"
-+VFS_CAPPLET_LIBS="`$GNOME_CONFIG --libs gnome gnomeui capplet`"
- VFS_GLIB_CONFIG="glib-config"
- 
- 
 @@ -10210,7 +10210,6 @@
  data/Makefile
  data/mime/Makefile