From 4ff5f6ae062a1143c9d2a08f5e33e22d43752ad6 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 16 Jul 2005 01:19:06 +0000 Subject: Get rid of USE_PERL5. The new way to express needing the Perl executable around at either build-time or at run-time is: USE_TOOLS+= perl # build-time USE_TOOLS+= perl:run # run-time Also remove some places where perl5/buildlink3.mk was being included by a package Makefile, but all that the package wanted was the Perl executable. --- graphics/cdlabelgen/Makefile | 4 ++-- graphics/fly/Makefile | 5 ++--- graphics/get_ds7/Makefile | 4 ++-- graphics/gnome-icon-theme/Makefile | 6 ++---- graphics/gri/Makefile | 5 ++--- graphics/gtkglext/Makefile | 5 ++--- graphics/magicpoint/Makefile | 4 ++-- graphics/p5-Image-Imlib2/Makefile | 4 +--- graphics/p5-PerlMagick/Makefile | 3 +-- 9 files changed, 16 insertions(+), 24 deletions(-) (limited to 'graphics') diff --git a/graphics/cdlabelgen/Makefile b/graphics/cdlabelgen/Makefile index 40b31865e9b..32e51c81547 100644 --- a/graphics/cdlabelgen/Makefile +++ b/graphics/cdlabelgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:01 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:10 jlam Exp $ DISTNAME= cdlabelgen-2.7.0 CATEGORIES= graphics @@ -9,7 +9,7 @@ MAINTAINER= cube@NetBSD.org HOMEPAGE= http://www.aczone.com/tools/cdinsert/ COMMENT= Generate frontcards and traycards for CDs -USE_PERL5= run +USE_TOOLS+= perl:run USE_LANGUAGES= # empty MAKE_ENV+= SED="${SED}" diff --git a/graphics/fly/Makefile b/graphics/fly/Makefile index b0526881abf..a327b6955b1 100644 --- a/graphics/fly/Makefile +++ b/graphics/fly/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/06/16 06:57:57 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:10 jlam Exp $ DISTNAME= fly-1.6.5 PKGREVISION= 6 @@ -11,8 +11,7 @@ COMMENT= Command-file interface for creating and modifying PNG images BUILD_DEPENDS+= gif2png>=2.4.2:../../graphics/gif2png -USE_PERL5= YES - +USE_TOOLS+= perl:run REPLACE_PERL= examples/cgi-perl-example.pl \ examples/fly-tester.pl \ examples/size.pl \ diff --git a/graphics/get_ds7/Makefile b/graphics/get_ds7/Makefile index 73526449fd6..283af75705d 100644 --- a/graphics/get_ds7/Makefile +++ b/graphics/get_ds7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:57 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:10 jlam Exp $ # DISTNAME= get_ds7_1.2.4 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.yk.rim.or.jp/~mamo/Computer/DS-7/index-e.html COMMENT= Read pictures from a FUJIFILM DS-7(DS series) digital camera -USE_PERL5= # defined +USE_TOOLS+= perl WRKSRC= ${WRKDIR}/ds-7_1.2.4 DECOMPRESS_CMD= ${CAT} diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile index 7be88adfb96..cac02000f33 100644 --- a/graphics/gnome-icon-theme/Makefile +++ b/graphics/gnome-icon-theme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:05 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:11 jlam Exp $ # DISTNAME= gnome-icon-theme-2.10.1 @@ -14,8 +14,7 @@ BUILD_USES_MSGFMT= yes GNU_CONFIGURE= yes USE_DIRS+= xdg-1.1 -USE_TOOLS+= gmake -USE_PERL5= build +USE_TOOLS+= gmake perl USE_PKGLOCALEDIR= yes PKGCONFIG_OVERRIDE= gnome-icon-theme.pc.in @@ -24,6 +23,5 @@ BUILDLINK_DEPENDS.hicolor-icon-theme= hicolor-icon-theme>=0.5 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../lang/perl5/buildlink3.mk" .include "../../textproc/intltool/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile index a8859c16731..165717bb137 100644 --- a/graphics/gri/Makefile +++ b/graphics/gri/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:11 jlam Exp $ DISTNAME= gri-2.12.5 PKGREVISION= 1 @@ -13,8 +13,7 @@ COMMENT= Language for scientific graphics applications BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick GNU_CONFIGURE= yes -USE_TOOLS+= gmake -USE_PERL5= build +USE_TOOLS+= gmake perl REPLACE_PERL= gri_merge gri_unpage USE_MAKEINFO= yes diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile index 0a8745f81a4..79c77e14297 100644 --- a/graphics/gtkglext/Makefile +++ b/graphics/gtkglext/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:11 jlam Exp $ DISTNAME= gtkglext-1.0.6 CATEGORIES= graphics @@ -10,9 +10,8 @@ HOMEPAGE= http://gtkglext.sourceforge.net/ COMMENT= OpenGL extension to GTK GNU_CONFIGURE= yes -USE_TOOLS+= gmake +USE_TOOLS+= gmake perl USE_LIBTOOL= yes -USE_PERL5= build PKGCONFIG_OVERRIDE= gdkglext.pc.in PKGCONFIG_OVERRIDE+= gtkglext.pc.in diff --git a/graphics/magicpoint/Makefile b/graphics/magicpoint/Makefile index b3a987800a0..699037c40d2 100644 --- a/graphics/magicpoint/Makefile +++ b/graphics/magicpoint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/06/17 16:27:58 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2005/07/16 01:19:11 jlam Exp $ DISTNAME= magicpoint-1.10a PKGREVISION= 7 @@ -15,7 +15,7 @@ CONFLICTS= mgp-[0-9]* GNU_CONFIGURE= yes USE_IMAKE= yes -USE_PERL5= build +USE_TOOLS+= perl PKG_OPTIONS_VAR= PKG_OPTIONS.magicpoint PKG_SUPPORTED_OPTIONS= freetype vflib xft2 diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile index 1acddbd34b8..8334a507e9d 100644 --- a/graphics/p5-Image-Imlib2/Makefile +++ b/graphics/p5-Image-Imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/07/13 18:01:31 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:11 jlam Exp $ # DISTNAME= Image-Imlib2-1.04 @@ -11,8 +11,6 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Image-Imlib2/ COMMENT= Interface to the Imlib2 image library -USE_PERL5= run - # versions before that contained a broken imlib2-config BUILDLINK_DEPENDS.imlib2+= imlib2>=1.2.0nb2 diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index c2703a000da..b28f44f3a97 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/07/13 18:01:31 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/07/16 01:19:11 jlam Exp $ .include "../../graphics/ImageMagick/Makefile.common" @@ -18,7 +18,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= YES -USE_PERL5= run PERL5_CONFIGURE= NO PERL5_PACKLIST= auto/Image/Magick/.packlist -- cgit v1.2.3