[Lunar-commits] <moonbase> Revert "Merge branch 'master' of ssh://lunar-linux.org/var/git/lunar/moonbase"

Jannis Pohlmann jannis at xfce.org
Fri Mar 13 17:34:43 CET 2009


commit 54c9b60be0f142bf0d937a56ddee69a1410cdcba
Author: Jannis Pohlmann <jannis at xfce.org>
Date:   Fri Mar 13 17:34:43 2009 +0100

    Revert "Merge branch 'master' of ssh://lunar-linux.org/var/git/lunar/moonbase"
    
    This reverts commit 1d40d11b63ba3b75b35e982488e81c91ad905ec9, reversing
    changes made to 331fb849df32accbb4a58690ab56fa15eb10a726.
---
 app-themes/gtk-nodoka-engine/DETAILS               |    8 ++--
 audio/consonance/BUILD                             |    5 --
 audio/consonance/DEPENDS                           |    2 -
 audio/consonance/DETAILS                           |    8 ++--
 audio/exaile/DETAILS                               |    8 ++--
 crypto/openssh/DEPENDS                             |   10 ++--
 distributed/distcc/plugin.d/optimize-distcc.plugin |    6 +-
 games/ultimatestunts/DETAILS                       |   11 ----
 gnome2/desktop/libsoup/DEPENDS                     |    1 -
 graphics/SDL_image/DETAILS                         |    3 +-
 graphics/enblend/BUILD                             |    7 ---
 graphics/libpano12/CONFLICTS                       |    1 +
 graphics/libpano12/DEPENDS                         |    3 +
 graphics/libpano12/DETAILS                         |   22 +++++++++
 kernel/linux-2.6/BUILD                             |    1 +
 net/libproxy/DETAILS                               |   15 ------
 printer/hplip/CONFIGURE                            |    2 +-
 python/cssutils/BUILD                              |    7 ---
 python/cssutils/DEPENDS                            |    1 -
 python/cssutils/DETAILS                            |   14 ------
 utils/cpupowerd/BUILD                              |    8 ---
 utils/cpupowerd/DETAILS                            |   18 -------
 video/HandBrake/BUILD                              |   17 -------
 video/HandBrake/DEPENDS                            |    1 -
 video/HandBrake/DETAILS                            |   20 --------
 video/elisa-plugins-bad/BUILD                      |    9 ----
 video/elisa-plugins-bad/DEPENDS                    |    8 ---
 video/elisa-plugins-bad/DETAILS                    |   17 -------
 video/elisa-plugins-good/BUILD                     |    7 ---
 video/elisa-plugins-good/DEPENDS                   |    7 ---
 video/elisa-plugins-good/DETAILS                   |   14 ------
 video/elisa-plugins-ugly/BUILD                     |    7 ---
 video/elisa-plugins-ugly/DEPENDS                   |    7 ---
 video/elisa-plugins-ugly/DETAILS                   |   14 ------
 video/elisa/BUILD                                  |    7 ---
 video/elisa/DEPENDS                                |   11 ----
 video/elisa/DETAILS                                |   14 ------
 video/mplayerplug-in/DEPENDS                       |    2 +-
 web/xulrunner/POST_REMOVE                          |    3 +-
 wifi/iw/DEPENDS                                    |    1 -
 wifi/iw/DETAILS                                    |   13 -----
 wifi/wicd/BUILD                                    |    8 ---
 wifi/wicd/DEPENDS                                  |    2 -
 wifi/wicd/DETAILS                                  |   13 -----
 wifi/wicd/init.d/wicd                              |   13 -----
 x11-utils/virtualbox/BUILD                         |    1 +
 x11/fglrx/DEPENDS                                  |    1 -
 x11/fglrx/DETAILS                                  |    1 -
 x11/fglrx/DETAILS.x86_64                           |    1 -
 xfce4/apps/Terminal/BUILD                          |   14 ------
 xfce4/apps/Terminal/DETAILS                        |   11 ++--
 xfce4/apps/mousepad/BUILD                          |    2 +-
 xfce4/apps/mousepad/DETAILS                        |   18 ++-----
 xfce4/apps/orage/BUILD                             |    2 +-
 xfce4/apps/orage/DEPENDS                           |    1 -
 xfce4/apps/orage/DETAILS                           |   13 ++---
 xfce4/apps/ristretto/BUILD                         |    6 --
 xfce4/apps/ristretto/DETAILS                       |    8 ++--
 xfce4/apps/squeeze/BUILD                           |    2 +-
 xfce4/apps/squeeze/DETAILS                         |   10 ++--
 xfce4/apps/xarchiver/DETAILS                       |   10 ++--
 xfce4/apps/xfburn/BUILD                            |   14 ------
 xfce4/apps/xfburn/DETAILS                          |   21 +++++----
 xfce4/apps/xfce4-appfinder/BUILD                   |    2 +-
 xfce4/apps/xfce4-appfinder/DETAILS                 |   10 ++--
 xfce4/apps/xfce4-mixer/BUILD                       |    2 +-
 xfce4/apps/xfce4-mixer/DEPENDS                     |    1 -
 xfce4/apps/xfce4-mixer/DETAILS                     |   11 ++--
 xfce4/apps/xfmedia/BUILD                           |    2 +-
 xfce4/apps/xfmedia/DETAILS                         |   10 ++--
 xfce4/apps/xfprint/BUILD                           |    4 +-
 xfce4/apps/xfprint/DETAILS                         |   10 ++--
 xfce4/core/Thunar/BUILD                            |    2 +-
 xfce4/core/Thunar/DETAILS                          |   11 ++--
 xfce4/core/exo/BUILD                               |   13 -----
 xfce4/core/exo/DETAILS                             |   11 ++--
 xfce4/core/libxfce4menu/BUILD                      |   10 ----
 xfce4/core/libxfce4menu/DETAILS                    |   23 +++++----
 xfce4/core/libxfce4util/BUILD                      |    2 +-
 xfce4/core/libxfce4util/DEPENDS                    |    2 -
 xfce4/core/libxfce4util/DETAILS                    |   10 ++--
 xfce4/core/libxfce4util/POST_INSTALL               |   10 ++++
 xfce4/core/libxfce4util/profile.d/xfce4.rc         |    4 ++
 xfce4/core/libxfcegui4/BUILD                       |    3 +-
 xfce4/core/libxfcegui4/DEPENDS                     |   11 ++--
 xfce4/core/libxfcegui4/DETAILS                     |   10 ++--
 xfce4/core/xfce-utils/BUILD                        |    2 +-
 xfce4/core/xfce-utils/DEPENDS                      |    3 +-
 xfce4/core/xfce-utils/DETAILS                      |   10 ++--
 xfce4/core/xfce4-dev-tools/BUILD                   |    2 +-
 xfce4/core/xfce4-dev-tools/DETAILS                 |   12 ++--
 xfce4/core/xfce4-dev-tools/POST_INSTALL            |   10 ----
 xfce4/core/xfce4-dev-tools/profile.d/xfce4.rc      |    4 --
 xfce4/core/xfce4-panel/BUILD                       |    2 +-
 xfce4/core/xfce4-panel/DEPENDS                     |    1 -
 xfce4/core/xfce4-panel/DETAILS                     |   10 ++--
 xfce4/core/xfce4-session/BUILD                     |    4 +-
 xfce4/core/xfce4-session/DETAILS                   |   11 ++--
 xfce4/core/xfce4-settings/BUILD                    |   14 ------
 xfce4/core/xfce4-settings/DEPENDS                  |    1 -
 xfce4/core/xfce4-settings/DETAILS                  |   16 +++---
 xfce4/core/xfconf/BUILD                            |   14 ------
 xfce4/core/xfconf/DETAILS                          |   23 +++++----
 xfce4/core/xfdesktop/BUILD                         |    2 +-
 xfce4/core/xfdesktop/DEPENDS                       |    3 +-
 xfce4/core/xfdesktop/DETAILS                       |   10 ++--
 xfce4/core/xfwm4/BUILD                             |    2 +-
 xfce4/core/xfwm4/DEPENDS                           |    3 +-
 xfce4/core/xfwm4/DETAILS                           |   10 ++--
 xfce4/goodies/xfce4-taskmanager/BUILD              |    2 +-
 xfce4/goodies/xfce4-taskmanager/DEPENDS            |    2 +-
 xfce4/goodies/xfce4-taskmanager/DETAILS            |    8 ++--
 xfce4/goodies/xfce4-xkb-plugin/BUILD               |    2 +-
 xfce4/goodies/xfce4-xkb-plugin/DETAILS             |   10 ++--
 xfce4/xfce4/DEPENDS                                |    1 -
 xfce4/xfce4/DETAILS                                |    4 +-
 xorg7/driver/xf86-video-mach64/BUILD               |    6 --
 xorg7/driver/xf86-video-mach64/CONFLICTS           |    6 --
 xorg7/driver/xf86-video-mach64/DEPENDS             |    2 -
 xorg7/driver/xf86-video-mach64/DETAILS             |   18 -------
 xorg7/xorg-server/BUILD                            |   15 +++---
 xorg7/xorg-server/CONFIGURE                        |    2 +-
 xorg7/xorg-server/PRE_BUILD                        |    3 +
 zbeta/WebKit/BUILD                                 |   12 -----
 zbeta/WebKit/DEPENDS                               |   17 -------
 zbeta/airconfig-svn/BUILD                          |    2 +-
 zbeta/arora-git/BUILD                              |   11 ----
 zbeta/arora-git/DEPENDS                            |    1 -
 zbeta/arora-git/DETAILS                            |   10 ----
 zbeta/e17/eina-svn/profile.d/e17-cvs.rc            |    4 --
 zbeta/e17/emphasis-svn/BUILD                       |   11 ----
 zbeta/e17/emphasis-svn/DEPENDS                     |    5 --
 zbeta/e17/emphasis-svn/DETAILS                     |   14 ------
 zbeta/e17/enhance-svn/BUILD                        |   11 ----
 zbeta/e17/enhance-svn/DEPENDS                      |    1 -
 zbeta/e17/enhance-svn/DETAILS                      |   14 ------
 zbeta/e17/enna-svn/BUILD                           |   11 ----
 zbeta/e17/enna-svn/DEPENDS                         |   28 -----------
 zbeta/e17/enna-svn/DETAILS                         |   14 ------
 zbeta/e17/equate-cvs/BUILD                         |   13 -----
 zbeta/e17/equate-cvs/DEPENDS                       |    1 -
 zbeta/e17/equate-cvs/DETAILS                       |   18 -------
 zbeta/emphasis-svn/BUILD                           |   11 ++++
 zbeta/emphasis-svn/DEPENDS                         |    5 ++
 zbeta/emphasis-svn/DETAILS                         |   14 ++++++
 zbeta/enhance-svn/BUILD                            |   11 ++++
 zbeta/enhance-svn/DEPENDS                          |    1 +
 zbeta/enhance-svn/DETAILS                          |   14 ++++++
 zbeta/enna-svn/BUILD                               |   11 ++++
 zbeta/enna-svn/DEPENDS                             |   28 +++++++++++
 zbeta/enna-svn/DETAILS                             |   14 ++++++
 zbeta/epiphany-svn/BUILD                           |   21 --------
 zbeta/epiphany-svn/CONFIGURE                       |    5 --
 zbeta/epiphany-svn/DEPENDS                         |    9 ----
 zbeta/epiphany-svn/DETAILS                         |   15 ------
 zbeta/equate-cvs/BUILD                             |   13 +++++
 zbeta/equate-cvs/DEPENDS                           |    1 +
 zbeta/equate-cvs/DETAILS                           |   18 +++++++
 zbeta/ffmpeg-svn/DETAILS                           |    2 +-
 zbeta/midori-git/BUILD                             |   13 -----
 zbeta/midori-git/DEPENDS                           |    4 --
 zbeta/midori-git/DETAILS                           |   20 --------
 zbeta/mplayer/BUILD                                |   47 ------------------
 zbeta/mplayer/CONFIGURE                            |    2 -
 zbeta/mplayer/DEPENDS                              |   17 -------
 zbeta/mplayer/DETAILS                              |   50 --------------------
 zbeta/mplayer/POST_INSTALL                         |    3 -
 zbeta/mplayer/PRE_BUILD                            |   12 -----
 zbeta/pigment-python/DEPENDS                       |    3 -
 zbeta/pigment-python/DETAILS                       |   13 -----
 zbeta/pigment/DEPENDS                              |    4 --
 zbeta/pigment/DETAILS                              |   15 ------
 zbeta/xf86-video-mach64/BUILD                      |    6 ++
 zbeta/xf86-video-mach64/CONFLICTS                  |    6 ++
 zbeta/xf86-video-mach64/DEPENDS                    |    2 +
 zbeta/xf86-video-mach64/DETAILS                    |   18 +++++++
 zlocal/README                                      |    9 ++++
 177 files changed, 450 insertions(+), 1121 deletions(-)

diff --git a/app-themes/gtk-nodoka-engine/DETAILS b/app-themes/gtk-nodoka-engine/DETAILS
index d7db13a..50be530 100644
--- a/app-themes/gtk-nodoka-engine/DETAILS
+++ b/app-themes/gtk-nodoka-engine/DETAILS
@@ -1,11 +1,11 @@
           MODULE=gtk-nodoka-engine
-         VERSION=0.7.2
+         VERSION=0.7.1
           SOURCE=$MODULE-$VERSION.tar.gz
-       SOURCE_URL=https://fedorahosted.org/releases/n/o/nodoka
-       SOURCE_VFY=sha1:7bc8c778cfb76717a2881b7524daa4a7acf3a16b
+       SOURCE_URL=https://fedorahosted.org/releases/n/o/nodoka/
+       SOURCE_VFY=sha1:e55a08ea714c765bba5b292b2383f1c523d9ae92
         WEB_SITE=https://hosted.fedoraproject.org/projects/nodoka/wiki
          ENTERED=20070921
-         UPDATED=20080127
+         UPDATED=20090309
            SHORT="a GTK+-2 theme engine created by Fedora"
 
 cat << EOF
