s/USE_LIBTOOL/USE_PKGLIBTOOL/

Add a new USE_LIBTOOL definition that uses the libtool package instead of
pkglibtool which is now considered outdated.
USE_PKGLIBTOOL is available for backwards compatibility with old packages
but is deprecated for new packages.

24 files changed, 48 insertions, 48 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 9a2cf3442f4..3e5580d9fd0 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/12 14:17:29 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:20 rh Exp $
 #
 
 DISTNAME=		bonobo-0.4
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 DEPENDS+=		bison-*:../../devel/bison
 DEPENDS+=		gdk-pixbuf-*:../../graphics/gdk-pixbuf
 
-USE_LIBTOOL=		YES
+USE_PKGLIBTOOL=		YES
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/devel/boost/Makefile b/devel/boost/Makefile
index 13fb6a3a602..bc86440e7d4 100644
--- a/devel/boost/Makefile
+++ b/devel/boost/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/05/29 22:46:44 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:20 rh Exp $
 
 DISTNAME=		boost_all
 PKGNAME=		boost-1.14.3
@@ -12,7 +12,7 @@ HOMEPAGE=		http://www.boost.org/
 # Need working <limits> and <memory> not present in NetBSD yet.
 DEPENDS+=		sgi-stl>=3.2:../../devel/sgi-stl
 
-USE_LIBTOOL=		# defined
+USE_PKGLIBTOOL=		# defined
 
 DIST_SUBDIR=		${PKGNAME}
 EXTRACT_CMD=		${LOCALBASE}/bin/unzip -aaLu ${DOWNLOADED_DISTFILE}
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index 2ea6fd83e30..ba1d570299d 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/01/15 18:46:25 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:20 rh Exp $
 #
 
 DISTNAME=		latestCDK
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.vexus.ca/CDK.html
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/autoconf:../../devel/autoconf
 
-USE_LIBTOOL=		yes
+USE_PKGLIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include	# for ncurses.h
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index ac59003ea4c..b0e7a65850f 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/05/26 05:37:00 rh Exp $
+# $NetBSD: Makefile,v 1.24 2000/06/01 11:23:20 rh Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -17,7 +17,7 @@ DEPENDS+=	pth>=1.3.2:../pth
 CONFLICTS=	gtk+-1.0.*
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/glib
 LIBTOOL_FLAGS=	 --install-la
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
diff --git a/devel/gtl/Makefile b/devel/gtl/Makefile
index 893fbfc6de9..503edaa0b61 100644
--- a/devel/gtl/Makefile
+++ b/devel/gtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/05/10 04:31:17 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:21 rh Exp $
 
 DISTNAME=		GTL-0.3.3
 PKGNAME=		gtl-0.3.3
@@ -9,7 +9,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.fmi.uni-passau.de/Graphlet/GTL/
 
 GNU_CONFIGURE=		# defined
-USE_LIBTOOL=		# defined
+USE_PKGLIBTOOL=		# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GTL_VERS=		0:3
diff --git a/devel/guile-gtk/Makefile b/devel/guile-gtk/Makefile
index 4dd7f4ea9c9..efa8437e4a5 100644
--- a/devel/guile-gtk/Makefile
+++ b/devel/guile-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/12/20 11:58:45 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:21 rh Exp $
 #
 
 DISTNAME=	guile-gtk-0.17
@@ -15,7 +15,7 @@ DEPENDS+=	gnome-core-*:../../x11/gnome-core
 DEPENDS+=	guile-1.3.*:../../lang/guile
 
 GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
+USE_PKGLIBTOOL=	YES
 USE_X11=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/isect/Makefile b/devel/isect/Makefile
index 677146f28a1..e34cc168c69 100644
--- a/devel/isect/Makefile
+++ b/devel/isect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/11/15 18:08:16 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:21 rh Exp $
 #
 
 DISTNAME=	isect-1.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://home.netcom.com/~tgagne/
 DEPENDS+=	libwww-5.*:../../www/libwww
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include	# for w3c-libwww/WWWlib.h
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 21bd8722702..5ccf9836297 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/03/30 15:22:43 tron Exp $
+# $NetBSD: Makefile,v 1.10 2000/06/01 11:23:21 rh Exp $
 
 DISTNAME=	kdbg-1.0.1
 CATEGORIES=	devel kde
