[Lunar-commits] <moonbase> aliases: Adding an alias "%JPEG" and adjusting the appropriate DEPENDS.
Dennis `stumbles` Veatch
stumbles at lunar-linux.org
Tue Nov 16 16:47:11 CET 2010
commit 20e8635d6c0edc83918bdce4a9cbc2cc2cbdc524
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date: Tue Nov 16 10:47:11 2010 -0500
aliases: Adding an alias "%JPEG" and adjusting the appropriate DEPENDS.
Like past jpeg version bumps, this is not exactly a clean process if you
switch to libjpeg-turbo; it of course depends on what you have installed.
So like in the past jpeg bumps, some manual intervention maybe required.
The vast majority of this list I do have installed and found no issues
during the lin or useage.
Or you can just stay with jpeg and avoid the whole thing.
---
aliases | 1 +
audio/gst-plugins-good/DEPENDS | 2 +-
crypto/heimdal/BUILD | 4 ++--
crypto/heimdal/DETAILS | 1 +
crypto/steghide/DEPENDS | 6 +++---
editors/emacs/DEPENDS | 2 +-
editors/fldev/DEPENDS | 6 +++---
editors/xemacs/DEPENDS | 2 +-
games/asc/DEPENDS | 2 +-
games/nexuiz/DEPENDS | 2 +-
games/sauerbraten/DEPENDS | 2 +-
games/ufoai/DEPENDS | 2 +-
games/vavoom/DEPENDS | 2 +-
games/warsow/DEPENDS | 2 +-
games/xmoto/DEPENDS | 2 +-
graphics/SDL_image/DEPENDS | 2 +-
graphics/blender/DEPENDS | 2 +-
graphics/dcraw/DEPENDS | 2 +-
graphics/devil/DEPENDS | 2 +-
graphics/djvulibre/DEPENDS | 2 +-
graphics/fbida/DEPENDS | 14 +++++++-------
graphics/gd/DEPENDS | 2 +-
graphics/gegl/DEPENDS | 2 +-
graphics/gtk+-2/DEPENDS | 2 +-
graphics/imlib2/DEPENDS | 2 +-
graphics/libmng/DEPENDS | 2 +-
graphics/libpano12/DEPENDS | 4 ++--
graphics/libpano13/DEPENDS | 4 ++--
graphics/netpbm/DEPENDS | 2 +-
graphics/openvrml/DEPENDS | 2 +-
graphics/povray/DEPENDS | 2 +-
graphics/psiconv/DEPENDS | 8 ++++----
graphics/sane-backends/DEPENDS | 2 +-
graphics/synfig/DEPENDS | 2 +-
graphics/vigra/DEPENDS | 2 +-
graphics/xv/DEPENDS | 6 +++---
graphics/yafaray/DEPENDS | 4 ++--
libs/eet/DEPENDS | 2 +-
libs/fltk/DEPENDS | 2 +-
libs/fox/DEPENDS | 2 +-
libs/lcms/DEPENDS | 6 +++---
libs/lcms2/DEPENDS | 2 +-
libs/openMotif/DEPENDS | 2 +-
libs/opencv/DEPENDS | 20 ++++++++++----------
libs/opencv/DETAILS | 1 +
mono/libgdiplus/DEPENDS | 2 +-
net/tightvnc/DEPENDS | 2 +-
printer/ghostscript/DEPENDS | 2 +-
printer/hplip/DEPENDS | 2 +-
python/pil/DEPENDS | 2 +-
qt4-apps/qt4/BUILD | 2 +-
qt4-apps/qt4/DEPENDS | 1 +
qt4-apps/scribus/DEPENDS | 2 +-
qt4-apps/tulip/BUILD | 2 +-
science/R/DEPENDS | 2 +-
science/gdal/DEPENDS | 2 +-
science/grass/DEPENDS | 2 +-
science/mapnik/DEPENDS | 2 +-
terminal/mrxvt/DEPENDS | 2 +-
terminal/multi-aterm/DEPENDS | 2 +-
video/DirectFB/DEPENDS | 2 +-
video/LiVES/DEPENDS | 2 +-
video/ffmpegthumbnailer/DEPENDS | 2 +-
video/gpac/DEPENDS | 2 +-
video/xawtv/DEPENDS | 8 ++++----
video/xvidcap/DEPENDS | 2 +-
web/bluefish/DEPENDS | 2 +-
web/chromium/DEPENDS | 2 +-
web/dillo/DEPENDS | 2 +-
web/links/DEPENDS | 2 +-
web/webkit/DEPENDS | 2 +-
x11-apps/openoffice-src/DEPENDS | 2 +-
x11-apps/xscreensaver/DEPENDS | 2 +-
x11-utils/x11vnc/DEPENDS | 2 +-
x11-utils/xfig/DEPENDS | 2 +-
x11-utils/xforms/DEPENDS | 2 +-
x11-wm/pekwm/DEPENDS | 2 +-
x11/slim/DEPENDS | 2 +-
zbeta/chrome-linux/DEPENDS | 2 +-
zbeta/e17/eet-svn/DEPENDS | 2 +-
zbeta/e17/eina-svn/DEPENDS | 2 +-
zbeta/e17/evas-svn/DEPENDS | 2 +-
zbeta/e17/imlib2-svn/DEPENDS | 2 +-
zbeta/emacs-cvs/DEPENDS | 14 +++++++-------
zbeta/firebox/DEPENDS | 2 +-
zbeta/jwm/DEPENDS | 4 ++--
zbeta/mupdf/DEPENDS | 2 +-
zbeta/xemacs-beta/DEPENDS | 2 +-
88 files changed, 128 insertions(+), 124 deletions(-)
diff --git a/aliases b/aliases
index 1b3deb3..677558f 100644
--- a/aliases
+++ b/aliases
@@ -14,3 +14,4 @@
%XINELIB:xine-lib xine-lib-vdpau
%CROND:cronie hc-cron vixie-cron
%TEX:teTeX texlive
+%JPEG:libjpeg-turbo jpeg
diff --git a/audio/gst-plugins-good/DEPENDS b/audio/gst-plugins-good/DEPENDS
index dd574bf..737cd53 100644
--- a/audio/gst-plugins-good/DEPENDS
+++ b/audio/gst-plugins-good/DEPENDS
@@ -37,7 +37,7 @@ optional_depends "hal" \
"--disable-hal" \
"for HAL support"
-optional_depends "jpeg" \
+optional_depends "%JPEG" \
"" \
"--disable-jpeg" \
"for the JPEG image plugin"
diff --git a/crypto/heimdal/BUILD b/crypto/heimdal/BUILD
index fd1115a..d8ee024 100644
--- a/crypto/heimdal/BUILD
+++ b/crypto/heimdal/BUILD
@@ -10,8 +10,8 @@
--sysconfdir=/etc \
--enable-shared \
--with-readline=/usr \
- --with-openssl=/usr" &&
-
+ --with-openssl=/usr \
+ --disable-otp" &&
# Migration code, remove symlinks
REMOVE_KRB="gssapi krb5-types.h krb5.h asn1_err.h krb5_asn1.h \
krb5_err.h heim_err.h k524_err.h krb5-protos.h" &&
diff --git a/crypto/heimdal/DETAILS b/crypto/heimdal/DETAILS
index 3f84d74..b10f2f4 100644
--- a/crypto/heimdal/DETAILS
+++ b/crypto/heimdal/DETAILS
@@ -17,6 +17,7 @@
ENTERED=20041026
UPDATED=20101104
SHORT="Heimdals kerberos 5 implementation"
+PSAFE=no
cat << EOF
Heimdal is a free implementation of Kerberos 5.
EOF
diff --git a/crypto/steghide/DEPENDS b/crypto/steghide/DEPENDS
index 2a5f195..87f3b89 100644
--- a/crypto/steghide/DEPENDS
+++ b/crypto/steghide/DEPENDS
@@ -1,4 +1,4 @@
-depends mhash &&
-depends libmcrypt &&
-depends jpeg &&
+depends mhash
+depends libmcrypt
+depends %JPEG
depends zlib
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index 1c59bd3..eaa6d58 100644
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -1,5 +1,5 @@
optional_depends "giflib" "--with-gif" "--without-gif" "for gif support if you use faces"
-optional_depends "jpeg" "--with-jpeg" "--without-jpeg" "for jpeg support if you use faces"
+optional_depends "%JPEG" "--with-jpeg" "--without-jpeg" "for jpeg support if you use faces"
optional_depends "tiff" "--with-tiff" "--without-tiff" "for tiff support if you use faces"
optional_depends "libpng" "--with-png" "--without-png" "for png support if you use faces"
optional_depends "librsvg" "--with-rsvg" "--without-rsvg" "for SVG image support"
diff --git a/editors/fldev/DEPENDS b/editors/fldev/DEPENDS
index 8664ebc..cc36b61 100644
--- a/editors/fldev/DEPENDS
+++ b/editors/fldev/DEPENDS
@@ -1,3 +1,3 @@
-depends fltk &&
-depends libpng &&
-depends jpeg
+depends fltk
+depends libpng
+depends %JPEG
diff --git a/editors/xemacs/DEPENDS b/editors/xemacs/DEPENDS
index 9083c43..f0e3916 100644
--- a/editors/xemacs/DEPENDS
+++ b/editors/xemacs/DEPENDS
@@ -11,7 +11,7 @@ optional_depends "libpng" \
"--with-png" \
"" \
"for PNG image support"
-optional_depends "jpeg" \
+optional_depends "%JPEG" \
"--with-jpeg" \
"" \
"for JPEG image support"
diff --git a/games/asc/DEPENDS b/games/asc/DEPENDS
index 5a22b07..6c54a15 100644
--- a/games/asc/DEPENDS
+++ b/games/asc/DEPENDS
@@ -1,4 +1,4 @@
-depends jpeg
+depends %JPEG
depends SDL_image
depends SDL_mixer
depends SDL_sound
diff --git a/games/nexuiz/DEPENDS b/games/nexuiz/DEPENDS
index 80e7191..7354d45 100644
--- a/games/nexuiz/DEPENDS
+++ b/games/nexuiz/DEPENDS
@@ -2,7 +2,7 @@ depends SDL
depends alsa-lib
depends libmodplug
depends libvorbis
-depends jpeg
+depends %JPEG
depends libXxf86vm
depends libXxf86dga
depends libXpm
diff --git a/games/sauerbraten/DEPENDS b/games/sauerbraten/DEPENDS
index 3fb616d..77a6818 100644
--- a/games/sauerbraten/DEPENDS
+++ b/games/sauerbraten/DEPENDS
@@ -1,4 +1,4 @@
depends libpng
-depends jpeg
+depends %JPEG
depends SDL_image
depends SDL_mixer
diff --git a/games/ufoai/DEPENDS b/games/ufoai/DEPENDS
index ca1ba4a..f63b748 100644
--- a/games/ufoai/DEPENDS
+++ b/games/ufoai/DEPENDS
@@ -4,5 +4,5 @@ depends SDL_mixer
depends libvorbis
depends curl
depends libpng
-depends jpeg
+depends %JPEG
diff --git a/games/vavoom/DEPENDS b/games/vavoom/DEPENDS
index 95faadf..d494619 100644
--- a/games/vavoom/DEPENDS
+++ b/games/vavoom/DEPENDS
@@ -1,6 +1,6 @@
depends cmake
depends libpng
-depends jpeg
+depends %JPEG
depends SDL_mixer
optional_depends allegro "-DWITH_ALLEGRO=Y" "-DWITH_ALLEGRO=N" "build with allegro"
diff --git a/games/warsow/DEPENDS b/games/warsow/DEPENDS
index fc2d923..9ee5eff 100644
--- a/games/warsow/DEPENDS
+++ b/games/warsow/DEPENDS
@@ -1,6 +1,6 @@
depends pkgconfig
depends curl
-depends jpeg
+depends %JPEG
depends libvorbis
depends openal
depends %GLX
diff --git a/games/xmoto/DEPENDS b/games/xmoto/DEPENDS
index 5821c3f..d23ef66 100644
--- a/games/xmoto/DEPENDS
+++ b/games/xmoto/DEPENDS
@@ -1,5 +1,5 @@
depends curl
-depends jpeg
+depends %JPEG
depends sqlite
depends ode
depends libpng
diff --git a/graphics/SDL_image/DEPENDS b/graphics/SDL_image/DEPENDS
index 930ef61..b995c3d 100644
--- a/graphics/SDL_image/DEPENDS
+++ b/graphics/SDL_image/DEPENDS
@@ -1,5 +1,5 @@
depends libpng
depends SDL
-depends jpeg
+depends %JPEG
optional_depends "tiff" "--enable-tif" "--disable-tiff" "support TIFF images"
diff --git a/graphics/blender/DEPENDS b/graphics/blender/DEPENDS
index 2715f54..6ce6234 100644
--- a/graphics/blender/DEPENDS
+++ b/graphics/blender/DEPENDS
@@ -1,5 +1,5 @@
depends libpng
-depends jpeg
+depends %JPEG
depends Python
depends scons
depends SDL
diff --git a/graphics/dcraw/DEPENDS b/graphics/dcraw/DEPENDS
index d8959d5..23edddd 100644
--- a/graphics/dcraw/DEPENDS
+++ b/graphics/dcraw/DEPENDS
@@ -1,2 +1,2 @@
-depends jpeg
+depends %JPEG
depends lcms
diff --git a/graphics/devil/DEPENDS b/graphics/devil/DEPENDS
index 2d41951..647bc4d 100644
--- a/graphics/devil/DEPENDS
+++ b/graphics/devil/DEPENDS
@@ -1,6 +1,6 @@
depends libpng
depends zlib
-depends jpeg
+depends %JPEG
depends tiff
depends lcms
depends jasper
diff --git a/graphics/djvulibre/DEPENDS b/graphics/djvulibre/DEPENDS
index 847c5f0..f8bc6fb 100644
--- a/graphics/djvulibre/DEPENDS
+++ b/graphics/djvulibre/DEPENDS
@@ -1,2 +1,2 @@
depends tiff
-depends jpeg
+depends %JPEG
diff --git a/graphics/fbida/DEPENDS b/graphics/fbida/DEPENDS
index 5df2100..d62487f 100644
--- a/graphics/fbida/DEPENDS
+++ b/graphics/fbida/DEPENDS
@@ -1,9 +1,9 @@
-depends jpeg &&
-depends libexif &&
+depends %JPEG
+depends libexif
-optional_depends "libungif" "" "" "for GIF viewing support" &&
-optional_depends "libpng" "" "" "for PNG viewing support" &&
-optional_depends "tiff" "" "" "for TIFF viewing support" &&
-optional_depends "xsane" "" "" "for scanning support" &&
-optional_depends "curl" "" "" "for remote image viewing" &&
+optional_depends "libungif" "" "" "for GIF viewing support"
+optional_depends "libpng" "" "" "for PNG viewing support"
+optional_depends "tiff" "" "" "for TIFF viewing support"
+optional_depends "xsane" "" "" "for scanning support"
+optional_depends "curl" "" "" "for remote image viewing"
optional_depends "openMotif" "" "" "to build the Motif-based image viewer"
diff --git a/graphics/gd/DEPENDS b/graphics/gd/DEPENDS
index ef37825..110bc98 100644
--- a/graphics/gd/DEPENDS
+++ b/graphics/gd/DEPENDS
@@ -1,3 +1,3 @@
depends libpng
depends freetype2
-depends jpeg
+depends %JPEG
diff --git a/graphics/gegl/DEPENDS b/graphics/gegl/DEPENDS
index b6c779a..cf6dd45 100644
--- a/graphics/gegl/DEPENDS
+++ b/graphics/gegl/DEPENDS
@@ -3,7 +3,7 @@ depends babl
depends libpng
optional_depends SDL "" "" "for SDL video support"
-optional_depends jpeg "" "" "for jpeg graphics support"
+optional_depends %JPEG "" "" "for jpeg graphics support"
optional_depends OpenEXR "" "" "for high dynamic-range image support"
optional_depends libopenraw "" "" "RAW camera file format support"
optional_depends cairo "" "" "for cairo support"
diff --git a/graphics/gtk+-2/DEPENDS b/graphics/gtk+-2/DEPENDS
index 68afb3e..295ba88 100644
--- a/graphics/gtk+-2/DEPENDS
+++ b/graphics/gtk+-2/DEPENDS
@@ -1,7 +1,7 @@
depends atk
depends pango
depends tiff
-depends jpeg
+depends %JPEG
depends libX11
optional_depends "cups" "" "" "for the CUPS based printing backed"
diff --git a/graphics/imlib2/DEPENDS b/graphics/imlib2/DEPENDS
index 7e2ce02..ed360f2 100644
--- a/graphics/imlib2/DEPENDS
+++ b/graphics/imlib2/DEPENDS
@@ -1,6 +1,6 @@
depends tiff
depends libpng
-depends jpeg
+depends %JPEG
depends libungif
depends freetype2
diff --git a/graphics/libmng/DEPENDS b/graphics/libmng/DEPENDS
index 5db248d..31fa87d 100644
--- a/graphics/libmng/DEPENDS
+++ b/graphics/libmng/DEPENDS
@@ -1,4 +1,4 @@
depends automake
depends zlib
depends lcms
-depends jpeg
+depends %JPEG
diff --git a/graphics/libpano12/DEPENDS b/graphics/libpano12/DEPENDS
index becfb99..0b12d2c 100644
--- a/graphics/libpano12/DEPENDS
+++ b/graphics/libpano12/DEPENDS
@@ -1,3 +1,3 @@
-depends jpeg &&
-depends libpng &&
+depends %JPEG
+depends libpng
depends tiff
diff --git a/graphics/libpano13/DEPENDS b/graphics/libpano13/DEPENDS
index becfb99..0b12d2c 100644
--- a/graphics/libpano13/DEPENDS
+++ b/graphics/libpano13/DEPENDS
@@ -1,3 +1,3 @@
-depends jpeg &&
-depends libpng &&
+depends %JPEG
+depends libpng
depends tiff
diff --git a/graphics/netpbm/DEPENDS b/graphics/netpbm/DEPENDS
index 93b234f..cb978e4 100644
--- a/graphics/netpbm/DEPENDS
+++ b/graphics/netpbm/DEPENDS
@@ -1,5 +1,5 @@
depends tiff
-depends jpeg
+depends %JPEG
depends libpng
optional_depends libX11 "" "" "for X11 support"
diff --git a/graphics/openvrml/DEPENDS b/graphics/openvrml/DEPENDS
index 285bf6d..4a199da 100644
--- a/graphics/openvrml/DEPENDS
+++ b/graphics/openvrml/DEPENDS
@@ -1,5 +1,5 @@
depends libpng
-depends jpeg
+depends %JPEG
depends SDL
depends boost
depends libgnomeui
diff --git a/graphics/povray/DEPENDS b/graphics/povray/DEPENDS
index fb8012a..4235301 100644
--- a/graphics/povray/DEPENDS
+++ b/graphics/povray/DEPENDS
@@ -1,3 +1,3 @@
optional_depends "libpng" "" "" "PNG support" &&
-optional_depends "jpeg" "" "" "JPEG support" &&
+optional_depends "%JPEG" "" "" "JPEG support" &&
optional_depends "tiff" "" "" "TIFF support"
diff --git a/graphics/psiconv/DEPENDS b/graphics/psiconv/DEPENDS
index 1d80df7..96479f2 100644
--- a/graphics/psiconv/DEPENDS
+++ b/graphics/psiconv/DEPENDS
@@ -1,5 +1,5 @@
-depends jpeg &&
-depends ImageMagick &&
-depends libpng &&
-depends libxml2 &&
+depends %JPEG
+depends ImageMagick
+depends libpng
+depends libxml2
depends tiff
diff --git a/graphics/sane-backends/DEPENDS b/graphics/sane-backends/DEPENDS
index b3d0e3c..1a23f5b 100644
--- a/graphics/sane-backends/DEPENDS
+++ b/graphics/sane-backends/DEPENDS
@@ -1,4 +1,4 @@
-depends jpeg
+depends %JPEG
optional_depends avahi "--enable-avahi" "--disable-avahi" "for service discovery support"
optional_depends gphoto2 "--with-gphoto2" "--without-gphoto2" "for gphoto2 support"
diff --git a/graphics/synfig/DEPENDS b/graphics/synfig/DEPENDS
index fef86c6..adcd3da 100644
--- a/graphics/synfig/DEPENDS
+++ b/graphics/synfig/DEPENDS
@@ -4,7 +4,7 @@ depends libpng
optional_depends "libmng" "" "" "for MNG graphics support"
optional_depends "freetype2" "--with-freetype" "--without-freetype" "for freetype font support"
-optional_depends "jpeg" "--with-jpeg" "--without-jpeg" "for jpeg image support"
+optional_depends "%JPEG" "--with-jpeg" "--without-jpeg" "for jpeg image support"
# Currently fails with our version of ffmpeg.
#optional_depends "ffmpeg" "--with-ffmpeg --with-libavcodec --without-libswscale" \
diff --git a/graphics/vigra/DEPENDS b/graphics/vigra/DEPENDS
index b0d4715..2a9ae17 100644
--- a/graphics/vigra/DEPENDS
+++ b/graphics/vigra/DEPENDS
@@ -4,7 +4,7 @@ depends hdf5
optional_depends "fftw3" "" "" "fast C FFT library"
optional_depends "zlib" "" "" "compression support"
optional_depends "libpng" "" "" "for png support"
-optional_depends "jpeg" "" "" "for jpeg support"
+optional_depends "%JPEG" "" "" "for jpeg support"
optional_depends "openMotif" "" "" "for tiff support"
optional_depends "boost" "" "" "for boost support"
optional_depends "Sphinx" "" "" "for document generation support"
diff --git a/graphics/xv/DEPENDS b/graphics/xv/DEPENDS
index a841c3d..c39dbc9 100644
--- a/graphics/xv/DEPENDS
+++ b/graphics/xv/DEPENDS
@@ -1,4 +1,4 @@
-depends jpeg &&
-depends tiff &&
-depends libpng &&
+depends %JPEG
+depends tiff
+depends libpng
depends patch
diff --git a/graphics/yafaray/DEPENDS b/graphics/yafaray/DEPENDS
index 578be3e..011ac4e 100644
--- a/graphics/yafaray/DEPENDS
+++ b/graphics/yafaray/DEPENDS
@@ -1,3 +1,3 @@
-depends scons &&
-depends jpeg &&
+depends scons
+depends %JPEG
depends zlib
diff --git a/libs/eet/DEPENDS b/libs/eet/DEPENDS
index ad6319a..8998064 100644
--- a/libs/eet/DEPENDS
+++ b/libs/eet/DEPENDS
@@ -1,2 +1,2 @@
-depends jpeg
+depends %JPEG
depends zlib
diff --git a/libs/fltk/DEPENDS b/libs/fltk/DEPENDS
index fde9957..4f5d3b0 100644
--- a/libs/fltk/DEPENDS
+++ b/libs/fltk/DEPENDS
@@ -1,3 +1,3 @@
optional_depends zlib "--enable-localzlib" "--disable-localzlib" "use local zlib"
-optional_depends jpeg "--enable-localjpeg" "--disable-localjpeg" "use local jpeg"
+optional_depends %JPEG "--enable-localjpeg" "--disable-localjpeg" "use local jpeg"
optional_depends libpng "--enable-localpng" "--disable-localpng" "use local png"
diff --git a/libs/fox/DEPENDS b/libs/fox/DEPENDS
index 26a1e24..dcf19c4 100644
--- a/libs/fox/DEPENDS
+++ b/libs/fox/DEPENDS
@@ -1,7 +1,7 @@
depends libpng
depends tiff
depends zlib
-depends jpeg
+depends %JPEG
depends expat
optional_depends freetype2 "--with-xft" "--with-xft=no" "for freetype2 support"
diff --git a/libs/lcms/DEPENDS b/libs/lcms/DEPENDS
index 7de3c78..9183474 100644
--- a/libs/lcms/DEPENDS
+++ b/libs/lcms/DEPENDS
@@ -1,5 +1,5 @@
depends Python
-optional_depends "tiff" "" "--without-tiff" "for tiff support"
-optional_depends "jpeg" "" "--without-jpeg" "for jpeg support"
-optional_depends "zlib" "" "--without-zlib" "for zlib support"
+optional_depends "tiff" "" "--without-tiff" "for tiff support"
+optional_depends "%JPEG" "" "--without-jpeg" "for jpeg support"
+optional_depends "zlib" "" "--without-zlib" "for zlib support"
diff --git a/libs/lcms2/DEPENDS b/libs/lcms2/DEPENDS
index 8f4fe38..cba7942 100644
--- a/libs/lcms2/DEPENDS
+++ b/libs/lcms2/DEPENDS
@@ -1,5 +1,5 @@
depends Python
optional_depends "tiff" "--with-tiff" "--without-tiff" "for tiff support"
-optional_depends "jpeg" "--with-jpeg" "--without-jpeg" "for jpeg support"
+optional_depends "%JPEG" "--with-jpeg" "--without-jpeg" "for jpeg support"
optional_depends "zlib" "--with-zlib" "--without-zlib" "for zlib support"
diff --git a/libs/openMotif/DEPENDS b/libs/openMotif/DEPENDS
index 5b8ec2e..6811b04 100644
--- a/libs/openMotif/DEPENDS
+++ b/libs/openMotif/DEPENDS
@@ -1,3 +1,3 @@
depends %X
-depends jpeg
+depends %JPEG
depends libpng
diff --git a/libs/opencv/DEPENDS b/libs/opencv/DEPENDS
index 85e470c..d185d14 100644
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -8,29 +8,29 @@ optional_depends Python "-DCMAKE_BUILD_NEW_PYTHON_SUPPORT=ON" \
"for Python binding support"
optional_depends ffmpeg "-DWITH_FFMPEG=ON" \
- "-DCMAKE_WITH_FFMPEG=OFF" \
+ "-DWITH_FFMPEG=OFF" \
"for ffmpeg video support"
-optional_depends gstreamer-10 "-DCMAKE_WITH_GSTREAMER=ON" \
- "-DCMAKE_WITH_GSTREAMER=OFF" \
+optional_depends gstreamer-10 "-DWITH_GSTREAMER=ON" \
+ "-DWITH_GSTREAMER=OFF" \
"for gstreamer support"
-optional_depends %XINELIB "-DCMAKE_WITH_XINE=ON" \
- "-DCMAKE_WITH_XINE=OFF" \
+optional_depends %XINELIB "-DWITH_XINE=ON" \
+ "-DWITH_XINE=OFF" \
"for xine video support"
-optional_depends octave "-DCMAKE_BUILD_OCTAVE_SUPPORT=ON" \
- "-DCMAKE_BUILD_OCTAVE_SUPPORT=OFF" \
+optional_depends octave "-D_BUILD_OCTAVE_SUPPORT=ON" \
+ "-DBUILD_OCTAVE_SUPPORT=OFF" \
"for octave language support"
optional_depends libdc1394 "-DCMAKE_WITH_1394=ON" \
"-DCMAKE_WITH_1394=OFF" \
"for firewire support"
-optional_depends swig "-DCMAKE_BUILD_SWIG_PYTHON_SUPPORT=ON" \
- "-DCMAKE_BUILD_SWIG_PYTHON_SUPPORT=OFF" \
+optional_depends swig "-DBUILD_SWIG_PYTHON_SUPPORT=ON" \
+ "-DBUILD_SWIG_PYTHON_SUPPORT=OFF" \
"for swig support"
optional_depends unicap "-DWITH_UNICAP=ON" \
- "-DCMAKE_WITH_UNICAP=OFF" \
+ "-DWITH_UNICAP=OFF" \
"for additional video capture support"
diff --git a/libs/opencv/DETAILS b/libs/opencv/DETAILS
index 3f011cf..a9831a4 100644
--- a/libs/opencv/DETAILS
+++ b/libs/opencv/DETAILS
@@ -9,6 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/OpenCV-$VERSION
UPDATED=20100425
SHORT="Open Source Computer Vision Library"
+PSAFE=no
cat << EOF
This library is mainly aimed at real time computer vision.
Some example areas would be Human-Computer Interaction (HCI);
diff --git a/mono/libgdiplus/DEPENDS b/mono/libgdiplus/DEPENDS
index 6040ddc..187abf4 100644
--- a/mono/libgdiplus/DEPENDS
+++ b/mono/libgdiplus/DEPENDS
@@ -3,7 +3,7 @@ depends glib-2
optional_depends "tiff" "" "--without-libtiff" \
"for TIFF image IO support"
-optional_depends "jpeg" "" "--without-libjpg" \
+optional_depends "%JPEG" "" "--without-libjpg" \
"for JPEG image support"
optional_depends "libexif" "" "--without-libexif" \
"for EXIF image tag support"
diff --git a/net/tightvnc/DEPENDS b/net/tightvnc/DEPENDS
index c4c240a..655c535 100644
--- a/net/tightvnc/DEPENDS
+++ b/net/tightvnc/DEPENDS
@@ -1,4 +1,4 @@
depends imake
depends libX11
depends libXt
-depends jpeg
+depends %JPEG
diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 4eea990..4881330 100644
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -1,4 +1,4 @@
-depends jpeg
+depends %JPEG
depends libpng
optional_depends "%X" "--with-x" "--without-x" "For an X frontend"
diff --git a/printer/hplip/DEPENDS b/printer/hplip/DEPENDS
index 77c3d2e..4e07d38 100644
--- a/printer/hplip/DEPENDS
+++ b/printer/hplip/DEPENDS
@@ -1,4 +1,4 @@
-depends jpeg
+depends %JPEG
depends cups
depends libusb-compat
diff --git a/python/pil/DEPENDS b/python/pil/DEPENDS
index ea1140a..8104dbe 100644
--- a/python/pil/DEPENDS
+++ b/python/pil/DEPENDS
@@ -1,3 +1,3 @@
depends Python
-depends jpeg
+depends %JPEG
depends libpng
diff --git a/qt4-apps/qt4/BUILD b/qt4-apps/qt4/BUILD
index dccf3ef..17801fc 100644
--- a/qt4-apps/qt4/BUILD
+++ b/qt4-apps/qt4/BUILD
@@ -56,7 +56,7 @@
echo export QTDIR=\"/usr\" > $SOURCE_DIRECTORY/qt4.rc &&
echo export PATH=\"'${PATH}':'${QTDIR}'/bin\" >> $SOURCE_DIRECTORY/qt4.rc &&
- echo export XDG_DATA_DIRS=\"'${XDG_DATA_DIRS}':/usr/share/qt4\" >> $SOURCE_DIRECTORY/qt4.rc &&
+ echo export XDG_DATA_DIRS=\"'${XDG_DATA_DIRS}':/usr/share/\" >> $SOURCE_DIRECTORY/qt4.rc &&
echo export PKG_CONFIG_PATH=\"'${PKG_CONFIG_PATH}':/usr/lib/qt4/pkgconfig\" >> $SOURCE_DIRECTORY/qt4.rc &&
install -m644 $SOURCE_DIRECTORY/qt4.rc /etc/profile.d/
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
index 5acb323..502c177 100644
--- a/qt4-apps/qt4/DEPENDS
+++ b/qt4-apps/qt4/DEPENDS
@@ -1,5 +1,6 @@
depends %X
+optional_depends "%JPEG" "-system-libjpeg" "-qt-libjpeg" "Use system or qt provided jpeg"
optional_depends "openssl" "-openssl" "-no-openssl" "for Secure Sockets support"
optional_depends "libmng" "-system-libmng" "-qt-libmng" "Use system or Qt version of MNG"
optional_depends "libpng" "-system-libpng" "-qt-libpng" "Use system or Qt verion of PNG"
diff --git a/qt4-apps/scribus/DEPENDS b/qt4-apps/scribus/DEPENDS
index bbbfd2b..6c6ba5a 100644
--- a/qt4-apps/scribus/DEPENDS
+++ b/qt4-apps/scribus/DEPENDS
@@ -1,6 +1,6 @@
depends cmake
depends tiff
-depends jpeg
+depends %JPEG
depends freetype2
depends Python
depends qt4
diff --git a/qt4-apps/tulip/BUILD b/qt4-apps/tulip/BUILD
index 06b9263..d696f82 100644
--- a/qt4-apps/tulip/BUILD
+++ b/qt4-apps/tulip/BUILD
@@ -3,7 +3,7 @@
. /etc/profile.d/qt4.rc &&
OPTS="--with-qt-includes=/usr/include/qt4 --with-qt-libraries=/usr/lib/qt4" &&
-
+ CFLAGS="-L /usr/lib/qt4"
if module_installed teTeX ; then
export PDFXMLTEX="pdfetex"
fi &&
diff --git a/science/R/DEPENDS b/science/R/DEPENDS
index 0c91cca..a6ab724 100644
--- a/science/R/DEPENDS
+++ b/science/R/DEPENDS
@@ -1,4 +1,4 @@
-optional_depends jpeg "--with-jpeglib" "--without-jpeglib" "for jpeg graphics support"
+optional_depends %JPEG "--with-jpeglib" "--without-jpeglib" "for jpeg graphics support"
optional_depends libpng "--with-libpng" "--without-libpng" "for libpng support"
optional_depends %X "--with-x" "--without-x" "use the X Window System"
optional_depends tk "--with-tcltk" "--without-tcltk" "for gui, recommended"
diff --git a/science/gdal/DEPENDS b/science/gdal/DEPENDS
index 72d210d..ce3c3d1 100644
--- a/science/gdal/DEPENDS
+++ b/science/gdal/DEPENDS
@@ -1,6 +1,6 @@
depends postgresql
depends libgeotiff
-depends jpeg
+depends %JPEG
depends tiff
depends jasper
depends geos
diff --git a/science/grass/DEPENDS b/science/grass/DEPENDS
index 5388e31..bc54106 100644
--- a/science/grass/DEPENDS
+++ b/science/grass/DEPENDS
@@ -8,7 +8,7 @@ optional_depends "proj-4" "" "" "for external proj-4 support"
#optional_depends "readline" "--with-readline" "--without-readline" "for readline support"
optional_depends "ncurses" "--with-curses" "--without-ncurses" "for ncurses support"
-optional_depends "jpeg" "--with-jpeg" "--without-jpeg" "for jpeg graphics support"
+optional_depends "%JPEG" "--with-jpeg" "--without-jpeg" "for jpeg graphics support"
optional_depends "tiff" "--with-tiff" "--without-tiff" "for tiff graphics support"
optional_depends "libpng" "--with-png" "--without-png" "for png graphics support"
optional_depends "cairo" "--with-cairo" "--without-cairo" "for cairo functionality"
diff --git a/science/mapnik/DEPENDS b/science/mapnik/DEPENDS
index 0b68a38..a330dbb 100644
--- a/science/mapnik/DEPENDS
+++ b/science/mapnik/DEPENDS
@@ -4,7 +4,7 @@ depends icu4c
depends proj-4
depends libxml2
depends freetype2
-depends jpeg
+depends %JPEG
depends tiff
optional_depends gdal "" "" "for gdal support"
diff --git a/terminal/mrxvt/DEPENDS b/terminal/mrxvt/DEPENDS
index a04a4e6..bd26fb0 100644
--- a/terminal/mrxvt/DEPENDS
+++ b/terminal/mrxvt/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "jpeg" "--enable-jpeg" "--disable-jpeg" "for jpeg background support"
+optional_depends "%JPEG" "--enable-jpeg" "--disable-jpeg" "for jpeg background support"
optional_depends "libpng" "--enable-png" "--disable-png" "for png background support"
diff --git a/terminal/multi-aterm/DEPENDS b/terminal/multi-aterm/DEPENDS
index 7d7acc5..879e2fd 100644
--- a/terminal/multi-aterm/DEPENDS
+++ b/terminal/multi-aterm/DEPENDS
@@ -1,2 +1,2 @@
-optional_depends "jpeg" "--enable-jpeg" "--disable-jpeg" "for jpeg background support" &&
+optional_depends "%JPEG" "--enable-jpeg" "--disable-jpeg" "for jpeg background support" &&
optional_depends "libpng" "--enable-png" "--disable-png" "for png background support"
diff --git a/video/DirectFB/DEPENDS b/video/DirectFB/DEPENDS
index 80ca76d..1d7b7cf 100644
--- a/video/DirectFB/DEPENDS
+++ b/video/DirectFB/DEPENDS
@@ -1,5 +1,5 @@
depends freetype2
depends libpng
-optional_depends jpeg "" "" "to enable jpeg support"
+optional_depends %JPEG "" "" "to enable jpeg support"
optional_depends SDL "" "" "to enable SDL support"
diff --git a/video/LiVES/DEPENDS b/video/LiVES/DEPENDS
index 84e9ad1..08abb56 100644
--- a/video/LiVES/DEPENDS
+++ b/video/LiVES/DEPENDS
@@ -5,7 +5,7 @@ depends MPlayer
depends ImageMagick
depends perl
depends gtk+-2
-depends jpeg
+depends %JPEG
depends sox
depends Python
depends libtool
diff --git a/video/ffmpegthumbnailer/DEPENDS b/video/ffmpegthumbnailer/DEPENDS
index 15636b5..93ca911 100644
--- a/video/ffmpegthumbnailer/DEPENDS
+++ b/video/ffmpegthumbnailer/DEPENDS
@@ -1,5 +1,5 @@
depends ffmpeg
optional_depends libpng "--enable-png" "--disable-png" "for png graphic file support"
-optional_depends jpeg "--enable-jpeg" "--disable-jpeg" "for JPEG graphics support"
+optional_depends %JPEG "--enable-jpeg" "--disable-jpeg" "for JPEG graphics support"
diff --git a/video/gpac/DEPENDS b/video/gpac/DEPENDS
index d3cbbe0..562a164 100644
--- a/video/gpac/DEPENDS
+++ b/video/gpac/DEPENDS
@@ -12,7 +12,7 @@ optional_depends wxGTK "" "--disable-wx" \
"for wxWindows support"
optional_depends openjpeg "" "" \
"for jpeg2000 formats"
-optional_depends jpeg "" "" \
+optional_depends %JPEG "" "" \
"for jpeg support"
optional_depends libpng "" "" \
"for png support"
diff --git a/video/xawtv/DEPENDS b/video/xawtv/DEPENDS
index 15cf91d..78d6e64 100644
--- a/video/xawtv/DEPENDS
+++ b/video/xawtv/DEPENDS
@@ -1,10 +1,10 @@
-depends jpeg &&
+depends %JPEG
optional_depends "libpng" "" "" \
- "capture screen images to png format" &&
+ "capture screen images to png format"
optional_depends "alsa-utils" "" "" \
- "for ALSA audio support" &&
+ "for ALSA audio support"
optional_depends "xawtv-fonts" "" "" \
- "for extra tv fonts" &&
+ "for extra tv fonts"
optional_depends "openMotif" "--enable-motif" "--disable-motif" \
"for motif support"
diff --git a/video/xvidcap/DEPENDS b/video/xvidcap/DEPENDS
index 7716183..24c3c58 100644
--- a/video/xvidcap/DEPENDS
+++ b/video/xvidcap/DEPENDS
@@ -1,5 +1,5 @@
depends ffmpeg
-depends jpeg
+depends %JPEG
depends libpng
depends scrollkeeper
diff --git a/web/bluefish/DEPENDS b/web/bluefish/DEPENDS
index 69fb258..ae72a21 100644
--- a/web/bluefish/DEPENDS
+++ b/web/bluefish/DEPENDS
@@ -1,5 +1,5 @@
depends gtk+-2
-depends jpeg
+depends %JPEG
depends tiff
depends libungif
depends libpng
diff --git a/web/chromium/DEPENDS b/web/chromium/DEPENDS
index 20a26ba..daa2533 100644
--- a/web/chromium/DEPENDS
+++ b/web/chromium/DEPENDS
@@ -2,7 +2,7 @@ depends libevent
depends alsa-lib
depends bzip2
depends gperf
-depends jpeg
+depends %JPEG
depends libpng
depends libxml2
depends libxslt
diff --git a/web/dillo/DEPENDS b/web/dillo/DEPENDS
index 0478418..e527a1e 100644
--- a/web/dillo/DEPENDS
+++ b/web/dillo/DEPENDS
@@ -1,5 +1,5 @@
depends fltk2
-depends jpeg
+depends %JPEG
depends libpng
depends openssl
depends zlib
diff --git a/web/links/DEPENDS b/web/links/DEPENDS
index 8f966e2..0b7e348 100644
--- a/web/links/DEPENDS
+++ b/web/links/DEPENDS
@@ -15,7 +15,7 @@ optional_depends tiff \
"--without-libtiff" \
"for console graphics support"
-optional_depends jpeg \
+optional_depends %JPEG \
"--with-libjpeg" \
"--without-libjpeg" \
"for additional console graphics support"
diff --git a/web/webkit/DEPENDS b/web/webkit/DEPENDS
index ee71bd0..0c825fa 100644
--- a/web/webkit/DEPENDS
+++ b/web/webkit/DEPENDS
@@ -3,7 +3,7 @@ depends icu4c
depends gperf
depends libxslt
depends sqlite
-depends jpeg
+depends %JPEG
depends libpng
depends freetype2
depends libsoup
diff --git a/x11-apps/openoffice-src/DEPENDS b/x11-apps/openoffice-src/DEPENDS
index 17def73..1060c81 100644
--- a/x11-apps/openoffice-src/DEPENDS
+++ b/x11-apps/openoffice-src/DEPENDS
@@ -14,7 +14,7 @@ depends desktop-file-utils
depends hicolor-icon-theme
depends IO-Compress-Zlib
depends gperf
-depends jpeg
+depends %JPEG
depends expat
diff --git a/x11-apps/xscreensaver/DEPENDS b/x11-apps/xscreensaver/DEPENDS
index a851e3b..d515e07 100644
--- a/x11-apps/xscreensaver/DEPENDS
+++ b/x11-apps/xscreensaver/DEPENDS
@@ -24,5 +24,5 @@ optional_depends "%GLX" "--with-gl" "--without-gl" \
optional_depends "gle" "--with-gle" "--without-gle" \
"for OpenGL GLE screensaver support"
-optional_depends "jpeg" "--with-jpeg" "--without-jpeg" \
+optional_depends "%JPEG" "--with-jpeg" "--without-jpeg" \
"for Jpeg support"
diff --git a/x11-utils/x11vnc/DEPENDS b/x11-utils/x11vnc/DEPENDS
index 5da52ef..31264cb 100644
--- a/x11-utils/x11vnc/DEPENDS
+++ b/x11-utils/x11vnc/DEPENDS
@@ -1,6 +1,6 @@
depends %X
-optional_depends "jpeg" "" "--without-jpeg" "for JPEG support"
+optional_depends "%JPEG" "" "--without-jpeg" "for JPEG support"
optional_depends "openssl" "" "--without-ssl" "for SSL encryption"
optional_depends "avahi" "" "--without-avahi" "for avahi support"
diff --git a/x11-utils/xfig/DEPENDS b/x11-utils/xfig/DEPENDS
index e66c6ed..b60839a 100644
--- a/x11-utils/xfig/DEPENDS
+++ b/x11-utils/xfig/DEPENDS
@@ -1,2 +1,2 @@
-depends jpeg &&
+depends %JPEG
depends libpng
diff --git a/x11-utils/xforms/DEPENDS b/x11-utils/xforms/DEPENDS
index 0ec9987..4f13ef5 100644
--- a/x11-utils/xforms/DEPENDS
+++ b/x11-utils/xforms/DEPENDS
@@ -1,4 +1,4 @@
-depends jpeg
+depends %JPEG
depends libXpm
optional_depends "%GLX" "" "" "for OpenGL support"
diff --git a/x11-wm/pekwm/DEPENDS b/x11-wm/pekwm/DEPENDS
index 6346eb9..73cba67 100644
--- a/x11-wm/pekwm/DEPENDS
+++ b/x11-wm/pekwm/DEPENDS
@@ -1,2 +1,2 @@
optional_depends "libpng" "--enable-image-png" "--disable-image-png" "enables png image support"
-optional_depends "jpeg" "--enable-image-jpeg" "--disable-image-jpeg" "enables jpeg image support"
+optional_depends "%JPEG" "--enable-image-jpeg" "--disable-image-jpeg" "enables jpeg image support"
diff --git a/x11/slim/DEPENDS b/x11/slim/DEPENDS
index bc80ac3..691fe77 100644
--- a/x11/slim/DEPENDS
+++ b/x11/slim/DEPENDS
@@ -1,4 +1,4 @@
depends %X
depends libpng
-depends jpeg
+depends %JPEG
depends freetype2
diff --git a/zbeta/chrome-linux/DEPENDS b/zbeta/chrome-linux/DEPENDS
index 58ed485..d4e25c2 100644
--- a/zbeta/chrome-linux/DEPENDS
+++ b/zbeta/chrome-linux/DEPENDS
@@ -2,7 +2,7 @@ depends alsa-lib
depends GConf
depends gperf
depends gtk+-2
-depends jpeg
+depends %JPEG
depends libpng
depends libxml2
depends libxslt
diff --git a/zbeta/e17/eet-svn/DEPENDS b/zbeta/e17/eet-svn/DEPENDS
index b70fe12..b9d7f16 100644
--- a/zbeta/e17/eet-svn/DEPENDS
+++ b/zbeta/e17/eet-svn/DEPENDS
@@ -1,3 +1,3 @@
-depends jpeg
+depends %JPEG
depends eina-svn
depends zlib
diff --git a/zbeta/e17/eina-svn/DEPENDS b/zbeta/e17/eina-svn/DEPENDS
index ad6319a..8998064 100644
--- a/zbeta/e17/eina-svn/DEPENDS
+++ b/zbeta/e17/eina-svn/DEPENDS
@@ -1,2 +1,2 @@
-depends jpeg
+depends %JPEG
depends zlib
diff --git a/zbeta/e17/evas-svn/DEPENDS b/zbeta/e17/evas-svn/DEPENDS
index e3b1196..b045a6b 100644
--- a/zbeta/e17/evas-svn/DEPENDS
+++ b/zbeta/e17/evas-svn/DEPENDS
@@ -3,7 +3,7 @@ depends eet-svn
optional_depends "libpng" "--enable-image-loader-png" "" \
"enable PNG image loader"
-optional_depends "jpeg" "--enable-image-loader-jpeg" "" \
+optional_depends "%JPEG" "--enable-image-loader-jpeg" "" \
"enable JPEG image loader"
optional_depends "libungif" "--enable-image-loader-gif" "" \
"enable GIF image loader"
diff --git a/zbeta/e17/imlib2-svn/DEPENDS b/zbeta/e17/imlib2-svn/DEPENDS
index 17c8b8c..9d5a7ef 100644
--- a/zbeta/e17/imlib2-svn/DEPENDS
+++ b/zbeta/e17/imlib2-svn/DEPENDS
@@ -1,6 +1,6 @@
depends libpng
depends libungif
-depends jpeg
+depends %JPEG
depends freetype2
optional_depends "tiff" "" "--without-tiff" \
diff --git a/zbeta/emacs-cvs/DEPENDS b/zbeta/emacs-cvs/DEPENDS
index f8784a7..68b7825 100644
--- a/zbeta/emacs-cvs/DEPENDS
+++ b/zbeta/emacs-cvs/DEPENDS
@@ -1,9 +1,9 @@
depends texinfo
optional_depends libungif "--with-gif" "" "for gif support if you use faces"
-optional_depends jpeg "--with-jpeg" "" "for jpeg support if you use faces"
-optional_depends tiff "--with-tiff" "" "for tiff support if you use faces"
-optional_depends libpng "--with-png" "" "for png support if you use faces"
-optional_depends librsvg "--with-rsvg" "" "for svg support"
-optional_depends "%X" "--with-x --with-xpm" "" "for xpm support if you use faces"
-optional_depends gtk+-2 "--with-x-toolkit=gtk" "" "for a GTK2 user interface"
-optional_depends libXft "--enable-font-backend --with-xft" "" "for pretty font support"
+optional_depends %JPEG "--with-jpeg" "" "for jpeg support if you use faces"
+optional_depends tiff "--with-tiff" "" "for tiff support if you use faces"
+optional_depends libpng "--with-png" "" "for png support if you use faces"
+optional_depends librsvg "--with-rsvg" "" "for svg support"
+optional_depends "%X" "--with-x --with-xpm" "" "for xpm support if you use faces"
+optional_depends gtk+-2 "--with-x-toolkit=gtk" "" "for a GTK2 user interface"
+optional_depends libXft "--enable-font-backend --with-xft" "" "for pretty font support"
diff --git a/zbeta/firebox/DEPENDS b/zbeta/firebox/DEPENDS
index 0bb5b98..e4ff4ce 100644
--- a/zbeta/firebox/DEPENDS
+++ b/zbeta/firebox/DEPENDS
@@ -1,2 +1,2 @@
optional_depends "libpng" "--enable-png" "--disable-png" "enables png image support (RECOMMENDED)"
-optional_depends "jpeg" "--enable-jpeg" "--disable-jpeg" "enables jpeg image support (RECOMMENDED)"
+optional_depends "%JPEG" "--enable-jpeg" "--disable-jpeg" "enables jpeg image support (RECOMMENDED)"
diff --git a/zbeta/jwm/DEPENDS b/zbeta/jwm/DEPENDS
index 55b5dee..dfdc778 100644
--- a/zbeta/jwm/DEPENDS
+++ b/zbeta/jwm/DEPENDS
@@ -1,3 +1,3 @@
-optional_depends "libpng" "--enable-png" "--disable-png" "to enable PNG support"
-optional_depends "jpeg" "--enable-jpeg" "--disable-jpeg" "to enable JPEG support"
+optional_depends "libpng" "--enable-png" "--disable-png" "to enable PNG support"
+optional_depends "%JPEG" "--enable-jpeg" "--disable-jpeg" "to enable JPEG support"
optional_depends "fribidi" "--enable-fribidi" "--disable-fribidi" "to enable right-to-left language support"
diff --git a/zbeta/mupdf/DEPENDS b/zbeta/mupdf/DEPENDS
index f5885e7..50709ab 100644
--- a/zbeta/mupdf/DEPENDS
+++ b/zbeta/mupdf/DEPENDS
@@ -1,4 +1,4 @@
depends freetype2
-depends jpeg
+depends %JPEG
depends openjpeg
depends jbig2dec
diff --git a/zbeta/xemacs-beta/DEPENDS b/zbeta/xemacs-beta/DEPENDS
index d513a4b..f30c113 100644
--- a/zbeta/xemacs-beta/DEPENDS
+++ b/zbeta/xemacs-beta/DEPENDS
@@ -16,7 +16,7 @@ optional_depends "libpng" \
"--with-png" \
"" \
"for PNG image support"
-optional_depends "jpeg" \
+optional_depends "%JPEG" \
"--with-jpeg" \
"" \
"for JPEG image support"
More information about the Lunar-commits
mailing list