diff --git a/audio/consonance/BUILD b/audio/consonance/BUILD
deleted file mode 100644
index d0fcbc8..0000000
--- a/audio/consonance/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-(
-  default_build
-  install -m644 $SOURCE_DIRECTORY/data/consonance.png /usr/share/pixmaps
-
-) > $C_FIFO 2>&1
diff --git a/audio/consonance/DEPENDS b/audio/consonance/DEPENDS
index d9c654c..5c881bb 100644
--- a/audio/consonance/DEPENDS
+++ b/audio/consonance/DEPENDS
@@ -2,5 +2,3 @@ depends libmad
 depends libogg
 depends flac
 depends libsndfile
-depends taglib
-depends libnotify
diff --git a/audio/consonance/DETAILS b/audio/consonance/DETAILS
index 778c2a4..641d93f 100644
--- a/audio/consonance/DETAILS
+++ b/audio/consonance/DETAILS
@@ -1,9 +1,9 @@
           MODULE=consonance
-         VERSION="svn-`date +%Y%U`"
-         SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE          
-      SOURCE_URL=svn+https://consonance.svn.sourceforge.net/svnroot/consonance/trunk:consonance
+         VERSION=0.4.1
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=$SFORGE_URL/$MODULE
         WEB_SITE=http://consonance.sourceforge.net/
+      SOURCE_VFY=sha1:bb04185043677d024de11fcaa55bf00b295be0f0
          ENTERED=20080805
          UPDATED=20090307
            SHORT="lightweight music manager"
diff --git a/audio/exaile/DETAILS b/audio/exaile/DETAILS
index cd67c41..85bfadf 100644
--- a/audio/exaile/DETAILS
+++ b/audio/exaile/DETAILS
@@ -1,12 +1,12 @@
           MODULE=exaile
-         VERSION=0.2.14
+         VERSION=0.2.13
           SOURCE=${MODULE}_${VERSION}.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}-${VERSION}
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}_${VERSION}
       SOURCE_URL=http://exaile.org/files/
-      SOURCE_VFY=sha1:3442867ae6f5116f87eb2488da73cf6d23442f52
+      SOURCE_VFY=sha1:8cc754c55333dad750d27e45a4e16f53c1f1522c
         WEB_SITE=http://exaile.org/
          ENTERED=20061212
-         UPDATED=20081027
+         UPDATED=20080626
            SHORT="GTK+ media player aiming to be similar to KDE's AmaroK"
 
 cat << EOF
diff --git a/crypto/openssh/DEPENDS b/crypto/openssh/DEPENDS
index 8da819f..a511f0b 100644
--- a/crypto/openssh/DEPENDS
+++ b/crypto/openssh/DEPENDS
@@ -3,17 +3,17 @@ depends  openssl                  &&
 depends  coreutils                &&
 depends  psmisc                   &&
 
-optional_depends "tcp_wrappers"         \
-                 "--with-tcp-wrappers"  \
-                 ""                     \
-                 "for an optional method of controlling ssh access."  &&
+optional_depends  "tcp_wrappers"         \
+                  "--with-tcp-wrappers"  \
+                  ""                     \
+                  "for an optional method of controlling ssh access."  &&
 
 optional_depends "Linux-PAM"             \
                  "--with-pam"            \
                  "--without-pam"         \
                  "for Linux PAM support"  &&
 
-optional_depends "heimdal" \
+optional_depends heimdal \
                  "--with-kerberos5=/usr" \
                  "" \
                  "Heimdal Kerberos5/GSSAPI Support"
diff --git a/distributed/distcc/plugin.d/optimize-distcc.plugin b/distributed/distcc/plugin.d/optimize-distcc.plugin
index 74f3cd9..df2f075 100644
--- a/distributed/distcc/plugin.d/optimize-distcc.plugin
+++ b/distributed/distcc/plugin.d/optimize-distcc.plugin
@@ -19,7 +19,7 @@ plugin_distcc_optimize()
     export DISTCC_ALLOW
     verbose_msg "CC_EXT=\"$CC_EXT\""
     verbose_msg "CXX_EXT=\"$CXX_EXT\""
-    verbose_msg "DISTCC_POTENTIAL_HOSTS=\"$DISTCC_POTENTIAL_HOSTS\""
+    verbose_msg "DISTCC_HOSTS=\"$DISTCC_HOSTS\""
     verbose_msg "DISTCC_ALLOW=\"$DISTCC_ALLOW\""
   fi
   return 2
@@ -51,7 +51,7 @@ plugin_distcc_optimize_menu()
     debug_msg "save_optimizations($@)"
     cat > /etc/lunar/local/optimizations.DISTCC  <<EOF
 USE_DISTCC=$USE_DISTCC
-DISTCC_HOSTS="$DISTCC_POTENTIAL_HOSTS"
+DISTCC_HOSTS="$DISTCC_HOSTS"
 DISTCC_ALLOW="$DISTCC_ALLOW"
 EOF
   }
@@ -71,7 +71,7 @@ EOF
       fi
     save_optimizations
     elif [ "$RESULT" == "DISTCC_HOSTS" ]; then
-      DISTCC_POTENTIAL_HOSTS=`$DIALOG --inputbox "Enter a list of hosts as hostnames or IP addresses (see man distcc)" 9 60 $DISTCC_POTENTIAL_HOSTS`
+      DISTCC_HOSTS=`$DIALOG --inputbox "Enter a list of hosts as hostnames or IP addresses (see man distcc)" 9 60 $DISTCC_HOSTS`
       if [ $? != 0 ]; then
         continue
       else
diff --git a/games/ultimatestunts/DETAILS b/games/ultimatestunts/DETAILS
deleted file mode 100644
index e9ca44b..0000000
--- a/games/ultimatestunts/DETAILS
+++ /dev/null
@@ -1,11 +0,0 @@
-MODULE=ultimatestunts
-VERSION=0751
-SOURCE=$MODULE-srcdata-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-srcdata-$VERSION
-SOURCE_URL=$SFORGE_URL/$MODULE
-SOURCE_VFY=sha1:efc5d707da0277ba10bfa865b1c40e92c2104bec
-ENTERED=20080703
-UPDATED=20080703
-PSAFE=no
-SHORT="a game"
-
diff --git a/gnome2/desktop/libsoup/DEPENDS b/gnome2/desktop/libsoup/DEPENDS
index f6f87ab..bbda9c7 100644
--- a/gnome2/desktop/libsoup/DEPENDS
+++ b/gnome2/desktop/libsoup/DEPENDS
@@ -1,5 +1,4 @@
 depends  glib-2
 depends  gnutls
-depends  libproxy
 depends  sqlite
 depends  libproxy
diff --git a/graphics/SDL_image/DETAILS b/graphics/SDL_image/DETAILS
index 4138445..a4ef90f 100644
--- a/graphics/SDL_image/DETAILS
+++ b/graphics/SDL_image/DETAILS
@@ -1,7 +1,8 @@
           MODULE=SDL_image
          VERSION=1.2.7
           SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=http://www.libsdl.org/projects/$MODULE/release
+   SOURCE_URL[0]=$SFORGE_URL/libsdl
+   SOURCE_URL[1]=http://www.libsdl.org/projects/$MODULE/release
       SOURCE_VFY=sha1:0cffd05e41014651e7114d7fea309c9f37ef2d8a
         WEB_SITE=http://www.libsdl.org/projects/$MODULE
          ENTERED=20010922
