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/gd/Makefile      | 4 ++--
 graphics/gd/buildlink3.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'graphics/gd')

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 5505987e6c0..fbe3c9e05a9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2010/06/23 03:02:37 dsainty Exp $
+# $NetBSD: Makefile,v 1.85 2010/12/23 11:44:37 dsainty Exp $
 
 DISTNAME=	gd-2.0.35
 PKGREVISION=	6
@@ -33,7 +33,7 @@ CONFIGURE_ENV+=		ac_cv_path_LIBPNG12_CONFIG=""
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 173230f74db..cff3e7bfa9e 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:44:37 dsainty Exp $
 
 BUILDLINK_TREE+=	gd
 
@@ -21,7 +21,7 @@ pkgbase := gd
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
-- 
cgit v1.2.3