From 12cb97aee5a221de0ef52d6d283b031e561dbc13 Mon Sep 17 00:00:00 2001 From: dsainty Date: Thu, 23 Dec 2010 11:44:24 +0000 Subject: Mechanically replace references to graphics/jpeg with the suitable alternative from mk/jpeg.buildlink3.mk This allows selection of an alternative jpeg library (namely the x86 MMX, SSE, SSE2 accelerated libjpeg-turbo) via JPEG_DEFAULT=libjpeg-turbo, and follows the current standard model for alternatives (fam, motif, fuse etc). The mechanical edits were applied via the following script: #!/bin/sh for d in */*; do [ -d "$d" ] || continue for i in "$d/"Makefile* "$d/"*.mk; do case "$i" in *.orig|*"*"*) continue;; esac out="$d/x" sed -e 's;graphics/jpeg/buildlink3\.mk;mk/jpeg.buildlink3.mk;g' \ -e 's;BUILDLINK_PREFIX\.jpeg;JPEGBASE;g' \ < "$i" > "$out" if cmp -s "$i" "$out"; then rm -f "$out" else echo "Edited $i" mv -f "$i" "$i.orig" && mv "$out" "$i" fi done done --- games/boson/Makefile | 4 ++-- games/flightgear/Makefile | 4 ++-- games/fltk-sudoku/Makefile | 4 ++-- games/freedroid/Makefile | 4 ++-- games/neverball/Makefile | 4 ++-- games/simgear/Makefile | 4 ++-- games/simgear/buildlink3.mk | 4 ++-- games/ufoai/Makefile | 4 ++-- games/xracer/Makefile | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) (limited to 'games') diff --git a/games/boson/Makefile b/games/boson/Makefile index 29903a291b3..0b7433fe2ef 100644 --- a/games/boson/Makefile +++ b/games/boson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2010/07/14 11:11:20 sbd Exp $ +# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:31 dsainty Exp $ # DISTNAME= boson-all-0.8 @@ -26,6 +26,6 @@ CONFIGURE_ARGS+= --disable-debug .include "../../devel/SDL/buildlink3.mk" .include "../../games/kdegames3/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lib3ds/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 42defae3a53..821696c66ca 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/11/15 22:57:00 abs Exp $ +# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:31 dsainty Exp $ DISTNAME= FlightGear-2.0.0 PKGNAME= ${DISTNAME:tl} @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-threads BUILDLINK_API_DEPENDS.simgear+= simgear>=2.0.0 .include "../../games/simgear/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/osg/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/fltk-sudoku/Makefile b/games/fltk-sudoku/Makefile index 778e4634d45..bbb61f94b5c 100644 --- a/games/fltk-sudoku/Makefile +++ b/games/fltk-sudoku/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:19 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:31 dsainty Exp $ DISTNAME= fltk-1.1.7-source PKGNAME= fltk-sudoku-1.1.7 @@ -55,7 +55,7 @@ do-install: BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/fltk/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile index 311e8543d42..eb2ce37c7d8 100644 --- a/games/freedroid/Makefile +++ b/games/freedroid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:19 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:31 dsainty Exp $ # DISTNAME= freedroid-1.0.2 @@ -20,6 +20,6 @@ GNU_CONFIGURE= yes #.include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/neverball/Makefile b/games/neverball/Makefile index 3bc0986d3ca..f60f7933fdb 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:22 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2010/12/23 11:44:31 dsainty Exp $ DISTNAME= neverball-1.5.4 PKGREVISION= 2 @@ -40,6 +40,6 @@ do-install: .include "../../devel/SDL/buildlink3.mk" .include "../../devel/SDL_ttf/buildlink3.mk" .include "../../devel/physfs/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/simgear/Makefile b/games/simgear/Makefile index 18008aec606..89683c30fe5 100644 --- a/games/simgear/Makefile +++ b/games/simgear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/11/15 22:57:06 abs Exp $ +# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:32 dsainty Exp $ DISTNAME= SimGear-2.0.0 PKGNAME= ${DISTNAME:tl} @@ -25,7 +25,7 @@ BUILDLINK_API_DEPENDS.plib+= plib>=1.8.4 .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../games/plib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/osg/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/simgear/buildlink3.mk b/games/simgear/buildlink3.mk index e01bad81859..b9660035172 100644 --- a/games/simgear/buildlink3.mk +++ b/games/simgear/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2010/08/27 06:11:50 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/12/23 11:44:32 dsainty Exp $ BUILDLINK_TREE+= simgear @@ -12,7 +12,7 @@ BUILDLINK_DEPMETHOD.simgear?= build .include "../../devel/zlib/buildlink3.mk" .include "../../games/plib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # SIMGEAR_BUILDLINK3_MK BUILDLINK_TREE+= -simgear diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index 26caf83ff95..b2d9ffc74e8 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:24 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:32 dsainty Exp $ DISTNAME= ufoai-2.2.1 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufoai/} @@ -36,7 +36,7 @@ post-install: ${TAR} -xf ${DISTDIR}/${DISTNAME}-data.tar -C ${DESTDIR}${PREFIX}/share/ufoai ${BZIP2} -d -c ${DISTDIR}/${DISTNAME}-mappack.tar.bz2 | ${TAR} -xf - -C ${DESTDIR}${PREFIX}/share/ufoai -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" diff --git a/games/xracer/Makefile b/games/xracer/Makefile index 320b458bcc1..4b401c2671b 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2010/08/21 16:34:53 seb Exp $ +# $NetBSD: Makefile,v 1.49 2010/12/23 11:44:32 dsainty Exp $ # DISTNAME= xracer-0.96.9 @@ -34,6 +34,6 @@ post-configure: do-makemaker-configure .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3