summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/liblzo/Makefile4
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/gnome-media/Makefile4
-rw-r--r--audio/gsm/Makefile4
-rw-r--r--audio/libaudiofile/Makefile4
-rw-r--r--audio/libcdaudio/Makefile4
-rw-r--r--audio/libmikmod/Makefile4
-rw-r--r--audio/rplay/Makefile4
-rw-r--r--audio/xmms/Makefile4
-rw-r--r--cad/gnetlist/Makefile4
-rw-r--r--cad/gschem/Makefile4
-rw-r--r--cad/gsymcheck/Makefile4
-rw-r--r--cad/libgeda/Makefile4
-rw-r--r--cad/oregano/Makefile4
-rw-r--r--cad/vipec/Makefile4
-rw-r--r--comms/fidogate/Makefile4
-rw-r--r--comms/p5-pilot-link/Makefile4
-rw-r--r--comms/pilot-link/Makefile4
-rw-r--r--comms/plp/Makefile4
-rw-r--r--comms/plptools/Makefile4
-rw-r--r--converters/kdesupport/Makefile4
-rw-r--r--converters/psiconv/Makefile4
-rw-r--r--converters/uulib/Makefile4
-rw-r--r--cross/binutils/Makefile4
-rw-r--r--databases/db/Makefile4
-rw-r--r--databases/db3/Makefile4
-rw-r--r--databases/gdbm/Makefile4
-rw-r--r--databases/iodbc/Makefile4
-rw-r--r--databases/mysql-client/Makefile4
-rw-r--r--databases/openldap/Makefile4
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/boost/Makefile4
-rw-r--r--devel/cdk/Makefile4
-rw-r--r--devel/glib/Makefile4
-rw-r--r--devel/gtl/Makefile4
-rw-r--r--devel/guile-gtk/Makefile4
-rw-r--r--devel/isect/Makefile4
-rw-r--r--devel/kdbg/Makefile4
-rw-r--r--devel/kdevelop/Makefile4
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libhfs/Makefile4
-rw-r--r--devel/libnet/Makefile4
-rw-r--r--devel/libproplist/Makefile4
-rw-r--r--devel/libslang/Makefile4
-rw-r--r--devel/libsmi/Makefile4
-rw-r--r--devel/libstroke/Makefile4
-rw-r--r--devel/lwp/Makefile4
-rw-r--r--devel/ncurses/Makefile4
-rw-r--r--devel/netcdf/Makefile4
-rw-r--r--devel/pth-current/Makefile4
-rw-r--r--devel/pth/Makefile4
-rw-r--r--devel/readline/Makefile4
-rw-r--r--devel/rx/Makefile4
-rw-r--r--devel/xdelta/Makefile4
-rw-r--r--editors/pico/Makefile4
-rw-r--r--games/gnome-games/Makefile4
-rw-r--r--games/xracer/Makefile4
-rw-r--r--graphics/ImageMagick/Makefile4
-rw-r--r--graphics/Mesa-glx/Makefile4
-rw-r--r--graphics/Mesa/Makefile4
-rw-r--r--graphics/ee/Makefile4
-rw-r--r--graphics/fnlib/Makefile4
-rw-r--r--graphics/freetype-lib/Makefile.common4
-rw-r--r--graphics/g3d/Makefile4
-rw-r--r--graphics/gd/Makefile4
-rw-r--r--graphics/gdk-pixbuf/Makefile4
-rw-r--r--graphics/giflib/Makefile4
-rw-r--r--graphics/gimp-current/Makefile4
-rw-r--r--graphics/gimp-helpbrowser/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gphoto/Makefile4
-rw-r--r--graphics/hermes/Makefile4
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/jpeg/Makefile4
-rw-r--r--graphics/libgdgeda/Makefile4
-rw-r--r--graphics/libungif/Makefile4
-rw-r--r--graphics/mpeg-lib/Makefile4
-rw-r--r--graphics/netpbm/Makefile4
-rw-r--r--graphics/opendis/Makefile4
-rw-r--r--graphics/openptc/Makefile4
-rw-r--r--graphics/p5-PerlMagick/Makefile4
-rw-r--r--graphics/plotutils/Makefile4
-rw-r--r--graphics/png/Makefile4
-rw-r--r--graphics/tiff/Makefile4
-rw-r--r--graphics/xsane/Makefile4
-rw-r--r--japanese/kakasi/Makefile4
-rw-r--r--japanese/vflib-lib/Makefile.common4
-rw-r--r--lang/clisp/Makefile4
-rw-r--r--lang/guile/Makefile4
-rw-r--r--lang/japhar/Makefile4
-rw-r--r--lang/librep/Makefile4
-rw-r--r--lang/tcl80/Makefile4
-rw-r--r--lang/tclX80/Makefile4
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/imap-uw/Makefile4
-rw-r--r--math/cassowary/Makefile4
-rw-r--r--math/octave/Makefile4
-rw-r--r--math/scilab/Makefile4
-rw-r--r--misc/gnucash/Makefile4
-rw-r--r--misc/libutf/Makefile4
-rw-r--r--mk/bsd.pkg.mk16
-rw-r--r--net/ORBit/Makefile4
-rw-r--r--net/freewais-sf/Makefile4
-rw-r--r--net/kdenetwork/Makefile4
-rw-r--r--net/libirc/Makefile4
-rw-r--r--net/libsscript/Makefile4
-rw-r--r--net/scotty/Makefile4
-rw-r--r--net/ucd-snmp/Makefile4
-rw-r--r--news/inn/Makefile4
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/cups/Makefile4
-rw-r--r--print/ggv/Makefile4
-rw-r--r--print/gnome-print/Makefile4
-rw-r--r--print/pdflib/Makefile4
-rw-r--r--security/libident/Makefile4
-rw-r--r--security/rsaref/Makefile4
-rw-r--r--sysutils/amanda-client/Makefile4
-rw-r--r--sysutils/amanda-common/Makefile.common4
-rw-r--r--textproc/libxml/Makefile4
-rw-r--r--textproc/t1lib/Makefile4
-rw-r--r--www/ap-jserv/Makefile4
-rw-r--r--www/libghttp/Makefile4
-rw-r--r--www/libwww/Makefile4
-rw-r--r--x11/Xbae/Makefile4
-rw-r--r--x11/XmHTML/Makefile4
-rw-r--r--x11/afterstep/Makefile4
-rw-r--r--x11/controlcenter/Makefile4
-rw-r--r--x11/eterm/Makefile4
-rw-r--r--x11/fltk/Makefile4
-rw-r--r--x11/gnome-core/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gtk--/Makefile4
-rw-r--r--x11/gtk-engines/Makefile4
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/gtk10/Makefile4
-rw-r--r--x11/gtkglarea/Makefile4
-rw-r--r--x11/gtkstep/Makefile4
-rw-r--r--x11/kdelibs/Makefile4
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/qt/Makefile4
-rw-r--r--x11/qt1/Makefile4
-rw-r--r--x11/qt21/Makefile4
-rw-r--r--x11/qwspritefield/Makefile4
-rw-r--r--x11/qwt/Makefile4
-rw-r--r--x11/scwm/Makefile4
-rw-r--r--x11/tix/Makefile4
-rw-r--r--x11/tk80/Makefile4
-rw-r--r--x11/windowmaker/Makefile4
-rw-r--r--x11/xforms/Makefile4
150 files changed, 311 insertions, 301 deletions
diff --git a/archivers/liblzo/Makefile b/archivers/liblzo/Makefile
index 9f619d9e2fd..4465343449a 100644
--- a/archivers/liblzo/Makefile
+++ b/archivers/liblzo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/12/22 19:46:23 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:13 rh Exp $
#
DISTNAME= lzo-1.06
@@ -13,6 +13,6 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://wildsau.idv.uni-linz.ac.at/mfx/lzo.html
GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index c813adc9548..40cd9ccd129 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/05/30 19:20:12 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/01 11:23:13 rh Exp $
DISTNAME= esound-0.2.18
CATEGORIES= audio
@@ -10,6 +10,6 @@ HOMEPAGE= http://www.tux.org/~ricdude/EsounD.html
DEPENDS+= libaudiofile-*:../../audio/libaudiofile
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index b00e6b3e715..4fbfe5cd9fc 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/01/15 09:46:57 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:13 rh Exp $
DISTNAME= gnome-media-1.0.51
CATEGORIES= audio gnome
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnome.org/
DEPENDS+= gnome-core-*:../../x11/gnome-core
GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
USE_X11BASE= YES
CONFIGURE_ENV+= XGETTEXT="${LOCALBASE}/bin/xgettext"
diff --git a/audio/gsm/Makefile b/audio/gsm/Makefile
index 380eb5c1f44..2fb2d60942b 100644
--- a/audio/gsm/Makefile
+++ b/audio/gsm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/04/07 17:01:51 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2000/06/01 11:23:13 rh Exp $
# FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:39 max Exp
#
@@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/local/kbs/tubmik/gsm/
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://kbs.cs.tu-berlin.de/~jutta/toast.html
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
NO_CONFIGURE= yes
MAKE_ENV+= INSTALL_ROOT="${PREFIX}" ROOT="${WRKSRC}"
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index 338c6e0f207..380731ddd04 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/01/15 10:16:18 tron Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/01 11:23:14 rh Exp $
# FreeBSD Id: Makefile,v 1.2 1999/01/27 08:31:48 fenner Exp
#
@@ -11,7 +11,7 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://andromeda.68k.org./~michael/audiofile/
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/libaudiofile
diff --git a/audio/libcdaudio/Makefile b/audio/libcdaudio/Makefile
index ae5f04e55c9..0c175a35855 100644
--- a/audio/libcdaudio/Makefile
+++ b/audio/libcdaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/03 22:09:04 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:14 rh Exp $
#
DISTNAME= libcdaudio-0.99.1
@@ -11,6 +11,6 @@ MAINTAINER= rh@netbsd.org
HOMEPAGE= http://cdcd.undergrid.net/libcdaudio/
GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index af0d742b027..0f4077896ca 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/04/02 16:07:04 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:14 rh Exp $
DISTNAME= libmikmod-3.1.9
CATEGORIES= audio
@@ -9,7 +9,7 @@ HOMEPAGE= http://mikmod.darkorb.net/
DEPENDS+= esound-0.2.*:../../audio/esound
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
USE_GMAKE= YES
USE_GTEXINFO= YES
GNU_CONFIGURE= YES
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 80973c4a97f..3f5c2e73995 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/01/26 22:11:28 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2000/06/01 11:23:14 rh Exp $
# FreeBSD Id: Makefile,v 1.8 1997/06/13 16:17:01 ache Exp
#
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf
DEPENDS+= gsm-1.0.10:../../audio/gsm
DEPENDS+= rx-1.5:../../devel/rx
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= RPLAY_TARGET=generic # XXX generic, or oss, or sun?
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 83065de4e2b..d3be910d6b4 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/03/29 03:13:02 enami Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/01 11:23:14 rh Exp $
# FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
DISTNAME= xmms-1.0.1
@@ -19,7 +19,7 @@ DEPENDS+= gtk+>=1.2.7:../../x11/gtk
DEPENDS+= libmikmod>=3.1.7:../libmikmod
DEPENDS+= libxml>=1.8.5:../../textproc/libxml
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-gnome
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index f02180640e7..f37ca8b4a8d 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/22 08:38:54 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:15 rh Exp $
#
DISTNAME= gnetlist-${PKGVERSION}
@@ -22,7 +22,7 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_X11BASE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
USE_GMAKE= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/cad/gschem/Makefile b/cad/gschem/Makefile
index 453af70897b..1f6bdc32f8d 100644
--- a/cad/gschem/Makefile
+++ b/cad/gschem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/22 08:38:55 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:15 rh Exp $
#
DISTNAME= gschem-${PKGVERSION}
@@ -22,7 +22,7 @@ PKGVERSION= 20000220
GNU_CONFIGURE= YES
USE_X11BASE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/cad/gsymcheck/Makefile b/cad/gsymcheck/Makefile
index 9215698c03f..b1a2bb50ab0 100644
--- a/cad/gsymcheck/Makefile
+++ b/cad/gsymcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/22 08:38:55 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:15 rh Exp $
#
DISTNAME= gsymcheck-${PKGVERSION}
@@ -22,7 +22,7 @@ PKGVERSION= 20000220
GNU_CONFIGURE= YES
USE_X11BASE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/cad/libgeda/Makefile b/cad/libgeda/Makefile
index c2195d6f163..d7e15404899 100644
--- a/cad/libgeda/Makefile
+++ b/cad/libgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/22 08:38:56 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:15 rh Exp $
#
DISTNAME= libgeda-${PKGVERSION}
@@ -23,7 +23,7 @@ DIST_SUBDIR= geda
PKGVERSION= 20000220
GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
USE_X11BASE= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index 50c865b066d..3a029c327c3 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/02/16 20:56:05 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:16 rh Exp $
#
DISTNAME= oregano-0.11
@@ -14,7 +14,7 @@ DEPENDS+= libglade-*:../../devel/libglade
GNU_CONFIGURE= YES
USE_X11BASE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 7dd118ddc20..6b68af91bdf 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/04/28 10:11:02 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2000/06/01 11:23:16 rh Exp $
#
DISTNAME= vipec-2.0.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.netfold.com/~vipec/
DEPENDS+= qt2-2.0.2:../../x11/qt
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11= yes
CONFIGURE_ENV+= "QTDIR=${X11BASE}/qt2" \
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index a5115164c0a..9306cf30ee8 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/09/23 16:32:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:16 rh Exp $
#
DISTNAME= fidogate-4.2.9
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.fido.de/fidogate/
USE_GMAKE= yes
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
WRKSRC= ${WRKDIR}/fidogate
INFO_FILES= fidogate.info
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 61d8ab59f75..5081e16248d 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 1999/10/07 17:41:47 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:16 rh Exp $
DISTNAME= pilot-link.0.9.3
PKGNAME= p5-pilot-link-0.9.3
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
DEPENDS+= pilot-link-0.9.3:../pilot-link
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-perl5=${PERL5_BIN} --without-tcl \
--without-python --without-java
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 4fb17a52f65..c126724c373 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 1999/05/22 18:14:03 frueauf Exp $
+# $NetBSD: Makefile,v 1.18 2000/06/01 11:23:16 rh Exp $
#
DISTNAME= pilot-link.0.9.3
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ryeham.ee.ryerson.ca/pub/PalmOS/
MAINTAINER= sommerfeld@alum.mit.edu
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 094550d5592..dc75af93ca9 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/20 07:17:17 sakamoto Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:17 rh Exp $
DISTNAME= plp_1_8
PKGNAME= plp-1.8
@@ -9,7 +9,7 @@ MAINTAINER= sakamoto@netbsd.org
HOMEPAGE= http://www.proudman51.freeserve.co.uk/psion/
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
do-install:
${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/utils/libplputils.la ${PREFIX}/lib
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index d4790ffdf89..564b4e163b8 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/02/05 18:16:32 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:17 rh Exp $
#
DISTNAME= plptools-0.4
@@ -11,7 +11,7 @@ DEPENDS= readline-4.0:../../devel/readline
BROKEN= plptools does not work correctly
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include/" LIBS="-ltermlib"
diff --git a/converters/kdesupport/Makefile b/converters/kdesupport/Makefile
index 0b75814910f..e8946729124 100644
--- a/converters/kdesupport/Makefile
+++ b/converters/kdesupport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2000/03/28 00:12:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.28 2000/06/01 11:23:17 rh Exp $
# FreeBSD Id: Makefile,v 1.2 1997/11/05 04:19:46 asami Exp
#
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.bz2
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.kde.org/
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--without-gnu-ld" \
"--without-libjpeg" \
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index 007fda486d5..b050d7cfa73 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/13 01:15:01 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:17 rh Exp $
#
DISTNAME= psiconv-0.6.1
@@ -17,7 +17,7 @@ DEPENDS+= ImageMagick-*:../../graphics/ImageMagick
MAGICK_CONFIG= ${LOCALBASE}/bin/Magick-config
USE_X11= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ENV+= CPPFLAGS="`${MAGICK_CONFIG} --cppflags` -DIMAGEMAGICK" \
LIBS="${LIBS} `${MAGICK_CONFIG} --libs`"
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index f6da4d92a5e..2ee39f34d64 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1998/09/28 13:43:36 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/06/01 11:23:18 rh Exp $
# FreeBSD Id: Makefile,v 1.14 1998/02/18 22:20:02 hoek Exp
#
@@ -14,7 +14,7 @@ HOMEPAGE= http://www.informatik.uni-frankfurt.de/~fp/uudeview/
CONFLICTS= kdesupport-2.1b
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
ALL_TARGET= libuu.la
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index 9a12f0203fc..996d1ed058b 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/02/19 00:48:57 tsutsui Exp $
+# $NetBSD: Makefile,v 1.18 2000/06/01 11:23:18 rh Exp $
#
# GNU binutils configured to hold `as many targets as the cross system is
# capable of using'. Configures and builds everything except gas, which
@@ -13,7 +13,7 @@ MAINTAINER= tv@netbsd.org
HOMEPAGE= http://www.gnu.org/
USE_CROSSBASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-64-bit-bfd
diff --git a/databases/db/Makefile b/databases/db/Makefile
index a1d3c4fa4fc..b863fdfc85f 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/06 14:38:41 bouyer Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:18 rh Exp $
DISTNAME= db-2.7.7
CATEGORIES= databases
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.sleepycat.com/update/2.7.7/ \
MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.sleepycat.com/
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../dist/configure
diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index 51fbfbfd78c..4ee8e1df015 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/12/16 02:36:05 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:18 rh Exp $
DISTNAME= db-3.0.55
PKGNAME= db3-0.55
@@ -8,7 +8,7 @@ MASTER_SITES= http://www.sleepycat.com/update/3.0.55/
MAINTAINER= wrstuden@netbsd.org
HOMEPAGE= http://www.sleepycat.com/
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../dist/configure
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 0d58d9729c0..1374c4f6321 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1999/04/14 21:39:01 tron Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:18 rh Exp $
# FreeBSD Id: Makefile,v 1.4 1997/01/28 08:11:23 asami Exp
#
@@ -10,7 +10,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.gnu.org/software/gdbm/gdbm.html
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
INFO_FILES= gdbm.info
diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile
index f689f4c36cf..0c46a82346c 100644
--- a/databases/iodbc/Makefile
+++ b/databases/iodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/07/15 06:25:04 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:19 rh Exp $
#
DISTNAME= libiodbc-2.50.3
@@ -10,7 +10,7 @@ MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.iodbc.org/
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
CONFIGURE_ARGS+= --with-iodbc-inidir=/etc
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index a756518b25b..6b8aaa822c6 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/19 22:46:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:19 rh Exp $
#
DISTNAME= mysql-3.22.32
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--without-readline
CFLAGS+= -Dunix
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
INFO_FILES= mysql.info
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index f9f2c1d5606..4066a0c714c 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/05/05 12:08:37 veego Exp $
+# $NetBSD: Makefile,v 1.15 2000/06/01 11:23:19 rh Exp $
#
DISTNAME= openldap-1.2.7
@@ -16,7 +16,7 @@ HOMEPAGE= http://www.OpenLDAP.org/
CONFLICTS+= ldapsdk*
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 9a5e53344ec..e9830940f5e 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/07 12:50:51 wulf Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:19 rh Exp $
#
DISTNAME= rrdtool-1.0.21
@@ -13,7 +13,7 @@ DEPENDS+= gd>=1.7.3:../../graphics/gd
DEPENDS+= jpeg-6*:../../graphics/jpeg
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_GMAKE= yes
USE_X11= yes
GNU_CONFIGURE= yes
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"
diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index e3cca0b90d2..bb6739a1d61 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/12/02 17:01:05 bouyer Exp $
+# $NetBSD: Makefile,v 1.19 2000/06/01 11:23:25 rh Exp $
#
DISTNAME= pine4.21
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.cac.washington.edu/pine/
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.washington.edu/pine/
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
do-build:
cd ${WRKSRC} && ./build ${BUILDNAME} CC="${LIBTOOL} ${CC}" \
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index b4e54e48046..5da773a65d9 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/05/09 22:00:05 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:25 rh Exp $
DISTNAME= gnome-games-1.0.51
CATEGORIES= games gnome
@@ -14,7 +14,7 @@ DEPENDS+= xbill-*:../../games/xbill
GNU_CONFIGURE= yes
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
INSTALL_FILE= ${WRKDIR}/INSTALL
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index ee9ec33462c..10bcff3889d 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/05/29 06:36:00 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:26 rh Exp $
#
DISTNAME= xracer-0.96.9
@@ -19,7 +19,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include"
CONFIGURE_ENV+= LDFLAGS="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -lintl"
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
pre-patch:
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 80639873d0c..f61f05cfc1a 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2000/03/21 22:18:24 tron Exp $
+# $NetBSD: Makefile,v 1.57 2000/06/01 11:23:26 rh Exp $
DISTNAME= ImageMagick-5.1.1
CATEGORIES= graphics
@@ -14,7 +14,7 @@ DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
MIRROR_DISTFILE= no
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/graphics/Mesa-glx/Makefile b/graphics/Mesa-glx/Makefile
index ccaf94ea873..98e7874613a 100644
--- a/graphics/Mesa-glx/Makefile
+++ b/graphics/Mesa-glx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/04/11 22:36:04 tron Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/01 11:23:26 rh Exp $
DISTNAME= glx-20000407
PKGNAME= Mesa-${DISTNAME}
@@ -21,7 +21,7 @@ ONLY_FOR_PLATFORM= NetBSD-*-i386
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
CONFIGURE_ARGS+= --enable-static --with-mesa=${MESA_WRKSRC}
CONFIGURE_ENV+= TCLSH=${TCLSH}
diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index 5f728d77697..c8581c2a59d 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2000/04/04 12:17:45 tron Exp $
+# $NetBSD: Makefile,v 1.33 2000/06/01 11:23:26 rh Exp $
#
DISTNAME= MesaLib-3.1
@@ -22,6 +22,6 @@ USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-static
# XXX our pkglibtool is too old
-#USE_LIBTOOL= yes
+#USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ee/Makefile b/graphics/ee/Makefile
index ff8c05aecd1..3ec51f89a1f 100644
--- a/graphics/ee/Makefile
+++ b/graphics/ee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/02/17 23:18:36 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/01 11:23:26 rh Exp $
DISTNAME= ee-0.3.11
CATEGORIES= x11 gnome
@@ -12,7 +12,7 @@ DEPENDS= gnome-core-*:../../x11/gnome-core
GNU_CONFIGURE= yes
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LOCALSTATEDIR= /var/gnome
diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile
index 270c8d6db2e..fef48614537 100644
--- a/graphics/fnlib/Makefile
+++ b/graphics/fnlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/10/28 00:27:38 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/01 11:23:27 rh Exp $
DISTNAME= fnlib-0.5
CATEGORIES= x11 graphics
@@ -9,7 +9,7 @@ MAINTAINER= root@garbled.net
DEPENDS+= imlib-*:../../graphics/imlib
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
post-install:
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common
index 2934a7e5f78..2c6be71225a 100644
--- a/graphics/freetype-lib/Makefile.common
+++ b/graphics/freetype-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2000/05/01 21:53:33 jlam Exp $
+# $NetBSD: Makefile.common,v 1.3 2000/06/01 11:23:27 rh Exp $
DISTNAME= freetype-${FT_VERS}
FT_VERS= 1.2
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.freetype.org/
DEPENDS+= gettext-0.10.*:../../devel/gettext
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
index cc132a9dfd8..c6652dde308 100644
--- a/graphics/g3d/Makefile
+++ b/graphics/g3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/07/22 03:35:20 sakamoto Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:27 rh Exp $
#
DISTNAME= g3d-0.0.2
@@ -12,7 +12,7 @@ DEPENDS+= gtkglarea-1.2.1:../../x11/gtkglarea
WRKSRC= ${WRKDIR}/g3d
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
USE_GMAKE= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 68d64438a53..6ff97c678e9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/05/01 06:07:44 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:27 rh Exp $
# FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
#
@@ -14,7 +14,7 @@ DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= xpm-*:../../graphics/xpm
DEPENDS+= jpeg-*:../../graphics/jpeg
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11= yes
NO_CONFIGURE= yes
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 846952e70a9..68a59b67393 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/30 19:30:22 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:28 rh Exp $
#
DISTNAME= gdk-pixbuf-0.8.0
@@ -12,7 +12,7 @@ DEPENDS+= gnome-libs>=1.0.53:../../x11/gnome-libs
GNU_CONFIGURE= YES
#our pkglibtool can't add a library to a library
-#USE_LIBTOOL= YES
+#USE_PKGLIBTOOL= YES
USE_X11BASE= YES
USE_GMAKE= yes
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 97f898d7a5b..2e084c5a6f0 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/02/14 12:50:13 itojun Exp $
+# $NetBSD: Makefile,v 1.20 2000/06/01 11:23:28 rh Exp $
#
DISTNAME= giflib-4.1.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml
CONFLICTS= libungif-*
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-x
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index bb425510c94..8534a6d8de6 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/03/21 22:40:53 tron Exp $
+# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:28 rh Exp $
DISTNAME= gimp-1.1.18
CATEGORIES= graphics
@@ -19,7 +19,7 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} \
--disable-perl \
diff --git a/graphics/gimp-helpbrowser/Makefile b/graphics/gimp-helpbrowser/Makefile
index 6da011c457e..13e485534ae 100644
--- a/graphics/gimp-helpbrowser/Makefile
+++ b/graphics/gimp-helpbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/14 19:06:29 tron Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:28 rh Exp $
DISTNAME= gimp-1.1.18
PKGNAME= ${DISTNAME:S/-/-helpbrowser-/}
@@ -16,7 +16,7 @@ DEPENDS+= gnome-libs>=1.0.56:../../x11/gnome-libs
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE} \
--disable-perl \
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 8dea5c34696..75f324125f6 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2000/04/15 20:47:35 mycroft Exp $
+# $NetBSD: Makefile,v 1.51 2000/06/01 11:23:29 rh Exp $
DISTNAME= gimp-1.0.4
CATEGORIES= graphics
@@ -26,7 +26,7 @@ IS_INTERACTIVE= yes
.endif
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE}
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}"
diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index af93acd9bd0..d1c419d11fa 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/01/19 17:36:51 tron Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:29 rh Exp $
DISTNAME= gphoto-0.4.2
CATEGORIES= graphics
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gphoto.org/
DEPENDS+= imlib-1.9.8:../../graphics/imlib
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index 3adae90a150..b198152794c 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/03 14:52:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:29 rh Exp $
DISTNAME= Hermes-1.2.6-2
PKGNAME= Hermes-1.2.6.2
@@ -9,7 +9,7 @@ MASTER_SITES= http://hermes.terminal.at/files/
MAINTAINER= root@garbled.net
HOMEPAGE= http://www.clanlib.org/hermes/
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
MAKE_ENV= INSTALL_PROGRAM_DIR="${INSTALL_PROGRAM_DIR}"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index b34a5422612..5747ccfd5e3 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2000/05/30 19:16:27 drochner Exp $
+# $NetBSD: Makefile,v 1.35 2000/06/01 11:23:29 rh Exp $
#
DISTNAME= imlib-1.9.8.1
@@ -16,7 +16,7 @@ DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile
index 415357f2d16..547a1544169 100644
--- a/graphics/jpeg/Makefile
+++ b/graphics/jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 1999/02/20 22:48:30 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2000/06/01 11:23:29 rh Exp $
#
DISTNAME= jpegsrc.v6b
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.uu.net/graphics/jpeg/
MAINTAINER= mycroft@netbsd.org
HOMEPAGE= http://www.ijg.org/
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
INSTALL_TARGET= install install-lib
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index e5580282e40..2a600a2f635 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/03/21 22:40:53 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:30 rh Exp $
#
DISTNAME= libgdgeda-1.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.geda.seul.org/
DEPENDS+= png>=1.0.6:../../graphics/png
GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
CONFIGURE_ENV+= CPPFLAGS="-I${PREFIX}/include"
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index fed469b9ceb..e2657681132 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/26 01:11:54 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:30 rh Exp $
#
DISTNAME= libungif-4.1.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml
CONFLICTS= giflib-*
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-x
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index feafd76243c..5b1555c0ee9 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/10/07 17:41:53 tron Exp $
+# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:30 rh Exp $
DISTNAME= mpeg_lib-1.2.1
PKGNAME= mpeg-1.2.1
@@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.mni.mcgill.ca/pub/mpeg/ \
MAINTAINER= packages@netbsd.org
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
ALL_TARGET= libmpeg.la
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 540179d5678..f38552668a9 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2000/05/20 11:02:07 tron Exp $
+# $NetBSD: Makefile,v 1.40 2000/06/01 11:23:30 rh Exp $
DISTNAME= netpbm-9.2
CATEGORIES= graphics
@@ -12,7 +12,7 @@ DEPENDS+= tiff>=3.5.4:../../graphics/tiff
DEPENDS+= png>=1.0.6:../../graphics/png
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
INSTALL_TARGET= install.dev install
MAKE_ENV+= ECHO="${ECHO}"
diff --git a/graphics/opendis/Makefile b/graphics/opendis/Makefile
index 9ac0250f35e..876691a238e 100644
--- a/graphics/opendis/Makefile
+++ b/graphics/opendis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/05/12 03:07:40 sommerfeld Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:31 rh Exp $
DISTNAME= opendis-0.0.3
CATEGORIES= graphics
@@ -7,7 +7,7 @@ MASTER_SITES= http://ods.sourceforge.net/dl/
MAINTAINER= sommerfeld@netbsd.org
HOMEPAGE= http://ods.sourceforge.net/
-#USE_LIBTOOL= yes
+#USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
diff --git a/graphics/openptc/Makefile b/graphics/openptc/Makefile
index a07c6125995..dfcf14bb5df 100644
--- a/graphics/openptc/Makefile
+++ b/graphics/openptc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/03/14 21:49:22 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:31 rh Exp $
DISTNAME= OpenPTC-x11-1.0.0-2
PKGNAME= OpenPTC-X11-1.0.02
@@ -12,7 +12,7 @@ DEPENDS+= Hermes>=1.2.5:../../graphics/hermes
WRKSRC= ${WRKDIR}/OpenPTC-x11-1.0.0
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_X11BASE= yes
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 5abf52b20cf..592bd32f994 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/04/23 01:59:57 kim Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:31 rh Exp $
DISTNAME= ImageMagick-5.1.1
PKGNAME= p5-PerlMagick-5.1.1
@@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/PerlMagick
#EXTRACT_AFTER_ARGS+= ${WRKSRC}
MIRROR_DISTFILE= no
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 44cca607c74..4815904f2ea 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/10/10 14:33:07 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:31 rh Exp $
#
DISTNAME= plotutils-2.3
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnu.org/software/plotutils/plotutils.html
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
INFO_FILES= plotutils.info
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 2a93eaa7f64..4a786f3b414 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/04/20 02:11:46 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2000/06/01 11:23:31 rh Exp $
# FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp
DISTNAME= libpng-1.0.6
@@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.cdrom.com/pub/png/src/ \
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://www.cdrom.com/pub/png/
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
MAKEFILE= scripts/makefile.std
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index d12c747fd0a..34dd02e5cdc 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/04/01 00:05:27 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2000/06/01 11:23:32 rh Exp $
DISTNAME= tiff-v3.5.5
PKGNAME= tiff-3.5.5
@@ -14,7 +14,7 @@ HOMEPAGE= http://www.libtiff.org/
DEPENDS+= jpeg-6b:../../graphics/jpeg
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --noninteractive --site=${FILESDIR}
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 337968614d6..e87f52dd7e0 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/03/21 22:40:55 tron Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:32 rh Exp $
#
DISTNAME= xsane-0.51
@@ -24,7 +24,7 @@ DEPENDS+= sane-1.0.1:../../graphics/sane
GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_X11BASE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
CPPFLAGS+= -I${PREFIX}/include -I${LOCALBASE}/include
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index 8b4e1a98ccf..8533fbc5c1c 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/12/07 09:00:59 sakamoto Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:32 rh Exp $
# FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
DISTNAME= kakasi-2.3.1
@@ -10,7 +10,7 @@ HOMEPAGE= http://kakasi.namazu.org/
GNU_CONFIGURE= YES
USE_GMAKE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
post-install:
diff --git a/japanese/vflib-lib/Makefile.common b/japanese/vflib-lib/Makefile.common
index d20c2ce2063..f4e8978bdea 100644
--- a/japanese/vflib-lib/Makefile.common
+++ b/japanese/vflib-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2000/05/01 21:58:42 jlam Exp $
+# $NetBSD: Makefile.common,v 1.2 2000/06/01 11:23:32 rh Exp $
# FreeBSD Id: Makefile,v 1.20 1999/05/03 01:58:33 steve Exp $
DISTNAME= VFlib2-${VFLIB_VERSION}
@@ -18,7 +18,7 @@ VFLIB_VERSION= 2.24.2
PLIST_SUBST+= VFLIB_VERSION=${VFLIB_VERSION} \
VFLIB_SO_VERSION=${VFLIB_VERSION:C/^2.//}
-USE_LIBTOOL= # defined
+USE_PKGLIBTOOL= # defined
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= # defined
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 6368be94e51..ac8da7268c4 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/05/27 02:47:13 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/01 11:23:33 rh Exp $
DISTNAME= clisp-2000-03-06
PKGNAME= clisp-20000306
@@ -16,7 +16,7 @@ MIRROR_DISTFILE= no
GNU_CONFIGURE= YES
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-# USE_LIBTOOL= YES
+# USE_PKGLIBTOOL= YES
do-configure:
cd ${WRKSRC}; \
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index fdbcb6ee829..cf9856dce0c 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1999/12/20 11:55:15 rh Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:33 rh Exp $
# FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
#
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=guile/}
MAINTAINER= perry@piermont.com
HOMEPAGE= http://www.gnu.org/software/guile/guile.html
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
INFO_FILES= data-rep.info
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index c64b1300479..ce2bde077c8 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:33 rh Exp $
#
DISTNAME= japhar-0.08
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.japhar.org/
ONLY_FOR_PLATFORM= SunOS-*-* # untested on NetBSD
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LIBTOOL_FLAGS= --install-la
USE_GMAKE= yes
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index e54208443bb..c5ef628cf46 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/10/29 13:57:56 agc Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:33 rh Exp $
#
DISTNAME= librep-0.7
@@ -12,7 +12,7 @@ ONLY_FOR_PLATFORM= SunOS-*-* # only for Solaris, at the moment
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
#INFO_FILES= librep.info
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index e9475496517..a48188612c8 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/01/06 20:32:47 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2000/06/01 11:23:34 rh Exp $
# FreeBSD Id: Makefile,v 1.1.1.1 1997/08/20 10:33:35 jkh Exp
#
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix
GNU_CONFIGURE= yes
# Use disable-shared, so that libtool works with the generated Makefile
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
CONFIGURE_ARGS+= --disable-shared
# manual pages go into tclman80
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index dd86b56bea8..eb50b6f4564 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/10/07 17:41:54 tron Exp $
+# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:34 rh Exp $
#
DISTNAME= tclX8.0.4
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.neosoft.com/TclX/
DEPENDS+= tk-8.0.5:../../x11/tk80
USE_X11= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-shared --with-tk
CONFIGURE_ENV+= TCL_SHLIB_LD_LIBS=-L${PREFIX}/lib
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 6e4783b7e30..7406f3724cd 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/22 09:04:53 rh Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:34 rh Exp $
#
DISTNAME= balsa-0.8.0
@@ -14,7 +14,7 @@ DEPENDS+= gnome-core-*:../../x11/gnome-core
GNU_CONFIGURE= yes
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 0fe619ae114..5a26aa10aaa 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/05/19 03:58:55 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:34 rh Exp $
#
DISTNAME= imap-4.7c2
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= tv@netbsd.org
HOMEPAGE= http://www.washington.edu/imap/
-USE_LIBTOOL= # defined
+USE_PKGLIBTOOL= # defined
WRKSRC= ${WRKDIR}/imap-4.7c
MESSAGE_FILE= ${WRKDIR}/MESSAGE
diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile
index eae7fa718f5..745608dc21a 100644
--- a/math/cassowary/Makefile
+++ b/math/cassowary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/05/11 02:54:30 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:34 rh Exp $
#
DISTNAME= cassowary-0.50
@@ -12,7 +12,7 @@ DEPENDS+= guile-1.3.*:../../lang/guile
BUILD_DEPENDS+= ${LOCALBASE}/bin/bison:../../devel/bison
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_GMAKE= yes
YACC= ${LOCALBASE}/bin/bison -y
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 20e6824be6a..ebaf04d73ed 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/04/28 08:59:35 wennmach Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:35 rh Exp $
# FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp
DISTNAME= octave-2.0.16
@@ -19,7 +19,7 @@ DEPENDS+= gnuplot-3.7:../../graphics/gnuplot
USE_X11= yes
GNU_CONFIGURE= yes
USE_FORTRAN= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_GMAKE= yes
CONFIGURE_ENV+= CPPFLAGS=-I${WRKDIR}/include
LDFLAGS+= -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index fec6ec73a6d..645606cc06f 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 1999/12/22 16:15:45 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:35 rh Exp $
#
# IMPORTANT: Before upgrading this package, please read files/README.next_rev!
@@ -18,7 +18,7 @@ RESTRICTED= "no paid distribution of SCILAB"
NO_CDROM= ${RESTRICTED}
USE_FORTRAN= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/misc/gnucash/Makefile b/misc/gnucash/Makefile
index 9b083407c7b..468e8107e18 100644
--- a/misc/gnucash/Makefile
+++ b/misc/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/05/30 09:12:24 rh Exp $
+# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:35 rh Exp $
#
DISTNAME= gnucash-1.3.7
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-guile-config=${LOCALBASE}/bin/guile-config \
CONFIGURE_ENV+= "LOCALBASE=${LOCALBASE}"
USE_GMAKE= yes
USE_PERL= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
ALL_TARGET= gnome
diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile
index a53b5bde665..7aec783549f 100644
--- a/misc/libutf/Makefile
+++ b/misc/libutf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1998/09/09 15:01:59 agc Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:35 rh Exp $
#
DISTNAME= libutf-2.10
@@ -10,6 +10,6 @@ HOMEPAGE= http://www.westley.demon.co.uk/software.html
GNU_CONFIGURE= yes
ALL_TARGET= tst
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 124f266c51d..67034a38ef7 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.449 2000/06/01 02:01:42 wiz Exp $
+# $NetBSD: bsd.pkg.mk,v 1.450 2000/06/01 11:23:11 rh Exp $
#
# This file is in the public domain.
#
@@ -146,6 +146,13 @@ DEPENDS+= gtexinfo-3.12:${PKGSRCDIR}/devel/gtexinfo
.endif
.if defined(USE_LIBTOOL)
+LIBTOOL= ${LOCALBASE}/bin/libtool
+# XXX: actually, here we would need something like
+# BUILD_DEPENDS+=libtool>1.3.5:${PKGSRCDIR}/devel/libtool
+.if make(misc-depends)
+DEPENDS+= libtool>1.3.5:${PKGSRCDIR}/devel/libtool
+.endif
+.elif defined(USE_PKGLIBTOOL)
.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
LIBTOOL= ${LOCALBASE}/bin/pkglibtool-${OBJECT_FMT}-1.2p2
BUILD_DEPENDS+= ${LIBTOOL}:${PKGSRCDIR}/pkgtools/pkglibtool
@@ -153,6 +160,9 @@ BUILD_DEPENDS+= ${LIBTOOL}:${PKGSRCDIR}/pkgtools/pkglibtool
LIBTOOL= ${LOCALBASE}/bin/libtool
BUILD_DEPENDS+= ${LIBTOOL}:${PKGSRCDIR}/devel/libtool
.endif
+.endif
+
+.if defined(USE_LIBTOOL) || defined(USE_PKGLIBTOOL)
CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}"
.endif
@@ -1286,7 +1296,7 @@ do-patch:
.if !target(do-configure)
do-configure:
-.if defined(USE_LIBTOOL) && defined(LTCONFIG_OVERRIDE) && !defined(LIBTOOL_OVERRIDE)
+.if (defined(USE_LIBTOOL) || defined(USE_PKGLIBTOOL)) && defined(LTCONFIG_OVERRIDE) && !defined(LIBTOOL_OVERRIDE)
.for ltconfig in ${LTCONFIG_OVERRIDE}
${_PKG_SILENT}${_PKG_DEBUG}if [ -f ${ltconfig} ]; then \
${ECHO} "${RM} -f libtool; ${LN} -s ${LIBTOOL} libtool" \
@@ -1311,7 +1321,7 @@ do-configure:
.if defined(USE_IMAKE)
${_PKG_SILENT}(${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} XPROJECTROOT=${X11BASE} ${XMKMF})
.endif
-.if defined(USE_LIBTOOL) && defined(LIBTOOL_OVERRIDE) && !defined(LTCONFIG_OVERRIDE)
+.if (defined(USE_LIBTOOL) || defined(USE_PKGLIBTOOL)) && defined(LIBTOOL_OVERRIDE) && !defined(LTCONFIG_OVERRIDE)
.for libtool in ${LIBTOOL_OVERRIDE}
${_PKG_SILENT}${_PKG_DEBUG}if [ -f ${libtool} ]; then \
${RM} -f ${libtool}; \
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index c01b4767220..b68f18d6fa4 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2000/05/30 19:13:16 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2000/06/01 11:23:36 rh Exp $
#
DISTNAME= ORBit-0.5.1
@@ -13,7 +13,7 @@ DEPENDS+= gindent-*:../../devel/gindent
DEPENDS+= gettext-0.10.*:../../devel/gettext
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_GMAKE= yes
LIBTOOL_FLAGS= --install-la
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 5353cd664e6..1868fd24d32 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/03/27 08:54:59 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:36 rh Exp $
#
DISTNAME= freeWAIS-sf-2.2.12
@@ -11,7 +11,7 @@ HOMEPAGE= http://ls6-www.informatik.uni-dortmund.de/ir/projects/freeWAIS-sf/inde
BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
HAS_CONFIGURE= yes
CONFIGURE_ENV+= PREFIX=${PREFIX}
diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile
index cb302c9ed31..fbb28f853ad 100644
--- a/net/kdenetwork/Makefile
+++ b/net/kdenetwork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2000/03/28 00:12:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.42 2000/06/01 11:23:36 rh Exp $
# FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp
#
@@ -20,7 +20,7 @@ NOT_FOR_PLATFORM= *-*-alpha # LP64/ELF problems
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LIBTOOL_FLAGS= --cplusplus --install-la
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \
diff --git a/net/libirc/Makefile b/net/libirc/Makefile
index ede5c969d7b..23025df586c 100644
--- a/net/libirc/Makefile
+++ b/net/libirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/03/12 22:34:52 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:37 rh Exp $
#
DISTNAME= libirc-0.2
@@ -11,6 +11,6 @@ HOMEPAGE= http://www.cs.kau.se/~jorgen/software/
DEPENDS+= glib>=1.2.6:../../devel/glib
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/net/libsscript/Makefile b/net/libsscript/Makefile
index a634b1fd1f6..d62f5cb0b7b 100644
--- a/net/libsscript/Makefile
+++ b/net/libsscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/03/30 14:59:26 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:37 rh Exp $
#
DISTNAME= sscript-lib2.0
@@ -13,6 +13,6 @@ HOMEPAGE= http://www.linuxave.net/~drow/SocketScript/
DECOMPRESS_CMD= ${CAT}
NO_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 70820c84aae..a007fffaff4 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/04/26 19:15:38 garbled Exp $
+# $NetBSD: Makefile,v 1.19 2000/06/01 11:23:37 rh Exp $
# FreeBSD Id: Makefile,v 1.21 1997/08/27 23:01:53 cwt Exp
#
@@ -15,7 +15,7 @@ USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-tcl-config=${PREFIX}/lib/tcl8.0 \
--with-tk-config=${PREFIX}/lib/tk8.0
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/unix
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index b0bb7718cb9..87acfa6e378 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/01/24 04:18:35 itojun Exp $
+# $NetBSD: Makefile,v 1.19 2000/06/01 11:23:37 rh Exp $
# FreeBSD Id: Makefile,v 1.18 1998/04/06 20:50:31 andreas Exp
#
@@ -20,7 +20,7 @@ BUILD_DEPENDS+= autoreconf:../../devel/autoconf
BUILD_DEFS+= USE_INET6
.include "../../mk/bsd.prefs.mk"
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-defaults --with-libwrap --with-logfile="/var/log/snmpd"
diff --git a/news/inn/Makefile b/news/inn/Makefile
index e6167bf5837..1fe58c72fec 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/02/27 23:04:23 tron Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:38 rh Exp $
DISTNAME= inn-2.2.2
CATEGORIES= news
@@ -14,7 +14,7 @@ CONFLICTS+= nntpclnt-*
INN_DATA_DIR?= /var/news
USE_PERL5= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} --prefix=${PREFIX}/inn \
--mandir=${PREFIX}/man \
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 5170a1a4028..89ff2b5f251 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/09/05 18:37:48 kim Exp $
+# $NetBSD: Makefile,v 1.26 2000/06/01 11:23:39 rh Exp $
# FreeBSD Id: Makefile,v 1.12 1998/02/15 21:24:42 steve Exp
#
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= LPR=lpr
USE_PERL5= yes
USE_GTEXINFO= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
INFO_FILES= a2ps.info ogonkify.info regex.info
pre-build:
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 28010fe93ad..240db4f186d 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/03/21 22:40:56 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:40 rh Exp $
#
DISTNAME= cups-1.0.2-source
@@ -20,7 +20,7 @@ DEPENDS+= jpeg-6b:../../graphics/jpeg
DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index d15121771e1..719a760941e 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/05/10 15:39:07 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:40 rh Exp $
#
DISTNAME= ggv-0.50
@@ -13,7 +13,7 @@ DEPENDS+= ghostscript-[6-9]*:../../print/ghostscript
DEPENDS+= gnome-core-*:../../x11/gnome-core
GNU_CONFIGURE= YES
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
USE_X11BASE= YES
pre-configure:
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 251f8c2cea2..62a1198ad53 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2000/05/31 09:15:18 rh Exp $
+# $NetBSD: Makefile,v 1.27 2000/06/01 11:23:40 rh Exp $
#
DISTNAME= gnome-print-0.20
@@ -12,7 +12,7 @@ DEPENDS+= gnome-libs>=1.0.56:../../x11/gnome-libs
DEPENDS+= libxml>=1.8.5:../../textproc/libxml
DEPENDS+= ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
-USE_LIBTOOL= # defined
+USE_PKGLIBTOOL= # defined
USE_X11BASE= # defined
GNU_CONFIGURE= # defined
diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile
index 1d06ef6dee6..b0fcdd3c8dc 100644
--- a/print/pdflib/Makefile
+++ b/print/pdflib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/05/08 17:13:19 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:40 rh Exp $
#
DISTNAME= pdflib-3.0
@@ -17,6 +17,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-tifflib=${PREFIX} \
--with-pnglib=${PREFIX}
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/security/libident/Makefile b/security/libident/Makefile
index 0968ef1838e..5bead1bf26b 100644
--- a/security/libident/Makefile
+++ b/security/libident/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/09/28 20:40:04 soren Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:41 rh Exp $
# FreeBSD ID: Makefile,v 1.6 1998/01/25 20:42:37 torstenb Exp
DISTNAME= libident-0.22
@@ -7,7 +7,7 @@ MASTER_SITES= ftp://ftp.lysator.liu.se/pub/ident/libs/
MAINTAINER= packages@netbsd.org
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
ALL_TARGET= netbsd
MAKE_ENV+= INSTALL_DATA="${INSTALL_DATA}"
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index a040be4e550..42f281976b7 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/12/14 22:36:47 abs Exp $
+# $NetBSD: Makefile,v 1.17 2000/06/01 11:23:41 rh Exp $
#
DISTNAME= rsaref
@@ -15,7 +15,7 @@ MIRROR_DISTFILE= no
IS_INTERACTIVE= yes # requires options to be set in order to use
LICENSE= no-commercial-use
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
MAKEFILE= unix/makefile
ALL_TARGET= librsaref.la
diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index d16c75c87ac..27c1252d4d6 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/03/06 11:17:57 tron Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/01 11:23:41 rh Exp $
# FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
#
@@ -14,7 +14,7 @@ DEPENDS+= readline-4.0:../../devel/readline
DEPENDS+= gtar-1.12:../../archivers/gtar
DEPENDS+= amanda-common-2.4.1p1:../../sysutils/amanda-common
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 9fd4b9192c9..4b7cb69ac43 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 1999/09/06 19:30:20 bad Exp $
+# $NetBSD: Makefile.common,v 1.2 2000/06/01 11:23:41 rh Exp $
#
# common make file fragment shared by all amanda-* pkgs.
#
@@ -12,7 +12,7 @@ AMANDA_GROUP= sysadmin
AMANDA_USER?= backup
AMANDA_VAR?= /var/amanda
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-user=${AMANDA_USER} \
--with-group=${AMANDA_GROUP} \
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index d8429bbf364..8225563260c 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/05/30 09:07:29 rh Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/01 11:23:42 rh Exp $
#
DISTNAME= libxml-1.8.7
@@ -15,7 +15,7 @@ HOMEPAGE= http://xmlsoft.org/
DEPENDS+= zlib-*:../../devel/zlib
.endif
-USE_LIBTOOL= YES
+USE_PKGLIBTOOL= YES
GNU_CONFIGURE= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/t1lib/Makefile b/textproc/t1lib/Makefile
index b41f46b16c7..3bc3a575a42 100644
--- a/textproc/t1lib/Makefile
+++ b/textproc/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/05/08 17:23:46 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/01 11:23:42 rh Exp $
#
DISTNAME= t1lib-1.0.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.neuroinformatik.ruhr-uni-bochum.de/ini/PEOPLE/rmz/t1lib/t1l
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
WRKSRC= ${WRKDIR}/T1-1.0.1
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 8caa643fb8f..c85836c64c0 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/05/22 16:01:38 jwise Exp $
+# $NetBSD: Makefile,v 1.9 2000/06/01 11:23:42 rh Exp $
DISTNAME= ApacheJServ-1.1.1
PKGNAME= ap-jserv-1.1.1
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/perl:../../lang/perl5
USE_JAVA= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/src/scripts/build/unix/ltconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs --with-jdk-home=${JAVA_HOME} \
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 37992fe706b..bff2f024d53 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/30 21:06:01 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:42 rh Exp $
DISTNAME= libghttp-1.0.6
CATEGORIES= www gnome
@@ -8,6 +8,6 @@ MAINTAINER= tron@netbsd.org
HOMEPAGE= http://www.gnome.org/
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index cf3eed1c5d5..5950707720d 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 1999/10/08 04:43:07 deberg Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/01 11:23:43 rh Exp $
# FreeBSD Id: Makefile,v 1.10 1998/06/14 23:34:59 jseger Exp
#
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.w3.org/Library/
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
CONFIGURE_ARGS= --with-zlib --with-regex --without-x
DOCDIR= ${PREFIX}/share/doc/libwww
diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index 8ac294091e2..5b5280c3eb3 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/25 16:38:06 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:43 rh Exp $
#
DISTNAME= Xbae-4.8.1
@@ -9,7 +9,7 @@ MAINTAINER= drochner@netbsd.org
HOMEPAGE= http://www.lesstif.org/Xbae.html
USE_MOTIF= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-build-12 \
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 93ba1a0057e..64a2722ae1a 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/03/21 22:40:58 tron Exp $
+# $NetBSD: Makefile,v 1.14 2000/06/01 11:23:43 rh Exp $
#
DISTNAME= XmHTML-1.1.7
@@ -15,7 +15,7 @@ DEPENDS+= png>=1.0.6:../../graphics/png
USE_X11= yes
USE_MOTIF= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
NO_CONFIGURE= yes
diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index 40fce1bfe19..c2d255ed640 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/03/21 22:40:58 tron Exp $
+# $NetBSD: Makefile,v 1.21 2000/06/01 11:23:43 rh Exp $
DISTNAME= AfterStep-1.8.0
PKGNAME= afterstep-1.8.0
@@ -19,7 +19,7 @@ DEPENDS+= asclock-*:../../x11/asclock
DEPENDS+= xp-*:../../x11/xp
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_PERL= yes
USE_X11= yes
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 6c620735bd3..a69d11e388d 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/05/30 19:26:22 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2000/06/01 11:23:43 rh Exp $
DISTNAME= control-center-1.2.0
CATEGORIES= x11 gnome
@@ -12,7 +12,7 @@ DEPENDS+= gnome-libs-*:../../x11/gnome-libs
GNU_CONFIGURE= yes
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LOCALSTATEDIR= /var/gnome
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 20fe49a56eb..15c1385deac 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/02/16 10:35:56 agc Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:44 rh Exp $
DISTNAME= Eterm-0.8.9
PKGNAME= eterm-0.8.9
@@ -20,7 +20,7 @@ PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \
Eterm-bg-tile.tar.gz
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 264202a2150..9b60e1b9ea2 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/01/27 19:14:24 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2000/06/01 11:23:44 rh Exp $
#
DISTNAME= fltk-1.0.7-source
@@ -20,7 +20,7 @@ DEPENDS+= Mesa-*:../../graphics/Mesa
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
GNU_CONFIGURE= yes
# When the API changes and breaks binary-compatibility with the previous
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 81ba495ab16..0431263cea4 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2000/05/31 21:23:38 tron Exp $
+# $NetBSD: Makefile,v 1.43 2000/06/01 11:23:44 rh Exp $
DISTNAME= gnome-core-1.2.0
CATEGORIES= x11 gnome
@@ -15,7 +15,7 @@ DEPENDS+= libxml-*:../../textproc/libxml
GNU_CONFIGURE= yes
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LOCALSTATEDIR= /var/gnome
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 2ed329782bd..77d8250ed99 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2000/05/30 19:23:46 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2000/06/01 11:23:44 rh Exp $
DISTNAME= gnome-libs-1.2.1
CATEGORIES= x11 gnome
@@ -16,7 +16,7 @@ DEPENDS+= xpm-3.4k:../../graphics/xpm
GNU_CONFIGURE= yes
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LDFLAGS+= "-L${LOCALBASE}/lib"
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--with-glib-prefix=${LOCALBASE}
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index b28de1bbdd8..d74b387cba9 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/03/28 20:07:14 tron Exp $
+# $NetBSD: Makefile,v 1.12 2000/06/01 11:23:45 rh Exp $
# FreeBSD Id: Makefile,v 1.6 1999/01/12 16:50:43 vanilla Exp
#
@@ -13,7 +13,7 @@ HOMEPAGE= http://lazy.ton.tut.fi/gtk--/gtk--.html
DEPENDS+= gnome-libs-*:../../x11/gnome-libs
BUILD_DEPENDS+= ${LOCALBASE}/bin/gm4:../../devel/m4
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index a5918b9f622..3f8e07a5703 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/01/15 12:32:16 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:45 rh Exp $
DISTNAME= gtk-engines-0.8
CATEGORIES= x11
@@ -11,6 +11,6 @@ DEPENDS+= imlib-*:../../graphics/imlib
GNU_CONFIGURE= yes
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index 60270c503a9..189dd742bf0 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2000/05/26 05:38:19 rh Exp $
+# $NetBSD: Makefile,v 1.43 2000/06/01 11:23:45 rh Exp $
DISTNAME= gtk+-1.2.8
CATEGORIES= x11
@@ -14,7 +14,7 @@ DEPENDS+= gettext-0.10.*:../../devel/gettext
DEPENDS+= glib>=1.2.8:../../devel/glib
BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
USE_GMAKE= yes
diff --git a/x11/gtk10/Makefile b/x11/gtk10/Makefile
index bd2d46b9c9b..a6b91520e79 100644
--- a/x11/gtk10/Makefile
+++ b/x11/gtk10/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 1999/05/20 20:09:53 tron Exp $
+# $NetBSD: Makefile,v 1.10 2000/06/01 11:23:45 rh Exp $
DISTNAME= gtk+-1.0.6
PKGNAME= gtk10-1.0.6
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gtk.org/
CONFLICTS= gtk+-1.0.*
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index d285966d877..56eeb542047 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/02/05 15:48:52 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2000/06/01 11:23:46 rh Exp $
DISTNAME= gtkglarea-1.2.1
CATEGORIES= x11 graphics
@@ -11,7 +11,7 @@ DEPENDS+= Mesa-*:../../graphics/Mesa
DEPENDS+= gtk+-1.2.*:../../x11/gtk
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
CONFIGURE_ARGS+= --with-gtk-prefix=${X11BASE}
CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE}
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index 09fe27f3031..210e334da5b 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/04/24 16:02:33 mbw Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:46 rh Exp $
DISTNAME= gtkstep-1.10
CATEGORIES= x11
@@ -11,7 +11,7 @@ HOMEPAGE= http://ulli.linuxave.net/gtkstep/index.html
DEPENDS+= gtk+-1.2.*:../../x11/gtk
GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
post-install:
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index d61ccfa7e63..3b34f86fbfd 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2000/03/28 00:12:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.46 2000/06/01 11:23:46 rh Exp $
# FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
#
@@ -18,7 +18,7 @@ DEPENDS+= tiff-*:../../graphics/tiff
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
LIBTOOL_FLAGS= --cplusplus --install-la
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index c8731cb54b4..79fa6dfbbcc 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2000/05/25 15:25:43 drochner Exp $
+# $NetBSD: Makefile,v 1.49 2000/06/01 11:23:46 rh Exp $
# FreeBSD Id: Makefile,v 1.13 1997/09/08 08:34:13 tg Exp
#
@@ -16,7 +16,7 @@ HOMEPAGE= http://www.lesstif.org/
BUILD_DEPENDS+= lynx:../../www/lynx
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
diff --git a/x11/qt/Makefile b/x11/qt/Makefile
index 5de373e7787..699b81d8624 100644
--- a/x11/qt/Makefile
+++ b/x11/qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2000/04/28 10:09:53 drochner Exp $
+# $NetBSD: Makefile,v 1.34 2000/06/01 11:23:46 rh Exp $
#
DISTNAME= qt-2.0.2
@@ -18,7 +18,7 @@ NOT_FOR_PLATFORM= *-*-alpha # builds, but programs linked to qt crash
HAS_CONFIGURE= yes
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
CONFIGURE_ENV+= QTDIR=${WRKSRC}
CONFIGURE_ARGS+= -static -sm -system-zlib -system-libpng \
-I${LOCALBASE}/include -L${LOCALBASE}/lib \
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index a27cd995c34..ce0bc4f1949 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/04/13 10:13:20 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:47 rh Exp $
#
DISTNAME= qt-1.44
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.troll.no/products/qt.html
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
MAKE_ENV= QTDIR=${WRKSRC}
ALL_TARGET= src
diff --git a/x11/qt21/Makefile b/x11/qt21/Makefile
index eeb8edfec32..1155939f9a6 100644
--- a/x11/qt21/Makefile
+++ b/x11/qt21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/05/11 12:15:17 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:47 rh Exp $
#
DISTNAME= qt-x11-2.1.0
@@ -20,7 +20,7 @@ NOT_FOR_PLATFORM= *-*-alpha # builds, but programs linked to qt crash
HAS_CONFIGURE= yes
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
CONFIGURE_ENV+= QTDIR=${WRKSRC}
CONFIGURE_ARGS+= -static -sm -system-zlib \
-system-libpng -system-jpeg \
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 6aa850e0bcd..7e6b5636101 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/03/28 00:12:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/01 11:23:47 rh Exp $
DISTNAME= QwSpriteField1.6
PKGNAME= qwspritefield-1.6
@@ -13,7 +13,7 @@ CONFLICTS= kdesupport-1.0
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
WRKSRC= ${WRKDIR}/QwSpriteField
QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 1398c824f52..76b438eb3f2 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/03/23 23:15:25 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2000/06/01 11:23:47 rh Exp $
DISTNAME= qwtlib-0.2
CATEGORIES= x11
@@ -12,7 +12,7 @@ DEPENDS+= qt1-1.44:../../x11/qt1
USE_X11BASE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
WRKSRC= ${WRKDIR}/qwt
ALL_TARGET= src
diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile
index ffb9bf2675f..f896260b81e 100644
--- a/x11/scwm/Makefile
+++ b/x11/scwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/05 17:21:48 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2000/06/01 11:23:48 rh Exp $
#
DISTNAME= scwm-0.9
@@ -20,6 +20,6 @@ CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \
USE_X11BASE= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/tix/Makefile b/x11/tix/Makefile
index 90fe0af364c..6ac64b4056a 100644
--- a/x11/tix/Makefile
+++ b/x11/tix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/03/27 08:55:00 tron Exp $
+# $NetBSD: Makefile,v 1.11 2000/06/01 11:23:48 rh Exp $
# $FreeBSD Id: Makefile,v 1.15 1998/03/17 07:55:17 tg Exp
DISTNAME= Tix4.1.0.006
@@ -11,7 +11,7 @@ MAINTAINER= rh@vip.at
DEPENDS+= tk-8.0.5:../../x11/tk80
USE_X11= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
WRKSRC= ${WRKDIR}/Tix4.1.0/unix/tk8.0
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sam \
diff --git a/x11/tk80/Makefile b/x11/tk80/Makefile
index e31560c8a37..1ecfc819f02 100644
--- a/x11/tk80/Makefile
+++ b/x11/tk80/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 1999/04/01 13:36:57 agc Exp $
+# $NetBSD: Makefile,v 1.26 2000/06/01 11:23:48 rh Exp $
# FreeBSD Id: Makefile,v 1.4 1997/10/01 09:20:31 tg Exp
#
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_X11= yes
# let libtool look after shared libraries
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
CONFIGURE_ARGS+= --disable-shared
test:
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index 830937e489a..323626ffa6b 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2000/04/15 20:19:18 mycroft Exp $
+# $NetBSD: Makefile,v 1.49 2000/06/01 11:23:48 rh Exp $
DISTNAME= WindowMaker-0.62.1
PKGNAME= windowmaker-0.62.1
@@ -19,7 +19,7 @@ DEPENDS+= png>=1.0.6:../../graphics/png
DEPENDS+= tiff-*:../../graphics/tiff
DEPENDS+= xpm-3.4k:../../graphics/xpm
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-usermenu \
diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile
index 8861eb066af..2c5952bc5f9 100644
--- a/x11/xforms/Makefile
+++ b/x11/xforms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/05/14 01:00:42 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.26 2000/06/01 11:23:48 rh Exp $
#
DISTNAME= bxform-088
@@ -41,7 +41,7 @@ DISTNAME= bxform-088-ELF
OBJMACHINE= yes
USE_X11BASE= yes
-USE_LIBTOOL= yes
+USE_PKGLIBTOOL= yes
MAKEFILE= ${FILESDIR}/Makefile
PLIST_SRC= ${PKGDIR}/PLIST.mi ${PKGDIR}/PLIST.shlib