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

94 files changed, 193 insertions, 193 deletions

diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index 8b1fd059e37..0c588391a17 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:26 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:32 dsainty Exp $
 #
 
 DISTNAME=	GraphicsMagick-1.3.12
@@ -38,7 +38,7 @@ FIND_PREFIX:=	URW_FONTS_DIR=urw-fonts
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk
index cd063efac96..14029fa464f 100644
--- a/graphics/GraphicsMagick/buildlink3.mk
+++ b/graphics/GraphicsMagick/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:32 dsainty Exp $
 
 BUILDLINK_TREE+=	GraphicsMagick
 
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.GraphicsMagick?=	../../graphics/GraphicsMagick
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
diff --git a/graphics/OpenRM/Makefile b/graphics/OpenRM/Makefile
index 737d75d9b75..bd0b996d513 100644
--- a/graphics/OpenRM/Makefile
+++ b/graphics/OpenRM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/12/23 11:44:33 dsainty Exp $
 #
 
 DISTNAME=		openrm-devel-1.5.2
@@ -45,7 +45,7 @@ do-install:
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk
index d74332916cb..9b63add2286 100644
--- a/graphics/OpenRM/buildlink3.mk
+++ b/graphics/OpenRM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:58:55 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:44:33 dsainty Exp $
 
 BUILDLINK_TREE+=	OpenRM
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.OpenRM?=	../../graphics/OpenRM
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .endif # OPENRM_BUILDLINK3_MK
diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile
index 124741d4e5b..60c6a940215 100644
--- a/graphics/SDL_image/Makefile
+++ b/graphics/SDL_image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:26 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/12/23 11:44:33 dsainty Exp $
 
 DISTNAME=	SDL_image-1.2.10
 PKGREVISION=	2
@@ -28,7 +28,7 @@ post-install:
 
 BUILDLINK_API_DEPENDS.SDL+=	SDL>=1.2.10
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk
index 355bf176fb9..b43a37c76ad 100644
--- a/graphics/SDL_image/buildlink3.mk
+++ b/graphics/SDL_image/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:44:33 dsainty Exp $
 
 BUILDLINK_TREE+=	SDL_image
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.SDL_image?=	../../graphics/SDL_image
 BUILDLINK_INCDIRS.SDL_image?=	include/SDL
 
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .endif # SDL_IMAGE_BUILDLINK3_MK
diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile
index 649b2e6b116..c4e24728c3a 100644
--- a/graphics/TiffIO/Makefile
+++ b/graphics/TiffIO/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:26 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:33 dsainty Exp $
 #
 
 DISTNAME=		TiffIO-120e
@@ -21,7 +21,7 @@ PKGSRC_MAKE_ENV+=	QTDIR=${QTDIR:Q} RPM_BUILD_ROOT=${DESTDIR}
 
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.tiff+=	tiff>=3.8.1
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
@@ -29,7 +29,7 @@ BUILDLINK_API_DEPENDS.tiff+=	tiff>=3.8.1
 do-configure:
 	cd ${WRKSRC} && ${SETENV} QTDIR=${QTDIR:Q} ${QTDIR}/bin/qmake \
 		CONFIG+=libtiff \
-		JPEG=${BUILDLINK_PREFIX.jpeg}/include \
+		JPEG=${JPEGBASE}/include \
 		TIFF_ROOT=${BUILDLINK_PREFIX.tiff} \
 		ZLIB=${BUILDLINK_PREFIX.zlib} TiffIO.pro
 
diff --git a/graphics/autopano-sift-C/Makefile b/graphics/autopano-sift-C/Makefile
index f3a660c00d6..a779dd2219e 100644
--- a/graphics/autopano-sift-C/Makefile
+++ b/graphics/autopano-sift-C/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/09/15 10:27:51 adam Exp $
+# $NetBSD: Makefile,v 1.8 2010/12/23 11:44:33 dsainty Exp $
 
 DISTNAME=	autopano-sift-C-2.5.1
 PKGREVISION=	3
@@ -21,7 +21,7 @@ USE_LIBTOOL=		yes
 post-extract:
 	rm ${WRKSRC}/CMakeModules/FindPNG.cmake
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libpano13/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/bktr2jpeg/Makefile b/graphics/bktr2jpeg/Makefile
index 01233f55312..8b53eba78c0 100644
--- a/graphics/bktr2jpeg/Makefile
+++ b/graphics/bktr2jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/01/18 09:58:56 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2010/12/23 11:44:33 dsainty Exp $
 #
 
 DISTNAME=	bktr2jpeg-1.0
@@ -19,5 +19,5 @@ INSTALL_MAKE_FLAGS=	PREFIX=${DESTDIR}${PREFIX}
 
 INSTALLATION_DIRS=	bin
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cambevao/Makefile b/graphics/cambevao/Makefile
index 0a47220d810..bc315abc6ab 100644
--- a/graphics/cambevao/Makefile
+++ b/graphics/cambevao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/09/12 19:06:42 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/12/23 11:44:34 dsainty Exp $
 #
 
 DISTNAME=		cambevao-2.2
