From ada744dc0ade9830fd0c65e80d3c3acc4c19910b Mon Sep 17 00:00:00 2001
From: dsainty <dsainty@pkgsrc.org>
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
---
 x11/XmHTML/Makefile      | 4 ++--
 x11/XmHTML/buildlink3.mk | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'x11/XmHTML')

diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 0f2359593bd..735ce1c8fad 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2010/06/13 22:45:35 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2010/12/23 11:44:59 dsainty Exp $
 #
 
 DISTNAME=	XmHTML-1.1.7
@@ -23,7 +23,7 @@ do-install:
 		${WRKSRC}/lib/libXmHTML.la ${DESTDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/include/XmHTML/*.h ${DESTDIR}${PREFIX}/include/XmHTML
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../mk/motif.buildlink3.mk"
diff --git a/x11/XmHTML/buildlink3.mk b/x11/XmHTML/buildlink3.mk
index a326b7c6672..cd6e8f95f35 100644
--- a/x11/XmHTML/buildlink3.mk
+++ b/x11/XmHTML/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:35 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:59 dsainty Exp $
 
 BUILDLINK_TREE+=	XmHTML
 
@@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb2
 BUILDLINK_ABI_DEPENDS.XmHTML+=	XmHTML>=1.1.7nb9
 BUILDLINK_PKGSRCDIR.XmHTML?=	../../x11/XmHTML
 
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .endif # XMHTML_BUILDLINK3_MK
-- 
cgit v1.2.3