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

14 files changed, 28 insertions, 28 deletions

diff --git a/print/advi/Makefile b/print/advi/Makefile
index 4c8b5d836c5..332ef0956ae 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:14 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/12/23 11:44:54 dsainty Exp $
 
 DISTNAME=		advi-1.6.0
 PKGREVISION=		8
@@ -54,7 +54,7 @@ post-install:
 
 .include "../../lang/ocaml/buildlink3.mk"
 .include "../../graphics/camlimages/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/gdk-pixbuf/buildlink3.mk"
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 18e8d5651bf..dd3ba7aac0e 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2010/02/12 00:00:45 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2010/12/23 11:44:54 dsainty Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -35,7 +35,7 @@ REPLACE_PYTHON+=	lib/scripts/*.py lib/scripts/listerrors
 
 .include "../../lang/python/application.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 2d24a10a183..ac638ee3a75 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.171 2010/11/12 08:54:58 sbd Exp $
+# $NetBSD: Makefile,v 1.172 2010/12/23 11:44:54 dsainty Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -116,7 +116,7 @@ OWN_DIRS_PERMS+=	${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
 OWN_DIRS_PERMS+=	${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk
index f346594a4c5..c12ffe6a8fa 100644
--- a/print/ghostscript/options.mk
+++ b/print/ghostscript/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2009/11/01 23:57:29 gdt Exp $
+# $NetBSD: options.mk,v 1.11 2010/12/23 11:44:54 dsainty Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS=	x11 cups debug fontconfig
@@ -32,7 +32,7 @@ SUBST_FILES.cupsetc=	cups/cups.mak
 SUBST_SED.cupsetc=	-e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
 
 .include "../../print/cups/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--disable-cups
 .endif
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 80dcb3000f2..8f368fb7499 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/01/27 13:42:20 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/12/23 11:44:54 dsainty Exp $
 
 DISTNAME=	hpijs-2.1.4
 PKGREVISION=	2
@@ -28,5 +28,5 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/ppd/HP* ${DESTDIR}${PREFIX}/share/ppd/
 	${GZIP_CMD} ${DESTDIR}${PREFIX}/share/ppd/HP*.ppd
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/img2eps/Makefile b/print/img2eps/Makefile
index 4cbdb606521..2ad85dfdb16 100644
--- a/print/img2eps/Makefile
+++ b/print/img2eps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/12/23 11:44:55 dsainty Exp $
 #
 
 DISTNAME=	img2eps-0.2
@@ -17,7 +17,7 @@ TEST_TARGET=	check
 
 .include "options.mk"
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile
index 7df908de39e..9f2b81e87a7 100644
--- a/print/mupdf/Makefile
+++ b/print/mupdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/09/28 13:11:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:55 dsainty Exp $
 #
 
 DISTNAME=	mupdf-0.7
@@ -31,7 +31,7 @@ post-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbig2dec/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/openjpeg/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
diff --git a/print/podofo/Makefile b/print/podofo/Makefile
index b7ba0e8f570..7cbec76d58c 100644
--- a/print/podofo/Makefile
+++ b/print/podofo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/05 18:23:52 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/23 11:44:55 dsainty Exp $
 #
 
 DISTNAME=	podofo-0.7.0
@@ -27,7 +27,7 @@ CXXFLAGS+=	-fPIC
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/podofo/buildlink3.mk b/print/podofo/buildlink3.mk
index 6948699b7b7..7867de89075 100644
--- a/print/podofo/buildlink3.mk
+++ b/print/podofo/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:23 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/12/23 11:44:55 dsainty Exp $
 
 BUILDLINK_TREE+=	podofo
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.podofo?=	../../print/podofo
 BUILDLINK_DEPMETHOD.podofo?=	build
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .endif	# PODOFO_BUILDLINK3_MK
 
diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile
index 7982d759420..524d728b2c7 100644
--- a/print/poppler-glib/Makefile
+++ b/print/poppler-glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/11/15 22:58:23 abs Exp $
+# $NetBSD: Makefile,v 1.35 2010/12/23 11:44:55 dsainty Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -39,7 +39,7 @@ post-install:
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.poppler+=     poppler-${POPPLER_VERS}{,nb*}
 .include "../../print/poppler/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 3b612a5d855..48cd58d64aa 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2010/11/02 15:45:12 drochner Exp $
+# $NetBSD: Makefile,v 1.52 2010/12/23 11:44:55 dsainty Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
@@ -51,7 +51,7 @@ post-install:
 	${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE}
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk
index 54e4976bb65..1adb509bac3 100644
--- a/print/poppler/buildlink3.mk
+++ b/print/poppler/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/08/15 11:19:18 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:44:55 dsainty Exp $
 
 BUILDLINK_TREE+=	poppler
 
@@ -16,7 +16,7 @@ pkgbase := poppler
 .endif
 
 .include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # POPPLER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-poppler
diff --git a/print/scribus-qt4/Makefile b/print/scribus-qt4/Makefile
index c7df52ece1d..2db361884e9 100644
--- a/print/scribus-qt4/Makefile
+++ b/print/scribus-qt4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/12/13 11:49:42 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/12/23 11:44:56 dsainty Exp $
 
 DISTNAME=		scribus-1.3.9
 CATEGORIES=		print
@@ -36,7 +36,7 @@ post-install:
 .include "../../print/cups/buildlink3.mk"
 .include "../../print/podofo/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 8bff3d89a86..8f42a42239f 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2010/09/14 11:02:41 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2010/12/23 11:44:56 dsainty Exp $
 
 DISTNAME=		scribus-1.3.3.14
 PKGREVISION=		2
@@ -34,7 +34,7 @@ post-install:
 
 .include "../../print/cups/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"