Use USE_LIBTOOL instead of USE_PKGLIBTOOL.

3 files changed, 20 insertions, 32 deletions

diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index b0e7a65850f..2368afc4470 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,28 +1,28 @@
-# $NetBSD: Makefile,v 1.24 2000/06/01 11:23:20 rh Exp $
+# $NetBSD: Makefile,v 1.25 2000/06/05 00:54:47 wiz Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
-DISTNAME=	glib-1.2.8
-CATEGORIES=	devel
-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=		glib-1.2.8
+CATEGORIES=		devel
+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/docs/glib_toc.html
+MAINTAINER=		tron@netbsd.org
+HOMEPAGE=		http://www.gtk.org/docs/glib_toc.html
 
-DEPENDS+=	pth>=1.3.2:../pth
+DEPENDS+=		pth>=1.3.2:../pth
 
-CONFLICTS=	gtk+-1.0.*
+CONFLICTS=		gtk+-1.0.*
 
-GNU_CONFIGURE=	yes
-USE_PKGLIBTOOL=	yes
-CONFIGURE_ARGS+=--includedir=${PREFIX}/include/glib
-LIBTOOL_FLAGS=	 --install-la
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
+GNU_CONFIGURE=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
+CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include"
 
-INFO_FILES=	glib.info
+INFO_FILES=		glib.info
 
 # XXX egcs is still broken on arm32.
 .if (${MACHINE_ARCH} == arm32)
diff --git a/devel/glib/files/patch-sum b/devel/glib/files/patch-sum
index 00f140b09d8..412c11766e2 100644
--- a/devel/glib/files/patch-sum
+++ b/devel/glib/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.7 2000/05/26 05:37:01 rh Exp $
+$NetBSD: patch-sum,v 1.8 2000/06/05 00:54:48 wiz Exp $
 
 MD5 (patch-aa) = f0f79c4b4966ceb121bd12f240e5aef6
 MD5 (patch-ab) = 9037429c991ff06f71a81e91c1e963f7
 MD5 (patch-ac) = cd3b59c2ee386ad8bd293b09adca1ba6
-MD5 (patch-ad) = 6969876a641cf98fa6318cd7951483e8
+MD5 (patch-ad) = a6b07a69e9a5599e1bf3f365173ec538
 MD5 (patch-ae) = f4182beff6eedc691d74330a54dbb63b
diff --git a/devel/glib/patches/patch-ad b/devel/glib/patches/patch-ad
index 5bcc5c9fbcc..b4ec2e97c99 100644
--- a/devel/glib/patches/patch-ad
+++ b/devel/glib/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.11 2000/05/26 05:37:01 rh Exp $
+$NetBSD: patch-ad,v 1.12 2000/06/05 00:54:49 wiz Exp $
 
 --- configure.orig	Thu May 25 02:30:06 2000
 +++ configure	Thu May 25 18:24:08 2000
@@ -11,15 +11,3 @@ $NetBSD: patch-ad,v 1.11 2000/05/26 05:37:01 rh Exp $
  GLIB_INTERFACE_AGE=8
  GLIB_BINARY_AGE=8
  GLIB_VERSION=$GLIB_MAJOR_VERSION.$GLIB_MINOR_VERSION.$GLIB_MICRO_VERSION
-@@ -1540,8 +1540,11 @@
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
- 
-+if false; then
- # 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.