Replace USE_PKGLIBTOOL by USE_LIBTOOL.

4 files changed, 30 insertions, 43 deletions

diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 189dd742bf0..bad523aa364 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,37 +1,38 @@
-# $NetBSD: Makefile,v 1.43 2000/06/01 11:23:45 rh Exp $
+# $NetBSD: Makefile,v 1.44 2000/06/05 01:12:37 wiz Exp $
 
-DISTNAME=	gtk+-1.2.8
-CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.gtk.org/pub/gtk/v1.2/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
-		http://www.ameth.org/gimp/pub/gtk/v1.2/ \
-		ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.2/
+DISTNAME=		gtk+-1.2.8
+CATEGORIES=		x11
+MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v1.2/ \
+			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.2/ \
+			http://www.ameth.org/gimp/pub/gtk/v1.2/ \
+			ftp://infosoc.uni-koeln.de/pub/ftp.gimp.org/pub/gtk/v1.2/
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.gtk.org/
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gtk.org/
 
-DEPENDS+=	gettext-0.10.*:../../devel/gettext
-DEPENDS+=	glib>=1.2.8:../../devel/glib
-BUILD_DEPENDS+=	${LOCALBASE}/bin/perl:../../lang/perl5
+DEPENDS+=		gettext-0.10.*:../../devel/gettext
+DEPENDS+=		glib>=1.2.8:../../devel/glib
+BUILD_DEPENDS+=		${LOCALBASE}/bin/perl:../../lang/perl5
 
-USE_PKGLIBTOOL=	yes
-USE_X11BASE=	yes
-USE_GMAKE=	yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+USE_X11BASE=		yes
+USE_GMAKE=		yes
 
-GNU_CONFIGURE=  yes
-CONFIGURE_ARGS+=--with-xinput=xfree
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" X_LDFLAGS="${X_LDFLAGS}"
+GNU_CONFIGURE=		 yes
+CONFIGURE_ARGS+=	--with-xinput=xfree
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" X_LDFLAGS="${X_LDFLAGS}"
 
-INFO_FILES=	gdk.info gtk.info
+INFO_FILES=		gdk.info gtk.info
 
-CPPFLAGS=	-I${LOCALBASE}/include				# libintl.h
-LDFLAGS=	-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib	# -lintl
-PLIST_SUBST+=	LOCALBASE=${LOCALBASE}
+CPPFLAGS=		-I${LOCALBASE}/include			   # libintl.h
+LDFLAGS=		-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib  # -lintl
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 # The following ensures that `gtk-config --libs' includes the correct linker
 # flags for linking the X11 libs.
 #
-X_LDFLAGS=	-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
+X_LDFLAGS=		-Wl,-R${X11BASE}/lib -L${X11BASE}/lib
 
 post-install:
 	${TEST} ${PREFIX} = ${LOCALBASE} || \
diff --git a/x11/gtk/files/patch-sum b/x11/gtk/files/patch-sum
index 5962e50605e..29087e9726a 100644
--- a/x11/gtk/files/patch-sum
+++ b/x11/gtk/files/patch-sum
@@ -1,6 +1,6 @@
-$NetBSD: patch-sum,v 1.8 2000/05/26 05:38:21 rh Exp $
+$NetBSD: patch-sum,v 1.9 2000/06/05 01:12:41 wiz Exp $
 
-MD5 (patch-aa) = fe100bb1f02b87744711d67d975a4764
+MD5 (patch-aa) = 4d0a23379967d6227812b77c8b6d8b8d
 MD5 (patch-ab) = 884c71416aaaaee6dd2d410cb5a9cade
 MD5 (patch-ac) = 76bcc7c03a39f3562d365a8c57270189
 MD5 (patch-ad) = dec2132522595c59687fa3af05b75462
diff --git a/x11/gtk/patches/patch-aa b/x11/gtk/patches/patch-aa
index f1f6ed000f9..68833c19f51 100644
--- a/x11/gtk/patches/patch-aa
+++ b/x11/gtk/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.18 2000/05/26 05:38:21 rh Exp $
+$NetBSD: patch-aa,v 1.19 2000/06/05 01:12:43 wiz Exp $
 
 --- configure.orig	Thu May 25 02:31:48 2000
 +++ configure	Thu May 25 18:53:46 2000
@@ -13,22 +13,6 @@ $NetBSD: patch-aa,v 1.18 2000/05/26 05:38:21 rh Exp $
  GTK_BINARY_AGE=8
  GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
  ac_help="$ac_help
-@@ -1393,6 +1393,7 @@
- *) lt_target="$target" ;;
- esac
- 
-+if false; then
- # Check for any special flags to pass to ltconfig.
- libtool_flags="--cache-file=$cache_file"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-@@ -1546,6 +1547,7 @@
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+fi
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
 @@ -4099,7 +4101,7 @@
  
  # AM_GTK_GNU_GETTEXT above substs $DATADIRNAME
diff --git a/x11/gtk/pkg/PLIST b/x11/gtk/pkg/PLIST
index 03969112a0c..48a4d74aac2 100644
--- a/x11/gtk/pkg/PLIST
+++ b/x11/gtk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2000/05/26 05:38:21 rh Exp $
+@comment $NetBSD: PLIST,v 1.27 2000/06/05 01:12:44 wiz Exp $
 bin/gtk-config
 etc/gtk/gtkrc.cs
 etc/gtk/gtkrc.hr
@@ -170,8 +170,10 @@ include/gtk/gtksocket.h
 include/gtk/gtkthemes.h
 lib/libgdk.so.12.8
 lib/libgdk.a
+lib/libgdk.la
 lib/libgtk.so.12.8
 lib/libgtk.a
+lib/libgtk.la
 man/man1/gtk-config.1
 @unexec install-info --delete %D/info/gdk.info %D/info/dir
 @unexec install-info --delete %D/info/gtk.info %D/info/dir