From ada744dc0ade9830fd0c65e80d3c3acc4c19910b 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/fltk/Makefile      | 4 ++--
 x11/fltk/buildlink3.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'x11/fltk')

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 929ca9890e1..a88d1997370 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2010/06/13 22:45:36 wiz Exp $
+# $NetBSD: Makefile,v 1.73 2010/12/23 11:45:00 dsainty Exp $
 
 DISTNAME=	fltk-1.1.10-source
 PKGNAME=	${DISTNAME:S/-source//}
@@ -38,7 +38,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 .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 "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index 94f7265a085..c796637cd83 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2010/12/23 11:45:00 dsainty Exp $
 
 BUILDLINK_TREE+=	fltk
 
@@ -12,7 +12,7 @@ BUILDLINK_FILES.fltk+=		include/Fl/*
 
 .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 "../../mk/pthread.buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
-- 
cgit v1.2.3