[Lunar-commits] Removing stinking tabs. Don't use tabs in moonbase!!!

Terry Chan tchan at lunar-linux.org
Mon Dec 10 06:05:09 CET 2007


commit 7d395ee61276aa8fd3d123870a264600fcc6391d
Author: Terry Chan <tchan at lunar-linux.org>
Date:   Sun Dec 9 23:05:09 2007 -0600

    Removing stinking tabs. Don't use tabs in moonbase!!!
---
 archive/ibackup/DEPENDS           |   10 ++--
 audio/abcde/DEPENDS               |   15 +++----
 audio/audacity/DEPENDS            |   54 ++++++++++++------------
 audio/jack/DEPENDS                |   22 +++++-----
 audio/jack/POST_INSTALL           |    4 +-
 audio/xmms/DEPENDS                |    2 +-
 cd/cdw/DEPENDS                    |   18 +++-----
 cd/vobcopy/DEPENDS                |    4 +-
 chat/ircd-ratbox/DEPENDS          |   18 ++++----
 chat/ratbox-services/DEPENDS      |   12 +++---
 chat/weechat/DEPENDS              |   14 +-----
 crypto/heimdal/DEPENDS            |    4 +-
 devel/ivman/DEPENDS               |    4 +-
 devel/tcllib/DEPENDS              |    2 +-
 distributed/transmission/DEPENDS  |   11 +----
 editors/vim/DEPENDS               |   22 +++-------
 filesys/openafs/DEPENDS           |   13 ++----
 ftp/dclib/DEPENDS                 |    4 +-
 games/celestia/DEPENDS            |   11 ++---
 games/eboard/DEPENDS              |    2 +-
 games/scummvm/DEPENDS             |   32 +++-----------
 graphics/gdk-pixbuf/DEPENDS       |    2 +-
 graphics/gtksee/DEPENDS           |    8 ++--
 graphics/imlib/DEPENDS            |   12 +++---
 i18n/poedit/DEPENDS               |   12 +----
 libs/aqbanking/DEPENDS            |   38 +++++------------
 libs/fox/DEPENDS                  |    6 +--
 libs/fuse-python/DEPENDS          |    2 +-
 libs/mico/DEPENDS                 |    5 +--
 libs/yaz/DEPENDS                  |    4 +-
 mail/courier-authlib/DEPENDS      |   43 ++++---------------
 mail/dovecot/DEPENDS              |   12 +----
 mail/mailman/DEPENDS              |   32 +++-----------
 mail/spamass-milter/DEPENDS       |    4 +-
 mail/sylpheed/DEPENDS             |   31 +++----------
 mail/sylpheed2/DEPENDS            |   36 +++-------------
 mail/thunderbird/DEPENDS          |   29 ++++---------
 net/cfengine/DEPENDS              |    9 +---
 net/iftop/DEPENDS                 |    2 +-
 net/nomad/DEPENDS                 |    4 +-
 perl/SDL_perl/DEPENDS             |   20 ++++----
 perl/perlipq/DEPENDS              |    2 +-
 printer/cups/DEPENDS              |   30 ++-----------
 printer/gimp-print/DEPENDS        |   17 +------
 printer/gutenprint/DEPENDS        |    4 +-
 profiles/docbook-profile/DEPENDS  |    4 +-
 profiles/netutils-profile/DEPENDS |   42 ++++++------------
 qt-apps/qjackctl/DEPENDS          |    2 +-
 qt-apps/valknut/DEPENDS           |    4 +-
 science/gnuplot/DEPENDS           |    7 +--
 science/gputils/DEPENDS           |    2 +-
 sql/mysqltcl/DEPENDS              |    2 +-
 utils/cryptsetup/DEPENDS          |    4 +-
 utils/dosbox/DEPENDS              |   12 +----
 utils/evms/DEPENDS                |    8 +---
 utils/fcron/DEPENDS               |    5 +--
 utils/mkinitrd/DEPENDS            |    6 +-
 utils/openldap/DEPENDS            |   24 ++---------
 utils/xmltv/DEPENDS               |   18 ++++----
 video/MPlayer/DEPENDS             |   84 ++++++------------------------------
 video/divxcalc/DEPENDS            |    4 +-
 video/freevo/DEPENDS              |   67 +++++++++++------------------
 video/mpeg4ip/DEPENDS             |   18 +-------
 video/mythtv/DEPENDS              |   10 ++--
 web/linuxconf/DEPENDS             |    6 +-
 wifi/wpa_supplicant/DEPENDS       |   13 +++---
 x11-apps/openoffice-bin/DETAILS   |    2 +-
 x11-apps/xlockmore/DEPENDS        |   17 +------
 x11-utils/conky/DEPENDS           |    4 +-
 x11-utils/nvtv/DEPENDS            |    8 +---
 x11-wm/fluxbox/DEPENDS            |    5 +--
 xfce4/xfc/DEPENDS                 |    7 +--
 zbeta/XDirectFB/DEPENDS           |    2 +-
 zbeta/beagle/DEPENDS              |   20 ++-------
 zbeta/emacs-cvs/DEPENDS           |   14 +++---
 zbeta/gift-cvs/DEPENDS            |   26 +++--------
 zbeta/gloox/DETAILS               |    2 +-
 zbeta/gnash-cvs/DEPENDS           |    4 +-
 zbeta/hunspell/DEPENDS            |   18 +-------
 zbeta/libass/DEPENDS              |   14 +-----
 zbeta/nil-cvs/DEPENDS             |    6 +-
 zbeta/obby/DEPENDS                |    3 +-
 zbeta/openafs-devel/DEPENDS       |    6 +-
 zbeta/silc-server/DEPENDS         |    5 +--
 zbeta/silc-toolkit/DEPENDS        |    5 +--
 zbeta/turck-mmcache/DEPENDS       |    2 +-
 zbeta/vim-cvs/DEPENDS             |   18 ++------
 zbeta/vim-svn/DEPENDS             |   18 ++------
 zbeta/weechat-cvs/DEPENDS         |   16 ++-----
 zbeta/weechat-git/DEPENDS         |   16 ++-----
 90 files changed, 383 insertions(+), 839 deletions(-)

diff --git a/archive/ibackup/DEPENDS b/archive/ibackup/DEPENDS
index 3c587cf..279eace 100644
--- a/archive/ibackup/DEPENDS
+++ b/archive/ibackup/DEPENDS
@@ -1,5 +1,5 @@
-depends coreutils &&
-depends tar &&
-depends gzip &&
-optional_depends openssh	""	""	"Encrypt shell transfers" &&
-optional_depends gnupg		""	""	"Sign and encrypt your backup files"
+depends coreutils
+depends tar
+depends gzip
+optional_depends openssh "" "" "Encrypt shell transfers"
+optional_depends gnupg "" "" "Sign and encrypt your backup files"
diff --git a/audio/abcde/DEPENDS b/audio/abcde/DEPENDS
index 43e62e7..8192af1 100644
--- a/audio/abcde/DEPENDS
+++ b/audio/abcde/DEPENDS
@@ -1,9 +1,8 @@
-depends  cd-discid         &&
-depends  vorbis-tools	   &&
-depends	 cdparanoia	   &&
-depends	 wget		   &&
-depends	 id3		   &&
-depends	 id3v2		   &&
-
-optional_depends "lame"	"" "" "to be able to encode to mp3" &&
+depends  cd-discid
+depends  vorbis-tools
+depends  cdparanoia
+depends  wget
+depends  id3
+depends  id3v2
+optional_depends "lame" "" "" "to be able to encode to mp3"
 optional_depends "flac" "" "" "to be able to encode flac"
diff --git a/audio/audacity/DEPENDS b/audio/audacity/DEPENDS
index 40af4b9..4223482 100644
--- a/audio/audacity/DEPENDS
+++ b/audio/audacity/DEPENDS
@@ -1,33 +1,33 @@
-depends  wxGTK          &&
-depends  libsndfile     &&
-depends  libsamplerate  &&
+depends  wxGTK
+depends  libsndfile
+depends  libsamplerate
 
-optional_depends	"libid3tag" \
-			"--with-id3tag=system" \
-			"" \
-			"enable id3 support"  &&
+optional_depends        "libid3tag" \
+                        "--with-id3tag=system" \
+                        "" \
+                        "enable id3 support"
 
-optional_depends	"lame" \
-			"" \
-			"" \
-			"enable mp3 support"  &&
+optional_depends        "lame" \
+                        "" \
+                        "" \
+                        "enable mp3 support"
 
-optional_depends	"libvorbis" \
-			"--with-vorbis=system" \
-			"" \
-			"enable ogg support"  &&
+optional_depends        "libvorbis" \
+                        "--with-vorbis=system" \
+                        "" \
+                        "enable ogg support"
 
-optional_depends	"libmad" \
-			"--with-libmad=system" \
-			"" \
-			"for fast mp3 decoding"  &&
+optional_depends        "libmad" \
+                        "--with-libmad=system" \
+                        "" \
+                        "for fast mp3 decoding"
 
-optional_depends	"flac" \
-			"--with-flac=system" \
-			"" \
-			"for flac encoding"  &&
+optional_depends        "flac" \
+                        "--with-flac=system" \
+                        "" \
+                        "for flac encoding"
 
-optional_depends	"ladspa_sdk" \
-			"" \
-			"" \
-			"for ladspa plugin support"
+optional_depends        "ladspa_sdk" \
+                        "" \
+                        "" \
+                        "for ladspa plugin support"
diff --git a/audio/jack/DEPENDS b/audio/jack/DEPENDS
index 15d12ae..6f51ef8 100644
--- a/audio/jack/DEPENDS
+++ b/audio/jack/DEPENDS
@@ -1,14 +1,14 @@
-depends     automake  &&
-depends     autoconf  &&
-depends     pkgconfig &&
-depends     alsa-lib  &&
-depends     libsndfile &&
-depends	    readline  &&
+depends     automake
+depends     autoconf
+depends     pkgconfig
+depends     alsa-lib
+depends     libsndfile
+depends     readline
 optional_depends        "libcap" \
                         "--enable-capabilities" \
                         "" \
