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

8 files changed, 16 insertions, 16 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index 5dc2f220f0c..14ec5129062 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2010/11/15 22:58:49 abs Exp $
+# $NetBSD: Makefile,v 1.61 2010/12/23 11:44:58 dsainty Exp $
 
 DISTNAME=	amaya-fullsrc-10.0.1
 PKGNAME=	${DISTNAME:S/-fullsrc//}
@@ -126,7 +126,7 @@ EXTRACT_ELEMENTS+=	libwww
 CONFIGURE_ARGS+=	--without-graphic-libs	# Use pkgsrc libraries
 # link correctly with pkgsrc zlib (XXX: is this needed or correct?)
 LIBS+=			${COMPILER_RPATH_FLAG}${PREFIX}/lib
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 8c9a3d05cb6..45af90d4af3 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2010/12/23 11:44:58 dsainty Exp $
 #
 
 DISTNAME=	chimera-2.0a19
@@ -26,7 +26,7 @@ post-install:
 	cd ${WRKSRC}/doc && ${INSTALL_DATA}			\
 	    HINTS INFO LICENSE ${DESTDIR}${PREFIX}/share/doc/chimera
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 0cbf491b9c4..3604c75e58a 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:32 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/12/23 11:44:58 dsainty Exp $
 
 DISTNAME=	dillo-2.2
 PKGREVISION=	1
@@ -39,7 +39,7 @@ post-install:
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/fltk2/buildlink3.mk"
 
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index db24d6faa79..6093f29f03a 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:33 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/12/23 11:44:58 dsainty Exp $
 
 # This section contains variables that might be overridden.
 PKGNAME?=	${PKGNAME_BASE}
@@ -35,6 +35,6 @@ INSTALL_MAKE_FLAGS+=	datadir=${DESTDIR}${PREFIX}/share
 INSTALL_MAKE_FLAGS+=	mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile
index 0651abf4f42..d62959ead33 100644
--- a/www/mMosaic/Makefile
+++ b/www/mMosaic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:34 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2010/12/23 11:44:59 dsainty Exp $
 #
 
 DISTNAME=	mMosaic-3.7.2
@@ -22,7 +22,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${DESTDIR}${PREFIX}/bin/
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 
diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile
index 09cd6641824..76b541f7803 100644
--- a/www/swiggle/Makefile
+++ b/www/swiggle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:32 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:59 dsainty Exp $
 
 DISTNAME=	swiggle-0.4
 PKGREVISION=	2
@@ -23,7 +23,7 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/swiggle ${DESTDIR}${PREFIX}/bin/
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 9875745ea72..90ca2ec0a20 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/12/17 07:36:10 obache Exp $
+# $NetBSD: Makefile,v 1.31 2010/12/23 11:44:59 dsainty Exp $
 
 DISTNAME=	webkit-1.2.5
 PKGNAME=	${DISTNAME:S/webkit/webkit-gtk/}
@@ -41,7 +41,7 @@ REPLACE_PERL+=	JavaScriptCore/pcre/dftables \
 #.include "../../devel/pango/buildlink3.mk"
 # A correct Webkit build requires flex 2.5.33
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk
index c0a72d8f244..e0e9ec7cb45 100644
--- a/www/webkit-gtk/buildlink3.mk
+++ b/www/webkit-gtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/12/17 07:36:10 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:59 dsainty Exp $
 
 BUILDLINK_TREE+=	webkit-gtk
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.webkit-gtk?=	../../www/webkit-gtk
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"