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

ap-ometer/Makefile

@@ -16,7 +16,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-freetype=${BUILDLINK_PREFIX.freetype2}
 CONFIGURE_ARGS+=	--with-libpng=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=	--with-db=${BUILDLINK_PREFIX.db4}
-CONFIGURE_ARGS+=	--with-jpeg=${BUILDLINK_PREFIX.jpeg}
+CONFIGURE_ARGS+=	--with-jpeg=${JPEGBASE}
 CONFIGURE_ARGS+=	--with-libpng=${BUILDLINK_PREFIX.png}
 CONFIGURE_ARGS+=	--with-odometerdb=${VARBASE}/odometer/odometer.db
 
@@ -28,7 +28,7 @@ BUILDLINK_TRANSFORM+=l:db:db4
 .include "../../www/apache/module.mk"
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"

armagetronad/Makefile

@@ -8,5 +8,5 @@ COMMENT=	Tron clone in 3D with advanced gameplay and multiplayer
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../wip/armagetronad/Makefile.common"

avifile-devel/options.mk

@@ -130,7 +130,7 @@ CONFIGURE_ARGS+=	--disable-ac3passthrough
 .endif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 PLIST.jpeg=		yes
 .endif
 

boinc-lib/Makefile.common

@@ -29,7 +29,7 @@ PKG_SUGGESTED_OPTIONS=	gui
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgui)
-.	include "../../graphics/jpeg/buildlink3.mk"
+.	include "../../mk/jpeg.buildlink3.mk"
 .	include "../../graphics/MesaLib/buildlink3.mk"
 .	include "../../graphics/glu/buildlink3.mk"
 .	include "../../graphics/glut/buildlink3.mk"

chromium/Makefile.common

@@ -130,7 +130,7 @@ do-install:
 .include "../../devel/libevent/buildlink3.mk"
 .include "../../devel/nss/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../wip/libvpx/buildlink3.mk"

cinelerra-cv/Makefile

@@ -53,7 +53,7 @@ BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../wip/libuuid/buildlink3.mk" # should be in "devel" category
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"

cinelerra/Makefile

@@ -48,7 +48,7 @@ USE_TOOLS+=		gmake
 #  libmpeg3
 # jpeg-mmx
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 

crrcsim/Makefile

@@ -22,6 +22,6 @@ USE_LANGUAGES=	c c++
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../games/plib/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

directfb/Makefile

@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--with-gfxdrivers=all
 .endif
 
 .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"
 .include "../../mk/bsd.pkg.mk"

directfb/buildlink3.mk

@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.DirectFB?=	../../wip/directfb
 
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
 .endif # DIRECTFB_BUILDLINK3_MK

djview4/Makefile

@@ -19,5 +19,5 @@ USE_LANGUAGES=	c c++
 .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"

efltk/Makefile

@@ -28,7 +28,7 @@ CONFIGURE_ARGS+=	--disable-shared
 .include "options.mk"
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.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"

efltk/buildlink3.mk

@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.efltk?=	efltk>=2.0.8nb2
 BUILDLINK_PKGSRCDIR.efltk?=	../../x11/efltk
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"

electricsheep-svn/Makefile

@@ -40,7 +40,7 @@ do-install:
 	${INSTALL} -d -m 0755 ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
 	${INSTALL_DATA} ${WRKSRC}/electricsheep.xml ${DESTDIR}/${PREFIX}/libexec/xscreensaver/config
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 # for libavformat:
 .include "../../multimedia/ffmpeg/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"

electricsheep/Makefile

@@ -34,7 +34,7 @@ post-patch:
 	${SED} < ${WRKSRC}/electricsheep.c.orig > ${WRKSRC}/electricsheep.c \
 		-e 's|/usr/local/share|${DESTDIR}/${PREFIX}/share/electricsheep|'
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"

emacs-current/options.mk

@@ -64,7 +64,7 @@ CONFIGURE_ARGS+=	--with-tiff
 CONFIGURE_ARGS+=	--with-gif
 CONFIGURE_ARGS+=	--with-png
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

emboss-base/Makefile.common

@@ -31,6 +31,6 @@ PKG_DISTFILES_DIR=	emboss
 
 .include "../../graphics/gd/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"

epeg/Makefile

@@ -19,5 +19,5 @@ USE_LIBTOOL=	yes
 USE_TOOLS=	gmake pkg-config
 
 .include "../../wip/ecore/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

epeg/buildlink3.mk

