From c46da24c142eef5eab634a945d7e1d201115cb8b Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 14 Feb 2004 17:21:32 +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. --- games/asc/Makefile | 3 +-- games/boson/Makefile | 3 +-- games/dopewars/Makefile | 3 +-- games/freesci/Makefile | 3 +-- games/gnocatan/Makefile | 3 +-- games/gnome-games/Makefile | 3 +-- games/gnome2-games/Makefile | 3 +-- games/gturing/Makefile | 3 +-- games/sirius/Makefile | 4 +--- games/xscorch/Makefile | 4 +--- games/zoom/Makefile | 3 +-- 11 files changed, 11 insertions(+), 24 deletions(-) (limited to 'games') diff --git a/games/asc/Makefile b/games/asc/Makefile index 2edf9bd6e82..2c0224a4ee0 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/01/24 13:30:55 grant Exp $ +# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= asc-source-1.13.8.0 @@ -20,7 +20,6 @@ USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_GNU_TOOLS+= make -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes # ../weaponguide.cpp:1205: virtual memory exhausted diff --git a/games/boson/Makefile b/games/boson/Makefile index b7dd4fa5f97..5517a5097ef 100644 --- a/games/boson/Makefile +++ b/games/boson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:55 grant Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= boson-all-0.8 @@ -22,7 +22,6 @@ USE_GNU_TOOLS+= make USE_LIBTOOL= yes CONFIGURE_ARGS+= --disable-debug -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../audio/libvorbis/buildlink2.mk" .include "../../devel/SDL/buildlink2.mk" diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile index 78de5a7e585..fc72cab3caf 100644 --- a/games/dopewars/Makefile +++ b/games/dopewars/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/01/24 13:30:55 grant Exp $ +# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:40 jlam Exp $ DISTNAME= dopewars-1.5.9 PKGREVISION= 2 @@ -13,7 +13,6 @@ COMMENT= Make a fortune dealing drugs on the streets of New York USE_BUILDLINK2= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= YES USE_GNU_TOOLS+= make diff --git a/games/freesci/Makefile b/games/freesci/Makefile index 3d4638b16b0..1fd12274ba1 100644 --- a/games/freesci/Makefile +++ b/games/freesci/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/12/24 09:53:49 jmmv Exp $ +# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= freesci-0.3.4a @@ -12,7 +12,6 @@ COMMENT= Interpreter for Sierra On-Line's SCI games USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes post-install: diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile index 88bd7122cc0..4bb6bc4436c 100644 --- a/games/gnocatan/Makefile +++ b/games/gnocatan/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= gnocatan-0.8.0.0 @@ -14,7 +14,6 @@ GNU_CONFIGURE= YES USE_BUILDLINK2= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGLOCALEDIR= YES USE_X11= YES diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 1a8e46ce936..88ce0a9123c 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2004/01/24 13:30:56 grant Exp $ +# $NetBSD: Makefile,v 1.60 2004/02/14 17:21:40 jlam Exp $ DISTNAME= gnome-games-1.4.0.4 PKGREVISION= 9 @@ -26,7 +26,6 @@ USE_GNU_TOOLS+= make USE_X11BASE= YES USE_CONFIG_WRAPPER= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= YES CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index b4b01ceb32c..9ac3f779d2a 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2004/02/11 08:06:32 xtraeme Exp $ +# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:40 jlam Exp $ DISTNAME= gnome-games-2.4.2 PKGREVISION= 1 @@ -21,7 +21,6 @@ USE_X11= yes USE_CONFIG_WRAPPER= yes USE_LANGUAGES= c c++ USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool USE_PKGINSTALL= yes INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL diff --git a/games/gturing/Makefile b/games/gturing/Makefile index 2cd50db4246..c1ac6408e87 100644 --- a/games/gturing/Makefile +++ b/games/gturing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= gturing-0.1.1 @@ -19,7 +19,6 @@ USE_PKGLOCALEDIR= YES USE_X11= YES USE_GNU_TOOLS+= make USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool .include "../../textproc/scrollkeeper/omf.mk" .include "../../devel/gettext-lib/buildlink2.mk" diff --git a/games/sirius/Makefile b/games/sirius/Makefile index 9fbcfbe4825..1eef72c262c 100644 --- a/games/sirius/Makefile +++ b/games/sirius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/02/09 18:47:37 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= sirius-0.7.0 @@ -20,8 +20,6 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_X11= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - .include "../../devel/GConf2/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile index f0a2a8a9887..88a18586788 100644 --- a/games/xscorch/Makefile +++ b/games/xscorch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/07/17 21:39:45 grant Exp $ +# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= xscorch-0.1.15 @@ -14,8 +14,6 @@ USE_BUILDLINK2= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - CONFIGURE_ARGS+= --without-gnome .include "../../audio/libmikmod/buildlink2.mk" diff --git a/games/zoom/Makefile b/games/zoom/Makefile index 86e3568fd66..7812d2a0dfe 100644 --- a/games/zoom/Makefile +++ b/games/zoom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/01 01:43:29 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:40 jlam Exp $ # DISTNAME= zoom-1.0.1 @@ -17,7 +17,6 @@ COMMENT= Plays Infocom-compatible games, with graphics support USE_BUILDLINK2= yes USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool GNU_CONFIGURE= yes USE_X11= yes USE_GNU_TOOLS+= make -- cgit v1.2.3