[Lunar-commits] <moonbase> Revert "replace the %X depend with libX11 one for many modules."

Florin Braescu florin at lunar-linux.org
Tue May 4 09:24:33 CEST 2010


commit d5efaf91f0a86e494f8cb83b06bc4ec03f6fc0af
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Tue May 4 10:24:33 2010 +0300

    Revert "replace the %X depend with libX11 one for many modules."
    
    This reverts commit ec950ec5588cff98e63f8979c92e6b9594ac19fe.
    
    revert it.
---
 devel/tk/DEPENDS                |    2 +-
 doc-tools/teTeX/DEPENDS         |   26 +++++++++-----------------
 editors/elvis/DEPENDS           |    5 ++---
 editors/emacs/DEPENDS           |   18 +++++++++---------
 editors/jed/DEPENDS             |    3 +--
 editors/vile/DEPENDS            |    2 +-
 editors/vim/DEPENDS             |   13 ++++---------
 filemanagers/worker/DEPENDS     |    2 +-
 fonts/latex-xft-fonts/DEPENDS   |    2 +-
 graphics/GraphicsMagick/DEPENDS |   22 +++++++++++-----------
 graphics/cairo/DEPENDS          |    9 +++------
 i18n/Canna/DEPENDS              |    2 +-
 libs/cdk/DEPENDS                |    4 ++--
 libs/openMotif/DEPENDS          |    2 +-
 libs/opencv/DEPENDS             |    6 +++---
 mail/exim/DEPENDS               |    7 +++----
 mono/libgdiplus/DEPENDS         |   21 +++++----------------
 printer/ghostscript/DEPENDS     |    2 +-
 profiles/useful-profile/DEPENDS |    4 ----
 qt4-apps/qt4/DEPENDS            |    2 +-
 science/R/DEPENDS               |    2 +-
 science/gnuplot/DEPENDS         |    2 +-
 utils/vice/DEPENDS              |    2 +-
 video/goggles/DEPENDS           |    6 +++---
 video/tvtime/DEPENDS            |    8 ++++----
 video/xine-lib-vdpau/DEPENDS    |    2 +-
 video/xine-lib/DEPENDS          |    2 +-
 video/xine-ui/DEPENDS           |    4 ++--
 x11-utils/conky/DEPENDS         |    3 +--
 x11-utils/wmmemmon/DEPENDS      |    2 +-
 x11-utils/wmweather/DEPENDS     |    2 +-
 x11-utils/x11vnc/DEPENDS        |    2 +-
 x11-utils/xhkeys/DEPENDS        |    2 +-
 x11/slim/DEPENDS                |    2 +-
 zbeta/e17/emotion-svn/DEPENDS   |    1 -
 zbeta/emacs-cvs/DEPENDS         |   13 ++++++-------
 zbeta/gnash-cvs/DEPENDS         |    2 +-
 zbeta/wine-git/DEPENDS          |    2 +-
 zdeprecated/gtk+/DEPENDS        |    2 +-
 39 files changed, 89 insertions(+), 126 deletions(-)

diff --git a/devel/tk/DEPENDS b/devel/tk/DEPENDS
index def7d52..d675891 100644
--- a/devel/tk/DEPENDS
+++ b/devel/tk/DEPENDS
@@ -1,2 +1,2 @@
 depends  tcl