-                        "for realtime scheduling" &&
-optional_depends	"doxygen" \
-			"" \
-			"" \
-			"for Documentation"
+                        "for realtime scheduling"
+optional_depends        "doxygen" \
+                        "" \
+                        "" \
+                        "for Documentation"
diff --git a/audio/jack/POST_INSTALL b/audio/jack/POST_INSTALL
index ed4f35d..baa9db8 100644
--- a/audio/jack/POST_INSTALL
+++ b/audio/jack/POST_INSTALL
@@ -2,7 +2,7 @@ JACKLIBDIR="/usr/lib/jack"
 
 if ! grep -q "$JACKLIBDIR" /etc/ld.so.conf ; then
 
-	echo "$JACKLIBDIR" >> /etc/ld.so.conf
-	ldconfig
+        echo "$JACKLIBDIR" >> /etc/ld.so.conf
+        ldconfig
 
 fi
diff --git a/audio/xmms/DEPENDS b/audio/xmms/DEPENDS
index 5de392d..8bad8ff 100644
--- a/audio/xmms/DEPENDS
+++ b/audio/xmms/DEPENDS
@@ -1,6 +1,6 @@
 depends  gtk+
 
-optional_depends  libvorbis "" "" "for Ogg Vorbis support"		 
+optional_depends  libvorbis "" "" "for Ogg Vorbis support" 
 optional_depends  esound    "" "" "for Enlightened Sound Daemon support"
 optional_depends  libmikmod
 optional_depends  alsa-utils
diff --git a/cd/cdw/DEPENDS b/cd/cdw/DEPENDS
index cee1d9a..43f6932 100644
--- a/cd/cdw/DEPENDS
+++ b/cd/cdw/DEPENDS
@@ -1,17 +1,13 @@
-depends cdrtools  &&
-depends ncurses   &&
-depends zlib      &&
+depends cdrtools
+depends ncurses
+depends zlib
 
-optional_depends "gtk+-2"  "--enable-gui"     \
-                           "--disable-gui"    \
-			   "for GTK+-2 GUI"  &&
+optional_depends "gtk+-2"  "--enable-gui" "--disable-gui" "for GTK+-2 GUI"
 
-optional_depends "gettext" ""                  \
-                           "--disable-nls"     \
-			   "for NLS support"  &&
+optional_depends "gettext" "" "--disable-nls" "for NLS support"
 
-optional_depends "libvorbis" "--with-oggenc=/usr/bin/oggenc"                 \
-                             "--without-oggenc" "for OGG encoding support"  &&
+optional_depends "libvorbis" "--with-oggenc=/usr/bin/oggenc" \
+                             "--without-oggenc" "for OGG encoding support"
 
 optional_depends "lame"      "--with-lame=/usr/bin/lame" \
                              "--without-lame" "for lame encoding support"
diff --git a/cd/vobcopy/DEPENDS b/cd/vobcopy/DEPENDS
index 55f8cf3..fe83b06 100644
--- a/cd/vobcopy/DEPENDS
+++ b/cd/vobcopy/DEPENDS
@@ -1,2 +1,2 @@
-depends	 libdvdcss  &&
-depends	 libdvdread
+depends libdvdcss
+depends libdvdread
diff --git a/chat/ircd-ratbox/DEPENDS b/chat/ircd-ratbox/DEPENDS
index 19dd118..6747c92 100644
--- a/chat/ircd-ratbox/DEPENDS
+++ b/chat/ircd-ratbox/DEPENDS
@@ -1,14 +1,14 @@
 optional_depends "zlib" \
-		 "--with-zlib-path=/usr" \
-		 "--disable-zlib" \
-		 "for ziplinks support"
+                 "--with-zlib-path=/usr" \
+                 "--disable-zlib" \
+                 "for ziplinks support"
 
 optional_depends "openssl" \
-		 "--enable-openssl" \
-		 "--disable-openssl" \
-		 "for OpenSSL support"
+                 "--enable-openssl" \
+                 "--disable-openssl" \
+                 "for OpenSSL support"
 
 optional_depends "ratbox-services" \
-		 "--enable-services" \
-		 "" \
-		 "for ratbox-services compatibility code"
+                 "--enable-services" \
+                 "" \
+                 "for ratbox-services compatibility code"
diff --git a/chat/ratbox-services/DEPENDS b/chat/ratbox-services/DEPENDS
index f36da81..38eaab5 100644
--- a/chat/ratbox-services/DEPENDS
+++ b/chat/ratbox-services/DEPENDS
@@ -1,11 +1,11 @@
 depends sqlite
 
 optional_depends "mysql" \
-		 "--enable-mysql=/usr" \
-		 "" \
-		 "Enable MySQL backend"
+                 "--enable-mysql=/usr" \
+                 "" \
+                 "Enable MySQL backend"
 
 optional_depends "postgresql" \
-		 "--enable-pgsql=/usr" \
-		 "" \
-		 "Enable PostgreSQL backend"
+                 "--enable-pgsql=/usr" \
+                 "" \
+                 "Enable PostgreSQL backend"
diff --git a/chat/weechat/DEPENDS b/chat/weechat/DEPENDS
index 4b7dbf9..83e978c 100644
--- a/chat/weechat/DEPENDS
+++ b/chat/weechat/DEPENDS
@@ -1,11 +1,3 @@
-depends ncurses	&&
-
-optional_depends "perl" \
-		 "--enable-perl" \
-		 "--disable-perl" \
-		 "to compile the perl plugin"	&&
-
-optional_depends "Python" \
-                 "--enable-python" \
-                 "--disable-python" \
-                 "to compile the Python plugin"
+depends ncurses
+optional_depends "perl"  "--enable-perl" "--disable-perl" "to compile the perl plugin"
+optional_depends "Python" "--enable-python" "--disable-python" "to compile the Python plugin"
diff --git a/crypto/heimdal/DEPENDS b/crypto/heimdal/DEPENDS
index 36ec2a6..fedd4d0 100644
--- a/crypto/heimdal/DEPENDS
+++ b/crypto/heimdal/DEPENDS
@@ -1,3 +1,3 @@
-depends openssl	&&
-depends db &&
+depends openssl
+depends db
 depends readline
diff --git a/devel/ivman/DEPENDS b/devel/ivman/DEPENDS
index f1df228..51599a0 100644
--- a/devel/ivman/DEPENDS
+++ b/devel/ivman/DEPENDS
@@ -1,4 +1,4 @@
-depends libxml2  &&
-depends glib-2	 &&
+depends libxml2
+depends glib-
 
 optional_depends "pmount" "" "" "permit users to mount removable devices"
diff --git a/devel/tcllib/DEPENDS b/devel/tcllib/DEPENDS
index 45b082e..4845533 100644
--- a/devel/tcllib/DEPENDS
+++ b/devel/tcllib/DEPENDS
@@ -1 +1 @@
-depends	tcl
+depends tcl
diff --git a/distributed/transmission/DEPENDS b/distributed/transmission/DEPENDS
index af03924..d412780 100644
--- a/distributed/transmission/DEPENDS
+++ b/distributed/transmission/DEPENDS
@@ -1,8 +1,3 @@
-optional_depends  "gtk+-2"  ""  "--disable-gtk"  \
-		  "for the GUI interface"
-
-optional_depends  "openssl"  ""  "--disable-openssl"  \
-		  "for encrypted transfer support"
-
-optional_depends  "libevent"  ""  "--disable-daemon"  \
-                  "for daemon mode support"
+optional_depends  "gtk+-2"  ""  "--disable-gtk" "for the GUI interface"
+optional_depends  "openssl"  ""  "--disable-openssl" "for encrypted transfer support"
+optional_depends  "libevent"  ""  "--disable-daemon" "for daemon mode support"
diff --git a/editors/vim/DEPENDS b/editors/vim/DEPENDS
index b89f2c1..2bf3210 100644
--- a/editors/vim/DEPENDS
+++ b/editors/vim/DEPENDS
@@ -1,16 +1,6 @@
-depends ncurses &&
-optional_depends "%X"     "--enable-gui=auto"     \
-        "--enable-gui=no --without-x"           \
-        "to enable a gui" &&
-optional_depends "Python"	"--enable-pythoninterp" \
-				"" 			\
-				"to enable Python intepreter 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"
+depends ncurses
+optional_depends "%X" "--enable-gui=auto" "--enable-gui=no --without-x" "to enable a gui"
+optional_depends "Python" "--enable-pythoninterp" "" "to enable Python intepreter 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/filesys/openafs/DEPENDS b/filesys/openafs/DEPENDS
index 1c0f799..206ce8f 100644
--- a/filesys/openafs/DEPENDS
+++ b/filesys/openafs/DEPENDS
@@ -1,9 +1,6 @@
-depends autoconf	&&
-depends automake	&&
-depends Linux-PAM       &&
-depends lsof		&&
-optional_depends "heimdal" \
-                 "--with-krb5-conf=/usr/bin/krb5-config" \
-	         "" \
-                 "for kerberos support"
+depends autoconf
+depends automake
+depends Linux-PAM
+depends lsof
+optional_depends "heimdal" "--with-krb5-conf=/usr/bin/krb5-config" "" "for kerberos support"
 
