Strongly buildlinkify.

4 files changed, 130 insertions, 6 deletions

diff --git a/devel/gal/Makefile b/devel/gal/Makefile
index aef32977427..c1a1d874630 100644
--- a/devel/gal/Makefile
+++ b/devel/gal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/03/13 17:36:48 fredb Exp $
+# $NetBSD: Makefile,v 1.22 2002/04/10 15:56:12 jlam Exp $
 
 DISTNAME=		gal-0.19
 PKGREVISION=		1
@@ -10,6 +10,7 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Gnome Application Libraries
 
+USE_BUILDLINK_ONLY=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
@@ -17,10 +18,12 @@ USE_X11BASE=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .include "../../converters/libiconv/buildlink.mk"
-.include "../../textproc/libunicode/buildlink.mk"
-.include "../../sysutils/gnome-vfs/buildlink.mk"
-.include "../../print/gnome-print/buildlink.mk"
+.include "../../devel/bonobo/buildlink.mk"
 .include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/libglade/buildlink.mk"
-.include "../../devel/bonobo/buildlink.mk"
+.include "../../print/gnome-print/buildlink.mk"
+.include "../../sysutils/gnome-vfs/buildlink.mk"
+.include "../../textproc/libunicode/buildlink.mk"
+
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/gal/distinfo b/devel/gal/distinfo
index 85e101c116b..d41f96ab6d2 100644
--- a/devel/gal/distinfo
+++ b/devel/gal/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.9 2002/01/16 03:20:18 rh Exp $
+$NetBSD: distinfo,v 1.10 2002/04/10 15:56:12 jlam Exp $
 
 SHA1 (gal-0.19.tar.bz2) = 175300d0cd56fc93df0865fd1857c12837bcaf30
 Size (gal-0.19.tar.bz2) = 893300 bytes
+SHA1 (patch-aa) = 316dd9ea13a251106defabf32a0703949de74f24
+SHA1 (patch-ab) = 51d98eac2b40cd660de15e53a93d6956439dca3a
diff --git a/devel/gal/patches/patch-aa b/devel/gal/patches/patch-aa
new file mode 100644
index 00000000000..d5011721248
--- /dev/null
+++ b/devel/gal/patches/patch-aa
@@ -0,0 +1,106 @@
+$NetBSD: patch-aa,v 1.6 2002/04/10 15:56:13 jlam Exp $
+
+--- configure.orig	Tue Dec 18 17:36:11 2001
++++ configure
+@@ -2292,8 +2292,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
+@@ -2310,8 +2310,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
+@@ -2331,8 +2331,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
+@@ -4858,8 +4858,11 @@
+ 
+ echo $ac_n "checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0""... $ac_c" 1>&6
+ echo "configure:4861: 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 -n "$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
+@@ -5185,8 +5188,8 @@
+ 
+ echo $ac_n "checking for GnomePrint libraries >= 0.25""... $ac_c" 1>&6
+ echo "configure:5188: 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
+@@ -5199,8 +5202,8 @@
+ 
+ echo $ac_n "checking for Glade libraries >= 0.13""... $ac_c" 1>&6
+ echo "configure:5202: 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
+@@ -5226,8 +5229,8 @@
+ 
+ echo $ac_n "checking for GNOME-VFS""... $ac_c" 1>&6
+ echo "configure:5229: 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 ;;
+@@ -5240,8 +5243,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`"
+ 	
+ 	
+ 
+@@ -5307,8 +5310,8 @@
+ 
+ 
+ 
+-EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
+-EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
++EXTRA_GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
++EXTRA_GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
+ 
+ 
+ 
diff --git a/devel/gal/patches/patch-ab b/devel/gal/patches/patch-ab
new file mode 100644
index 00000000000..12c78debeed
--- /dev/null
+++ b/devel/gal/patches/patch-ab
@@ -0,0 +1,13 @@
+$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)
+ 
+