From 12cb97aee5a221de0ef52d6d283b031e561dbc13 Mon Sep 17 00:00:00 2001
From: dsainty <dsainty>
Date: Thu, 23 Dec 2010 11:44:24 +0000
Subject: 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
---
 misc/celestia/Makefile    | 4 ++--
 misc/fbreader/Makefile    | 4 ++--
 misc/openoffice2/Makefile | 4 ++--
 misc/openoffice3/Makefile | 4 ++--
 misc/root/Makefile        | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'misc')

diff --git a/misc/celestia/Makefile b/misc/celestia/Makefile
index 393b5faedce..e8a2b6c62e2 100644
--- a/misc/celestia/Makefile
+++ b/misc/celestia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2010/11/15 22:57:54 abs Exp $
+# $NetBSD: Makefile,v 1.27 2010/12/23 11:44:49 dsainty Exp $
 
 DISTNAME=	celestia-1.4.1
 PKGREVISION=	12
@@ -50,7 +50,7 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../lang/lua/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
diff --git a/misc/fbreader/Makefile b/misc/fbreader/Makefile
index 965a891c735..f0fa0049b27 100644
--- a/misc/fbreader/Makefile
+++ b/misc/fbreader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2010/11/15 22:57:54 abs Exp $
+# $NetBSD: Makefile,v 1.12 2010/12/23 11:44:49 dsainty Exp $
 #
 
 DISTNAME=	fbreader-sources-0.10.7
@@ -35,7 +35,7 @@ CPPFLAGS+=	-DDO_ICONV_CAST
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/liblinebreak/buildlink3.mk"
diff --git a/misc/openoffice2/Makefile b/misc/openoffice2/Makefile
index e44611994ce..c4d5f3bd438 100644
--- a/misc/openoffice2/Makefile
+++ b/misc/openoffice2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2010/12/17 07:36:13 obache Exp $
+# $NetBSD: Makefile,v 1.83 2010/12/23 11:44:49 dsainty Exp $
 #
 
 OO_VER=			2.4.3
@@ -191,7 +191,7 @@ post-install:
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff --git a/misc/openoffice3/Makefile b/misc/openoffice3/Makefile
index b8be43de960..7acf62823ee 100644
--- a/misc/openoffice3/Makefile
+++ b/misc/openoffice3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2010/12/17 07:36:13 obache Exp $
+# $NetBSD: Makefile,v 1.50 2010/12/23 11:44:50 dsainty Exp $
 
 OO_VER=			3.1.1
 OO_TAG=			OOO310_m19
@@ -202,7 +202,7 @@ post-install:
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 84157d30b24..c656ed0eee6 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2010/06/13 22:45:02 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/12/23 11:44:50 dsainty Exp $
 
 DISTNAME=		root_v5.26.00b.source
 PKGNAME=		root-5.26
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=	--disable-xml
 # might be optional
 #CONFIGURE_ARGS+=	--disable-asimage
 .include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 
-- 
cgit v1.2.3