Strongly buildlinkify and use LIBTOOL_OVERRIDE to use the pkgsrc libtool

instead of the package-supplied one.

3 files changed, 54 insertions, 7 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 53623f20370..c7f11799a22 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2002/03/27 18:51:51 perry Exp $
+# $NetBSD: Makefile,v 1.47 2002/04/10 01:59:14 jlam Exp $
 #
 
 DISTNAME=		gnome-print-0.35
@@ -13,16 +13,14 @@ DEPENDS+=		ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 
 USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ENV+=		GHOSTSCRIPT=${LOCALBASE}/bin/gs
+CONFIGURE_ARGS+=	--without-admin		# currently unstable
+
 # override HOME to avoid trying to install ${HOME}/.gnome
 MAKE_ENV+=		HOME=${WRKSRC}
 
-CPPFLAGS+=		-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-
 .include "../../graphics/freetype2/buildlink.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
 .include "../../textproc/libunicode/buildlink.mk"
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index 87d900373ca..1493e8906f6 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/03/26 09:20:44 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/04/10 01:59:15 jlam Exp $
 
 SHA1 (gnome-print-0.35.tar.gz) = 287f008c99925c662526f644a17cdb05c7533507
 Size (gnome-print-0.35.tar.gz) = 991657 bytes
+SHA1 (patch-aa) = c29847ea6059b8e9275176273c007a16b20c3a83
 SHA1 (patch-ac) = 74f5800e867c941f7fd5d054f28fe575fb5579da
diff --git a/print/gnome-print/patches/patch-aa b/print/gnome-print/patches/patch-aa
new file mode 100644
index 00000000000..45b7a516fdf
--- /dev/null
+++ b/print/gnome-print/patches/patch-aa
@@ -0,0 +1,48 @@
+$NetBSD: patch-aa,v 1.13 2002/04/10 01:59:15 jlam Exp $
+
+--- configure.orig	Mon Jan 28 14:58:57 2002
++++ configure
+@@ -5866,8 +5866,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
+@@ -5884,8 +5884,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
+@@ -5905,8 +5905,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
+@@ -8897,8 +8897,8 @@
+          
+             echo $ac_n "checking for Glade libraries >= 0.13""... $ac_c" 1>&6
+ echo "configure:8900: 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