From 22df0af21bc54c78d773ba28c810760d4eeb4073 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 14 Feb 2004 17:21:49 +0000
Subject: 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.

---
 wm/matchbox/Makefile    | 3 +--
 wm/metacity/Makefile    | 3 +--
 wm/openbox/Makefile     | 3 +--
 wm/whiteBOX/Makefile    | 4 +---
 wm/windowmaker/Makefile | 3 +--
 5 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'wm')

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} \
-- 
cgit v1.2.3