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

16 files changed, 32 insertions, 32 deletions

diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index 4a375f772ed..ec175d9951b 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:50 dsainty Exp $
 #
 
 DISTNAME=	ffmpegthumbnailer-1.5.3
@@ -19,7 +19,7 @@ USE_LANGUAGES=	c c++
 
 PKGCONFIG_OVERRIDE+=	libffmpegthumbnailer.pc.in
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 9b50470b9e4..8e1e9cb8645 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/12/01 11:00:11 obache Exp $
+# $NetBSD: Makefile,v 1.31 2010/12/23 11:44:50 dsainty Exp $
 #
 
 DISTNAME=		gnash-${VER}
@@ -43,7 +43,7 @@ BUILDLINK_TRANSFORM+=	rm:-fvisibility-inlines-hidden
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile
index f7a99d5fad6..ee7eb928231 100644
--- a/multimedia/gpac/Makefile
+++ b/multimedia/gpac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:05 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/12/23 11:44:50 dsainty Exp $
 #
 
 DISTNAME=	gpac-0.4.5
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--disable-wx
 .include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 # doesn't work yet
 #.include "../../lang/spidermonkey/buildlink3.mk"
diff --git a/multimedia/kmplayer-kde3/Makefile b/multimedia/kmplayer-kde3/Makefile
index 1d6788c1ec8..870ff93b42f 100644
--- a/multimedia/kmplayer-kde3/Makefile
+++ b/multimedia/kmplayer-kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/09/14 11:02:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/23 11:44:50 dsainty Exp $
 #
 
 DISTNAME=	kmplayer-0.10.0c
@@ -35,7 +35,7 @@ SUBST_SED.desktop=	-e 's|@PREFIX@|${PREFIX}|g'
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile
index 06dea2f51b9..1c5f22bad4d 100644
--- a/multimedia/libflash/Makefile
+++ b/multimedia/libflash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/02/11 20:01:50 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:51 dsainty Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -17,5 +17,5 @@ MAKE_ENV+=	LIBSTDCPP=-lstdc++
 INSTALLATION_DIRS+=	lib
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk
index 141b6c9f5ab..f00960ac8a8 100644
--- a/multimedia/libflash/buildlink3.mk
+++ b/multimedia/libflash/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2010/12/23 11:44:51 dsainty Exp $
 
 BUILDLINK_TREE+=	libflash
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libflash+=	libflash>=0.4.10nb8
 BUILDLINK_PKGSRCDIR.libflash?=	../../multimedia/libflash
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # LIBFLASH_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libflash
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 80e232eba21..ce9d53daf04 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:05 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/12/23 11:44:51 dsainty Exp $
 
 DISTNAME=	mjpegtools-1.9.0
 PKGREVISION=	3
@@ -42,7 +42,7 @@ BUILDLINK_TRANSFORM+=	rm:-laudio
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 #
 # GTK+ support is disabled to avoid a dependency on GTK+ when building GNOME2.
diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk
index ea99326420d..de9dde888b1 100644
--- a/multimedia/mjpegtools/buildlink3.mk
+++ b/multimedia/mjpegtools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:17 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2010/12/23 11:44:51 dsainty Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.mjpegtools?=	../../multimedia/mjpegtools
 
 .include "../../audio/lame/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 
 pkgbase := mjpegtools
 .include "../../mk/pkg-build-options.mk"
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index efbc153c218..2f3fd20fea3 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:51 dsainty Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
@@ -40,5 +40,5 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk
index d50d41f2445..9f1a2818792 100644
--- a/multimedia/mplayer-share/options.mk
+++ b/multimedia/mplayer-share/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.42 2010/12/17 19:05:35 shattered Exp $
+# $NetBSD: options.mk,v 1.43 2010/12/23 11:44:51 dsainty Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -205,7 +205,7 @@ CONFIGURE_ARGS+=	--disable-gif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
 CONFIGURE_ARGS+=	--enable-jpeg
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-jpeg
 .endif
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 3c938f2f4ec..e69bdb12490 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/12/23 11:44:51 dsainty Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	5
@@ -42,7 +42,7 @@ MESSAGE_SUBST+=		PKGBASE=${PKGBASE}
 .include "../../audio/liba52/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index a8393b0e2f0..de4428f5836 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/02/11 20:08:00 joerg Exp $
+# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:52 dsainty Exp $
 #
 
 DISTNAME=		${PKGNAME_NOREV}-src
@@ -40,5 +40,5 @@ pre-configure:
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk
index d82c4b23073..c49279241f4 100644
--- a/multimedia/openquicktime/buildlink3.mk
+++ b/multimedia/openquicktime/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2010/12/23 11:44:52 dsainty Exp $
 
 BUILDLINK_TREE+=	openquicktime
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.openquicktime?=	../../multimedia/openquicktime
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # OPENQUICKTIME_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-openquicktime
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index ca3170d3f47..7e0836ab108 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2010/11/14 14:05:58 obache Exp $
+# $NetBSD: Makefile,v 1.67 2010/12/23 11:44:52 dsainty Exp $
 
 DISTNAME=	transcode-1.1.5
 PKGREVISION=	6
@@ -46,7 +46,7 @@ PLIST_VARS+=	i386
 .include "../../audio/libvorbis/buildlink3.mk"
 .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 "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../multimedia/libdvdread/buildlink3.mk"
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index ae90df3e0ab..2c4b328cccd 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2010/11/15 22:58:09 abs Exp $
+# $NetBSD: Makefile,v 1.100 2010/12/23 11:44:52 dsainty Exp $
 #
 
 DISTNAME=		vlc-${VLC_VERSION}
@@ -133,7 +133,7 @@ CHECK_WRKREF_SKIP=	lib/libvlccore.a \
 .include "../../audio/libcddb/buildlink3.mk"
 .include "../../misc/libcdio/buildlink3.mk"
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/liblive/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/libebml/buildlink3.mk"
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index 6241175f267..7a4ac52f43a 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:18 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2010/12/23 11:44:52 dsainty Exp $
 #
 
 DISTNAME=	xawtv-3.95
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=	--enable-mmx
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/Xaw3d/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"