Strongly buildlinkify and use LIBTOOL_OVERRIDE instead of LTCONFIG_OVERRIDE

so pkgsrc's libtool is invoked (this looks like an increasingly common
problem with up-to-date GNOME packages).  Also change references to
*-config into ${*_CONFIG} so that the wrappers are used instead of the
original scripts (why is this such a common problem?!).

3 files changed, 262 insertions, 8 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index fd96354e95d..0d7fd7a1fa2 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/03/26 07:29:34 rh Exp $
+# $NetBSD: Makefile,v 1.25 2002/04/10 14:37:16 jlam Exp $
 #
 
 DISTNAME=		bonobo-1.0.18
@@ -23,9 +23,15 @@ GNU_CONFIGURE=		YES
 
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 CONFIGURE_ENV+=		X11BASE="${X11BASE}"
-LDFLAGS+=		-Wl,-R${LOCALBASE}/lib
 
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+post-patch:
+	for file in `${FIND} ${WRKSRC} -name "Makefile.in"`; do		\
+		${SED}	-e "s|-I\$$(includedir)||g"			\
+			$${file} > $${file}.fixed;			\
+		${MV} -f $${file}.fixed $${file};			\
+	done
 
 .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
 .include "../../graphics/freetype2/buildlink.mk"
diff --git a/devel/bonobo/distinfo b/devel/bonobo/distinfo
index 06308b294c3..cf8a5405879 100644
--- a/devel/bonobo/distinfo
+++ b/devel/bonobo/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2002/01/16 00:03:22 rh Exp $
+$NetBSD: distinfo,v 1.9 2002/04/10 14:37:17 jlam Exp $
 
 SHA1 (bonobo-1.0.18.tar.gz) = e6f6790e0c0eb29a295163f643569e36896d27a0
 Size (bonobo-1.0.18.tar.gz) = 1279988 bytes
 SHA1 (patch-aa) = abb08c79e9971e755f4fef72bce46a88e9299397
-SHA1 (patch-ab) = dcb60df7c4eed7efbf8086135a9f1e6fdecc1d36
+SHA1 (patch-ab) = f0e9525cc00145687fbeab000023c566e797c6c4
diff --git a/devel/bonobo/patches/patch-ab b/devel/bonobo/patches/patch-ab
index 5729f718b2d..5d387156507 100644
--- a/devel/bonobo/patches/patch-ab
+++ b/devel/bonobo/patches/patch-ab
@@ -1,8 +1,41 @@
-$NetBSD: patch-ab,v 1.5 2001/04/27 19:44:40 danw Exp $
+$NetBSD: patch-ab,v 1.6 2002/04/10 14:37:17 jlam Exp $
 
---- configure.orig	Thu Feb 15 07:40:11 2001
+--- configure.orig	Thu Jan 10 08:59:43 2002
 +++ configure