-depends  libX11
+depends  %X
diff --git a/doc-tools/teTeX/DEPENDS b/doc-tools/teTeX/DEPENDS
index cba6e64..c6e9ff2 100644
--- a/doc-tools/teTeX/DEPENDS
+++ b/doc-tools/teTeX/DEPENDS
@@ -1,17 +1,9 @@
-depends  dialog
-depends  ed
-depends  zlib
-depends  w3c-libwww
-depends  texinfo
-depends  teTeX-texmf
-depends  bison
-
-optional_depends  "libX11"  \
-                  ""        \
-                  "--without-x11"  \
-                  "for GUI support"
-
-optional_depends  "libpng"  \
-                  "--with-system-pnglib"  \
-                  ""   \
-                  "for png support"
+depends  dialog       &&
+depends  ed           &&
+depends  zlib         &&
+depends  w3c-libwww   &&
+depends  texinfo      &&
+depends  teTeX-texmf  &&
+depends  bison        &&
+optional_depends  "%X" ""  "--without-x11" "for GUI support"
+optional_depends  "libpng"  "--with-system-pnglib"  ""  "for png support"
diff --git a/editors/elvis/DEPENDS b/editors/elvis/DEPENDS
index 0ff58c3..730d696 100644
--- a/editors/elvis/DEPENDS
+++ b/editors/elvis/DEPENDS
@@ -1,3 +1,2 @@
-depends ncurses
-
-optional_depends "libX11" "" "" "Build elvis with x11 support"
+depends ncurses &&
+optional_depends "%X" "" "" "Build elvis with x11 support"
diff --git a/editors/emacs/DEPENDS b/editors/emacs/DEPENDS
index df56331..1c59bd3 100644
--- a/editors/emacs/DEPENDS
+++ b/editors/emacs/DEPENDS
@@ -1,10 +1,10 @@
-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  "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"
-optional_depends  "libX11"    "--with-x --with-xpm" "--without-xpm" "for xpm support if you use faces"
+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  "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"
+optional_depends  "%X" "--with-x --with-xpm" "--without-xpm" "for xpm support if you use faces"
 optional_depends  "openMotif" "--with-x-toolkit=motif" "" "for OSF/Motif standard GUI"
-optional_depends  "gtk+-2"    "--with-x-toolkit=gtk" "" "for gtk+ support GUI"
-optional_depends  "libXft"    "--with-xft" "--without-xft" "for anti alias font support"
-optional_depends  "dbus"      "--with-dbus" "--without-dbus" "for D-BUS support"
+optional_depends  "gtk+-2" "--with-x-toolkit=gtk" "" "for gtk+ support GUI"
+optional_depends  "libXft" "--with-xft" "--without-xft" "for anti alias font support"
+optional_depends  "dbus" "--with-dbus" "--without-dbus" "for D-BUS support"
diff --git a/editors/jed/DEPENDS b/editors/jed/DEPENDS
index bac01d5..e94fd1b 100644
--- a/editors/jed/DEPENDS
+++ b/editors/jed/DEPENDS
@@ -1,3 +1,2 @@
 depends  slang
-
-optional_depends "libX11" "" "" "Build jed with x11 support"
+optional_depends "%X" "" "" "Build jed with x11 support"
diff --git a/editors/vile/DEPENDS b/editors/vile/DEPENDS
index da84fc9..85166a7 100644
--- a/editors/vile/DEPENDS
+++ b/editors/vile/DEPENDS
@@ -1,3 +1,3 @@
 optional_depends perl      "--with-perl" "" "Use Perl as an extension language"
 optional_depends openMotif ""            "" "Build xvile with motif"
-optional_depends libX11    ""            "" "Build xvile with x11 support, no toolkits"
+optional_depends %X        ""            "" "Build xvile with x11 support, no toolkits"
diff --git a/editors/vim/DEPENDS b/editors/vim/DEPENDS
index 2de2b0e..ddeb4df 100644
--- a/editors/vim/DEPENDS
+++ b/editors/vim/DEPENDS
@@ -1,11 +1,6 @@
 depends ncurses
-
-optional_depends libX11  \
-                 "--enable-gui=auto"  \
-                 "--enable-gui=no --without-x"  \
-                 "to enable a gui"
-
+optional_depends "%X" "--enable-gui=auto" "--enable-gui=no --without-x" "to enable a gui"
 optional_depends Python "--enable-pythoninterp" "" "to enable Python interpreter support"
-optional_depends perl   "--enable-perlinterp"   "" "to enable Perl interpreter support"
-optional_depends tcl    "--enable-tclinterp"    "" "to enable Tcl interpreter support"
-optional_depends ruby   "--enable-rubyinterp"   "" "to enable Ruby interpreter support"
+optional_depends perl "--enable-perlinterp" "" "to enable Perl interpreter support"
+optional_depends tcl "--enable-tclinterp" "" "to enable Tcl interpreter support"
+optional_depends ruby "--enable-rubyinterp" "" "to enable Ruby interpreter support"
diff --git a/filemanagers/worker/DEPENDS b/filemanagers/worker/DEPENDS
index 7892b55..2368fd3 100644
--- a/filemanagers/worker/DEPENDS
+++ b/filemanagers/worker/DEPENDS
@@ -1 +1 @@
-depends  libX11
\ No newline at end of file
+depends  %X
diff --git a/fonts/latex-xft-fonts/DEPENDS b/fonts/latex-xft-fonts/DEPENDS
index 2fb0f72..2368fd3 100644
--- a/fonts/latex-xft-fonts/DEPENDS
+++ b/fonts/latex-xft-fonts/DEPENDS
@@ -1 +1 @@
-depends  libX11
+depends  %X
diff --git a/graphics/GraphicsMagick/DEPENDS b/graphics/GraphicsMagick/DEPENDS
index b4e4568..5789508 100644
--- a/graphics/GraphicsMagick/DEPENDS
+++ b/graphics/GraphicsMagick/DEPENDS
@@ -1,12 +1,12 @@
-depends  libX11
+depends  %X
 