diff --git a/ftp/dclib/DEPENDS b/ftp/dclib/DEPENDS
index 4653cfe..e387823 100644
--- a/ftp/dclib/DEPENDS
+++ b/ftp/dclib/DEPENDS
@@ -1,2 +1,2 @@
-depends	 libxml2  &&
-depends	 openssl 
+depends libxml2
+depends openssl 
diff --git a/games/celestia/DEPENDS b/games/celestia/DEPENDS
index 0d5be1f..54b51b5 100644
--- a/games/celestia/DEPENDS
+++ b/games/celestia/DEPENDS
@@ -1,7 +1,4 @@
-depends jpeg   &&
-depends libpng &&
-depends %GLUT   &&
-optional_depends "qt3"                                     \
-		 "--with-kde --without-gtk"                \
-		 "--without-kde --without-gtk"             \
-                 "Build with qt3 GUI say no for GLUT gui"
+depends jpeg
+depends libpng
+depends %GLUT
+optional_depends "qt3" "--with-kde --without-gtk" "--without-kde --without-gtk" "Build with qt3 GUI say no for GLUT gui"
diff --git a/games/eboard/DEPENDS b/games/eboard/DEPENDS
index ad86d22..371f217 100644
--- a/games/eboard/DEPENDS
+++ b/games/eboard/DEPENDS
@@ -1 +1 @@
-depends	   imlib
+depends imlib
diff --git a/games/scummvm/DEPENDS b/games/scummvm/DEPENDS
index bb01fe1..fc1a31b 100644
--- a/games/scummvm/DEPENDS
+++ b/games/scummvm/DEPENDS
@@ -1,26 +1,6 @@
-depends SDL  &&
-
-optional_depends libmad                 \
-                 "--enable-mad"         \
-		 "--disable-mad"        \
-		 "To use mp3 support"  &&
-		 
-optional_depends alsa-lib                \
-                 "--enable-alsa"         \
-		 "--disable-alsa"        \
-		 "To use alsa support"  &&
-		 
-optional_depends libvorbis               \
-                 "--enable-vorbis"       \
-		 "--disable-vorbis"      \
-		 "To use ogg support"   &&
-
-optional_depends flac                    \
-                 "--enable-flac"         \
-		 "--disable-flac"        \
-		 "To use flac support"  &&
-
-optional_depends mpeg2dec                \
-                 ""                      \
-		 "--disable-mpeg2"       \
-		 "To use mpeg2 decoding"
+depends SDL
+optional_depends libmad "--enable-mad" "--disable-mad" "For mp3 support"
+optional_depends alsa-lib "--enable-alsa" "--disable-alsa" "For alsa support"
+optional_depends libvorbis "--enable-vorbis" "--disable-vorbis" "For ogg support"
+optional_depends flac "--enable-flac" "--disable-flac" "For flac support"
+optional_depends mpeg2dec "" "--disable-mpeg2" "For mpeg2 decoding"
diff --git a/graphics/gdk-pixbuf/DEPENDS b/graphics/gdk-pixbuf/DEPENDS
index 647b7fe..9d08847 100644
--- a/graphics/gdk-pixbuf/DEPENDS
+++ b/graphics/gdk-pixbuf/DEPENDS
@@ -1,2 +1,2 @@
 depends xhost
-depends imlib	
+depends imlib
diff --git a/graphics/gtksee/DEPENDS b/graphics/gtksee/DEPENDS
index 6b5d204..a49d89d 100644
--- a/graphics/gtksee/DEPENDS
+++ b/graphics/gtksee/DEPENDS
@@ -1,5 +1,5 @@
-depends gtk+ &&
-optional_depends jpeg	""	""	"for jpeg support"
-optional_depends tiff	""	""	"for tiff support"
-optional_depends libpng ""	""	"for png support"
+depends gtk+
+optional_depends jpeg "" "" "for jpeg support"
+optional_depends tiff "" "" "for tiff support"
+optional_depends libpng "" "" "for png support"
 
diff --git a/graphics/imlib/DEPENDS b/graphics/imlib/DEPENDS
index b551e46..a972f46 100644
--- a/graphics/imlib/DEPENDS
+++ b/graphics/imlib/DEPENDS
@@ -1,7 +1,7 @@
-depends  automake  &&
-depends  gettext   &&
-depends  tiff      &&
-depends  jpeg      &&
-depends  libungif  &&
-depends  gtk+      &&
+depends  automake
+depends  gettext
+depends  tiff
+depends  jpeg
+depends  libungif
+depends  gtk+
 depends  libtool
diff --git a/i18n/poedit/DEPENDS b/i18n/poedit/DEPENDS
index 19c0872..4655815 100644
--- a/i18n/poedit/DEPENDS
+++ b/i18n/poedit/DEPENDS
@@ -1,11 +1,3 @@
 depends wxGTK
-
-optional_depends "gtkspell" \
-		 "" \
-		 "--disable-spellchecking" \
-		 "Enable spell checking"
-
-optional_depends "db" \
-		 "" \
-		 "--disable-transmem" \
-		 "Enable translation memory"
+optional_depends "gtkspell" "" "--disable-spellchecking" "Enable spell checking"
+optional_depends "db" "" "--disable-transmem" "Enable translation memory"
diff --git a/libs/aqbanking/DEPENDS b/libs/aqbanking/DEPENDS
index fadd13c..aa99923 100644
--- a/libs/aqbanking/DEPENDS
+++ b/libs/aqbanking/DEPENDS
@@ -1,30 +1,14 @@
-optional_depends  "gwenhywfar"               \
-                  "--enable-gwenhywfar"      \
-		  "--disable-gwenhywfar"     \
-		  "for gwenhywfar support"  &&
-		  
-optional_depends  "libofx"\
-                  "--enable-libofx"   \
-		  "--disable-libofx"  \
-		  "for OFX support"  &&
-		  
-optional_depends  "libchipcard2"                  \
-                  "--enable-chipcard-client"      \
-		  "--disable-chipcard-client"     \
-                  "for chipcard-client support"  &&
+optional_depends  gwenhywfar "--enable-gwenhywfar" "--disable-gwenhywfar" "for gwenhywfar support"
 
-optional_depends  "qt3"                                  \
-                  "--enable-qt3 --enable-qt3-threads --with-qt3-libs=/opt/lunar/qt/3/lib"  \
-                  "--disable-qt3 --disable-qt3-threads"  \
-                  "for Qt3 support"                     &&
+optional_depends  libofx "--enable-libofx" "--disable-libofx" "for OFX support"
 
-optional_depends  "kdebase3"          \
-                  "--enable-kde3 --with-kde3-libs=/opt/lunar/kde/3/lib"     \
-                  "--disable-kde3"    \
-                  "for KDE support"  &&
-		  
-optional_depends  "Python"           \
-                  "--enable-python"  \
-		  ""                 \
-		  "for Python bindings support"
+optional_depends  libchipcard2 "--enable-chipcard-client" "--disable-chipcard-client" "for chipcard-client support"
+
+optional_depends  qt3 "--enable-qt3 --enable-qt3-threads --with-qt3-libs=/opt/lunar/qt/3/lib" /
+                      "--disable-qt3 --disable-qt3-threads"  "for Qt3 support"
+
+optional_depends  kdebase3 "--enable-kde3 --with-kde3-libs=/opt/lunar/kde/3/lib" /
+                           "--disable-kde3" "for KDE support"
+
+optional_depends  Python "--enable-python" "" "for Python bindings support"
 
diff --git a/libs/fox/DEPENDS b/libs/fox/DEPENDS
index 6fe5f97..38d23fc 100644
--- a/libs/fox/DEPENDS
+++ b/libs/fox/DEPENDS
@@ -3,8 +3,4 @@ depends tiff
 depends zlib
 depends jpeg
 depends expat
-
-optional_depends "freetype2"      \
-		 "--with-xft"     \
-                 "--with-xft=no"  \
-		 "for freetype2 support"
+optional_depends freetype2 "--with-xft" "--with-xft=no" "for freetype2 support"
diff --git a/libs/fuse-python/DEPENDS b/libs/fuse-python/DEPENDS
index 0d139ff..1c8389b 100644
--- a/libs/fuse-python/DEPENDS
+++ b/libs/fuse-python/DEPENDS
@@ -1,2 +1,2 @@
-depends	fuse	&&
+depends fuse
 depends Python
diff --git a/libs/mico/DEPENDS b/libs/mico/DEPENDS
index e5d705c..4d931a4 100644
--- a/libs/mico/DEPENDS
+++ b/libs/mico/DEPENDS
@@ -1,4 +1 @@
-optional_depends "openssl" \
-		""		\
-		""		\
-		"For ssl support"
+optional_depends openssl "" "" "For ssl support"
diff --git a/libs/yaz/DEPENDS b/libs/yaz/DEPENDS
index 845b186..a75dbd7 100644
--- a/libs/yaz/DEPENDS
+++ b/libs/yaz/DEPENDS
@@ -1,2 +1,2 @@
-depends	 openssl  &&
-depends	 libxml2
+depends openssl
+depends libxml2
diff --git a/mail/courier-authlib/DEPENDS b/mail/courier-authlib/DEPENDS
index 8e39f2a..19fbbad 100644
--- a/mail/courier-authlib/DEPENDS
+++ b/mail/courier-authlib/DEPENDS
@@ -1,35 +1,8 @@
-depends libtool  &&
-		  
-optional_depends  "shadow"				    \
-		  "--with-authshadow"			    \
-		  ""					    \
-		  "for authshadow support"		   &&
-		  
-optional_depends  "db"                                      \
-                  "--with-db=db"                            \
-		  ""                                        \
-		  "for db support"                         &&
-
-optional_depends  "gdbm"                                    \
-                  "--with-db=gdbm"                          \
-		  ""                                        \
-		  "for gdbm support"                       &&
-
-optional_depends  "mysql"                                   \
-                  "--with-authmysql"                        \
-		  "--without-authmysql"                     \
-		  "for mysql authentication support"       &&
-
-optional_depends  "openldap"                                \
-                  "--with-authldap"                         \
-		  "--without-authldap"                      \
-		  "for ldap authentication support"        &&
-
-optional_depends  "postgresql"                              \
-                  "--with-auth-pgsql"                       \
-		  "--without-authpgsql"                     \
-		  "for postgresql authentication support"  &&
-		  
-optional_depends  "expect"                                  \
-                  ""  ""                                    \
-		  "for webmail support to change passwords"
+depends libtool
+optional_depends  shadow "--with-authshadow" "" "for authshadow support"
+optional_depends  db "--with-db=db" "" "for db support"
+optional_depends  gdbm "--with-db=gdbm" "" "for gdbm support"
+optional_depends  mysql "--with-authmysql" "--without-authmysql" "for mysql authentication support"
+optional_depends  openldap "--with-authldap" "--without-authldap" "for ldap authentication support"
+optional_depends  postgresql "--with-auth-pgsql" "--without-authpgsql" "for postgresql authentication support"
+optional_depends  expect ""  "" "for webmail support to change passwords"
diff --git a/mail/dovecot/DEPENDS b/mail/dovecot/DEPENDS
index aa52208..0d2834c 100644
--- a/mail/dovecot/DEPENDS
+++ b/mail/dovecot/DEPENDS
@@ -1,10 +1,4 @@
 depends openssl
