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 --- devel/eet/Makefile | 4 ++-- devel/eet/buildlink3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'devel/eet') diff --git a/devel/eet/Makefile b/devel/eet/Makefile index 3ffb291f73d..ba0e65673aa 100644 --- a/devel/eet/Makefile +++ b/devel/eet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2010/01/18 09:58:44 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2010/12/23 11:44:26 dsainty Exp $ # DISTNAME= eet-1.2.3 @@ -22,6 +22,6 @@ PKGCONFIG_OVERRIDE= eet.pc.in .include "../../devel/eina/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk index 821e7b398cb..f9e71123b0c 100644 --- a/devel/eet/buildlink3.mk +++ b/devel/eet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:58:44 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:26 dsainty Exp $ BUILDLINK_TREE+= eet @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.eet?= ../../devel/eet .include "../../devel/eina/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .endif # EET_BUILDLINK3_MK -- cgit v1.2.3