-optional_depends "hp2xx"         ""  ""  "to convert HP-GL foramts"
-optional_depends "lcms"          ""  ""  "for color management"
-optional_depends "transfig"      ""  ""  "to read fig image format"
-optional_depends "gnuplot"       ""  ""  "to read plot files"
-optional_depends "jbigkit"       ""  ""  "bi-level image compression"
-optional_depends "jasper"        ""  ""  "JPEG-2000 support"
-optional_depends "libwmf"        ""  ""  "for Windows Metafile support"
-optional_depends "libfpx"        ""  ""  "for flash pix support"
-optional_depends "ufraw"         ""  ""  "for RAW image support"
-optional_depends "sane-backends" ""  ""  "for scanner support"
+optional_depends "hp2xx"    ""  ""  "to convert HP-GL foramts"
+optional_depends "lcms"     ""  ""  "for color management"
+optional_depends "transfig" ""  ""  "to read fig image format"
+optional_depends "gnuplot"  ""  ""  "to read plot files"
+optional_depends "jbigkit"  ""  ""  "bi-level image compression"
+optional_depends "jasper"   ""  ""  "JPEG-2000 support"
+optional_depends "libwmf"   ""  ""  "for Windows Metafile support"
+optional_depends "libfpx"   ""  ""  "for flash pix support"
+optional_depends "ufraw"    ""  ""  "for RAW image support"
+optional_depends "sane-backends" "" "" "for scanner support"
diff --git a/graphics/cairo/DEPENDS b/graphics/cairo/DEPENDS
index 918a128..ff3ef9d 100644
--- a/graphics/cairo/DEPENDS
+++ b/graphics/cairo/DEPENDS
@@ -3,10 +3,7 @@ depends fontconfig
 depends libpng
 depends pixman
 
-optional_depends  "libX11"  "--with-x"  ""  "for X11 support"
-
-optional_depends  "glitz"  \
-                  "--enable-glitz"   \
-                  "--disable-glitz"  \
-                  "to enable an (experimental) OpenGL backend to cairo"
+optional_depends  "glitz"  "--enable-glitz"  "--disable-glitz"  \
+                  "to enable an (experimental) OpenGL backend to cairo" 
 
+optional_depends  "%X"  "--with-x"  "" "for X11 support"
diff --git a/i18n/Canna/DEPENDS b/i18n/Canna/DEPENDS
index 2fb0f72..3ddb42b 100644
--- a/i18n/Canna/DEPENDS
+++ b/i18n/Canna/DEPENDS
@@ -1 +1 @@
-depends  libX11
+depends %X
diff --git a/libs/cdk/DEPENDS b/libs/cdk/DEPENDS
index 733c2e8..f471472 100644
--- a/libs/cdk/DEPENDS
+++ b/libs/cdk/DEPENDS
@@ -1,5 +1,5 @@
-depends  ncurses
+depends  ncurses  &&
 
-optional_depends  "libX11"  "--with-x"  ""  "use the X Window System"
+optional_depends  "%X"  "--with-x"  ""  "use the X Window System"
 
 
diff --git a/libs/openMotif/DEPENDS b/libs/openMotif/DEPENDS
index 85dd4ae..5b8ec2e 100644
--- a/libs/openMotif/DEPENDS
+++ b/libs/openMotif/DEPENDS
@@ -1,3 +1,3 @@
-depends libX11
+depends %X
 depends jpeg
 depends libpng
diff --git a/libs/opencv/DEPENDS b/libs/opencv/DEPENDS
index ada0446..85e470c 100644
--- a/libs/opencv/DEPENDS
+++ b/libs/opencv/DEPENDS
@@ -1,6 +1,6 @@
-depends gtk+-2
-depends libpng
-depends jpeg
+depends gtk+-2 
+depends libpng 
+depends jpeg   
 depends tiff
 
 optional_depends Python       "-DCMAKE_BUILD_NEW_PYTHON_SUPPORT=ON"  \
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index f468281..1be7229 100644
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -1,7 +1,6 @@
 depends db
 depends gawk
