summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net/wget/Makefile3
-rw-r--r--net/yaz/Makefile3
-rw-r--r--parallel/linda/Makefile3
-rw-r--r--print/cjk-lyx/Makefile5
-rw-r--r--print/ggv/Makefile3
-rw-r--r--print/ggv2/Makefile3
-rw-r--r--print/gimp-print-cups/Makefile3
-rw-r--r--print/gimp-print-escputil/Makefile3
-rw-r--r--print/gimp-print-ijs/Makefile6
-rw-r--r--print/gimp-print-lib/Makefile3
-rw-r--r--print/gimp-print/Makefile3
-rw-r--r--print/gnome-print/Makefile3
-rw-r--r--print/gpdf/Makefile4
-rw-r--r--print/ja-vfxdvik/Makefile4
-rw-r--r--print/libgnomeprint/Makefile3
-rw-r--r--print/libgnomeprintui/Makefile3
-rw-r--r--print/mp/Makefile3
-rw-r--r--print/pdflib/Makefile.common6
-rw-r--r--print/scribus/Makefile4
-rw-r--r--security/beecrypt/Makefile4
-rw-r--r--security/cyrus-sasl2/Makefile.common3
-rw-r--r--security/gnutls/Makefile4
-rw-r--r--security/gpgme/Makefile6
-rw-r--r--security/gpgme03/Makefile6
-rw-r--r--security/gsasl/Makefile3
-rw-r--r--security/gss/Makefile3
-rw-r--r--security/heimdal/Makefile3
-rw-r--r--security/kth-krb4/Makefile6
-rw-r--r--security/libgcrypt/Makefile6
-rw-r--r--security/libgpg-error/Makefile5
-rw-r--r--security/libmcrypt/Makefile3
-rw-r--r--security/libtasn1/Makefile4
-rw-r--r--security/mcrypt/Makefile3
-rw-r--r--security/mhash/Makefile4
-rw-r--r--security/nessus-libraries/Makefile3
-rw-r--r--security/opencdk/Makefile3
-rw-r--r--sysutils/fakeroot/Makefile3
-rw-r--r--sysutils/fam/Makefile4
-rw-r--r--sysutils/gnome-vfs/Makefile4
-rw-r--r--sysutils/gnome-vfs2/Makefile3
-rw-r--r--sysutils/nautilus/Makefile3
-rw-r--r--sysutils/vcdimager-devel/Makefile3
-rw-r--r--textproc/aiksaurus/Makefile3
-rw-r--r--textproc/aspell/Makefile3
-rw-r--r--textproc/eb/Makefile4
-rw-r--r--textproc/enchant/Makefile3
-rw-r--r--textproc/expat/Makefile3
-rw-r--r--textproc/gtkspell/Makefile3
-rw-r--r--textproc/kakasi/Makefile3
-rw-r--r--textproc/libcroco/Makefile3
-rw-r--r--textproc/libpathan/Makefile3
-rw-r--r--textproc/libxml/Makefile4
-rw-r--r--textproc/libxml2/Makefile3
-rw-r--r--textproc/libxslt/Makefile3
-rw-r--r--textproc/ndtpd/Makefile4
-rw-r--r--textproc/opensp/Makefile6
-rw-r--r--textproc/raptor/Makefile3
-rw-r--r--textproc/regexx/Makefile3
-rw-r--r--textproc/sablotron/Makefile4
-rw-r--r--textproc/scrollkeeper/Makefile4
-rw-r--r--time/jday/Makefile3
-rw-r--r--wm/matchbox/Makefile3
-rw-r--r--wm/metacity/Makefile3
-rw-r--r--wm/openbox/Makefile3
-rw-r--r--wm/whiteBOX/Makefile4
-rw-r--r--wm/windowmaker/Makefile3
-rw-r--r--www/ap-php4/Makefile4
-rw-r--r--www/apache2/Makefile4
-rw-r--r--www/curl/Makefile3
-rw-r--r--www/epiphany/Makefile3
-rw-r--r--www/fcgi/Makefile6
-rw-r--r--www/galeon/Makefile3
-rw-r--r--www/gtkhtml/Makefile4
-rw-r--r--www/gtkhtml3/Makefile3
-rw-r--r--www/kimagemapeditor/Makefile4
-rw-r--r--www/libghttp/Makefile3
-rw-r--r--www/libgtkhtml/Makefile3
-rw-r--r--www/libwww/Makefile3
-rw-r--r--www/neon/Makefile4
-rw-r--r--www/php4/Makefile5
-rw-r--r--www/quanta3/Makefile3
-rw-r--r--www/swish-e/Makefile3
-rw-r--r--x11/Xbae/Makefile3
-rw-r--r--x11/Xfixes/Makefile3
-rw-r--r--x11/Xrandr-mixedcase/Makefile3
-rw-r--r--x11/Xrender/Makefile3
-rw-r--r--x11/controlcenter/Makefile3
-rw-r--r--x11/eterm/Makefile3
-rw-r--r--x11/fbdesk/Makefile4
-rw-r--r--x11/gdkxft/Makefile4
-rw-r--r--x11/gdm/Makefile3
-rw-r--r--x11/gnome--/Makefile3
-rw-r--r--x11/gnome-core/Makefile.common3
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gnome-mag/Makefile3
-rw-r--r--x11/gnome-panel/Makefile3
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-themes-extra/Makefile4
-rw-r--r--x11/gnome-themes/Makefile4
-rw-r--r--x11/gnome2-applets/Makefile3
-rw-r--r--x11/gnome2-control-center/Makefile6
-rw-r--r--x11/gnome2-terminal/Makefile3
-rw-r--r--x11/gnopernicus/Makefile3
-rw-r--r--x11/gtk--/Makefile3
-rw-r--r--x11/gtk-engines/Makefile4
-rw-r--r--x11/gtk-thinice-engine/Makefile3
-rw-r--r--x11/gtk/Makefile3
-rw-r--r--x11/gtk2-engines/Makefile4
-rw-r--r--x11/gtk2/Makefile5
-rw-r--r--x11/gtkglarea2/Makefile3
-rw-r--r--x11/gtkmm/Makefile3
-rw-r--r--x11/gtksourceview/Makefile3
-rw-r--r--x11/gtkstep/Makefile3
-rw-r--r--x11/gtoolkit/Makefile.common3
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/lesstif12/Makefile.common4
-rw-r--r--x11/libzvt/Makefile3
-rw-r--r--x11/mlterm/Makefile5
-rw-r--r--x11/mowitz/Makefile3
-rw-r--r--x11/multi-gnome-terminal/Makefile4
-rw-r--r--x11/neXtaw/Makefile4
-rw-r--r--x11/paragui/Makefile3
-rw-r--r--x11/py-gnome2/Makefile3
-rw-r--r--x11/py-gtk2/Makefile3
-rw-r--r--x11/py-qt2-sip/Makefile4
-rw-r--r--x11/py-qt2/Makefile4
-rw-r--r--x11/pygtk/Makefile3
-rw-r--r--x11/startup-notification/Makefile3
-rw-r--r--x11/vte/Makefile3
-rw-r--r--x11/xcursor/Makefile3
-rw-r--r--x11/xfce/Makefile4
-rw-r--r--x11/xosd/Makefile.common5
133 files changed, 153 insertions, 321 deletions
diff --git a/net/wget/Makefile b/net/wget/Makefile
index d3c3549b2ea..192ed3361ec 100644
--- a/net/wget/Makefile
+++ b/net/wget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2003/12/08 21:44:35 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2004/02/14 17:21:49 jlam Exp $
DISTNAME= wget-1.9.1
CATEGORIES= net
@@ -17,7 +17,6 @@ USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
OPENSSL_LDFLAGS= ${LDFLAGS} -L${BUILDLINK_PREFIX.openssl}/lib \
-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.openssl}/lib
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 55db1b45f15..288be764cfc 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/28 05:04:26 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:49 jlam Exp $
#
DISTNAME= yaz-2.0
@@ -12,7 +12,6 @@ COMMENT= C/C++ toolkit for the development of Z39.50v3/SRW clients and servers
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
PTHREAD_OPTS+= native optional
diff --git a/parallel/linda/Makefile b/parallel/linda/Makefile
index 320c9cc4883..5abb9d22d56 100644
--- a/parallel/linda/Makefile
+++ b/parallel/linda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:52:12 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:49 jlam Exp $
#
DISTNAME= linda-0.1.1
@@ -13,7 +13,6 @@ COMMENT= Parallel distributed database environment
USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../devel/glib2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 8bfea036877..bcae5665a16 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:49 jlam Exp $
DISTNAME= lyx-${LYX_VERS}
PKGNAME= cjk-${DISTNAME}
@@ -29,10 +29,7 @@ USE_PERL5= yes
USE_X11= yes
USE_GCC_SHLIB= yes
GNU_CONFIGURE= yes
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/sigc++/libtool
.include "../../graphics/jpeg/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk"
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index 0d6c47d080d..8c996b71c35 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.45 2004/02/14 17:21:49 jlam Exp $
#
DISTNAME= ggv-1.0.2
@@ -17,7 +17,6 @@ USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
USE_X11BASE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../devel/bonobo/buildlink2.mk"
.include "../../devel/oaf/buildlink2.mk"
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 3c127ae7959..4cfec84174c 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/11 05:20:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= ggv-2.4.1
@@ -20,7 +20,6 @@ USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
USE_GNU_TOOLS+= make
USE_X11= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GCONF2_SCHEMAS= ggv.schemas
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index 1a60fd66b62..6e4bcd2075f 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= gimp-print-4.2.5
@@ -19,7 +19,6 @@ CONFIGURE_ARGS+= --without-translated-ppds
CONFIGURE_ARGS+= --enable-escputil=no
CONFIGURE_ARGS+= --enable-libgimpprint=no
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_GNU_TOOLS+= make
USE_BUILDLINK2= yes
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index af033f17485..9c77ad2b3a6 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/06 10:36:10 tron Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:50 jlam Exp $
DISTNAME= gimp-print-4.2.5
PKGNAME= gimp-print-escputil-4.2.5
@@ -20,7 +20,6 @@ CONFIGURE_ARGS+= --without-gimp
CONFIGURE_ARGS+= --without-cups --without-translated-ppds
CONFIGURE_ARGS+= --enable-libgimpprint=no
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_GNU_TOOLS+= make
USE_BUILDLINK2= yes
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index 6ce63bbd8f8..e4d1e9d1d8c 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:50 jlam Exp $
DISTNAME= gimp-print-4.2.5
PKGNAME= gimp-print-ijs-4.2.5
@@ -11,6 +11,7 @@ HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= GIMP print IJS server
USE_BUILDLINK2= # defined
+USE_LIBTOOL= # defined
USE_GNU_TOOLS+= make
GNU_CONFIGURE= # defined
@@ -23,9 +24,6 @@ CONFIGURE_ARGS+= --without-translated-ppds
CONFIGURE_ARGS+= --disable-escputil
CONFIGURE_ARGS+= --disable-libgimpprint
-USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
BUILD_DIRS= ${WRKSRC}/lib ${WRKSRC}/src/ghost
DOCDIR= ${PREFIX}/share/doc/gimp-print-ijs
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index 921e3511f7b..c5d00b15690 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= gimp-print-4.2.5
@@ -20,7 +20,6 @@ USE_BUILDLINK2= yes
USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
INFO_FILES= gimpprint.info
GNU_CONFIGURE= yes
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index abd2c07d0ec..3e818e19fb8 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= gimp-print-4.2.5
@@ -18,7 +18,6 @@ CONFIGURE_ARGS+= --without-cups --without-translated-ppds
CONFIGURE_ARGS+= --enable-escputil=no
CONFIGURE_ARGS+= --enable-libgimpprint=no
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_GNU_TOOLS+= make
USE_BUILDLINK2= yes
USE_X11= yes
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index a2eb3f707f7..a690a89c5e1 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.60 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= gnome-print-0.36
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --without-admin # currently unstable
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 57a12d4aa7c..88ecf43c455 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= gpdf-0.112
@@ -22,8 +22,6 @@ USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../devel/libbonobo/buildlink2.mk"
.include "../../devel/libbonoboui/buildlink2.mk"
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index e8e4a17c0de..bce06cfabc3 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:50 jlam Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -30,7 +30,7 @@ USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/config/config
-LIBTOOL_OVERRIDE= ${WRKSRC}/config/klibtool
+LIBTOOL_OVERRIDE= klibtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+=--enable-local-texmf=${PREFIX}/share/texmf.local \
--without-texinfo \
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index eff28e8c3fe..24135852b00 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/02/13 14:04:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= libgnomeprint-2.4.2
@@ -22,7 +22,6 @@ GNU_CONFIGURE= YES
BUILDLINK_DEPENDS.freetype2+= freetype2>=2.1.4
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnomeprint/libgnomeprint-2.2.pc.in
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 169d48b4b4e..86604d11ab2 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/11 02:34:55 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= libgnomeprintui-2.4.2
@@ -20,7 +20,6 @@ USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= libgnomeprintui/libgnomeprintui-2.2.pc.in
CONFIGURE_ARGS= --enable-gtk-doc=no
diff --git a/print/mp/Makefile b/print/mp/Makefile
index 49e7451ebe1..9904b1d8a9a 100644
--- a/print/mp/Makefile
+++ b/print/mp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/09/21 21:33:09 kim Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= mpdist-3.7.1
@@ -13,7 +13,6 @@ COMMENT= PostScript pretty printer
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_X11= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index 4dc9c389f08..4db6f4460b0 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/02/14 17:21:50 jlam Exp $
DISTNAME= pdflib-${PDFLIB_DIST_VERS}
PKGREVISION= 1
@@ -20,6 +20,7 @@ DISTINFO_FILE= ${.CURDIR}/../pdflib/distinfo
PATCHDIR= ${.CURDIR}/../pdflib/patches
USE_BUILDLINK2= YES
+USE_LIBTOOL= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-pnglib
@@ -36,8 +37,5 @@ CONFIGURE_ARGS+= --enable-cxx=no
CPPFLAGS+= -Dunix
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../graphics/png/buildlink2.mk"
.include "../../graphics/tiff/buildlink2.mk"
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index e32cb2eaa6f..542eb4d0d3c 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:50 jlam Exp $
DISTNAME= scribus-1.1.1
PKGREVISION= 1
@@ -19,7 +19,7 @@ USE_GNU_TOOLS+= make
PTHREAD_OPTS+= require
USE_LIBTOOL= YES
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-qt-dir=${QTDIR} \
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 35924760f53..8b90939dfae 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/08/03 20:58:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= beecrypt-3.0.0
@@ -13,8 +13,6 @@ GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --without-javaglue
.include "../../mk/pthread.buildlink2.mk"
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index f94ff3ff0b8..143f63b8086 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/02/14 14:43:51 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/02/14 17:21:50 jlam Exp $
#
# This file is currently included by:
#
@@ -37,7 +37,6 @@ USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q}
# CYRUS_USER username of the Cyrus administrator
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index c71195984c3..6c343233ad3 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/10 00:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:50 jlam Exp $
DISTNAME= gnutls-1.0.4
CATEGORIES= security devel
@@ -12,8 +12,6 @@ USE_BUILDLINK3= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
DOCDIR= ${PREFIX}/share/doc/gnutls
EGDIR= ${PREFIX}/share/examples/gnutls
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 75da3d36aa7..7ddb617abbf 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/11 02:30:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:50 jlam Exp $
#
DISTNAME= gpgme-0.4.3
@@ -13,6 +13,7 @@ COMMENT= GnuPG Made Easy
DEPENDS+= gnupg>=1.2.2:../../security/gnupg
USE_BUILDLINK3= YES
+USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PTHREAD_OPTS+= require
@@ -24,9 +25,6 @@ TEST_TARGET= check
CONFIGURE_ARGS+= --without-pth --without-pth-test
.endif
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
INFO_FILES= gpgme.info
.include "../../security/libgpg-error/buildlink3.mk"
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 9d1f7fe9a22..20281005e6a 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/14 17:57:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= gpgme-0.3.15
@@ -13,6 +13,7 @@ COMMENT= GnuPG Made Easy (0.3 branch)
DEPENDS+= gnupg>=1.2.0:../../security/gnupg
USE_BUILDLINK2= YES
+USE_LIBTOOL= YES
GNU_CONFIGURE= YES
PTHREAD_OPTS+= require
@@ -22,9 +23,6 @@ PTHREAD_OPTS+= require
CONFIGURE_ARGS+= --without-pth --without-pth-test
.endif
-USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
INFO_FILES= gpgme.info
.include "../../mk/bsd.pkg.mk"
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 7d7affc1ea2..3a5a1ce597b 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/10 00:17:51 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $
DISTNAME= gsasl-0.0.8
PKGREVISION= 1
@@ -21,7 +21,6 @@ INFO_FILES= gsasl.info
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgsasl.pc.in
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 332d932952f..b310754f92d 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/10 00:14:41 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= gss-0.0.6
@@ -15,7 +15,6 @@ GNU_CONFIGURE= yes
USE_BUILDLINK3= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gss.pc.in
INFO_FILES= gss.info
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f6245dd289c..6c734adc612 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/15 12:48:00 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:52 jlam Exp $
DISTNAME= heimdal-0.6
CATEGORIES= security
@@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
HEIMDAL_STATEDIR?= /var/heimdal
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 2bc3b33065c..10ea608284b 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/02/09 17:36:37 wennmach Exp $
+# $NetBSD: Makefile,v 1.31 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= krb4-1.2.1
@@ -23,6 +23,7 @@ CRYPTO= yes
USE_BUILDLINK2= yes
USE_X11= yes
+USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/kerberosIV
@@ -44,9 +45,6 @@ PLIST_SUBST+= KRB4_PREFIX=
.endif
CONFIGURE_ARGS+= --program-transform="${KTH_KRB4_TRANSFORM}"
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
INFO_FILES= kth-krb.info
EXAMPLEDIR= ${PREFIX}/share/examples/kth-krb4
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index e614f0081c7..646bac5ed8b 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/10 00:13:24 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= libgcrypt-1.1.90
@@ -29,7 +29,9 @@ INFO_FILES= gcrypt.info
.if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
CONFIGURE_ARGS+= --disable-asm
-LIBTOOL_OVERRIDE+= ${WRKSRC}/libtool
+LIBTOOL_OVERRIDE+= libtool
+.else
+LIBTOOL_OVERRIDE= # empty
.endif
.include "../../mk/pthread.buildlink3.mk"
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 79b44dcef47..107cdcc1dc2 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/09 20:28:16 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= libgpg-error-0.6
@@ -15,8 +15,5 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../devel/gettext-lib/buildlink3.mk"
-
.include "../../mk/bsd.pkg.mk"
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index cbb66b8a7fd..e54a1cc4a4d 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/08/29 00:56:25 dan Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:52 jlam Exp $
DISTNAME= libmcrypt-2.5.7
CATEGORIES= security devel
@@ -12,7 +12,6 @@ COMMENT= Crypto algorithms library
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= yes
post-install:
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index d8a3b8720b9..3a5cb10eeba 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:52 jlam Exp $
DISTNAME= libtasn1-0.2.6
CATEGORIES= security devel
@@ -12,6 +12,4 @@ USE_BUILDLINK3= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../mk/bsd.pkg.mk"
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index b675aba0a3b..1010e4b8deb 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:20:11 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:52 jlam Exp $
DISTNAME= mcrypt-2.6.4
PKGREVISION= 1
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../security/libmcrypt/buildlink2.mk"
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 60542c346c8..303cf0ee17e 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:20:11 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:52 jlam Exp $
DISTNAME= mhash-0.8.17
CATEGORIES= security devel
@@ -10,8 +10,6 @@ COMMENT= Hash algorithms library
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index e4a20d102dd..b33288ddb6f 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:25:34 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= nessus-libraries-${VERS}
@@ -10,7 +10,6 @@ COMMENT= Libs required by the Nessus Network security scanner
WRKSRC= ${WRKDIR}/nessus-libraries
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 1504cfed675..86e28cf31bc 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/10 00:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= opencdk-0.5.3
@@ -14,7 +14,6 @@ USE_BUILDLINK3= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
REPLACE_PERL= doc/gdoc
DOCDIR= ${PREFIX}/share/doc/opencdk
diff --git a/sysutils/fakeroot/Makefile b/sysutils/fakeroot/Makefile
index 990ed07a88b..c3475ce3b37 100644
--- a/sysutils/fakeroot/Makefile
+++ b/sysutils/fakeroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= fakeroot_0.5.8
@@ -11,7 +11,6 @@ COMMENT= Creates a fake root environment
WRKSRC= ${WRKDIR}/fakeroot-0.5.8
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE=${WRKSRC}/libtool
GNU_CONFIGURE= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 9074999f151..f57138c31de 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/11 00:39:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= fam-2.6.10
@@ -17,8 +17,6 @@ USE_LIBTOOL= YES
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
EGDIR= ${PREFIX}/share/examples/fam
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 829292ab339..1aa7dc6fb68 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/02/11 12:20:03 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2004/02/14 17:21:52 jlam Exp $
DISTNAME= gnome-vfs-1.0.5
PKGREVISION= 5
@@ -17,9 +17,7 @@ USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 0d51de05a46..7b142a03b8a 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/12 23:44:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= gnome-vfs-2.4.2
@@ -21,7 +21,6 @@ USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gnome-vfs-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-vfs-module-2.0.pc.in
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index c082419f79a..d620e086ce7 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/14 00:23:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:52 jlam Exp $
#
DISTNAME= nautilus-2.4.2
@@ -18,7 +18,6 @@ USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libnautilus/libnautilus.pc.in
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index fa1bde639e1..f4e50a2dc3c 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 15:06:58 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= vcdimager-0.7.12
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
INFO_FILES= vcdimager.info
.include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index c283e76c0cb..eb9fc6c8a5d 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/26 20:51:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= aiksaurus-1.0.1
@@ -13,7 +13,6 @@ USE_BUILDLINK2= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --without-gtk
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/base/aiksaurus-1.0.pc.in
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 6a0e5268219..1fd83803649 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/11 04:35:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= aspell-0.50.4.1
@@ -17,7 +17,6 @@ USE_GCC_SHLIB= yes
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --enable-doc-dir=${PREFIX}/share/doc/aspell
CONFIGURE_ARGS+= --enable-curses=ncurses
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 359ba5269c8..872e806e614 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 15:13:19 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:53 jlam Exp $
# FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
#
@@ -58,8 +58,6 @@ USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
USE_MAKEINFO= YES
INFO_FILES= eb-ja.info ebfont-ja.info ebfont.info ebinfo-ja.info
INFO_FILES+= ebinfo.info ebrefile-ja.info ebrefile.info ebzip-ja.info
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 60c43c6d005..2f7637bd1a4 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/26 18:19:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= enchant-1.1.3
@@ -12,7 +12,6 @@ COMMENT= Generic spell checking library
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/enchant.pc.in
GNU_CONFIGURE= yes
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index b12ba30eb71..9de4cb1ae11 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:13:19 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= expat-1.95.6
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_GNU_TOOLS+= make
USE_BUILDLINK3= YES
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 3c923b0b230..91922d0cc7f 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/09 18:26:06 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= gtkspell-2.0.5
@@ -13,7 +13,6 @@ GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gtkspell-2.0.pc.in
SUBST_CLASSES+= subdir
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 8593465d737..576f2e1463c 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
# FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
DISTNAME= kakasi-2.3.4
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 9436b2382ee..6b69ff289ef 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/11 06:18:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= libcroco-0.4.0
@@ -17,7 +17,6 @@ USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libcroco.pc.in
CONFIGURE_ARGS+= --enable-seleng=yes
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index e48a66cca16..183415bc14d 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/12 02:41:18 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:53 jlam Exp $
DISTNAME= libpathan-1.2-2-src
PKGNAME= ${DISTNAME:S/-2-src/.2/}
@@ -18,7 +18,6 @@ USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= XERCESCROOT=${LOCALBASE}
CONFIGURE_ARGS+= YACC=${LOCALBASE}/bin/bison
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 257da6a0ee9..98068e7d2fd 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 22:54:29 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= libxml-1.8.17
@@ -13,9 +13,7 @@ COMMENT= XML parser, mainly used by the GNOME project
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libxml.pc.in
.include "../../devel/zlib/buildlink2.mk"
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 3f893237472..6bca51540d3 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2004/02/12 22:18:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.47 2004/02/14 17:21:53 jlam Exp $
DISTNAME= libxml2-${LIBXML_VERSION}
CATEGORIES= textproc
@@ -12,7 +12,6 @@ COMMENT= XML parser library from the GNOME project
USE_BUILDLINK3= yes
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libxml-2.0.pc.in
LIBXML_VERSION= 2.6.6
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index b4d94db2cfc..e1f64810aad 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/02/10 02:56:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:53 jlam Exp $
DISTNAME= libxslt-1.1.2
PKGNAME= ${DISTNAME}
@@ -15,7 +15,6 @@ USE_BUILDLINK3= yes
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_PERL5= build
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libxslt.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libexslt.pc.in
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index 2f1f035c1f3..59f6aafea17 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/09 11:27:50 seb Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= ndtpd-3.1.4
@@ -17,8 +17,6 @@ GNU_CONFIGURE= YES
INFO_FILES= ndtpd-ja.info ndtpd.info
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=${NDTPD_RUNDIR}
CONFIGURE_ARGS+= --with-logdir=${NDTPD_LOGDIR}
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 7fc23617828..bfd7dfabf18 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 22:54:31 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= OpenSP-1.5
@@ -15,15 +15,13 @@ CONFLICTS+= sp-[0-9]*
USE_BUILDLINK2= yes
USE_PERL5= build
+USE_LIBTOOL= yes
PTHREAD_OPTS+= native
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-http \
--enable-default-catalog=${PREFIX}/share/sgml/catalog
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../devel/gettext-lib/buildlink2.mk"
.include "../../mk/pthread.buildlink2.mk"
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 8a11ff2950b..8eff8871da1 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= raptor-1.0.0
@@ -14,7 +14,6 @@ USE_BUILDLINK2= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/raptor.pc.in
.include "../../devel/glib2/buildlink2.mk"
diff --git a/textproc/regexx/Makefile b/textproc/regexx/Makefile
index ab40009a0f5..c22f4a75ec2 100644
--- a/textproc/regexx/Makefile
+++ b/textproc/regexx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= regexx-0.98.1
@@ -12,7 +12,6 @@ COMMENT= C++ regular expression library
USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
.include "../../devel/pcre/buildlink2.mk"
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index badb830ace1..0618267b728 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/09 19:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:53 jlam Exp $
DISTNAME= Sablot-1.0.1
PKGNAME= ${DISTNAME:S/Sablot/sablotron/}
@@ -17,8 +17,6 @@ GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
# sablotron needs iconv but assumes it is in libc, so add what
# buildlink2 finds.
LIBS+= ${_BLNK_ICONV_LDFLAGS}
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 1adc9208f55..a8c8a183c85 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/11 04:35:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= scrollkeeper-0.3.14
@@ -21,8 +21,6 @@ USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
CONFIGURE_ARGS= --localstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR}
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/time/jday/Makefile b/time/jday/Makefile
index dca1a77af10..f0a7d75fdce 100644
--- a/time/jday/Makefile
+++ b/time/jday/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 13:40:53 wennmach Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= jday-1.3
@@ -11,7 +11,6 @@ COMMENT= Julian date calculator
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
do-test:
@(cd ${WRKSRC} && ./RunTest)
diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile
index c20af395bef..ed02296f608 100644
--- a/wm/matchbox/Makefile
+++ b/wm/matchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:34:04 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= matchbox-0.3.6
@@ -13,7 +13,6 @@ USE_BUILDLINK2= YES
USE_X11= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE=${WRKSRC}/libtool
.include "../../graphics/xpm/buildlink2.mk"
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 03c7178fcb9..0b96d1d8895 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/12 11:13:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= metacity-2.6.3
@@ -21,7 +21,6 @@ USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/src/libmetacity-private.pc.in
GCONF2_SCHEMAS= metacity.schemas
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index 9fac978b4e9..f6e2bbb4073 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/07 23:22:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:53 jlam Exp $
DISTNAME= openbox-3.1
PKGREVISION= 2
@@ -20,7 +20,6 @@ USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/parser/obparser-3.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/render/obrender-3.0.pc.in
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index 64b276c64ad..1bf48852000 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/24 15:18:32 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:53 jlam Exp $
#
DISTNAME= whiteBOX-0.5
@@ -15,8 +15,6 @@ USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
# this prevents us from build-depending on autoconf and automake
# is it worth it?
pre-install:
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index b8bd3cd4b39..bb2248bbd04 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/02/01 01:43:30 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2004/02/14 17:21:53 jlam Exp $
DISTNAME= WindowMaker-0.80.2
PKGNAME= windowmaker-0.80.2
@@ -19,7 +19,6 @@ USE_PKGINSTALL= YES
USE_X11BASE= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-usermenu \
--sysconfdir=${PKG_SYSCONFBASEDIR} \
diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile
index da19b82e731..27b9832e2a7 100644
--- a/www/ap-php4/Makefile
+++ b/www/ap-php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/01/12 09:46:04 cjep Exp $
+# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:54 jlam Exp $
#
PKGNAME= ap-php-${PHP_BASE_VERS}
@@ -9,7 +9,7 @@ DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4
USE_BUILDLINK2= YES
APACHE_MODULE= YES
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
.include "../../www/php4/Makefile.php"
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 3ccff810a91..f5d63391464 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/01/27 08:11:05 grant Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:54 jlam Exp $
PKGNAME= apache-${APACHE_VERSION}
PKGREVISION= 3
@@ -16,7 +16,7 @@ USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
#USE_LIBTOOL= YES
-#LIBTOOL_OVERRIDE= ${WRKSRC}/srclib/apr/libtool
+#LIBTOOL_OVERRIDE= libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-layout=NetBSD
diff --git a/www/curl/Makefile b/www/curl/Makefile
index 91bc7969f4a..74bae0af290 100644
--- a/www/curl/Makefile
+++ b/www/curl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/01/23 22:52:28 recht Exp $
+# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:54 jlam Exp $
DISTNAME= curl-7.11.0
CATEGORIES= www
@@ -16,7 +16,6 @@ BUILD_DEFS+= USE_INET6
USE_BUILDLINK2= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl}
CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib}
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index a9a4cee6ca3..ce3dfdde2cd 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/02/14 00:24:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:54 jlam Exp $
#
DISTNAME= epiphany-1.0.7
@@ -14,7 +14,6 @@ BUILD_USES_MSGFMT= YES
DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index a67342da58d..38f100c10ce 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/11/10 17:25:13 gavan Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:54 jlam Exp $
DISTNAME= fcgi-2.4.0
CATEGORIES= www devel
@@ -11,10 +11,8 @@ COMMENT= FastCGI application development kit
USE_BUILDLINK2= YES
USE_GCC_SHLIB= YES
GNU_CONFIGURE= YES
-PTHREAD_OPTS+= require
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+PTHREAD_OPTS+= require
.include "../../mk/pthread.buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 198a1e353dc..12dcb63a711 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2004/02/05 08:48:54 abs Exp $
+# $NetBSD: Makefile,v 1.62 2004/02/14 17:21:54 jlam Exp $
DISTNAME= galeon-1.2.13
PKGREVISION= 2
@@ -22,7 +22,6 @@ USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 8edfc56a89a..1d6ab7b3732 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/01/24 15:23:46 grant Exp $
+# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:54 jlam Exp $
DISTNAME= gtkhtml-1.1.10
PKGREVISION= 2
@@ -15,9 +15,7 @@ USE_X11BASE= YES
USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 1b3a6648cc3..ac1b96e4837 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/02/11 03:59:51 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:54 jlam Exp $
#
DISTNAME= gtkhtml-3.0.9
@@ -16,7 +16,6 @@ USE_GNU_TOOLS+= make
USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/src/libgtkhtml.pc.in
GNU_CONFIGURE= yes
diff --git a/www/kimagemapeditor/Makefile b/www/kimagemapeditor/Makefile
index 4d163745cc4..c16107a8e23 100644
--- a/www/kimagemapeditor/Makefile
+++ b/www/kimagemapeditor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:54 jlam Exp $
DISTNAME= kimagemapeditor-1.0
PKGREVISION= 3
@@ -15,8 +15,6 @@ USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../meta-pkgs/kde3/buildlink2.mk"
.include "../../x11/kdelibs3/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 33be5d06ae8..8e18a3d8a45 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/02/11 09:53:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:54 jlam Exp $
DISTNAME= libghttp-1.0.9
CATEGORIES= www gnome
@@ -11,6 +11,5 @@ COMMENT= GNOME http client library
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../mk/bsd.pkg.mk"
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 4393062182a..06c837462d7 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/13 19:36:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:54 jlam Exp $
#
DISTNAME= libgtkhtml-2.4.1
@@ -19,7 +19,6 @@ USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_X11= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= libgtkhtml-2.0.pc.in
.include "../../devel/gail/buildlink3.mk"
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 1011d8e715c..ce551ae9c1b 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/02/12 21:22:35 minskim Exp $
+# $NetBSD: Makefile,v 1.51 2004/02/14 17:21:54 jlam Exp $
DISTNAME= w3c-libwww-5.4.0
PKGNAME= libwww-5.4.0
@@ -19,7 +19,6 @@ SITES_libwww-configure-5.4.0.gz= ${MASTER_SITE_LOCAL}
USE_BUILDLINK3= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --with-zlib --with-regex --without-x
diff --git a/www/neon/Makefile b/www/neon/Makefile
index c97c224716a..0e7f9c1d86d 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/12/20 19:44:39 heinz Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:54 jlam Exp $
DISTNAME= neon-0.24.4
CATEGORIES= www
@@ -9,9 +9,7 @@ HOMEPAGE= http://www.webdav.org/neon/
COMMENT= HTTP and WebDAV client library
USE_BUILDLINK2= # defined
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= neon.pc.in
GNU_CONFIGURE= # defined
diff --git a/www/php4/Makefile b/www/php4/Makefile
index a6855330c49..199aaa6db07 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.37 2004/02/14 17:21:54 jlam Exp $
PKGNAME= php-${PHP_BASE_VERS}
CATEGORIES+= lang
@@ -9,7 +9,8 @@ CONFLICTS+= ap-php-4.0.3pl1
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
# PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now
-# LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+# LIBTOOL_OVERRIDE= libtool
+LIBTOOL_OVERRIDE= # empty
USE_GNU_TOOLS+= make
.include "Makefile.php"
diff --git a/www/quanta3/Makefile b/www/quanta3/Makefile
index 99decacca27..e4667cd0c86 100644
--- a/www/quanta3/Makefile
+++ b/www/quanta3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/05 02:25:36 markd Exp $
+# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:54 jlam Exp $
DISTNAME= quanta-${_KDE_VERSION}
CATEGORIES= www
@@ -12,7 +12,6 @@ USE_PERL5= build
USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../meta-pkgs/kde3/buildlink2.mk"
.include "../../x11/kdebase3/buildlink2.mk"
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index c19d0fdc8f6..4fcfda25510 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/23 21:55:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:54 jlam Exp $
# FreeBSD Id: ports/www/swish-e/Makefile,v 1.3 1999/08/31 02:43:18 peter Exp
DISTNAME= swish-e-2.4.1
@@ -12,7 +12,6 @@ COMMENT= Simple web indexing for humans - enhanced
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --with-libxml2=${BUILDLINK_PREFIX.libxml2}
CONFIGURE_ARGS+= --with-pcre=${BUILDLINK_PREFIX.pcre}
diff --git a/x11/Xbae/Makefile b/x11/Xbae/Makefile
index d4edefc66a9..0c004654c71 100644
--- a/x11/Xbae/Makefile
+++ b/x11/Xbae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/07/17 22:56:20 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= Xbae-4.9.1
@@ -12,7 +12,6 @@ COMMENT= Motif-compatible widgets: XbaeMatrix, XbaeCaption, XbaeInput
USE_BUILDLINK2= YES
USE_X11BASE= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-motif-includes=${MOTIFBASE}/include
diff --git a/x11/Xfixes/Makefile b/x11/Xfixes/Makefile
index 61a41c7467d..22651f041e3 100644
--- a/x11/Xfixes/Makefile
+++ b/x11/Xfixes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/30 16:53:35 cjep Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= libXfixes-2.0.0
@@ -16,7 +16,6 @@ USE_BUILDLINK2= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/xfixes.pc.in
.include "../../x11/fixesext/buildlink2.mk"
diff --git a/x11/Xrandr-mixedcase/Makefile b/x11/Xrandr-mixedcase/Makefile
index af4dbf73932..ad884e9e51f 100644
--- a/x11/Xrandr-mixedcase/Makefile
+++ b/x11/Xrandr-mixedcase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/04 14:40:39 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= libXrandr-1.0.1
@@ -16,7 +16,6 @@ USE_BUILDLINK2= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/xrandr.pc.in
BUILDLINK_DEPENDS.Xrender= Xrender>=0.8.2
diff --git a/x11/Xrender/Makefile b/x11/Xrender/Makefile
index c1a911c3078..2912c7f8740 100644
--- a/x11/Xrender/Makefile
+++ b/x11/Xrender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/09 06:24:05 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:55 jlam Exp $
DISTNAME= xrender-0.8.3
PKGNAME= ${DISTNAME:S/x/X/}
@@ -13,7 +13,6 @@ COMMENT= Client library for the X Rendering Extension protocol
USE_BUILDLINK3= YES
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
PKGCONFIG_OVERRIDE= ${WRKSRC}/xrender.pc.in
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index 0894e55b5d9..629f5a87291 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2004/01/24 15:30:32 grant Exp $
+# $NetBSD: Makefile,v 1.54 2004/02/14 17:21:55 jlam Exp $
DISTNAME= control-center-1.4.0.4
PKGREVISION= 5
@@ -17,7 +17,6 @@ USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LOCALSTATEDIR= ${X11PREFIX}/var
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index e32520a90a7..1288c581f38 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/02/11 22:56:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= Eterm-0.9.2
@@ -26,7 +26,6 @@ USE_BUILDLINK3= YES
USE_PKGINSTALL= YES
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index cbb897876d3..5dad13d943e 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/28 20:05:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= fbdesk-1.1.4
@@ -16,8 +16,6 @@ USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_X11= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../graphics/png/buildlink2.mk"
.include "../../fonts/Xft2/buildlink2.mk"
.include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 87b7e46b1d4..b77d46efc83 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gdkxft-1.5
@@ -18,9 +18,7 @@ PKG_FAIL_REASON= "${PKGNAME} requires XFree86-4.0 or higher"
USE_BUILDLINK2= YES
USE_X11BASE= YES
-
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-static
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 40734ff671d..688d3665471 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.51 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gdm-2.4.4.7
@@ -21,7 +21,6 @@ USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/x11/gnome--/Makefile b/x11/gnome--/Makefile
index 8a4502fa1bd..266ff1bc377 100644
--- a/x11/gnome--/Makefile
+++ b/x11/gnome--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/24 15:30:32 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnomemm-1.2.4
@@ -17,7 +17,6 @@ USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_X11BASE= yes
USE_BUILDLINK2= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
REPLACE_PERL= docgen/pce2
.include "../../devel/libsigc++10/buildlink2.mk"
diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common
index a0dcac13589..ae0356e390b 100644
--- a/x11/gnome-core/Makefile.common
+++ b/x11/gnome-core/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/01/24 15:30:32 grant Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-core-1.4.2
@@ -16,7 +16,6 @@ USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
LOCALSTATEDIR= ${X11PREFIX}/var/gnome
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index f4500c74914..4992483942a 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/13 22:15:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-desktop-2.4.1.1
@@ -20,9 +20,7 @@ USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
USE_PERL5= yes
USE_X11= yes
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index dbcf92ccef7..306116f5a36 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2004/01/24 15:30:32 grant Exp $
+# $NetBSD: Makefile,v 1.96 2004/02/14 17:21:55 jlam Exp $
DISTNAME= gnome-libs-1.4.2
PKGREVISION= 1
@@ -15,8 +15,6 @@ BUILD_USES_MSGFMT= YES
USE_X11BASE= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/libart_lgpl/libtool
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index b48e0dcb32c..804f42e6783 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/12 02:32:49 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-mag-0.10.4
@@ -20,7 +20,6 @@ USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-mag-1.0.pc.in
.include "../../devel/at-spi/buildlink2.mk"
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index eb7c21baaf6..4eed1a026f3 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-panel-2.4.2
@@ -21,7 +21,6 @@ USE_PERL5= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libpanel-applet/libpanelapplet-2.0.pc.in
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 22492216c59..883830d89d4 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.31 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-session-2.4.2
@@ -21,9 +21,7 @@ USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
USE_X11= yes
USE_PERL5= build
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GCONF2_SCHEMAS= gnome-session.schemas
diff --git a/x11/gnome-themes-extra/Makefile b/x11/gnome-themes-extra/Makefile
index 790707fb16d..32877206496 100644
--- a/x11/gnome-themes-extra/Makefile
+++ b/x11/gnome-themes-extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-themes-extras-0.5
@@ -21,8 +21,6 @@ GNU_CONFIGURE= yes
USE_GNU_TOOLS+= make
USE_X11= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../devel/libgnomeui/buildlink2.mk"
.include "../../x11/gtk2-engines/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index a08c30a283f..28501b912de 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-themes-2.4.1
@@ -21,8 +21,6 @@ USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
.include "../../devel/libgnomeui/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 986aa57d8fb..f5c23108c69 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-applets-2.4.2
@@ -20,7 +20,6 @@ USE_X11= yes
USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 365029a21d4..ca05bd3b840 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/02/14 14:48:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= control-center-2.4.0
@@ -20,13 +20,11 @@ USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
+USE_LIBTOOL= yes
USE_X11= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-
GCONF2_SCHEMAS= apps_gnome_settings_daemon_default_editor.schemas
GCONF2_SCHEMAS+= apps_gnome_settings_daemon_screensaver.schemas
GCONF2_SCHEMAS+= desktop_gnome_font_rendering.schemas
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index d823c5c0921..b13dcaf1b94 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnome-terminal-2.4.2
@@ -24,7 +24,6 @@ USE_PKGLOCALEDIR= YES
USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GCONF2_SCHEMAS= gnome-terminal.schemas
diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 2fb2ce7415b..898455ae55f 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/09 18:47:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gnopernicus-0.7.1
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+= --disable-ipv6
CONFIGURE_ARGS+= --disable-gtk-doc
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnopernicus-1.0.pc.in
GCONF2_SCHEMAS+= brlmonitor.schemas
diff --git a/x11/gtk--/Makefile b/x11/gtk--/Makefile
index 21a1162a4c7..b71c61ea4b7 100644
--- a/x11/gtk--/Makefile
+++ b/x11/gtk--/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/01/25 03:08:47 grant Exp $
+# $NetBSD: Makefile,v 1.34 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gtkmm-1.2.10
@@ -19,7 +19,6 @@ GNU_CONFIGURE= YES
USE_PERL5= build
USE_GNU_TOOLS+= m4 make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS= --enable-static
PLIST_SUBST+= LOCALBASE=${LOCALBASE}
diff --git a/x11/gtk-engines/Makefile b/x11/gtk-engines/Makefile
index 9b88de614f8..6ebc70c7461 100644
--- a/x11/gtk-engines/Makefile
+++ b/x11/gtk-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/03 18:49:56 reed Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:55 jlam Exp $
DISTNAME= gtk-engines-0.12
PKGREVISION= 5
@@ -13,7 +13,7 @@ GNU_CONFIGURE= # defined
USE_BUILDLINK2= # defined
USE_X11BASE= # defined
USE_LIBTOOL= # defined
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE= libtool
.include "../../x11/gtk/buildlink2.mk"
.include "../../graphics/imlib/buildlink2.mk"
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index 2eac5457071..0f5e966f011 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:55 jlam Exp $
#
DISTNAME= gtk-thinice-engine-2.0.2
@@ -20,7 +20,6 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gtk-thinice-engine-2.pc.in
.include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index ed6ab6ecb52..3bf65b1f401 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2004/02/14 00:54:46 grant Exp $
+# $NetBSD: Makefile,v 1.99 2004/02/14 17:21:55 jlam Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 6
@@ -22,7 +22,6 @@ USE_X11BASE= yes
USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+.pc.in
diff --git a/x11/gtk2-engines/Makefile b/x11/gtk2-engines/Makefile
index 094a72d9379..20715614d63 100644
--- a/x11/gtk2-engines/Makefile
+++ b/x11/gtk2-engines/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= gtk-engines-2.2.0
@@ -15,9 +15,7 @@ COMMENT= Theme engines for GTK+ version 2
GNU_CONFIGURE= yes
USE_BUILDLINK3= yes
USE_X11= yes
-
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gtk-engines-2.pc.in
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 5342258e932..32f46a64503 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/02/10 02:04:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.42 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= gtk+-2.2.4
@@ -20,6 +20,7 @@ USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
USE_GNU_TOOLS+= make
+USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xinput=xfree
@@ -31,8 +32,6 @@ CONFIGURE_ENV+= ac_cv_lib_Xinerama_XineramaQueryExtension=no
MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
TEST_TARGET= check
-USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gdk-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtk+-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gdk-pixbuf-2.0.pc.in
diff --git a/x11/gtkglarea2/Makefile b/x11/gtkglarea2/Makefile
index d04ebf9a650..36da2bd2154 100644
--- a/x11/gtkglarea2/Makefile
+++ b/x11/gtkglarea2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:57 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= gtkglarea-1.99.0
@@ -15,7 +15,6 @@ COMMENT= OpenGL widget for the GTK+2 GUI toolkit
WRKSRC= ${WRKDIR}/gtkglarea-1.99.0
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gtkgl-2.0.pc.in
GNU_CONFIGURE= YES
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 037d434f97b..5f50403085d 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= gtkmm-2.2.8
@@ -17,7 +17,6 @@ USE_GNU_TOOLS+= make
USE_PERL5= YES
USE_X11= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/atk/atkmm-1.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gdk/gdkmm-2.0.pc.in
PKGCONFIG_OVERRIDE+= ${WRKSRC}/glib/glibmm-2.0.pc.in
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index 6fc3437a695..4966ed4cffb 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/11 05:11:07 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= gtksourceview-0.7.0
@@ -19,7 +19,6 @@ USE_PERL5= build
USE_PKGLOCALEDIR= yes
USE_GNU_TOOLS+= make
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
CONFIGURE_ARGS= --disable-build-tests
diff --git a/x11/gtkstep/Makefile b/x11/gtkstep/Makefile
index ab8d9c70610..3b8e668a320 100644
--- a/x11/gtkstep/Makefile
+++ b/x11/gtkstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:56:32 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:56 jlam Exp $
DISTNAME= gtkstep-1.10
PKGREVISION= 3
@@ -13,7 +13,6 @@ COMMENT= GTK theme-engine to yield a NEXTSTEP(tm) look and feel
USE_BUILDLINK2= # defined
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
post-install:
${RM} -f ${PREFIX}/share/themes/Step/gtk/gtkrc.in
diff --git a/x11/gtoolkit/Makefile.common b/x11/gtoolkit/Makefile.common
index 18d2ca834ba..182ed44d75e 100644
--- a/x11/gtoolkit/Makefile.common
+++ b/x11/gtoolkit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= gtoolkit-0.9.5
@@ -14,5 +14,4 @@ USE_BUILDLINK2= YES
USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ARGS+= --with-gnustep
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 8aad118d901..a330cd202fc 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.69 2004/02/14 17:21:56 jlam Exp $
DISTNAME= lesstif-0.93.94
CATEGORIES= x11
@@ -15,8 +15,6 @@ USE_BUILDLINK2= YES
USE_X11BASE= YES
USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/test/libtool
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --disable-build-12
CONFIGURE_ARGS+= --disable-build-20
diff --git a/x11/lesstif12/Makefile.common b/x11/lesstif12/Makefile.common
index 518c3bdda84..85d7361a81d 100644
--- a/x11/lesstif12/Makefile.common
+++ b/x11/lesstif12/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/02/14 17:21:56 jlam Exp $
DISTNAME= lesstif-${LESSTIF_VERSION}
LESSTIF_VERSION= 0.93.0
@@ -16,8 +16,6 @@ HOMEPAGE= http://www.lesstif.org/
USE_X11BASE= # defined
USE_GNU_TOOLS+= make
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/test/libtool
AUTOMAKE_REQD= 1.4
GNU_CONFIGURE= # defined
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index bbfee6a65d8..521f1263fdb 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= libzvt-2.0.1
@@ -16,7 +16,6 @@ USE_BUILDLINK3= YES
USE_GNU_TOOLS+= make
USE_X11= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libzvt/libzvt-2.0.pc.in
.include "../../graphics/libart2/buildlink3.mk"
diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile
index 4b749bc56dc..9a774adb00a 100644
--- a/x11/mlterm/Makefile
+++ b/x11/mlterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:56 jlam Exp $
DISTNAME= mlterm-2.7.0
PKGREVISION= 2
@@ -17,9 +17,6 @@ USE_X11= yes
USE_LIBTOOL= yes
USE_GNU_TOOLS+= make
-LIBTOOL_OVERRIDE+= ${WRKSRC}/mkf/autoconf/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/autoconf/libtool
-LIBTOOL_OVERRIDE+= ${WRKSRC}/kiklib/autoconf/libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-imagelib=imlib
diff --git a/x11/mowitz/Makefile b/x11/mowitz/Makefile
index 8bd6ae644ae..c05c14d031c 100644
--- a/x11/mowitz/Makefile
+++ b/x11/mowitz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:56:37 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:56 jlam Exp $
DISTNAME= Mowitz-0.2.2
CATEGORIES= x11
@@ -10,7 +10,6 @@ COMMENT= "More widgets" library
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
GNU_CONFIGURE= yes
USE_X11= yes
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index ba5a0bc7729..18a3b44a2fb 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:56 jlam Exp $
DISTNAME= multi-gnome-terminal-1.6.1
PKGREVISION= 4
@@ -13,9 +13,7 @@ USE_BUILDLINK2= # defined
USE_X11BASE= # defined
USE_GNU_TOOLS+= make
GNU_CONFIGURE= # defined
-
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
CONFIGURE_ENV+= ac_cv_prog_JADE=no
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile
index b822993b6cf..47c009bf681 100644
--- a/x11/neXtaw/Makefile
+++ b/x11/neXtaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/10/05 10:08:39 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:56 jlam Exp $
DISTNAME= neXtaw-0.15.1
CATEGORIES= x11
@@ -11,9 +11,7 @@ COMMENT= NeXTstep-like widgets based on the Athena Widget set
USE_BUILDLINK2= # defined
USE_X11BASE= # defined
GNU_CONFIGURE= # defined
-
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
DOCDIR= ${PREFIX}/share/doc/${PKGBASE}
EGDIR= ${PREFIX}/share/examples/${PKGBASE}
diff --git a/x11/paragui/Makefile b/x11/paragui/Makefile
index 8bdf40953de..939194c354a 100644
--- a/x11/paragui/Makefile
+++ b/x11/paragui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/03 18:49:59 reed Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= paragui-1.0.4
@@ -13,7 +13,6 @@ COMMENT= Cross-platform high-level application framework and GUI library
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/src/physfs/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/paragui.pc.in
GNU_CONFIGURE= yes
PTHREAD_OPTS+= require native
diff --git a/x11/py-gnome2/Makefile b/x11/py-gnome2/Makefile
index 85fad364b39..9dca0213630 100644
--- a/x11/py-gnome2/Makefile
+++ b/x11/py-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/14 00:24:35 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= gnome-python-2.0.0
@@ -15,7 +15,6 @@ COMMENT= Python binding for GNOME2
PY_PATCHPLIST= YES
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gnome-python-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 1f8901960e3..ed002782249 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/23 21:50:52 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= pygtk-2.0.0
@@ -17,7 +17,6 @@ CONFLICTS= ${PYPKGPREFIX}-gtk<0.6.10
PY_PATCHPLIST= YES
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/pygtk-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile
index e0b065eff9d..f2b3d69c2e8 100644
--- a/x11/py-qt2-sip/Makefile
+++ b/x11/py-qt2-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:38:31 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= sip-3.1
@@ -13,9 +13,7 @@ COMMENT= Tool to create Python bindings for C++ libraries
USE_BUILDLINK2= # defined
USE_X11= # defined
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-HAS_CONFIGURE= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS= --with-python=${PYTHONBIN} \
--with-qt-dir=${QTDIR}
diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile
index 9c40b443022..37fcd678435 100644
--- a/x11/py-qt2/Makefile
+++ b/x11/py-qt2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:28:27 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= PyQt-3.1-Qt-2.3.1
@@ -14,9 +14,7 @@ WRKSRC= ${WRKDIR}/PyQt-3.1
USE_BUILDLINK2= # defined
USE_X11= # defined
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-HAVE_CONFIGURE= # defined
GNU_CONFIGURE= # defined
CONFIGURE_ARGS= --with-python=${PYTHONBIN} \
--with-qt-dir=${QTDIR}
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index b0b5185663d..80420dfff60 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= pygtk-0.6.9
@@ -16,7 +16,6 @@ CONFIGURE_ARGS+= --disable-numpy
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PY_PATCHPLIST= yes
USE_BUILDLINK2= yes
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index d402b588bb6..73a85895893 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/11 04:43:38 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:56 jlam Exp $
DISTNAME= startup-notification-0.5
CATEGORIES= x11 gnome
@@ -14,7 +14,6 @@ USE_BUILDLINK3= yes
USE_LIBTOOL= yes
USE_X11= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libstartup-notification-1.0.pc.in
post-install:
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index c3c2b642909..3f7b57479a2 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= vte-0.11.10
@@ -25,7 +25,6 @@ CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --disable-python
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/vte.pc.in
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/x11/xcursor/Makefile b/x11/xcursor/Makefile
index 8355c251df0..e5356c08278 100644
--- a/x11/xcursor/Makefile
+++ b/x11/xcursor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/16 08:51:42 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= libXcursor-1.1.1
@@ -17,7 +17,6 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/xcursor.pc.in
.include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index 88154967979..abe0d61205a 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2004/01/24 15:30:34 grant Exp $
+# $NetBSD: Makefile,v 1.41 2004/02/14 17:21:56 jlam Exp $
DISTNAME= xfce-3.8.18
PKGREVISION= 3
@@ -14,9 +14,7 @@ BUILD_USES_MSGFMT= yes
USE_BUILDLINK2= # defined
USE_X11BASE= # defined
USE_PKGLOCALEDIR= # defined
-
USE_LIBTOOL= # defined
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_GNU_TOOLS+= make
GNU_CONFIGURE= # defined
diff --git a/x11/xosd/Makefile.common b/x11/xosd/Makefile.common
index 6a32ab81942..3b0361a4447 100644
--- a/x11/xosd/Makefile.common
+++ b/x11/xosd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2004/02/03 17:56:54 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.9 2004/02/14 17:21:56 jlam Exp $
#
DISTNAME= xosd-2.2.5
@@ -16,8 +16,7 @@ USE_BUILDLINK2= yes
USE_LIBTOOL= yes
USE_X11= yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-SHLIBTOOL_OVERRIDE= ${WRKSRC}/libtool-disable-static
+SHLIBTOOL_OVERRIDE= libtool-disable-static
CONFIGURE_ARGS+= --disable-xinerama