@@ -16,7 +16,7 @@ DEPENDS+=	png>=1.0.6:../../graphics/png
 
 USE_X11BASE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-qt-dir=${PREFIX}/qt1 \
 		--with-qt-includes=${PREFIX}/qt1/include \
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index dbb10322bde..84e6a3e19de 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/05/05 13:54:10 wulf Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/01 11:23:21 rh Exp $
 
 DISTNAME=	kdevelop-1.2
 CATEGORIES=	devel kde
@@ -18,7 +18,7 @@ DEPENDS+=       kdoc-2*:../../textproc/kdoc
 USE_PERL5=	yes
 USE_X11BASE=	yes
 USE_GMAKE=	yes
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-extra-includes=${LOCALBASE}/include \
 		--with-extra-libs=${LOCALBASE}/lib \
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 919fa570966..b5df1a52715 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2000/05/30 19:35:40 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2000/06/01 11:23:22 rh Exp $
 
 DISTNAME=		libgtop-1.0.9
 CATEGORIES=		devel gnome
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM=	NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k
 GNU_CONFIGURE=		yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
-USE_LIBTOOL=		yes
+USE_PKGLIBTOOL=		yes
 
 CFLAGS+=		-g
 CPPFLAGS+=		-I${LOCALBASE}/include
diff --git a/devel/libhfs/Makefile b/devel/libhfs/Makefile
index fd1154f4478..8b87af42494 100644
--- a/devel/libhfs/Makefile
+++ b/devel/libhfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/02 19:05:05 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:22 rh Exp $
 #
 
 DISTNAME=	hfsutils-3.2.6
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.mars.org/home/rob/proj/hfs/
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I./
 
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 
 ALL_TARGET=	all_lib
 
diff --git a/devel/libnet/Makefile b/devel/libnet/Makefile
index 0e8eff244f8..1d79279db2c 100644
--- a/devel/libnet/Makefile
+++ b/devel/libnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/28 05:28:26 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:22 rh Exp $
 #
 
 DISTNAME=	libnet-1.0
@@ -9,7 +9,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.packetfactory.net/libnet/
 
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBNET_CONFIG_CFLAGS="-I${PREFIX}/include" \
 		LIBNET_CONFIG_LIBS="${LDFLAGS}"
diff --git a/devel/libproplist/Makefile b/devel/libproplist/Makefile
index 111cae54420..c50fbebb97c 100644
--- a/devel/libproplist/Makefile
+++ b/devel/libproplist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/07 17:44:42 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:22 rh Exp $
 
 DISTNAME=	libPropList-0.10.1
 PKGNAME=	libproplist-0.10.1
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.windowmaker.org/pub/beta/srcs/
 MAINTAINER=	jlam@netbsd.org
 
 GNU_CONFIGURE=	# defined
-USE_LIBTOOL=	# defined
+USE_PKGLIBTOOL=	# defined
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libproplist
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 3b9f8fedd21..03dbcc87e29 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/05/18 13:20:09 mjl Exp $
+# $NetBSD: Makefile,v 1.20 2000/06/01 11:23:23 rh Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:41 max Exp 
 #
 
@@ -12,6 +12,6 @@ MAINTAINER=     packages@netbsd.org
 HOMEPAGE=	http://space.mit.edu/~davis/slang.html
 
 GNU_CONFIGURE=  yes
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile
index 63ea3a56bad..f0074e8ef02 100644
--- a/devel/libsmi/Makefile
+++ b/devel/libsmi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/08 07:59:18 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:23 rh Exp $
 #
 
 DISTNAME=	libsmi-0.1.6
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.ibr.cs.tu-bs.de/projects/libsmi/
 
 MIBDIR=		${PREFIX}/share/libsmi/mibs
 
-USE_LIBTOOL=	YES
+USE_PKGLIBTOOL=	YES
 GNU_CONFIGURE=	YES
 CPPFLAGS+=	-Dstrtoll=strtoq -Dstrtoull=strtouq
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index 115c298746a..f76e754d7a6 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/01/06 13:28:42 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:23 rh Exp $
 #
 
 DISTNAME=		libstroke-0.3
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.etla.net/libstroke/
 DEPENDS+=		tcl-8.0.5:../../lang/tcl80
 
 GNU_CONFIGURE=		YES
-USE_LIBTOOL=		YES
+USE_PKGLIBTOOL=		YES
 USE_X11=		YES
 
 CONFIGURE_ENV+=		X_CFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0"
