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

8 files changed, 18 insertions, 18 deletions

diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index 7102bb133c8..b155f115d9f 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2010/11/26 14:49:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.41 2010/12/23 11:44:28 dsainty Exp $
 #
 # used by editors/abiword-plugins/Makefile
 
@@ -32,7 +32,7 @@ PATCHDIR=	${.CURDIR}/../../editors/abiword/patches
 .include "../../devel/libgsf-gnome/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../print/libgnomeprintui/buildlink3.mk"
diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk
index 9fab2f59929..f8461d381aa 100644
--- a/editors/emacs-snapshot/options.mk
+++ b/editors/emacs-snapshot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2010/06/07 22:44:01 minskim Exp $
+# $NetBSD: options.mk,v 1.5 2010/12/23 11:44:28 dsainty Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -59,7 +59,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"
diff --git a/editors/emacs/options.mk b/editors/emacs/options.mk
index 68091dda7f0..64b898a705f 100644
--- a/editors/emacs/options.mk
+++ b/editors/emacs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.10 2010/06/01 21:44:54 minskim Exp $
+# $NetBSD: options.mk,v 1.11 2010/12/23 11:44:28 dsainty Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
@@ -59,7 +59,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"
diff --git a/editors/emacs21/options.mk b/editors/emacs21/options.mk
index 9a6ca2fd16d..ab126bd1827 100644
--- a/editors/emacs21/options.mk
+++ b/editors/emacs21/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/08/13 12:40:58 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2010/12/23 11:44:28 dsainty Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=		x11
@@ -39,7 +39,7 @@ PKG_OPTIONS+=		xaw
 ### Support drawing pretty X11 widgets.
 ###
 .if !empty(PKG_OPTIONS:Mx11)
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"
diff --git a/editors/emacs22/options.mk b/editors/emacs22/options.mk
index 5740bd7ce74..2de68d39575 100644
--- a/editors/emacs22/options.mk
+++ b/editors/emacs22/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2009/08/05 10:30:29 minskim Exp $
+# $NetBSD: options.mk,v 1.2 2010/12/23 11:44:29 dsainty Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=		x11
@@ -32,7 +32,7 @@ PKG_OPTIONS+=		xaw
 ### Support drawing pretty X11 widgets.
 ###
 .if !empty(PKG_OPTIONS:Mx11)
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index ffb6a6e2053..06ff7c5ec62 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2010/07/20 09:56:50 markd Exp $
+# $NetBSD: Makefile,v 1.41 2010/12/23 11:44:29 dsainty Exp $
 
 DISTNAME=	ted-2.21.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -22,8 +22,8 @@ AFMDIR=		${PREFIX}/share/Ted/afm
 INDDIR=		${PREFIX}/share/Ted/ind
 INFODIR=	${PREFIX}/share/doc/Ted
 
-CONFIGURE_ENV+=	ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include"
-CONFIGURE_ENV+=	ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib"
+CONFIGURE_ENV+=	ac_jpeg_includes="${JPEGBASE}/include"
+CONFIGURE_ENV+=	ac_jpeg_libraries="${JPEGBASE}/lib"
 CONFIGURE_ENV+=	ac_png_includes="${BUILDLINK_PREFIX.png}/include"
 CONFIGURE_ENV+=	ac_png_libraries="${BUILDLINK_PREFIX.png}/lib"
 CONFIGURE_ENV+=	ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include"
@@ -68,7 +68,7 @@ do-install:
 
 .include "../../devel/pcre/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 "../../x11/libXpm/buildlink3.mk"
diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk
index 30fc03d2b37..892c25ac717 100644
--- a/editors/xemacs-current/options.mk
+++ b/editors/xemacs-current/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2008/04/24 21:32:47 jlam Exp $
+# $NetBSD: options.mk,v 1.12 2010/12/23 11:44:29 dsainty Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS=		ldap xface canna debug x11 xft
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--enable-debug=yes --with-debug
 ### Support drawing pretty X11 widgets.
 ###
 .if !empty(PKG_OPTIONS:Mx11)
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../x11/xbitmaps/buildlink3.mk"
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk
index af3e49ae416..284c15d2a6c 100644
--- a/editors/xemacs/options.mk
+++ b/editors/xemacs/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2009/11/09 14:09:41 joerg Exp $
+# $NetBSD: options.mk,v 1.10 2010/12/23 11:44:29 dsainty Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.xemacs
 PKG_SUPPORTED_OPTIONS=		ldap xface canna x11
@@ -63,7 +63,7 @@ CONFIGURE_ARGS+=	--without-canna
 ###
 PLIST_VARS+=		x11
 .if !empty(PKG_OPTIONS:Mx11)
-.  include "../../graphics/jpeg/buildlink3.mk"
+.  include "../../mk/jpeg.buildlink3.mk"
 .  include "../../graphics/png/buildlink3.mk"
 .  include "../../graphics/tiff/buildlink3.mk"
 .  include "../../x11/libXpm/buildlink3.mk"