From 8c7ca6a8c0860ebd3e39de2d607b75770e220d80 Mon Sep 17 00:00:00 2001
From: dsainty <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/vigra/Makefile      | 4 ++--
 graphics/vigra/buildlink3.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'graphics/vigra')

diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 16e83cd7389..d758e201f8a 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/10/16 15:50:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:46 dsainty Exp $
 #
 
 DISTNAME=	vigra-1.7.0-src
@@ -26,7 +26,7 @@ INSTALL_MAKE_FLAGS+=	libdir=${DESTDIR}${PREFIX}/lib
 .include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/vigra/buildlink3.mk b/graphics/vigra/buildlink3.mk
index bf77e3e6dff..0718d8c9dee 100644
--- a/graphics/vigra/buildlink3.mk
+++ b/graphics/vigra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2010/10/19 09:13:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/12/23 11:44:46 dsainty Exp $
 
 BUILDLINK_TREE+=	vigra
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.vigra+=	vigra>=1.7.0
 BUILDLINK_PKGSRCDIR.vigra?=	../../graphics/vigra
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .endif	# VIGRA_BUILDLINK3_MK
-- 
cgit v1.2.3