LIBTOOL_OVERRIDE generally doesn't need to be specified anymore... just

set OVERRIDE_DIRDEPTH to find any libtool scripts deeper in the WRKSRC
tree unless they're named something other than "libtool".

SHLIBTOOL_OVERRIDE generally doesn't need to be specified either -- just
define it to the empty list and shlibtool-override will look for libtool
scripts.

6 files changed, 11 insertions, 12 deletions

diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 433f3147afe..c14c68d8a88 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2006/06/16 14:16:54 joerg Exp $
+# $NetBSD: Makefile,v 1.50 2006/07/07 15:49:32 jlam Exp $
 #
 
 DISTNAME=	giram-0.3.5
@@ -22,7 +22,7 @@ PKG_SYSCONFSUBDIR=	giram
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}/0.3
 
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 BUILDLINK_TRANSFORM+=	rm:-DGTK_DISABLE_DEPRECATED
 
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index a47486c3dbf..7f14c561575 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/06/20 23:44:01 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:32 jlam Exp $
 #
 
 DISTNAME=	gwenview-1.3.1
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	YES
 # Enable kipi (KDE Image Plugin Interface)
 CONFIGURE_ARGS+=	--enable-kipi
 
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/libkipi/buildlink3.mk"
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 2d43a93a5aa..187da8d9713 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/06/20 20:43:08 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:32 jlam Exp $
 
 DISTNAME=	kipi-plugins-0.1.0-rc1
 PKGNAME=	kipi-plugins-0.1.0rc1
@@ -19,7 +19,7 @@ USE_TOOLS+=		gmake pkg-config msgfmt
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
diff --git a/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index 3789b86910d..228ac48aed7 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/11 21:46:46 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $
 
 DISTNAME=	libkexif-0.2.2
 PKGREVISION=	3
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake pkg-config msgfmt
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index f143b54b39b..3562882f211 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/11 14:30:09 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:32 jlam Exp $
 
 DISTNAME=	libkipi-0.1.2
 PKGREVISION=	3
@@ -15,7 +15,7 @@ USE_TOOLS+=		gmake msgfmt
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/graphics/vp/Makefile b/graphics/vp/Makefile
index f5d5943cb7b..c0f0d658583 100644
--- a/graphics/vp/Makefile
+++ b/graphics/vp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/06/12 16:28:11 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:32 jlam Exp $
 #
 
 DISTNAME=		vp-1.5
@@ -11,7 +11,6 @@ HOMEPAGE=		http://math.smsu.edu/~erik/software.php?id=63
 COMMENT=		Image viewer
 
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 
 .include "../../devel/SDL/buildlink3.mk"