From c83f002c609b793986a4857b9309624cf43a08e3 Mon Sep 17 00:00:00 2001
From: dsainty <dsainty@pkgsrc.org>
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
---
 x11/wxGTK28/Makefile.common | 4 ++--
 x11/wxGTK28/buildlink3.mk   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'x11/wxGTK28')

diff --git a/x11/wxGTK28/Makefile.common b/x11/wxGTK28/Makefile.common
index 9eeebe6797d..7a3f60db993 100644
--- a/x11/wxGTK28/Makefile.common
+++ b/x11/wxGTK28/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2010/06/15 13:15:15 dsainty Exp $
+# $NetBSD: Makefile.common,v 1.7 2010/12/23 11:45:03 dsainty Exp $
 #
 # used by x11/wxGTK28/Makefile
 
@@ -62,7 +62,7 @@ pre-configure:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk
index b28dad70f87..3cbfdab9465 100644
--- a/x11/wxGTK28/buildlink3.mk
+++ b/x11/wxGTK28/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/11/15 22:59:14 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/12/23 11:45:03 dsainty Exp $
 
 BUILDLINK_TREE+=	wxGTK28
 
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.wxGTK28?=	../../x11/wxGTK28
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-- 
cgit v1.2.3