From ada744dc0ade9830fd0c65e80d3c3acc4c19910b 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/simgear/Makefile | 4 ++-- games/simgear/buildlink3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'games/simgear') 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 -- cgit v1.2.3