-
-optional_depends %CROND "" ""  "to periodically attempt to resend undelivered mail"
-optional_depends mysql  "" ""  "for mysql lookup tables"
-optional_depends libX11 "" ""  "Build exim monitor with x11 support"
+optional_depends %CROND "" "" "to periodically attempt to resend undelivered mail"
 optional_depends tcp_wrappers  ""  ""  "for controlling remote access"
+optional_depends mysql ""  ""  "for mysql lookup tables"
+optional_depends %X "" "" "Build exim monitor with x11 support"
diff --git a/mono/libgdiplus/DEPENDS b/mono/libgdiplus/DEPENDS
index 1893285..6040ddc 100644
--- a/mono/libgdiplus/DEPENDS
+++ b/mono/libgdiplus/DEPENDS
@@ -1,22 +1,11 @@
-depends  libX11
+depends  %X
 depends  glib-2
 
-optional_depends  "tiff"  \
-                  ""      \
-                  "--without-libtiff"  \
+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"  \
+optional_depends  "libexif"  ""  "--without-libexif"  \
                   "for EXIF image tag support"
-
-optional_depends  "libungif"  \
-                  ""  \
-                  ""  \
+optional_depends  "libungif" ""  ""                   \
                   "for GIF image support"
diff --git a/printer/ghostscript/DEPENDS b/printer/ghostscript/DEPENDS
index 7a22700..4eea990 100644
--- a/printer/ghostscript/DEPENDS
+++ b/printer/ghostscript/DEPENDS
@@ -1,7 +1,7 @@
 depends jpeg
 depends libpng
 
-optional_depends "libX11"  "--with-x"   "--without-x"      "For an X frontend"
+optional_depends "%X"      "--with-x"   "--without-x"      "For an X frontend"
 optional_depends "ijs"     "--with-ijs" "--without-ijs"    "For ijs driver support"
 optional_depends "cups"    ""           "--disable-cups"   "To build the CUPS backends (recommended)"
 optional_depends "gtk+-2"  ""           "--disable-gtk"    "For GTK support"
diff --git a/profiles/useful-profile/DEPENDS b/profiles/useful-profile/DEPENDS
index 5dfc582..c896343 100644
--- a/profiles/useful-profile/DEPENDS
+++ b/profiles/useful-profile/DEPENDS
@@ -1,15 +1,11 @@
 optional_depends  "pine"  ""  ""  "for a easy console based email client."
-
 message  "Choose sysklogd for traditional style of logs"  \
          "or metalog for autorotating style of logs" \
 optional_depends  "sysklogd"  ""  ""  "for traditonal style of logs"
-
 optional_depends  "metalog"   ""  ""  "for auto-rotating logs"
-
 message  "Choose either the xinetd launched exim MTA or"
 message  "the postfix daemon mail transfer agent."
 optional_depends  "exim"     ""  ""  "a MTA"
 optional_depends  "postfix"  ""  ""  "a MTA"
 optional_depends  "sendmail" ""  ""  "a MTA"
-
 optional_depends  "%X"  ""  ""  "for x11 desktop"
diff --git a/qt4-apps/qt4/DEPENDS b/qt4-apps/qt4/DEPENDS
index 6f1e924..0898b4c 100644
--- a/qt4-apps/qt4/DEPENDS
+++ b/qt4-apps/qt4/DEPENDS
@@ -1,4 +1,4 @@
-depends  libX11
+depends  %X
 
 optional_depends  "openssl"    "-openssl"          "-no-openssl"    "for Secure Sockets support"
 optional_depends  "libmng"     "-system-libmng"    "-qt-libmng"     "Use system or Qt version of MNG"
diff --git a/science/R/DEPENDS b/science/R/DEPENDS
index b70f814..0c91cca 100644
--- a/science/R/DEPENDS
+++ b/science/R/DEPENDS
@@ -1,6 +1,6 @@
 optional_depends jpeg   "--with-jpeglib" "--without-jpeglib" "for jpeg graphics support"
 optional_depends libpng "--with-libpng"  "--without-libpng"  "for libpng support"
