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.

13 files changed, 16 insertions, 30 deletions

diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 48c95172155..55d67e20041 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/02/01 01:43:28 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:34 jlam Exp $
 
 DISTNAME=	gabber-0.8.8
 PKGREVISION=	3
@@ -14,7 +14,6 @@ USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GCC_REQD+=		2.95.3
 
diff --git a/chat/gaim-gtk1/Makefile.common b/chat/gaim-gtk1/Makefile.common
index 3095d63744d..04c779a5833 100644
--- a/chat/gaim-gtk1/Makefile.common
+++ b/chat/gaim-gtk1/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2004/01/22 07:49:20 grant Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=	gaim-0.59.8
@@ -22,9 +22,7 @@ DEPENDS+=	gnome1-dirs>=1.0:../../misc/gnome1-dirs
 USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_PKGLOCALEDIR=	YES
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-artsc
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 849ea569516..2a46ae73b61 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2004/01/27 01:24:51 recht Exp $
+# $NetBSD: Makefile,v 1.52 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=	gaim-0.75
@@ -23,8 +23,6 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--disable-nas
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-nss
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 9dd1db03ddb..9142fabc2ca 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/09 18:47:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=	gossip-0.7
@@ -22,7 +22,6 @@ USE_PKGLOCALEDIR=       yes
 GNU_CONFIGURE=		yes
 
 GCONF2_SCHEMAS=		gossip.schemas
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/chat/ickle/Makefile b/chat/ickle/Makefile
index 8216f356dba..5ac2cd4965e 100644
--- a/chat/ickle/Makefile
+++ b/chat/ickle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/13 13:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:34 jlam Exp $
 
 DISTNAME=	ickle-0.3.2
 PKGREVISION=	2
@@ -11,7 +11,6 @@ COMMENT=	Simplistic gtk+ icq client
 
 USE_BUILDLINK2= YES
 USE_LIBTOOL=    YES
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 GNU_CONFIGURE=  YES
 
 .include "../../chat/libicq2000/buildlink2.mk"
diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile
index eeb61816cde..8ac0eafbe3e 100644
--- a/chat/irssi-icb/Makefile
+++ b/chat/irssi-icb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:09:35 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=	irssi-icb-0.14
@@ -21,7 +21,7 @@ USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 
 USE_LIBTOOL=	yes
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE=	libtool
 
 CONFIGURE_ARGS+=	--with-irssi=${WRKDIR}/${IRSSI_DISTNAME}
 
diff --git a/chat/libicq2000/Makefile b/chat/libicq2000/Makefile
index c911c92f6b1..6b91e8cfeb4 100644
--- a/chat/libicq2000/Makefile
+++ b/chat/libicq2000/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:25:58 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=	libicq2000-0.3.2
@@ -12,7 +12,6 @@ COMMENT=	Library for icq 2000/2001 clients
 
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 
 .include "../../devel/libsigc++10/buildlink2.mk"
diff --git a/chat/libirc/Makefile b/chat/libirc/Makefile
index d3953df7574..097f52d615a 100644
--- a/chat/libirc/Makefile
+++ b/chat/libirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:25:59 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=		libirc-0.2
@@ -13,7 +13,6 @@ COMMENT=		libirc is a C-library for the IRC protocol
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../devel/glib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/libyahoo/Makefile b/chat/libyahoo/Makefile
index 85f690024a1..b9aa90e5ef2 100644
--- a/chat/libyahoo/Makefile
+++ b/chat/libyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/09/21 06:59:15 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:34 jlam Exp $
 
 DISTNAME=	libyahoo-0.18.4
 CATEGORIES=	chat
@@ -11,7 +11,6 @@ COMMENT=	Yahoo! Messenger client library
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 USE_LIBTOOL=		# defined
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/libyahoo-authors.h ${PREFIX}/include/libyahoo
diff --git a/chat/naim/Makefile b/chat/naim/Makefile
index 53a98e83957..b8dee60d439 100644
--- a/chat/naim/Makefile
+++ b/chat/naim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/13 22:15:32 snj Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=	naim-0.11.6.6
@@ -13,7 +13,6 @@ COMMENT=	Ncurses-based AIM, ICQ, IRC and Lily client
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_NCURSES=		# assertion "COLOR_PAIRS >= (COLORS*COLORS)" failed: file "./win.c", line 250, function "wsetup_colors"
 
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 0e08dd76b1b..796fe384bf9 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/22 07:49:21 grant Exp $
+# $NetBSD: Makefile,v 1.33 2004/02/14 17:21:34 jlam Exp $
 #
 
 DISTNAME=		${SILC_CLIENT_DISTNAME}
@@ -21,8 +21,7 @@ USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/irssi/libtool \
-			${WRKSRC}/lib/silcmath/mpi/libtool
+SHLIBTOOL_OVERRIDE=	libtool */libtool */*/*/libtool
 
 PKG_SYSCONFSUBDIR?=	silc
 
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 454fc3ff93d..06f20c9da4b 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/01/03 18:02:52 salo Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=		silc-server-0.9.16
@@ -18,7 +18,7 @@ USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool ${WRKSRC}/lib/silcmath/mpi/libtool
+SHLIBTOOL_OVERRIDE=	libtool */*/*/libtool
 
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
diff --git a/chat/xchat2/Makefile b/chat/xchat2/Makefile
index 4292eb82def..1aa6e5d4039 100644
--- a/chat/xchat2/Makefile
+++ b/chat/xchat2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/10 16:59:21 minskim Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=	xchat-2.0.7
@@ -22,8 +22,6 @@ USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--enable-textfe
 CONFIGURE_ARGS+=	--enable-tcl=no
 CONFIGURE_ARGS+=	--disable-perl