-
-optional_depends "postgresql" "--with-pgsql" "--without-pgsql" \
-                 "For Postgresql support"
-		 
-optional_depends "mysql" "--with-mysql" "--without-mysql" \
-		 "For Mysql support"
-		 
-optional_depends "openldap" "--with-ldap" "--with-ldap" \
-		 "For openldap support"
+optional_depends postgresql "--with-pgsql" "--without-pgsql" "For Postgresql support"
+optional_depends mysq" "--with-mysql" "--without-mysql" "For Mysql support"
+optional_depends "openldap" "--with-ldap" "--with-ldap" "For openldap support"
diff --git a/mail/mailman/DEPENDS b/mail/mailman/DEPENDS
index c4a62e4..4577456 100644
--- a/mail/mailman/DEPENDS
+++ b/mail/mailman/DEPENDS
@@ -1,26 +1,6 @@
-depends  Python                                 &&
-
-optional_depends  "apache2"                      \
-                  ""                             \
-		  ""                             \
-		  " (a web server is required)" &&
-
-optional_depends  "apache"                       \
-                  ""                             \
-		  ""                             \
-		  " (a web server is required)" &&
-
-optional_depends  "apache-mod_ssl"               \
-                  ""                             \
-		  ""                             \
-		  " (a web server is required)" &&
-
-optional_depends  "postfix"                      \
-                  ""                             \
-		  ""                             \
-		  " (an MTA is required)"       &&
-		  
-optional_depends  "exim"                         \
-                  ""                             \
-		  ""                             \
-		  " (an MTA is required)"
+depends  Python
+optional_depends  apache2 "" "" " (a web server is required)"
+optional_depends  apache "" "" " (a web server is required)"
+optional_depends  apache-mod_ssl "" "" " (a web server is required)"
+optional_depends  postfix "" "" " (an MTA is required)"
+optional_depends  exim "" "" " (an MTA is required)"
diff --git a/mail/spamass-milter/DEPENDS b/mail/spamass-milter/DEPENDS
index ccafd87..493e584 100644
--- a/mail/spamass-milter/DEPENDS
+++ b/mail/spamass-milter/DEPENDS
@@ -1,2 +1,2 @@
-depends		sendmail	&&
-depends		spamassassin
+depends sendmail
+depends spamassassin
diff --git a/mail/sylpheed/DEPENDS b/mail/sylpheed/DEPENDS
index f9ce6cb..81c60c6 100644
--- a/mail/sylpheed/DEPENDS
+++ b/mail/sylpheed/DEPENDS
@@ -1,25 +1,8 @@
-depends gtk+  &&
-
-optional_depends  "compface"    ""  ""  "for X-Face support"               &&
-optional_depends  "gdk-pixbuf"  ""  ""  "for built-in image view support"  &&
-
-optional_depends  "openssl"              \
-                  "--enable-ssl"         \
-                  ""                     \
-                  "for pop3s and imaps"  &&
-
-optional_depends  "openldap"             \
-                  "--enable-ldap"        \
-		  ""                     \
-		  "for ldap support"     &&
-
-optional_depends  "gpgme" \
-                  "--enable-gpgme" \
-                  "--disable-gpgme"  \
-                  "for encrypted email"  &&
-
-optional_depends  "jpilot"               \
-                  "--enable-jpilot"      \
-                  ""                     \
-                  "to use jpilot address book"
+depends gtk+
+optional_depends  compface    ""  ""  "for X-Face support"
+optional_depends  gdk-pixbuf  ""  ""  "for built-in image view support"
+optional_depends  openssl "--enable-ssl" "" "for pop3s and imaps"
+optional_depends  openldap "--enable-ldap" "" "for ldap support" 
+optional_depends  gpgme "--enable-gpgme" "--disable-gpgme" "for encrypted email"
+optional_depends  jpilot "--enable-jpilot" "" "to use jpilot address book"
 
diff --git a/mail/sylpheed2/DEPENDS b/mail/sylpheed2/DEPENDS
index 3cb1276..8812e19 100644
--- a/mail/sylpheed2/DEPENDS
+++ b/mail/sylpheed2/DEPENDS
@@ -1,31 +1,7 @@
 depends gtk+-2
-
-optional_depends "compface" \
-		 "" \
-		 "--disable-compface" \
-		 "for X-Face support"
-
-optional_depends "openssl" \
-		 "" \
-		 "--disable-ssl" \
-		 "for pop3s and imaps"
-
-optional_depends "openldap" \
-		 "--enable-ldap" \
-		 "" \
-		 "for ldap support"
-
-optional_depends "gpgme" \
-		 "" \
-		 "--disable-gpgme" \
-		 "for encrypted email"
-
-optional_depends "jpilot" \
-		 "--enable-jpilot" \
-		 "" \
-		 "to use jpilot address book"
-
-optional_depends "gtkspell" \
-		 "" \
-		 "--disable-gtkspell" \
-		 "for inline spellchecking support"
+optional_depends compface "" "--disable-compface" "for X-Face support"
+optional_depends openssl "" "--disable-ssl" "for pop3s and imaps"
+optional_depends openldap "--enable-ldap" "" "for ldap support"
+optional_depends gpgme "" "--disable-gpgme" "for encrypted email"
+optional_depends jpilot "--enable-jpilot" "" "to use jpilot address book"
+optional_depends gtkspell "" "--disable-gtkspell" "for inline spellchecking support"
diff --git a/mail/thunderbird/DEPENDS b/mail/thunderbird/DEPENDS
index dee1976..8e749db 100644
--- a/mail/thunderbird/DEPENDS
+++ b/mail/thunderbird/DEPENDS
@@ -1,20 +1,9 @@
-depends ORBit2 &&
-depends	zip    &&
-depends	unzip  &&
-depends expat  &&
-depends gtk+-2 &&
-
-optional_depends "gnupg" "" "" "for encrypted email" &&
-
-optional_depends "gnome-vfs2" "" \
-                 "--disable-gnome --disable-gnomevfs" \
-                 "for Gnome VFS support" &&
-
-optional_depends heimdal \
-                 "--with-gssapi=/usr/include/heimdal" \
-                 "" \
-                 "Heimdal GSSAPI Support" &&
-
-optional_depends openldap \
-                 "--enable-ldap" "--disable-ldap" \
-                 "for LDAP address book support"
+depends ORBit2
+depends zip
+depends unzip
+depends expat
+depends gtk+-2
+optional_depends "gnupg" "" "" "for encrypted email"
+optional_depends "gnome-vfs2" "" "--disable-gnome --disable-gnomevfs" "for Gnome VFS support"
+optional_depends heimdal "--with-gssapi=/usr/include/heimdal" "" "Heimdal GSSAPI Support"
+optional_depends openldap "--enable-ldap" "--disable-ldap" "for LDAP address book support"
diff --git a/net/cfengine/DEPENDS b/net/cfengine/DEPENDS
index f744eb7..631e0ad 100644
--- a/net/cfengine/DEPENDS
+++ b/net/cfengine/DEPENDS
@@ -1,6 +1,3 @@
-depends db &&
-depends openssl &&
-optional_depends "pcre" 		\
-		 "--with-pcre"		\
-		 "--without-pcre"	\
-                 "for perl style regex support"
+depends db
+depends openssl
+optional_depends pcre "--with-pcre" "--without-pcre" "for perl style regex support"
diff --git a/net/iftop/DEPENDS b/net/iftop/DEPENDS
index c2c4e88..a8ec60d 100644
--- a/net/iftop/DEPENDS
+++ b/net/iftop/DEPENDS
@@ -1 +1 @@
-depends		libpcap
+depends libpcap
diff --git a/net/nomad/DEPENDS b/net/nomad/DEPENDS
index 1cc4f26..c6db1e7 100644
--- a/net/nomad/DEPENDS
+++ b/net/nomad/DEPENDS
@@ -1,3 +1,3 @@
-depends fping		&&
-depends net-snmp	&&
+depends fping
+depends net-snmp
 depends gtk+-2
