* Strongly buildlinkify.

* Use LIBTOOL_OVERRIDE instead of LTCONFIG_OVERRIDE so pkgsrc libtool is
  actually invoked.
* Make sure that *-config scripts are invoked as $*_CONFIG so that the
  wrappers can be used instead.

3 files changed, 70 insertions, 13 deletions

diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index ff4e6458df8..13f5d273d98 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/03/13 17:36:51 fredb Exp $
+# $NetBSD: Makefile,v 1.36 2002/04/09 23:05:42 jlam Exp $
 #
 
 DISTNAME=		libglade-0.17
@@ -10,16 +10,14 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.daa.com.au/~james/gnome/
 COMMENT=		Runtime interpreter for GLADE gui files
 
-BUILD_USES_MSGFMT=	yes
+BUILD_USES_MSGFMT=	YES
 
-USE_LIBTOOL=		YES
+USE_BUILDLINK_ONLY=	YES
 USE_X11BASE=		YES
-
 GNU_CONFIGURE=		YES
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-Wl,-R${LOCALBASE}/lib
 
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 pre-configure:
 	${RM} ${WRKSRC}/libgladeConf.sh
diff --git a/devel/libglade/distinfo b/devel/libglade/distinfo
index 1180abd2400..cf75168520a 100644
--- a/devel/libglade/distinfo
+++ b/devel/libglade/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/10/04 19:20:06 rh Exp $
+$NetBSD: distinfo,v 1.4 2002/04/09 23:05:42 jlam Exp $
 
 SHA1 (libglade-0.17.tar.gz) = 66dbb90ffcfe80c551d2f3a296729ceab527cbc0
 Size (libglade-0.17.tar.gz) = 418921 bytes
-SHA1 (patch-aa) = 0144305b76987773b49234091a7da6708da27d3c
+SHA1 (patch-aa) = 758bdbf941d60c3c4ed69aac8ad19cdc5f012f51
 SHA1 (patch-ab) = b7832173e36810c9e5e29aace918c8169de6f5ad
diff --git a/devel/libglade/patches/patch-aa b/devel/libglade/patches/patch-aa
index a7f49f37181..6729f4d534e 100644
--- a/devel/libglade/patches/patch-aa
+++ b/devel/libglade/patches/patch-aa
@@ -1,9 +1,68 @@
-$NetBSD: patch-aa,v 1.4 2001/03/18 00:40:50 mjl Exp $
+$NetBSD: patch-aa,v 1.5 2002/04/09 23:05:43 jlam Exp $
 
---- configure.orig	Sun Mar 18 01:24:21 2001
-+++ configure	Sun Mar 18 01:25:08 2001
-@@ -2739,3 +2739,3 @@
+--- configure.orig	Thu Sep  6 23:00:42 2001
++++ configure
+@@ -7145,8 +7145,8 @@
+ echo "$as_me: error: Couldn't find xml-config" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-XML_LIBS=`xml-config --libs`
+-XML_CFLAGS=`xml-config --cflags`
++XML_LIBS=`$XML_CONFIG --libs`
++XML_CFLAGS=`$XML_CONFIG --cflags`
+ 
+ old_LIBS="$LIBS"
+ LIBS="$XML_LIBS $LIBS"
+@@ -7412,8 +7412,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
+     		if test x = xfailure; then
+@@ -7431,8 +7431,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
+@@ -7451,8 +7451,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
+ 	    	if test x = xfailure; then
+@@ -7643,7 +7643,7 @@
+   echo "$as_me:7643: checking for BONOBO - version >= $min_bonobo_version" >&5
+ echo $ECHO_N "checking for BONOBO - version >= $min_bonobo_version... $ECHO_C" >&6
    no_bonobo=""
 -  if test "$GNOME_CONFIG" = "no" ; then
 +  if true ; then
      no_bonobo=yes
+   else
+     BONOBO_CFLAGS=`$GNOME_CONFIG $bonoboconf_args --cflags bonobo bonobox`
+@@ -7860,8 +7860,8 @@
+ echo $ECHO_N "checking for gnome-db... $ECHO_C" >&6
+   if test x$GNOMEDB_CONFIG != xno; then
+     have_gnomedb=true
+-    GNOMEDB_CFLAGS="`gnomedb-config --cflags`"
+-    GNOMEDB_LIBS="`gnomedb-config --libs`"
++    GNOMEDB_CFLAGS="`$GNOMEDB_CONFIG --cflags`"
++    GNOMEDB_LIBS="`$GNOMEDB_CONFIG --libs`"
+     echo "$as_me:7865: result: found" >&5
+ echo "${ECHO_T}found" >&6
+   else