@@ -31,6 +31,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/cambevao.xml ${DESTDIR}${PREFIX}/share/examples/cambevao
 	${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cambevao.README
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 0ae5c4ff4b6..211899e29e5 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:27 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/12/23 11:44:34 dsainty Exp $
 
 DISTNAME=		camlimages-2.2.0
 PKGREVISION=		9
@@ -38,7 +38,7 @@ PLIST.dll=	yes
 .endif
 
 .include "../../lang/ocaml/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/graphics/cqcam/Makefile b/graphics/cqcam/Makefile
index 82186d97ac1..48da4e3acf8 100644
--- a/graphics/cqcam/Makefile
+++ b/graphics/cqcam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/12/23 11:44:34 dsainty Exp $
 #
 
 DISTNAME=		cqcam-0.91
@@ -35,7 +35,7 @@ CONFIGURE_ARGS+=	--x-libraries=${X11BASE:Q}/lib
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile
index 5353b2bd95a..9b5ef78e445 100644
--- a/graphics/dcraw/Makefile
+++ b/graphics/dcraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2010/08/06 20:49:23 bad Exp $
+# $NetBSD: Makefile,v 1.34 2010/12/23 11:44:34 dsainty Exp $
 #
 
 DISTNAME=	dcraw-9.04
@@ -65,5 +65,5 @@ do-install:
 .endfor
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/digikam-kde3/Makefile b/graphics/digikam-kde3/Makefile
index 7f2ead50189..a5772894a79 100644
--- a/graphics/digikam-kde3/Makefile
+++ b/graphics/digikam-kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/07/14 11:11:21 sbd Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:34 dsainty Exp $
 
 DISTNAME=		digikam-0.9.6
 PKGREVISION=		7
@@ -33,7 +33,7 @@ PLIST_SUBST=	HTMLDIR=${DISTNAME}
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libkdcraw/buildlink3.mk"
 .include "../../graphics/libkexiv2/buildlink3.mk"
 .include "../../graphics/libkipi/buildlink3.mk"
diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile
index 8b9adcb5fc0..7cfe86fba33 100644
--- a/graphics/djview4/Makefile
+++ b/graphics/djview4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/11/15 22:57:12 abs Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $
 #
 
 DISTNAME=	djview4-4.5
@@ -21,5 +21,5 @@ USE_TOOLS+=	pkg-config
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/djvulibre-lib/Makefile b/graphics/djvulibre-lib/Makefile
index 663e2e14509..08693bd062d 100644
--- a/graphics/djvulibre-lib/Makefile
+++ b/graphics/djvulibre-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/08/09 11:05:54 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $
 
 DISTNAME=		djvulibre-3.5.22
 PKGNAME=		djvulibre-lib-3.5.22
@@ -29,5 +29,5 @@ INSTALL_DIRS=		libdjvu
 CFLAGS+= -march=i486
 .endif
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/djvulibre-tools/Makefile b/graphics/djvulibre-tools/Makefile
index 2644f0c8500..770f7ed2a60 100644
--- a/graphics/djvulibre-tools/Makefile
+++ b/graphics/djvulibre-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/08/09 11:05:55 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $
 
 DISTNAME=		djvulibre-3.5.22
 PKGNAME=		djvulibre-tools-3.5.22
@@ -27,6 +27,6 @@ INSTALL_DIRS=		tools xmltools
 REPLACE_BASH+=		tools/any2djvu
 
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index fee85b3d770..0079ce456f9 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2010/11/14 14:05:57 obache Exp $
+# $NetBSD: Makefile,v 1.55 2010/12/23 11:44:35 dsainty Exp $
 
 DISTNAME=	dx-4.4.4
 PKGREVISION=	8
@@ -34,7 +34,7 @@ CONFIGURE_ENV+=		ARCH=""
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .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 "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile
index 409bb771e71..944ac7971f0 100644
--- a/graphics/enblend-enfuse/Makefile
+++ b/graphics/enblend-enfuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/12/14 18:26:34 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:35 dsainty Exp $
 
 DISTNAME=	enblend-enfuse-4.0
 # XXX distribution file has changed; remove the line below on next update
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-x
 .endif
 
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libxmi/buildlink3.mk"
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 480b6f9bfe3..10394f36563 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2010/11/28 13:04:09 drochner Exp $
+# $NetBSD: Makefile,v 1.60 2010/12/23 11:44:36 dsainty Exp $
 #
 
 DISTNAME=	eog-2.32.1
@@ -33,7 +33,7 @@ BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.15.3
 BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.20.0
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libexif+=	libexif>=0.6.12
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile
index b910ed54945..8f16d7d147c 100644
--- a/graphics/epeg/Makefile
+++ b/graphics/epeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/12/23 11:44:36 dsainty Exp $
 #
 
 DISTNAME=		epeg-0.9.0
@@ -16,5 +16,5 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/epeg/buildlink3.mk b/graphics/epeg/buildlink3.mk
index 85cce374ad7..16957bef0ac 100644
--- a/graphics/epeg/buildlink3.mk
+++ b/graphics/epeg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:58:58 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2010/12/23 11:44:36 dsainty Exp $
 
 BUILDLINK_TREE+=	epeg
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.epeg?=	epeg>=0.9.0nb3
 BUILDLINK_PKGSRCDIR.epeg?=	../../graphics/epeg
 
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # EPEG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-epeg
diff --git a/graphics/evas-jpeg/Makefile b/graphics/evas-jpeg/Makefile
index f6c30e6f3f0..17b08bcef46 100644
--- a/graphics/evas-jpeg/Makefile
+++ b/graphics/evas-jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:36 dsainty Exp $
 
 PKGNAME=	${DISTNAME:S/evas/evas-jpeg/}
 PKGREVISION=	2
@@ -16,5 +16,5 @@ MAKE_FLAGS+=	module_la_LIBADD="\$${eavs_image_loader_jpeg_libs} \$${EINA_LIBS} $
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/evas/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index 77ac14ffa4c..3cacc7aa91c 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/11/18 23:59:17 obache Exp $
+# $NetBSD: Makefile,v 1.26 2010/12/23 11:44:36 dsainty Exp $
 #
 
 DISTNAME=	f-spot-0.6.2
@@ -48,7 +48,7 @@ GCONF_SCHEMAS=	f-spot.schemas
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../lang/mono/buildlink3.mk"
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 4e9d7276459..21349f3e695 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2010/12/19 12:32:42 dsainty Exp $
+# $NetBSD: Makefile,v 1.40 2010/12/23 11:44:36 dsainty Exp $
 #
 
 DISTNAME=	feh-1.3.4
@@ -28,7 +28,7 @@ BUILDLINK_API_DEPENDS.giblib+=	giblib>=1.2.4
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/giblib/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index 3739b3757be..295c186cad7 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:30 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/12/23 11:44:36 dsainty Exp $
 #
 
 DISTNAME=		flphoto-1.2-source
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
 .include "../../x11/fltk/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 5505987e6c0..fbe3c9e05a9 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2010/06/23 03:02:37 dsainty Exp $
+# $NetBSD: Makefile,v 1.85 2010/12/23 11:44:37 dsainty Exp $
 
 DISTNAME=	gd-2.0.35
 PKGREVISION=	6
@@ -33,7 +33,7 @@ CONFIGURE_ENV+=		ac_cv_path_LIBPNG12_CONFIG=""
 .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/png/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk
index 173230f74db..cff3e7bfa9e 100644
--- a/graphics/gd/buildlink3.mk
+++ b/graphics/gd/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:44:37 dsainty Exp $
 
 BUILDLINK_TREE+=	gd
 
@@ -21,7 +21,7 @@ pkgbase := gd
 .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/png/buildlink3.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 7a65dc7277f..a90e4cd2bc0 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2007/01/08 16:07:31 joerg Exp $
+# $NetBSD: Makefile.common,v 1.47 2010/12/23 11:44:37 dsainty Exp $
 
 DISTNAME=		gdk-pixbuf-${VER}.0
 CATEGORIES=		graphics devel
@@ -25,7 +25,7 @@ PATCHDIR=		${.CURDIR}/../gdk-pixbuf/patches
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk
index 29d715a6abb..e3e51ffcc44 100644
--- a/graphics/gdk-pixbuf/buildlink3.mk
+++ b/graphics/gdk-pixbuf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2010/12/23 11:44:37 dsainty Exp $
 
 BUILDLINK_TREE+=	gdk-pixbuf
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.gdk-pixbuf?=	../../graphics/gdk-pixbuf
 BUILDLINK_CPPFLAGS.gdk-pixbuf+= \
 	-I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index 3534685ce3a..8246542eef5 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/14 20:11:41 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2010/12/23 11:44:37 dsainty Exp $
 #
 
 DISTNAME=	gdk-pixbuf-2.22.1
@@ -35,6 +35,6 @@ post-install:
 BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/tiff/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/graphics/gegl/Makefile b/graphics/gegl/Makefile
index 29962199af9..9c1c7e60f1b 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2010/11/15 22:57:14 abs Exp $
+# $NetBSD: Makefile,v 1.17 2010/12/23 11:44:37 dsainty Exp $
 
 DISTNAME=	gegl-0.1.2
 PKGREVISION=	3
@@ -36,7 +36,7 @@ PLIST.v4l=	yes
 
 BUILDLINK_API_DEPENDS.babl+=	babl>=0.1.2
 .include "../../graphics/babl/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index b097e83f94c..1de55aab119 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2010/11/15 22:57:14 abs Exp $
+# $NetBSD: Makefile,v 1.64 2010/12/23 11:44:37 dsainty Exp $
 
 DISTNAME=	gimageview-0.2.27
 PKGREVISION=	20
@@ -27,7 +27,7 @@ LDFLAGS.NetBSD+=	${PTHREAD_LDFLAGS}
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../graphics/mng/buildlink3.mk"
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index 1214fd2ca32..d14742c1a95 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2010/11/15 22:57:17 abs Exp $
+# $NetBSD: Makefile,v 1.62 2010/12/23 11:44:38 dsainty Exp $
 
 DISTNAME=		ufraw-0.17
 PKGNAME=		gimp-${DISTNAME}
@@ -43,7 +43,7 @@ PKG_SUGGESTED_OPTIONS=	lensfun
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/gimp/buildlink3.mk"
 .include "../../graphics/gtkimageview/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 21050408e51..b429e5e28ad 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.200 2010/11/15 22:57:15 abs Exp $
+# $NetBSD: Makefile,v 1.201 2010/12/23 11:44:38 dsainty Exp $
 
 DISTNAME=	gimp-2.6.11
 PKGREVISION=	2
@@ -64,7 +64,7 @@ PLIST.twain=		yes
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/babl/buildlink3.mk"
 .include "../../graphics/gegl/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index 9da5d2a224a..42ec20566bb 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:33 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2010/12/23 11:44:38 dsainty Exp $
 #
 
 DISTNAME=		gimp-1.2.5
@@ -59,7 +59,7 @@ pre-build:
 		${FILESDIR}/pdb_self_doc.c
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../multimedia/mpeg-lib/buildlink3.mk"
diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk
index 06b819df115..1782fda7b3d 100644
--- a/graphics/gimp1-base/buildlink3.mk
+++ b/graphics/gimp1-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:33 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:38 dsainty Exp $
 
 BUILDLINK_TREE+=	gimp-base
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.gimp-base+=	gimp-base>=1.2.5nb10
 BUILDLINK_PKGSRCDIR.gimp-base?=	../../graphics/gimp1-base
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../multimedia/mpeg-lib/buildlink3.mk"
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 44f96033d72..082c0ffe07e 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2010/01/18 09:59:01 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2010/12/23 11:44:38 dsainty Exp $
 
 DISTNAME=	gphoto2-2.4.7
 PKGREVISION=	2
@@ -21,7 +21,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-aalib-prefix=${BUILDLINK_PREFIX.aalib}
 CONFIGURE_ARGS+=	--with-cdk-prefix=${BUILDLINK_PREFIX.cdk}
 CONFIGURE_ARGS+=	--with-exif-prefix=${BUILDLINK_PREFIX.libexif}
-CONFIGURE_ARGS+=	--with-jpeg-prefix=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+=	--with-jpeg-prefix=${JPEGBASE}
 
 # uses rl_completion_matches() (NetBSD 3.* don't have) and rl_copy_text()
 USE_GNU_READLINE=	yes
@@ -34,5 +34,5 @@ CFLAGS.Darwin+= -D_DARWIN_C_SOURCE
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 864a5b64581..1cebd37375f 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2010/11/17 15:46:21 dholland Exp $
+# $NetBSD: Makefile,v 1.88 2010/12/23 11:44:38 dsainty Exp $
 
 DISTNAME=	graphviz-2.26.3
 CATEGORIES=	graphics
@@ -77,7 +77,7 @@ post-install:
 .include "../../devel/libltdl/buildlink3.mk"
 #.include "../../devel/libltdl/convenience.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
-#.include "../../graphics/jpeg/buildlink3.mk"
+#.include "../../mk/jpeg.buildlink3.mk"
 #.include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/gst-plugins0.10-jpeg/Makefile b/graphics/gst-plugins0.10-jpeg/Makefile
index 7e700f3ff0e..555efde274e 100644
--- a/graphics/gst-plugins0.10-jpeg/Makefile
+++ b/graphics/gst-plugins0.10-jpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/02/16 13:17:28 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:39 dsainty Exp $
 #
 
 GST_PLUGINS0.10_NAME=	jpeg
@@ -8,5 +8,5 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../multimedia/gst-plugins0.10-good/Makefile.common"
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index deb583449d2..6759869de2c 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2010/12/04 21:16:35 adam Exp $
+# $NetBSD: Makefile,v 1.57 2010/12/23 11:44:39 dsainty Exp $
 
 DISTNAME=	gthumb-2.12.1
 PKGREVISION=	1
@@ -35,7 +35,7 @@ GCONF_SCHEMAS+=	gthumb_webalbums.schemas
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 #.include "../../net/ORBit2/buildlink3.mk"
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index 7ab93f66b96..da468f7e1a0 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2010/12/23 11:44:39 dsainty Exp $
 #
 
 DISTNAME=		gtksee-0.5.6
@@ -25,7 +25,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/TODO	  ${DESTDIR}${PREFIX}/share/doc/gtksee
 
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/h5utils/Makefile b/graphics/h5utils/Makefile
index 9c2302a0983..75b46b4eee7 100644
--- a/graphics/h5utils/Makefile
+++ b/graphics/h5utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:35 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/12/23 11:44:39 dsainty Exp $
 #
 
 DISTNAME=		h5utils-1.12.1
@@ -20,6 +20,6 @@ pre-install:
 .include "../../devel/hdf5/buildlink3.mk"
 .include "../../devel/hdf/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../math/libmatheval/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 8887096f90d..49ddc635d55 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2010/06/13 22:44:36 wiz Exp $
+# $NetBSD: Makefile,v 1.106 2010/12/23 11:44:39 dsainty Exp $
 
 DISTNAME=	imlib-1.9.15
 PKGREVISION=	7
@@ -53,7 +53,7 @@ post-install:
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk
index 90ea0abf7d1..10dc542bfc5 100644
--- a/graphics/imlib/buildlink3.mk
+++ b/graphics/imlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/12/23 11:44:39 dsainty Exp $
 
 BUILDLINK_TREE+=	imlib
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.imlib+=	imlib>=1.9.15nb7
 BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/netpbm/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index cc51f1fb175..6c0f52400f9 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:36 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2010/12/23 11:44:40 dsainty Exp $
 
 DISTNAME=	imlib2-1.4.2
 PKGREVISION=	5
@@ -38,7 +38,7 @@ SUBST_SED.shlib+=	-e 's,"\.so",".${SHLIB_SUFFIX}",'
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk
index 27fb670655a..3f03637c154 100644
--- a/graphics/imlib2/buildlink3.mk
+++ b/graphics/imlib2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:44:36 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/12/23 11:44:40 dsainty Exp $
 
 BUILDLINK_TREE+=	imlib2
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.imlib2?=	../../graphics/imlib2
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 173cf2638a9..a59e80caf31 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:03 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2010/12/23 11:44:40 dsainty Exp $
 
 DISTNAME=	jasper-1.900.1
 PKGREVISION=	5
@@ -24,5 +24,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/jasper.pdf ${DESTDIR}${PREFIX}/share/doc/jasper
 	${INSTALL_DATA} ${WRKSRC}/doc/jpeg2000.pdf ${DESTDIR}${PREFIX}/share/doc/jasper
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk
index 9b012a7a8bc..bd849c24abe 100644
--- a/graphics/jasper/buildlink3.mk
+++ b/graphics/jasper/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:03 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:40 dsainty Exp $
 
 BUILDLINK_TREE+=	jasper
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.jasper+=	jasper>=1.600.0
 BUILDLINK_ABI_DEPENDS.jasper+=	jasper>=1.900.1nb5
 BUILDLINK_PKGSRCDIR.jasper?=	../../graphics/jasper
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # JASPER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-jasper
diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile
index 9016c5d5a1f..efc54a70eee 100644
--- a/graphics/jpeginfo/Makefile
+++ b/graphics/jpeginfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/12/12 15:25:59 adam Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:40 dsainty Exp $
 
 DISTNAME=	jpeginfo-1.6.1
 CATEGORIES=	graphics
@@ -17,5 +17,5 @@ GNU_CONFIGURE=		yes
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile
index 6c437c51f7f..6f33ceb17c9 100644
--- a/graphics/jpegoptim/Makefile
+++ b/graphics/jpegoptim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/11/10 19:56:38 adam Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:40 dsainty Exp $
 
 DISTNAME=	jpegoptim-1.2.3
 PKGREVISION=	1
@@ -21,5 +21,5 @@ INSTALL_MAKE_FLAGS+=	bindir=${DESTDIR}${PREFIX}/bin \
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/jpegpixi/Makefile b/graphics/jpegpixi/Makefile
index a251c8a5389..d6102ceb4c4 100644
--- a/graphics/jpegpixi/Makefile
+++ b/graphics/jpegpixi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:03 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/12/23 11:44:40 dsainty Exp $
 
 DISTNAME=		jpegpixi-1.1.1
 PKGREVISION=		2
@@ -16,5 +16,5 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/kipi-plugins-kde3/Makefile b/graphics/kipi-plugins-kde3/Makefile
index f2a8f16be46..6f297fad846 100644
--- a/graphics/kipi-plugins-kde3/Makefile
+++ b/graphics/kipi-plugins-kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/11/15 22:57:21 abs Exp $
+# $NetBSD: Makefile,v 1.8 2010/12/23 11:44:41 dsainty Exp $
 
 DISTNAME=	kipi-plugins-0.1.7
 PKGREVISION=	11
@@ -26,7 +26,7 @@ DEPENDS+=	ImageMagick>=5.5.4:../../graphics/ImageMagick
 BUILDLINK_API_DEPENDS.libgpod+=	libgpod>=0.7.0
 .include "../../audio/libgpod/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.libkdcraw+=	libkdcraw>=0.1.4
 .include "../../graphics/libkdcraw/buildlink3.mk"
 .include "../../graphics/libkexiv2/buildlink3.mk"
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index aae8128c160..31c27997b60 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2010/06/16 15:17:58 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:41 dsainty Exp $
 
 DISTNAME=	lcms-1.19
 CATEGORIES=	graphics
@@ -30,6 +30,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${_f_} ${DESTDIR}${PREFIX}/share/doc/lcms/${_f_}
 .endfor
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 48bb91095c7..d34b49075c1 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2010/12/09 08:31:40 kefren Exp $
+# $NetBSD: Makefile,v 1.50 2010/12/23 11:44:41 dsainty Exp $
 
 DISTNAME=	libgdiplus-2.8.1
 PKGREVISION=	2
@@ -29,7 +29,7 @@ BUILDLINK_TRANSFORM+=		rm:-Werror
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk
index f9182e89478..05c525d050d 100644
--- a/graphics/libgdiplus/buildlink3.mk
+++ b/graphics/libgdiplus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2010/12/09 08:31:40 kefren Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/12/23 11:44:41 dsainty Exp $
 
 BUILDLINK_TREE+=	libgdiplus
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libgdiplus?=	../../graphics/libgdiplus
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile
index 7698e28b01c..d732c17c8e4 100644
--- a/graphics/libkdcraw/Makefile
+++ b/graphics/libkdcraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/07/14 11:11:14 sbd Exp $
+# $NetBSD: Makefile,v 1.19 2010/12/23 11:44:41 dsainty Exp $
 #
 
 DISTNAME=	libkdcraw-0.1.9
@@ -20,7 +20,7 @@ USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
 # needed by **** libjpeg detection
-CONFIGURE_ARGS+=	--includedir=${BUILDLINK_PREFIX.jpeg:Q}/include
+CONFIGURE_ARGS+=	--includedir=${JPEGBASE:Q}/include
 
 PKGCONFIG_OVERRIDE+=	libkdcraw/libkdcraw.pc.in
 
@@ -30,6 +30,6 @@ BUILDLINK_API_DEPENDS.qt3-libs+=	qt3-libs>=3.3
 .include "../../x11/kdelibs3/buildlink3.mk"
 BUILDLINK_API_DEPENDS.lcms+=		lcms>=1.14
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile
index 897a56197b4..3d41faedcf1 100644
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/07/14 11:11:14 sbd Exp $
+# $NetBSD: Makefile,v 1.20 2010/12/23 11:44:41 dsainty Exp $
 #
 
 DISTNAME=	libkexiv2-0.1.9
@@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+=	libkexiv2/libkexiv2.pc.in
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index d73a3385f5e..cd013800617 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/09/15 10:13:26 adam Exp $
+# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:42 dsainty Exp $
 
 DISTNAME=	libpano13-2.9.17
 CATEGORIES=	graphics
@@ -17,7 +17,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 PKGCONFIG_OVERRIDE=	libpano13.pc.in
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libpano13/buildlink3.mk b/graphics/libpano13/buildlink3.mk
index a93e1d37506..9d0d71d2783 100644
--- a/graphics/libpano13/buildlink3.mk
+++ b/graphics/libpano13/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/09/15 10:13:26 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/12/23 11:44:42 dsainty Exp $
 
 BUILDLINK_TREE+=	libpano13
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libpano13+=	libpano13>=2.9.17
 BUILDLINK_ABI_DEPENDS.libpano13+=	libpano13>=2.9.17
 BUILDLINK_PKGSRCDIR.libpano13?=		../../graphics/libpano13
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .endif	# LIBPANO13_BUILDLINK3_MK
diff --git a/graphics/libvideogfx/Makefile b/graphics/libvideogfx/Makefile
index 6ebf8220996..92f3f2ea8ba 100644
--- a/graphics/libvideogfx/Makefile
+++ b/graphics/libvideogfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:38 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/12/23 11:44:42 dsainty Exp $
 #
 
 DISTNAME=	libvideogfx-1.0.3
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	YES
 
 BUILDLINK_DEPMETHOD.libXt?=	build
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk
index 9bd9da0d8dd..47d08c4023b 100644
--- a/graphics/libvideogfx/buildlink3.mk
+++ b/graphics/libvideogfx/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:42 dsainty Exp $
 
 BUILDLINK_TREE+=	libvideogfx
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libvideogfx+=	libvideogfx>=1.0.3
 BUILDLINK_ABI_DEPENDS.libvideogfx+=	libvideogfx>=1.0.3nb6
 BUILDLINK_PKGSRCDIR.libvideogfx?=	../../graphics/libvideogfx
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .endif # LIBVIDEOGFX_BUILDLINK3_MK
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index b7f53e88e17..11448098815 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2010/11/11 11:38:36 adam Exp $
+# $NetBSD: Makefile,v 1.67 2010/12/23 11:44:42 dsainty Exp $
 
 DISTNAME=	libwmf-0.2.8.4
 PKGREVISION=	8
@@ -25,7 +25,7 @@ post-install:
 .include "options.mk"
 
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk
index 7f2d8954bc6..08e1a1e55c6 100644
--- a/graphics/libwmf/buildlink3.mk
+++ b/graphics/libwmf/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/11/11 11:38:36 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/12/23 11:44:42 dsainty Exp $
 
 BUILDLINK_TREE+=	libwmf
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libwmf+=	libwmf>=0.2.8.4nb7
 BUILDLINK_PKGSRCDIR.libwmf?=	../../graphics/libwmf
 
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index 950e9fbac4d..df291c114af 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:39 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/12/23 11:44:42 dsainty Exp $
 #
 
 DISTNAME=	mgl2-alpha-020
@@ -111,7 +111,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/nine/${i} ${DESTDIR}${PREFIX}/share/doc/mgl2/nine/
 .endfor
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile
index e37dd2b2d32..bab81ac351a 100644
--- a/graphics/mng/Makefile
+++ b/graphics/mng/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:43 dsainty Exp $
 
 DISTNAME=	libmng-1.0.10
 PKGNAME=	mng-1.0.10
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		automake
 
-CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+=	--with-jpeg=${JPEGBASE}
 CONFIGURE_ARGS+=	--with-lcms=${BUILDLINK_PREFIX.lcms}
 CPPFLAGS+=		${BUILDLINK_CPPFLAGS.lcms}
 
@@ -46,7 +46,7 @@ post-install:
 		${INSTALL_MAN} jng.5 mng.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk
index c582b5a4353..e87d44ba3a4 100644
--- a/graphics/mng/buildlink3.mk
+++ b/graphics/mng/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:05 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:43 dsainty Exp $
 
 BUILDLINK_TREE+=	mng
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.mng+=	mng>=1.0.10nb2
 BUILDLINK_PKGSRCDIR.mng?=	../../graphics/mng
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .endif # MNG_BUILDLINK3_MK
 
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index d1487e57893..c55733ac555 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/12/05 10:36:40 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:43 dsainty Exp $
 #
 
 DISTNAME=		OpenCV-2.2.0
@@ -34,7 +34,7 @@ CMAKE_ARGS+=	-D BUILD_NEW_PYTHON_SUPPORT=OFF
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 
diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile
index bd55c25b8d9..c0bbbb2b1d4 100644
--- a/graphics/osg/Makefile
+++ b/graphics/osg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/11/15 22:57:23 abs Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/23 11:44:43 dsainty Exp $
 
 DISTNAME=	OpenSceneGraph-${OSGVER}
 PKGNAME=	osg-${OSGVER}
@@ -29,7 +29,7 @@ CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/graphics/osg/buildlink3.mk b/graphics/osg/buildlink3.mk
index 340413825f3..a82cfad486f 100644
--- a/graphics/osg/buildlink3.mk
+++ b/graphics/osg/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2010/11/15 22:57:23 abs Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2010/12/23 11:44:43 dsainty Exp $
 
 BUILDLINK_TREE+=	osg
 
@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.osg?=	../../graphics/osg
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
diff --git a/graphics/panomatic/Makefile b/graphics/panomatic/Makefile
index c34b4afce9a..245fbd702ff 100644
--- a/graphics/panomatic/Makefile
+++ b/graphics/panomatic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:40 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/12/23 11:44:43 dsainty Exp $
 
 DISTNAME=	panomatic-0.9.4-src
 PKGNAME=	panomatic-0.9.4
@@ -22,7 +22,7 @@ GNU_CONFIGURE=		yes
 
 .include "../../devel/boost-headers/buildlink3.mk"
 .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 "../../mk/bsd.pkg.mk"
diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile
index e298f357af5..d5d26ad13bb 100644
--- a/graphics/php-gd/Makefile
+++ b/graphics/php-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2010/07/24 22:24:21 tron Exp $
+# $NetBSD: Makefile,v 1.25 2010/12/23 11:44:43 dsainty Exp $
 
 MODNAME=		gd
 CATEGORIES+=		graphics
@@ -24,7 +24,7 @@ USE_PHP_EXT_PATCHES=	yes
 
 .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"
 .include "../../lang/php/ext.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index 417eaee0cb6..e198b771698 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:41 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2010/12/23 11:44:44 dsainty Exp $
 
 DISTNAME=	pl231src
 PKGNAME=	ploticus-2.31pl4
@@ -42,7 +42,7 @@ do-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile
index 716a1d24215..3bb9b3ca8a9 100644
--- a/graphics/pornview/Makefile
+++ b/graphics/pornview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/11/15 22:57:23 abs Exp $
+# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:44 dsainty Exp $
 #
 
 PKGNAME=	pornview-0.2.0pre1
@@ -24,6 +24,6 @@ REPLACE_PERL+=		src/scripts/helloworld
 
 .include "options.mk"
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 4cd2f93097f..83b64504355 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:41 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/12/23 11:44:44 dsainty Exp $
 
 DISTNAME=	povray-3.6.1
 PKGREVISION=	8
@@ -40,7 +40,7 @@ INSTALLATION_DIRS=	share/povray-3.6/scripts
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .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 "../../x11/libSM/buildlink3.mk"
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index 15a5108779b..9f91136f58d 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2010/07/19 17:45:02 drochner Exp $
+# $NetBSD: Makefile,v 1.38 2010/12/23 11:44:44 dsainty Exp $
 
 DISTNAME=	Imaging-1.1.7
 PKGNAME=	${PYPKGPREFIX}-imaging-1.1.7
@@ -34,5 +34,5 @@ post-install:
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk
index 93d961ef962..f3b9145aca2 100644
--- a/graphics/py-imaging/buildlink3.mk
+++ b/graphics/py-imaging/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:44 dsainty Exp $
 
 BUILDLINK_TREE+=	pyimaging
 
@@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.pyimaging+=	${PYPKGPREFIX}-imaging>=1.1.4
 BUILDLINK_ABI_DEPENDS.pyimaging?=	${PYPKGPREFIX}-imaging>=1.1.7nb1
 BUILDLINK_PKGSRCDIR.pyimaging?=	../../graphics/py-imaging
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # PY_IMAGING_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-pyimaging
diff --git a/graphics/resize_image/Makefile b/graphics/resize_image/Makefile
index 127a8f99427..d414ffb9db0 100644
--- a/graphics/resize_image/Makefile
+++ b/graphics/resize_image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:44 dsainty Exp $
 #
 
 DISTNAME=	resize_image-0.6
@@ -20,5 +20,5 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/resize_image ${DESTDIR}${PREFIX}/bin
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile
index b47a7940347..80b0f895089 100644
--- a/graphics/ruby-gd/Makefile
+++ b/graphics/ruby-gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2010/11/23 05:41:43 obache Exp $
+# $NetBSD: Makefile,v 1.32 2010/12/23 11:44:45 dsainty Exp $
 
 DISTNAME=	ruby-gd-0.8.0
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
@@ -14,13 +14,13 @@ GEM_CLEANBUILD=		Makefile *.o GD.${RUBY_DLEXT} mkmf.log
 
 CONFIGURE_ARGS+=	--with-gd-dir=${BUILDLINK_PREFIX.gd:Q}
 CONFIGURE_ARGS+=	--with-jpeg
-CONFIGURE_ARGS+=	--with-jpeg-dir=${BUILDLINK_PREFIX.jpeg:Q}
+CONFIGURE_ARGS+=	--with-jpeg-dir=${JPEGBASE:Q}
 CONFIGURE_ARGS+=	--with-freetype
 CONFIGURE_ARGS+=	--with-freetype-dir=${BUILDLINK_PREFIX.freetype2:Q}
 CONFIGURE_ARGS+=	--enable-gd2_0
 
 .include "../../lang/ruby/gem.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile
index d4dd4919baf..223dd5fb077 100644
--- a/graphics/ruby-gnome2-libart/Makefile
+++ b/graphics/ruby-gnome2-libart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2010/10/23 12:45:11 obache Exp $
+# $NetBSD: Makefile,v 1.15 2010/12/23 11:44:45 dsainty Exp $
 #
 
 PKGNAME=		${RUBY_PKGPREFIX}-gnome2-libart-${VERSION}
@@ -14,7 +14,7 @@ RUBY_EXTCONF_SUBDIRS=	libart
 
 BUILD_DEPENDS+=		${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../devel/ruby-pkg-config/tool.mk"
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index a0d7e430229..546184cc052 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2010/09/19 15:06:18 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2010/12/23 11:44:45 dsainty Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -64,6 +64,6 @@ CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f}
 .if (${OPSYS} != "SunOS")
 . include "../../devel/libusb/buildlink3.mk"
 .endif
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk
index 223ca0662ec..bb26e8cce60 100644
--- a/graphics/sane-backends/buildlink3.mk
+++ b/graphics/sane-backends/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:08 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/12/23 11:44:45 dsainty Exp $
 
 BUILDLINK_TREE+=	sane-backends
 
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.sane-backends?=	../../graphics/sane-backends
 .if (${OPSYS} != "SunOS")
 . include "../../devel/libusb/buildlink3.mk"
 .endif
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # SANE_BACKENDS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-sane-backends
diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile
index 0d07d51950c..0edc5fd632e 100644
--- a/graphics/simage/Makefile
+++ b/graphics/simage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:45 dsainty Exp $
 
 DISTNAME=		simage-1.6.1
 PKGREVISION=		8
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--with-xwd --with-mpeg2enc
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 
diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk
index deff954c936..97700f31b9d 100644
--- a/graphics/simage/buildlink3.mk
+++ b/graphics/simage/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:45 dsainty Exp $
 
 BUILDLINK_TREE+=	simage
 
@@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.simage?=	../../graphics/simage
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .endif # SIMAGE_BUILDLINK3_MK
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 289393ec939..093290c05e9 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2010/12/23 11:44:46 dsainty Exp $
 #
 
 DISTNAME=		tgif-4.2.2
@@ -28,7 +28,7 @@ post-patch::
 	@${RM} -f ${WRKSRC}/Tgif.tmpl
 	@${CP}  ${OS_TEMPLATE} ${WRKSRC}/Tgif.tmpl
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index f92fc4c9ab1..b62f032d218 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2010/08/04 17:48:22 tron Exp $
+# $NetBSD: Makefile,v 1.98 2010/12/23 11:44:46 dsainty Exp $
 
 DISTNAME=	tiff-3.9.4
 PKGREVISION=	1
@@ -35,5 +35,5 @@ post-install:
 .include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk
index a2315605b64..84c7d22d2fa 100644
--- a/graphics/tiff/buildlink3.mk
+++ b/graphics/tiff/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2010/12/23 11:44:46 dsainty Exp $
 
 BUILDLINK_TREE+=	tiff
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.tiff+=	tiff>=3.9.2nb1
 BUILDLINK_PKGSRCDIR.tiff?=	../../graphics/tiff
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # TIFF_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-tiff
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index 16e83cd7389..d758e201f8a 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/10/16 15:50:21 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:46 dsainty Exp $
 #
 
 DISTNAME=	vigra-1.7.0-src
@@ -26,7 +26,7 @@ INSTALL_MAKE_FLAGS+=	libdir=${DESTDIR}${PREFIX}/lib
 .include "options.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/vigra/buildlink3.mk b/graphics/vigra/buildlink3.mk
index bf77e3e6dff..0718d8c9dee 100644
--- a/graphics/vigra/buildlink3.mk
+++ b/graphics/vigra/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2010/10/19 09:13:10 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2010/12/23 11:44:46 dsainty Exp $
 
 BUILDLINK_TREE+=	vigra
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.vigra+=	vigra>=1.7.0
 BUILDLINK_PKGSRCDIR.vigra?=	../../graphics/vigra
 
 .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"
 .endif	# VIGRA_BUILDLINK3_MK
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index bb88d69442b..e8262eb4253 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/12/23 11:44:46 dsainty Exp $
 #
 
 DISTNAME=	xart19980415
@@ -21,7 +21,7 @@ post-extract:
 	cd ${WRKDIR} && find * -type d -exec chmod 755 "{}" ";"
 	cd ${WRKDIR} && find * -type f -print | xargs chmod 644
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index c0401d7fb11..58c7bd7ddb6 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2010/06/13 22:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.63 2010/12/23 11:44:46 dsainty Exp $
 
 DISTNAME=	xfig.3.2.5b.full
 PKGNAME=	xfig-3.2.5b
@@ -62,7 +62,7 @@ XFIGDOCDIR=		${PREFIX}/share/doc/xfig
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Doc/FORMAT?.? ${DESTDIR}${XFIGDOCDIR}
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index e1eff09b0f7..ef350408e90 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2010/12/23 11:44:47 dsainty Exp $
 
 DISTNAME=	xli-2005-02-27
 PKGNAME=	xli-1.17.0
@@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_IMAKE=		YES
 INSTALLATION_DIRS+=	lib/X11/app-defaults
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 878de024d9a..f9511cd7733 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2010/06/13 22:44:46 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2010/12/23 11:44:47 dsainty Exp $
 
 DISTNAME=	xpaint-2.7.8.1
 PKGREVISION=	5
@@ -28,7 +28,7 @@ SUBST_SED.foo=		-e "s|@LOCALBASE@|${LOCALBASE}|g" \
 pre-configure:
 	cd ${WRKSRC} && ./configure xaw3dg
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 7928c0ba387..73274c8e681 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2010/11/15 22:57:29 abs Exp $
+# $NetBSD: Makefile,v 1.85 2010/12/23 11:44:47 dsainty Exp $
 
 DISTNAME=	xsane-0.994
 PKGNAME=	xsane-0.99.4
@@ -20,7 +20,7 @@ USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/gimp/buildlink3.mk"