diff --git a/perl/SDL_perl/DEPENDS b/perl/SDL_perl/DEPENDS
index ed29cff..7be9d42 100644
--- a/perl/SDL_perl/DEPENDS
+++ b/perl/SDL_perl/DEPENDS
@@ -1,10 +1,10 @@
-depends			perl &&
-depends			SDL &&
-depends                 YAML &&
-depends                 Module-Build &&
-optional_depends	"SDL_image" "" "" "For image support" &&
-optional_depends        "SDL_mixer" "" "" "For mixer support" &&
-optional_depends	"SDL_net"   "" "" "For networking support" &&
-optional_depends	"SDL_gfx"   "" "" "For extended graphics support" &&
-optional_depends	"smpeg"     "" "" "For MPEG support" &&
-optional_depends        "SDL_ttf"   "" "" "For truetype fonts support"
+depends perl
+depends SDL
+depends YAML
+depends Module-Build
+optional_depends SDL_image "" "" "For image support"
+optional_depends SDL_mixer "" "" "For mixer support"
+optional_depends SDL_net   "" "" "For networking support"
+optional_depends SDL_gfx   "" "" "For extended graphics support"
+optional_depends smpeg     "" "" "For MPEG support"
+optional_depends SDL_ttf   "" "" "For truetype fonts support"
diff --git a/perl/perlipq/DEPENDS b/perl/perlipq/DEPENDS
index abb7b35..67b518c 100644
--- a/perl/perlipq/DEPENDS
+++ b/perl/perlipq/DEPENDS
@@ -1,2 +1,2 @@
-depends perl	&&
+depends perl
 depends iptables
diff --git a/printer/cups/DEPENDS b/printer/cups/DEPENDS
index e06e0b0..7e116c5 100644
--- a/printer/cups/DEPENDS
+++ b/printer/cups/DEPENDS
@@ -1,26 +1,6 @@
 depends   chkconfig
-
-optional_depends  "Linux-PAM" \
-		  "--enable-pam" \
-		  "--disable-pam" \
-		  "for pluggable authentication"
-
-optional_depends  "openssl" \
-		  "--enable-ssl --enable-openssl" \
-		  "--disable-openssl" \
-		  "for encrypted communications"
-
-optional_depends  "gnutls" \
-		  "--enable-gnutls" \
-		  "--disable-gnutls" \
-		  "for encrypted communications"
-
-optional_depends  "openldap" \
-		  "--enable-ldap" \
-		  "--disable-ldap" \
-		  "for LDAP printer sharing support"
-
-optional_depends  "dbus" \
-		  "--enable-dbus" \
-		  "--disable-dbus" \
-		  "enable DBUS support"
+optional_depends  Linux-PAM "--enable-pam" "--disable-pam" "for pluggable authentication"
+optional_depends  openssl "--enable-ssl --enable-openssl" "--disable-openssl" "for encrypted communications"
+optional_depends  gnutls "--enable-gnutls" "--disable-gnutls" "for encrypted communications"
+optional_depends  openldap "--enable-ldap" "--disable-ldap" "for LDAP printer sharing support"
+optional_depends  dbus "--enable-dbus" "--disable-dbus" "enable DBUS support"
diff --git a/printer/gimp-print/DEPENDS b/printer/gimp-print/DEPENDS
index 470bd6d..68c4444 100644
--- a/printer/gimp-print/DEPENDS
+++ b/printer/gimp-print/DEPENDS
@@ -1,14 +1,3 @@
-optional_depends "cups" \
-                 "--with-cups" \
-                 "--without-cups" \
-                 "to build CUPS drivers" &&
-
-optional_depends "ijs" \
-                 "--with-ijs" \
-                 "--without-ijs" \
-                 "to build IJS-based driver" &&
-
-optional_depends "foomatic-db-engine" \
-		 "--with-foomatic" \
-		 "--without-foomatic" \
-                 "for Foomatic spooler support"
+optional_depends cups "--with-cups" "--without-cups" "to build CUPS drivers"
+optional_depends ijs "--with-ijs" "--without-ijs" "to build IJS-based driver"
+optional_depends foomatic-db-engine "--with-foomatic" "--without-foomatic" "for Foomatic spooler support"
diff --git a/printer/gutenprint/DEPENDS b/printer/gutenprint/DEPENDS
index f90d998..4d9c652 100644
--- a/printer/gutenprint/DEPENDS
+++ b/printer/gutenprint/DEPENDS
@@ -11,6 +11,6 @@ optional_depends "%GHOSTSCRIPT" \
                  "to build Ghostscript driver"
 
 optional_depends "foomatic-db-engine" \
-		 "--with-foomatic" \
-		 "--without-foomatic" \
+                 "--with-foomatic" \
+                 "--without-foomatic" \
                  "for Foomatic spooler support"
diff --git a/profiles/docbook-profile/DEPENDS b/profiles/docbook-profile/DEPENDS
index 7700bf6..6e9cd60 100644
--- a/profiles/docbook-profile/DEPENDS
+++ b/profiles/docbook-profile/DEPENDS
@@ -1,8 +1,8 @@
 depends  docbook-xml          &&
 depends  docbook-dsssl        &&
 depends  docbook-dsssl-doc    &&
-depends  docbook-4.1	      &&
-depends  docbook-4.2	      &&
+depends  docbook-4.1          &&
+depends  docbook-4.2          &&
 depends  docbook-utils        &&
 depends  scrollkeeper         &&
 optional_depends  "linuxdoc-tools" "" "" "These are the old linuxdoc tools. You may or may not need them!"
diff --git a/profiles/netutils-profile/DEPENDS b/profiles/netutils-profile/DEPENDS
index 090cce3..52ad853 100644
--- a/profiles/netutils-profile/DEPENDS
+++ b/profiles/netutils-profile/DEPENDS
@@ -1,28 +1,14 @@
-depends net-tools &&
-
-optional_depends "whois" "" "" \
-                 "to identify IP address owners" &&
-optional_depends "traceroute" "" "" \
-                 "to trace packets to their origin" &&
-optional_depends "netwatch" "" "" \
-                 "to monitor bypassing traffic" &&
-optional_depends "mtr" "" "" \
-                 "for an improved continuous traceroute" &&
-optional_depends "ntp" "" "" \
-                 "to keep your clock synchronized" &&
-optional_depends "tnftp" "" "" \
-                 "for a basic all purpose classic ftp client" &&
-optional_depends "rsync" "" "" \
-                 "for an Rsync client" &&
-optional_depends "iptables" "" "" \
-                 "to set up a firewall" &&
-optional_depends "ferm" "" "" \
-		 "to easily maintain complex iptables firewalls" &&
-optional_depends "netkit-telnet" "" "" \
-                 "for testing TCP services" &&
-optional_depends "netkit-base" "" "" \
-                 "for the \"ping\" command" &&
-optional_depends "xinetd" "" "" \
-                 "for a internet service startup daemon" &&
-optional_depends "nmap" "" "" \
-                 "for a portscanning tool"
+depends net-tools
+optional_depends whois "" "" "to identify IP address owners"
+optional_depends traceroute "" "" "to trace packets to their origin"
+optional_depends netwatch "" "" "to monitor bypassing traffic"
+optional_depends mtr "" "" "for an improved continuous traceroute"
+optional_depends ntp "" "" "to keep your clock synchronized"
+optional_depends tnftp "" "" "for a basic all purpose classic ftp client"
+optional_depends rsync "" "" "for an Rsync client"
+optional_depends iptables" "" "" "to set up a firewall"
+optional_depends ferm "" "" "to easily maintain complex iptables firewalls"
+optional_depends netkit-telnet "" "" "for testing TCP services"
+optional_depends netkit-base "" "" "for the \"ping\" command"
+optional_depends xinetd "" "" "for a internet service startup daemon"
+optional_depends nmap "" "" "for a portscanning tool"
diff --git a/qt-apps/qjackctl/DEPENDS b/qt-apps/qjackctl/DEPENDS
index 3d1b5f8..39bbf85 100644
--- a/qt-apps/qjackctl/DEPENDS
+++ b/qt-apps/qjackctl/DEPENDS
@@ -1,2 +1,2 @@
 depends  jack
-depends	 qt4
+depends  qt4
diff --git a/qt-apps/valknut/DEPENDS b/qt-apps/valknut/DEPENDS
index fe8418f..bcd79d9 100644
--- a/qt-apps/valknut/DEPENDS
+++ b/qt-apps/valknut/DEPENDS
@@ -1,2 +1,2 @@
-depends	 dclib  &&
-depends	 qt3
+depends dclib
+depends qt3
diff --git a/science/gnuplot/DEPENDS b/science/gnuplot/DEPENDS
index 4504d08..b31d8d2 100644
--- a/science/gnuplot/DEPENDS
+++ b/science/gnuplot/DEPENDS
@@ -1,5 +1,2 @@
-optional_depends libpng "--with-png" "--without-png" "enable png terminal" &&
-optional_depends "%X" \
-			"--with-x" \
-			"--without-x" \
-			"Use X window system" 
+optional_depends libpng "--with-png" "--without-png" "enable png terminal"
+optional_depends "%X" "--with-x" "--without-x" "Use X window system" 
diff --git a/science/gputils/DEPENDS b/science/gputils/DEPENDS
index 8934b0e..0dd42af 100644
--- a/science/gputils/DEPENDS
+++ b/science/gputils/DEPENDS
@@ -1 +1 @@
-depends  flex	
+depends  flex
diff --git a/sql/mysqltcl/DEPENDS b/sql/mysqltcl/DEPENDS
index 909509b..8e35926 100644
--- a/sql/mysqltcl/DEPENDS
+++ b/sql/mysqltcl/DEPENDS
@@ -1,2 +1,2 @@
-depends tcl	&&
+depends tcl
 depends mysql
diff --git a/utils/cryptsetup/DEPENDS b/utils/cryptsetup/DEPENDS
index e1b2b15..2b62fa1 100644
--- a/utils/cryptsetup/DEPENDS
+++ b/utils/cryptsetup/DEPENDS
@@ -1,3 +1,3 @@
-depends	device-mapper	&&
-depends libgcrypt	&&
+depends device-mapper
+depends libgcrypt
 depends hashalot
