From c83f002c609b793986a4857b9309624cf43a08e3 Mon Sep 17 00:00:00 2001 From: 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 --- audio/csound5/Makefile | 4 ++-- audio/dap/Makefile | 4 ++-- audio/flactag/Makefile | 4 ++-- cad/xchiplogo/Makefile | 4 ++-- chat/amsn/Makefile | 4 ++-- chat/centerim/Makefile | 4 ++-- chat/ekg/Makefile | 4 ++-- chat/ekg/buildlink3.mk | 4 ++-- comms/hylafax/Makefile | 4 ++-- comms/xtel/Makefile | 4 ++-- databases/xsqlmenu/Makefile | 4 ++-- devel/devIL/Makefile | 4 ++-- devel/devIL/buildlink3.mk | 4 ++-- devel/doxygen/Makefile | 3 ++- devel/eet/Makefile | 4 ++-- devel/eet/buildlink3.mk | 4 ++-- devel/gdl/Makefile | 4 ++-- devel/hdf/Makefile | 4 ++-- devel/hdf/buildlink3.mk | 4 ++-- devel/libgnomeui/Makefile | 4 ++-- devel/libgnomeui/buildlink3.mk | 4 ++-- devel/libgphoto2/Makefile | 4 ++-- devel/p5-SDL/Makefile | 4 ++-- devel/xulrunner/mozilla-common.mk | 4 ++-- editors/abiword/Makefile.common | 4 ++-- editors/emacs-snapshot/options.mk | 4 ++-- editors/emacs/options.mk | 4 ++-- editors/emacs21/options.mk | 4 ++-- editors/emacs22/options.mk | 4 ++-- editors/ted/Makefile | 8 ++++---- editors/xemacs-current/options.mk | 4 ++-- editors/xemacs/options.mk | 4 ++-- emulators/gcube/Makefile | 4 ++-- emulators/palmosemulator/Makefile | 4 ++-- emulators/vice/Makefile | 4 ++-- emulators/wine-devel/buildlink3.mk | 4 ++-- emulators/wine-devel/options.mk | 4 ++-- emulators/wine/Makefile | 4 ++-- emulators/wine/buildlink3.mk | 4 ++-- fonts/fontforge/Makefile | 4 ++-- games/boson/Makefile | 4 ++-- games/flightgear/Makefile | 4 ++-- games/fltk-sudoku/Makefile | 4 ++-- games/freedroid/Makefile | 4 ++-- games/neverball/Makefile | 4 ++-- games/simgear/Makefile | 4 ++-- games/simgear/buildlink3.mk | 4 ++-- games/ufoai/Makefile | 4 ++-- games/xracer/Makefile | 4 ++-- geography/gipfel/Makefile | 4 ++-- graphics/GraphicsMagick/Makefile | 4 ++-- graphics/GraphicsMagick/buildlink3.mk | 4 ++-- graphics/OpenRM/Makefile | 4 ++-- graphics/OpenRM/buildlink3.mk | 4 ++-- graphics/SDL_image/Makefile | 4 ++-- graphics/SDL_image/buildlink3.mk | 4 ++-- graphics/TiffIO/Makefile | 6 +++--- graphics/autopano-sift-C/Makefile | 4 ++-- graphics/bktr2jpeg/Makefile | 4 ++-- graphics/cambevao/Makefile | 4 ++-- graphics/camlimages/Makefile | 4 ++-- graphics/cqcam/Makefile | 4 ++-- graphics/dcraw/Makefile | 4 ++-- graphics/digikam-kde3/Makefile | 4 ++-- graphics/djview4/Makefile | 4 ++-- graphics/djvulibre-lib/Makefile | 4 ++-- graphics/djvulibre-tools/Makefile | 4 ++-- graphics/dx/Makefile | 4 ++-- graphics/enblend-enfuse/Makefile | 4 ++-- graphics/eog/Makefile | 4 ++-- graphics/epeg/Makefile | 4 ++-- graphics/epeg/buildlink3.mk | 4 ++-- graphics/evas-jpeg/Makefile | 4 ++-- graphics/f-spot/Makefile | 4 ++-- graphics/feh/Makefile | 4 ++-- graphics/flphoto/Makefile | 4 ++-- graphics/gd/Makefile | 4 ++-- graphics/gd/buildlink3.mk | 4 ++-- graphics/gdk-pixbuf/Makefile.common | 4 ++-- graphics/gdk-pixbuf/buildlink3.mk | 4 ++-- graphics/gdk-pixbuf2/Makefile | 4 ++-- graphics/gegl/Makefile | 4 ++-- graphics/gimageview/Makefile | 4 ++-- graphics/gimp-ufraw/Makefile | 4 ++-- graphics/gimp/Makefile | 4 ++-- graphics/gimp1-base/Makefile | 4 ++-- graphics/gimp1-base/buildlink3.mk | 4 ++-- graphics/gphoto2/Makefile | 6 +++--- graphics/graphviz/Makefile | 4 ++-- graphics/gst-plugins0.10-jpeg/Makefile | 4 ++-- graphics/gthumb/Makefile | 4 ++-- graphics/gtksee/Makefile | 4 ++-- graphics/h5utils/Makefile | 4 ++-- graphics/imlib/Makefile | 4 ++-- graphics/imlib/buildlink3.mk | 4 ++-- graphics/imlib2/Makefile | 4 ++-- graphics/imlib2/buildlink3.mk | 4 ++-- graphics/jasper/Makefile | 4 ++-- graphics/jasper/buildlink3.mk | 4 ++-- graphics/jpeginfo/Makefile | 4 ++-- graphics/jpegoptim/Makefile | 4 ++-- graphics/jpegpixi/Makefile | 4 ++-- graphics/kipi-plugins-kde3/Makefile | 4 ++-- graphics/lcms/Makefile | 4 ++-- graphics/libgdiplus/Makefile | 4 ++-- graphics/libgdiplus/buildlink3.mk | 4 ++-- graphics/libkdcraw/Makefile | 6 +++--- graphics/libkexiv2/Makefile | 4 ++-- graphics/libpano13/Makefile | 4 ++-- graphics/libpano13/buildlink3.mk | 4 ++-- graphics/libvideogfx/Makefile | 4 ++-- graphics/libvideogfx/buildlink3.mk | 4 ++-- graphics/libwmf/Makefile | 4 ++-- graphics/libwmf/buildlink3.mk | 4 ++-- graphics/mgl/Makefile | 4 ++-- graphics/mng/Makefile | 6 +++--- graphics/mng/buildlink3.mk | 4 ++-- graphics/opencv/Makefile | 4 ++-- graphics/osg/Makefile | 4 ++-- graphics/osg/buildlink3.mk | 4 ++-- graphics/panomatic/Makefile | 4 ++-- graphics/php-gd/Makefile | 4 ++-- graphics/ploticus/Makefile | 4 ++-- graphics/pornview/Makefile | 4 ++-- graphics/povray/Makefile | 4 ++-- graphics/py-imaging/Makefile | 4 ++-- graphics/py-imaging/buildlink3.mk | 4 ++-- graphics/resize_image/Makefile | 4 ++-- graphics/ruby-gd/Makefile | 6 +++--- graphics/ruby-gnome2-libart/Makefile | 4 ++-- graphics/sane-backends/Makefile | 4 ++-- graphics/sane-backends/buildlink3.mk | 4 ++-- graphics/simage/Makefile | 4 ++-- graphics/simage/buildlink3.mk | 4 ++-- graphics/tgif/Makefile | 4 ++-- graphics/tiff/Makefile | 4 ++-- graphics/tiff/buildlink3.mk | 4 ++-- graphics/vigra/Makefile | 4 ++-- graphics/vigra/buildlink3.mk | 4 ++-- graphics/xart/Makefile | 4 ++-- graphics/xfig/Makefile | 4 ++-- graphics/xli/Makefile | 4 ++-- graphics/xpaint/Makefile | 4 ++-- graphics/xsane/Makefile | 4 ++-- ham/fldigi/Makefile | 4 ++-- lang/kaffe-x11/Makefile | 4 ++-- lang/swi-prolog-packages/Makefile | 4 ++-- mail/spamprobe/options.mk | 4 ++-- mail/xfmail/Makefile | 4 ++-- math/R/Makefile | 4 ++-- math/grace/Makefile | 4 ++-- math/octave-forge/Makefile | 4 ++-- math/xldlas/Makefile | 4 ++-- misc/celestia/Makefile | 4 ++-- misc/fbreader/Makefile | 4 ++-- misc/openoffice2/Makefile | 4 ++-- misc/openoffice3/Makefile | 4 ++-- misc/root/Makefile | 4 ++-- multimedia/ffmpegthumbnailer/Makefile | 4 ++-- multimedia/gnash/Makefile | 4 ++-- multimedia/gpac/Makefile | 4 ++-- multimedia/kmplayer-kde3/Makefile | 4 ++-- multimedia/libflash/Makefile | 4 ++-- multimedia/libflash/buildlink3.mk | 4 ++-- multimedia/mjpegtools/Makefile | 4 ++-- multimedia/mjpegtools/buildlink3.mk | 4 ++-- multimedia/mpeg_encode/Makefile | 4 ++-- multimedia/mplayer-share/options.mk | 4 ++-- multimedia/ogle/Makefile | 4 ++-- multimedia/openquicktime/Makefile | 4 ++-- multimedia/openquicktime/buildlink3.mk | 4 ++-- multimedia/transcode/Makefile | 4 ++-- multimedia/vlc/Makefile | 4 ++-- multimedia/xawtv/Makefile | 4 ++-- net/driftnet/Makefile | 4 ++-- net/libvncserver/Makefile | 4 ++-- net/libvncserver/buildlink3.mk | 4 ++-- net/tightvnc/Makefile | 4 ++-- net/tightvncviewer/Makefile | 4 ++-- net/vino/Makefile | 4 ++-- net/xrmftp/Makefile | 4 ++-- news/knews/Makefile | 4 ++-- print/advi/Makefile | 4 ++-- print/cjk-lyx/Makefile | 4 ++-- print/cups/Makefile | 4 ++-- print/ghostscript/options.mk | 4 ++-- print/hpijs/Makefile | 4 ++-- print/img2eps/Makefile | 4 ++-- print/mupdf/Makefile | 4 ++-- print/podofo/Makefile | 4 ++-- print/podofo/buildlink3.mk | 4 ++-- print/poppler-glib/Makefile | 4 ++-- print/poppler/Makefile | 4 ++-- print/poppler/buildlink3.mk | 4 ++-- print/scribus-qt4/Makefile | 4 ++-- print/scribus/Makefile | 4 ++-- security/steghide/Makefile | 4 ++-- sysutils/xnc/Makefile | 4 ++-- time/xonclock/Makefile | 4 ++-- wm/compiz-fusion-plugins-extra/Makefile | 4 ++-- wm/compiz-fusion-plugins-main/Makefile | 4 ++-- wm/ctwm/Makefile | 8 ++++---- wm/jwm/options.mk | 4 ++-- wm/pekwm/Makefile | 4 ++-- wm/windowmaker/Makefile | 4 ++-- wm/windowmaker/buildlink3.mk | 4 ++-- www/amaya/Makefile | 4 ++-- www/chimera/Makefile | 4 ++-- www/dillo/Makefile | 4 ++-- www/htmldoc/Makefile | 4 ++-- www/mMosaic/Makefile | 4 ++-- www/swiggle/Makefile | 4 ++-- www/webkit-gtk/Makefile | 4 ++-- www/webkit-gtk/buildlink3.mk | 4 ++-- x11/XmHTML/Makefile | 4 ++-- x11/XmHTML/buildlink3.mk | 4 ++-- x11/aterm/Makefile | 8 ++++---- x11/efltk/Makefile | 4 ++-- x11/efltk/buildlink3.mk | 4 ++-- x11/fltk/Makefile | 4 ++-- x11/fltk/buildlink3.mk | 4 ++-- x11/fltk2/Makefile | 4 ++-- x11/fltk2/buildlink3.mk | 4 ++-- x11/fox/Makefile | 4 ++-- x11/fox/buildlink3.mk | 4 ++-- x11/gnustep-gui/Makefile | 4 ++-- x11/gtk2/Makefile | 4 ++-- x11/kdelibs3/Makefile | 4 ++-- x11/kdelibs3/buildlink3.mk | 4 ++-- x11/kdelibs4/Makefile | 4 ++-- x11/kdelibs4/buildlink3.mk | 4 ++-- x11/mrxvt/Makefile | 4 ++-- x11/openmotif/Makefile | 8 ++++---- x11/openmotif/buildlink3.mk | 4 ++-- x11/p5-Tk/Makefile | 4 ++-- x11/qt3-libs/Makefile | 4 ++-- x11/qt3-libs/buildlink3.mk | 4 ++-- x11/qt4-libs/Makefile | 4 ++-- x11/qt4-libs/buildlink3.mk | 4 ++-- x11/ssystem/Makefile | 4 ++-- x11/wdm/Makefile | 4 ++-- x11/wxGTK24/Makefile.common | 4 ++-- x11/wxGTK24/buildlink3.mk | 4 ++-- x11/wxGTK26-contrib/buildlink3.mk | 4 ++-- x11/wxGTK26/Makefile.common | 4 ++-- x11/wxGTK26/buildlink3.mk | 4 ++-- x11/wxGTK28-contrib/buildlink3.mk | 4 ++-- x11/wxGTK28/Makefile.common | 4 ++-- x11/wxGTK28/buildlink3.mk | 4 ++-- x11/xforms/Makefile | 4 ++-- x11/xforms/buildlink3.mk | 4 ++-- x11/xplanet/Makefile | 4 ++-- x11/xscreensaver/Makefile.common | 6 +++--- x11/xvidcap/Makefile.common | 4 ++-- 254 files changed, 522 insertions(+), 521 deletions(-) diff --git a/audio/csound5/Makefile b/audio/csound5/Makefile index be0cc835316..65acab8abae 100644 --- a/audio/csound5/Makefile +++ b/audio/csound5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/06/13 22:43:48 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:24 dsainty Exp $ # DISTNAME= Csound${CSOUND_VERSION}_src @@ -37,7 +37,7 @@ do-install: .include "../../audio/fluidsynth/buildlink3.mk" .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/swig/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../lang/python24/buildlink3.mk" .include "../../x11/fltk/buildlink3.mk" diff --git a/audio/dap/Makefile b/audio/dap/Makefile index 720c9b3c175..8969bfa081a 100644 --- a/audio/dap/Makefile +++ b/audio/dap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2010/01/18 09:58:38 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/12/23 11:44:24 dsainty Exp $ DISTNAME= dap-2.1.5 PKGREVISION= 2 @@ -24,7 +24,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO ${WRKSRC}/COPYING \ ${WRKSRC}/FEATURES ${DESTDIR}${PREFIX}/share/doc/dap -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xforms/buildlink3.mk" .include "../../mk/oss.buildlink3.mk" diff --git a/audio/flactag/Makefile b/audio/flactag/Makefile index a0e86ab5335..9fe4e80e705 100644 --- a/audio/flactag/Makefile +++ b/audio/flactag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/07/16 16:23:49 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:24 dsainty Exp $ # DISTNAME= flactag-1.1 @@ -24,7 +24,7 @@ do-install: .include "../../audio/flac/buildlink3.mk" .include "../../audio/libdiscid/buildlink3.mk" .include "../../www/neon/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../textproc/unac/buildlink3.mk" .include "../../audio/libmusicbrainz/buildlink3.mk" .include "../../devel/libslang2/buildlink3.mk" diff --git a/cad/xchiplogo/Makefile b/cad/xchiplogo/Makefile index 494a780c11d..d133bf4cd38 100644 --- a/cad/xchiplogo/Makefile +++ b/cad/xchiplogo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:40 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/12/23 11:44:25 dsainty Exp $ # DISTNAME= xchiplogo @@ -18,7 +18,7 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xchiplogo ${DESTDIR}${PREFIX}/bin/xchiplogo -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xforms/buildlink3.mk" diff --git a/chat/amsn/Makefile b/chat/amsn/Makefile index 0861db8520c..5d1acd9e844 100644 --- a/chat/amsn/Makefile +++ b/chat/amsn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/06/25 08:30:23 obache Exp $ +# $NetBSD: Makefile,v 1.17 2010/12/23 11:44:25 dsainty Exp $ # DISTNAME= amsn-0.98.3 @@ -49,6 +49,6 @@ CHECK_PORTABILITY_SKIP= utils/macosx/finishbuild.sh .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/centerim/Makefile b/chat/centerim/Makefile index b1dba7aea31..117d72c4a5c 100644 --- a/chat/centerim/Makefile +++ b/chat/centerim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/11/15 08:55:21 jnemeth Exp $ +# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:25 dsainty Exp $ # DISTNAME= centerim-4.22.9 @@ -49,7 +49,7 @@ GCC_REQD+= 3.0 # see PR 29185 .include "../../devel/ncurses/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../www/curl/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .if defined(BUILDLINK_LIBICONV_LDADD) && !empty(BUILDLINK_LIBICONV_LDADD) # diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile index bc58fba0821..475b4e92678 100644 --- a/chat/ekg/Makefile +++ b/chat/ekg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2010/01/18 09:58:40 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2010/12/23 11:44:25 dsainty Exp $ DISTNAME= ekg-1.7 PKGREVISION= 5 @@ -33,6 +33,6 @@ CONFIGURE_ARGS+= --with-pthread .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/ekg/buildlink3.mk b/chat/ekg/buildlink3.mk index 2443d5da352..9aaf8495e28 100644 --- a/chat/ekg/buildlink3.mk +++ b/chat/ekg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2010/01/18 09:58:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2010/12/23 11:44:25 dsainty Exp $ BUILDLINK_TREE+= ekg @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ekg+= ekg>=1.7nb5 BUILDLINK_PKGSRCDIR.ekg?= ../../chat/ekg .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .endif # EKG_BUILDLINK3_MK diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index bfae15b087f..66fbe21af40 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2010/01/29 16:44:13 joerg Exp $ +# $NetBSD: Makefile,v 1.62 2010/12/23 11:44:25 dsainty Exp $ VERS= 4.2.5 DISTNAME= hylafax-${VERS} @@ -64,7 +64,7 @@ CONFIGURE_ENV+= MACHDEPLIBS=-lrt .endif .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/xtel/Makefile b/comms/xtel/Makefile index 72d3ebcde9c..52e8f96a650 100644 --- a/comms/xtel/Makefile +++ b/comms/xtel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2010/01/18 09:58:42 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/12/23 11:44:26 dsainty Exp $ # DISTNAME= xtel-3.3.0 @@ -23,7 +23,7 @@ INSTALL_MAKE_FLAGS= PPPDIR=${PREFIX}/share/examples/xtel SPECIAL_PERMS+= bin/mdmdetect ${SETUID_ROOT_PERMS} -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile index 666d912a6b6..7a8cbb4738e 100644 --- a/databases/xsqlmenu/Makefile +++ b/databases/xsqlmenu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2010/09/30 10:49:16 obache Exp $ +# $NetBSD: Makefile,v 1.26 2010/12/23 11:44:26 dsainty Exp $ # DISTNAME= xsqlmenu-2.10 @@ -28,7 +28,7 @@ do-install: ${DESTDIR}${PREFIX}/share/doc/xsqlmenu .include "../../mk/mysql.buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xforms/buildlink3.mk" diff --git a/devel/devIL/Makefile b/devel/devIL/Makefile index 17c3402e466..67c39313683 100644 --- a/devel/devIL/Makefile +++ b/devel/devIL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2010/06/13 22:44:03 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2010/12/23 11:44:26 dsainty Exp $ # DISTNAME= DevIL-${DEVIL_VERSION} @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --enable-ILUT .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/devel/devIL/buildlink3.mk b/devel/devIL/buildlink3.mk index c4b6ee555dc..1f89adf1ae9 100644 --- a/devel/devIL/buildlink3.mk +++ b/devel/devIL/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:44:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2010/12/23 11:44:26 dsainty Exp $ BUILDLINK_TREE+= devIL @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.devIL?= ../../devel/devIL .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile index 175f8ae4d25..dd1509f98cc 100644 --- a/devel/doxygen/Makefile +++ b/devel/doxygen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.79 2010/11/19 19:21:37 tez Exp $ +# $NetBSD: Makefile,v 1.80 2010/12/23 11:44:26 dsainty Exp $ DISTNAME= doxygen-1.6.3.src PKGNAME= ${DISTNAME:S/.src//} @@ -74,6 +74,7 @@ post-patch: BUILDLINK_API_DEPENDS.graphviz+= graphviz>=2.12nb1 +.include "../../converters/libiconv/buildlink3.mk" .include "../../graphics/graphviz/buildlink3.mk" .include "../../lang/python/application.mk" .include "../../mk/tex.buildlink3.mk" diff --git a/devel/eet/Makefile b/devel/eet/Makefile index 3ffb291f73d..ba0e65673aa 100644 --- a/devel/eet/Makefile +++ b/devel/eet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2010/01/18 09:58:44 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2010/12/23 11:44:26 dsainty Exp $ # DISTNAME= eet-1.2.3 @@ -22,6 +22,6 @@ PKGCONFIG_OVERRIDE= eet.pc.in .include "../../devel/eina/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/eet/buildlink3.mk b/devel/eet/buildlink3.mk index 821e7b398cb..f9e71123b0c 100644 --- a/devel/eet/buildlink3.mk +++ b/devel/eet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:58:44 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:26 dsainty Exp $ BUILDLINK_TREE+= eet @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.eet?= ../../devel/eet .include "../../devel/eina/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .endif # EET_BUILDLINK3_MK diff --git a/devel/gdl/Makefile b/devel/gdl/Makefile index af579530977..2987a082a79 100644 --- a/devel/gdl/Makefile +++ b/devel/gdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2010/11/15 22:56:38 abs Exp $ +# $NetBSD: Makefile,v 1.21 2010/12/23 11:44:27 dsainty Exp $ DISTNAME= gdl-2.26.2 PKGREVISION= 5 @@ -23,6 +23,6 @@ PKGCONFIG_OVERRIDE+= gdl-1.0.pc.in .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/libgnomeui/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile index e39e6a531d9..cf8645e53ec 100644 --- a/devel/hdf/Makefile +++ b/devel/hdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2010/07/30 10:36:23 asau Exp $ +# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:27 dsainty Exp $ DISTNAME= HDF4.2r4 PKGNAME= hdf-4.2r4 @@ -36,6 +36,6 @@ do-test: .include "../../archivers/szip/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/hdf/buildlink3.mk b/devel/hdf/buildlink3.mk index 7cafcfefb4d..7cdc7e3ab20 100644 --- a/devel/hdf/buildlink3.mk +++ b/devel/hdf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/03/28 12:45:44 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/12/23 11:44:27 dsainty Exp $ BUILDLINK_TREE+= hdf @@ -12,6 +12,6 @@ BUILDLINK_PKGSRCDIR.hdf?= ../../devel/hdf .include "../../archivers/szip/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" BUILDLINK_TREE+= -hdf diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile index 04b13a00856..87ad55dec8a 100644 --- a/devel/libgnomeui/Makefile +++ b/devel/libgnomeui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2010/11/15 22:56:42 abs Exp $ +# $NetBSD: Makefile,v 1.96 2010/12/23 11:44:27 dsainty Exp $ # DISTNAME= libgnomeui-2.24.4 @@ -44,7 +44,7 @@ post-configure: .include "../../devel/libglade/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -#.include "../../graphics/jpeg/buildlink3.mk" +#.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../security/libgnome-keyring/buildlink3.mk" .include "../../sysutils/gnome-vfs/buildlink3.mk" diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk index 18fc52fdcf3..3ccab5c7a26 100644 --- a/devel/libgnomeui/buildlink3.mk +++ b/devel/libgnomeui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.32 2010/11/15 22:56:42 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2010/12/23 11:44:27 dsainty Exp $ BUILDLINK_TREE+= libgnomeui @@ -15,7 +15,7 @@ BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui .include "../../devel/libglade/buildlink3.mk" .include "../../devel/libgnome/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" -#.include "../../graphics/jpeg/buildlink3.mk" +#.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../security/libgnome-keyring/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile index 1f20ae563f5..7b38863bd84 100644 --- a/devel/libgphoto2/Makefile +++ b/devel/libgphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2010/01/18 09:58:46 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2010/12/23 11:44:27 dsainty Exp $ DISTNAME= libgphoto2-2.4.7 PKGREVISION= 2 @@ -36,6 +36,6 @@ post-install: .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libltdl/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 8179a88969b..bd3b2aef03a 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2010/08/21 16:34:22 seb Exp $ +# $NetBSD: Makefile,v 1.42 2010/12/23 11:44:27 dsainty Exp $ # DISTNAME= SDL_Perl-2.1.2 @@ -29,7 +29,7 @@ pre-configure: .include "../../devel/SDL_gfx/buildlink3.mk" .include "../../devel/SDL_ttf/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../lang/perl5/module.mk" diff --git a/devel/xulrunner/mozilla-common.mk b/devel/xulrunner/mozilla-common.mk index 972deb0e2ee..3e2ccbd13fd 100644 --- a/devel/xulrunner/mozilla-common.mk +++ b/devel/xulrunner/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.18 2010/11/13 11:54:43 tnn Exp $ +# $NetBSD: mozilla-common.mk,v 1.19 2010/12/23 11:44:28 dsainty Exp $ # # common Makefile fragment for mozilla packages based on gecko 1.9.1. # @@ -88,7 +88,7 @@ BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.7.1 CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../net/libIDL/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 .include "../../x11/gtk2/buildlink3.mk" diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common index 7102bb133c8..b155f115d9f 100644 --- a/editors/abiword/Makefile.common +++ b/editors/abiword/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2010/11/26 14:49:49 adam Exp $ +# $NetBSD: Makefile.common,v 1.41 2010/12/23 11:44:28 dsainty Exp $ # # used by editors/abiword-plugins/Makefile @@ -32,7 +32,7 @@ PATCHDIR= ${.CURDIR}/../../editors/abiword/patches .include "../../devel/libgsf-gnome/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../print/libgnomeprintui/buildlink3.mk" diff --git a/editors/emacs-snapshot/options.mk b/editors/emacs-snapshot/options.mk index 9fab2f59929..f8461d381aa 100644 --- a/editors/emacs-snapshot/options.mk +++ b/editors/emacs-snapshot/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2010/06/07 22:44:01 minskim Exp $ +# $NetBSD: options.mk,v 1.5 2010/12/23 11:44:28 dsainty Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.emacs @@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --with-tiff CONFIGURE_ARGS+= --with-gif CONFIGURE_ARGS+= --with-png -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/editors/emacs/options.mk b/editors/emacs/options.mk index 68091dda7f0..64b898a705f 100644 --- a/editors/emacs/options.mk +++ b/editors/emacs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2010/06/01 21:44:54 minskim Exp $ +# $NetBSD: options.mk,v 1.11 2010/12/23 11:44:28 dsainty Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.emacs @@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --with-tiff CONFIGURE_ARGS+= --with-gif CONFIGURE_ARGS+= --with-png -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/editors/emacs21/options.mk b/editors/emacs21/options.mk index 9a6ca2fd16d..ab126bd1827 100644 --- a/editors/emacs21/options.mk +++ b/editors/emacs21/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2007/08/13 12:40:58 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2010/12/23 11:44:28 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs PKG_SUPPORTED_OPTIONS= x11 @@ -39,7 +39,7 @@ PKG_OPTIONS+= xaw ### Support drawing pretty X11 widgets. ### .if !empty(PKG_OPTIONS:Mx11) -. include "../../graphics/jpeg/buildlink3.mk" +. include "../../mk/jpeg.buildlink3.mk" . include "../../graphics/tiff/buildlink3.mk" . include "../../graphics/png/buildlink3.mk" . include "../../x11/libXpm/buildlink3.mk" diff --git a/editors/emacs22/options.mk b/editors/emacs22/options.mk index 5740bd7ce74..2de68d39575 100644 --- a/editors/emacs22/options.mk +++ b/editors/emacs22/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1.1.1 2009/08/05 10:30:29 minskim Exp $ +# $NetBSD: options.mk,v 1.2 2010/12/23 11:44:29 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs PKG_SUPPORTED_OPTIONS= x11 @@ -32,7 +32,7 @@ PKG_OPTIONS+= xaw ### Support drawing pretty X11 widgets. ### .if !empty(PKG_OPTIONS:Mx11) -. include "../../graphics/jpeg/buildlink3.mk" +. include "../../mk/jpeg.buildlink3.mk" . include "../../graphics/tiff/buildlink3.mk" . include "../../graphics/png/buildlink3.mk" . include "../../x11/libXpm/buildlink3.mk" diff --git a/editors/ted/Makefile b/editors/ted/Makefile index ffb6a6e2053..06ff7c5ec62 100644 --- a/editors/ted/Makefile +++ b/editors/ted/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2010/07/20 09:56:50 markd Exp $ +# $NetBSD: Makefile,v 1.41 2010/12/23 11:44:29 dsainty Exp $ DISTNAME= ted-2.21.src PKGNAME= ${DISTNAME:S/.src//} @@ -22,8 +22,8 @@ AFMDIR= ${PREFIX}/share/Ted/afm INDDIR= ${PREFIX}/share/Ted/ind INFODIR= ${PREFIX}/share/doc/Ted -CONFIGURE_ENV+= ac_jpeg_includes="${BUILDLINK_PREFIX.jpeg}/include" -CONFIGURE_ENV+= ac_jpeg_libraries="${BUILDLINK_PREFIX.jpeg}/lib" +CONFIGURE_ENV+= ac_jpeg_includes="${JPEGBASE}/include" +CONFIGURE_ENV+= ac_jpeg_libraries="${JPEGBASE}/lib" CONFIGURE_ENV+= ac_png_includes="${BUILDLINK_PREFIX.png}/include" CONFIGURE_ENV+= ac_png_libraries="${BUILDLINK_PREFIX.png}/lib" CONFIGURE_ENV+= ac_tiff_includes="${BUILDLINK_PREFIX.tiff}/include" @@ -68,7 +68,7 @@ do-install: .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk index 30fc03d2b37..892c25ac717 100644 --- a/editors/xemacs-current/options.mk +++ b/editors/xemacs-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2008/04/24 21:32:47 jlam Exp $ +# $NetBSD: options.mk,v 1.12 2010/12/23 11:44:29 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS= ldap xface canna debug x11 xft @@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --enable-debug=yes --with-debug ### Support drawing pretty X11 widgets. ### .if !empty(PKG_OPTIONS:Mx11) -. include "../../graphics/jpeg/buildlink3.mk" +. include "../../mk/jpeg.buildlink3.mk" . include "../../graphics/png/buildlink3.mk" . include "../../graphics/tiff/buildlink3.mk" . include "../../x11/xbitmaps/buildlink3.mk" diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index af3e49ae416..284c15d2a6c 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.9 2009/11/09 14:09:41 joerg Exp $ +# $NetBSD: options.mk,v 1.10 2010/12/23 11:44:29 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS= ldap xface canna x11 @@ -63,7 +63,7 @@ CONFIGURE_ARGS+= --without-canna ### PLIST_VARS+= x11 .if !empty(PKG_OPTIONS:Mx11) -. include "../../graphics/jpeg/buildlink3.mk" +. include "../../mk/jpeg.buildlink3.mk" . include "../../graphics/png/buildlink3.mk" . include "../../graphics/tiff/buildlink3.mk" . include "../../x11/libXpm/buildlink3.mk" diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile index 458ad12348c..2c54b74354c 100644 --- a/emulators/gcube/Makefile +++ b/emulators/gcube/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/01/18 09:58:49 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2010/12/23 11:44:29 dsainty Exp $ # DISTNAME= gcube-0.4-src @@ -37,5 +37,5 @@ do-install: .include "../../devel/SDL/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile index a1fc321b23e..eadc1e809f3 100644 --- a/emulators/palmosemulator/Makefile +++ b/emulators/palmosemulator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2010/06/13 22:44:15 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/12/23 11:44:30 dsainty Exp $ # DISTNAME= emulator_src_${POSE_VERSION} @@ -69,7 +69,7 @@ do-install: ${INSTALL_DATA} "$$i" ${DESTDIR}${POSE_SKINS_DIR}; \ done -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/fltk/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index d05bc01a645..07050baef3e 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2010/11/15 22:56:57 abs Exp $ +# $NetBSD: Makefile,v 1.87 2010/12/23 11:44:30 dsainty Exp $ # DISTNAME= vice-2.2 @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --without-oss .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/emulators/wine-devel/buildlink3.mk b/emulators/wine-devel/buildlink3.mk index 21c4b68e1ed..d3d2f5c8e53 100644 --- a/emulators/wine-devel/buildlink3.mk +++ b/emulators/wine-devel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2010/01/18 09:58:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2010/12/23 11:44:30 dsainty Exp $ BUILDLINK_TREE+= wine @@ -17,7 +17,7 @@ pkgbase:= wine .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" .endif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .endif # WINE_BUILDLINK3_MK diff --git a/emulators/wine-devel/options.mk b/emulators/wine-devel/options.mk index 8f834e21292..7fda6f74a31 100644 --- a/emulators/wine-devel/options.mk +++ b/emulators/wine-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2008/12/07 15:32:06 jmcneill Exp $ +# $NetBSD: options.mk,v 1.3 2010/12/23 11:44:30 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wine PKG_SUPPORTED_OPTIONS= cups opengl sane esound ldap dbus hal ssl x11 @@ -46,7 +46,7 @@ CONFIGURE_ARGS+= --without-cups PLIST.x11= yes .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 15f12729bf5..982b4f840eb 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.156 2010/06/13 22:44:15 wiz Exp $ +# $NetBSD: Makefile,v 1.157 2010/12/23 11:44:30 dsainty Exp $ DISTNAME= wine-1.0.1 PKGREVISION= 5 @@ -60,7 +60,7 @@ post-install: .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../devel/ncurses/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk index 9e93df05feb..ca271ed035b 100644 --- a/emulators/wine/buildlink3.mk +++ b/emulators/wine/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2010/01/18 09:58:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2010/12/23 11:44:30 dsainty Exp $ BUILDLINK_TREE+= wine @@ -17,7 +17,7 @@ pkgbase:= wine .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" .endif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .endif # WINE_BUILDLINK3_MK diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile index 72cc6870d22..d89d48d315a 100644 --- a/fonts/fontforge/Makefile +++ b/fonts/fontforge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2010/12/07 16:58:12 drochner Exp $ +# $NetBSD: Makefile,v 1.69 2010/12/23 11:44:30 dsainty Exp $ DISTNAME= fontforge_full-${VERSION} PKGNAME= fontforge-${VERSION} @@ -37,7 +37,7 @@ LDFLAGS.SunOS+= -lrt .include "../../devel/pango/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/games/boson/Makefile b/games/boson/Makefile index 29903a291b3..0b7433fe2ef 100644 --- a/games/boson/Makefile +++ b/games/boson/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2010/07/14 11:11:20 sbd Exp $ +# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:31 dsainty Exp $ # DISTNAME= boson-all-0.8 @@ -26,6 +26,6 @@ CONFIGURE_ARGS+= --disable-debug .include "../../devel/SDL/buildlink3.mk" .include "../../games/kdegames3/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lib3ds/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index 42defae3a53..821696c66ca 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/11/15 22:57:00 abs Exp $ +# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:31 dsainty Exp $ DISTNAME= FlightGear-2.0.0 PKGNAME= ${DISTNAME:tl} @@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --with-threads BUILDLINK_API_DEPENDS.simgear+= simgear>=2.0.0 .include "../../games/simgear/buildlink3.mk" .include "../../graphics/glut/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/osg/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/fltk-sudoku/Makefile b/games/fltk-sudoku/Makefile index 778e4634d45..bbb61f94b5c 100644 --- a/games/fltk-sudoku/Makefile +++ b/games/fltk-sudoku/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:19 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:31 dsainty Exp $ DISTNAME= fltk-1.1.7-source PKGNAME= fltk-sudoku-1.1.7 @@ -55,7 +55,7 @@ do-install: BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/fltk/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile index 311e8543d42..eb2ce37c7d8 100644 --- a/games/freedroid/Makefile +++ b/games/freedroid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:19 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:31 dsainty Exp $ # DISTNAME= freedroid-1.0.2 @@ -20,6 +20,6 @@ GNU_CONFIGURE= yes #.include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/neverball/Makefile b/games/neverball/Makefile index 3bc0986d3ca..f60f7933fdb 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/06/13 22:44:22 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2010/12/23 11:44:31 dsainty Exp $ DISTNAME= neverball-1.5.4 PKGREVISION= 2 @@ -40,6 +40,6 @@ do-install: .include "../../devel/SDL/buildlink3.mk" .include "../../devel/SDL_ttf/buildlink3.mk" .include "../../devel/physfs/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/simgear/Makefile b/games/simgear/Makefile index 18008aec606..89683c30fe5 100644 --- a/games/simgear/Makefile +++ b/games/simgear/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/11/15 22:57:06 abs Exp $ +# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:32 dsainty Exp $ DISTNAME= SimGear-2.0.0 PKGNAME= ${DISTNAME:tl} @@ -25,7 +25,7 @@ BUILDLINK_API_DEPENDS.plib+= plib>=1.8.4 .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../games/plib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/osg/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/simgear/buildlink3.mk b/games/simgear/buildlink3.mk index e01bad81859..b9660035172 100644 --- a/games/simgear/buildlink3.mk +++ b/games/simgear/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2010/08/27 06:11:50 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/12/23 11:44:32 dsainty Exp $ BUILDLINK_TREE+= simgear @@ -12,7 +12,7 @@ BUILDLINK_DEPMETHOD.simgear?= build .include "../../devel/zlib/buildlink3.mk" .include "../../games/plib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # SIMGEAR_BUILDLINK3_MK BUILDLINK_TREE+= -simgear diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index 26caf83ff95..b2d9ffc74e8 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:24 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:32 dsainty Exp $ DISTNAME= ufoai-2.2.1 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ufoai/} @@ -36,7 +36,7 @@ post-install: ${TAR} -xf ${DISTDIR}/${DISTNAME}-data.tar -C ${DESTDIR}${PREFIX}/share/ufoai ${BZIP2} -d -c ${DISTDIR}/${DISTNAME}-mappack.tar.bz2 | ${TAR} -xf - -C ${DESTDIR}${PREFIX}/share/ufoai -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" diff --git a/games/xracer/Makefile b/games/xracer/Makefile index 320b458bcc1..4b401c2671b 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2010/08/21 16:34:53 seb Exp $ +# $NetBSD: Makefile,v 1.49 2010/12/23 11:44:32 dsainty Exp $ # DISTNAME= xracer-0.96.9 @@ -34,6 +34,6 @@ post-configure: do-makemaker-configure .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/Mesa/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../lang/perl5/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/gipfel/Makefile b/geography/gipfel/Makefile index 05858beeaa7..94a0521b490 100644 --- a/geography/gipfel/Makefile +++ b/geography/gipfel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:25 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/12/23 11:44:32 dsainty Exp $ # DISTNAME= gipfel-0.3.2 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_LANGUAGES= c c++ .include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/exiv2/buildlink3.mk" .include "../../math/gsl/buildlink3.mk" .include "../../x11/fltk/buildlink3.mk" diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 8b1fd059e37..0c588391a17 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2010/06/13 22:44:26 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:32 dsainty Exp $ # DISTNAME= GraphicsMagick-1.3.12 @@ -38,7 +38,7 @@ FIND_PREFIX:= URW_FONTS_DIR=urw-fonts .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jbigkit/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" diff --git a/graphics/GraphicsMagick/buildlink3.mk b/graphics/GraphicsMagick/buildlink3.mk index cd063efac96..14029fa464f 100644 --- a/graphics/GraphicsMagick/buildlink3.mk +++ b/graphics/GraphicsMagick/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:26 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:32 dsainty Exp $ BUILDLINK_TREE+= GraphicsMagick @@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.GraphicsMagick?= ../../graphics/GraphicsMagick .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jbigkit/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" diff --git a/graphics/OpenRM/Makefile b/graphics/OpenRM/Makefile index 737d75d9b75..bd0b996d513 100644 --- a/graphics/OpenRM/Makefile +++ b/graphics/OpenRM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2010/12/23 11:44:33 dsainty Exp $ # DISTNAME= openrm-devel-1.5.2 @@ -45,7 +45,7 @@ do-install: .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/OpenRM/buildlink3.mk b/graphics/OpenRM/buildlink3.mk index d74332916cb..9b63add2286 100644 --- a/graphics/OpenRM/buildlink3.mk +++ b/graphics/OpenRM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:58:55 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:44:33 dsainty Exp $ BUILDLINK_TREE+= OpenRM @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.OpenRM?= ../../graphics/OpenRM .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # OPENRM_BUILDLINK3_MK diff --git a/graphics/SDL_image/Makefile b/graphics/SDL_image/Makefile index 124741d4e5b..60c6a940215 100644 --- a/graphics/SDL_image/Makefile +++ b/graphics/SDL_image/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2010/06/13 22:44:26 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2010/12/23 11:44:33 dsainty Exp $ DISTNAME= SDL_image-1.2.10 PKGREVISION= 2 @@ -28,7 +28,7 @@ post-install: BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.10 .include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk index 355bf176fb9..b43a37c76ad 100644 --- a/graphics/SDL_image/buildlink3.mk +++ b/graphics/SDL_image/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:26 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:44:33 dsainty Exp $ BUILDLINK_TREE+= SDL_image @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image BUILDLINK_INCDIRS.SDL_image?= include/SDL .include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .endif # SDL_IMAGE_BUILDLINK3_MK diff --git a/graphics/TiffIO/Makefile b/graphics/TiffIO/Makefile index 649b2e6b116..c4e24728c3a 100644 --- a/graphics/TiffIO/Makefile +++ b/graphics/TiffIO/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:26 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:33 dsainty Exp $ # DISTNAME= TiffIO-120e @@ -21,7 +21,7 @@ PKGSRC_MAKE_ENV+= QTDIR=${QTDIR:Q} RPM_BUILD_ROOT=${DESTDIR} .include "../../devel/zlib/buildlink3.mk" BUILDLINK_API_DEPENDS.tiff+= tiff>=3.8.1 -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/qt3-libs/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" @@ -29,7 +29,7 @@ BUILDLINK_API_DEPENDS.tiff+= tiff>=3.8.1 do-configure: cd ${WRKSRC} && ${SETENV} QTDIR=${QTDIR:Q} ${QTDIR}/bin/qmake \ CONFIG+=libtiff \ - JPEG=${BUILDLINK_PREFIX.jpeg}/include \ + JPEG=${JPEGBASE}/include \ TIFF_ROOT=${BUILDLINK_PREFIX.tiff} \ ZLIB=${BUILDLINK_PREFIX.zlib} TiffIO.pro diff --git a/graphics/autopano-sift-C/Makefile b/graphics/autopano-sift-C/Makefile index f3a660c00d6..a779dd2219e 100644 --- a/graphics/autopano-sift-C/Makefile +++ b/graphics/autopano-sift-C/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/09/15 10:27:51 adam Exp $ +# $NetBSD: Makefile,v 1.8 2010/12/23 11:44:33 dsainty Exp $ DISTNAME= autopano-sift-C-2.5.1 PKGREVISION= 3 @@ -21,7 +21,7 @@ USE_LIBTOOL= yes post-extract: rm ${WRKSRC}/CMakeModules/FindPNG.cmake -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libpano13/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/graphics/bktr2jpeg/Makefile b/graphics/bktr2jpeg/Makefile index 01233f55312..8b53eba78c0 100644 --- a/graphics/bktr2jpeg/Makefile +++ b/graphics/bktr2jpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/01/18 09:58:56 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2010/12/23 11:44:33 dsainty Exp $ # DISTNAME= bktr2jpeg-1.0 @@ -19,5 +19,5 @@ INSTALL_MAKE_FLAGS= PREFIX=${DESTDIR}${PREFIX} INSTALLATION_DIRS= bin -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/cambevao/Makefile b/graphics/cambevao/Makefile index 0a47220d810..bc315abc6ab 100644 --- a/graphics/cambevao/Makefile +++ b/graphics/cambevao/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2010/09/12 19:06:42 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/12/23 11:44:34 dsainty Exp $ # DISTNAME= cambevao-2.2 @@ -31,6 +31,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cambevao.xml ${DESTDIR}${PREFIX}/share/examples/cambevao ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cambevao.README -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index 0ae5c4ff4b6..211899e29e5 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2010/06/13 22:44:27 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2010/12/23 11:44:34 dsainty Exp $ DISTNAME= camlimages-2.2.0 PKGREVISION= 9 @@ -38,7 +38,7 @@ PLIST.dll= yes .endif .include "../../lang/ocaml/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index 82186d97ac1..48da4e3acf8 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2010/01/18 09:58:57 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2010/12/23 11:44:34 dsainty Exp $ # DISTNAME= cqcam-0.91 @@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile index 5353b2bd95a..9b5ef78e445 100644 --- a/graphics/dcraw/Makefile +++ b/graphics/dcraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2010/08/06 20:49:23 bad Exp $ +# $NetBSD: Makefile,v 1.34 2010/12/23 11:44:34 dsainty Exp $ # DISTNAME= dcraw-9.04 @@ -65,5 +65,5 @@ do-install: .endfor .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/digikam-kde3/Makefile b/graphics/digikam-kde3/Makefile index 7f2ead50189..a5772894a79 100644 --- a/graphics/digikam-kde3/Makefile +++ b/graphics/digikam-kde3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/07/14 11:11:21 sbd Exp $ +# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:34 dsainty Exp $ DISTNAME= digikam-0.9.6 PKGREVISION= 7 @@ -33,7 +33,7 @@ PLIST_SUBST= HTMLDIR=${DISTNAME} .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/imlib2/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libkdcraw/buildlink3.mk" .include "../../graphics/libkexiv2/buildlink3.mk" .include "../../graphics/libkipi/buildlink3.mk" diff --git a/graphics/djview4/Makefile b/graphics/djview4/Makefile index 8b9adcb5fc0..7cfe86fba33 100644 --- a/graphics/djview4/Makefile +++ b/graphics/djview4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/11/15 22:57:12 abs Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $ # DISTNAME= djview4-4.5 @@ -21,5 +21,5 @@ USE_TOOLS+= pkg-config .include "../../x11/qt4-libs/buildlink3.mk" .include "../../x11/qt4-tools/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/djvulibre-lib/Makefile b/graphics/djvulibre-lib/Makefile index 663e2e14509..08693bd062d 100644 --- a/graphics/djvulibre-lib/Makefile +++ b/graphics/djvulibre-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/08/09 11:05:54 drochner Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $ DISTNAME= djvulibre-3.5.22 PKGNAME= djvulibre-lib-3.5.22 @@ -29,5 +29,5 @@ INSTALL_DIRS= libdjvu CFLAGS+= -march=i486 .endif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/djvulibre-tools/Makefile b/graphics/djvulibre-tools/Makefile index 2644f0c8500..770f7ed2a60 100644 --- a/graphics/djvulibre-tools/Makefile +++ b/graphics/djvulibre-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/08/09 11:05:55 drochner Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:35 dsainty Exp $ DISTNAME= djvulibre-3.5.22 PKGNAME= djvulibre-tools-3.5.22 @@ -27,6 +27,6 @@ INSTALL_DIRS= tools xmltools REPLACE_BASH+= tools/any2djvu .include "../../graphics/djvulibre-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile index fee85b3d770..0079ce456f9 100644 --- a/graphics/dx/Makefile +++ b/graphics/dx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2010/11/14 14:05:57 obache Exp $ +# $NetBSD: Makefile,v 1.55 2010/12/23 11:44:35 dsainty Exp $ DISTNAME= dx-4.4.4 PKGREVISION= 8 @@ -34,7 +34,7 @@ CONFIGURE_ENV+= ARCH="" .include "../../graphics/ImageMagick/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/graphics/enblend-enfuse/Makefile b/graphics/enblend-enfuse/Makefile index 409bb771e71..944ac7971f0 100644 --- a/graphics/enblend-enfuse/Makefile +++ b/graphics/enblend-enfuse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/12/14 18:26:34 adam Exp $ +# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:35 dsainty Exp $ DISTNAME= enblend-enfuse-4.0 # XXX distribution file has changed; remove the line below on next update @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --with-x .endif .include "../../devel/boost-headers/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/glew/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libxmi/buildlink3.mk" diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile index 480b6f9bfe3..10394f36563 100644 --- a/graphics/eog/Makefile +++ b/graphics/eog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2010/11/28 13:04:09 drochner Exp $ +# $NetBSD: Makefile,v 1.60 2010/12/23 11:44:36 dsainty Exp $ # DISTNAME= eog-2.32.1 @@ -33,7 +33,7 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.15.3 BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.20.0 .include "../../graphics/gnome-icon-theme/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" BUILDLINK_API_DEPENDS.libexif+= libexif>=0.6.12 .include "../../graphics/libexif/buildlink3.mk" diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile index b910ed54945..8f16d7d147c 100644 --- a/graphics/epeg/Makefile +++ b/graphics/epeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/01/18 09:58:58 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/12/23 11:44:36 dsainty Exp $ # DISTNAME= epeg-0.9.0 @@ -16,5 +16,5 @@ GNU_CONFIGURE= YES USE_LIBTOOL= YES .include "../../devel/libltdl/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/epeg/buildlink3.mk b/graphics/epeg/buildlink3.mk index 85cce374ad7..16957bef0ac 100644 --- a/graphics/epeg/buildlink3.mk +++ b/graphics/epeg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2010/01/18 09:58:58 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2010/12/23 11:44:36 dsainty Exp $ BUILDLINK_TREE+= epeg @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.epeg?= epeg>=0.9.0nb3 BUILDLINK_PKGSRCDIR.epeg?= ../../graphics/epeg .include "../../devel/libltdl/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # EPEG_BUILDLINK3_MK BUILDLINK_TREE+= -epeg diff --git a/graphics/evas-jpeg/Makefile b/graphics/evas-jpeg/Makefile index f6c30e6f3f0..17b08bcef46 100644 --- a/graphics/evas-jpeg/Makefile +++ b/graphics/evas-jpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/01/18 09:58:58 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:36 dsainty Exp $ PKGNAME= ${DISTNAME:S/evas/evas-jpeg/} PKGREVISION= 2 @@ -16,5 +16,5 @@ MAKE_FLAGS+= module_la_LIBADD="\$${eavs_image_loader_jpeg_libs} \$${EINA_LIBS} $ .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile index 77ac14ffa4c..3cacc7aa91c 100644 --- a/graphics/f-spot/Makefile +++ b/graphics/f-spot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2010/11/18 23:59:17 obache Exp $ +# $NetBSD: Makefile,v 1.26 2010/12/23 11:44:36 dsainty Exp $ # DISTNAME= f-spot-0.6.2 @@ -48,7 +48,7 @@ GCONF_SCHEMAS= f-spot.schemas .include "../../devel/libgphoto2/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../lang/mono/buildlink3.mk" diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile index 4e9d7276459..21349f3e695 100644 --- a/graphics/feh/Makefile +++ b/graphics/feh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2010/12/19 12:32:42 dsainty Exp $ +# $NetBSD: Makefile,v 1.40 2010/12/23 11:44:36 dsainty Exp $ # DISTNAME= feh-1.3.4 @@ -28,7 +28,7 @@ BUILDLINK_API_DEPENDS.giblib+= giblib>=1.2.4 BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../devel/giblib/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile index 3739b3757be..295c186cad7 100644 --- a/graphics/flphoto/Makefile +++ b/graphics/flphoto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/06/13 22:44:30 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2010/12/23 11:44:36 dsainty Exp $ # DISTNAME= flphoto-1.2-source @@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes .include "../../x11/fltk/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../print/cups/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 5505987e6c0..fbe3c9e05a9 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2010/06/23 03:02:37 dsainty Exp $ +# $NetBSD: Makefile,v 1.85 2010/12/23 11:44:37 dsainty Exp $ DISTNAME= gd-2.0.35 PKGREVISION= 6 @@ -33,7 +33,7 @@ CONFIGURE_ENV+= ac_cv_path_LIBPNG12_CONFIG="" .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/graphics/gd/buildlink3.mk b/graphics/gd/buildlink3.mk index 173230f74db..cff3e7bfa9e 100644 --- a/graphics/gd/buildlink3.mk +++ b/graphics/gd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2010/06/13 22:44:30 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:44:37 dsainty Exp $ BUILDLINK_TREE+= gd @@ -21,7 +21,7 @@ pkgbase := gd .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common index 7a65dc7277f..a90e4cd2bc0 100644 --- a/graphics/gdk-pixbuf/Makefile.common +++ b/graphics/gdk-pixbuf/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.46 2007/01/08 16:07:31 joerg Exp $ +# $NetBSD: Makefile.common,v 1.47 2010/12/23 11:44:37 dsainty Exp $ DISTNAME= gdk-pixbuf-${VER}.0 CATEGORIES= graphics devel @@ -25,7 +25,7 @@ PATCHDIR= ${.CURDIR}/../gdk-pixbuf/patches BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk index 29d715a6abb..e3e51ffcc44 100644 --- a/graphics/gdk-pixbuf/buildlink3.mk +++ b/graphics/gdk-pixbuf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2010/06/13 22:44:31 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2010/12/23 11:44:37 dsainty Exp $ BUILDLINK_TREE+= gdk-pixbuf @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf BUILDLINK_CPPFLAGS.gdk-pixbuf+= \ -I${BUILDLINK_PREFIX.gdk-pixbuf}/include/gdk-pixbuf-1.0 -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile index 3534685ce3a..8246542eef5 100644 --- a/graphics/gdk-pixbuf2/Makefile +++ b/graphics/gdk-pixbuf2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/11/14 20:11:41 drochner Exp $ +# $NetBSD: Makefile,v 1.3 2010/12/23 11:44:37 dsainty Exp $ # DISTNAME= gdk-pixbuf-2.22.1 @@ -35,6 +35,6 @@ post-install: BUILDLINK_API_DEPENDS.glib2+= glib2>=2.26.0 .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 29962199af9..9c1c7e60f1b 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/11/15 22:57:14 abs Exp $ +# $NetBSD: Makefile,v 1.17 2010/12/23 11:44:37 dsainty Exp $ DISTNAME= gegl-0.1.2 PKGREVISION= 3 @@ -36,7 +36,7 @@ PLIST.v4l= yes BUILDLINK_API_DEPENDS.babl+= babl>=0.1.2 .include "../../graphics/babl/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index b097e83f94c..1de55aab119 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2010/11/15 22:57:14 abs Exp $ +# $NetBSD: Makefile,v 1.64 2010/12/23 11:44:37 dsainty Exp $ DISTNAME= gimageview-0.2.27 PKGREVISION= 20 @@ -27,7 +27,7 @@ LDFLAGS.NetBSD+= ${PTHREAD_LDFLAGS} .include "../../archivers/bzip2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/libwmf/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile index 1214fd2ca32..d14742c1a95 100644 --- a/graphics/gimp-ufraw/Makefile +++ b/graphics/gimp-ufraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2010/11/15 22:57:17 abs Exp $ +# $NetBSD: Makefile,v 1.62 2010/12/23 11:44:38 dsainty Exp $ DISTNAME= ufraw-0.17 PKGNAME= gimp-${DISTNAME} @@ -43,7 +43,7 @@ PKG_SUGGESTED_OPTIONS= lensfun .include "../../graphics/exiv2/buildlink3.mk" .include "../../graphics/gimp/buildlink3.mk" .include "../../graphics/gtkimageview/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index 21050408e51..b429e5e28ad 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.200 2010/11/15 22:57:15 abs Exp $ +# $NetBSD: Makefile,v 1.201 2010/12/23 11:44:38 dsainty Exp $ DISTNAME= gimp-2.6.11 PKGREVISION= 2 @@ -64,7 +64,7 @@ PLIST.twain= yes .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/babl/buildlink3.mk" .include "../../graphics/gegl/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile index 9da5d2a224a..42ec20566bb 100644 --- a/graphics/gimp1-base/Makefile +++ b/graphics/gimp1-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2010/06/13 22:44:33 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2010/12/23 11:44:38 dsainty Exp $ # DISTNAME= gimp-1.2.5 @@ -59,7 +59,7 @@ pre-build: ${FILESDIR}/pdb_self_doc.c .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../multimedia/mpeg-lib/buildlink3.mk" diff --git a/graphics/gimp1-base/buildlink3.mk b/graphics/gimp1-base/buildlink3.mk index 06b819df115..1782fda7b3d 100644 --- a/graphics/gimp1-base/buildlink3.mk +++ b/graphics/gimp1-base/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:33 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:38 dsainty Exp $ BUILDLINK_TREE+= gimp-base @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.gimp-base+= gimp-base>=1.2.5nb10 BUILDLINK_PKGSRCDIR.gimp-base?= ../../graphics/gimp1-base .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../multimedia/mpeg-lib/buildlink3.mk" diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 44f96033d72..082c0ffe07e 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2010/01/18 09:59:01 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2010/12/23 11:44:38 dsainty Exp $ DISTNAME= gphoto2-2.4.7 PKGREVISION= 2 @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-aalib-prefix=${BUILDLINK_PREFIX.aalib} CONFIGURE_ARGS+= --with-cdk-prefix=${BUILDLINK_PREFIX.cdk} CONFIGURE_ARGS+= --with-exif-prefix=${BUILDLINK_PREFIX.libexif} -CONFIGURE_ARGS+= --with-jpeg-prefix=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-jpeg-prefix=${JPEGBASE} # uses rl_completion_matches() (NetBSD 3.* don't have) and rl_copy_text() USE_GNU_READLINE= yes @@ -34,5 +34,5 @@ CFLAGS.Darwin+= -D_DARWIN_C_SOURCE .include "../../devel/popt/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../graphics/aalib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 864a5b64581..1cebd37375f 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2010/11/17 15:46:21 dholland Exp $ +# $NetBSD: Makefile,v 1.88 2010/12/23 11:44:38 dsainty Exp $ DISTNAME= graphviz-2.26.3 CATEGORIES= graphics @@ -77,7 +77,7 @@ post-install: .include "../../devel/libltdl/buildlink3.mk" #.include "../../devel/libltdl/convenience.mk" .include "../../fonts/fontconfig/buildlink3.mk" -#.include "../../graphics/jpeg/buildlink3.mk" +#.include "../../mk/jpeg.buildlink3.mk" #.include "../../graphics/png/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/graphics/gst-plugins0.10-jpeg/Makefile b/graphics/gst-plugins0.10-jpeg/Makefile index 7e700f3ff0e..555efde274e 100644 --- a/graphics/gst-plugins0.10-jpeg/Makefile +++ b/graphics/gst-plugins0.10-jpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/02/16 13:17:28 drochner Exp $ +# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:39 dsainty Exp $ # GST_PLUGINS0.10_NAME= jpeg @@ -8,5 +8,5 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../multimedia/gst-plugins0.10-good/Makefile.common" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile index deb583449d2..6759869de2c 100644 --- a/graphics/gthumb/Makefile +++ b/graphics/gthumb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2010/12/04 21:16:35 adam Exp $ +# $NetBSD: Makefile,v 1.57 2010/12/23 11:44:39 dsainty Exp $ DISTNAME= gthumb-2.12.1 PKGREVISION= 1 @@ -35,7 +35,7 @@ GCONF_SCHEMAS+= gthumb_webalbums.schemas .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/exiv2/buildlink3.mk" .include "../../graphics/libgnomecanvas/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" #.include "../../net/ORBit2/buildlink3.mk" diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index 7ab93f66b96..da468f7e1a0 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:35 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2010/12/23 11:44:39 dsainty Exp $ # DISTNAME= gtksee-0.5.6 @@ -25,7 +25,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/TODO ${DESTDIR}${PREFIX}/share/doc/gtksee .include "../../x11/gtk/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/h5utils/Makefile b/graphics/h5utils/Makefile index 9c2302a0983..75b46b4eee7 100644 --- a/graphics/h5utils/Makefile +++ b/graphics/h5utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2010/06/13 22:44:35 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/12/23 11:44:39 dsainty Exp $ # DISTNAME= h5utils-1.12.1 @@ -20,6 +20,6 @@ pre-install: .include "../../devel/hdf5/buildlink3.mk" .include "../../devel/hdf/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../math/libmatheval/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 8887096f90d..49ddc635d55 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2010/06/13 22:44:36 wiz Exp $ +# $NetBSD: Makefile,v 1.106 2010/12/23 11:44:39 dsainty Exp $ DISTNAME= imlib-1.9.15 PKGREVISION= 7 @@ -53,7 +53,7 @@ post-install: BUILDLINK_DEPMETHOD.libXt?= build .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/netpbm/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/imlib/buildlink3.mk b/graphics/imlib/buildlink3.mk index 90ea0abf7d1..10dc542bfc5 100644 --- a/graphics/imlib/buildlink3.mk +++ b/graphics/imlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2010/06/13 22:44:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/12/23 11:44:39 dsainty Exp $ BUILDLINK_TREE+= imlib @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.imlib+= imlib>=1.9.15nb7 BUILDLINK_PKGSRCDIR.imlib?= ../../graphics/imlib .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/netpbm/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index cc51f1fb175..6c0f52400f9 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2010/06/13 22:44:36 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2010/12/23 11:44:40 dsainty Exp $ DISTNAME= imlib2-1.4.2 PKGREVISION= 5 @@ -38,7 +38,7 @@ SUBST_SED.shlib+= -e 's,"\.so",".${SHLIB_SUFFIX}",' .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/graphics/imlib2/buildlink3.mk b/graphics/imlib2/buildlink3.mk index 27fb670655a..3f03637c154 100644 --- a/graphics/imlib2/buildlink3.mk +++ b/graphics/imlib2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2010/06/13 22:44:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2010/12/23 11:44:40 dsainty Exp $ BUILDLINK_TREE+= imlib2 @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.imlib2?= ../../graphics/imlib2 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index 173cf2638a9..a59e80caf31 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2010/01/18 09:59:03 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2010/12/23 11:44:40 dsainty Exp $ DISTNAME= jasper-1.900.1 PKGREVISION= 5 @@ -24,5 +24,5 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/jasper.pdf ${DESTDIR}${PREFIX}/share/doc/jasper ${INSTALL_DATA} ${WRKSRC}/doc/jpeg2000.pdf ${DESTDIR}${PREFIX}/share/doc/jasper -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/jasper/buildlink3.mk b/graphics/jasper/buildlink3.mk index 9b012a7a8bc..bd849c24abe 100644 --- a/graphics/jasper/buildlink3.mk +++ b/graphics/jasper/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:40 dsainty Exp $ BUILDLINK_TREE+= jasper @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.jasper+= jasper>=1.600.0 BUILDLINK_ABI_DEPENDS.jasper+= jasper>=1.900.1nb5 BUILDLINK_PKGSRCDIR.jasper?= ../../graphics/jasper -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # JASPER_BUILDLINK3_MK BUILDLINK_TREE+= -jasper diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile index 9016c5d5a1f..efc54a70eee 100644 --- a/graphics/jpeginfo/Makefile +++ b/graphics/jpeginfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2010/12/12 15:25:59 adam Exp $ +# $NetBSD: Makefile,v 1.9 2010/12/23 11:44:40 dsainty Exp $ DISTNAME= jpeginfo-1.6.1 CATEGORIES= graphics @@ -17,5 +17,5 @@ GNU_CONFIGURE= yes pre-configure: cd ${WRKSRC} && autoconf -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile index 6c437c51f7f..6f33ceb17c9 100644 --- a/graphics/jpegoptim/Makefile +++ b/graphics/jpegoptim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/11/10 19:56:38 adam Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:40 dsainty Exp $ DISTNAME= jpegoptim-1.2.3 PKGREVISION= 1 @@ -21,5 +21,5 @@ INSTALL_MAKE_FLAGS+= bindir=${DESTDIR}${PREFIX}/bin \ pre-configure: cd ${WRKSRC} && autoconf -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/jpegpixi/Makefile b/graphics/jpegpixi/Makefile index a251c8a5389..d6102ceb4c4 100644 --- a/graphics/jpegpixi/Makefile +++ b/graphics/jpegpixi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:03 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/12/23 11:44:40 dsainty Exp $ DISTNAME= jpegpixi-1.1.1 PKGREVISION= 2 @@ -16,5 +16,5 @@ GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/kipi-plugins-kde3/Makefile b/graphics/kipi-plugins-kde3/Makefile index f2a8f16be46..6f297fad846 100644 --- a/graphics/kipi-plugins-kde3/Makefile +++ b/graphics/kipi-plugins-kde3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/11/15 22:57:21 abs Exp $ +# $NetBSD: Makefile,v 1.8 2010/12/23 11:44:41 dsainty Exp $ DISTNAME= kipi-plugins-0.1.7 PKGREVISION= 11 @@ -26,7 +26,7 @@ DEPENDS+= ImageMagick>=5.5.4:../../graphics/ImageMagick BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.7.0 .include "../../audio/libgpod/buildlink3.mk" .include "../../devel/libgphoto2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=0.1.4 .include "../../graphics/libkdcraw/buildlink3.mk" .include "../../graphics/libkexiv2/buildlink3.mk" diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index aae8128c160..31c27997b60 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2010/06/16 15:17:58 drochner Exp $ +# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:41 dsainty Exp $ DISTNAME= lcms-1.19 CATEGORIES= graphics @@ -30,6 +30,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/${_f_} ${DESTDIR}${PREFIX}/share/doc/lcms/${_f_} .endfor -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile index 48bb91095c7..d34b49075c1 100644 --- a/graphics/libgdiplus/Makefile +++ b/graphics/libgdiplus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2010/12/09 08:31:40 kefren Exp $ +# $NetBSD: Makefile,v 1.50 2010/12/23 11:44:41 dsainty Exp $ DISTNAME= libgdiplus-2.8.1 PKGREVISION= 2 @@ -29,7 +29,7 @@ BUILDLINK_TRANSFORM+= rm:-Werror .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/graphics/libgdiplus/buildlink3.mk b/graphics/libgdiplus/buildlink3.mk index f9182e89478..05c525d050d 100644 --- a/graphics/libgdiplus/buildlink3.mk +++ b/graphics/libgdiplus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2010/12/09 08:31:40 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2010/12/23 11:44:41 dsainty Exp $ BUILDLINK_TREE+= libgdiplus @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libgdiplus?= ../../graphics/libgdiplus .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/graphics/libkdcraw/Makefile b/graphics/libkdcraw/Makefile index 7698e28b01c..d732c17c8e4 100644 --- a/graphics/libkdcraw/Makefile +++ b/graphics/libkdcraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2010/07/14 11:11:14 sbd Exp $ +# $NetBSD: Makefile,v 1.19 2010/12/23 11:44:41 dsainty Exp $ # DISTNAME= libkdcraw-0.1.9 @@ -20,7 +20,7 @@ USE_LANGUAGES= c c++ USE_LIBTOOL= yes # needed by **** libjpeg detection -CONFIGURE_ARGS+= --includedir=${BUILDLINK_PREFIX.jpeg:Q}/include +CONFIGURE_ARGS+= --includedir=${JPEGBASE:Q}/include PKGCONFIG_OVERRIDE+= libkdcraw/libkdcraw.pc.in @@ -30,6 +30,6 @@ BUILDLINK_API_DEPENDS.qt3-libs+= qt3-libs>=3.3 .include "../../x11/kdelibs3/buildlink3.mk" BUILDLINK_API_DEPENDS.lcms+= lcms>=1.14 .include "../../graphics/lcms/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index 897a56197b4..3d41faedcf1 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/07/14 11:11:14 sbd Exp $ +# $NetBSD: Makefile,v 1.20 2010/12/23 11:44:41 dsainty Exp $ # DISTNAME= libkexiv2-0.1.9 @@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE+= libkexiv2/libkexiv2.pc.in .include "../../meta-pkgs/kde3/kde3.mk" .include "../../graphics/exiv2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index d73a3385f5e..cd013800617 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/09/15 10:13:26 adam Exp $ +# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:42 dsainty Exp $ DISTNAME= libpano13-2.9.17 CATEGORIES= graphics @@ -17,7 +17,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= libpano13.pc.in -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/libpano13/buildlink3.mk b/graphics/libpano13/buildlink3.mk index a93e1d37506..9d0d71d2783 100644 --- a/graphics/libpano13/buildlink3.mk +++ b/graphics/libpano13/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2010/09/15 10:13:26 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2010/12/23 11:44:42 dsainty Exp $ BUILDLINK_TREE+= libpano13 @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libpano13+= libpano13>=2.9.17 BUILDLINK_ABI_DEPENDS.libpano13+= libpano13>=2.9.17 BUILDLINK_PKGSRCDIR.libpano13?= ../../graphics/libpano13 -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .endif # LIBPANO13_BUILDLINK3_MK diff --git a/graphics/libvideogfx/Makefile b/graphics/libvideogfx/Makefile index 6ebf8220996..92f3f2ea8ba 100644 --- a/graphics/libvideogfx/Makefile +++ b/graphics/libvideogfx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:38 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2010/12/23 11:44:42 dsainty Exp $ # DISTNAME= libvideogfx-1.0.3 @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/graphics/libvideogfx/buildlink3.mk b/graphics/libvideogfx/buildlink3.mk index 9bd9da0d8dd..47d08c4023b 100644 --- a/graphics/libvideogfx/buildlink3.mk +++ b/graphics/libvideogfx/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:44:38 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:42 dsainty Exp $ BUILDLINK_TREE+= libvideogfx @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libvideogfx+= libvideogfx>=1.0.3 BUILDLINK_ABI_DEPENDS.libvideogfx+= libvideogfx>=1.0.3nb6 BUILDLINK_PKGSRCDIR.libvideogfx?= ../../graphics/libvideogfx -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .endif # LIBVIDEOGFX_BUILDLINK3_MK diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index b7f53e88e17..11448098815 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2010/11/11 11:38:36 adam Exp $ +# $NetBSD: Makefile,v 1.67 2010/12/23 11:44:42 dsainty Exp $ DISTNAME= libwmf-0.2.8.4 PKGREVISION= 8 @@ -25,7 +25,7 @@ post-install: .include "options.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/graphics/libwmf/buildlink3.mk b/graphics/libwmf/buildlink3.mk index 7f2d8954bc6..08e1a1e55c6 100644 --- a/graphics/libwmf/buildlink3.mk +++ b/graphics/libwmf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2010/11/11 11:38:36 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/12/23 11:44:42 dsainty Exp $ BUILDLINK_TREE+= libwmf @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libwmf+= libwmf>=0.2.8.4nb7 BUILDLINK_PKGSRCDIR.libwmf?= ../../graphics/libwmf .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile index 950e9fbac4d..df291c114af 100644 --- a/graphics/mgl/Makefile +++ b/graphics/mgl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2010/06/13 22:44:39 wiz Exp $ +# $NetBSD: Makefile,v 1.34 2010/12/23 11:44:42 dsainty Exp $ # DISTNAME= mgl2-alpha-020 @@ -111,7 +111,7 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/nine/${i} ${DESTDIR}${PREFIX}/share/doc/mgl2/nine/ .endfor -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/graphics/mng/Makefile b/graphics/mng/Makefile index e37dd2b2d32..bab81ac351a 100644 --- a/graphics/mng/Makefile +++ b/graphics/mng/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:43 dsainty Exp $ DISTNAME= libmng-1.0.10 PKGNAME= mng-1.0.10 @@ -20,7 +20,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= automake -CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-jpeg=${JPEGBASE} CONFIGURE_ARGS+= --with-lcms=${BUILDLINK_PREFIX.lcms} CPPFLAGS+= ${BUILDLINK_CPPFLAGS.lcms} @@ -46,7 +46,7 @@ post-install: ${INSTALL_MAN} jng.5 mng.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk index c582b5a4353..e87d44ba3a4 100644 --- a/graphics/mng/buildlink3.mk +++ b/graphics/mng/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/01/18 09:59:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:43 dsainty Exp $ BUILDLINK_TREE+= mng @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.mng+= mng>=1.0.10nb2 BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .endif # MNG_BUILDLINK3_MK diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index d1487e57893..c55733ac555 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/12/05 10:36:40 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:43 dsainty Exp $ # DISTNAME= OpenCV-2.2.0 @@ -34,7 +34,7 @@ CMAKE_ARGS+= -D BUILD_NEW_PYTHON_SUPPORT=OFF .include "../../x11/gtk2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index bd55c25b8d9..c0bbbb2b1d4 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/11/15 22:57:23 abs Exp $ +# $NetBSD: Makefile,v 1.5 2010/12/23 11:44:43 dsainty Exp $ DISTNAME= OpenSceneGraph-${OSGVER} PKGNAME= osg-${OSGVER} @@ -29,7 +29,7 @@ CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" diff --git a/graphics/osg/buildlink3.mk b/graphics/osg/buildlink3.mk index 340413825f3..a82cfad486f 100644 --- a/graphics/osg/buildlink3.mk +++ b/graphics/osg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2010/11/15 22:57:23 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2010/12/23 11:44:43 dsainty Exp $ BUILDLINK_TREE+= osg @@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.osg?= ../../graphics/osg .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/librsvg/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" diff --git a/graphics/panomatic/Makefile b/graphics/panomatic/Makefile index c34b4afce9a..245fbd702ff 100644 --- a/graphics/panomatic/Makefile +++ b/graphics/panomatic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:40 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/12/23 11:44:43 dsainty Exp $ DISTNAME= panomatic-0.9.4-src PKGNAME= panomatic-0.9.4 @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes .include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index e298f357af5..d5d26ad13bb 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2010/07/24 22:24:21 tron Exp $ +# $NetBSD: Makefile,v 1.25 2010/12/23 11:44:43 dsainty Exp $ MODNAME= gd CATEGORIES+= graphics @@ -24,7 +24,7 @@ USE_PHP_EXT_PATCHES= yes .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../lang/php/ext.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile index 417eaee0cb6..e198b771698 100644 --- a/graphics/ploticus/Makefile +++ b/graphics/ploticus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2010/06/13 22:44:41 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/12/23 11:44:44 dsainty Exp $ DISTNAME= pl231src PKGNAME= ploticus-2.31pl4 @@ -42,7 +42,7 @@ do-install: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/graphics/pornview/Makefile b/graphics/pornview/Makefile index 716a1d24215..3bb9b3ca8a9 100644 --- a/graphics/pornview/Makefile +++ b/graphics/pornview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/11/15 22:57:23 abs Exp $ +# $NetBSD: Makefile,v 1.13 2010/12/23 11:44:44 dsainty Exp $ # PKGNAME= pornview-0.2.0pre1 @@ -24,6 +24,6 @@ REPLACE_PERL+= src/scripts/helloworld .include "options.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 4cd2f93097f..83b64504355 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2010/06/13 22:44:41 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2010/12/23 11:44:44 dsainty Exp $ DISTNAME= povray-3.6.1 PKGREVISION= 8 @@ -40,7 +40,7 @@ INSTALLATION_DIRS= share/povray-3.6/scripts BUILDLINK_DEPMETHOD.libXt?= build .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index 15a5108779b..9f91136f58d 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2010/07/19 17:45:02 drochner Exp $ +# $NetBSD: Makefile,v 1.38 2010/12/23 11:44:44 dsainty Exp $ DISTNAME= Imaging-1.1.7 PKGNAME= ${PYPKGPREFIX}-imaging-1.1.7 @@ -34,5 +34,5 @@ post-install: .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" .include "../../lang/python/extension.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk index 93d961ef962..f3b9145aca2 100644 --- a/graphics/py-imaging/buildlink3.mk +++ b/graphics/py-imaging/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:07 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:44 dsainty Exp $ BUILDLINK_TREE+= pyimaging @@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4 BUILDLINK_ABI_DEPENDS.pyimaging?= ${PYPKGPREFIX}-imaging>=1.1.7nb1 BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # PY_IMAGING_BUILDLINK3_MK BUILDLINK_TREE+= -pyimaging diff --git a/graphics/resize_image/Makefile b/graphics/resize_image/Makefile index 127a8f99427..d414ffb9db0 100644 --- a/graphics/resize_image/Makefile +++ b/graphics/resize_image/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:07 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:44 dsainty Exp $ # DISTNAME= resize_image-0.6 @@ -20,5 +20,5 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/resize_image ${DESTDIR}${PREFIX}/bin -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" 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" diff --git a/graphics/ruby-gnome2-libart/Makefile b/graphics/ruby-gnome2-libart/Makefile index d4dd4919baf..223dd5fb077 100644 --- a/graphics/ruby-gnome2-libart/Makefile +++ b/graphics/ruby-gnome2-libart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2010/10/23 12:45:11 obache Exp $ +# $NetBSD: Makefile,v 1.15 2010/12/23 11:44:45 dsainty Exp $ # PKGNAME= ${RUBY_PKGPREFIX}-gnome2-libart-${VERSION} @@ -14,7 +14,7 @@ RUBY_EXTCONF_SUBDIRS= libart BUILD_DEPENDS+= ${RUBY_PKGPREFIX}-gnome2-glib>=${VERSION}:../../devel/ruby-gnome2-glib -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../devel/ruby-pkg-config/tool.mk" diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index a0d7e430229..546184cc052 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2010/09/19 15:06:18 wiz Exp $ +# $NetBSD: Makefile,v 1.47 2010/12/23 11:44:45 dsainty Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -64,6 +64,6 @@ CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/sane.d/${f} .if (${OPSYS} != "SunOS") . include "../../devel/libusb/buildlink3.mk" .endif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk index 223ca0662ec..bb26e8cce60 100644 --- a/graphics/sane-backends/buildlink3.mk +++ b/graphics/sane-backends/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:08 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2010/12/23 11:44:45 dsainty Exp $ BUILDLINK_TREE+= sane-backends @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.sane-backends?= ../../graphics/sane-backends .if (${OPSYS} != "SunOS") . include "../../devel/libusb/buildlink3.mk" .endif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # SANE_BACKENDS_BUILDLINK3_MK BUILDLINK_TREE+= -sane-backends diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index 0d07d51950c..0edc5fd632e 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/06/13 22:44:45 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:45 dsainty Exp $ DISTNAME= simage-1.6.1 PKGREVISION= 8 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --with-xwd --with-mpeg2enc .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/graphics/simage/buildlink3.mk b/graphics/simage/buildlink3.mk index deff954c936..97700f31b9d 100644 --- a/graphics/simage/buildlink3.mk +++ b/graphics/simage/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2010/06/13 22:44:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2010/12/23 11:44:45 dsainty Exp $ BUILDLINK_TREE+= simage @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.simage?= ../../graphics/simage .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" .endif # SIMAGE_BUILDLINK3_MK diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile index 289393ec939..093290c05e9 100644 --- a/graphics/tgif/Makefile +++ b/graphics/tgif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2010/12/23 11:44:46 dsainty Exp $ # DISTNAME= tgif-4.2.2 @@ -28,7 +28,7 @@ post-patch:: @${RM} -f ${WRKSRC}/Tgif.tmpl @${CP} ${OS_TEMPLATE} ${WRKSRC}/Tgif.tmpl -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index f92fc4c9ab1..b62f032d218 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.97 2010/08/04 17:48:22 tron Exp $ +# $NetBSD: Makefile,v 1.98 2010/12/23 11:44:46 dsainty Exp $ DISTNAME= tiff-3.9.4 PKGREVISION= 1 @@ -35,5 +35,5 @@ post-install: .include "options.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/tiff/buildlink3.mk b/graphics/tiff/buildlink3.mk index a2315605b64..84c7d22d2fa 100644 --- a/graphics/tiff/buildlink3.mk +++ b/graphics/tiff/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2010/01/18 09:59:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2010/12/23 11:44:46 dsainty Exp $ BUILDLINK_TREE+= tiff @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.tiff+= tiff>=3.9.2nb1 BUILDLINK_PKGSRCDIR.tiff?= ../../graphics/tiff .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # TIFF_BUILDLINK3_MK BUILDLINK_TREE+= -tiff diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 16e83cd7389..d758e201f8a 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/10/16 15:50:21 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:46 dsainty Exp $ # DISTNAME= vigra-1.7.0-src @@ -26,7 +26,7 @@ INSTALL_MAKE_FLAGS+= libdir=${DESTDIR}${PREFIX}/lib .include "options.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/vigra/buildlink3.mk b/graphics/vigra/buildlink3.mk index bf77e3e6dff..0718d8c9dee 100644 --- a/graphics/vigra/buildlink3.mk +++ b/graphics/vigra/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2010/10/19 09:13:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2010/12/23 11:44:46 dsainty Exp $ BUILDLINK_TREE+= vigra @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.vigra+= vigra>=1.7.0 BUILDLINK_PKGSRCDIR.vigra?= ../../graphics/vigra .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .endif # VIGRA_BUILDLINK3_MK diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile index bb88d69442b..e8262eb4253 100644 --- a/graphics/xart/Makefile +++ b/graphics/xart/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2010/06/13 22:44:46 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2010/12/23 11:44:46 dsainty Exp $ # DISTNAME= xart19980415 @@ -21,7 +21,7 @@ post-extract: cd ${WRKDIR} && find * -type d -exec chmod 755 "{}" ";" cd ${WRKDIR} && find * -type f -print | xargs chmod 644 -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index c0401d7fb11..58c7bd7ddb6 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2010/06/13 22:44:46 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2010/12/23 11:44:46 dsainty Exp $ DISTNAME= xfig.3.2.5b.full PKGNAME= xfig-3.2.5b @@ -62,7 +62,7 @@ XFIGDOCDIR= ${PREFIX}/share/doc/xfig post-install: ${INSTALL_DATA} ${WRKSRC}/Doc/FORMAT?.? ${DESTDIR}${XFIGDOCDIR} -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index e1eff09b0f7..ef350408e90 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2010/06/13 22:44:46 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2010/12/23 11:44:47 dsainty Exp $ DISTNAME= xli-2005-02-27 PKGNAME= xli-1.17.0 @@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_IMAKE= YES INSTALLATION_DIRS+= lib/X11/app-defaults -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile index 878de024d9a..f9511cd7733 100644 --- a/graphics/xpaint/Makefile +++ b/graphics/xpaint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2010/06/13 22:44:46 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2010/12/23 11:44:47 dsainty Exp $ DISTNAME= xpaint-2.7.8.1 PKGREVISION= 5 @@ -28,7 +28,7 @@ SUBST_SED.foo= -e "s|@LOCALBASE@|${LOCALBASE}|g" \ pre-configure: cd ${WRKSRC} && ./configure xaw3dg -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 7928c0ba387..73274c8e681 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2010/11/15 22:57:29 abs Exp $ +# $NetBSD: Makefile,v 1.85 2010/12/23 11:44:47 dsainty Exp $ DISTNAME= xsane-0.994 PKGNAME= xsane-0.99.4 @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../graphics/gimp/buildlink3.mk" diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile index 25507de9473..9499bb68b6b 100644 --- a/ham/fldigi/Makefile +++ b/ham/fldigi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/10/03 12:13:23 obache Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:47 dsainty Exp $ # DISTNAME= fldigi-3.03 @@ -22,7 +22,7 @@ CONFIGURE_ENV+= STRIP=${STRIP} .include "../../audio/libsndfile/buildlink3.mk" .include "../../audio/libsamplerate/buildlink3.mk" .include "../../audio/portaudio-devel/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../ham/hamlib/buildlink3.mk" .include "../../x11/fltk/buildlink3.mk" diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile index a9afa7b7f78..212a7bb3d23 100644 --- a/lang/kaffe-x11/Makefile +++ b/lang/kaffe-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2010/12/17 22:14:42 asau Exp $ +# $NetBSD: Makefile,v 1.25 2010/12/23 11:44:47 dsainty Exp $ # .include "../../lang/kaffe/Makefile.common" @@ -34,7 +34,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../devel/glib2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../lang/kaffe/buildlink3.mk" diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile index 0050eb44c9a..751777e4ab5 100644 --- a/lang/swi-prolog-packages/Makefile +++ b/lang/swi-prolog-packages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2010/11/23 21:56:25 asau Exp $ +# $NetBSD: Makefile,v 1.28 2010/12/23 11:44:48 dsainty Exp $ .include "../../lang/swi-prolog-lite/Makefile.common" @@ -86,7 +86,7 @@ CHECK_WRKREF_SKIP= lib/swi-prolog-${SWIPLVERS}/xpce-${XPCE_VERSION}/lib/${MACHIN .include "../../lang/swi-prolog-lite/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" 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" diff --git a/math/R/Makefile b/math/R/Makefile index 1dfc59764b8..a88eaffa7e7 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2010/09/14 11:02:21 wiz Exp $ +# $NetBSD: Makefile,v 1.112 2010/12/23 11:44:48 dsainty Exp $ DISTNAME= R-2.11.1 PKGREVISION= 1 @@ -101,7 +101,7 @@ CONFIGURE_ARGS+= --enable-mbcs=no .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../math/blas/buildlink3.mk" diff --git a/math/grace/Makefile b/math/grace/Makefile index 93a755aa4e5..b500f6238d2 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2010/07/30 10:36:29 asau Exp $ +# $NetBSD: Makefile,v 1.49 2010/12/23 11:44:48 dsainty Exp $ # DISTNAME= grace-5.1.22 @@ -33,7 +33,7 @@ post-install: .include "../../devel/netcdf/buildlink3.mk" .include "../../fonts/t1lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../math/fftw2/buildlink3.mk" diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile index 4eb0c6dea31..12df29ca338 100644 --- a/math/octave-forge/Makefile +++ b/math/octave-forge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2010/07/30 10:36:30 asau Exp $ +# $NetBSD: Makefile,v 1.32 2010/12/23 11:44:49 dsainty Exp $ DISTNAME= octave-forge-2006.03.17 PKGREVISION= 6 @@ -46,7 +46,7 @@ post-patch: ${MKDIR} ${WRKSRC}/extra/pdb/scripts ${MV} ${WRKSRC}/extra/pdb/bin/rasmol.sh ${WRKSRC}/extra/pdb/scripts/rasmol.sh -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../math/gsl/buildlink3.mk" .include "../../math/octave/buildlink3.mk" diff --git a/math/xldlas/Makefile b/math/xldlas/Makefile index ae445307094..288e0d913bf 100644 --- a/math/xldlas/Makefile +++ b/math/xldlas/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2010/01/18 09:59:13 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2010/12/23 11:44:49 dsainty Exp $ DISTNAME= xldlas-0.85 PKGREVISION= 7 @@ -22,7 +22,7 @@ do-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/xldlas ${CP} -R ${WRKSRC}/help ${DESTDIR}${PREFIX}/share/xldlas -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xforms/buildlink3.mk" 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" diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 4a375f772ed..ec175d9951b 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:04 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/12/23 11:44:50 dsainty Exp $ # DISTNAME= ffmpegthumbnailer-1.5.3 @@ -19,7 +19,7 @@ USE_LANGUAGES= c c++ PKGCONFIG_OVERRIDE+= libffmpegthumbnailer.pc.in -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile index 9b50470b9e4..8e1e9cb8645 100644 --- a/multimedia/gnash/Makefile +++ b/multimedia/gnash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2010/12/01 11:00:11 obache Exp $ +# $NetBSD: Makefile,v 1.31 2010/12/23 11:44:50 dsainty Exp $ # DISTNAME= gnash-${VER} @@ -43,7 +43,7 @@ BUILDLINK_TRANSFORM+= rm:-fvisibility-inlines-hidden .include "../../devel/libltdl/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/multimedia/gpac/Makefile b/multimedia/gpac/Makefile index f7a99d5fad6..ee7eb928231 100644 --- a/multimedia/gpac/Makefile +++ b/multimedia/gpac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:05 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/12/23 11:44:50 dsainty Exp $ # DISTNAME= gpac-0.4.5 @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --disable-wx .include "../../audio/pulseaudio/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" # doesn't work yet #.include "../../lang/spidermonkey/buildlink3.mk" diff --git a/multimedia/kmplayer-kde3/Makefile b/multimedia/kmplayer-kde3/Makefile index 1d6788c1ec8..870ff93b42f 100644 --- a/multimedia/kmplayer-kde3/Makefile +++ b/multimedia/kmplayer-kde3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/09/14 11:02:29 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2010/12/23 11:44:50 dsainty Exp $ # DISTNAME= kmplayer-0.10.0c @@ -35,7 +35,7 @@ SUBST_SED.desktop= -e 's|@PREFIX@|${PREFIX}|g' .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../meta-pkgs/kde3/kde3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile index 06dea2f51b9..1c5f22bad4d 100644 --- a/multimedia/libflash/Makefile +++ b/multimedia/libflash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/02/11 20:01:50 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:51 dsainty Exp $ # PKG_DESTDIR_SUPPORT= user-destdir @@ -17,5 +17,5 @@ MAKE_ENV+= LIBSTDCPP=-lstdc++ INSTALLATION_DIRS+= lib .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk index 141b6c9f5ab..f00960ac8a8 100644 --- a/multimedia/libflash/buildlink3.mk +++ b/multimedia/libflash/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2010/01/18 09:59:17 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2010/12/23 11:44:51 dsainty Exp $ BUILDLINK_TREE+= libflash @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libflash+= libflash>=0.4.10nb8 BUILDLINK_PKGSRCDIR.libflash?= ../../multimedia/libflash .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # LIBFLASH_BUILDLINK3_MK BUILDLINK_TREE+= -libflash diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 80e232eba21..ce9d53daf04 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:05 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2010/12/23 11:44:51 dsainty Exp $ DISTNAME= mjpegtools-1.9.0 PKGREVISION= 3 @@ -42,7 +42,7 @@ BUILDLINK_TRANSFORM+= rm:-laudio .include "../../audio/lame/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" # # GTK+ support is disabled to avoid a dependency on GTK+ when building GNOME2. diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk index ea99326420d..de9dde888b1 100644 --- a/multimedia/mjpegtools/buildlink3.mk +++ b/multimedia/mjpegtools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2010/01/18 09:59:17 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2010/12/23 11:44:51 dsainty Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools .include "../../audio/lame/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" pkgbase := mjpegtools .include "../../mk/pkg-build-options.mk" diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile index efbc153c218..2f3fd20fea3 100644 --- a/multimedia/mpeg_encode/Makefile +++ b/multimedia/mpeg_encode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:18 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:51 dsainty Exp $ # DISTNAME= mpeg_encode-1.5b-src @@ -40,5 +40,5 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/docs/mpeg_encode.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk index d50d41f2445..9f1a2818792 100644 --- a/multimedia/mplayer-share/options.mk +++ b/multimedia/mplayer-share/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.42 2010/12/17 19:05:35 shattered Exp $ +# $NetBSD: options.mk,v 1.43 2010/12/23 11:44:51 dsainty Exp $ .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) @@ -205,7 +205,7 @@ CONFIGURE_ARGS+= --disable-gif .if !empty(PKG_OPTIONS:Mjpeg) CONFIGURE_ARGS+= --enable-jpeg -. include "../../graphics/jpeg/buildlink3.mk" +. include "../../mk/jpeg.buildlink3.mk" .else CONFIGURE_ARGS+= --disable-jpeg .endif diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index 3c938f2f4ec..e69bdb12490 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:18 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2010/12/23 11:44:51 dsainty Exp $ DISTNAME= ogle-0.9.2 PKGREVISION= 5 @@ -42,7 +42,7 @@ MESSAGE_SUBST+= PKGBASE=${PKGBASE} .include "../../audio/liba52/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile index a8393b0e2f0..de4428f5836 100644 --- a/multimedia/openquicktime/Makefile +++ b/multimedia/openquicktime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2010/02/11 20:08:00 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2010/12/23 11:44:52 dsainty Exp $ # DISTNAME= ${PKGNAME_NOREV}-src @@ -40,5 +40,5 @@ pre-configure: .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/openquicktime/buildlink3.mk b/multimedia/openquicktime/buildlink3.mk index d82c4b23073..c49279241f4 100644 --- a/multimedia/openquicktime/buildlink3.mk +++ b/multimedia/openquicktime/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/12/23 11:44:52 dsainty Exp $ BUILDLINK_TREE+= openquicktime @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.openquicktime?= ../../multimedia/openquicktime .include "../../devel/glib2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # OPENQUICKTIME_BUILDLINK3_MK BUILDLINK_TREE+= -openquicktime diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index ca3170d3f47..7e0836ab108 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2010/11/14 14:05:58 obache Exp $ +# $NetBSD: Makefile,v 1.67 2010/12/23 11:44:52 dsainty Exp $ DISTNAME= transcode-1.1.5 PKGREVISION= 6 @@ -46,7 +46,7 @@ PLIST_VARS+= i386 .include "../../audio/libvorbis/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index ae90df3e0ab..2c4b328cccd 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2010/11/15 22:58:09 abs Exp $ +# $NetBSD: Makefile,v 1.100 2010/12/23 11:44:52 dsainty Exp $ # DISTNAME= vlc-${VLC_VERSION} @@ -133,7 +133,7 @@ CHECK_WRKREF_SKIP= lib/libvlccore.a \ .include "../../audio/libcddb/buildlink3.mk" .include "../../misc/libcdio/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../net/liblive/buildlink3.mk" .include "../../converters/fribidi/buildlink3.mk" .include "../../devel/libebml/buildlink3.mk" diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 6241175f267..7a4ac52f43a 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2010/01/18 09:59:18 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2010/12/23 11:44:52 dsainty Exp $ # DISTNAME= xawtv-3.95 @@ -45,7 +45,7 @@ CONFIGURE_ARGS+= --enable-mmx .include "../../devel/ncurses/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/Xaw3d/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile index 45db532bf5b..84ccecb92df 100644 --- a/net/driftnet/Makefile +++ b/net/driftnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2010/02/11 20:47:11 joerg Exp $ +# $NetBSD: Makefile,v 1.26 2010/12/23 11:44:52 dsainty Exp $ # DISTNAME= driftnet-0.1.6 @@ -28,7 +28,7 @@ do-install: .include "../../graphics/libungif/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index 707842f8fde..2ce7420b0a1 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/03/30 04:36:54 sbd Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:53 dsainty Exp $ # DISTNAME= LibVNCServer-0.9.7 @@ -27,6 +27,6 @@ SUBST_FILES.pthread= configure SUBST_SED.pthread= -e 's|-lpthread||g' .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libvncserver/buildlink3.mk b/net/libvncserver/buildlink3.mk index 3edd832b136..1d2e1001536 100644 --- a/net/libvncserver/buildlink3.mk +++ b/net/libvncserver/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:20 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2010/12/23 11:44:53 dsainty Exp $ BUILDLINK_TREE+= libVNCServer @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.libVNCServer?= libVNCServer>=0.9.7nb2 BUILDLINK_PKGSRCDIR.libVNCServer?= ../../net/libvncserver .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # LIBVNCSERVER_BUILDLINK3_MK BUILDLINK_TREE+= -libVNCServer diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 3f3e74fc12b..f802d30a1d7 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2010/03/24 21:35:12 sbd Exp $ +# $NetBSD: Makefile,v 1.36 2010/12/23 11:44:53 dsainty Exp $ DISTNAME= tightvnc-1.3.10 PKGREVISION= 4 @@ -76,7 +76,7 @@ do-install: ${DESTDIR}${PREFIX}/share/examples/tightvnc/tightvncserver.conf .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile index 865e0b2e630..cf057091bb2 100644 --- a/net/tightvncviewer/Makefile +++ b/net/tightvncviewer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:20 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2010/12/23 11:44:53 dsainty Exp $ DISTNAME= tightvnc-1.3.10 PKGNAME= ${DISTNAME:S/tightvnc/tightvncviewer/} @@ -35,7 +35,7 @@ do-install: ${DESTDIR}${PREFIX}/share/doc/vncviewer/README .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/net/vino/Makefile b/net/vino/Makefile index 358d228af4d..335b2214e2c 100644 --- a/net/vino/Makefile +++ b/net/vino/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2010/11/15 22:58:19 abs Exp $ +# $NetBSD: Makefile,v 1.42 2010/12/23 11:44:53 dsainty Exp $ DISTNAME= vino-2.28.2 PKGREVISION= 2 @@ -28,7 +28,7 @@ GCONF_SCHEMAS= vino-server.schemas .include "../../devel/pango/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../net/libsoup24/buildlink3.mk" .include "../../security/libgnome-keyring/buildlink3.mk" .include "../../security/gnutls/buildlink3.mk" diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile index c112ad9b3eb..73a964e3bcd 100644 --- a/net/xrmftp/Makefile +++ b/net/xrmftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2010/02/12 02:02:49 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/12/23 11:44:53 dsainty Exp $ DISTNAME= xrmftp-1.2.4 PKGREVISION= 6 @@ -20,7 +20,7 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${DESTDIR}${PREFIX}/bin -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xforms/buildlink3.mk" diff --git a/news/knews/Makefile b/news/knews/Makefile index c3511aea6f7..bd6df1d694b 100644 --- a/news/knews/Makefile +++ b/news/knews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2010/06/13 22:45:13 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2010/12/23 11:44:54 dsainty Exp $ DISTNAME= knews-1.0b.1 PKGNAME= knews-1.0 @@ -48,7 +48,7 @@ post-patch: ${ECHO} >>${WRKSRC}/configure.h "#define USE_INET6 YES" .endif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mail/faces/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/print/advi/Makefile b/print/advi/Makefile index 4c8b5d836c5..332ef0956ae 100644 --- a/print/advi/Makefile +++ b/print/advi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:14 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/12/23 11:44:54 dsainty Exp $ DISTNAME= advi-1.6.0 PKGREVISION= 8 @@ -54,7 +54,7 @@ post-install: .include "../../lang/ocaml/buildlink3.mk" .include "../../graphics/camlimages/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/gdk-pixbuf/buildlink3.mk" diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index 18e8d5651bf..dd3ba7aac0e 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2010/02/12 00:00:45 joerg Exp $ +# $NetBSD: Makefile,v 1.32 2010/12/23 11:44:54 dsainty Exp $ DISTNAME= lyx-${LYX_VERS} PKGNAME= cjk-${DISTNAME} @@ -35,7 +35,7 @@ REPLACE_PYTHON+= lib/scripts/*.py lib/scripts/listerrors .include "../../lang/python/application.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xforms/buildlink3.mk" .include "../../mk/tex.buildlink3.mk" diff --git a/print/cups/Makefile b/print/cups/Makefile index 2d24a10a183..ac638ee3a75 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.171 2010/11/12 08:54:58 sbd Exp $ +# $NetBSD: Makefile,v 1.172 2010/12/23 11:44:54 dsainty Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -116,7 +116,7 @@ OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/print/ghostscript/options.mk b/print/ghostscript/options.mk index f346594a4c5..c12ffe6a8fa 100644 --- a/print/ghostscript/options.mk +++ b/print/ghostscript/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2009/11/01 23:57:29 gdt Exp $ +# $NetBSD: options.mk,v 1.11 2010/12/23 11:44:54 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.ghostscript PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig @@ -32,7 +32,7 @@ SUBST_FILES.cupsetc= cups/cups.mak SUBST_SED.cupsetc= -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g' .include "../../print/cups/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .else CONFIGURE_ARGS+= --disable-cups .endif diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index 80dcb3000f2..8f368fb7499 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2010/01/27 13:42:20 joerg Exp $ +# $NetBSD: Makefile,v 1.29 2010/12/23 11:44:54 dsainty Exp $ DISTNAME= hpijs-2.1.4 PKGREVISION= 2 @@ -28,5 +28,5 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/ppd/HP* ${DESTDIR}${PREFIX}/share/ppd/ ${GZIP_CMD} ${DESTDIR}${PREFIX}/share/ppd/HP*.ppd -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/img2eps/Makefile b/print/img2eps/Makefile index 4cbdb606521..2ad85dfdb16 100644 --- a/print/img2eps/Makefile +++ b/print/img2eps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/06/13 22:45:15 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2010/12/23 11:44:55 dsainty Exp $ # DISTNAME= img2eps-0.2 @@ -17,7 +17,7 @@ TEST_TARGET= check .include "options.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" diff --git a/print/mupdf/Makefile b/print/mupdf/Makefile index 7df908de39e..9f2b81e87a7 100644 --- a/print/mupdf/Makefile +++ b/print/mupdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/09/28 13:11:26 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:55 dsainty Exp $ # DISTNAME= mupdf-0.7 @@ -31,7 +31,7 @@ post-install: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jbig2dec/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/openjpeg/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" diff --git a/print/podofo/Makefile b/print/podofo/Makefile index b7ba0e8f570..7cbec76d58c 100644 --- a/print/podofo/Makefile +++ b/print/podofo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/05/05 18:23:52 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2010/12/23 11:44:55 dsainty Exp $ # DISTNAME= podofo-0.7.0 @@ -27,7 +27,7 @@ CXXFLAGS+= -fPIC .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/podofo/buildlink3.mk b/print/podofo/buildlink3.mk index 6948699b7b7..7867de89075 100644 --- a/print/podofo/buildlink3.mk +++ b/print/podofo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2010/01/18 09:59:23 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2010/12/23 11:44:55 dsainty Exp $ BUILDLINK_TREE+= podofo @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.podofo?= ../../print/podofo BUILDLINK_DEPMETHOD.podofo?= build .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .endif # PODOFO_BUILDLINK3_MK diff --git a/print/poppler-glib/Makefile b/print/poppler-glib/Makefile index 7982d759420..524d728b2c7 100644 --- a/print/poppler-glib/Makefile +++ b/print/poppler-glib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2010/11/15 22:58:23 abs Exp $ +# $NetBSD: Makefile,v 1.35 2010/12/23 11:44:55 dsainty Exp $ # .include "../../print/poppler/Makefile.common" @@ -39,7 +39,7 @@ post-install: .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" BUILDLINK_API_DEPENDS.poppler+= poppler-${POPPLER_VERS}{,nb*} .include "../../print/poppler/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/print/poppler/Makefile b/print/poppler/Makefile index 3b612a5d855..48cd58d64aa 100644 --- a/print/poppler/Makefile +++ b/print/poppler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2010/11/02 15:45:12 drochner Exp $ +# $NetBSD: Makefile,v 1.52 2010/12/23 11:44:55 dsainty Exp $ # .include "../../print/poppler/Makefile.common" @@ -51,7 +51,7 @@ post-install: ${RMDIR} ${DESTDIR}${PREFIX}/include/poppler || ${TRUE} .include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/poppler/buildlink3.mk b/print/poppler/buildlink3.mk index 54e4976bb65..1adb509bac3 100644 --- a/print/poppler/buildlink3.mk +++ b/print/poppler/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2010/08/15 11:19:18 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:44:55 dsainty Exp $ BUILDLINK_TREE+= poppler @@ -16,7 +16,7 @@ pkgbase := poppler .endif .include "../../fonts/fontconfig/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif # POPPLER_BUILDLINK3_MK BUILDLINK_TREE+= -poppler diff --git a/print/scribus-qt4/Makefile b/print/scribus-qt4/Makefile index c7df52ece1d..2db361884e9 100644 --- a/print/scribus-qt4/Makefile +++ b/print/scribus-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/12/13 11:49:42 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2010/12/23 11:44:56 dsainty Exp $ DISTNAME= scribus-1.3.9 CATEGORIES= print @@ -36,7 +36,7 @@ post-install: .include "../../print/cups/buildlink3.mk" .include "../../print/podofo/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/lcms/buildlink3.mk" BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1 diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 8bff3d89a86..8f42a42239f 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2010/09/14 11:02:41 wiz Exp $ +# $NetBSD: Makefile,v 1.71 2010/12/23 11:44:56 dsainty Exp $ DISTNAME= scribus-1.3.3.14 PKGREVISION= 2 @@ -34,7 +34,7 @@ post-install: .include "../../print/cups/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1 .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/security/steghide/Makefile b/security/steghide/Makefile index aa4a420e142..f4bb54a556d 100644 --- a/security/steghide/Makefile +++ b/security/steghide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/11/02 20:40:55 shattered Exp $ +# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:56 dsainty Exp $ DISTNAME= steghide-0.5.1 PKGREVISION= 5 @@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../security/libmcrypt/buildlink3.mk" .include "../../security/mhash/buildlink3.mk" diff --git a/sysutils/xnc/Makefile b/sysutils/xnc/Makefile index d54d9145ffd..66c55b20a47 100644 --- a/sysutils/xnc/Makefile +++ b/sysutils/xnc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:27 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/12/23 11:44:56 dsainty Exp $ DISTNAME= xnc-5.0.4.src PKGNAME= xnc-5.0.4 @@ -23,7 +23,7 @@ GNU_CONFIGURE= yes BUILDLINK_DEPMETHOD.libXt?= build .include "../../graphics/tiff/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/time/xonclock/Makefile b/time/xonclock/Makefile index 13c630bc9b8..799b141d117 100644 --- a/time/xonclock/Makefile +++ b/time/xonclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/06/13 22:45:29 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/12/23 11:44:56 dsainty Exp $ # DISTNAME= xonclock-0.0.9.2 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/wm/compiz-fusion-plugins-extra/Makefile b/wm/compiz-fusion-plugins-extra/Makefile index a8eeca1d09b..0cf3799f990 100644 --- a/wm/compiz-fusion-plugins-extra/Makefile +++ b/wm/compiz-fusion-plugins-extra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/11/15 22:58:46 abs Exp $ +# $NetBSD: Makefile,v 1.10 2010/12/23 11:44:57 dsainty Exp $ # PKGVER= 0.8.4 @@ -55,7 +55,7 @@ GCONF_SCHEMAS+= compiz-widget.schemas .include "../../devel/GConf/schemas.mk" .include "../../devel/compiz-bcop/buildlink3.mk" .include "../../wm/compiz-fusion-plugins-main/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../wm/compiz/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/compiz-fusion-plugins-main/Makefile b/wm/compiz-fusion-plugins-main/Makefile index 46cc618adb1..ea29cd4add6 100644 --- a/wm/compiz-fusion-plugins-main/Makefile +++ b/wm/compiz-fusion-plugins-main/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2010/11/15 22:58:46 abs Exp $ +# $NetBSD: Makefile,v 1.12 2010/12/23 11:44:57 dsainty Exp $ # PKGVER= 0.8.4 @@ -54,7 +54,7 @@ GCONF_SCHEMAS+= compiz-workarounds.schemas .include "../../devel/GConf/schemas.mk" .include "../../devel/compiz-bcop/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../wm/compiz/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wm/ctwm/Makefile b/wm/ctwm/Makefile index 7e9728aff29..724d638401d 100644 --- a/wm/ctwm/Makefile +++ b/wm/ctwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2010/05/15 00:05:00 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2010/12/23 11:44:57 dsainty Exp $ # DISTNAME= ctwm-3.8a @@ -26,8 +26,8 @@ EXTRA_DEFINES.SunOS+= -D__EXTENSIONS__ MAKE_ENV+= EXTRA_DEFINES=${EXTRA_DEFINES:Q} pre-configure: - ( ${ECHO} 'USER_JPEGLIBDIR = -L${BUILDLINK_PREFIX.jpeg}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.jpeg}/lib'; \ - ${ECHO} 'USER_JPEGINCDIR = -I${BUILDLINK_PREFIX.jpeg}/include'; \ + ( ${ECHO} 'USER_JPEGLIBDIR = -L${JPEGBASE}/lib ${COMPILER_RPATH_FLAG}${JPEGBASE}/lib'; \ + ${ECHO} 'USER_JPEGINCDIR = -I${JPEGBASE}/include'; \ ${CAT} ${WRKSRC}/Imakefile.local-template; \ ) >${WRKSRC}/Imakefile.local @@ -42,7 +42,7 @@ pre-install: ${INSTALL_DATA} ${FILESDIR}/ctwm.desktop \ ${DESTDIR}${PREFIX}/share/xsessions/ctwm.desktop -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/wm/jwm/options.mk b/wm/jwm/options.mk index 3407d3cbcd9..7a0fb2c2c88 100644 --- a/wm/jwm/options.mk +++ b/wm/jwm/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2008/06/17 00:00:30 abs Exp $ +# $NetBSD: options.mk,v 1.4 2010/12/23 11:44:57 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.jwm PKG_SUPPORTED_OPTIONS= debug fribidi jpeg png @@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --enable-debug .endif .if !empty(PKG_OPTIONS:Mjpeg) -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mpng) diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile index 5ecd1e0e76e..fefc75f9ec0 100644 --- a/wm/pekwm/Makefile +++ b/wm/pekwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2010/06/13 22:45:31 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2010/12/23 11:44:57 dsainty Exp $ # DISTNAME= pekwm-0.1.12 @@ -28,7 +28,7 @@ CONF_FILES= CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index 9b603f4fc27..1a5197ddde9 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2010/06/13 22:45:31 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2010/12/23 11:44:58 dsainty Exp $ DISTNAME= WindowMaker-0.92.0 PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} @@ -97,7 +97,7 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/wm/windowmaker/buildlink3.mk b/wm/windowmaker/buildlink3.mk index 34e88bd26fd..a90b69da4b7 100644 --- a/wm/windowmaker/buildlink3.mk +++ b/wm/windowmaker/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:31 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2010/12/23 11:44:58 dsainty Exp $ BUILDLINK_TREE+= windowmaker @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.windowmaker+= windowmaker>=0.92.0nb12 BUILDLINK_PKGSRCDIR.windowmaker?= ../../wm/windowmaker .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/www/amaya/Makefile b/www/amaya/Makefile index 5dc2f220f0c..14ec5129062 100644 --- a/www/amaya/Makefile +++ b/www/amaya/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2010/11/15 22:58:49 abs Exp $ +# $NetBSD: Makefile,v 1.61 2010/12/23 11:44:58 dsainty Exp $ DISTNAME= amaya-fullsrc-10.0.1 PKGNAME= ${DISTNAME:S/-fullsrc//} @@ -126,7 +126,7 @@ EXTRACT_ELEMENTS+= libwww CONFIGURE_ARGS+= --without-graphic-libs # Use pkgsrc libraries # link correctly with pkgsrc zlib (XXX: is this needed or correct?) LIBS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/www/chimera/Makefile b/www/chimera/Makefile index 8c9a3d05cb6..45af90d4af3 100644 --- a/www/chimera/Makefile +++ b/www/chimera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2010/06/13 22:45:32 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2010/12/23 11:44:58 dsainty Exp $ # DISTNAME= chimera-2.0a19 @@ -26,7 +26,7 @@ post-install: cd ${WRKSRC}/doc && ${INSTALL_DATA} \ HINTS INFO LICENSE ${DESTDIR}${PREFIX}/share/doc/chimera -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXp/buildlink3.mk" diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 0cbf491b9c4..3604c75e58a 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:32 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2010/12/23 11:44:58 dsainty Exp $ DISTNAME= dillo-2.2 PKGREVISION= 1 @@ -39,7 +39,7 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/fltk2/buildlink3.mk" diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile index db24d6faa79..6093f29f03a 100644 --- a/www/htmldoc/Makefile +++ b/www/htmldoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2010/06/13 22:45:33 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2010/12/23 11:44:58 dsainty Exp $ # This section contains variables that might be overridden. PKGNAME?= ${PKGNAME_BASE} @@ -35,6 +35,6 @@ INSTALL_MAKE_FLAGS+= datadir=${DESTDIR}${PREFIX}/share INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/mMosaic/Makefile b/www/mMosaic/Makefile index 0651abf4f42..d62959ead33 100644 --- a/www/mMosaic/Makefile +++ b/www/mMosaic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2010/06/13 22:45:34 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2010/12/23 11:44:59 dsainty Exp $ # DISTNAME= mMosaic-3.7.2 @@ -22,7 +22,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/mMosaic ${DESTDIR}${PREFIX}/bin/ .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile index 09cd6641824..76b541f7803 100644 --- a/www/swiggle/Makefile +++ b/www/swiggle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/01/18 09:59:32 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/12/23 11:44:59 dsainty Exp $ DISTNAME= swiggle-0.4 PKGREVISION= 2 @@ -23,7 +23,7 @@ INSTALLATION_DIRS= bin do-install: ${INSTALL_PROGRAM} ${WRKSRC}/swiggle ${DESTDIR}${PREFIX}/bin/ -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libexif/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile index 9875745ea72..90ca2ec0a20 100644 --- a/www/webkit-gtk/Makefile +++ b/www/webkit-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2010/12/17 07:36:10 obache Exp $ +# $NetBSD: Makefile,v 1.31 2010/12/23 11:44:59 dsainty Exp $ DISTNAME= webkit-1.2.5 PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/} @@ -41,7 +41,7 @@ REPLACE_PERL+= JavaScriptCore/pcre/dftables \ #.include "../../devel/pango/buildlink3.mk" # A correct Webkit build requires flex 2.5.33 .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" diff --git a/www/webkit-gtk/buildlink3.mk b/www/webkit-gtk/buildlink3.mk index c0a72d8f244..e0e9ec7cb45 100644 --- a/www/webkit-gtk/buildlink3.mk +++ b/www/webkit-gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2010/12/17 07:36:10 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2010/12/23 11:44:59 dsainty Exp $ BUILDLINK_TREE+= webkit-gtk @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.webkit-gtk?= ../../www/webkit-gtk .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/gperf/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" 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 diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index c8099fe1125..9dd9d2ed075 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:35 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/12/23 11:44:59 dsainty Exp $ # DISTNAME= aterm-1.0.0 @@ -27,8 +27,8 @@ CONFIGURE_ARGS+=--enable-background-image \ --with-xpm-includes=${BUILDLINK_PREFIX.libXpm}/include \ --with-xpm-library=${BUILDLINK_PREFIX.libXpm}/lib \ --with-jpeg \ - --with-jpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \ - --with-jpeg-library=${BUILDLINK_PREFIX.jpeg}/lib \ + --with-jpeg-includes=${JPEGBASE}/include \ + --with-jpeg-library=${JPEGBASE}/lib \ --with-png \ --with-png-library=${BUILDLINK_PREFIX.png}/lib \ --with-png-includes=${BUILDLINK_PREFIX.png}/include \ @@ -49,7 +49,7 @@ SPECIAL_PERMS= ${PREFIX}/bin/aterm ${SETUID_ROOT_PERMS} BUILDLINK_DEPMETHOD.libXt?= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/efltk/Makefile b/x11/efltk/Makefile index 5519c4fb59d..1f79009de83 100644 --- a/x11/efltk/Makefile +++ b/x11/efltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2010/12/23 11:44:59 dsainty Exp $ # DISTNAME= efltk-2.0.5 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-shared .include "options.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/efltk/buildlink3.mk b/x11/efltk/buildlink3.mk index 5ae31347152..bc1cc086ea7 100644 --- a/x11/efltk/buildlink3.mk +++ b/x11/efltk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:44:59 dsainty Exp $ BUILDLINK_TREE+= efltk @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.efltk?= efltk>=2.0.5nb10 BUILDLINK_PKGSRCDIR.efltk?= ../../x11/efltk .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index 929ca9890e1..a88d1997370 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.72 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2010/12/23 11:45:00 dsainty Exp $ DISTNAME= fltk-1.1.10-source PKGNAME= ${DISTNAME:S/-source//} @@ -38,7 +38,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk index 94f7265a085..c796637cd83 100644 --- a/x11/fltk/buildlink3.mk +++ b/x11/fltk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2010/12/23 11:45:00 dsainty Exp $ BUILDLINK_TREE+= fltk @@ -12,7 +12,7 @@ BUILDLINK_FILES.fltk+= include/Fl/* .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile index b41bc1c65bb..5324410434d 100644 --- a/x11/fltk2/Makefile +++ b/x11/fltk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/12/23 11:45:00 dsainty Exp $ VERS= 6129 PKGREVISION= 4 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= ac_cv_have_overlay=yes .include "options.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk index c747c02a271..c143661aff9 100644 --- a/x11/fltk2/buildlink3.mk +++ b/x11/fltk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/12/23 11:45:00 dsainty Exp $ BUILDLINK_TREE+= fltk2 @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.fltk2?= ../../x11/fltk2 .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXft/buildlink3.mk" diff --git a/x11/fox/Makefile b/x11/fox/Makefile index 0ce8a777e9c..9f45ab0ecca 100644 --- a/x11/fox/Makefile +++ b/x11/fox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2010/12/23 11:45:00 dsainty Exp $ DISTNAME= fox-1.6.33 PKGREVISION= 3 @@ -35,7 +35,7 @@ BUILDLINK_DEPMETHOD.libXt?= build .include "../../archivers/bzip2/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/x11/fox/buildlink3.mk b/x11/fox/buildlink3.mk index 6f7fe3c69d5..910efdfd5d1 100644 --- a/x11/fox/buildlink3.mk +++ b/x11/fox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2010/06/13 22:45:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2010/12/23 11:45:00 dsainty Exp $ BUILDLINK_TREE+= fox @@ -12,7 +12,7 @@ BUILDLINK_INCDIRS.fox?= include/fox-1.6 .include "../../archivers/bzip2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/gnustep-gui/Makefile b/x11/gnustep-gui/Makefile index 8f8adf75def..f5773280f75 100644 --- a/x11/gnustep-gui/Makefile +++ b/x11/gnustep-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2010/06/13 22:45:38 wiz Exp $ +# $NetBSD: Makefile,v 1.46 2010/12/23 11:45:00 dsainty Exp $ DISTNAME= gnustep-gui-0.16.0 PKGREVISION= 3 @@ -22,7 +22,7 @@ INSTALLATION_DIRS+= share/GNUstep/Applications .include "../../audio/libaudiofile/buildlink3.mk" .include "../../devel/gnustep-base/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 50b59109e89..c0f121ffcc8 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.209 2010/11/23 13:31:33 tnn Exp $ +# $NetBSD: Makefile,v 1.210 2010/12/23 11:45:01 dsainty Exp $ DISTNAME= gtk+-2.22.1 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -104,7 +104,7 @@ BUILDLINK_API_DEPENDS.pango+= pango>=1.20.0 BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.0 .include "../../graphics/cairo/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -#.include "../../graphics/jpeg/buildlink3.mk" +#.include "../../mk/jpeg.buildlink3.mk" #.include "../../graphics/png/buildlink3.mk" #.include "../../graphics/tiff/buildlink3.mk" .include "../../lang/python/application.mk" diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 1dff854e61c..55e0a356ea5 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.150 2010/07/14 11:11:14 sbd Exp $ +# $NetBSD: Makefile,v 1.151 2010/12/23 11:45:01 dsainty Exp $ DISTNAME= kdelibs-${_KDE_VERSION} PKGREVISION= 9 @@ -101,7 +101,7 @@ GCC_REQD+= 2.95 .include "../../devel/libidn/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk index 2fb9b4cc638..a5f344c7754 100644 --- a/x11/kdelibs3/buildlink3.mk +++ b/x11/kdelibs3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2010/07/14 11:11:14 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2010/12/23 11:45:01 dsainty Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -23,7 +23,7 @@ pkgbase := kdelibs .include "../../devel/libidn/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libart/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 6b7d8b3a47c..9d4a7fdace3 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/12/06 11:43:43 markd Exp $ +# $NetBSD: Makefile,v 1.20 2010/12/23 11:45:01 dsainty Exp $ DISTNAME= kdelibs-${_KDE_VERSION} CATEGORIES= x11 @@ -77,7 +77,7 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.4 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../misc/attica/buildlink3.mk" diff --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk index b0ed19becf2..ea439629fee 100644 --- a/x11/kdelibs4/buildlink3.mk +++ b/x11/kdelibs4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2010/11/15 22:59:04 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2010/12/23 11:45:01 dsainty Exp $ BUILDLINK_TREE+= kdelibs @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.kdelibs?= ../../x11/kdelibs4 .include "../../devel/pcre/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../multimedia/phonon/buildlink3.mk" diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index 5efc04f1667..ad803226194 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/06/13 22:45:48 wiz Exp $ +# $NetBSD: Makefile,v 1.22 2010/12/23 11:45:01 dsainty Exp $ # DISTNAME= mrxvt-0.5.4 @@ -50,7 +50,7 @@ SPECIAL_PERMS= ${PREFIX}/bin/mrxvt ${SETUID_ROOT_PERMS} BUILDLINK_DEPMETHOD.libXt+= build -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile index 3bb943d8c86..613a6e77508 100644 --- a/x11/openmotif/Makefile +++ b/x11/openmotif/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2010/06/13 22:45:48 wiz Exp $ +# $NetBSD: Makefile,v 1.66 2010/12/23 11:45:01 dsainty Exp $ PKGVER= 2.3.1 DISTNAME= openmotif-${PKGVER} @@ -53,8 +53,8 @@ SUBST_SED.man_rename+= -e 's: Shell.3: XShell.3:g' CONFIGURE_ARGS+= \ --enable-jpeg --enable-png \ - --with-libjpeg-includes=${BUILDLINK_PREFIX.jpeg}/include \ - --with-libjpeg-lib=${BUILDLINK_PREFIX.jpeg}/lib \ + --with-libjpeg-includes=${JPEGBASE}/include \ + --with-libjpeg-lib=${JPEGBASE}/lib \ --with-libpng-includes=${BUILDLINK_PREFIX.png}/include \ --with-libpng-lib=${BUILDLINK_PREFIX.png}/lib \ --x-libraries=${X11BASE}/lib @@ -109,7 +109,7 @@ post-build: ${MV} -f $${manpage}.tblized $${manpage}; \ done -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/x11/openmotif/buildlink3.mk b/x11/openmotif/buildlink3.mk index 45ae625b333..91d01410073 100644 --- a/x11/openmotif/buildlink3.mk +++ b/x11/openmotif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:45:48 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:45:01 dsainty Exp $ BUILDLINK_TREE+= openmotif @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.openmotif+= openmotif>=2.3.1 BUILDLINK_ABI_DEPENDS.openmotif?= openmotif>=2.3.1nb4 BUILDLINK_PKGSRCDIR.openmotif?= ../../x11/openmotif -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile index 526ee6899b2..37486c0f3f2 100644 --- a/x11/p5-Tk/Makefile +++ b/x11/p5-Tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.68 2010/09/12 12:59:47 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2010/12/23 11:45:02 dsainty Exp $ DISTNAME= Tk-804.029 PKGNAME= p5-${DISTNAME} @@ -36,6 +36,6 @@ pre-configure: .include "../../lang/perl5/module.mk" .include "../../graphics/png/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 10e6818f19a..3c0ef745fcc 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2010/06/13 22:45:50 wiz Exp $ +# $NetBSD: Makefile,v 1.76 2010/12/23 11:45:02 dsainty Exp $ PKGNAME= qt3-libs-${QTVERSION} PKGREVISION= 14 @@ -55,7 +55,7 @@ SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/' .endif .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" diff --git a/x11/qt3-libs/buildlink3.mk b/x11/qt3-libs/buildlink3.mk index a93462e475e..d26cccc020a 100644 --- a/x11/qt3-libs/buildlink3.mk +++ b/x11/qt3-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.26 2010/11/18 07:48:45 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2010/12/23 11:45:02 dsainty Exp $ BUILDLINK_TREE+= qt3-libs @@ -19,7 +19,7 @@ QTDIR= ${BUILDLINK_PREFIX.qt3-libs}/qt3 PTHREAD_OPTS+= require .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/mng/buildlink3.mk" diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile index 7fa53bdf176..874448b190c 100644 --- a/x11/qt4-libs/Makefile +++ b/x11/qt4-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2010/11/15 22:59:09 abs Exp $ +# $NetBSD: Makefile,v 1.53 2010/12/23 11:45:02 dsainty Exp $ PKG_DESTDIR_SUPPORT= user-destdir @@ -116,7 +116,7 @@ SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/' .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk index 8924dda4fec..3a564182e83 100644 --- a/x11/qt4-libs/buildlink3.mk +++ b/x11/qt4-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2010/11/18 07:48:46 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2010/12/23 11:45:02 dsainty Exp $ BUILDLINK_TREE+= qt4-libs @@ -21,7 +21,7 @@ PTHREAD_OPTS+= require .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXcursor/buildlink3.mk" diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile index 9dc017bc793..fac3073bb0e 100644 --- a/x11/ssystem/Makefile +++ b/x11/ssystem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:44 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2010/12/23 11:45:02 dsainty Exp $ # DISTNAME= ssystem-1.6 @@ -34,5 +34,5 @@ do-install: ${INSTALL_DATA} hires/README ${DESTDIR}${PREFIX}/share/ssystem/hires .include "../../graphics/Mesa/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 31e497079fe..559a55a12f6 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2010/06/13 22:45:53 wiz Exp $ +# $NetBSD: Makefile,v 1.41 2010/12/23 11:45:02 dsainty Exp $ DISTNAME= wdm-1.28 PKGREVISION= 4 @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-winmgr=${wmanager:Q} INSTALLATION_DIRS += share/pixmaps/wdm share/examples/wdm -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/x11/wxGTK24/Makefile.common b/x11/wxGTK24/Makefile.common index 8822812a207..d3ffd0523ae 100644 --- a/x11/wxGTK24/Makefile.common +++ b/x11/wxGTK24/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2010/08/18 10:05:08 obache Exp $ +# $NetBSD: Makefile.common,v 1.8 2010/12/23 11:45:02 dsainty Exp $ # DISTNAME= wxGTK-2.4.2 @@ -43,7 +43,7 @@ PLIST_SUBST+= GTKVER=2 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk index 7f7c0cdd20a..01cecc50456 100644 --- a/x11/wxGTK24/buildlink3.mk +++ b/x11/wxGTK24/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2010/12/23 11:45:02 dsainty Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.wxGTK24?= ../../x11/wxGTK24 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK26-contrib/buildlink3.mk b/x11/wxGTK26-contrib/buildlink3.mk index d0702854519..2b91aa0ef83 100644 --- a/x11/wxGTK26-contrib/buildlink3.mk +++ b/x11/wxGTK26-contrib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK-contrib @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.wxGTK-contrib?= ../../x11/wxGTK26-contrib .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK26/Makefile.common b/x11/wxGTK26/Makefile.common index 513f6345286..92c1d4ec07c 100644 --- a/x11/wxGTK26/Makefile.common +++ b/x11/wxGTK26/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2008/09/22 19:58:52 joerg Exp $ +# $NetBSD: Makefile.common,v 1.3 2010/12/23 11:45:03 dsainty Exp $ # DISTNAME= wxGTK-2.6.3 @@ -46,7 +46,7 @@ DOCDIR= ${PREFIX}/share/doc/wxGTK .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK26/buildlink3.mk b/x11/wxGTK26/buildlink3.mk index 9445dbcc813..afded6a2d1a 100644 --- a/x11/wxGTK26/buildlink3.mk +++ b/x11/wxGTK26/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.wxGTK?= ../../x11/wxGTK26 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK28-contrib/buildlink3.mk b/x11/wxGTK28-contrib/buildlink3.mk index 3d419b71d0e..736d84ea90d 100644 --- a/x11/wxGTK28-contrib/buildlink3.mk +++ b/x11/wxGTK28-contrib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK28-contrib @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.wxGTK28-contrib?= ../../x11/wxGTK28-contrib .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/wxGTK28/Makefile.common b/x11/wxGTK28/Makefile.common index 9eeebe6797d..7a3f60db993 100644 --- a/x11/wxGTK28/Makefile.common +++ b/x11/wxGTK28/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.6 2010/06/15 13:15:15 dsainty Exp $ +# $NetBSD: Makefile.common,v 1.7 2010/12/23 11:45:03 dsainty Exp $ # # used by x11/wxGTK28/Makefile @@ -62,7 +62,7 @@ pre-configure: .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/x11/wxGTK28/buildlink3.mk b/x11/wxGTK28/buildlink3.mk index b28dad70f87..3cbfdab9465 100644 --- a/x11/wxGTK28/buildlink3.mk +++ b/x11/wxGTK28/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2010/11/15 22:59:14 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= wxGTK28 @@ -13,7 +13,7 @@ BUILDLINK_PKGSRCDIR.wxGTK28?= ../../x11/wxGTK28 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index b928820dd19..0b7f3489d1d 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2010/01/18 09:59:45 wiz Exp $ +# $NetBSD: Makefile,v 1.65 2010/12/23 11:45:03 dsainty Exp $ # DISTNAME= xforms-1.0 @@ -18,7 +18,7 @@ MAKE_ENV= DEPEND_DEFINES=${CPPFLAGS:M*:Q} MAKE_FLAGS+= MANPATH=${PREFIX}/${PKGMANDIR} SCRIPTS_ENV= DEPEND_DEFINES="${CPPFLAGS}" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/x11/xforms/buildlink3.mk b/x11/xforms/buildlink3.mk index a65b0b3d254..5c98f7fbbc9 100644 --- a/x11/xforms/buildlink3.mk +++ b/x11/xforms/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/01/18 09:59:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2010/12/23 11:45:03 dsainty Exp $ BUILDLINK_TREE+= xforms @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.xforms+= xforms>=1.0nb2 BUILDLINK_ABI_DEPENDS.xforms+= xforms>=1.0nb7 BUILDLINK_PKGSRCDIR.xforms?= ../../x11/xforms -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .endif # XFORMS_BUILDLINK3_MK diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile index 2e94376356b..2b9942413ac 100644 --- a/x11/xplanet/Makefile +++ b/x11/xplanet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2010/09/14 11:13:17 wiz Exp $ +# $NetBSD: Makefile,v 1.48 2010/12/23 11:45:04 dsainty Exp $ DISTNAME= xplanet-1.2.1 PKGREVISION= 4 @@ -25,7 +25,7 @@ INSTALLATION_DIRS+= ${XPLANET_DIRS:C,.*,share/xplanet/&,g} .include "options.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/libungif/buildlink3.mk" .include "../../graphics/netpbm/buildlink3.mk" diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index e2d6b089b43..e34d89974a5 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.103 2010/11/29 18:04:35 drochner Exp $ +# $NetBSD: Makefile.common,v 1.104 2010/12/23 11:45:04 dsainty Exp $ # # When updating the package, @@ -19,7 +19,7 @@ USE_TOOLS+= msgfmt perl GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-hackdir=${PREFIX}/libexec/xscreensaver -CONFIGURE_ARGS+= --with-jpeg=${BUILDLINK_PREFIX.jpeg} +CONFIGURE_ARGS+= --with-jpeg=${JPEGBASE} CONFIGURE_ARGS+= --with-zippy=/usr/games/fortune CONFIGURE_ARGS+= --without-motif @@ -63,6 +63,6 @@ GCC_REQD+= 2.95.3 INSTALL_MAKE_FLAGS= install_prefix=${DESTDIR} .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/x11/xvidcap/Makefile.common b/x11/xvidcap/Makefile.common index 2f0f9649f3e..c0b8f10bccf 100644 --- a/x11/xvidcap/Makefile.common +++ b/x11/xvidcap/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2008/12/18 17:28:17 bjs Exp $ +# $NetBSD: Makefile.common,v 1.8 2010/12/23 11:45:04 dsainty Exp $ # DISTNAME= xvidcap-1.1.3 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-forced-embedded-ffmpeg .include "../../devel/zlib/buildlink3.mk" -.include "../../graphics/jpeg/buildlink3.mk" +.include "../../mk/jpeg.buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../multimedia/ffmpeg/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" -- cgit v1.2.3