From 8c7ca6a8c0860ebd3e39de2d607b75770e220d80 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 --- graphics/libwmf/Makefile | 4 ++-- graphics/libwmf/buildlink3.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'graphics/libwmf') diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index b7f53e88e17..11448098815 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2010/11/11 11:38:36 adam Exp $ +# $NetBSD: Makefile,v 1.67 2010/12/23 11:44:42 dsainty Exp $ DISTNAME= libwmf-0.2.8.4 PKGREVISION= 8 @@ -25,7 +25,7 @@ post-install: .include "options.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk index 7f2d8954bc6..08e1a1e55c6 100644 --- a/graphics/libwmf/buildlink3.mk +++ b/graphics/libwmf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2010/11/11 11:38:36 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/12/23 11:44:42 dsainty Exp $ BUILDLINK_TREE+= libwmf @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb7 BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -- cgit v1.2.3