diff --git a/utils/dosbox/DEPENDS b/utils/dosbox/DEPENDS
index 0b002bf..26ea25a 100644
--- a/utils/dosbox/DEPENDS
+++ b/utils/dosbox/DEPENDS
@@ -1,10 +1,4 @@
 depends  SDL
-
-optional_depends  libpng  "--enable-png" "--disable-png" \
-                          "Needed for screenshots" 
-			
-optional_depends  SDL_net  "--enable-SDL_Net" "--disable-SDL_Net" \
-                           "For modem support" 
-			
-optional_depends  alsa-lib "--enable-alsa" "--disable-alsa" \
-                           "To use alsa support"
+optional_depends libpng  "--enable-png" "--disable-png" "Needed for screenshots" 
+optional_depends SDL_net  "--enable-SDL_Net" "--disable-SDL_Net" "For modem support" 
+optional_depends alsa-lib "--enable-alsa" "--disable-alsa" "To use alsa support"
diff --git a/utils/evms/DEPENDS b/utils/evms/DEPENDS
index 85a8bc4..5c0b232 100644
--- a/utils/evms/DEPENDS
+++ b/utils/evms/DEPENDS
@@ -1,7 +1,3 @@
-depends ncurses &&
-
-optional_depends "gtk+-2"          \
-                 " "               \
-								 "--disable-gui"   \
-								 "to use the evmsgui program" 
+depends ncurses
+optional_depends gtk+-2 "" "--disable-gui" "to use the evmsgui program" 
 
diff --git a/utils/fcron/DEPENDS b/utils/fcron/DEPENDS
index 683762e..2379fec 100644
--- a/utils/fcron/DEPENDS
+++ b/utils/fcron/DEPENDS
@@ -1,7 +1,4 @@
 depends chkconfig
 depends perl
 
-optional_depends "Linux-PAM" \
-		 "--with-pam=yes" \
-		 "--with-pam=no" \
-		 "Use PAM support"
+optional_depends Linux-PAM "--with-pam=yes" "--with-pam=no" "Use PAM support"
diff --git a/utils/mkinitrd/DEPENDS b/utils/mkinitrd/DEPENDS
index 15c6a8f..6344140 100644
--- a/utils/mkinitrd/DEPENDS
+++ b/utils/mkinitrd/DEPENDS
@@ -1,3 +1,3 @@
-depends modutils-wrappers   &&
-depends util-linux &&
-depends popt	  
+depends modutils-wrappers
+depends util-linux
+depends popt
diff --git a/utils/openldap/DEPENDS b/utils/openldap/DEPENDS
index 27f6e9d..a2707c8 100644
--- a/utils/openldap/DEPENDS
+++ b/utils/openldap/DEPENDS
@@ -1,21 +1,5 @@
 depends  db
-
-optional_depends  "openssl"                       \
-                  ""                              \
-                  ""                              \
-                  "for encrypted communications" 
-
-optional_depends  "cyrus-sasl"                    \
-                  "--enable-spasswd"              \
-                  ""                              \
-                  "for secure authentication"    
-
-optional_depends  "krb5"                          \
-                  "--enable-kpasswd"              \
-                  ""                              \
-                  "for Kerberos V.5 authentication"    
-
-optional_depends  "tcp_wrappers"                  \
-                  "--enable-wrappers"             \
-		  ""                              \
-		  "for TCP wrapper support"
+optional_depends  openssl "" "" "for encrypted communications" 
+optional_depends  cyrus-sasl "--enable-spasswd" "" "for secure authentication"    
+optional_depends  krb5 "--enable-kpasswd" "" "for Kerberos V.5 authentication"    
+optional_depends  tcp_wrappers "--enable-wrappers" "" "for TCP wrapper support"
diff --git a/utils/xmltv/DEPENDS b/utils/xmltv/DEPENDS
index ea338c1..299a55b 100644
--- a/utils/xmltv/DEPENDS
+++ b/utils/xmltv/DEPENDS
@@ -1,10 +1,10 @@
-depends XML-Twig	           &&
-depends XML-Writer	           &&
-depends DateManip	           &&
-depends HTML-Parser	           &&
-depends HTML-Tree	           &&
-depends Lingua-Preferred           &&
-depends Lingua-EN-Numbers-Ordinate &&
-depends Unicode-String             &&
-depends TermReadKey                &&
+depends XML-Twig
+depends XML-Writer
+depends DateManip
+depends HTML-Parser
+depends HTML-Tree
+depends Lingua-Preferred
+depends Lingua-EN-Numbers-Ordinate
+depends Unicode-String
+depends TermReadKey
 depends libwww-perl
diff --git a/video/MPlayer/DEPENDS b/video/MPlayer/DEPENDS
index b90d2a0..a4ca500 100644
--- a/video/MPlayer/DEPENDS
+++ b/video/MPlayer/DEPENDS
@@ -1,73 +1,17 @@
 depends freetype2
 depends unzip
 depends MPlayer-essentials
-
-optional_depends  "libdvdread"     \
-		  ""               \
-		  ""               \
-		  "To read DVDs'"
-
-optional_depends  "SDL"            \
-                  "--enable-sdl"   \
-                  ""               \
-                  "to use SDL to output video signal" 
-
-optional_depends  "alsa-utils"     \
-                  ""               \
-                  ""               \
-                  "for ALSA sound support"
-
-optional_depends  "libvorbis"      \
-		  ""               \
-		  ""               \
-		  "to use ogg audio format"
-
-optional_depends "libmatroska"	   \
-		 ""                \
-		 ""                \
-		 "for matroska audio/video container format support" 
-
-optional_depends "faad"		   \
-		 ""   		   \
-		 ""		   \
-		 "for external FAAD2 (MPA/AAC) support"
-
-optional_depends "libtheora"         \
-                 "--enable-theora"   \
-                 "--disable-theora"  \
-                 "for OGG/Theora Video Playback" 
-
-optional_depends "libXvMC" 			       \
-		 "--enable-xvmc --with-xvmclib=XvMCW"  \
-		 ""				       \
-		 "for hardware XvMC acceleration"
-
-optional_depends "gtk+-2" \
-		 "--enable-gui"	 \
-		 "--disable-gui" \
-		 "for MPlayer GTK gui support" 
-
-optional_depends "MPlayer-all"  \
-                 ""             \
-                 ""             \
-                 "to install more foreign codecs"
-
-optional_depends "libggi"                              \
-                 "--enable-ggi"                        \
-                 "--disable-ggi"                       \
-                 "General Graphics Interface support" 
-
-optional_depends "libggiwmh"                           \
-                 "--enable-ggiwmh"                     \
-                 "--disable-ggiwmh"                    \
-                 "GGI extension support"
-
-optional_depends "amrnb"                  \
-                 ""                       \
-                 "--disable-libamr_nb"    \
-                 "AMR narrowband support"
-
-optional_depends "amrwb"                  \
-                 ""                       \
-                 "--disable-libamr_wb"    \
-                 "AMR wideband support"
+optional_depends  libdvdread "" "" "To read DVDs"
+optional_depends  SDL "--enable-sdl" "" "to use SDL to output video signal" 
+optional_depends  alsa-utils "" "" "for ALSA sound support"
+optional_depends  libvorbis "" "" "to use ogg audio format"
+optional_depends libmatroska "" "" "for matroska audio/video container format support" 
+optional_depends faad "" "" "for external FAAD2 (MPA/AAC) support"
+optional_depends libtheora "--enable-theora" "--disable-theora" "for OGG/Theora Video Playback" 
+optional_depends libXvMC "--enable-xvmc --with-xvmclib=XvMCW" "" "for hardware XvMC acceleration"
+optional_depends gtk+-2 "--enable-gui" "--disable-gui" "for MPlayer GTK gui support" 
+optional_depends MPlayer-all "" "" "to install more foreign codecs"
+optional_depends libggi "--enable-ggi" "--disable-ggi" "General Graphics Interface support" 
+optional_depends libggiwmh "--enable-ggiwmh" "--disable-ggiwmh" "GGI extension support"
+optional_depends amrnb "" "--disable-libamr_nb" "AMR narrowband support"
+optional_depends amrwb "" "--disable-libamr_wb" "AMR wideband support"
diff --git a/video/divxcalc/DEPENDS b/video/divxcalc/DEPENDS
index 7bca231..7800e82 100644
--- a/video/divxcalc/DEPENDS
+++ b/video/divxcalc/DEPENDS
@@ -1,2 +1,2 @@
-depends		gtk+      &&
-depends         automake
+depends gtk+
+depends automake
diff --git a/video/freevo/DEPENDS b/video/freevo/DEPENDS
index 3f75b15..ecc8294 100644
--- a/video/freevo/DEPENDS
+++ b/video/freevo/DEPENDS
@@ -1,41 +1,26 @@
-depends Python             &&
-depends PyXML              &&
-depends BeautifulSoup      &&
-depends elementtree        &&
-depends egenix-mx          &&
-depends libexif            &&
-depends aumix              &&
-depends pygame             &&
-depends pil                &&
-depends Twisted            &&
-depends mmpython           &&
-depends MPlayer            &&
-depends MPlayer-all        &&
-depends numpy              &&
-depends libdvdread         &&
-depends libdvdcss          &&
-depends SDL                &&
-depends SDL_mixer          &&
-depends SDL_ttf            &&
-depends SDL_image          &&
-depends kaa-imlib2         &&
-depends kaa-metadata       &&
-optional_depends "lsdvd" \
-                 ""      \
-                 ""      \
-                 "for extended dvd support" &&
-
-optional_depends "pylirc" \
-                 ""       \
-                 ""       \
-                 "to interact with a remote control" &&
-
-optional_depends "xmltv" \
-                 ""      \
-                 ""      \
-                 "for tv-programming support" &&
-
-optional_depends "matroxset" \
-                 ""          \
-                 ""          \
-                 "if you want to use your matrox-mga device" 				 
+depends Python
+depends PyXML
+depends BeautifulSoup
+depends elementtree
+depends egenix-mx
+depends libexif
+depends aumix
+depends pygame
+depends pil
+depends Twisted 
+depends mmpython
+depends MPlayer
+depends MPlayer-all
+depends numpy
+depends libdvdread
+depends libdvdcss
+depends SDL
+depends SDL_mixer
+depends SDL_ttf
+depends SDL_image
+depends kaa-imlib2
+depends kaa-metadata
+optional_depends lsdvd "" "" "for extended dvd support"
+optional_depends pylirc "" "" "to interact with a remote control"
+optional_depends xmltv "" "" "for tv-programming support"
+optional_depends matroxset "" "" "if you want to use your matrox-mga device"
diff --git a/video/mpeg4ip/DEPENDS b/video/mpeg4ip/DEPENDS
index b846535..c3a5666 100644
--- a/video/mpeg4ip/DEPENDS
+++ b/video/mpeg4ip/DEPENDS
@@ -1,18 +1,6 @@
 depends faac
 depends id3lib
 depends SDL
