LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs

relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.

51 files changed, 55 insertions, 123 deletions

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