-@@ -4353,7 +4353,7 @@
+@@ -1312,8 +1312,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
+@@ -1330,8 +1330,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
+@@ -1351,8 +1351,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
+@@ -7779,7 +7779,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -11,3 +44,218 @@ $NetBSD: patch-ab,v 1.5 2001/04/27 19:44:40 danw Exp $
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
+@@ -8159,7 +8159,7 @@
+ 
+ echo $ac_n "checking ORBit version""... $ac_c" 1>&6
+ echo "configure:8162: checking ORBit version" >&5
+-orbit_version=`orbit-config --version | awk '{print $2;}'`
++orbit_version=`$ORBIT_CONFIG --version | awk '{print $2;}'`
+ echo "$ac_t""$orbit_version" 1>&6
+ orbit_version=`echo $orbit_version | awk -F. '{print $1 * 10000 + $2 * 100 + $3;}'`
+ if test 0$orbit_version -lt 000512; then
+@@ -8168,8 +8168,8 @@
+ 
+ echo $ac_n "checking for libIDL >= 0.6.8""... $ac_c" 1>&6
+ echo "configure:8171: checking for libIDL >= 0.6.8" >&5
+-if gnome-config --libs libIDL > /dev/null 2>&1; then
+-	verstxt=`gnome-config --modversion libIDL`
++if $GNOME_CONFIG --libs libIDL > /dev/null 2>&1; then
++	verstxt=`$GNOME_CONFIG --modversion libIDL`
+ 	vers=`echo "$verstxt" | sed -e "s/^libIDL-//" | \
+ 		awk -F. '{ printf "%d", $1 * 10000 + $2 * 100 + $3; }'`
+ else
+@@ -8219,8 +8219,8 @@
+ 	echo "$ac_t""not found - no auto shlib factory unloads" 1>&6
+ fi
+ 
+-BONOBO_IDL_CFLAGS=`gnome-config --cflags gnome libIDL`
+-BONOBO_IDL_LIBS=`gnome-config --libs gnome libIDL`
++BONOBO_IDL_CFLAGS=`$GNOME_CONFIG --cflags gnome libIDL`
++BONOBO_IDL_LIBS=`$GNOME_CONFIG --libs gnome libIDL`
+ 
+ 
+ 
+@@ -8238,7 +8238,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8288,7 +8288,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8338,7 +8338,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_unsigned_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8388,7 +8388,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_unsigned_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8438,7 +8438,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_float'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8488,7 +8488,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8538,7 +8538,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_char'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8588,7 +8588,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_boolean'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8638,7 +8638,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_octet'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8688,7 +8688,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_long_double'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8738,7 +8738,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_wchar'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8788,7 +8788,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8838,7 +8838,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_unsigned_long_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8888,7 +8888,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_struct'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8938,7 +8938,7 @@
+ align_save_libs="$LIBS"
+ LIBS="$GLIB_LIBS $LIBS"
+ align_save_flags="$CFLAGS"
+-CFLAGS="`orbit-config --cflags client` $CFLAGS"
++CFLAGS="`$ORBIT_CONFIG --cflags client` $CFLAGS"
+ if eval "test \"`echo '$''{'ac_cv_alignof_CORBA_pointer'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9001,7 +9001,7 @@
+ 
+ echo $ac_n "checking for gnome-libs >= 1.2.7""... $ac_c" 1>&6
+ echo "configure:9004: checking for gnome-libs >= 1.2.7" >&5
+-vers=`gnome-config --modversion gnome | sed -e "s/gnome-libs-//" | \
++vers=`$GNOME_CONFIG --modversion gnome | sed -e "s/gnome-libs-//" | \
+ 		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
+ if test "$vers" -ge 10207; then
+ 	echo "$ac_t""found" 1>&6
+@@ -9012,7 +9012,7 @@
+ have_oaf=true
+ echo $ac_n "checking for Oaf >= 0.6.7""... $ac_c" 1>&6
+ echo "configure:9015: checking for Oaf >= 0.6.7" >&5
+-vers=`gnome-config --modversion oaf | sed -e "s/oaf-//" | \
++vers=`$GNOME_CONFIG --modversion oaf | sed -e "s/oaf-//" | \
+ 		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
+ if test "$vers" -ge 607; then
+ 	cat >> confdefs.h <<\EOF
+@@ -9026,7 +9026,7 @@
+ 
+ echo $ac_n "checking for libXml >= 1.8.15""... $ac_c" 1>&6
+ echo "configure:9029: checking for libXml >= 1.8.15" >&5
+-vers=`gnome-config --modversion xml | sed -e "s/xml-//" | \
++vers=`$GNOME_CONFIG --modversion xml | sed -e "s/xml-//" | \
+ 		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 10000 + $2 * 100 + $3;}'`
+ if test "$vers" -ge 10815; then
+ 	echo "$ac_t""found" 1>&6
+@@ -9341,8 +9341,8 @@
+ 
+ echo $ac_n "checking for GnomePrint libraries >= 0.16""... $ac_c" 1>&6
+ echo "configure:9344: checking for GnomePrint libraries >= 0.16" >&5
+-if gnome-config --libs print > /dev/null 2>&1; then 
+-    vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" | \
++if $GNOME_CONFIG --libs print > /dev/null 2>&1; then 
++    vers=`$GNOME_CONFIG --modversion print | sed -e "s/gnome-print-//" | \
+         awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
+     if test "$vers" -ge 16; then
+         echo "$ac_t""found" 1>&6
+@@ -9370,8 +9370,8 @@
+   HAVE_VFS_FALSE=
+ fi
+ 
+-BONOBO_LIBDIR='-L${libdir}'
+-BONOBO_INCLUDEDIR="-I${includedir}/gnome-1.0 `$GNOME_CONFIG --cflags gnomeui gdk_pixbuf print oaf xml`"
++BONOBO_LIBDIR="`$GNOME_CONFIG --libs-only-L gnome`"
++BONOBO_INCLUDEDIR="`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf print oaf xml`"
+ BONOBO_LIBS="-lbonobo `$GNOME_CONFIG --libs oaf gtk gnome`"
+ BONOBOX_LIBS="$BONOBO_LIBS -lbonobox `$GNOME_CONFIG --libs gnomeui gdk_pixbuf xml`"
+ BONOBOX_PRINT_LIBS="$BONOBOX_LIBS -lbonobo-print `$GNOME_CONFIG --libs print`"