-
-optional_depends  "lame"                \
-                  "--enable-mp3lame"	\
-                  "--disable-mp3lame"	\
-                  "for MP3 en/decoding support"
-
-optional_depends  "xvidcore"            \
-                  "--enable-xvid"    \
-                  "--disable-xvid"   \
-                  "for XviD decoding support"
-
-optional_depends  "libmad"               \
-                  "--enable-mad"    \
-                  "--disable-mad"   \
-                  "for MAD en/decoding support"
+optional_depends  lame "--enable-mp3lame" "--disable-mp3lame" "for MP3 en/decoding support"
+optional_depends  xvidcore "--enable-xvid" "--disable-xvid" "for XviD decoding support"
+optional_depends  libmad "--enable-mad" "--disable-mad" "for MAD en/decoding support"
diff --git a/video/mythtv/DEPENDS b/video/mythtv/DEPENDS
index ea639d2..56db2e2 100644
--- a/video/mythtv/DEPENDS
+++ b/video/mythtv/DEPENDS
@@ -1,5 +1,5 @@
-depends		lame		&&
-depends 	mysql		&&
-depends		freetype2	&&
-depends		xmltv		&&
-depends		qt3
+depends lame
+depends mysql
+depends freetype2
+depends xmltv
+depends qt3
diff --git a/web/linuxconf/DEPENDS b/web/linuxconf/DEPENDS
index 56c7d8a..418c878 100644
--- a/web/linuxconf/DEPENDS
+++ b/web/linuxconf/DEPENDS
@@ -1,3 +1,3 @@
-depends perl       &&
-depends gd	   &&
-optional_depends "Python" "" "" "for python module support"
+depends perl
+depends gd
+optional_depends Python "" "" "for python module support"
diff --git a/wifi/wpa_supplicant/DEPENDS b/wifi/wpa_supplicant/DEPENDS
index 8af5bc6..4e77040 100644
--- a/wifi/wpa_supplicant/DEPENDS
+++ b/wifi/wpa_supplicant/DEPENDS
@@ -1,7 +1,6 @@
-depends wireless_tools  &&
-depends libpcap		&&
-depends libdnet         &&
-depends openssl         &&
-depends dbus            &&
-
-optional_depends "qt3" "" "" "to build the wpa_gui utility"
+depends wireless_tools
+depends libpcap
+depends libdnet
+depends openssl
+depends dbus 
+optional_depends qt3 "" "" "to build the wpa_gui utility"
diff --git a/x11-apps/openoffice-bin/DETAILS b/x11-apps/openoffice-bin/DETAILS
index 5d7fa20..063ad1b 100644
--- a/x11-apps/openoffice-bin/DETAILS
+++ b/x11-apps/openoffice-bin/DETAILS
@@ -13,7 +13,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/OOG680_m9_native_packed-1_en-US.9238
            SHORT="The open office suite for unix"
        LDD_CHECK=off
          ARCHIVE=off
-	 
+ 
 cat << EOF
 OpenOffice is the open source alternative to a full office suite. Derived
 from SUN's staroffice 5.2, this group of developers started to create
diff --git a/x11-apps/xlockmore/DEPENDS b/x11-apps/xlockmore/DEPENDS
index 17e6268..087d14c 100644
--- a/x11-apps/xlockmore/DEPENDS
+++ b/x11-apps/xlockmore/DEPENDS
@@ -1,14 +1,3 @@
-optional_depends "gtk+-2" \
-		 "" \
-		 "" \
-		 "to build xglock, a xlock GUI configuration tool"
-
-optional_depends "Linux-PAM" \
-		 "--enable-pam" \
-		 "--disable-pam" \
-		 "for PAM support"
-
-optional_depends "%GLUT" \
-		 "" \
-		 "" \
-		 "may be required to view some 3d screen hacks"
+optional_depends gtk+-2 "" "" "to build xglock, a xlock GUI configuration tool"
+optional_depends Linux-PAM "--enable-pam" "--disable-pam" "for PAM support"
+optional_depends "%GLUT" "" "" "may be required to view some 3d screen hacks"
diff --git a/x11-utils/conky/DEPENDS b/x11-utils/conky/DEPENDS
index 5a9c915..a0c392b 100644
--- a/x11-utils/conky/DEPENDS
+++ b/x11-utils/conky/DEPENDS
@@ -1,4 +1,2 @@
 depends %X
-
-optional_depends "bmpx" "--enable-bmpx" "--disable-bmpx" \
-		 "for BMPx control support"
+optional_depends bmpx "--enable-bmpx" "--disable-bmpx" "for BMPx control support"
diff --git a/x11-utils/nvtv/DEPENDS b/x11-utils/nvtv/DEPENDS
index cec0696..7762138 100644
--- a/x11-utils/nvtv/DEPENDS
+++ b/x11-utils/nvtv/DEPENDS
@@ -1,6 +1,2 @@
-depends NVIDIA &&
-
-optional_depends  "gtk+-2"	     \
-		  "--with-gtk=gtk2"  \
-		  "--disable-gtk"    \
-		  "to enable the GTK2 frontend"
+depends NVIDIA
+optional_depends  gtk+-2 "--with-gtk=gtk2" "--disable-gtk" "to enable the GTK2 frontend"
diff --git a/x11-wm/fluxbox/DEPENDS b/x11-wm/fluxbox/DEPENDS
index bb886da..59265ad 100644
--- a/x11-wm/fluxbox/DEPENDS
+++ b/x11-wm/fluxbox/DEPENDS
@@ -1,4 +1 @@
-optional_depends "imlib2"	    \
-		 "--enable-imlib2"  \
-		 ""		    \
-		 "for imlib2 (png, jpeg pixmap) support"
+optional_depends imlib2 "--enable-imlib2" "" "for imlib2 (png, jpeg pixmap) support"
diff --git a/xfce4/xfc/DEPENDS b/xfce4/xfc/DEPENDS
index 2c74576..949786a 100644
--- a/xfce4/xfc/DEPENDS
+++ b/xfce4/xfc/DEPENDS
@@ -1,6 +1,5 @@
-depends libsigc++2 						&&
-depends gtk+-2							&&
-
-optional_depends libglade2  ""  ""  "libglade support"		&&
+depends libsigc++2
+depends gtk+-2
+optional_depends libglade2  ""  ""  "libglade support"
 optional_depends doxygen    ""  ""  "to build documentation"
 
diff --git a/zbeta/XDirectFB/DEPENDS b/zbeta/XDirectFB/DEPENDS
index 44e2447..c539ab2 100644
--- a/zbeta/XDirectFB/DEPENDS
+++ b/zbeta/XDirectFB/DEPENDS
@@ -1,2 +1,2 @@
-depends perl		&&
+depends perl
 depends DirectFB
diff --git a/zbeta/beagle/DEPENDS b/zbeta/beagle/DEPENDS
index 4a6ec33..d074425 100644
--- a/zbeta/beagle/DEPENDS
+++ b/zbeta/beagle/DEPENDS
@@ -4,18 +4,8 @@ depends  sqlite
 depends  libexif
 depends  zip
 depends  dbus
