From 12cb97aee5a221de0ef52d6d283b031e561dbc13 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
---
 emulators/wine-devel/buildlink3.mk | 4 ++--
 emulators/wine-devel/options.mk    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'emulators/wine-devel')

diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk
index 21c4b68e1ed..d3d2f5c8e53 100644
--- a/emulators/wine-devel/buildlink3.mk
+++ b/emulators/wine-devel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:58:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2010/12/23 11:44:30 dsainty Exp $
 
 BUILDLINK_TREE+=	wine
 
@@ -17,7 +17,7 @@ pkgbase:= wine
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .endif
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .endif # WINE_BUILDLINK3_MK
 
diff --git a/emulators/wine-devel/options.mk b/emulators/wine-devel/options.mk
index 8f834e21292..7fda6f74a31 100644
--- a/emulators/wine-devel/options.mk
+++ b/emulators/wine-devel/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/12/07 15:32:06 jmcneill Exp $
+# $NetBSD: options.mk,v 1.3 2010/12/23 11:44:30 dsainty Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	cups opengl sane esound ldap dbus hal ssl x11
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --without-cups
 PLIST.x11=		yes
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-- 
cgit v1.2.3