diff --git a/graphics/enblend/BUILD b/graphics/enblend/BUILD
deleted file mode 100644
index bc97bf4..0000000
--- a/graphics/enblend/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-  sed -i '/CXXFLAGS/s: -g -O3 : :' src/Makefile.in
- 
-  default_build
-
-) > $C_FIFO 2>&1
diff --git a/graphics/libpano12/CONFLICTS b/graphics/libpano12/CONFLICTS
new file mode 100644
index 0000000..bd39616
--- /dev/null
+++ b/graphics/libpano12/CONFLICTS
@@ -0,0 +1 @@
+conflicts libpano13
diff --git a/graphics/libpano12/DEPENDS b/graphics/libpano12/DEPENDS
new file mode 100644
index 0000000..becfb99
--- /dev/null
+++ b/graphics/libpano12/DEPENDS
@@ -0,0 +1,3 @@
+depends jpeg   &&
+depends libpng &&
+depends tiff
diff --git a/graphics/libpano12/DETAILS b/graphics/libpano12/DETAILS
new file mode 100644
index 0000000..8ff9c3d
--- /dev/null
+++ b/graphics/libpano12/DETAILS
@@ -0,0 +1,22 @@
+           MODULE=libpano12
+          VERSION=2.8.4
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=$SFORGE_URL/panotools/
+      SOURCE_VFY=sha1:90584b1629103344b23d25a729cc35f4b5639228
+        WEB_SITE=http://panotools.sourceforge.net
+      MAINTAINER=perldude at lunar-linux.org
+         ENTERED=20060720
+         UPDATED=20060720
+        SHORT="The cross-platform library behind Panorama Tools and many other GUI photo stitchers"
+
+cat << EOF
+This is the backend library used by many applications. Also included are:
+
+    * PTOptimizer, a utility for optimising control points.
+    * panoinfo a utility for querying the library version.
+    * PTmender a replacement for PTStitcher.
+    * PTblender implements just the colour and brightness correction of PTmender.
+    * PTtiff2psd Converts a set of TIFF files into a PSD file.
+    * PTuncrop Converts 'cropped TIFF' files into 'normal' TIFF files.
+EOF
+
diff --git a/kernel/linux-2.6/BUILD b/kernel/linux-2.6/BUILD
index 90260aa..d41ddb7 100644
--- a/kernel/linux-2.6/BUILD
+++ b/kernel/linux-2.6/BUILD
@@ -1,4 +1,5 @@
 (
+
   while
     if [ "$CONFIG_KERNEL" == "y" ]; then
         if [ "$PREFER_XCONFIG" == "y" -a -n "$DISPLAY" ]; then
diff --git a/net/libproxy/DETAILS b/net/libproxy/DETAILS
deleted file mode 100644
index 2c3b91d..0000000
--- a/net/libproxy/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-MODULE=libproxy
-VERSION=0.2.3
-SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_URL=http://libproxy.googlecode.com/files
-SOURCE_VFY=sha1:2b2b00a179740548035a1145bbae600db9b0a2ce
-WEBSITE=http://code.google.com/p/libproxy
-ENTERED=20090115
-UPDATED=20090115
-SHORT="provide automatic proxy configuration management"
-
-cat << EOF
-libproxy exists to answer the question: Given a network resource, how 
-do I reach it? It handles all the details, enabling you to get back to 
-programming. 
-EOF
diff --git a/printer/hplip/CONFIGURE b/printer/hplip/CONFIGURE
index 25fbb02..8666e42 100644
--- a/printer/hplip/CONFIGURE
+++ b/printer/hplip/CONFIGURE
@@ -1,3 +1,3 @@
 mquery PP "Disable HP parallel port printing support (if your HP printer is USB only)?" y
 mquery FAX "Enable builtin fax in your HP printer?" n
-mquery FOOMATIC "Install foomatic ppd's (required for PSC and Photosmart printers)?" y "--enable-foomatic-ppd-install --enable-foomatic-rip-hplip-install"
+mquery FOOMATIC "Install foomatic ppd's (required for PSC and Photosmart printers)?" y "--enable-foomatic-ppd-install"
diff --git a/python/cssutils/BUILD b/python/cssutils/BUILD
deleted file mode 100644
index 381ba27..0000000
--- a/python/cssutils/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-  python setup.py build &&
-  prepare_install &&
-  python setup.py install --root=/
-
-) > $C_FIFO 2>&1
diff --git a/python/cssutils/DEPENDS b/python/cssutils/DEPENDS
deleted file mode 100644
index 7d03d17..0000000
--- a/python/cssutils/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends Python
diff --git a/python/cssutils/DETAILS b/python/cssutils/DETAILS
deleted file mode 100644
index 8623dc2..0000000
--- a/python/cssutils/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=cssutils
-         VERSION=0.9.5.1
-          SOURCE=$MODULE-$VERSION.zip
-      SOURCE_URL=http://pypi.python.org/packages/source/c/cssutils/
-      SOURCE_VFY=sha1:bdf53ff8b0417c064daaa585389e99bed79e6bbf
-        WEB_SITE=http://cthedot.de/cssutils/
-         ENTERED=20081020
-         UPDATED=20081020
-           SHORT="css parser and library for Python"
-
-cat << EOF
-A Python package to parse and build CSS Cascading Style Sheets.
-EOF
-
diff --git a/utils/cpupowerd/BUILD b/utils/cpupowerd/BUILD
deleted file mode 100644
index 7182c4f..0000000
--- a/utils/cpupowerd/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-
-  cd src &&
-  make &&
-  prepare_install &&
-  make install
-
-) > $C_FIFO 2>&1
diff --git a/utils/cpupowerd/DETAILS b/utils/cpupowerd/DETAILS
deleted file mode 100644
index f8d46d7..0000000
--- a/utils/cpupowerd/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-          MODULE=cpupowerd
-         VERSION=0.2.0
-          SOURCE=$MODULE-$VERSION.tar.gz
-      SOURCE_URL=$SFORGE_URL/$MODULE/
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_VFY=sha1:d0285e02fbed2d64de339fc3306dd0ccda2ff9d3
-        WEB_SITE=http://cpupowerd.sourceforge.net
-         ENTERED=20080919
-         UPDATED=20081111
-           SHORT="A daemon which controls the frequency and voltage of CPUs."
-
-cat <<EOF
-This userland program adjusts the frequency and voltage according to 
-the CPUs load.
-Its capabilities include overvolting as well as undervolting.
-Currently it supports only AMD K8 processors like Athlon, Athlon64 (X2), 
-Sempron, Opteron, Turion ...
-EOF
diff --git a/video/HandBrake/BUILD b/video/HandBrake/BUILD
deleted file mode 100644
index d654ad0..0000000
--- a/video/HandBrake/BUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-(
-  tar xjf $SOURCE_CACHE/$SOURCE1 -C $SOURCE_DIRECTORY/contrib/ --strip-components=1 && 
-  make && 
-  cd gtk &&
-  ./autogen.sh --prefix=/usr &&
-  make &&
-  prepare_install && 
-  make install
-
-#  install -m755 HandBrakeCLI /usr/bin/ 
-#
-
-
-
-
-) > $C_FIFO 2>&1
-
diff --git a/video/HandBrake/DEPENDS b/video/HandBrake/DEPENDS
deleted file mode 100644
index 05cab96..0000000
--- a/video/HandBrake/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends gtkhtml3
diff --git a/video/HandBrake/DETAILS b/video/HandBrake/DETAILS
deleted file mode 100644
index a2bfbfc..0000000
--- a/video/HandBrake/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-        MODULE=HandBrake
-       VERSION=0.9.3
-        SOURCE=$MODULE-$VERSION.tar.gz
-    SOURCE_URL=http://download.m0k.org/handbrake/releases
-    SOURCE_VFY=sha1:f52389b1226bf81ba58bca67f3a1aa468cfee624
-       SOURCE1=HandBrakeContrib.tar.bz2
-   SOURCE1_URL=http://foo-projects.org/~elangelo/
-   SOURCE1_VFY=sha1:2db049571427b65cd3e89245adef51a0e0466433
-         PSAFE=no
-       ENTERED=20080104
-       UPDATED=20080104
-         SHORT="friendly video recoder with retarded devs"
-
-cat << EOF
-HandBrake is an open-source GPL-licensed, multiplatform, multithreaded DVD to
-MPEG-4 converter.
-This module only install HandBrakeCLI. If you want the gtk interface, install 
-HandBrakeGTK.
-EOF
-
diff --git a/video/elisa-plugins-bad/BUILD b/video/elisa-plugins-bad/BUILD
deleted file mode 100644
index 3184644..0000000
--- a/video/elisa-plugins-bad/BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-(
-
-patch_it $SOURCE1 1 &&
-
-python setup.py build &&
-prepare_install &&
-python setup.py install
-
-) > $C_FIFO 2>&1
diff --git a/video/elisa-plugins-bad/DEPENDS b/video/elisa-plugins-bad/DEPENDS
deleted file mode 100644
index b907bc8..0000000
--- a/video/elisa-plugins-bad/DEPENDS
+++ /dev/null
@@ -1,8 +0,0 @@
-depends Python
-depends setuptools
-depends pigment-python
-depends Twisted
-depends pysqlite
-depends pyopenssl
-depends pycairo
-depends pil
diff --git a/video/elisa-plugins-bad/DETAILS b/video/elisa-plugins-bad/DETAILS
deleted file mode 100644
index 81e7ad6..0000000
--- a/video/elisa-plugins-bad/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-MODULE=elisa-plugins-bad
-VERSION=0.5.15
-SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_URL=http://elisa.fluendo.com/download/elisa/
-SOURCE_VFY=sha1:0d8041d27e90d66143c77dcab51387a8e25fb254
-SOURCE1=elisa-plugins-bad-0.5.15-fix-PIL.patch
-SOURCE1_URL=$PATCH_URL/
-SOUECE1_VFY=5e2fecde20813388f4293a1badbc50f4bdf00e94
-WEBSITE=http://elisa.fluendo.com
-ENTERED=20081007
-UPDATED=20081007
-SHORT="media center software"
-
-cat<< EOF
-Elisa is an open source cross-platform media center connecting the 
-Internet to an all-in-one media player. 
-EOF
diff --git a/video/elisa-plugins-good/BUILD b/video/elisa-plugins-good/BUILD
deleted file mode 100644
index dfd9c3f..0000000
--- a/video/elisa-plugins-good/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-python setup.py build &&
-prepare_install &&
-python setup.py install
-
-) > $C_FIFO 2>&1
diff --git a/video/elisa-plugins-good/DEPENDS b/video/elisa-plugins-good/DEPENDS
deleted file mode 100644
index 07c149f..0000000
--- a/video/elisa-plugins-good/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends Python
-depends setuptools
-depends pigment-python
-depends Twisted
-depends pysqlite
-depends pyopenssl
-depends pycairo
diff --git a/video/elisa-plugins-good/DETAILS b/video/elisa-plugins-good/DETAILS
deleted file mode 100644
index e13aba9..0000000
--- a/video/elisa-plugins-good/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-MODULE=elisa-plugins-good
-  VERSION=0.5.15
-SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_URL=http://elisa.fluendo.com/download/elisa/
-SOURCE_VFY=sha1:4b525c979d35f5e2f2a637207ef4c681d908bb4a
-WEBSITE=http://elisa.fluendo.com
-ENTERED=20081007
-UPDATED=20081007
-SHORT="media center software"
-
-cat<< EOF
-Elisa is an open source cross-platform media center connecting the 
-Internet to an all-in-one media player. 
-EOF
diff --git a/video/elisa-plugins-ugly/BUILD b/video/elisa-plugins-ugly/BUILD
deleted file mode 100644
index dfd9c3f..0000000
--- a/video/elisa-plugins-ugly/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-python setup.py build &&
-prepare_install &&
-python setup.py install
-
-) > $C_FIFO 2>&1
diff --git a/video/elisa-plugins-ugly/DEPENDS b/video/elisa-plugins-ugly/DEPENDS
deleted file mode 100644
index 07c149f..0000000
--- a/video/elisa-plugins-ugly/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends Python
-depends setuptools
-depends pigment-python
-depends Twisted
-depends pysqlite
-depends pyopenssl
-depends pycairo
diff --git a/video/elisa-plugins-ugly/DETAILS b/video/elisa-plugins-ugly/DETAILS
deleted file mode 100644
index 08a29c2..0000000
--- a/video/elisa-plugins-ugly/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-MODULE=elisa-plugins-ugly
-VERSION=0.5.15
-SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_URL=http://elisa.fluendo.com/download/elisa/
-SOURCE_VFY=sha1:c6519a57cd7731ae20e03a35e1858603fd007c2f
-WEBSITE=http://elisa.fluendo.com
-ENTERED=20081007
-UPDATED=20081007
-SHORT="media center software"
-
-cat<< EOF
-Elisa is an open source cross-platform media center connecting the 
-Internet to an all-in-one media player. 
-EOF
diff --git a/video/elisa/BUILD b/video/elisa/BUILD
deleted file mode 100644
index dfd9c3f..0000000
--- a/video/elisa/BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-(
-
-python setup.py build &&
-prepare_install &&
-python setup.py install
-
-) > $C_FIFO 2>&1
diff --git a/video/elisa/DEPENDS b/video/elisa/DEPENDS
deleted file mode 100644
index cc8e5af..0000000
--- a/video/elisa/DEPENDS
+++ /dev/null
@@ -1,11 +0,0 @@
-depends Python
-depends setuptools
-depends pigment-python
-depends Twisted
-depends pysqlite
-depends pyopenssl
-depends pycairo
-depends cssutils
-depends elisa-plugins-good
-depends elisa-plugins-bad
-depends elisa-plugins-ugly
diff --git a/video/elisa/DETAILS b/video/elisa/DETAILS
deleted file mode 100644
index 2c4418c..0000000
--- a/video/elisa/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-MODULE=elisa
-VERSION=0.5.15
-SOURCE=$MODULE-$VERSION.tar.gz
-SOURCE_URL=http://elisa.fluendo.com/download/elisa/
-SOURCE_VFY=sha1:a4715e7d4dfc7d3f1eb3810d3024df463c68aef2
-WEBSITE=http://elisa.fluendo.com
-ENTERED=20081007
-UPDATED=20081007
-SHORT="media center software"
-
-cat<< EOF
-Elisa is an open source cross-platform media center connecting the 
-Internet to an all-in-one media player. 
-EOF
diff --git a/video/mplayerplug-in/DEPENDS b/video/mplayerplug-in/DEPENDS
index 8de0aaf..a507e3b 100644
--- a/video/mplayerplug-in/DEPENDS
+++ b/video/mplayerplug-in/DEPENDS
@@ -1 +1 @@
-depends mplayer
+depends MPlayer
diff --git a/web/xulrunner/POST_REMOVE b/web/xulrunner/POST_REMOVE
index 5b625da..90f0d62 100644
--- a/web/xulrunner/POST_REMOVE
+++ b/web/xulrunner/POST_REMOVE
@@ -1 +1,2 @@
-#ld_remove /usr/lib/xulrnner
+rm -rf /usr/include/xulrunner-*
+rm -rf /usr/lib/xulrunner-*
diff --git a/wifi/iw/DEPENDS b/wifi/iw/DEPENDS
deleted file mode 100644
index 1efc679..0000000
--- a/wifi/iw/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends libnl
diff --git a/wifi/iw/DETAILS b/wifi/iw/DETAILS
deleted file mode 100644
index 1f3ac89..0000000
--- a/wifi/iw/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
-          MODULE=iw
-         VERSION=0.9.7
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=http://wireless.kernel.org/download/iw/
-      SOURCE_VFY=sha1:51430d14792419d8fa158c333f5a2d7a57628541
-        WEB_SITE=http://wireless.kernel.org
-	 ENTERED=20081216	
-         UPDATED=20081216
-           SHORT="show/manipulate wireless devices and their configuration"
-
-cat <<EOF
-show / manipulate wireless devices and their configuration
-EOF
diff --git a/wifi/wicd/BUILD b/wifi/wicd/BUILD
deleted file mode 100644
index 6494d92..0000000
--- a/wifi/wicd/BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-(
-  python setup.py configure &&
-  python setup.py build     &&
-  prepare_install           &&
-  python setup.py install
-
-
-) > $C_FIFO 2>&1
diff --git a/wifi/wicd/DEPENDS b/wifi/wicd/DEPENDS
deleted file mode 100644
index b767cb4..0000000
--- a/wifi/wicd/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends pygtk
-depends wpa_supplicant
diff --git a/wifi/wicd/DETAILS b/wifi/wicd/DETAILS
deleted file mode 100644
index fde8c9c..0000000
--- a/wifi/wicd/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
-     MODULE=wicd
-    VERSION=1.5.9
-     SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE_URL=$SFORGE_URL/$MODULE
- SOURCE_VFY=sha1:e8a03ab4d6d699576c954a962eb5b2392e623f51
-    WEBSITE=http://wicd.sourceforge.net
-    ENTERED=20090309
-    UPDATED=20090309
-      SHORT="wireless/wired internet connection daemon"
-
-cat << EOF
-wireless/wired interenet connection daemon
-EOF
diff --git a/wifi/wicd/init.d/wicd b/wifi/wicd/init.d/wicd
deleted file mode 100755
index c2fd136..0000000
--- a/wifi/wicd/init.d/wicd
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-#
-# Startup script for wicd
-#
-# chkconfig:	345 99 01
-#
-# description:	wicd wireless/wired internet connection daemon
-#
-# processname:	wicd
-# pidfile: /var/run/wicd/wicd.pid
-#
-
-. /lib/lsb/init-functions $1
diff --git a/x11-utils/virtualbox/BUILD b/x11-utils/virtualbox/BUILD
index 2487fb0..1300fdf 100644
--- a/x11-utils/virtualbox/BUILD
+++ b/x11-utils/virtualbox/BUILD
@@ -1,4 +1,5 @@
 (
+
   #lets disable qt3
   sedit s at WITH_QT3=1 at WITH_QT3=0@ configure &&
 
diff --git a/x11/fglrx/DEPENDS b/x11/fglrx/DEPENDS
index 55fc75c..b6c17f4 100644
--- a/x11/fglrx/DEPENDS
+++ b/x11/fglrx/DEPENDS
@@ -1,2 +1 @@
 depends libstdc++5
-depends xrandr
diff --git a/x11/fglrx/DETAILS b/x11/fglrx/DETAILS
index 9f44316..261cdac 100644
--- a/x11/fglrx/DETAILS
+++ b/x11/fglrx/DETAILS
@@ -8,7 +8,6 @@
          UPDATED=20090222
          LICENSE="proprietary"
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
-
 cat << EOF
 Proprietary X.Org driver for AMD ATI Radeon GPUs:
 9500 and later (also mobility)
diff --git a/x11/fglrx/DETAILS.x86_64 b/x11/fglrx/DETAILS.x86_64
index 1d9e391..287bf04 100644
--- a/x11/fglrx/DETAILS.x86_64
+++ b/x11/fglrx/DETAILS.x86_64
@@ -8,7 +8,6 @@
          UPDATED=20090222
          LICENSE="proprietary"
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
-
 cat << EOF
 Proprietary X.Org driver for the AMD ATI Radeon GPUs:
 9500 and later (also mobility)
diff --git a/xfce4/apps/Terminal/BUILD b/xfce4/apps/Terminal/BUILD
deleted file mode 100644
index 3a073f3..0000000
--- a/xfce4/apps/Terminal/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-
-(
-  [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
-
-  # make sure proper PKG_CONFIG_PATH is set
-  export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
-
-  ./autogen.sh --build=$BUILD             \
-               --prefix=${MODULE_PREFIX}  \
-               $OPTS                     &&
-
-  default_make
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/apps/Terminal/DETAILS b/xfce4/apps/Terminal/DETAILS
index 6f8e2cd..e50faaf 100644
--- a/xfce4/apps/Terminal/DETAILS
+++ b/xfce4/apps/Terminal/DETAILS
@@ -1,13 +1,12 @@
           MODULE=Terminal
-             MOD=terminal
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MOD/trunk:$MOD
+         VERSION=0.2.10
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-4.6.0/src/
+      SOURCE_VFY=sha1:c0f0c3cb9a924e98449e29e17ec8aecef1ee6c32
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.os-cillation.com/
          ENTERED=20040930
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="vte based/gtk+-2 lightweight X-terminal"
 
 cat << EOF
diff --git a/xfce4/apps/mousepad/BUILD b/xfce4/apps/mousepad/BUILD
index 908d260..725cd2f 100644
--- a/xfce4/apps/mousepad/BUILD
+++ b/xfce4/apps/mousepad/BUILD
@@ -4,7 +4,7 @@
   # make sure proper PKG_CONFIG_PATH is set
   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-  ./autogen.sh --build=$BUILD                                   \
+  ./configure  --build=$BUILD                                   \
                --prefix=${MODULE_PREFIX}       \
                $OPTS                                           &&
 
diff --git a/xfce4/apps/mousepad/DETAILS b/xfce4/apps/mousepad/DETAILS
index f7cb2ce..d622f36 100644
--- a/xfce4/apps/mousepad/DETAILS
+++ b/xfce4/apps/mousepad/DETAILS
@@ -1,19 +1,13 @@
           MODULE=mousepad
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE          
-     #SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MOD
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/branches/nick_0_3:$MODULE
+         VERSION=0.2.16
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-4.6.0/src/
+      SOURCE_VFY=sha1:4e63033e0a71578f3ec9a0d2e6a505efd0424ef9
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://www.xfce.org
+        WEB_SITE=http://erikharrison.net/
          ENTERED=20050218
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Lighweight xfce text editor"
 cat << EOF
 Mousepad is an Xfce port of leafpad, the minimal gtk+-2 text editor.
-
-the svn branch is the one from Nick Schermer, slightly more advanced
-than the trunk branch
-If you want the trunk version, uncomment the other sourceurl, comment
-the nick sourceurl and delete /var/spool/lunar/mousepad-svn*.tar.bz2
 EOF
diff --git a/xfce4/apps/orage/BUILD b/xfce4/apps/orage/BUILD
index 8d3380a..4486026 100644
--- a/xfce4/apps/orage/BUILD
+++ b/xfce4/apps/orage/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
    default_make
diff --git a/xfce4/apps/orage/DEPENDS b/xfce4/apps/orage/DEPENDS
index ee5884e..500db30 100644
--- a/xfce4/apps/orage/DEPENDS
+++ b/xfce4/apps/orage/DEPENDS
@@ -1,2 +1 @@
-depends xfconf
 depends libxfcegui4
diff --git a/xfce4/apps/orage/DETAILS b/xfce4/apps/orage/DETAILS
index c5c2552..24c7a9a 100644
--- a/xfce4/apps/orage/DETAILS
+++ b/xfce4/apps/orage/DETAILS
@@ -1,15 +1,14 @@
           MODULE=orage
-             MOD=xfcalendar
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MOD/trunk:$MOD
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:99839642fcb76d9583ced2752e5505ce12196c17
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20031222
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Calendar utility for Xfce4"
 
 cat << EOF
-orage -- Small calendar utility for the Xfce4 Desktop Environment.
+xfcalendar -- Small calendar utility for the Xfce4 Desktop Environment.
 EOF
diff --git a/xfce4/apps/ristretto/BUILD b/xfce4/apps/ristretto/BUILD
index 204ab3d..1776fd6 100644
--- a/xfce4/apps/ristretto/BUILD
+++ b/xfce4/apps/ristretto/BUILD
@@ -6,10 +6,4 @@
 
    default_build
 
-   ./autogen.sh --build=$BUILD                                  \
-                --prefix=${MODULE_PREFIX}      \
-                $OPTS                                           &&
-
-   default_make
-
 ) > $C_FIFO 2>&1
diff --git a/xfce4/apps/ristretto/DETAILS b/xfce4/apps/ristretto/DETAILS
index 3eeea5f..995f126 100644
--- a/xfce4/apps/ristretto/DETAILS
+++ b/xfce4/apps/ristretto/DETAILS
@@ -1,8 +1,8 @@
           MODULE=ristretto
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/goodies/$MODULE/trunk:$MODULE
+         VERSION=0.0.16
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=http://goodies.xfce.org/releases/$MODULE/
+      SOURCE_VFY=sha1:9aa17a466cdbb0f0ea1a1e5f7f162e5d767f9095
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://goodies.xfce.org/projects/applications/ristretto
          ENTERED=20070826
diff --git a/xfce4/apps/squeeze/BUILD b/xfce4/apps/squeeze/BUILD
index 908d260..725cd2f 100644
--- a/xfce4/apps/squeeze/BUILD
+++ b/xfce4/apps/squeeze/BUILD
@@ -4,7 +4,7 @@
   # make sure proper PKG_CONFIG_PATH is set
   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-  ./autogen.sh --build=$BUILD                                   \
+  ./configure  --build=$BUILD                                   \
                --prefix=${MODULE_PREFIX}       \
                $OPTS                                           &&
 
diff --git a/xfce4/apps/squeeze/DETAILS b/xfce4/apps/squeeze/DETAILS
index d806b6a..05c1a86 100644
--- a/xfce4/apps/squeeze/DETAILS
+++ b/xfce4/apps/squeeze/DETAILS
@@ -1,12 +1,12 @@
           MODULE=squeeze
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=0.2.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://squeeze.xfce.org/downloads/
+      SOURCE_VFY=sha1:d19e218387e646594e93dee29f4c9d91c4b0b2da
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://squeeze.xfce.org
          ENTERED=20070129
-         UPDATED=20071207
+         UPDATED=20080104
            SHORT="Archive manager"
 
 cat << EOF
diff --git a/xfce4/apps/xarchiver/DETAILS b/xfce4/apps/xarchiver/DETAILS
index 3166aad..f88d146 100644
--- a/xfce4/apps/xarchiver/DETAILS
+++ b/xfce4/apps/xarchiver/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xarchiver
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=0.4.6
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$SFORGE_URL/$MODULE/
+      SOURCE_VFY=sha1:db80abdebf3396ded3cf8d2224e88c987a2d9c32
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://xarchiver.xfce.org/
          ENTERED=20060407
-         UPDATED=20071207
+         UPDATED=20070106
            SHORT="simple archive manager"
 
 cat << EOF
diff --git a/xfce4/apps/xfburn/BUILD b/xfce4/apps/xfburn/BUILD
deleted file mode 100644
index 3a073f3..0000000
--- a/xfce4/apps/xfburn/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-
-(
-  [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
-
-  # make sure proper PKG_CONFIG_PATH is set
-  export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
-
-  ./autogen.sh --build=$BUILD             \
-               --prefix=${MODULE_PREFIX}  \
-               $OPTS                     &&
-
-  default_make
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/apps/xfburn/DETAILS b/xfce4/apps/xfburn/DETAILS
index 4fcee28..f6c1786 100644
--- a/xfce4/apps/xfburn/DETAILS
+++ b/xfce4/apps/xfburn/DETAILS
@@ -1,11 +1,14 @@
           MODULE=xfburn
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE      
-      SOURCE_URL=svn+http://svn.xfce.org/svn/goodies/$MODULE/trunk:$MODULE
-        WEB_SITE=http://www.xfce.org
-         ENTERED=20051012
-         UPDATED=20071207
-           SHORT="The long awaited burn application for Xfce"
+         VERSION=0.4.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://goodies.xfce.org/releases/$MODULE
+      SOURCE_VFY=sha1:7086fcdb2fa2c1b634cf64a9eef704656e774c26
+   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
+        WEB_SITE=http://goodies.xfce.org/projects/applications/xfburn
+         ENTERED=20090227
+         UPDATED=20090227
+           SHORT="Cd burning application for Xfce"
 cat << EOF
-The long awaited burn application for Xfce
+Cd burning application for Xfce
+EOF
+
diff --git a/xfce4/apps/xfce4-appfinder/BUILD b/xfce4/apps/xfce4-appfinder/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/apps/xfce4-appfinder/BUILD
+++ b/xfce4/apps/xfce4-appfinder/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/apps/xfce4-appfinder/DETAILS b/xfce4/apps/xfce4-appfinder/DETAILS
index 1384841..716268f 100644
--- a/xfce4/apps/xfce4-appfinder/DETAILS
+++ b/xfce4/apps/xfce4-appfinder/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce4-appfinder
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.4.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:1ed442bca3fc8bc4c4f14aad0ec1573fbf4bd061
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20041003
-         UPDATED=20071207
+         UPDATED=20071204
            SHORT="Easy search available applications"
 cat << EOF
 A tool to quickly locate and use applications available programs.
diff --git a/xfce4/apps/xfce4-mixer/BUILD b/xfce4/apps/xfce4-mixer/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/apps/xfce4-mixer/BUILD
+++ b/xfce4/apps/xfce4-mixer/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/apps/xfce4-mixer/DEPENDS b/xfce4/apps/xfce4-mixer/DEPENDS
index cd380ed..ea491bb 100644
--- a/xfce4/apps/xfce4-mixer/DEPENDS
+++ b/xfce4/apps/xfce4-mixer/DEPENDS
@@ -1,3 +1,2 @@
 depends xfce4-panel
 depends gst-plugins-base
-optional_depends alsa-lib "--with-sound=alsa" "--with-sound=oss" "to use alsa instead of oss"
diff --git a/xfce4/apps/xfce4-mixer/DETAILS b/xfce4/apps/xfce4-mixer/DETAILS
index 327df05..28362f6 100644
--- a/xfce4/apps/xfce4-mixer/DETAILS
+++ b/xfce4/apps/xfce4-mixer/DETAILS
@@ -1,14 +1,13 @@
           MODULE=xfce4-mixer
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:ebcbc2cefbd6f0a24c339d61bdb138e2bbe1335c
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Volume control and mixer for the Xfce4 panel"
-
 cat << EOF
 xfce4-mixer -- Volume control plugin and mixer for the Xfce4 panel.
 EOF
diff --git a/xfce4/apps/xfmedia/BUILD b/xfce4/apps/xfmedia/BUILD
index 95cd8a2..5550ba1 100644
--- a/xfce4/apps/xfmedia/BUILD
+++ b/xfce4/apps/xfmedia/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                  \
+   ./configure  --build=$BUILD                                  \
                 --prefix=${MODULE_PREFIX}      \
                 $OPTS                                           &&
 
diff --git a/xfce4/apps/xfmedia/DETAILS b/xfce4/apps/xfmedia/DETAILS
index 76c661f..8c678ea 100644
--- a/xfce4/apps/xfmedia/DETAILS
+++ b/xfce4/apps/xfmedia/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfmedia
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=0.9.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://spuriousinterrupt.org/projects/xfmedia/files/
+      SOURCE_VFY=sha1:cb8d39f2a4ee6a6164f722162fa45004770a7605
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://spuriousinterrupt.org/projects/xfmedia
          ENTERED=20041029
-         UPDATED=20071207
+         UPDATED=20061124
            SHORT="Xfce media player"
 cat << EOF
 Xfce media player. Uses Xine to play video streams! Still in development.
diff --git a/xfce4/apps/xfprint/BUILD b/xfce4/apps/xfprint/BUILD
index 95cd8a2..12e8e69 100644
--- a/xfce4/apps/xfprint/BUILD
+++ b/xfce4/apps/xfprint/BUILD
@@ -4,8 +4,8 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                  \
-                --prefix=${MODULE_PREFIX}      \
+   ./configure  --build=$BUILD                                        \
+                --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
    default_make
diff --git a/xfce4/apps/xfprint/DETAILS b/xfce4/apps/xfprint/DETAILS
index 2d607ff..8a5aaef 100644
--- a/xfce4/apps/xfprint/DETAILS
+++ b/xfce4/apps/xfprint/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfprint
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:28bd6c8ff46eb0193647d1cd1a13d970a18e599b
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Printer dialog for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/Thunar/BUILD b/xfce4/core/Thunar/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/core/Thunar/BUILD
+++ b/xfce4/core/Thunar/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/core/Thunar/DETAILS b/xfce4/core/Thunar/DETAILS
index 4a9d2ec..c7c9a08 100644
--- a/xfce4/core/Thunar/DETAILS
+++ b/xfce4/core/Thunar/DETAILS
@@ -1,13 +1,12 @@
           MODULE=Thunar
-             MOD=thunar
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MOD.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD          
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MOD/trunk:$MOD
+         VERSION=1.0.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-4.6.0/src/
+      SOURCE_VFY=sha1:581594eb4bfe4db49244773ee3abeaaf136a0e0f
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://thunar.xfce.org/
          ENTERED=20060407
-         UPDATED=20071207
+         UPDATED=20090223
            SHORT="File manager for xfce"
 
 cat << EOF
diff --git a/xfce4/core/exo/BUILD b/xfce4/core/exo/BUILD
deleted file mode 100644
index 15f96e8..0000000
--- a/xfce4/core/exo/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
-
-   # make sure proper PKG_CONFIG_PATH is set
-   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
-
-   ./autogen.sh --build=$BUILD                                        \
-                --prefix=${MODULE_PREFIX}        \
-                $OPTS                                           &&
-
-   default_make
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/core/exo/DETAILS b/xfce4/core/exo/DETAILS
index 5a0fbec..f1a1347 100644
--- a/xfce4/core/exo/DETAILS
+++ b/xfce4/core/exo/DETAILS
@@ -1,13 +1,12 @@
           MODULE=exo
-	  MOD=libexo
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MOD.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD          
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MOD/trunk:$MOD
+         VERSION=0.3.100
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-4.6.0/src/
+      SOURCE_VFY=sha1:987262654d23e0da359d434cc29f0b64ad06a733
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://libexo.os-cillation.com/
          ENTERED=20040930
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="the Xfce extension library"
 cat << EOF
 libexo is a library for Xfce that contain additional widgets and a
diff --git a/xfce4/core/libxfce4menu/BUILD b/xfce4/core/libxfce4menu/BUILD
deleted file mode 100644
index 37dd2af..0000000
--- a/xfce4/core/libxfce4menu/BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-(
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
-
-   ./autogen.sh --build=$BUILD                              \
-                --prefix=${MODULE_PREFIX}  \
-                $OPTS                                       &&
-
-   default_make
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfce4menu/DETAILS b/xfce4/core/libxfce4menu/DETAILS
index cc684f8..c00cdea 100644
--- a/xfce4/core/libxfce4menu/DETAILS
+++ b/xfce4/core/libxfce4menu/DETAILS
@@ -1,12 +1,15 @@
-          MODULE=libxfce4menu
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
-   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://www.xfce.org/
-         ENTERED=20030715
-         UPDATED=20071207
-           SHORT="the menu library for Xfce4"
+        MODULE=libxfce4menu
+       VERSION=4.6.0
+        SOURCE=$MODULE-$VERSION.tar.bz2
+    SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+    SOURCE_VFY=sha1:4143eae2871ee072b9805a1f506c7f10525f2f28
+ MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
+      WEB_SITE=http://www.xfce.org
+       ENTERED=20090227
+       UPDATED=20090227
+         SHORT="menu library for Xfce"
+
 cat << EOF
+menu library for Xfce
 EOF
+
diff --git a/xfce4/core/libxfce4util/BUILD b/xfce4/core/libxfce4util/BUILD
index 37dd2af..94d8102 100644
--- a/xfce4/core/libxfce4util/BUILD
+++ b/xfce4/core/libxfce4util/BUILD
@@ -1,7 +1,7 @@
 (
    [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
-   ./autogen.sh --build=$BUILD                              \
+   ./configure  --build=$BUILD                              \
                 --prefix=${MODULE_PREFIX}  \
                 $OPTS                                       &&
 
diff --git a/xfce4/core/libxfce4util/DEPENDS b/xfce4/core/libxfce4util/DEPENDS
index f0a56ab..87c9410 100644
--- a/xfce4/core/libxfce4util/DEPENDS
+++ b/xfce4/core/libxfce4util/DEPENDS
@@ -1,3 +1 @@
 depends  glib-2
-depends  xfce4-dev-tools
-depends  gtk-doc
diff --git a/xfce4/core/libxfce4util/DETAILS b/xfce4/core/libxfce4util/DETAILS
index 31122a4..be2f4fd 100644
--- a/xfce4/core/libxfce4util/DETAILS
+++ b/xfce4/core/libxfce4util/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libxfce4util
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:b4d17be26f965ac0f898b53c691a992efe54b195
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org/
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="a utility library for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/libxfce4util/POST_INSTALL b/xfce4/core/libxfce4util/POST_INSTALL
new file mode 100644
index 0000000..7c16f06
--- /dev/null
+++ b/xfce4/core/libxfce4util/POST_INSTALL
@@ -0,0 +1,10 @@
+if [ -n "$XFCE4_PREFIX" ]; then
+  sedit "s?/usr?$XFCE4_PREFIX?" /etc/profile.d/xfce4.rc
+fi
+
+XFCE4LIBDIR=${XFCE4_PREFIX:-/usr}/lib
+if ! grep -q "$XFCE4LIBDIR" /etc/ld.so.conf ; then
+    echo "$XFCE4LIBDIR" >> /etc/ld.so.conf
+    ldconfig
+fi
+
diff --git a/xfce4/core/libxfce4util/profile.d/xfce4.rc b/xfce4/core/libxfce4util/profile.d/xfce4.rc
new file mode 100755
index 0000000..031e535
--- /dev/null
+++ b/xfce4/core/libxfce4util/profile.d/xfce4.rc
@@ -0,0 +1,4 @@
+PATH=$PATH:/usr/bin
+PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH
+
+export PATH PKG_CONFIG_PATH
diff --git a/xfce4/core/libxfcegui4/BUILD b/xfce4/core/libxfcegui4/BUILD
index 0847398..b695eac 100644
--- a/xfce4/core/libxfcegui4/BUILD
+++ b/xfce4/core/libxfcegui4/BUILD
@@ -4,10 +4,9 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 --enable-xinerama                                \
-                --enable-libglade \
                 $OPTS                                           &&
 
    default_make
diff --git a/xfce4/core/libxfcegui4/DEPENDS b/xfce4/core/libxfcegui4/DEPENDS
index fe37ef9..2a855c9 100644
--- a/xfce4/core/libxfcegui4/DEPENDS
+++ b/xfce4/core/libxfcegui4/DEPENDS
@@ -1,9 +1,8 @@
-depends gtk+-2
-depends libxml2
-depends libxfce4util
-depends libglade
-depends xfconf
-depends libglade
+depends  gtk+-2
+depends  libxml2
+depends  libxfce4util
+depends  xfconf
+depends  libglade
 
 # not real depends, but we really want them
 depends  gtk-xfce-engine
diff --git a/xfce4/core/libxfcegui4/DETAILS b/xfce4/core/libxfcegui4/DETAILS
index 0f0568e..8204469 100644
--- a/xfce4/core/libxfcegui4/DETAILS
+++ b/xfce4/core/libxfcegui4/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libxfcegui4
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:d8a3e86f90ad026c4a9fa369c9c3f6d4f3f6fd06
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Widget library for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfce-utils/BUILD b/xfce4/core/xfce-utils/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/core/xfce-utils/BUILD
+++ b/xfce4/core/xfce-utils/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/core/xfce-utils/DEPENDS b/xfce4/core/xfce-utils/DEPENDS
index f17975c..c5f480e 100644
--- a/xfce4/core/xfce-utils/DEPENDS
+++ b/xfce4/core/xfce-utils/DEPENDS
@@ -1,4 +1,3 @@
-depends xfconf
-depends libxfcegui4
 depends xfce4-dev-tools
 depends libxfce4util
+depends libxfcegui4
diff --git a/xfce4/core/xfce-utils/DETAILS b/xfce4/core/xfce-utils/DETAILS
index 345026d..5545cbb 100644
--- a/xfce4/core/xfce-utils/DETAILS
+++ b/xfce4/core/xfce-utils/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce-utils
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:2ca9480f9a12ab4e584e27bc3d9e99ec1fab1041
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Essential utilities for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfce4-dev-tools/BUILD b/xfce4/core/xfce4-dev-tools/BUILD
index 37dd2af..94d8102 100644
--- a/xfce4/core/xfce4-dev-tools/BUILD
+++ b/xfce4/core/xfce4-dev-tools/BUILD
@@ -1,7 +1,7 @@
 (
    [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
-   ./autogen.sh --build=$BUILD                              \
+   ./configure  --build=$BUILD                              \
                 --prefix=${MODULE_PREFIX}  \
                 $OPTS                                       &&
 
diff --git a/xfce4/core/xfce4-dev-tools/DETAILS b/xfce4/core/xfce4-dev-tools/DETAILS
index 7a5acd0..798ee1a 100644
--- a/xfce4/core/xfce4-dev-tools/DETAILS
+++ b/xfce4/core/xfce4-dev-tools/DETAILS
@@ -1,13 +1,13 @@
           MODULE=xfce4-dev-tools
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:a5a5cbc9e5f84f4939e53e3327c51f4b749c38a2
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org/
          ENTERED=20030715
-         UPDATED=20071207
-           SHORT="a utility library for Xfce4"
+         UPDATED=20090227
+           SHORT="developer tools for Xfce4"
 cat << EOF
 The Xfce development tools are a collection of tools and macros for
 Xfce developers and people that want to build Xfce from SVN. In addition
diff --git a/xfce4/core/xfce4-dev-tools/POST_INSTALL b/xfce4/core/xfce4-dev-tools/POST_INSTALL
deleted file mode 100644
index 7c16f06..0000000
--- a/xfce4/core/xfce4-dev-tools/POST_INSTALL
+++ /dev/null
@@ -1,10 +0,0 @@
-if [ -n "$XFCE4_PREFIX" ]; then
-  sedit "s?/usr?$XFCE4_PREFIX?" /etc/profile.d/xfce4.rc
-fi
-
-XFCE4LIBDIR=${XFCE4_PREFIX:-/usr}/lib
-if ! grep -q "$XFCE4LIBDIR" /etc/ld.so.conf ; then
-    echo "$XFCE4LIBDIR" >> /etc/ld.so.conf
-    ldconfig
-fi
-
diff --git a/xfce4/core/xfce4-dev-tools/profile.d/xfce4.rc b/xfce4/core/xfce4-dev-tools/profile.d/xfce4.rc
deleted file mode 100755
index 031e535..0000000
--- a/xfce4/core/xfce4-dev-tools/profile.d/xfce4.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=$PATH:/usr/bin
-PKG_CONFIG_PATH=/usr/lib/pkgconfig:$PKG_CONFIG_PATH
-
-export PATH PKG_CONFIG_PATH
diff --git a/xfce4/core/xfce4-panel/BUILD b/xfce4/core/xfce4-panel/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/core/xfce4-panel/BUILD
+++ b/xfce4/core/xfce4-panel/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/core/xfce4-panel/DEPENDS b/xfce4/core/xfce4-panel/DEPENDS
index dccab87..0016747 100644
--- a/xfce4/core/xfce4-panel/DEPENDS
+++ b/xfce4/core/xfce4-panel/DEPENDS
@@ -1,2 +1 @@
-depends  exo
 depends libxfce4util
diff --git a/xfce4/core/xfce4-panel/DETAILS b/xfce4/core/xfce4-panel/DETAILS
index fced832..14fbcf6 100644
--- a/xfce4/core/xfce4-panel/DETAILS
+++ b/xfce4/core/xfce4-panel/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce4-panel
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:d63849e76cd65eefde01ac5a23a96df66d8a39db
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Xfce4 panel"
 
 cat << EOF
diff --git a/xfce4/core/xfce4-session/BUILD b/xfce4/core/xfce4-session/BUILD
index 61b5f10..bbfe5e0 100644
--- a/xfce4/core/xfce4-session/BUILD
+++ b/xfce4/core/xfce4-session/BUILD
@@ -1,6 +1,4 @@
 (
-
-#   patch_it $SOURCE2 1 &&
    [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
    # make sure proper PKG_CONFIG_PATH is set
@@ -8,7 +6,7 @@
 
    PATH="$PATH:/usr/X11/bin"
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/core/xfce4-session/DETAILS b/xfce4/core/xfce4-session/DETAILS
index 06b1aa9..8c002c7 100644
--- a/xfce4/core/xfce4-session/DETAILS
+++ b/xfce4/core/xfce4-session/DETAILS
@@ -1,14 +1,13 @@
           MODULE=xfce4-session
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-          #SOURCE2=fast_xfce.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
-      #SOURCE2_URL=http://merlin.ugent.be/lunar/patches
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:3865e36b691802d74b3e86aaa4a3bb2ceff838da
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
          UPDATED=20090227
+           PSAFE=no
            SHORT="Session manager for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfce4-settings/BUILD b/xfce4/core/xfce4-settings/BUILD
deleted file mode 100644
index 5e5fa3e..0000000
--- a/xfce4/core/xfce4-settings/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
-
-   # make sure proper PKG_CONFIG_PATH is set
-   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
-
-   ./autogen.sh --build=$BUILD                                        \
-                --prefix=${MODULE_PREFIX}        \
-                $OPTS                                           &&
-
-   default_make
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-settings/DEPENDS b/xfce4/core/xfce4-settings/DEPENDS
index 0cc56b4..19165eb 100644
--- a/xfce4/core/xfce4-settings/DEPENDS
+++ b/xfce4/core/xfce4-settings/DEPENDS
@@ -1,4 +1,3 @@
-depends libxfcegui4
 depends exo
 depends gnome-icon-theme
 optional_depends libxklavier "" "" "to enable the keyboard layout switcher"
diff --git a/xfce4/core/xfce4-settings/DETAILS b/xfce4/core/xfce4-settings/DETAILS
index 4c1c61c..1a03039 100644
--- a/xfce4/core/xfce4-settings/DETAILS
+++ b/xfce4/core/xfce4-settings/DETAILS
@@ -1,14 +1,14 @@
           MODULE=xfce4-settings
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:76b256aa77269e0b2b056a806106a0313629d1b6
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
-         ENTERED=20080705
-         UPDATED=20080705
-           SHORT="Something that does something"
+         ENTERED=20090227
+         UPDATED=20090227
+           SHORT="Xfce settings manager"
 
 cat << EOF
-Something that does that other thing
 EOF
+
diff --git a/xfce4/core/xfconf/BUILD b/xfce4/core/xfconf/BUILD
deleted file mode 100644
index 5e5fa3e..0000000
--- a/xfce4/core/xfconf/BUILD
+++ /dev/null
@@ -1,14 +0,0 @@
-(
-
-   [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
-
-   # make sure proper PKG_CONFIG_PATH is set
-   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
-
-   ./autogen.sh --build=$BUILD                                        \
-                --prefix=${MODULE_PREFIX}        \
-                $OPTS                                           &&
-
-   default_make
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfconf/DETAILS b/xfce4/core/xfconf/DETAILS
index 17f98c6..f4d51af 100644
--- a/xfce4/core/xfconf/DETAILS
+++ b/xfce4/core/xfconf/DETAILS
@@ -1,14 +1,15 @@
-          MODULE=xfconf
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
-   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://www.xfce.org
-         ENTERED=20080626
-         UPDATED=20080626
-           SHORT="Something that does something"
+        MODULE=xfconf
+       VERSION=4.6.0
+        SOURCE=$MODULE-$VERSION.tar.bz2
+    SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+    SOURCE_VFY=sha1:89aece9debe9ddd71493c1e4c99be2009562cba0
+ MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
+      WEB_SITE=http://www.xfce.org
+       ENTERED=20090227
+       UPDATED=20090227
+         SHORT="configuration system for Xfce"
 
 cat << EOF
-Something that does that other thing
+configuration storage system for Xfce
 EOF
+
diff --git a/xfce4/core/xfdesktop/BUILD b/xfce4/core/xfdesktop/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/core/xfdesktop/BUILD
+++ b/xfce4/core/xfdesktop/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/core/xfdesktop/DEPENDS b/xfce4/core/xfdesktop/DEPENDS
index ec6d557..b28b83a 100644
--- a/xfce4/core/xfdesktop/DEPENDS
+++ b/xfce4/core/xfdesktop/DEPENDS
@@ -1,5 +1,4 @@
 depends xfce4-panel
-depends libxfce4menu
 depends libxml2
-depends xfconf
+depends libxfce4menu
 optional_depends Thunar "" "" "for desktop file icon support"
diff --git a/xfce4/core/xfdesktop/DETAILS b/xfce4/core/xfdesktop/DETAILS
index 9acac98..2a162f5 100644
--- a/xfce4/core/xfdesktop/DETAILS
+++ b/xfce4/core/xfdesktop/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfdesktop
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+      SOURCE_VFY=sha1:11bd5312e13c78db125ffee1494c33e35e33d15a
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Desktop manager for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfwm4/BUILD b/xfce4/core/xfwm4/BUILD
index 6dbe632..e736288 100644
--- a/xfce4/core/xfwm4/BUILD
+++ b/xfce4/core/xfwm4/BUILD
@@ -5,7 +5,7 @@
   # make sure proper PKG_CONFIG_PATH is set
   export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-  ./autogen.sh --build=$BUILD             \
+  ./configure  --build=$BUILD             \
                --prefix=${MODULE_PREFIX}  \
                $OPTS                     &&
 
diff --git a/xfce4/core/xfwm4/DEPENDS b/xfce4/core/xfwm4/DEPENDS
index 2c346ab..9973ceb 100644
--- a/xfce4/core/xfwm4/DEPENDS
+++ b/xfce4/core/xfwm4/DEPENDS
@@ -1,6 +1,5 @@
-depends xfconf
 depends libwnck
-depends exo
 depends libxfce4util
 depends libxfcegui4
+depends xfconf
 depends startup-notification
diff --git a/xfce4/core/xfwm4/DETAILS b/xfce4/core/xfwm4/DETAILS
index fab5d6e..b0f7e33 100644
--- a/xfce4/core/xfwm4/DETAILS
+++ b/xfce4/core/xfwm4/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfwm4
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-     SOURCE_URL=svn+http://svn.xfce.org/svn/xfce/$MODULE/trunk:$MODULE
+         VERSION=4.6.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+     SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src/
+     SOURCE_VFY=sha1:da4b81c35759ff69ab7862b702db10bb0ee2af7e
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="Window manager for Xfce4"
 
 cat << EOF
diff --git a/xfce4/goodies/xfce4-taskmanager/BUILD b/xfce4/goodies/xfce4-taskmanager/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/goodies/xfce4-taskmanager/BUILD
+++ b/xfce4/goodies/xfce4-taskmanager/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/goodies/xfce4-taskmanager/DEPENDS b/xfce4/goodies/xfce4-taskmanager/DEPENDS
index 5834a03..741aa15 100644
--- a/xfce4/goodies/xfce4-taskmanager/DEPENDS
+++ b/xfce4/goodies/xfce4-taskmanager/DEPENDS
@@ -1,2 +1,2 @@
-depends libxfcegui4
+depends libxfcegui4  &&
 depends libxfce4util
diff --git a/xfce4/goodies/xfce4-taskmanager/DETAILS b/xfce4/goodies/xfce4-taskmanager/DETAILS
index ebe5f99..6cbe982 100644
--- a/xfce4/goodies/xfce4-taskmanager/DETAILS
+++ b/xfce4/goodies/xfce4-taskmanager/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce4-taskmanager
-         VERSION="svn-`date +%Y%U`"
+         VERSION=0.3.2
           SOURCE=$MODULE-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.xfce.org/svn/goodies/$MODULE/trunk:$MODULE
+      SOURCE_URL=http://goodies.xfce.org/releases/$MODULE/
+      SOURCE_VFY=sha1:a7cce962550f8c3669c3709db9f7f3a0c18c534d
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20061124
-         UPDATED=20071207
+         UPDATED=20070123
            SHORT="taskmanager for the Xfce Desktop Environment"
 
 cat << EOF
diff --git a/xfce4/goodies/xfce4-xkb-plugin/BUILD b/xfce4/goodies/xfce4-xkb-plugin/BUILD
index 15f96e8..12e8e69 100644
--- a/xfce4/goodies/xfce4-xkb-plugin/BUILD
+++ b/xfce4/goodies/xfce4-xkb-plugin/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   ./autogen.sh --build=$BUILD                                        \
+   ./configure  --build=$BUILD                                        \
                 --prefix=${MODULE_PREFIX}        \
                 $OPTS                                           &&
 
diff --git a/xfce4/goodies/xfce4-xkb-plugin/DETAILS b/xfce4/goodies/xfce4-xkb-plugin/DETAILS
index 313889a..ba04156 100644
--- a/xfce4/goodies/xfce4-xkb-plugin/DETAILS
+++ b/xfce4/goodies/xfce4-xkb-plugin/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce4-xkb-plugin
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE          
-      SOURCE_URL=svn+http://svn.xfce.org/svn/goodies/$MODULE/trunk:$MODULE 
+         VERSION=0.4.3
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://goodies.xfce.org/releases/$MODULE/
+      SOURCE_VFY=sha1:962f1fdc6b373fa5d8a886aaaa4d0fbb45c44234
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20061124
-         UPDATED=20081015
+         UPDATED=20070123
            SHORT="keyboard layout switcher"
 
 cat << EOF
diff --git a/xfce4/xfce4/DEPENDS b/xfce4/xfce4/DEPENDS
index 7ca6ca9..e1af4e4 100644
--- a/xfce4/xfce4/DEPENDS
+++ b/xfce4/xfce4/DEPENDS
@@ -6,6 +6,5 @@ depends xfce4-panel
 depends xfdesktop
 depends xfce4-session
 depends xfce4-icon-theme
-
 optional_depends Thunar "" "" "For the new xfce4 filemanager"
 optional_depends Terminal "" "" "For the new xfce4 xterm"
diff --git a/xfce4/xfce4/DETAILS b/xfce4/xfce4/DETAILS
index 05ed871..6516356 100644
--- a/xfce4/xfce4/DETAILS
+++ b/xfce4/xfce4/DETAILS
@@ -1,11 +1,11 @@
           MODULE=xfce4
-         VERSION="svn-`date +%Y%U`"
+         VERSION=4.6.0
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${MODULE}
         WEB_SITE=http://www.xfce.org
       MAINTAINER=jasper at lunar-linux.org
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090227
            SHORT="lightweight desktop environment based on GTK2"
          PROFILE=yes
 
diff --git a/xorg7/driver/xf86-video-mach64/BUILD b/xorg7/driver/xf86-video-mach64/BUILD
deleted file mode 100644
index cfe3408..0000000
--- a/xorg7/driver/xf86-video-mach64/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-(
-  . /etc/profile.d/x11r7.rc &&
-
-  default_build
-
-) > $C_FIFO 2>&1
diff --git a/xorg7/driver/xf86-video-mach64/CONFLICTS b/xorg7/driver/xf86-video-mach64/CONFLICTS
deleted file mode 100644
index 5013182..0000000
--- a/xorg7/driver/xf86-video-mach64/CONFLICTS
+++ /dev/null
@@ -1,6 +0,0 @@
-conflicts XOrg6  &&
-conflicts XOrg-test &&
-conflicts XOrg-fonts-base &&
-conflicts XOrg-fonts-extra &&
-conflicts XOrg-drm &&
-conflicts XOrg-drm-cvs
diff --git a/xorg7/driver/xf86-video-mach64/DEPENDS b/xorg7/driver/xf86-video-mach64/DEPENDS
deleted file mode 100644
index 514f37d..0000000
--- a/xorg7/driver/xf86-video-mach64/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends xorg-server 
-depends mesa-lib
diff --git a/xorg7/driver/xf86-video-mach64/DETAILS b/xorg7/driver/xf86-video-mach64/DETAILS
deleted file mode 100644
index 9510d35..0000000
--- a/xorg7/driver/xf86-video-mach64/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-          MODULE=xf86-video-mach64
-         VERSION=6.8.0
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$XORG_URL/individual/driver/
-      SOURCE_VFY=sha1:0f130aca927ede0fd3ed7876c52817a5ef9215bb
-   MODULE_PREFIX=${X11R7_PREFIX:-/usr}
-        WEB_SITE=http://www.x.org/
-         ENTERED=20080918
-         UPDATED=20080918
-           SHORT="the X.Org video driver for older ATI/Mach64 based cards"
-
-cat << EOF
-xf86-video-mach64 provides the X.Org video drivers for older the
-older ATI/Mach64 based video cards.
-
-This driver does not support newer ATI Rage or Radeon cards: see
-the xf86-video-ati and xf86-video-radeonhd modules.
-EOF
diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index 74b518c..3538870 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -8,19 +8,20 @@
     rm -f /usr/share/X11/xkb/compiled
   fi &&
 
-  if [[ "$USE_NVIDIA" = "y" ]]; then
-    OPTS="$OPTS --disable-glx --disable-glx-tlx"
-  fi &&
+#  if [[ "$USE_NVIDIA" = "y" ]]; then
+#    OPTS="$OPTS --disable-glx --disable-glx-tlx"
+#  fi &&
 
   OPTS+=" --enable-composite --enable-aiglx --enable-xorgcfg \
          --with-dri-driver-path=${MODULE_PREFIX}/lib/dri" &&
+         #--with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
 
-  default_build
+  default_build &&
 
   # This should not be needed, check in next release if still needed.
-  #  rm -fr /usr/share/X11/xkb/compiled &&
-  #  mkdir -p /var/lib/xkb &&
-  #  ln -sf /var/lib/xkb /usr/share/X11/xkb/compiled
+  rm -fr /usr/share/X11/xkb/compiled &&
+  mkdir -p /var/lib/xkb &&
+  ln -sf /var/lib/xkb /usr/share/X11/xkb/compiled
 
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/xorg-server/CONFIGURE b/xorg7/xorg-server/CONFIGURE
index 659c2db..7bf847c 100644
--- a/xorg7/xorg-server/CONFIGURE
+++ b/xorg7/xorg-server/CONFIGURE
@@ -1 +1 @@
-mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n
+#mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n
diff --git a/xorg7/xorg-server/PRE_BUILD b/xorg7/xorg-server/PRE_BUILD
new file mode 100644
index 0000000..3185795
--- /dev/null
+++ b/xorg7/xorg-server/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build         &&
+cd $SOURCE_DIRECTORY         
+#unpack $SOURCE2
diff --git a/zbeta/WebKit/BUILD b/zbeta/WebKit/BUILD
deleted file mode 100644
index c653306..0000000
--- a/zbeta/WebKit/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-  bad_flags linker &&
-
-  OPTS="$OPTS --enable-svg-experimental --enable-svg --enable-svg-animation \
-        --disable-svg-filters --enable-svg-fonts --enable-svg-foreign-object \
-	--enable-svg-as-image --enable-svg-use-element"
-
-
-  default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/WebKit/DEPENDS b/zbeta/WebKit/DEPENDS
deleted file mode 100644
index e766997..0000000
--- a/zbeta/WebKit/DEPENDS
+++ /dev/null
@@ -1,17 +0,0 @@
-depends gtk+-2
-depends icu4c
-depends gperf
-depends libxslt
-depends sqlite
-depends jpeg
-depends libpng
-depends freetype2
-
-optional_depends libproxy "" "" "if you don't want GConf"
-optional_depends GConf "" "--without-gnome" "GConf"
-
-optional_depends gst-plugins-good "--enable-video" "" "Enable video support?"
-
-depends libsoup
-
-#optional_depends curl "--with-http-backend=curl" "" "Build with curl http backend? (Say N if you said Y to libsoup)"
diff --git a/zbeta/airconfig-svn/BUILD b/zbeta/airconfig-svn/BUILD
index e62f919..e96291e 100644
--- a/zbeta/airconfig-svn/BUILD
+++ b/zbeta/airconfig-svn/BUILD
@@ -4,7 +4,7 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   OPTS="$OPTS  --disable-gtk-doc --prefix=/usr --enable-debug=yes"
+   OPTS="$OPTS  --disable-gtk-doc"
 
    touch INSTALL  &&
 
diff --git a/zbeta/arora-git/BUILD b/zbeta/arora-git/BUILD
deleted file mode 100644
index 3e2bfa8..0000000
--- a/zbeta/arora-git/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-
-  . /etc/profile.d/qt4.rc
-
-  qmake &&
-
-  default_make &&
-
-  install -m0755 $SOURCE_DIRECTORY/arora /usr/bin/
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/arora-git/DEPENDS b/zbeta/arora-git/DEPENDS
deleted file mode 100644
index 428f269..0000000
--- a/zbeta/arora-git/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends qt4
diff --git a/zbeta/arora-git/DETAILS b/zbeta/arora-git/DETAILS
deleted file mode 100644
index a53a63c..0000000
--- a/zbeta/arora-git/DETAILS
+++ /dev/null
@@ -1,10 +0,0 @@
-          MODULE=arora-git
-         VERSION=beta
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=git://github.com/icefox/arora.git
-        WEB_SITE=http://code.google.com/p/arora/
-         ENTERED=20080519
-         UPDATED=20080519
-           SHORT=""
-cat << EOF
-EOF
diff --git a/zbeta/e17/eina-svn/profile.d/e17-cvs.rc b/zbeta/e17/eina-svn/profile.d/e17-cvs.rc
deleted file mode 100644
index 26a04cd..0000000
--- a/zbeta/e17/eina-svn/profile.d/e17-cvs.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=${PATH}:/opt/lunar/enlightenment/bin
-PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/lunar/enlightenment/lib/pkgconfig
-
-export PATH PKG_CONFIG_PATH
diff --git a/zbeta/e17/emphasis-svn/BUILD b/zbeta/e17/emphasis-svn/BUILD
deleted file mode 100644
index 46c8c34..0000000
--- a/zbeta/e17/emphasis-svn/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-  export PATH=$MODULE_PREFIX/bin:$PATH
-  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
-  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
-  export USER=nobody
-
-  OPTS="$OPTS --with-profile=FAST_PC"
-
-  default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/e17/emphasis-svn/DEPENDS b/zbeta/e17/emphasis-svn/DEPENDS
deleted file mode 100644
index 5448d7e..0000000
--- a/zbeta/e17/emphasis-svn/DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-depends  ecore-svn
-depends  etk-svn
-depends  enhance-svn
-depends  libmpd
-depends  libxml
diff --git a/zbeta/e17/emphasis-svn/DETAILS b/zbeta/e17/emphasis-svn/DETAILS
deleted file mode 100644
index 2c32ba6..0000000
--- a/zbeta/e17/emphasis-svn/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=emphasis-svn
-         VERSION=beta
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/emphasis
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-        WEB_SITE="http://emphasis.tuxfamily.org"
-         ENTERED=20081103
-         UPDATED=`date -u +%Y%m%d`
-   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
-           SHORT="e mpd client"
-
-cat <<EOF
-An ETK-based MPD client.
-EOF
diff --git a/zbeta/e17/enhance-svn/BUILD b/zbeta/e17/enhance-svn/BUILD
deleted file mode 100644
index 46c8c34..0000000
--- a/zbeta/e17/enhance-svn/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-  export PATH=$MODULE_PREFIX/bin:$PATH
-  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
-  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
-  export USER=nobody
-
-  OPTS="$OPTS --with-profile=FAST_PC"
-
-  default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/e17/enhance-svn/DEPENDS b/zbeta/e17/enhance-svn/DEPENDS
deleted file mode 100644
index 8b13789..0000000
--- a/zbeta/e17/enhance-svn/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/zbeta/e17/enhance-svn/DETAILS b/zbeta/e17/enhance-svn/DETAILS
deleted file mode 100644
index d3a757e..0000000
--- a/zbeta/e17/enhance-svn/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=enhance-svn
-         VERSION=beta
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/enhance
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-        WEB_SITE="http://enlightenment.org"
-         ENTERED=20081103
-         UPDATED=`date -u +%Y%m%d`
-   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
-           SHORT="glade stuff"
-
-cat <<EOF
-Enhance is used to create GUIs from Glade's XMLs and EXML on runtime.
-EOF
diff --git a/zbeta/e17/enna-svn/BUILD b/zbeta/e17/enna-svn/BUILD
deleted file mode 100644
index 46c8c34..0000000
--- a/zbeta/e17/enna-svn/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-(
-  export PATH=$MODULE_PREFIX/bin:$PATH
-  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
-  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
-  export USER=nobody
-
-  OPTS="$OPTS --with-profile=FAST_PC"
-
-  default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/e17/enna-svn/DEPENDS b/zbeta/e17/enna-svn/DEPENDS
deleted file mode 100644
index a5729e5..0000000
--- a/zbeta/e17/enna-svn/DEPENDS
+++ /dev/null
@@ -1,28 +0,0 @@
-optional_depends  "curl"              \
-                  "--enable-libcurl"  \
-		  "--disable-libcurl" \
-		  "for curl support"
-
-optional_depends  "libxml2"           \
-                  "--enable-libxml2"  \
-		  "--disable-libxml2" \
-		  "for libxml2 support"
-
-optional_depends  "emotion-svn"               \
-                  "--enable-emotion-backend"  \
-		  "--disable-emotion-backend" \
-		  "for optional playback with Emotion"
-
-optional_depends  "libplayer-hg"                \
-                  "--enable-libplayer-backend"  \
-		  "--disable-libplayer-backend" \
-		  "for the libplayer A/V backend"
-
-optional_depends  "lirc"       \
-                  ""           \
-		  ""           \
-		  "for LIRC support"
-
-
-# Just a reminder for Light Media Scanner to be eventually included one day :-)
-# optional_depends "liblms"
diff --git a/zbeta/e17/enna-svn/DETAILS b/zbeta/e17/enna-svn/DETAILS
deleted file mode 100644
index 8b9f07a..0000000
--- a/zbeta/e17/enna-svn/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=enna-svn
-         VERSION=beta
-          SOURCE=$MODULE.tar.bz2
-      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/MISC/enna
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-        WEB_SITE="http://exchange.enlightenment.org/application/show/164"
-         ENTERED=20081103
-         UPDATED=`date -u +%Y%m%d`
-   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
-           SHORT="multimedia-center-thingy for E"
-cat <<EOF
-
-
-EOF
diff --git a/zbeta/e17/equate-cvs/BUILD b/zbeta/e17/equate-cvs/BUILD
deleted file mode 100644
index 0f96211..0000000
--- a/zbeta/e17/equate-cvs/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
-  export PATH=$MODULE_PREFIX/bin:$PATH
-  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
-  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
-  export USER=nobody
-
-  # This file needs to exists or Makefile.in will not be created.
-  touch ChangeLog
-
-  default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/e17/equate-cvs/DEPENDS b/zbeta/e17/equate-cvs/DEPENDS
deleted file mode 100644
index e23f6e8..0000000
--- a/zbeta/e17/equate-cvs/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends ewl-cvs
diff --git a/zbeta/e17/equate-cvs/DETAILS b/zbeta/e17/equate-cvs/DETAILS
deleted file mode 100644
index 06453e8..0000000
--- a/zbeta/e17/equate-cvs/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-          MODULE=equate-cvs
-         VERSION=beta
-          SOURCE=$MODULE-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/equate
-      SOURCE_URL=cvs://:pserver:anonymous@cvs.sourceforge.net:/cvsroot/enlightenment:misc/equate
-        WEB_SITE=http://andy.elcock.org/Software/Equate.xml
-         ENTERED=20041224
-         UPDATED=`date -u +%Y%m%d`
-   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
-           SHORT="A themeable ewl based calculator"
-
-cat << EOF
-Equate - an E Calculator
-I decided (with the agreement of some of the crew from #edevelop) that
-it would be cool to write a simple app to demonstrate EWL (one of the 
-E Foundation Libraries) and that a calculator would be a cool app to
-write.
-EOF
diff --git a/zbeta/emphasis-svn/BUILD b/zbeta/emphasis-svn/BUILD
new file mode 100644
index 0000000..46c8c34
--- /dev/null
+++ b/zbeta/emphasis-svn/BUILD
@@ -0,0 +1,11 @@
+(
+  export PATH=$MODULE_PREFIX/bin:$PATH
+  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
+  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
+  export USER=nobody
+
+  OPTS="$OPTS --with-profile=FAST_PC"
+
+  default_cvs_build
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/emphasis-svn/DEPENDS b/zbeta/emphasis-svn/DEPENDS
new file mode 100644
index 0000000..5448d7e
--- /dev/null
+++ b/zbeta/emphasis-svn/DEPENDS
@@ -0,0 +1,5 @@
+depends  ecore-svn
+depends  etk-svn
+depends  enhance-svn
+depends  libmpd
+depends  libxml
diff --git a/zbeta/emphasis-svn/DETAILS b/zbeta/emphasis-svn/DETAILS
new file mode 100644
index 0000000..2c32ba6
--- /dev/null
+++ b/zbeta/emphasis-svn/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=emphasis-svn
+         VERSION=beta
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/emphasis
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+        WEB_SITE="http://emphasis.tuxfamily.org"
+         ENTERED=20081103
+         UPDATED=`date -u +%Y%m%d`
+   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
+           SHORT="e mpd client"
+
+cat <<EOF
+An ETK-based MPD client.
+EOF
diff --git a/zbeta/enhance-svn/BUILD b/zbeta/enhance-svn/BUILD
new file mode 100644
index 0000000..46c8c34
--- /dev/null
+++ b/zbeta/enhance-svn/BUILD
@@ -0,0 +1,11 @@
+(
+  export PATH=$MODULE_PREFIX/bin:$PATH
+  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
+  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
+  export USER=nobody
+
+  OPTS="$OPTS --with-profile=FAST_PC"
+
+  default_cvs_build
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/enhance-svn/DEPENDS b/zbeta/enhance-svn/DEPENDS
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/zbeta/enhance-svn/DEPENDS
@@ -0,0 +1 @@
+
diff --git a/zbeta/enhance-svn/DETAILS b/zbeta/enhance-svn/DETAILS
new file mode 100644
index 0000000..d3a757e
--- /dev/null
+++ b/zbeta/enhance-svn/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=enhance-svn
+         VERSION=beta
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/enhance
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+        WEB_SITE="http://enlightenment.org"
+         ENTERED=20081103
+         UPDATED=`date -u +%Y%m%d`
+   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
+           SHORT="glade stuff"
+
+cat <<EOF
+Enhance is used to create GUIs from Glade's XMLs and EXML on runtime.
+EOF
diff --git a/zbeta/enna-svn/BUILD b/zbeta/enna-svn/BUILD
new file mode 100644
index 0000000..46c8c34
--- /dev/null
+++ b/zbeta/enna-svn/BUILD
@@ -0,0 +1,11 @@
+(
+  export PATH=$MODULE_PREFIX/bin:$PATH
+  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
+  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
+  export USER=nobody
+
+  OPTS="$OPTS --with-profile=FAST_PC"
+
+  default_cvs_build
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/enna-svn/DEPENDS b/zbeta/enna-svn/DEPENDS
new file mode 100644
index 0000000..a5729e5
--- /dev/null
+++ b/zbeta/enna-svn/DEPENDS
@@ -0,0 +1,28 @@
+optional_depends  "curl"              \
+                  "--enable-libcurl"  \
+		  "--disable-libcurl" \
+		  "for curl support"
+
+optional_depends  "libxml2"           \
+                  "--enable-libxml2"  \
+		  "--disable-libxml2" \
+		  "for libxml2 support"
+
+optional_depends  "emotion-svn"               \
+                  "--enable-emotion-backend"  \
+		  "--disable-emotion-backend" \
+		  "for optional playback with Emotion"
+
+optional_depends  "libplayer-hg"                \
+                  "--enable-libplayer-backend"  \
+		  "--disable-libplayer-backend" \
+		  "for the libplayer A/V backend"
+
+optional_depends  "lirc"       \
+                  ""           \
+		  ""           \
+		  "for LIRC support"
+
+
+# Just a reminder for Light Media Scanner to be eventually included one day :-)
+# optional_depends "liblms"
diff --git a/zbeta/enna-svn/DETAILS b/zbeta/enna-svn/DETAILS
new file mode 100644
index 0000000..8b9f07a
--- /dev/null
+++ b/zbeta/enna-svn/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=enna-svn
+         VERSION=beta
+          SOURCE=$MODULE.tar.bz2
+      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/MISC/enna
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
+        WEB_SITE="http://exchange.enlightenment.org/application/show/164"
+         ENTERED=20081103
+         UPDATED=`date -u +%Y%m%d`
+   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
+           SHORT="multimedia-center-thingy for E"
+cat <<EOF
+
+
+EOF
diff --git a/zbeta/epiphany-svn/BUILD b/zbeta/epiphany-svn/BUILD
deleted file mode 100644
index e27d0fb..0000000
--- a/zbeta/epiphany-svn/BUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-(
-
-   if [[ "$DESKTOP_PLUGIN" == "y" ]]; then
-     OPTS="$OPTS --enable-deskop-file-plugin"
-   fi
-
-   if [[ "$ZEROCONF_BOOKMARKS" == "y" ]]; then
-     OPTS="$OPTS --enable-zeroconf"
-   fi
-
-   if [[ "$CERTIFICATE_MANAGER" == "y" ]]; then
-     OPTS="$OPTS --enable-certificate-manager"
-   fi
-
-   OPTS="$OPTS --with-engine=webkit"
-
-   sedit 's/xulrunner mozilla webkit/webkit/g' embed/Makefile.am
- 
-   default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/epiphany-svn/CONFIGURE b/zbeta/epiphany-svn/CONFIGURE
deleted file mode 100644
index d5047a3..0000000
--- a/zbeta/epiphany-svn/CONFIGURE
+++ /dev/null
@@ -1,5 +0,0 @@
-mquery  DESKTOP_PLUGIN       "Enable the desktop file plugin"             y
-mquery  ZEROCONF_BOOKMARKS   "Enable zeroconf bookmarks support"          y
-mquery  CERTIFICATE_MANAGER  "Enable certificate manager"                 y
-
-#mquery ENABLE_CGID "Enable cgid ?" y --enable-cgid --enable-cgi
diff --git a/zbeta/epiphany-svn/DEPENDS b/zbeta/epiphany-svn/DEPENDS
deleted file mode 100644
index 0db4f60..0000000
--- a/zbeta/epiphany-svn/DEPENDS
+++ /dev/null
@@ -1,9 +0,0 @@
-depends  libgnomeui
-depends  libgnomeprintui
-depends  iso-codes
-depends  WebKit
-
-optional_depends  "Python"  "--enable-python"  ""  "to enable Python support"
-
-optional_depends  "enchant"  "--enable-spell-checker" "" \
-                  "to enable spell checing"
diff --git a/zbeta/epiphany-svn/DETAILS b/zbeta/epiphany-svn/DETAILS
deleted file mode 100644
index b2a1150..0000000
--- a/zbeta/epiphany-svn/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=epiphany-svn
-         VERSION=beta
-          SOURCE=$MODULE-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-      SOURCE_URL=svn://svn.gnome.org/svn/epiphany/trunk/
-        WEB_SITE=http://live.gnome.org/Epiphany
-         ENTERED=20080128
-         UPDATED=`date -u +%Y%m01`
-           SHORT="GNOME Web browser."
-
-cat << EOF
-Epiphany is a GNOME Web browser that can use different rendering
-engines. It is fast, has a light interface, and is fully
-standards-compliant.
-EOF
diff --git a/zbeta/equate-cvs/BUILD b/zbeta/equate-cvs/BUILD
new file mode 100644
index 0000000..0f96211
--- /dev/null
+++ b/zbeta/equate-cvs/BUILD
@@ -0,0 +1,13 @@
+(
+
+  export PATH=$MODULE_PREFIX/bin:$PATH
+  export CPPFLAGS="$CPPFLAGS -I$MODULE_PREFIX/include"
+  export LDFLAGS="$LDFLAGS -L$MODULE_PREFIX/lib"
+  export USER=nobody
+
+  # This file needs to exists or Makefile.in will not be created.
+  touch ChangeLog
+
+  default_cvs_build
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/equate-cvs/DEPENDS b/zbeta/equate-cvs/DEPENDS
new file mode 100644
index 0000000..e23f6e8
--- /dev/null
+++ b/zbeta/equate-cvs/DEPENDS
@@ -0,0 +1 @@
+depends ewl-cvs
diff --git a/zbeta/equate-cvs/DETAILS b/zbeta/equate-cvs/DETAILS
new file mode 100644
index 0000000..06453e8
--- /dev/null
+++ b/zbeta/equate-cvs/DETAILS
@@ -0,0 +1,18 @@
+          MODULE=equate-cvs
+         VERSION=beta
+          SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/equate
+      SOURCE_URL=cvs://:pserver:anonymous@cvs.sourceforge.net:/cvsroot/enlightenment:misc/equate
+        WEB_SITE=http://andy.elcock.org/Software/Equate.xml
+         ENTERED=20041224
+         UPDATED=`date -u +%Y%m%d`
+   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
+           SHORT="A themeable ewl based calculator"
+
+cat << EOF
+Equate - an E Calculator
+I decided (with the agreement of some of the crew from #edevelop) that
+it would be cool to write a simple app to demonstrate EWL (one of the 
+E Foundation Libraries) and that a calculator would be a cool app to
+write.
+EOF
diff --git a/zbeta/ffmpeg-svn/DETAILS b/zbeta/ffmpeg-svn/DETAILS
index 6f29b4b..bc842f3 100644
--- a/zbeta/ffmpeg-svn/DETAILS
+++ b/zbeta/ffmpeg-svn/DETAILS
@@ -1,6 +1,6 @@
           MODULE=ffmpeg-svn
              MOD=ffmpeg
-         VERSION=svn-"`date +%Y%U`"
+         VERSION=beta
           SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=svn://svn.mplayerhq.hu/$MOD/trunk:$MOD
diff --git a/zbeta/midori-git/BUILD b/zbeta/midori-git/BUILD
deleted file mode 100644
index d65f68e..0000000
--- a/zbeta/midori-git/BUILD
+++ /dev/null
@@ -1,13 +0,0 @@
-(
-
-#    default_cvs_config &&
-#    ./configure --prefix=/usr &&
-#     default_cvs_build
- ./waf configure --prefix=/usr &&
- ./waf build &&
- prepare_install &&
- ./waf install
-
-
-) > $C_FIFO 2>&1
-
diff --git a/zbeta/midori-git/DEPENDS b/zbeta/midori-git/DEPENDS
deleted file mode 100644
index bd7000d..0000000
--- a/zbeta/midori-git/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends  libsexy
-depends  WebKit
-
-optional_depends unique "" "" "for single instance midori"
diff --git a/zbeta/midori-git/DETAILS b/zbeta/midori-git/DETAILS
deleted file mode 100644
index 321bae2..0000000
--- a/zbeta/midori-git/DETAILS
+++ /dev/null
@@ -1,20 +0,0 @@
-          MODULE=midori-git
-         VERSION="git-`date +%U`"
-          SOURCE=$MODULE.tar.bz2
-          SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://software.twotoasts.de/media/midori.git
-         WEBSITE=http://software.twotoasts.de/?page=midori
-         ENTERED=20080429
-         UPDATED=20080429
-         PSAFE=no
-           SHORT="lightweight WebKit/Gtk+-2 based browser"
-
-cat << EOF
-Midori is a lightweight web browser.
-  * Full integration with GTK+2
-  * Fast rendering with WebKit
-  * Tabs, windows, and session management
-  * Bookmarks are stored with XBEL
-  * Searchbox based on OpenSearch
-  * User scripts and user styles support
-EOF
diff --git a/zbeta/mplayer/BUILD b/zbeta/mplayer/BUILD
deleted file mode 100644
index a62a2b2..0000000
--- a/zbeta/mplayer/BUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-(
-
-#patch_it $SOURCE7 0 &&
-#patch_it $SOURCE8 0 &&
-#patch_it $SOURCE9 0 &&
-#patch_it $SOURCE10 0 &&
-
-  # using CFLAGS other than MPlayers autodetected will break
-  bad_flags compiler
-
-  if [ $MENCODER == "n" ] ; then
-    OPTS=$OPTS" --disable-mencoder"
-  fi
-
-  if [ $OSD == "y" ] ; then
-    OPTS=$OPTS" --enable-menu"
-  fi
-
-  cd $SOURCE_DIRECTORY &&
-
-  ./configure --prefix=/usr                 \
-              --confdir=/etc                \
-              --mandir=/usr/share/man       \
-              --codecsdir=/usr/lib/win32    \
-              --enable-linux-devfs          \
-              --enable-largefiles           \
-              --confdir=/etc/mplayer        \
-              --datadir=/usr/share/mplayer  \
-              $OPTS &&
-
-  default_make  &&
-
-  gather_docs etc/*                   &&
-  install -d /usr/share/mplayer/Skin  &&
-  install -d /etc/mplayer             &&
-  install -m644 etc/codecs.conf /usr/share/mplayer/         &&
-  install -m644 etc/example.conf /etc/mplayer/mplayer.conf  &&
-  install -m644 etc/input.conf /etc/mplayer/                &&
-
-  cp -a Skin/Blue /usr/share/mplayer/Skin/  &&
-  ln -sf /usr/share/mplayer/Skin/Blue /usr/share/mplayer/Skin/default  &&
-
-  cp -a fonts /usr/share/mplayer/  &&
-  rm -rf /usr/share/mplayer/font   &&
-  ln -sf fonts/font-arial-iso-8859-1/font-arial-18-iso-8859-1 /usr/share/mplayer/font
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/mplayer/CONFIGURE b/zbeta/mplayer/CONFIGURE
deleted file mode 100644
index a4d0e7b..0000000
--- a/zbeta/mplayer/CONFIGURE
+++ /dev/null
@@ -1,2 +0,0 @@
- mquery MENCODER "Enable building of MEncoder ?" y
- mquery OSD "Enable OSD support? " y
diff --git a/zbeta/mplayer/DEPENDS b/zbeta/mplayer/DEPENDS
deleted file mode 100644
index 6a3a21c..0000000
--- a/zbeta/mplayer/DEPENDS
+++ /dev/null
@@ -1,17 +0,0 @@
-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"
diff --git a/zbeta/mplayer/DETAILS b/zbeta/mplayer/DETAILS
deleted file mode 100644
index 835d6f9..0000000
--- a/zbeta/mplayer/DETAILS
+++ /dev/null
@@ -1,50 +0,0 @@
-          MODULE=mplayer
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-          SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-         SOURCE2=font-arial-iso-8859-1.tar.bz2
-         SOURCE3=font-arial-iso-8859-2.tar.bz2
-         SOURCE4=font-arial-cp1250.tar.bz2
-         SOURCE5=font-arial-iso-8859-7.tar.bz2
-         SOURCE6=Blue-1.7.tar.bz2
-         #SOURCE7=stream_cddb_fix_20080120.diff
-         ##SOURCE8=url_fix_20080120.diff
-         #SOURCE9=demux_mov_fix_20080129.diff
-        #SOURCE10=demux_audio_fix_20080129.diff
-   SOURCE_URL[0]=svn://svn.mplayerhq.hu/$MODULE/trunk:$MODULE
-  SOURCE2_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE2_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE3_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE3_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE4_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE4_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE5_URL[0]=ftp://ftp1.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE5_URL[1]=ftp://ftp2.mplayerhq.hu/$MODULE/releases/fonts/
-  SOURCE6_URL[0]=ftp://ftp1.mplayerhq.hu/MPlayer/skins/
-     #SOURCE7_URL=http://www.mplayerhq.hu/MPlayer/patches/
-     #SOURCE8_URL=http://www.mplayerhq.hu/MPlayer/patches/
-    # SOURCE9_URL=http://www.mplayerhq.hu/MPlayer/patches/
-   # SOURCE10_URL=http://www.mplayerhq.hu/MPlayer/patches/
-     SOURCE2_VFY=sha1:152c40bf20de34aa8802d7f80d34d673b0b67212
-     SOURCE3_VFY=sha1:7b99bbe0e9ba89a57eccbea8f93c453c4f268181
-     SOURCE4_VFY=sha1:ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68
-     SOURCE5_VFY=sha1:2a3fa8cf54ec3ed4dfa1a0e72f2d207c13507b9d
-     SOURCE6_VFY=sha1:45e5ee7a5541a5f1cfd2678a6c9b5911ca473cb9
-   #  SOURCE7_VFY=sha1:8d901c7a88fa120ed26492e741e1ae0fbe57e12d
-   #  SOURCE8_VFY=sha1:1e92ded6f27bf07601fa318e24ec468fe225ffe5
-   #  SOURCE9_VFY=sha1:a17d82baff58e8cc569365341503273956fd26c8
-   # SOURCE10_VFY=sha1:e25ba7d8d696d9c6365f105134ba723404adb4e1
-        WEB_SITE=http://www.mplayerhq.hu
-         ENTERED=20010922
-         UPDATED=20080409
-           PSAFE=no
-           SHORT="A movie and animation player"
-
-cat << EOF
-MPlayer is a movie and animation player based on the 0.90pre5 version of
-MPEGplayer and the Avifile library. It uses mpeg2dec/libmpeg2 for MPEG
-decoding. The supported file formats are: MPEG 1/2 (MPG, DAT, BIN, VOB)
-and AVI (Mpeg/PCM/AC3/DivX/MS-ADPCM/aLaw audio and MPEG4/DivX/Indeo/CVID
-video codecs). It supports hardware YUV colorspace conversion and
-scaling via mga_vid/syncfb devices or the X11 Xv extension.
-EOF
diff --git a/zbeta/mplayer/POST_INSTALL b/zbeta/mplayer/POST_INSTALL
deleted file mode 100644
index 3f3af25..0000000
--- a/zbeta/mplayer/POST_INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-# Recompile mplayerplug-in
-
-if module_installed mplayerplug-in; then lin -c mplayerplug-in; fi
diff --git a/zbeta/mplayer/PRE_BUILD b/zbeta/mplayer/PRE_BUILD
deleted file mode 100644
index 6b20dfe..0000000
--- a/zbeta/mplayer/PRE_BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-default_pre_build                &&
-
-mkdir   $SOURCE_DIRECTORY/Skin   &&
-cd        $SOURCE_DIRECTORY/Skin   &&
-unpack  $SOURCE6                 &&
-
-mkdir   $SOURCE_DIRECTORY/fonts  &&
-cd      $SOURCE_DIRECTORY/fonts  &&
-unpack  $SOURCE2                 &&
-unpack  $SOURCE3                 &&
-unpack  $SOURCE4                 &&
-unpack  $SOURCE5
diff --git a/zbeta/pigment-python/DEPENDS b/zbeta/pigment-python/DEPENDS
deleted file mode 100644
index 7a625f2..0000000
--- a/zbeta/pigment-python/DEPENDS
+++ /dev/null
@@ -1,3 +0,0 @@
-depends pigment
-depends pygobject
-depends gst-python
diff --git a/zbeta/pigment-python/DETAILS b/zbeta/pigment-python/DETAILS
deleted file mode 100644
index a89af01..0000000
--- a/zbeta/pigment-python/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
-     MODULE=pigment-python
-    VERSION=0.3.8
-     SOURCE=$MODULE-$VERSION.tar.gz
- SOURCE_URL=http://elisa.fluendo.com/static/download/pigment/
- SOURCE_VFY=sha1:871ed17d32aed39ecf974cca9246c919af9e9b0e
-    WEBSITE=https://code.fluendo.com/pigment/trac
-    ENTERED=20081007
-    UPDATED=20081007
-      SHORT="python bindings for pigment"
-
-cat << EOF
-python bindings for pigment
-EOF
diff --git a/zbeta/pigment/DEPENDS b/zbeta/pigment/DEPENDS
deleted file mode 100644
index 90695e9..0000000
--- a/zbeta/pigment/DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-depends gstreamer-10
-depends gst-plugins-base
-depends gtk-doc
-depends cairo
diff --git a/zbeta/pigment/DETAILS b/zbeta/pigment/DETAILS
deleted file mode 100644
index 5748e7c..0000000
--- a/zbeta/pigment/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-     MODULE=pigment
-    VERSION=0.3.11
-     SOURCE=$MODULE-$VERSION.tar.bz2
- SOURCE_URL=http://elisa.fluendo.com/static/download/pigment/
- SOURCE_VFY=sha1:de26ed65201b4eac1e2b806c945a7a9199d9c5c9
-    WEBSITE=https://code.fluendo.com/pigment/trac
-    ENTERED=20081007
-    UPDATED=20081007
-      SHORT="3D scene graph library"
-
-cat << EOF
-Pigment is a 3D scene graph library designed to easily create rich 
-application user interfaces.
-EOF
-
diff --git a/zbeta/xf86-video-mach64/BUILD b/zbeta/xf86-video-mach64/BUILD
new file mode 100644
index 0000000..cfe3408
--- /dev/null
+++ b/zbeta/xf86-video-mach64/BUILD
@@ -0,0 +1,6 @@
+(
+  . /etc/profile.d/x11r7.rc &&
+
+  default_build
+
+) > $C_FIFO 2>&1
diff --git a/zbeta/xf86-video-mach64/CONFLICTS b/zbeta/xf86-video-mach64/CONFLICTS
new file mode 100644
index 0000000..5013182
--- /dev/null
+++ b/zbeta/xf86-video-mach64/CONFLICTS
@@ -0,0 +1,6 @@
+conflicts XOrg6  &&
+conflicts XOrg-test &&
+conflicts XOrg-fonts-base &&
+conflicts XOrg-fonts-extra &&
+conflicts XOrg-drm &&
+conflicts XOrg-drm-cvs
diff --git a/zbeta/xf86-video-mach64/DEPENDS b/zbeta/xf86-video-mach64/DEPENDS
new file mode 100644
index 0000000..514f37d
--- /dev/null
+++ b/zbeta/xf86-video-mach64/DEPENDS
@@ -0,0 +1,2 @@
+depends xorg-server 
+depends mesa-lib
diff --git a/zbeta/xf86-video-mach64/DETAILS b/zbeta/xf86-video-mach64/DETAILS
new file mode 100644
index 0000000..9510d35
--- /dev/null
+++ b/zbeta/xf86-video-mach64/DETAILS
@@ -0,0 +1,18 @@
+          MODULE=xf86-video-mach64
+         VERSION=6.8.0
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$XORG_URL/individual/driver/
+      SOURCE_VFY=sha1:0f130aca927ede0fd3ed7876c52817a5ef9215bb
+   MODULE_PREFIX=${X11R7_PREFIX:-/usr}
+        WEB_SITE=http://www.x.org/
+         ENTERED=20080918
+         UPDATED=20080918
+           SHORT="the X.Org video driver for older ATI/Mach64 based cards"
+
+cat << EOF
+xf86-video-mach64 provides the X.Org video drivers for older the
+older ATI/Mach64 based video cards.
+
+This driver does not support newer ATI Rage or Radeon cards: see
+the xf86-video-ati and xf86-video-radeonhd modules.
+EOF
diff --git a/zlocal/README b/zlocal/README
index e69de29..f040170 100644
--- a/zlocal/README
+++ b/zlocal/README
@@ -0,0 +1,9 @@
+
+moonbase/zlocal:
+
+This directory is a placeholder for new and custom modules. Put
+modules you are testing, designing or something else in this
+directory to keep them apart from the automatically updated
+modules in moonbase. No module will ever be automatically inserted
+into this directory or removed.
+


More information about the Lunar-commits mailing list