-
-optional_depends  "thunderbird"      "--enable-thunderbird"  ""  \
-                  "Enables the Thunderbird Mail Backend"        
-		  
-optional_depends  "evolution-sharp"  ""  "--disable-evolution"  \
-                  "Enables the Evolution Mail Backend"         
-		  
-optional_depends  "MPlayer"          ""  ""                      \
-                  "Enables beagle to parse metadata from videos" 
-		  
-optional_depends  "wv"               ""  ""                      \
-                  "Enables MS Word support (must say Y to gsf-sharp)" 
-		  
-optional_depends  "gsf-sharp-svn"    ""  "--disable-gsf-sharp"   \
-                  "Enables Microsoft Powerpoint support"
+optional_depends  thunderbird "--enable-thunderbird" "" "Enables the Thunderbird Mail Backend"        
+optional_depends  evolution-sharp  "" "--disable-evolution" "Enables the Evolution Mail Backend"         
+optional_depends  MPlayer "" "" "Enables beagle to parse metadata from videos" 
+optional_depends  wv "" "" "Enables MS Word support (must say Y to gsf-sharp)" 
+optional_depends  gsf-sharp-svn "" "--disable-gsf-sharp" "Enables Microsoft Powerpoint support"
diff --git a/zbeta/emacs-cvs/DEPENDS b/zbeta/emacs-cvs/DEPENDS
index 09f661d..650a1cc 100644
--- a/zbeta/emacs-cvs/DEPENDS
+++ b/zbeta/emacs-cvs/DEPENDS
@@ -1,7 +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  "%X" "--with-x --with-xpm" "" "for xpm support if you use faces"	&&
-optional_depends  "gtk+-2"  "--with-gtk" "" "for a GTK2 user interface"
+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  "%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/gift-cvs/DEPENDS b/zbeta/gift-cvs/DEPENDS
index 17f34b5..3eeac4c 100644
--- a/zbeta/gift-cvs/DEPENDS
+++ b/zbeta/gift-cvs/DEPENDS
@@ -1,19 +1,7 @@
-depends autoconf	&&
-depends automake	&&
-depends pkgconfig	&&
-depends libtool		&&
-
-optional_depends "libvorbis"		\
-		 "--enable-libvorbis"	\
-		 "--disable-libvorbis"	\
-		 "to enable Vorbis support" &&
-
-optional_depends "ImageMagick"		\
-		 "--enable-imagemagick"	\
-		 "--disable-imagemagick" \
-		 "to enable ImageMagick support" &&
-
-optional_depends "gdbm"			\
-		 "--enable-libdb"	\
-		 "--disable-libdb"	\
-		 "to enable supernode support"
+depends autoconf
+depends automake
+depends pkgconfig
+depends libtool
+optional_depends libvorbis "--enable-libvorbis" "--disable-libvorbis" "to enable Vorbis support"
+optional_depends ImageMagick "--enable-imagemagick" "--disable-imagemagick" "to enable ImageMagick support"
+optional_depends gdbm "--enable-libdb" "--disable-libdb" "to enable supernode support"
diff --git a/zbeta/gloox/DETAILS b/zbeta/gloox/DETAILS
index 1c57e6a..f881586 100644
--- a/zbeta/gloox/DETAILS
+++ b/zbeta/gloox/DETAILS
@@ -1,7 +1,7 @@
           MODULE=gloox
          VERSION=0.9.7
           SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://camaya.net/download/	
+      SOURCE_URL=http://camaya.net/download/
       SOURCE_VFY=sha1:1a5aece25e82861de319851bc5ff6701570a6fb8
         WEB_SITE=http://camaya.net/gloox/
          ENTERED=20070412
diff --git a/zbeta/gnash-cvs/DEPENDS b/zbeta/gnash-cvs/DEPENDS
index ddfda98..a777452 100644
--- a/zbeta/gnash-cvs/DEPENDS
+++ b/zbeta/gnash-cvs/DEPENDS
@@ -1,3 +1,3 @@
-depends %X	&&
-depends libpng	&&
+depends %X
+depends libpng
 depends libxml2
diff --git a/zbeta/hunspell/DEPENDS b/zbeta/hunspell/DEPENDS
index 0788255..f5e6c9b 100644
--- a/zbeta/hunspell/DEPENDS
+++ b/zbeta/hunspell/DEPENDS
@@ -1,15 +1,3 @@
-depends          "glibc" 
-optional_depends "ncurses"                                   \
-                 "--with-ui"                                 \
-		 ""                                          \
-		 "for using ncurses"
-
-optional_depends "readline"                                  \
-                 "--with-readline"                           \
-                 ""                                          \
-                 "for fancy input line editing"
-
-optional_depends "gettext"                                   \
-                 ""                                          \
-                 "--with-included-gettext"                   \
-                 "for using gettext"
+optional_depends ncurses "--with-ui" "" "for using ncurses"
+optional_depends readline "--with-readline" "" "for fancy input line editing"
+optional_depends gettext "" "--with-included-gettext" "for using gettext"
diff --git a/zbeta/libass/DEPENDS b/zbeta/libass/DEPENDS
index af68254..2e640ac 100644
--- a/zbeta/libass/DEPENDS
+++ b/zbeta/libass/DEPENDS
@@ -1,11 +1,3 @@
-depends          "freetype2" 
-optional_depends "fontconfig"                                \
-                 ""                                          \
-		 ""                                          \
-		 "for using FontConfig"
-
-optional_depends "enca"                                      \
-                 ""                                          \
-                 ""                                          \
-                 "for using enca"
-
+depends freetype2
+optional_depends fontconfig "" "" "for using FontConfig"
+optional_depends enca "" "" "for using enca"
diff --git a/zbeta/nil-cvs/DEPENDS b/zbeta/nil-cvs/DEPENDS
index bdcf189..dc8fc01 100644
--- a/zbeta/nil-cvs/DEPENDS
+++ b/zbeta/nil-cvs/DEPENDS
@@ -1,3 +1,3 @@
-depends		SDL_mixer	&&
-depends		SDL_ttf		&&
-depends		SDL_image
+depends SDL_mixer
+depends SDL_ttf
+depends SDL_image
diff --git a/zbeta/obby/DEPENDS b/zbeta/obby/DEPENDS
index e487178..2119d79 100644
--- a/zbeta/obby/DEPENDS
+++ b/zbeta/obby/DEPENDS
@@ -1,3 +1,2 @@
 depends net6
-optional_depends "howl" "--with-howl" "" \
-		 "for ZeroConf support"
+optional_depends howl "--with-howl" "" "for ZeroConf support"
diff --git a/zbeta/openafs-devel/DEPENDS b/zbeta/openafs-devel/DEPENDS
index caba05b..5ab9291 100644
--- a/zbeta/openafs-devel/DEPENDS
+++ b/zbeta/openafs-devel/DEPENDS
@@ -1,3 +1,3 @@
-depends autoconf	&&
-depends automake	&&
-depends Linux-PAM
\ No newline at end of file
+depends autoconf
+depends automake
+depends Linux-PAM
diff --git a/zbeta/silc-server/DEPENDS b/zbeta/silc-server/DEPENDS
index c23b9c5..b6709bb 100644
--- a/zbeta/silc-server/DEPENDS
+++ b/zbeta/silc-server/DEPENDS
@@ -1,4 +1 @@
-optional_depends "gmp"                                       \
-                 "--with-gmp"                                \
-		 ""                                          \
-		 "for using GMP instead of SILC Math"        \
+optional_depends gmp "--with-gmp" "" "for using GMP instead of SILC Math"
diff --git a/zbeta/silc-toolkit/DEPENDS b/zbeta/silc-toolkit/DEPENDS
index c23b9c5..b6709bb 100644
--- a/zbeta/silc-toolkit/DEPENDS
+++ b/zbeta/silc-toolkit/DEPENDS
@@ -1,4 +1 @@
-optional_depends "gmp"                                       \
-                 "--with-gmp"                                \
-		 ""                                          \
-		 "for using GMP instead of SILC Math"        \
+optional_depends gmp "--with-gmp" "" "for using GMP instead of SILC Math"
diff --git a/zbeta/turck-mmcache/DEPENDS b/zbeta/turck-mmcache/DEPENDS
index cfee859..25c76d9 100644
--- a/zbeta/turck-mmcache/DEPENDS
+++ b/zbeta/turck-mmcache/DEPENDS
@@ -1 +1 @@
-depends		php
+depends php
diff --git a/zbeta/vim-cvs/DEPENDS b/zbeta/vim-cvs/DEPENDS
index 38b09a5..de30f82 100644
--- a/zbeta/vim-cvs/DEPENDS
+++ b/zbeta/vim-cvs/DEPENDS
@@ -1,13 +1,5 @@
-depends ncurses &&
-optional_depends "Python"	"--enable-pythoninterp" \
-				"" 			\
-				"to enable Python intepreter 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"
+depends ncurses
+optional_depends Python "--enable-pythoninterp" "" "to enable Python intepreter 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/zbeta/vim-svn/DEPENDS b/zbeta/vim-svn/DEPENDS
index 38b09a5..40273e1 100644
--- a/zbeta/vim-svn/DEPENDS
+++ b/zbeta/vim-svn/DEPENDS
@@ -1,13 +1,5 @@
-depends ncurses &&
-optional_depends "Python"	"--enable-pythoninterp" \
-				"" 			\
-				"to enable Python intepreter 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"
+depends ncurses
+optional_depends Python "--enable-pythoninterp" "" "to enable Python intepreter 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/zbeta/weechat-cvs/DEPENDS b/zbeta/weechat-cvs/DEPENDS
index 5767f1b..c6d6586 100644
--- a/zbeta/weechat-cvs/DEPENDS
+++ b/zbeta/weechat-cvs/DEPENDS
@@ -1,12 +1,4 @@
-depends ncurses	&&
-depends gnutls  &&
-
-optional_depends "perl" \
-		 "--enable-perl" \
-		 "--disable-perl" \
-		 "to compile the perl plugin"	&&
-
-optional_depends "Python" \
-                 "--enable-python" \
-                 "--disable-python" \
-                 "to compile the Python plugin"
+depends ncurses
+depends gnutls
+optional_depends perl "--enable-perl" "--disable-perl" "to compile the perl plugin"
+optional_depends Python "--enable-python" "--disable-python" "to compile the Python plugin"
diff --git a/zbeta/weechat-git/DEPENDS b/zbeta/weechat-git/DEPENDS
index 5767f1b..c6d6586 100644
--- a/zbeta/weechat-git/DEPENDS
+++ b/zbeta/weechat-git/DEPENDS
@@ -1,12 +1,4 @@
-depends ncurses	&&
-depends gnutls  &&
-
-optional_depends "perl" \
-		 "--enable-perl" \
-		 "--disable-perl" \
-		 "to compile the perl plugin"	&&
-
-optional_depends "Python" \
-                 "--enable-python" \
-                 "--disable-python" \
-                 "to compile the Python plugin"
+depends ncurses
+depends gnutls
+optional_depends perl "--enable-perl" "--disable-perl" "to compile the perl plugin"
+optional_depends Python "--enable-python" "--disable-python" "to compile the Python plugin"


More information about the Lunar-commits mailing list