-optional_depends libX11 "--with-x"       "--without-x"       "use the X Window System"
+optional_depends %X     "--with-x"       "--without-x"       "use the X Window System"
 optional_depends tk     "--with-tcltk"   "--without-tcltk"   "for gui, recommended"
 optional_depends icu4c  "--with-ICU"     "--without-ICU"     "for Unicode support"
 
diff --git a/science/gnuplot/DEPENDS b/science/gnuplot/DEPENDS
index fe33172..be05653 100644
--- a/science/gnuplot/DEPENDS
+++ b/science/gnuplot/DEPENDS
@@ -1,6 +1,6 @@
 optional_depends gd     "--with-gd"  "--without-gd"  "for additional graphics support"
 optional_depends libpng "--with-png" "--without-png" "enable png terminal"
-optional_depends libX11 "--with-x"   "--without-x"   "Use X window system" 
+optional_depends "%X"   "--with-x"   "--without-x"   "Use X window system" 
 optional_depends lua    "--with-lua" "--without-lua" "For Lua scripting support"
 optional_depends libggi "--with-ggi" "--without-ggi" "For General Graphics Interface support"
 
diff --git a/utils/vice/DEPENDS b/utils/vice/DEPENDS
index 2fb0f72..2368fd3 100644
--- a/utils/vice/DEPENDS
+++ b/utils/vice/DEPENDS
@@ -1 +1 @@
-depends  libX11
+depends  %X
diff --git a/video/goggles/DEPENDS b/video/goggles/DEPENDS
index 1b7cdc6..fba6992 100644
--- a/video/goggles/DEPENDS
+++ b/video/goggles/DEPENDS
@@ -1,3 +1,3 @@
-depends  fox
-depends  ogle
-depends  libX11
+depends  fox   &&
+depends  ogle  &&
+depends  %X
diff --git a/video/tvtime/DEPENDS b/video/tvtime/DEPENDS
index 6ef5b65..7277f3f 100644
--- a/video/tvtime/DEPENDS
+++ b/video/tvtime/DEPENDS
@@ -1,4 +1,4 @@
-depends libxml2
-depends libpng
-depends freetype2
-depends libX11
+depends libxml2  &&
+depends libpng   &&
+depends freetype2 &&
+depends %X
diff --git a/video/xine-lib-vdpau/DEPENDS b/video/xine-lib-vdpau/DEPENDS
index f834e9c..5cb8dfb 100644
--- a/video/xine-lib-vdpau/DEPENDS
+++ b/video/xine-lib-vdpau/DEPENDS
@@ -1,4 +1,4 @@
-depends  libX11
+depends  %X
 depends  %VDPAUDEVICE
 
 optional_depends  "alsa-utils" \
diff --git a/video/xine-lib/DEPENDS b/video/xine-lib/DEPENDS
index 3325926..932d137 100644
--- a/video/xine-lib/DEPENDS
+++ b/video/xine-lib/DEPENDS
@@ -1,4 +1,4 @@
-depends  libX11
+depends  %X
 
 optional_depends  "alsa-utils"  \
                   ""            \
diff --git a/video/xine-ui/DEPENDS b/video/xine-ui/DEPENDS
index 814ff8a..29f4cd7 100644
--- a/video/xine-ui/DEPENDS
+++ b/video/xine-ui/DEPENDS
@@ -1,3 +1,3 @@
-depends  %XINELIB
-depends  ncurses
+depends  %XINELIB &&
+depends  ncurses &&
 depends  readline
diff --git a/x11-utils/conky/DEPENDS b/x11-utils/conky/DEPENDS
index 6884865..5096aec 100644
--- a/x11-utils/conky/DEPENDS
+++ b/x11-utils/conky/DEPENDS
@@ -1,6 +1,5 @@
-depends libX11
+depends %X
 depends zlib
-
 optional_depends bmpx "--enable-bmpx" "--disable-bmpx" "for BMPx control support"
 optional_depends audacious "--enable-audacious" "--disable-audacious" "for Audacious support"
 optional_depends curl "--enable-curl" "--disable-curl" "for CURL support"