@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.epeg?=	epeg>=0.9.1.042nb3
 BUILDLINK_PKGSRCDIR.epeg?=	../../wip/epeg
 
 .include	"../../wip/ecore/buildlink3.mk"
-.include	"../../graphics/jpeg/buildlink3.mk"
+.include	"../../mk/jpeg.buildlink3.mk"
 .endif # EPEG_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-epeg

esmart/Makefile

@@ -28,5 +28,5 @@ pre-configure:
 .include "../../wip/epsilon/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

esmart/buildlink3.mk

@@ -15,7 +15,7 @@ BUILDLINK_PKGSRCDIR.esmart?=	../../wip/esmart
 .include "../../wip/epsilon/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # ESMART_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-esmart

exact-image/Makefile

@@ -28,7 +28,7 @@ post-extract:
 .include "../../graphics/agg/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jasper/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"

fbida/Makefile

@@ -16,7 +16,7 @@ USE_TOOLS+=		gmake perl
 
 # not used, even though the configure output claims it
 #.include "../../graphics/ImageMagick/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libexif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 #.include "../../graphics/sane-backends/buildlink3.mk"

flam3-svn/Makefile

@@ -19,7 +19,7 @@ WRKSRC=			${WRKDIR}/flam3/src
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../wip/mk/svn-package.mk"

flimp/Makefile

@@ -19,7 +19,7 @@ USE_LANGUAGES+=	c c++
 DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 DEPENDS+=	pnmcurve-[0-9]*:../../wip/pnmcurve
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/fltk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

freej/Makefile

@@ -22,5 +22,5 @@ GNU_CONFIGURE=		yes
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../wip/alsa-lib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

fs2open/Makefile

@@ -29,7 +29,7 @@ do-install:
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/openal/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../multimedia/libtheora/buildlink3.mk"

gpicview/Makefile

@@ -15,6 +15,6 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=			pkg-config gmake
 
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"

grass/Makefile

@@ -68,7 +68,7 @@ post-install:
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"

gtklookat/Makefile

@@ -18,7 +18,7 @@ LIBS+=		-lX11
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../x11/gtkglarea/buildlink3.mk"

hplip/Makefile

@@ -54,7 +54,7 @@ CONFIGURE_ARGS= --sysconfdir=${EGDIR:Q} \
 .include "../../textproc/py-xml/buildlink3.mk"
 .include "../../x11/py-qt3-base/buildlink3.mk"
 .include "../../devel/py-readline/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/sane-backends/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
 .include "../../devel/libusb/buildlink3.mk"

hplip3/Makefile

@@ -139,7 +139,7 @@ post-install:
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"

hylafax-devel/Makefile

@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=	--disable-pam
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

hylafax/Makefile

@@ -68,7 +68,7 @@ CONFIGURE_ARGS+=	--disable-pam
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

jp2a/Makefile

@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=	--disable-curl
 CONFIGURE_ARGS+=	--disable-termlib
 .endif
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 
 .if !empty(PKG_OPTIONS:Mcurl)
 .include "../../www/curl/buildlink3.mk"

jpgtn/Makefile

@@ -13,5 +13,5 @@ COMMENT=		Thumbnail generator for JPEG images
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

kaffe-x11/Makefile

@@ -34,7 +34,7 @@ PRINT_PLIST_AWK+= /^@dirrm/ { print "@comment in kaffe: " $$0; next; }
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../wip/kaffe/buildlink3.mk"

kvirc/Makefile

@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--with-ix86-asm
 .include "../../audio/gsm/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../lang/perl5/buildlink3.mk"

libpano12/Makefile

@@ -19,7 +19,7 @@ post-extract:
 	${CP} ${FILESDIR}/makefile.netbsd ${WRKSRC}/makefile.netbsd
 
 .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/java-vm.mk"

links-hacked/Makefile

@@ -63,7 +63,7 @@ pre-configure:
 
 .include "../../graphics/png/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 "../../databases/gdbm/buildlink3.mk"

mapnik/Makefile

@@ -35,7 +35,7 @@ do-install:
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../geography/proj/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/python/application.mk"

mapnik/buildlink3.mk

@@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.mapnik?=	../../wip/mapnik
 .include "../../devel/libltdl/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"
 #.include "../../graphics/tiff/buildlink3.mk"
 #.include "../../geography/proj/buildlink3.mk"

molmol/Makefile

@@ -23,7 +23,7 @@ do-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"

mplayer-mt/options.mk

@@ -179,7 +179,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

mplayer-share/options.mk

@@ -140,7 +140,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