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

7 files changed, 14 insertions, 14 deletions

diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile
index 45db532bf5b..84ccecb92df 100644
--- a/net/driftnet/Makefile
+++ b/net/driftnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2010/02/11 20:47:11 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2010/12/23 11:44:52 dsainty Exp $
 #
 
 DISTNAME=	driftnet-0.1.6
@@ -28,7 +28,7 @@ do-install:
 
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile
index 707842f8fde..2ce7420b0a1 100644
--- a/net/libvncserver/Makefile
+++ b/net/libvncserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/03/30 04:36:54 sbd Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:53 dsainty Exp $
 #
 
 DISTNAME=		LibVNCServer-0.9.7
@@ -27,6 +27,6 @@ SUBST_FILES.pthread=	configure
 SUBST_SED.pthread=	-e 's|-lpthread||g'
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/libvncserver/buildlink3.mk b/net/libvncserver/buildlink3.mk
index 3edd832b136..1d2e1001536 100644
--- a/net/libvncserver/buildlink3.mk
+++ b/net/libvncserver/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/12/23 11:44:53 dsainty Exp $
 
 BUILDLINK_TREE+=	libVNCServer
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libVNCServer?=	libVNCServer>=0.9.7nb2
 BUILDLINK_PKGSRCDIR.libVNCServer?=	../../net/libvncserver
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif # LIBVNCSERVER_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libVNCServer
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 3f3e74fc12b..f802d30a1d7 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2010/03/24 21:35:12 sbd Exp $
+# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:53 dsainty Exp $
 
 DISTNAME=		tightvnc-1.3.10
 PKGREVISION=		4
@@ -76,7 +76,7 @@ do-install:
 	    ${DESTDIR}${PREFIX}/share/examples/tightvnc/tightvncserver.conf
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile
index 865e0b2e630..cf057091bb2 100644
--- a/net/tightvncviewer/Makefile
+++ b/net/tightvncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:20 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/12/23 11:44:53 dsainty Exp $
 
 DISTNAME=		tightvnc-1.3.10
 PKGNAME=		${DISTNAME:S/tightvnc/tightvncviewer/}
@@ -35,7 +35,7 @@ do-install:
 		${DESTDIR}${PREFIX}/share/doc/vncviewer/README
 
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 358d228af4d..335b2214e2c 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2010/11/15 22:58:19 abs Exp $
+# $NetBSD: Makefile,v 1.42 2010/12/23 11:44:53 dsainty Exp $
 
 DISTNAME=	vino-2.28.2
 PKGREVISION=	2
@@ -28,7 +28,7 @@ GCONF_SCHEMAS=		vino-server.schemas
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/libsoup24/buildlink3.mk"
 .include "../../security/libgnome-keyring/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile
index c112ad9b3eb..73a964e3bcd 100644
--- a/net/xrmftp/Makefile
+++ b/net/xrmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2010/02/12 02:02:49 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/12/23 11:44:53 dsainty Exp $
 
 DISTNAME=	xrmftp-1.2.4
 PKGREVISION=	6
@@ -20,7 +20,7 @@ INSTALLATION_DIRS=	bin
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${DESTDIR}${PREFIX}/bin
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"