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
---
 mail/spamprobe/options.mk | 4 ++--
 mail/xfmail/Makefile      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'mail')

diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk
index 60359657c6b..003f604c0c9 100644
--- a/mail/spamprobe/options.mk
+++ b/mail/spamprobe/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2010/06/02 13:17:22 adam Exp $
+# $NetBSD: options.mk,v 1.8 2010/12/23 11:44:48 dsainty Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.spamprobe
 PKG_SUPPORTED_OPTIONS=		bdb gif png jpeg
@@ -22,5 +22,5 @@ CONFIGURE_ARGS+=	--with-db=${BDBBASE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mjpeg)
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .endif
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 8e40f4286e3..3b8046877f2 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2010/02/04 14:36:01 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2010/12/23 11:44:48 dsainty Exp $
 
 DISTNAME=		xfmail-1.5.5
 PKGREVISION=		3
@@ -27,7 +27,7 @@ post-install:
 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/glib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/xforms/buildlink3.mk"
 
-- 
cgit v1.2.3