buildlink1 -> buildlink2

4 files changed, 12 insertions, 134 deletions

diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index d965973ffdf..eda1882768d 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/09/10 16:06:38 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2002/09/21 10:49:26 jlam Exp $
 
 DISTNAME=		gal-0.19.3
 PKGREVISION=		1
@@ -10,20 +10,19 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Gnome Application Libraries
 
-USE_BUILDLINK_ONLY=	YES
-GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
+GNU_CONFIGURE=		YES
 
+USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../devel/bonobo/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/libglade/buildlink.mk"
-.include "../../print/gnome-print/buildlink.mk"
-.include "../../sysutils/gnome-vfs/buildlink.mk"
-.include "../../textproc/libunicode/buildlink.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../sysutils/gnome-vfs/buildlink2.mk"
+.include "../../textproc/libunicode/buildlink2.mk"
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gal/distinfo b/devel/gal/distinfo
index 3738d1b911e..4891ec15bf6 100644
--- a/devel/gal/distinfo
+++ b/devel/gal/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/08/25 19:22:27 jlam Exp $
+$NetBSD: distinfo,v 1.14 2002/09/21 10:49:26 jlam Exp $
 
 SHA1 (gal-0.19.3.tar.bz2) = db4a09f01f5d2d1f3c2c3466988f3c42cc0d2073
 Size (gal-0.19.3.tar.bz2) = 903527 bytes
-SHA1 (patch-aa) = ff3dd3e6bf69f886f2c0538902badcf77a522ff1
-SHA1 (patch-ab) = 51d98eac2b40cd660de15e53a93d6956439dca3a
diff --git a/devel/gal/patches/patch-aa b/devel/gal/patches/patch-aa
deleted file mode 100644
index 5a310e89220..00000000000
--- a/devel/gal/patches/patch-aa
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2002/08/25 19:22:28 jlam Exp $
-
---- configure.orig	Thu Jun 20 04:40:53 2002
-+++ configure	Wed Jul 10 22:54:42 2002
-@@ -5989,8 +5989,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
-@@ -6007,8 +6007,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
-@@ -6028,8 +6028,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
-@@ -8585,8 +8585,11 @@
- 
- echo $ac_n "checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0""... $ac_c" 1>&6
- echo "configure:8588: checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0" >&5
--if xml-config --libs > /dev/null 2>&1; then 
--    vers=`xml-config --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+if test -z "$XML_CONFIG"; then
-+  XML_CONFIG=xml-config
-+fi
-+if $XML_CONFIG --libs > /dev/null 2>&1; then 
-+    vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-     if test "$vers" -ge 1008008; then
- 	if test "$vers" -lt 2000000; then
- 	    echo "$ac_t""found" 1>&6
-@@ -8952,8 +8955,8 @@
- 
- echo $ac_n "checking for GnomePrint libraries >= 0.25""... $ac_c" 1>&6
- echo "configure:8955: checking for GnomePrint libraries >= 0.25" >&5
--if gnome-config --libs print > /dev/null 2>&1; then 
--    vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" -e 's/cvs$//' -e 's/pre$//' | \
-+if $GNOME_CONFIG --libs print > /dev/null 2>&1; then 
-+    vers=`$GNOME_CONFIG --modversion print | sed -e "s/gnome-print-//" -e 's/cvs$//' -e 's/pre$//' | \
-         awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-     if test "$vers" -ge 25; then
-         echo "$ac_t""found" 1>&6
-@@ -8966,8 +8969,8 @@
- 
- echo $ac_n "checking for Glade libraries >= 0.13""... $ac_c" 1>&6
- echo "configure:8969: checking for Glade libraries >= 0.13" >&5
--if gnome-config --libs libglade > /dev/null 2>&1; then 
--    vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-+if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then 
-+    vers=`$GNOME_CONFIG --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
-     if test "$vers" -ge 13; then
-         echo "$ac_t""found" 1>&6
-     else
-@@ -8993,8 +8996,8 @@
- 
- echo $ac_n "checking for GNOME-VFS""... $ac_c" 1>&6
- echo "configure:8996: checking for GNOME-VFS" >&5
--if gnome-config --libs vfs > /dev/null 2>&1; then
--	vers=`gnome-config --modversion vfs`
-+if $GNOME_CONFIG --libs vfs > /dev/null 2>&1; then
-+	vers=`$GNOME_CONFIG --modversion vfs`
- 	case $vers
- 	in
- 	    gnome-vfs-0.012) vfs_ok=false ;;
-@@ -9007,8 +9010,8 @@
- if $vfs_ok; then
- 	echo "$ac_t""$vers" 1>&6
- 
--	GNOME_VFS_LIBS="`gnome-config --libs vfs`"
--	GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
-+	GNOME_VFS_LIBS="`$GNOME_CONFIG --libs vfs`"
-+	GNOME_VFS_CFLAGS="`$GNOME_CONFIG --cflags vfs`"
- 	
- 	
- 
-@@ -9074,8 +9077,8 @@
- 
- 
- 
--EXTRA_GNOME_LIBS="`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `imlib-config --libs-gdk`"
--EXTRA_GNOME_CFLAGS="`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `imlib-config --cflags-gdk`"
-+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `$IMLIB_CONFIG --libs-gdk`"
-+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf` `$IMLIB_CONFIG --cflags-gdk`"
- 
- 
- 
diff --git a/devel/gal/patches/patch-ab b/devel/gal/patches/patch-ab
deleted file mode 100644
index 12c78debeed..00000000000
--- a/devel/gal/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2002/04/10 15:56:13 jlam Exp $
-
---- tests/Makefile.in.orig	Wed Apr 10 11:34:01 2002
-+++ tests/Makefile.in
-@@ -143,7 +143,7 @@
- INCLUDES =  	-I$(top_srcdir)                         	-I$(top_srcdir)/gal                     	$(EXTRA_GNOME_CFLAGS)				$(GNOME_BONOBO_CFLAGS)				$(GNOME_VFS_CFLAGS)				$(GNOME_INCLUDEDIR)				-DETABLE_GLADEDIR=\"$(gladedir)\"	        -DG_LOG_DOMAIN=\"e-table\"
- 
- 
--LDFLAGS = `gnome-config --libs gdk_pixbuf`
-+LDFLAGS = `$(GNOME_CONFIG) --libs gdk_pixbuf`
- LDADD = $(top_builddir)/gal/libgal.la 	$(EXTRA_GNOME_LIBS) $(ICONV_LIBS)
- 
-