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

1 files changed, 3 insertions, 3 deletions

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"