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
---
 math/R/Makefile            | 4 ++--
 math/grace/Makefile        | 4 ++--
 math/octave-forge/Makefile | 4 ++--
 math/xldlas/Makefile       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'math')

diff --git a/math/R/Makefile b/math/R/Makefile
index 1dfc59764b8..a88eaffa7e7 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2010/09/14 11:02:21 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2010/12/23 11:44:48 dsainty Exp $
 
 DISTNAME=		R-2.11.1
 PKGREVISION=		1
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=	--enable-mbcs=no
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/blas/buildlink3.mk"
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 93a755aa4e5..b500f6238d2 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2010/07/30 10:36:29 asau Exp $
+# $NetBSD: Makefile,v 1.49 2010/12/23 11:44:48 dsainty Exp $
 #
 
 DISTNAME=	grace-5.1.22
@@ -33,7 +33,7 @@ post-install:
 
 .include "../../devel/netcdf/buildlink3.mk"
 .include "../../fonts/t1lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/fftw2/buildlink3.mk"
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 4eb0c6dea31..12df29ca338 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2010/07/30 10:36:30 asau Exp $
+# $NetBSD: Makefile,v 1.32 2010/12/23 11:44:49 dsainty Exp $
 
 DISTNAME=	octave-forge-2006.03.17
 PKGREVISION=	6
@@ -46,7 +46,7 @@ post-patch:
 	${MKDIR} ${WRKSRC}/extra/pdb/scripts
 	${MV} ${WRKSRC}/extra/pdb/bin/rasmol.sh ${WRKSRC}/extra/pdb/scripts/rasmol.sh
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
 .include "../../math/octave/buildlink3.mk"
diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile
index ae445307094..288e0d913bf 100644
--- a/math/xldlas/Makefile
+++ b/math/xldlas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:59:13 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/12/23 11:44:49 dsainty Exp $
 
 DISTNAME=		xldlas-0.85
 PKGREVISION=		7
@@ -22,7 +22,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xldlas
 	${CP} -R ${WRKSRC}/help ${DESTDIR}${PREFIX}/share/xldlas
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
-- 
cgit v1.2.3