diff --git a/devel/lwp/Makefile b/devel/lwp/Makefile
index a0f2fb80f7f..ed43dd0ba12 100644
--- a/devel/lwp/Makefile
+++ b/devel/lwp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/03 12:58:43 fredb Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:23 rh Exp $
 #
 
 DISTNAME=	lwp-1.1
@@ -10,7 +10,7 @@ MAINTAINER=	fb@enteract.com
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
 GNU_CONFIGURE=	YES
-USE_LIBTOOL=	YES
+USE_PKGLIBTOOL=	YES
 
 LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
 
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 85510e2a776..70f889946b8 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/02/12 05:00:38 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2000/06/01 11:23:23 rh Exp $
 
 DISTNAME=		ncurses-5.0
 CATEGORIES=		devel
@@ -9,7 +9,7 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.clark.net/pub/dickey/ncurses/ncurses.html
 
 GNU_CONFIGURE=		yes
-USE_LIBTOOL=		yes
+USE_PKGLIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-normal --enable-bsdpad \
 			--without-shared --without-debug --without-profile \
 			--without-gpm --without-ada \
diff --git a/devel/netcdf/Makefile b/devel/netcdf/Makefile
index af0207f7735..2a0d6256d26 100644
--- a/devel/netcdf/Makefile
+++ b/devel/netcdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/11/23 22:04:26 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:24 rh Exp $
 #
 
 DISTNAME=	netcdf-3.4
@@ -14,7 +14,7 @@ HOMEPAGE=	http://www.unidata.ucar.edu/packages/netcdf/index.html
 CONFIGURE_ENV+=	CPPFLAGS="-Df2cFortran -Dunix"
 
 USE_FORTRAN=	yes
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/pth-current/Makefile b/devel/pth-current/Makefile
index 547cdd56d76..158b0abe1a1 100644
--- a/devel/pth-current/Makefile
+++ b/devel/pth-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/03/04 15:45:22 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2000/06/01 11:23:24 rh Exp $
 #
 
 DISTNAME=	pth-1.3b1
@@ -13,7 +13,7 @@ IGNORE=         "superseded by pth package"
 
 CONFLICTS=	pth-*
 
-USE_LIBTOOL=	YES
+USE_PKGLIBTOOL=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--enable-pthread
 
diff --git a/devel/pth/Makefile b/devel/pth/Makefile
index 3ad78aa92fd..5ceb3acea22 100644
--- a/devel/pth/Makefile
+++ b/devel/pth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2000/04/18 08:48:33 rh Exp $
+# $NetBSD: Makefile,v 1.27 2000/06/01 11:23:24 rh Exp $
 #
 
 DISTNAME=	pth-1.3.5
@@ -12,7 +12,7 @@ CONFLICTS=	pth-current-*
 # for PLIST
 VERS=		13.5
 
-USE_LIBTOOL=	YES
+USE_PKGLIBTOOL=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--enable-pthread
 PLIST_SUBST+=	VERS=${VERS}
diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 75c440e8c10..3de19125bcf 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 1999/07/13 00:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/01 11:23:24 rh Exp $
 #
 
 DISTNAME=	readline-4.0
@@ -9,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/readline/
 
 GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 USE_GTEXINFO=	yes
 MAKE_ENV+=	READLINE_MAJOR=4 READLINE_MINOR=0
 
diff --git a/devel/rx/Makefile b/devel/rx/Makefile
index cc3bdcb9348..98f769ceac7 100644
--- a/devel/rx/Makefile
+++ b/devel/rx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/01/17 04:40:15 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:25 rh Exp $
 
 DISTNAME=	rx-1.5
 CATEGORIES=	devel
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=rx/}
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/rx/rx.html
 
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
 INFO_FILES=	rx.info
diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index 8d89f5c4b57..c3a1b3ce42d 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 1999/10/22 23:40:31 tron Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/01 11:23:25 rh Exp $
 #
 
 DISTNAME=	xdelta-0.22
@@ -11,7 +11,7 @@ HOMEPAGE=	http://scam.XCF.Berkeley.EDU/~jmacd/xdelta.html
 DEPENDS+=	glib-1.2.*:../../devel/glib
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 
-USE_LIBTOOL=	yes
+USE_PKGLIBTOOL=	yes
 GNU_CONFIGURE=	yes
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"