Subject: CVS commit: pkgsrc
From: David Sainty
Date: 2010-12-23 12:45:04
Message id: 20101223114505.103DA175DD@cvs.netbsd.org

Log Message:
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

Files:
RevisionActionfile
1.13modifypkgsrc/audio/csound5/Makefile
1.41modifypkgsrc/audio/dap/Makefile
1.7modifypkgsrc/audio/flactag/Makefile
1.21modifypkgsrc/cad/xchiplogo/Makefile
1.17modifypkgsrc/chat/amsn/Makefile
1.13modifypkgsrc/chat/centerim/Makefile
1.46modifypkgsrc/chat/ekg/Makefile
1.24modifypkgsrc/chat/ekg/buildlink3.mk
1.62modifypkgsrc/comms/hylafax/Makefile
1.21modifypkgsrc/comms/xtel/Makefile
1.26modifypkgsrc/databases/xsqlmenu/Makefile
1.27modifypkgsrc/devel/devIL/Makefile
1.20modifypkgsrc/devel/devIL/buildlink3.mk
1.80modifypkgsrc/devel/doxygen/Makefile
1.19modifypkgsrc/devel/eet/Makefile
1.15modifypkgsrc/devel/eet/buildlink3.mk
1.21modifypkgsrc/devel/gdl/Makefile
1.36modifypkgsrc/devel/hdf/Makefile
1.9modifypkgsrc/devel/hdf/buildlink3.mk
1.96modifypkgsrc/devel/libgnomeui/Makefile
1.33modifypkgsrc/devel/libgnomeui/buildlink3.mk
1.51modifypkgsrc/devel/libgphoto2/Makefile
1.42modifypkgsrc/devel/p5-SDL/Makefile
1.19modifypkgsrc/devel/xulrunner/mozilla-common.mk
1.41modifypkgsrc/editors/abiword/Makefile.common
1.11modifypkgsrc/editors/emacs/options.mk
1.5modifypkgsrc/editors/emacs-snapshot/options.mk
1.2modifypkgsrc/editors/emacs21/options.mk
1.2modifypkgsrc/editors/emacs22/options.mk
1.41modifypkgsrc/editors/ted/Makefile
1.10modifypkgsrc/editors/xemacs/options.mk
1.12modifypkgsrc/editors/xemacs-current/options.mk
1.17modifypkgsrc/emulators/gcube/Makefile
1.33modifypkgsrc/emulators/palmosemulator/Makefile
1.87modifypkgsrc/emulators/vice/Makefile
1.157modifypkgsrc/emulators/wine/Makefile
1.17modifypkgsrc/emulators/wine/buildlink3.mk
1.5modifypkgsrc/emulators/wine-devel/buildlink3.mk
1.3modifypkgsrc/emulators/wine-devel/options.mk
1.69modifypkgsrc/fonts/fontforge/Makefile
1.36modifypkgsrc/games/boson/Makefile
1.14modifypkgsrc/games/flightgear/Makefile
1.9modifypkgsrc/games/fltk-sudoku/Makefile
1.14modifypkgsrc/games/freedroid/Makefile
1.22modifypkgsrc/games/neverball/Makefile
1.13modifypkgsrc/games/simgear/Makefile
1.8modifypkgsrc/games/simgear/buildlink3.mk
1.9modifypkgsrc/games/ufoai/Makefile
1.49modifypkgsrc/games/xracer/Makefile
1.3modifypkgsrc/geography/gipfel/Makefile
1.36modifypkgsrc/graphics/GraphicsMagick/Makefile
1.14modifypkgsrc/graphics/GraphicsMagick/buildlink3.mk
1.18modifypkgsrc/graphics/OpenRM/Makefile
1.16modifypkgsrc/graphics/OpenRM/buildlink3.mk
1.38modifypkgsrc/graphics/SDL_image/Makefile
1.22modifypkgsrc/graphics/SDL_image/buildlink3.mk
1.16modifypkgsrc/graphics/TiffIO/Makefile
1.8modifypkgsrc/graphics/autopano-sift-C/Makefile
1.12modifypkgsrc/graphics/bktr2jpeg/Makefile
1.21modifypkgsrc/graphics/cambevao/Makefile
1.28modifypkgsrc/graphics/camlimages/Makefile
1.35modifypkgsrc/graphics/cqcam/Makefile
1.34modifypkgsrc/graphics/dcraw/Makefile
1.6modifypkgsrc/graphics/digikam-kde3/Makefile
1.10modifypkgsrc/graphics/djview4/Makefile
1.10modifypkgsrc/graphics/djvulibre-lib/Makefile
1.10modifypkgsrc/graphics/djvulibre-tools/Makefile
1.55modifypkgsrc/graphics/dx/Makefile
1.9modifypkgsrc/graphics/enblend-enfuse/Makefile
1.60modifypkgsrc/graphics/eog/Makefile
1.8modifypkgsrc/graphics/epeg/Makefile
1.10modifypkgsrc/graphics/epeg/buildlink3.mk
1.7modifypkgsrc/graphics/evas-jpeg/Makefile
1.26modifypkgsrc/graphics/f-spot/Makefile
1.40modifypkgsrc/graphics/feh/Makefile
1.17modifypkgsrc/graphics/flphoto/Makefile
1.85modifypkgsrc/graphics/gd/Makefile
1.22modifypkgsrc/graphics/gd/buildlink3.mk
1.47modifypkgsrc/graphics/gdk-pixbuf/Makefile.common
1.18modifypkgsrc/graphics/gdk-pixbuf/buildlink3.mk
1.3modifypkgsrc/graphics/gdk-pixbuf2/Makefile
1.17modifypkgsrc/graphics/gegl/Makefile
1.64modifypkgsrc/graphics/gimageview/Makefile
1.201modifypkgsrc/graphics/gimp/Makefile
1.62modifypkgsrc/graphics/gimp-ufraw/Makefile
1.30modifypkgsrc/graphics/gimp1-base/Makefile
1.15modifypkgsrc/graphics/gimp1-base/buildlink3.mk
1.53modifypkgsrc/graphics/gphoto2/Makefile
1.88modifypkgsrc/graphics/graphviz/Makefile
1.6modifypkgsrc/graphics/gst-plugins0.10-jpeg/Makefile
1.57modifypkgsrc/graphics/gthumb/Makefile
1.21modifypkgsrc/graphics/gtksee/Makefile
1.15modifypkgsrc/graphics/h5utils/Makefile
1.106modifypkgsrc/graphics/imlib/Makefile
1.19modifypkgsrc/graphics/imlib/buildlink3.mk
1.54modifypkgsrc/graphics/imlib2/Makefile
1.26modifypkgsrc/graphics/imlib2/buildlink3.mk
1.32modifypkgsrc/graphics/jasper/Makefile
1.14modifypkgsrc/graphics/jasper/buildlink3.mk
1.9modifypkgsrc/graphics/jpeginfo/Makefile
1.10modifypkgsrc/graphics/jpegoptim/Makefile
1.11modifypkgsrc/graphics/jpegpixi/Makefile
1.8modifypkgsrc/graphics/kipi-plugins-kde3/Makefile
1.36modifypkgsrc/graphics/lcms/Makefile
1.50modifypkgsrc/graphics/libgdiplus/Makefile
1.30modifypkgsrc/graphics/libgdiplus/buildlink3.mk
1.19modifypkgsrc/graphics/libkdcraw/Makefile
1.20modifypkgsrc/graphics/libkexiv2/Makefile
1.6modifypkgsrc/graphics/libpano13/Makefile
1.6modifypkgsrc/graphics/libpano13/buildlink3.mk
1.20modifypkgsrc/graphics/libvideogfx/Makefile
1.14modifypkgsrc/graphics/libvideogfx/buildlink3.mk
1.67modifypkgsrc/graphics/libwmf/Makefile
1.19modifypkgsrc/graphics/libwmf/buildlink3.mk
1.34modifypkgsrc/graphics/mgl/Makefile
1.36modifypkgsrc/graphics/mng/Makefile
1.14modifypkgsrc/graphics/mng/buildlink3.mk
1.13modifypkgsrc/graphics/opencv/Makefile
1.5modifypkgsrc/graphics/osg/Makefile
1.4modifypkgsrc/graphics/osg/buildlink3.mk
1.3modifypkgsrc/graphics/panomatic/Makefile
1.25modifypkgsrc/graphics/php-gd/Makefile
1.41modifypkgsrc/graphics/ploticus/Makefile
1.13modifypkgsrc/graphics/pornview/Makefile
1.46modifypkgsrc/graphics/povray/Makefile
1.38modifypkgsrc/graphics/py-imaging/Makefile
1.15modifypkgsrc/graphics/py-imaging/buildlink3.mk
1.16modifypkgsrc/graphics/resize_image/Makefile
1.32modifypkgsrc/graphics/ruby-gd/Makefile
1.15modifypkgsrc/graphics/ruby-gnome2-libart/Makefile
1.47modifypkgsrc/graphics/sane-backends/Makefile
1.13modifypkgsrc/graphics/sane-backends/buildlink3.mk
1.14modifypkgsrc/graphics/simage/Makefile
1.15modifypkgsrc/graphics/simage/buildlink3.mk
1.59modifypkgsrc/graphics/tgif/Makefile
1.98modifypkgsrc/graphics/tiff/Makefile
1.19modifypkgsrc/graphics/tiff/buildlink3.mk
1.7modifypkgsrc/graphics/vigra/Makefile
1.2modifypkgsrc/graphics/vigra/buildlink3.mk
1.51modifypkgsrc/graphics/xart/Makefile
1.63modifypkgsrc/graphics/xfig/Makefile
1.40modifypkgsrc/graphics/xli/Makefile
1.65modifypkgsrc/graphics/xpaint/Makefile
1.85modifypkgsrc/graphics/xsane/Makefile
1.10modifypkgsrc/ham/fldigi/Makefile
1.25modifypkgsrc/lang/kaffe-x11/Makefile
1.28modifypkgsrc/lang/swi-prolog-packages/Makefile
1.8modifypkgsrc/mail/spamprobe/options.mk
1.49modifypkgsrc/mail/xfmail/Makefile
1.112modifypkgsrc/math/R/Makefile
1.49modifypkgsrc/math/grace/Makefile
1.32modifypkgsrc/math/octave-forge/Makefile
1.35modifypkgsrc/math/xldlas/Makefile
1.27modifypkgsrc/misc/celestia/Makefile
1.12modifypkgsrc/misc/fbreader/Makefile
1.83modifypkgsrc/misc/openoffice2/Makefile
1.50modifypkgsrc/misc/openoffice3/Makefile
1.39modifypkgsrc/misc/root/Makefile
1.7modifypkgsrc/multimedia/ffmpegthumbnailer/Makefile
1.31modifypkgsrc/multimedia/gnash/Makefile
1.11modifypkgsrc/multimedia/gpac/Makefile
1.5modifypkgsrc/multimedia/kmplayer-kde3/Makefile
1.10modifypkgsrc/multimedia/libflash/Makefile
1.11modifypkgsrc/multimedia/libflash/buildlink3.mk
1.46modifypkgsrc/multimedia/mjpegtools/Makefile
1.21modifypkgsrc/multimedia/mjpegtools/buildlink3.mk
1.16modifypkgsrc/multimedia/mpeg_encode/Makefile
1.43modifypkgsrc/multimedia/mplayer-share/options.mk
1.27modifypkgsrc/multimedia/ogle/Makefile
1.16modifypkgsrc/multimedia/openquicktime/Makefile
1.12modifypkgsrc/multimedia/openquicktime/buildlink3.mk
1.67modifypkgsrc/multimedia/transcode/Makefile
1.100modifypkgsrc/multimedia/vlc/Makefile
1.27modifypkgsrc/multimedia/xawtv/Makefile
1.26modifypkgsrc/net/driftnet/Makefile
1.10modifypkgsrc/net/libvncserver/Makefile
1.6modifypkgsrc/net/libvncserver/buildlink3.mk
1.36modifypkgsrc/net/tightvnc/Makefile
1.31modifypkgsrc/net/tightvncviewer/Makefile
1.42modifypkgsrc/net/vino/Makefile
1.19modifypkgsrc/net/xrmftp/Makefile
1.56modifypkgsrc/news/knews/Makefile
1.33modifypkgsrc/print/advi/Makefile
1.32modifypkgsrc/print/cjk-lyx/Makefile
1.172modifypkgsrc/print/cups/Makefile
1.11modifypkgsrc/print/ghostscript/options.mk
1.29modifypkgsrc/print/hpijs/Makefile
1.20modifypkgsrc/print/img2eps/Makefile
1.6modifypkgsrc/print/mupdf/Makefile
1.5modifypkgsrc/print/podofo/Makefile
1.4modifypkgsrc/print/podofo/buildlink3.mk
1.52modifypkgsrc/print/poppler/Makefile
1.22modifypkgsrc/print/poppler/buildlink3.mk
1.35modifypkgsrc/print/poppler-glib/Makefile
1.71modifypkgsrc/print/scribus/Makefile
1.2modifypkgsrc/print/scribus-qt4/Makefile
1.14modifypkgsrc/security/steghide/Makefile
1.33modifypkgsrc/sysutils/xnc/Makefile
1.6modifypkgsrc/time/xonclock/Makefile
1.10modifypkgsrc/wm/compiz-fusion-plugins-extra/Makefile
1.12modifypkgsrc/wm/compiz-fusion-plugins-main/Makefile
1.28modifypkgsrc/wm/ctwm/Makefile
1.4modifypkgsrc/wm/jwm/options.mk
1.38modifypkgsrc/wm/pekwm/Makefile
1.84modifypkgsrc/wm/windowmaker/Makefile
1.20modifypkgsrc/wm/windowmaker/buildlink3.mk
1.61modifypkgsrc/www/amaya/Makefile
1.26modifypkgsrc/www/chimera/Makefile
1.49modifypkgsrc/www/dillo/Makefile
1.30modifypkgsrc/www/htmldoc/Makefile
1.24modifypkgsrc/www/mMosaic/Makefile
1.14modifypkgsrc/www/swiggle/Makefile
1.31modifypkgsrc/www/webkit-gtk/Makefile
1.14modifypkgsrc/www/webkit-gtk/buildlink3.mk
1.48modifypkgsrc/x11/XmHTML/Makefile
1.14modifypkgsrc/x11/XmHTML/buildlink3.mk
1.41modifypkgsrc/x11/aterm/Makefile
1.18modifypkgsrc/x11/efltk/Makefile
1.16modifypkgsrc/x11/efltk/buildlink3.mk
1.73modifypkgsrc/x11/fltk/Makefile
1.20modifypkgsrc/x11/fltk/buildlink3.mk
1.7modifypkgsrc/x11/fltk2/Makefile
1.7modifypkgsrc/x11/fltk2/buildlink3.mk
1.44modifypkgsrc/x11/fox/Makefile
1.21modifypkgsrc/x11/fox/buildlink3.mk
1.46modifypkgsrc/x11/gnustep-gui/Makefile
1.210modifypkgsrc/x11/gtk2/Makefile
1.151modifypkgsrc/x11/kdelibs3/Makefile
1.36modifypkgsrc/x11/kdelibs3/buildlink3.mk
1.20modifypkgsrc/x11/kdelibs4/Makefile
1.8modifypkgsrc/x11/kdelibs4/buildlink3.mk
1.22modifypkgsrc/x11/mrxvt/Makefile
1.66modifypkgsrc/x11/openmotif/Makefile
1.16modifypkgsrc/x11/openmotif/buildlink3.mk
1.69modifypkgsrc/x11/p5-Tk/Makefile
1.76modifypkgsrc/x11/qt3-libs/Makefile
1.27modifypkgsrc/x11/qt3-libs/buildlink3.mk
1.53modifypkgsrc/x11/qt4-libs/Makefile
1.22modifypkgsrc/x11/qt4-libs/buildlink3.mk
1.25modifypkgsrc/x11/ssystem/Makefile
1.41modifypkgsrc/x11/wdm/Makefile
1.8modifypkgsrc/x11/wxGTK24/Makefile.common
1.16modifypkgsrc/x11/wxGTK24/buildlink3.mk
1.3modifypkgsrc/x11/wxGTK26/Makefile.common
1.9modifypkgsrc/x11/wxGTK26/buildlink3.mk
1.9modifypkgsrc/x11/wxGTK26-contrib/buildlink3.mk
1.7modifypkgsrc/x11/wxGTK28/Makefile.common
1.10modifypkgsrc/x11/wxGTK28/buildlink3.mk
1.9modifypkgsrc/x11/wxGTK28-contrib/buildlink3.mk
1.65modifypkgsrc/x11/xforms/Makefile
1.12modifypkgsrc/x11/xforms/buildlink3.mk
1.48modifypkgsrc/x11/xplanet/Makefile
1.104modifypkgsrc/x11/xscreensaver/Makefile.common
1.8modifypkgsrc/x11/xvidcap/Makefile.common