diff --git a/x11-utils/wmmemmon/DEPENDS b/x11-utils/wmmemmon/DEPENDS
index 2fb0f72..2368fd3 100644
--- a/x11-utils/wmmemmon/DEPENDS
+++ b/x11-utils/wmmemmon/DEPENDS
@@ -1 +1 @@
-depends  libX11
+depends  %X
diff --git a/x11-utils/wmweather/DEPENDS b/x11-utils/wmweather/DEPENDS
index 21bdc46..a83fe64 100644
--- a/x11-utils/wmweather/DEPENDS
+++ b/x11-utils/wmweather/DEPENDS
@@ -1,2 +1,2 @@
-depends  libX11
+depends  %X    &&
 depends  curl
diff --git a/x11-utils/x11vnc/DEPENDS b/x11-utils/x11vnc/DEPENDS
index a0987ee..5da52ef 100644
--- a/x11-utils/x11vnc/DEPENDS
+++ b/x11-utils/x11vnc/DEPENDS
@@ -1,4 +1,4 @@
-depends  libX11
+depends  %X
 
 optional_depends  "jpeg"     ""  "--without-jpeg"  "for JPEG support"
 optional_depends  "openssl"  ""  "--without-ssl"   "for SSL encryption"
diff --git a/x11-utils/xhkeys/DEPENDS b/x11-utils/xhkeys/DEPENDS
index 2fb0f72..3ddb42b 100644
--- a/x11-utils/xhkeys/DEPENDS
+++ b/x11-utils/xhkeys/DEPENDS
@@ -1 +1 @@
-depends  libX11
+depends %X
diff --git a/x11/slim/DEPENDS b/x11/slim/DEPENDS
index d003856..bc80ac3 100644
--- a/x11/slim/DEPENDS
+++ b/x11/slim/DEPENDS
@@ -1,4 +1,4 @@
-depends  libX11
+depends  %X
 depends  libpng
 depends  jpeg
 depends  freetype2
diff --git a/zbeta/e17/emotion-svn/DEPENDS b/zbeta/e17/emotion-svn/DEPENDS
index f7153ad..a994f3e 100644
--- a/zbeta/e17/emotion-svn/DEPENDS
+++ b/zbeta/e17/emotion-svn/DEPENDS
@@ -2,6 +2,5 @@ depends  edje-svn
 
 optional_depends  "%XINELIB"    "--enable-xine"       "--disable-xine"       \
                   "for xine based video/audio decoding support (if you say 'n' here, you need to say 'y' to gst-ffmpeg)"
-
 optional_depends  "gst-ffmpeg"  "--enable-gstreamer"  "--disable-gstreamer"  \
                   "for gstreamer based video/audio decoding support"
diff --git a/zbeta/emacs-cvs/DEPENDS b/zbeta/emacs-cvs/DEPENDS
index da8e3ba..857ea86 100644
--- a/zbeta/emacs-cvs/DEPENDS
+++ b/zbeta/emacs-cvs/DEPENDS
@@ -1,8 +1,7 @@
 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  libX11   "--with-x --with-xpm" "" "for xpm support if you use faces"
-optional_depends  gtk+-2   "--with-gtk"          "" "for a GTK2 user interface"
+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  "%X" "--with-x --with-xpm" "" "for xpm support if you use faces"
+optional_depends  gtk+-2  "--with-gtk" "" "for a GTK2 user interface"
diff --git a/zbeta/gnash-cvs/DEPENDS b/zbeta/gnash-cvs/DEPENDS
index 7afcc52..a777452 100644
--- a/zbeta/gnash-cvs/DEPENDS
+++ b/zbeta/gnash-cvs/DEPENDS
@@ -1,3 +1,3 @@
-depends libX11
+depends %X
 depends libpng
 depends libxml2
diff --git a/zbeta/wine-git/DEPENDS b/zbeta/wine-git/DEPENDS
index a15675e..8725065 100644
--- a/zbeta/wine-git/DEPENDS
+++ b/zbeta/wine-git/DEPENDS
@@ -1,7 +1,7 @@
 depends  flex
 
 # For users that only want to run console applications.
-optional_depends "libX11"            \
+optional_depends "%X"                \
                  "--enable-opengl"   \
                  "--without-x"       \
                  "for X11 support"
diff --git a/zdeprecated/gtk+/DEPENDS b/zdeprecated/gtk+/DEPENDS
index 30fe1d2..3047b57 100644
--- a/zdeprecated/gtk+/DEPENDS
+++ b/zdeprecated/gtk+/DEPENDS
@@ -1,2 +1,2 @@
 depends  glib
-depends  libX11
+depends  %X


More information about the Lunar-commits mailing list