[Lunar-commits] <moonbase> update

Florin Braescu florin at lunar-linux.org
Fri Dec 4 12:02:04 CET 2009


commit 5982dbc931022d27dd43f13a98e661707b7dac9c
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Fri Dec 4 13:02:04 2009 +0200

    update
---
 archive/par2cmdline/BUILD                  |    5 -
 archive/par2cmdline/DETAILS                |    4 +-
 audio/consonance/DEPENDS                   |    6 ++
 audio/consonance/DETAILS                   |   14 +++
 audio/gejengel/DEPENDS                     |    2 -
 audio/pragha/DEPENDS                       |    7 --
 audio/pragha/DETAILS                       |   18 ----
 devel/ctags/DETAILS                        |    6 +-
 devel/git/plugin.d/download-git.plugin     |   18 ----
 devel/git/plugin.d/download-git.plugin2    |  135 ----------------------------
 devel/gtksourcecompletion/DETAILS          |   17 ----
 devel/vtg/DETAILS                          |   12 ---
 filemanagers/worker/DEPENDS                |    1 +
 gnome2/bindings/glibmm/DETAILS             |    8 +-
 gnome2/bindings/gtkmm/DETAILS              |    8 +-
 gnome2/bindings/pangomm/DETAILS            |    8 +-
 gnome2/desktop/gvfs/DETAILS                |    6 +-
 gnome2/desktop/libsoup/DEPENDS             |    2 +-
 graphics/gtk+-2/BUILD                      |   11 +--
 graphics/gtk+-2/DETAILS                    |    6 +-
 graphics/libpano12/CONFLICTS               |    1 +
 graphics/libpano12/DEPENDS                 |    3 +
 graphics/libpano12/DETAILS                 |   22 +++++
 kde4/base/qt4/BUILD                        |    8 +-
 kde4/base/qt4/CONFIGURE                    |    1 -
 kde4/base/qt4/DEPENDS                      |   14 +--
 kde4/base/qt4/DETAILS                      |   12 ++--
 kernel/linux-2.6-rc/BUILD                  |   39 --------
 kernel/linux-2.6-rc/CONFIGURE              |   11 ---
 kernel/linux-2.6-rc/DEPENDS                |    2 -
 kernel/linux-2.6-rc/DETAILS                |   25 -----
 kernel/linux-2.6-rc/POST_INSTALL           |    8 --
 kernel/linux-2.6-rc/PRE_BUILD              |   32 -------
 libs/glib-2/DETAILS                        |    2 +-
 profiles/kde4/DEPENDS                      |    3 +-
 qt4-apps/qt-creator/BUILD                  |    4 +-
 qt4-apps/qt-creator/DETAILS                |    6 +-
 sql/phpMyAdmin/DETAILS                     |    6 +-
 video/xbmc/DEPENDS                         |   14 ---
 video/xbmc/DETAILS                         |   16 ----
 x11-utils/gparted/DETAILS                  |    6 +-
 x11/fglrx/BUILD                            |    2 +-
 x11/fglrx/DETAILS                          |   15 ++--
 x11/synaptics/BUILD                        |    8 ++
 x11/synaptics/DETAILS                      |   19 ++++
 xfce4/apps/Terminal/DEPENDS                |    5 +
 xfce4/apps/Terminal/DETAILS                |   20 ++++
 xfce4/apps/mousepad/DETAILS                |   17 ++---
 xfce4/apps/ristretto/BUILD                 |    5 +-
 xfce4/apps/ristretto/DETAILS               |   11 +--
 xfce4/apps/terminal/BUILD                  |    9 --
 xfce4/apps/terminal/DEPENDS                |    5 -
 xfce4/apps/terminal/DETAILS                |   19 ----
 xfce4/apps/tumbler/BUILD                   |    9 --
 xfce4/apps/tumbler/DETAILS                 |   16 ----
 xfce4/apps/xarchiver/DETAILS               |   10 +-
 xfce4/apps/xfburn/BUILD                    |    9 --
 xfce4/apps/xfburn/DETAILS                  |   13 ++--
 xfce4/apps/xfce4-power-manager/DETAILS     |    1 -
 xfce4/apps/xfce4-taskmanager/BUILD         |    6 +-
 xfce4/apps/xfce4-taskmanager/DETAILS       |   10 +-
 xfce4/core/Thunar/BUILD                    |    6 +-
 xfce4/core/Thunar/DETAILS                  |   11 +--
 xfce4/core/exo/BUILD                       |    7 +-
 xfce4/core/exo/DETAILS                     |   11 ++-
 xfce4/core/libxfce4menu/BUILD              |    9 --
 xfce4/core/libxfce4menu/DETAILS            |   20 ++--
 xfce4/core/libxfce4ui/BUILD                |   14 ---
 xfce4/core/libxfce4ui/DEPENDS              |    7 --
 xfce4/core/libxfce4ui/DETAILS              |   15 ---
 xfce4/core/libxfce4util/BUILD              |    7 +-
 xfce4/core/libxfce4util/DETAILS            |    8 +-
 xfce4/core/libxfce4util/POST_INSTALL       |   10 ++
 xfce4/core/libxfce4util/profile.d/xfce4.rc |    4 +
 xfce4/core/libxfcegui4/BUILD               |    7 ++-
 xfce4/core/libxfcegui4/DEPENDS             |    9 ++
 xfce4/core/libxfcegui4/DETAILS             |   10 +-
 xfce4/core/thunar-vfs/BUILD                |   13 ---
 xfce4/core/thunar-vfs/DEPENDS              |    6 --
 xfce4/core/thunar-vfs/DETAILS              |   14 ---
 xfce4/core/xfce-utils/BUILD                |    6 +-
 xfce4/core/xfce-utils/DEPENDS              |    3 +-
 xfce4/core/xfce-utils/DETAILS              |   10 +-
 xfce4/core/xfce4-dev-tools/BUILD           |    6 +-
 xfce4/core/xfce4-dev-tools/DETAILS         |   12 ++--
 xfce4/core/xfce4-panel/BUILD               |    6 +-
 xfce4/core/xfce4-panel/DETAILS             |   10 +-
 xfce4/core/xfce4-session/BUILD             |    9 ++-
 xfce4/core/xfce4-session/DEPENDS           |    2 -
 xfce4/core/xfce4-session/DETAILS           |   11 ++-
 xfce4/core/xfce4-settings/BUILD            |   14 ++--
 xfce4/core/xfce4-settings/DEPENDS          |    1 -
 xfce4/core/xfce4-settings/DETAILS          |   21 +++--
 xfce4/core/xfconf/BUILD                    |    9 --
 xfce4/core/xfconf/DETAILS                  |   21 +++--
 xfce4/core/xfdesktop/BUILD                 |    7 +-
 xfce4/core/xfdesktop/DEPENDS               |    4 +-
 xfce4/core/xfdesktop/DETAILS               |   10 +-
 xfce4/core/xfwm4/BUILD                     |    2 +-
 xfce4/core/xfwm4/DEPENDS                   |    3 +-
 xfce4/core/xfwm4/DETAILS                   |   10 +-
 xfce4/goodies/xfce4-xkb-plugin/BUILD       |    2 +-
 xfce4/goodies/xfce4-xkb-plugin/DETAILS     |   10 +-
 xfce4/xfce4/DEPENDS                        |    2 +-
 xfce4/xfce4/DETAILS                        |    6 +-
 xorg7/xorg-server/BUILD                    |    6 +-
 xorg7/xorg-server/PRE_BUILD                |    3 +
 zbeta/airconfig-svn/BUILD                  |    2 +-
 zbeta/e17/e_modules-svn/DEPENDS            |    1 -
 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/epsilon-svn/DETAILS              |    2 +-
 zbeta/e17/ethumb-svn/DETAILS               |    4 +-
 zbeta/enna-hg/BUILD                        |   11 ---
 zbeta/enna-hg/DEPENDS                      |   38 --------
 zbeta/enna-hg/DETAILS                      |   15 ---
 zbeta/enna-svn/BUILD                       |   11 +++
 zbeta/enna-svn/DEPENDS                     |   28 ++++++
 zbeta/enna-svn/DETAILS                     |   14 +++
 zbeta/eweather-svn/BUILD                   |   11 ---
 zbeta/eweather-svn/DEPENDS                 |    2 -
 zbeta/eweather-svn/DETAILS                 |   14 ---
 zbeta/ffmpeg-svn/DETAILS                   |    2 +-
 zbeta/gdm-old/BUILD                        |   45 ---------
 zbeta/gdm-old/DEPENDS                      |    2 -
 zbeta/gdm-old/DETAILS                      |   50 ----------
 zbeta/gdm-old/Default                      |   27 ------
 zbeta/gdm-old/POST_INSTALL                 |    5 -
 zbeta/gdm-old/Sessions/gnome.desktop       |   68 --------------
 zbeta/gdm-old/gnomerc                      |   13 ---
 zbeta/gdm-old/init.d/gdm                   |   27 ------
 zbeta/gdm-old/pam.d/gdm                    |   14 ---
 zbeta/gdm-old/pam.d/gdm-autologin          |   13 ---
 zbeta/libgdata/BUILD                       |   12 ---
 zbeta/libgdata/DEPENDS                     |    1 -
 zbeta/libgdata/DETAILS                     |   16 ----
 zbeta/libvalhalla-hg/BUILD                 |    6 --
 zbeta/libvalhalla-hg/DEPENDS               |    9 --
 zbeta/libvalhalla-hg/DETAILS               |   13 ---
 zbeta/midori/DETAILS                       |    8 +-
 zbeta/midori/POST_INSTALL                  |    1 -
 zbeta/mplayer/BUILD                        |   48 ----------
 zbeta/mplayer/CONFIGURE                    |    3 -
 zbeta/mplayer/DEPENDS                      |   16 ----
 zbeta/mplayer/DETAILS                      |   51 -----------
 zbeta/mplayer/POST_INSTALL                 |    1 -
 zbeta/mplayer/PRE_BUILD                    |   13 ---
 zlocal/README                              |    9 ++
 152 files changed, 504 insertions(+), 1310 deletions(-)

diff --git a/archive/par2cmdline/BUILD b/archive/par2cmdline/BUILD
deleted file mode 100644
index e12a60a..0000000
--- a/archive/par2cmdline/BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-( 
-  patch_it $SOURCE2 1 &&
-  default_build
-
-) > $C_FIFO 2>&1
diff --git a/archive/par2cmdline/DETAILS b/archive/par2cmdline/DETAILS
index f9c73bd..dc12251 100644
--- a/archive/par2cmdline/DETAILS
+++ b/archive/par2cmdline/DETAILS
@@ -1,13 +1,11 @@
           MODULE=par2cmdline
          VERSION=0.4
           SOURCE=$MODULE-$VERSION.tar.gz
-         SOURCE2=$MODULE-$VERSION-gcc4.patch
       SOURCE_URL=$SFORGE_URL/parchive/
-     SOURCE2_URL=http://sage.math.washington.edu/home/binegar/src/
       SOURCE_VFY=sha1:2fcdc932b5d7b4b1c68c4a4ca855ca913d464d2f
         WEB_SITE=http://parchive.sourceforge.net
          ENTERED=20040228
-         UPDATED=20091105
+         UPDATED=20050313
       MAINTAINER=tchan at lunar-linux.org  
            SHORT="A command line implementation of the PAR v2.0 specification"
 
diff --git a/audio/consonance/DEPENDS b/audio/consonance/DEPENDS
new file mode 100644
index 0000000..5b3d82d
--- /dev/null
+++ b/audio/consonance/DEPENDS
@@ -0,0 +1,6 @@
+depends flac
+depends libcddb
+depends libmad
+depends libmodplug
+depends libogg
+depends libsndfile
diff --git a/audio/consonance/DETAILS b/audio/consonance/DETAILS
new file mode 100644
index 0000000..edf7aba
--- /dev/null
+++ b/audio/consonance/DETAILS
@@ -0,0 +1,14 @@
+          MODULE=consonance
+         VERSION=0.5.1
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=http://sites.google.com/site/consonancemanager/releases-1/
+        WEB_SITE=http://sites.google.com/site/consonancemanager/
+      SOURCE_VFY=sha1:af3667cf43f5f2eedeac94454f1e5b9de68b5155
+         ENTERED=20080805
+         UPDATED=20090512
+           SHORT="lightweight music manager"
+
+cat << EOF
+Consonance is a lightweight GTK+ music manager that aims to be fast, 
+bloat-free, and light on memory consumption.
+EOF
diff --git a/audio/gejengel/DEPENDS b/audio/gejengel/DEPENDS
index 5d10b96..988063c 100644
--- a/audio/gejengel/DEPENDS
+++ b/audio/gejengel/DEPENDS
@@ -1,4 +1,2 @@
 depends libsexymm
 depends ImageMagick
-
-optional_depends lastfmlib "" "" "scrobble your tracks on Last.fm"
diff --git a/audio/pragha/DEPENDS b/audio/pragha/DEPENDS
deleted file mode 100644
index 2ca8472..0000000
--- a/audio/pragha/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends libmad
-depends libogg
-depends flac
-depends libsndfile
-depends libnotify
-depends taglib
-depends libmodplug
diff --git a/audio/pragha/DETAILS b/audio/pragha/DETAILS
deleted file mode 100644
index d0a4008..0000000
--- a/audio/pragha/DETAILS
+++ /dev/null
@@ -1,18 +0,0 @@
-          MODULE=pragha
-         #VERSION="svn-`date +%Y%U`"
-         VERSION=0.6.2.2
-         #SOURCE=$MODULE.tar.bz2
-          SOURCE=$MODULE-$VERSION.tar.bz2
-#SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE          
-      SOURCE_URL=http://dissonance.googlecode.com/files/
-#      SOURCE_URL=svn+https://consonance.svn.sourceforge.net/svnroot/consonance/trunk:consonance
-        WEB_SITE=http://consonance.sourceforge.net/
-      SOURCE_VFY=sha1:7e9256d3f10ad22cc52ca32f5f5e1b989082f9a8
-         ENTERED=20090627
-         UPDATED=20090731
-           SHORT="lightweight music manager"
-
-cat << EOF
-Consonance is a lightweight GTK+ music manager that aims to be fast, 
-bloat-free, and light on memory consumption.
-EOF
diff --git a/devel/ctags/DETAILS b/devel/ctags/DETAILS
index 0c88a55..6f6d9fa 100644
--- a/devel/ctags/DETAILS
+++ b/devel/ctags/DETAILS
@@ -1,11 +1,11 @@
           MODULE=ctags
-         VERSION=5.8
+         VERSION=5.7
           SOURCE=$MODULE-$VERSION.tar.gz
       SOURCE_URL=$SFORGE_URL/$MODULE/
-      SOURCE_VFY=sha1:482da1ecd182ab39bbdc09f2f02c9fba8cd20030
+      SOURCE_VFY=sha1:f7e435286c25181d6cb28ca1ac2d4ba63507a82d
         WEB_SITE=http://ctags.sourceforge.net/
          ENTERED=20020723
-         UPDATED=20090929
+         UPDATED=20071016
            SHORT="Generates tag (index) files from source files"
 
 cat << EOF
diff --git a/devel/git/plugin.d/download-git.plugin b/devel/git/plugin.d/download-git.plugin
index a8aef27..1b28551 100644
--- a/devel/git/plugin.d/download-git.plugin
+++ b/devel/git/plugin.d/download-git.plugin
@@ -30,8 +30,6 @@ plugin_source_download_git() {
   fi
 
   GIT_URL=$(echo $1 | cut -d: -f1-2)
-  GIT_BRANCH=$(echo $1 | cut -s -d: -f3)
-  
   # translate git+http(s) urls:
   if [ "${GIT_URL:0:8}" == "git+http" ]; then
     GIT_URL="${GIT_URL:4}"
@@ -66,26 +64,10 @@ plugin_source_download_git() {
       cd $SBASE
       verbose_msg "[${TRY}] git pull"
       git pull && git gc && GOT_GIT="yes" 
-      message "${MESSAGE_COLOR}Init and update the submodules${DEFAULT_COLOR}"
-      git submodule init
-      git submodule update
-      if [ -n "$GIT_BRANCH" ] ; then
-        message "${MESSAGE_COLOR}Checking out branch ${FILE_COLOR}$GIT_BRANCH${DEFAULT_COLOR}"
-        git checkout $GIT_BRANCH || activity_log "lget" "$MODULE" "$VERSION" "failed" "Could not checkout branch $GIT_BRANCH of \"$1\""
-      fi
       cd ${CD}
     else
       verbose_msg "[${TRY}] git clone $GIT_URL"
       git clone $GIT_URL $SBASE && GOT_GIT="yes"
-      cd $SBASE
-      message "${MESSAGE_COLOR}Init and update the submodules${DEFAULT_COLOR}"
-      git submodule init
-      git submodule update
-      if [ -n "$GIT_BRANCH" ] ; then
-        message "${MESSAGE_COLOR}Checking out branch ${FILE_COLOR}$GIT_BRANCH${DEFAULT_COLOR}"
-        git checkout $GIT_BRANCH || activity_log "lget" "$MODULE" "$VERSION" "failed" "Could not checkout branch $GIT_BRANCH of \"$1\""
-      fi
-      cd $TMPDIR/$MODULE-$VERSION
     fi
 
     if [ "$?" == "0" ] ; then
diff --git a/devel/git/plugin.d/download-git.plugin2 b/devel/git/plugin.d/download-git.plugin2
deleted file mode 100644
index 008206b..0000000
--- a/devel/git/plugin.d/download-git.plugin2
+++ /dev/null
@@ -1,135 +0,0 @@
-#!/bin/bash
-############################################################
-#                                                          #
-# download-git.plugin - download GIT urls                  #
-#                                                          #
-############################################################
-#                                                          #
-# Copyright 2005 by Auke Kok under GPLv2                   #
-#                                                          #
-############################################################
-
-# valid git urls are:
-# git://
-# git+http:// (will be transformed to http://)
-# git+https:// (will be transformed to https://)
-# git+rsync:// (will be transformed to rsync://)
-# git+ssh:// (will be transformed to ssh://)
-#
-# additional, behind a ":" can be a branch to use
-
-plugin_source_download_git() {
-  # check if we can handle this URL format
-  if [ "${1:0:6}" != "git://" -a "${1:0:11}" != "git+http://" -a "${1:0:12}" != "git+https://" -a "${1:0:12}" != "git+rsync://" -a "${1:0:10}" != "git+ssh://" ] ; then
-    return 2
-  fi
-  debug_msg "plugin_source_needrefresh_git($@)"
-
-  if [ ! -x `which git` ] ; then
-    # full stop: we need to make sure the user sees this error:
-    message "${PROBLEM_COLOR}! Cannot fetch git sources without \"git\" installed${DEFAULT_COLOR}"
-    exit 1
-  fi
-
-  GIT_URL=$(echo $1 | cut -d: -f1-2)
-  GIT_BRANCH=$(echo $1 | cut -s -d: -f3)
-  
-  # translate git+http(s) urls:
-  if [ "${GIT_URL:0:8}" == "git+http" ]; then
-    GIT_URL="${GIT_URL:4}"
-  elif [ "${GIT_URL:0:9}" == "git+rsync" ]; then
-    GIT_URL="${GIT_URL:4}"
-  fi
-
-  message  "${MESSAGE_COLOR}Downloading GIT module for module ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR}"
-
-  SBASE=$(source_basename $2)
-  mk_source_dir $TMPDIR/$MODULE-$VERSION
-  cd $TMPDIR/$MODULE-$VERSION
-  if [ -f "$3/$2" ] ; then
-    verbose_msg "Extracting local GIT copy"
-    # unpacking
-    CD=$(pwd -P)
-    cd $CD
-    if ! unpack $2 ; then
-      message "${PROBLEM_COLOR}Warning: bad local GIT copy, checking out fresh GIT copy${DEFAULT_COLOR}"
-      rm_source_dir $TMPDIR/$MODULE-$VERSION
-      mk_source_dir $TMPDIR/$MODULE-$VERSION
-    fi
-  fi
-
-  NUM_RETRY=${NUM_RETRY:-5}
-  if [ "$NUM_RETRY" -eq 0 ]; then
-      NUM_RETRY=1000
-  fi
-
-  for (( TRY=1 ; $TRY<$NUM_RETRY+1 ; TRY++ )) ; do
-    if [ -d "$SBASE/.git" ] ; then
-      cd $SBASE
-      verbose_msg "[${TRY}] git pull"
-      git pull && git gc && GOT_GIT="yes" 
-    else
-      verbose_msg "[${TRY}] git clone $GIT_URL"
-      pwd
-      git clone $GIT_URL $SBASE && GOT_GIT="yes"
-    fi
-
-    echo "Hallo ${CD}"
-    cd $CD
-
-    if [ "$?" == "0" ] ; then
-      break
-    fi
-
-    sleep 2
-  done
-
-  if [ "$GOT_GIT" == "yes" ] ; then
-    if [ -n "$GIT_BRANCH" ] ; then
-      message "${MESSAGE_COLOR}Checking out branch ${FILE_COLOR}$GIT_BRANCH${DEFAULT_COLOR}"
-      git checkout $GIT_BRANCH || activity_log "lget" "$MODULE" "$VERSION" "failed" "Could not checkout branch $GIT_BRANCH of \"$1\""
-    fi
-
-    message "${MESSAGE_COLOR}Creating ${FILE_COLOR}$2${DEFAULT_COLOR}"
-    # pack
-    tar cjf $3/$2 $SBASE
-  else
-    activity_log "lget" "$MODULE" "$VERSION" "failed" "Could not fetch \"$1\""
-  fi
-
-  cd $TMPDIR
-  rm_source_dir $TMPDIR/$MODULE-$VERSION
-
-}
-
-
-plugin_source_needrefresh_git() {
-  # check if we can handle this URL format
-  if [ "${1:0:6}" != "git://" -a "${1:0:11}" != "git+http://" -a "${1:0:12}" != "git+https://" -a "${1:0:12}" != "git+rsync://" -a "${1:0:10}" != "git+ssh://" ] ; then
-    return 2
-  fi
-  debug_msg "plugin_source_needrefresh_git($@)"
-
-  if [ ! -f $3/$2 ]; then
-    return 0
-  fi
-
-  REPOSITORY_THRESHOLD=${REPOSITORY_THRESHOLD:-10}
-  if (( "REPOSITORY_THRESHOLD" > 0 )) ; then
-    if [ "$(find $3/$2 -amin +$REPOSITORY_THRESHOLD)" == "$3/$2" ] ; then
-      # it is older:
-      return 0
-    else
-      message "${MESSAGE_COLOR}GIT update not required for \"${FILE_COLOR}$(basename $2)${DEFAULT_COLOR}${CYAN}\" (less than $REPOSITORY_THRESHOLD minutes old)${DEFAULT_COLOR}"
-      # now we can send a FAIL so the next plugins are skipped:
-      return 1
-    fi
-  else
-    # always return true if threshhold is zero
-    return 0
-  fi
-}
-
-
-plugin_register SOURCE_DOWNLOAD plugin_source_download_git
-plugin_register SOURCE_NEEDREFRESH plugin_source_needrefresh_git
diff --git a/devel/gtksourcecompletion/DETAILS b/devel/gtksourcecompletion/DETAILS
deleted file mode 100644
index 96b8c4d..0000000
--- a/devel/gtksourcecompletion/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-MODULE=gtksourcecompletion
-VERSION=0.7.0
-SOURCE=$MODULE-$VERSION.tar.gz
-#SOURCE_URL=http://cloud.github.com/downloads/chuchiperriman/gtksourcecompletion
-SOURCE_URL=$SFORGE_URL/gtksourcecomple
-WEBSITE=http://gtksourcecomple.sourceforge.net
-ENTERED=20090628
-UPDATED=20090628
-SHORT="library to add autocompletion and calltips support to gtksourceview"
-cat << EOF
-GtkSourceCompletion is a library to add (auto)completion and calltips 
-support to GtkSourceView. The library manages all events, the popup 
-position etc. but it doesn't complete anything, it is the base library.
-You can develop providers for GtkSourceCompletion and the library will 
-use it to show all the proposals, the information for every proposal 
-etc.
-EOF
diff --git a/devel/vtg/DETAILS b/devel/vtg/DETAILS
deleted file mode 100644
index 6906c0c..0000000
--- a/devel/vtg/DETAILS
+++ /dev/null
@@ -1,12 +0,0 @@
-MODULE=vtg
-VERSION=0.4.1
-SOURCE=$MODULE-$VERSION.tar.bz2
-SOURCE_URL=http://vtg.googlecode.com/files/
-WEBSITE=http://vtg.googlecode.com
-ENTERED=20090628
-UPDATED=20090628
-SHORT="Vala Toys for gEdit"
-cat << EOF
-Experimental collection of plugins for gEdit to make it a better
-programmer editor for the Vala language
-EOF
diff --git a/filemanagers/worker/DEPENDS b/filemanagers/worker/DEPENDS
new file mode 100644
index 0000000..2368fd3
--- /dev/null
+++ b/filemanagers/worker/DEPENDS
@@ -0,0 +1 @@
+depends  %X
diff --git a/gnome2/bindings/glibmm/DETAILS b/gnome2/bindings/glibmm/DETAILS
index a507bb9..ee7cda1 100644
--- a/gnome2/bindings/glibmm/DETAILS
+++ b/gnome2/bindings/glibmm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=glibmm
-         VERSION=2.22.1
-           MAJOR=2.22
+         VERSION=2.20.0
+           MAJOR=2.20
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:278c19d3dfbdc8185772fb1dfdfcafc252a99da1
+      SOURCE_VFY=sha1:a3988446c4443cc944855abbc7f0851d46adc154
         WEB_SITE=http://www.gtkmm.org/
          ENTERED=20040409
-         UPDATED=20091008
+         UPDATED=20090318
            SHORT="C++ bindings for glib2"
 
 cat << EOF
diff --git a/gnome2/bindings/gtkmm/DETAILS b/gnome2/bindings/gtkmm/DETAILS
index 3761ac9..c819121 100644
--- a/gnome2/bindings/gtkmm/DETAILS
+++ b/gnome2/bindings/gtkmm/DETAILS
@@ -1,13 +1,13 @@
           MODULE=gtkmm
-         VERSION=2.18.2
-           MAJOR=2.18
+         VERSION=2.16.0
+           MAJOR=2.16
           SOURCE=$MODULE-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:ed58c6d8d0be82fc326cd67a8c2cf1762c30245e
+      SOURCE_VFY=sha1:e8cde1ebf651458c815d5e896bbae2ae4bf33d67
         WEB_SITE=http://gtkmm.org
          ENTERED=20021225
-         UPDATED=20091008
+         UPDATED=20090318
            SHORT="C++ bindings for gtk2 and glib2"
 
 cat << EOF
diff --git a/gnome2/bindings/pangomm/DETAILS b/gnome2/bindings/pangomm/DETAILS
index 2fa98e9..e205c3f 100644
--- a/gnome2/bindings/pangomm/DETAILS
+++ b/gnome2/bindings/pangomm/DETAILS
@@ -1,12 +1,12 @@
           MODULE=pangomm
-         VERSION=2.26.0
-           MAJOR=2.26
+         VERSION=2.24.0
+           MAJOR=2.24
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:3e2efea94443387d5213652d011e0d859afb8a3f
+      SOURCE_VFY=sha1:bd14185ead820f4865608c6b0a641a9b6fd2a8b1
         WEB_SITE=http://www.gtk.org
          ENTERED=20080924
-         UPDATED=20091008
+         UPDATED=20090318
            SHORT="C++ wrapper for Pango"
 
 cat << EOF
diff --git a/gnome2/desktop/gvfs/DETAILS b/gnome2/desktop/gvfs/DETAILS
index 24e5eb9..cf18f2e 100644
--- a/gnome2/desktop/gvfs/DETAILS
+++ b/gnome2/desktop/gvfs/DETAILS
@@ -1,9 +1,9 @@
           MODULE=gvfs
-           MAJOR=1.4
-         VERSION=1.4.0
+           MAJOR=1.2
+         VERSION=1.2.3
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      #SOURCE_VFY=sha1:cb66e72bf92a22cde07da9875d10d9c9eb81a23c
+      SOURCE_VFY=sha1:c94d52b0bf2fe83d7e26c05ce9d65d240cd57be4
         WEB_SITE=http://www.gnome.org/
          ENTERED=20080312
          UPDATED=20090526
diff --git a/gnome2/desktop/libsoup/DEPENDS b/gnome2/desktop/libsoup/DEPENDS
index 0bd2c24..40dfa40 100644
--- a/gnome2/desktop/libsoup/DEPENDS
+++ b/gnome2/desktop/libsoup/DEPENDS
@@ -3,4 +3,4 @@ depends  gnutls
 depends  sqlite
 depends  libproxy
 
-optional_depends gnome-keyring "" "--without-gnome" "gnome support"
+optional_depends GConf "" "--without-gnome" "gnome support"
diff --git a/graphics/gtk+-2/BUILD b/graphics/gtk+-2/BUILD
index bc57fa1..ceb4f11 100644
--- a/graphics/gtk+-2/BUILD
+++ b/graphics/gtk+-2/BUILD
@@ -1,17 +1,14 @@
 (
 
-#  if egrep -q '^#define JPEG_LIB_VERSION.*7[0-9]+' /usr/include/jpeglib.h; then
+  if egrep -q '^#define JPEG_LIB_VERSION.*7[0-9]+' /usr/include/jpeglib.h; then
     # Is 7.0 API, rather than old version 6b
     # Old patch: http://repos.archlinux.org/viewvc.cgi/gtk2/repos/extra-i686/
     # Fixes blurry jpegs: http://bugzilla.gnome.org/show_bug.cgi?id=588740
     # http://bugs.gentoo.org/show_bug.cgi?id=282744
     # Info: http://bbs.archlinux.org/viewtopic.php?id=75529
     # Original fix:  sedit "s:cinfo->scale_denom <= 8:cinfo->scale_denom <= 16:" gdk-pixbuf/io-jpeg.c
-#    patch_it $SOURCE2 0
-#  fi &&
-
-  # Quieten the "XID collision, trouble ahead" useless, spammy warning
-  patch_it $SOURCE3 1 &&
+    patch_it $SOURCE2 0
+  fi &&
 
   # Quieten the "XID collision, trouble ahead" useless, spammy warning
   patch_it $SOURCE3 1 &&
@@ -21,8 +18,6 @@
     OPTS+=" --with-xinput=yes --enable-debug=no"
   fi &&
 
-  OPTS+=" --enable-debug"
-
   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/graphics/gtk+-2/DETAILS b/graphics/gtk+-2/DETAILS
index 151480c..1b2dc99 100644
--- a/graphics/gtk+-2/DETAILS
+++ b/graphics/gtk+-2/DETAILS
@@ -1,6 +1,6 @@
           MODULE=gtk\+-2
-         VERSION=18.2
-           MAJOR=2.18
+         VERSION=16.6
+           MAJOR=2.16
           SOURCE=$MODULE.$VERSION.tar.bz2
          SOURCE2=gtk\+-2-2.16.5-jpeg7.patch.bz2
          SOURCE3=gtk\+-2.16.6-quiet-xid-collision-warning.patch.bz2
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
    SOURCE_URL[1]=ftp://ftp.gtk.org/pub/gtk/v$MAJOR
      SOURCE2_URL=$PATCH_URL
      SOURCE3_URL=$PATCH_URL
-      SOURCE_VFY=sha1:f33b9c67541de024fa3867ab41de3e25ec6d52d4
+      SOURCE_VFY=sha1:f69cb48311d60664bac7cf68351c175c7a214ae6
      SOURCE2_VFY=sha1:6981a977ea91d6dce32f444ad3b097e2ad43302b
      SOURCE3_VFY=sha1:00d7688f8dbca9543ac54a53b217242aa926c1ed
         WEB_SITE=http://www.gtk.org/
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/kde4/base/qt4/BUILD b/kde4/base/qt4/BUILD
index 60475e9..0120a93 100644
--- a/kde4/base/qt4/BUILD
+++ b/kde4/base/qt4/BUILD
@@ -4,7 +4,7 @@
   export PATH=$QTDIR/bin:$PATH
   export LD_LIBRARY_PATH=$QTDIR/lib
 
-  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure &&
+  sedit "s:COMMERCIAL_USER=ask:COMMERCIAL_USER=no:" configure
 
   if module_installed phonon ; then
     OPTS+=" -phonon -phonon-backend"
@@ -20,7 +20,9 @@
     OPTS+=" -make examples -make demos -make tools -make docs -make translations"
   fi &&
 
-  OPTS+=" -release -fast -no-separate-debug-info -script -scripttools -accessibility -pch -glib" &&
+  OPTS+=" -release -fast -no-separate-debug-info -shared -qt-gif -system-libpng -system-libjpeg   \
+          -system-libmng -system-zlib -accessibility -pch -stl -webkit -fontconfig \
+          -largefile -glib -qt3support"
 
   echo "yes" | ./configure               \
                -prefix ${MODULE_PREFIX}  \
@@ -32,7 +34,7 @@
      cd tools/qdoc3 &&
      qmake -unix -o Makefile qdoc3.pro &&
      make    &&
-     install -m 755 ../../bin/qdoc3 $MODULE_PREFIX/bin/ &&
+     install -D -m0755 qdoc3 $MODULE_PREFIX/tools/qdoc3/qdoc3 &&
      cd $SOURCE_DIRECTORY
   fi &&
 
diff --git a/kde4/base/qt4/CONFIGURE b/kde4/base/qt4/CONFIGURE
index ceb87e8..b39218a 100644
--- a/kde4/base/qt4/CONFIGURE
+++ b/kde4/base/qt4/CONFIGURE
@@ -2,4 +2,3 @@ mquery MAKE_DOCS "Build the QT4 documentation?" n "" " -nomake docs"
 mquery MAKE_EXAMPLE_DEMOS "Build exmaples and demos?" n "" "-nomake examples -nomake demos"
 mquery XML_PATTERNS "Build xml patterns? Needed by qtscriptgenerator" y "-exceptions" "-no-exceptions"
 mquery MAKE_QDOC3 "BUILD QDOC3 docs? This is needed by qt-creator." n
-mquery MAKE_WEBKIT "Build the webkit plugin?" y "-webkit" "-no-webkit"
diff --git a/kde4/base/qt4/DEPENDS b/kde4/base/qt4/DEPENDS
index 0898b4c..cd59245 100644
--- a/kde4/base/qt4/DEPENDS
+++ b/kde4/base/qt4/DEPENDS
@@ -1,17 +1,13 @@
+depends  libungif
+depends  libpng
+depends  libmng
 depends  %X
 
-optional_depends  "openssl"    "-openssl"          "-no-openssl"    "for Secure Sockets support"
-optional_depends  "libmng"     "-system-libmng"    "-qt-libmng"     "Use system or Qt version of MNG"
-optional_depends  "libpng"     "-system-libpng"    "-qt-libpng"     "Use system or Qt verion of PNG"
-optional_depends  "zlib"       "-system-zlib"      "-qt-zlib"       "Choose system or Qt version of zlib"
-optional_depends  "libungif"   "-qt-gif"           "-no-gif"        "for GIF reading support"
-optional_depends  "fontconfig" "-fontconfig"       "-no-fontconfig" "for anti alias font support"
-optional_depends  "cups"       "-cups"             "-no-cups"       "for printing support, needed by kdelibs4"
-optional_depends  "nas"        "-system-nas-sound" "-no-nas-sound"  "for Network Audio System support"
-
 optional_depends  "gst-plugins-base"  ""  ""  "for gstreamer support"
 
+optional_depends  "cups" "-cups" "-no-cups" "for printing support, needed by kdelibs4"
 
+optional_depends  "nas" "-system-nas-sound" "-no-nas-sound" "for Network Audio System support"
 
 optional_depends  "mysql"                                                    \
                   "-plugin-sql-mysql -I/usr/include/mysql -L/usr/lib/mysql"  \
diff --git a/kde4/base/qt4/DETAILS b/kde4/base/qt4/DETAILS
index fc34aa1..5a3a485 100644
--- a/kde4/base/qt4/DETAILS
+++ b/kde4/base/qt4/DETAILS
@@ -1,15 +1,15 @@
           MODULE=qt4
-         VERSION=4.6.0
-          SOURCE=qt-everywhere-opensource-src-${VERSION}.tar.gz
+         VERSION=4.5.3
+          SOURCE=qt-x11-opensource-src-${VERSION}.tar.gz
    SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source
    SOURCE_URL[1]=http://gd.tuwien.ac.at/hci/qt/source
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-everywhere-opensource-src-${VERSION}
-      SOURCE_VFY=c2cbbde83f1ebac3b8dd13a112fcad757d395041
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-opensource-src-${VERSION}
+      SOURCE_VFY=78620ffd03c83c4d86f5039ccf7b09e5c709ed25
    MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.trolltech.com/qt
          ENTERED=20020420
-         UPDATED=20091202
-#         GARBAGE=off
+         UPDATED=20091001
+         GARBAGE=off
      FTP_PASSIVE=on
       MAINTAINER=florin at lunar-linux.org
            SHORT="A C++ toolkit for application development"
diff --git a/kernel/linux-2.6-rc/BUILD b/kernel/linux-2.6-rc/BUILD
deleted file mode 100644
index 88536e6..0000000
--- a/kernel/linux-2.6-rc/BUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-(
-
-  while
-    if [ "$CONFIG_KERNEL" == "y" ]; then
-        if [ "$PREFER_XCONFIG" == "y" -a -n "$DISPLAY" ]; then
-            make xconfig || make menuconfig || make config
-        elif [ "$PREFER_MENUCONFIG" == "y" ]; then
-            make menuconfig || make config
-        else
-            make config
-        fi
-        if ! query "Repeat configuration?" n; then
-            CONFIG_KERNEL=n
-        fi
-    else
-        false
-    fi
-  do
-    true
-  done
-
-) && (
-
-  # Needed for x86_64
-  MYARCH="`arch | grep -qw i.86 && echo i386 || arch`"
-
-  echo | make oldconfig
-  LD_PRELOAD= cp .config $CONFIG_CACHE/.config.2.6.rc
-  rm -f arch/${MYARCH}/boot/bzImage
-
-  make ${MAKES:+-j$MAKES} bzImage           &&
-  make ${MAKES:+-j$MAKES} modules           &&
-  backup_mods_krnl $VERSION                    &&
-  prepare_install                           &&
-  make modules_install                      &&
-  cp arch/${MYARCH}/boot/bzImage /boot/$VERSION-`arch`  &&
-  cp System.map /boot/System.map-$VERSION-`arch`
-
-) > $C_FIFO 2>&1
diff --git a/kernel/linux-2.6-rc/CONFIGURE b/kernel/linux-2.6-rc/CONFIGURE
deleted file mode 100644
index 8fa5719..0000000
--- a/kernel/linux-2.6-rc/CONFIGURE
+++ /dev/null
@@ -1,11 +0,0 @@
-mquery PREFER_XCONFIG "Do you prefer xconfig over menuconfig?" n
-
-if [ "`get_module_config PREFER_XCONFIG`" = "y" ]; then
-    set_module_config "PREFER_MENUCONFIG" "n" ; 
-else 
-    mquery PREFER_MENUCONFIG "Do you prefer menuconfig over config?" y
-fi
-
-unset_module_config CONFIG_KERNEL
-mquery CONFIG_KERNEL "Configure linux kernel?" n
-
diff --git a/kernel/linux-2.6-rc/DEPENDS b/kernel/linux-2.6-rc/DEPENDS
deleted file mode 100644
index 5a3371a..0000000
--- a/kernel/linux-2.6-rc/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends  autoconf
-depends  module-init-tools
diff --git a/kernel/linux-2.6-rc/DETAILS b/kernel/linux-2.6-rc/DETAILS
deleted file mode 100644
index 1069402..0000000
--- a/kernel/linux-2.6-rc/DETAILS
+++ /dev/null
@@ -1,25 +0,0 @@
-          MODULE=linux-2.6-rc
-         VERSION=2.6.32-rc1
-          SOURCE=linux-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/linux-$VERSION
-   SOURCE_URL[0]=$KERNEL_URL/pub/linux/kernel/v2.6/testing
-   SOURCE_URL[1]=http://www.kernel.org/pub/linux/kernel/v2.6/testing
-      SOURCE_VFY=sha1:9f4e50878d77922c84a29be9913a8b5c3f66e6ec
-        WEB_SITE=http://www.kernel.org
-         ENTERED=20041019
-         UPDATED=20090929
-           SHORT="The core of a Linux GNU Operating System"
-     KEEP_SOURCE=on
-           TMPFS=off
-
-cat << EOF
-This is the stable version of the 2.6.x branch.
-
-Linux is a clone of the Unix kernel, written from scratch by Linus
-Torvalds with assistance from a loosely-knit team of hackers across the
-Net. It aims towards POSIX and Single UNIX Specification compliance. It
-has all the features you would expect in a modern fully-fledged Unix
-kernel, including true multitasking, virtual memory, shared libraries,
-demand loading, shared copy-on-write executables, proper memory
-management, and TCP/IP networking.
-EOF
diff --git a/kernel/linux-2.6-rc/POST_INSTALL b/kernel/linux-2.6-rc/POST_INSTALL
deleted file mode 100644
index dd6cddc..0000000
--- a/kernel/linux-2.6-rc/POST_INSTALL
+++ /dev/null
@@ -1,8 +0,0 @@
-update_bootloader $VERSION-`arch` $VERSION-`arch`
-
-#  Reinstall packages that add their own kernel modules
-
-lin -c kernel-reqs
-
-# create /sys
-mkdir -p /sys
diff --git a/kernel/linux-2.6-rc/PRE_BUILD b/kernel/linux-2.6-rc/PRE_BUILD
deleted file mode 100644
index ae8eafd..0000000
--- a/kernel/linux-2.6-rc/PRE_BUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Bail if we're not running a core with kernel functions
-
-if [ ! -e $FUNCTIONS/kernel.lunar ] ; then
-  message "${PROBLEM_COLOR}Bailing out, ${DEFAULT_COLOR}Lunar (or theedge) code version too old"
-  message "${PROBLEM_COLOR}Update core ${MODULE_COLOR}(lin lunar or lin theedge)${DEFAULT_COLOR} to install this kernel"
-  exit 1
-fi
-
-mk_source_dir $SOURCE_DIRECTORY
-rm -f /usr/src/linux
-ln -sf $SOURCE_DIRECTORY /usr/src/linux
-cd $SOURCE_DIRECTORY
-
-# Check wether we're running an up-to-date tar
-if [ `installed_version tar | cut -d. -f2` -ge 15 ]; then
-  tar xf $SOURCE_CACHE/$SOURCE --no-same-owner \
-  --no-same-permissions --strip-components=1
-else
-  message "${PROBLEM_COLOR}Error:${DEFAULT_COLOR} Please update your tar module"
-  exit 1
-fi
-
-# if we have an EXTRA patch, apply it
-if [ -n "${SOURCE2}" ]; then
-    patch_it ${SOURCE2} 1
-fi
-
-if  [ -f $CONFIG_CACHE/.config.2.6.rc ]; then
-    cp $CONFIG_CACHE/.config.2.6.rc $SOURCE_DIRECTORY/.config;
-elif [ -f $CONFIG_CACHE/.config.beta ]; then
-    cp $CONFIG_CACHE/.config.beta $SOURCE_DIRECTORY/.config;
-fi
diff --git a/libs/glib-2/DETAILS b/libs/glib-2/DETAILS
index 661e2dd..e832095 100644
--- a/libs/glib-2/DETAILS
+++ b/libs/glib-2/DETAILS
@@ -8,7 +8,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE.$VERSION
       SOURCE_VFY=sha1:bdd9c4b930e81203ea69fe83876cb6c82bdc5a38
         WEB_SITE=http://www.gtk.org/
          ENTERED=20020313
-         UPDATED=20090930
+         UPDATED=20091009
            SHORT="A library of useful C routines for trees, hashes, and lists"
 
 cat << EOF
diff --git a/profiles/kde4/DEPENDS b/profiles/kde4/DEPENDS
index 7cf7cfc..8aab302 100644
--- a/profiles/kde4/DEPENDS
+++ b/profiles/kde4/DEPENDS
@@ -1,11 +1,10 @@
-depends  kdepimlibs4
 depends  kdelibs4-experimental
 depends  kdebase4-runtime
 depends  kdebase4-workspace
 depends  kdebase4
-depends  kdepim4-runtime
 depends  oxygen-icons
 
+optional_depends  "kdepim4-runtime"    ""  ""  "for PIM support"
 optional_depends  "kdebindings4"       ""  ""  "bindings to languages"
 optional_depends  "kdegames4"          ""  ""  "games"
 optional_depends  "kdegraphics4"       ""  ""  "graphics applications"
diff --git a/qt4-apps/qt-creator/BUILD b/qt4-apps/qt-creator/BUILD
index 952485d..52d14a3 100644
--- a/qt4-apps/qt-creator/BUILD
+++ b/qt4-apps/qt-creator/BUILD
@@ -3,12 +3,12 @@
   source /etc/profile.d/qt4.rc &&
   source /etc/profile.d/kde4.rc &&
 
-  QT_CREATOR_BLD="$SOURCE_DIRECTORY/creator-build" &&
+  QT_CREATOR_BLD="$SOURCE_DIRECTORY/creator-build"
 
   mkdir $QT_CREATOR_BLD &&
   cd $QT_CREATOR_BLD    &&
 
-  qmake $SOURCE_DIRECTORY/qtcreator.pro &&
+  qmake $SOURCE_DIRECTORY/qtcreator.pro
 
   make            &&
   prepare_install &&
diff --git a/qt4-apps/qt-creator/DETAILS b/qt4-apps/qt-creator/DETAILS
index 7ace002..7a5fc8e 100644
--- a/qt4-apps/qt-creator/DETAILS
+++ b/qt4-apps/qt-creator/DETAILS
@@ -1,12 +1,12 @@
           MODULE=qt-creator
-         VERSION=1.3.0
+         VERSION=1.2.1-src
           SOURCE=$MODULE-$VERSION.tar.gz
    SOURCE_URL[0]=http://download.qtsoftware.com/qtcreator/
-      SOURCE_VFY=sha1:ccb1228411b9b7d5f3a734ee1a667b4a17ef0a26
+      SOURCE_VFY=sha1:eaa8dbdb6bee9def91df302ff13ba26e70ffcb38
    MODULE_PREFIX=${QT4_PREFIX:-/opt/lunar/qt/4}
         WEB_SITE=http://www.qtsoftware.com/products/developer-tools/developer-tools
          ENTERED=20090303
-         UPDATED=20091203
+         UPDATED=20090827
            SHORT="cross-platform integrated development environment"
 
 cat << EOF
diff --git a/sql/phpMyAdmin/DETAILS b/sql/phpMyAdmin/DETAILS
index e2ec401..1324f16 100644
--- a/sql/phpMyAdmin/DETAILS
+++ b/sql/phpMyAdmin/DETAILS
@@ -1,13 +1,13 @@
           MODULE=phpMyAdmin
-         VERSION=3.2.4
+         VERSION=3.2.3
          RELEASE=$VERSION-all-languages
           SOURCE=$MODULE-$RELEASE.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$RELEASE
       SOURCE_URL=$SFORGE_URL/phpmyadmin
-      SOURCE_VFY=sha1:ac9239755c294d15569af99f227b124bd578faf2
+      SOURCE_VFY=sha1:d99b1098c7cb3454f95dced25574bde0c7fd78ca
         WEB_SITE=http://www.phpmyadmin.net/home_page
          ENTERED=20040912
-         UPDATED=20091203
+         UPDATED=20091030
            SHORT="A php web interface to administrate MySQL tables"
 
 cat << EOF
diff --git a/video/xbmc/DEPENDS b/video/xbmc/DEPENDS
deleted file mode 100644
index cdf3a5a..0000000
--- a/video/xbmc/DEPENDS
+++ /dev/null
@@ -1,14 +0,0 @@
-depends glew
-depends fribidi
-depends mysql
-depends lzo
-depends libcdio
-depends SDL
-depends SDL_image
-depends SDL_mixer
-depends enca
-depends jasper
-depends boost
-depends quilt
-depends libsamplerate
-depends libmms
diff --git a/video/xbmc/DETAILS b/video/xbmc/DETAILS
deleted file mode 100644
index 530239b..0000000
--- a/video/xbmc/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-#http://heanet.dl.sourceforge.net/sourceforge/xbmc/XBMC_9.04_Babylon-linux-osx-win32.tar.bz2
-MODULE=xbmc
-VERSION=svn
-SOURCE=XBMC.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/XBMC
-SOURCE_URL=svn+http://xmbc.svn.sourceforge.net/svnroot/xbmc/trunk:XBMC
-ENTERED=20090517
-UPDATED=20090517
-PSAFE=no
-SHORT="XBMC"
-
-cat << EOF
-XBMC
-
-EOF
-
diff --git a/x11-utils/gparted/DETAILS b/x11-utils/gparted/DETAILS
index 97cd83f..c04f01d 100644
--- a/x11-utils/gparted/DETAILS
+++ b/x11-utils/gparted/DETAILS
@@ -1,11 +1,11 @@
           MODULE=gparted
-         VERSION=0.5.0
+         VERSION=0.4.8
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE
-      SOURCE_VFY=sha1:9181cc26a8242de32395c9bea3e136eed06874f2
+      SOURCE_VFY=sha1:2b963967110a65d7f4496e3f32f612ae97025f7f
         WEB_SITE=http://gparted.sourceforge.net
          ENTERED=20050109
-         UPDATED=20091204
+         UPDATED=20091103
            SHORT="A graphical frontend to parted"
 
 cat << EOF
diff --git a/x11/fglrx/BUILD b/x11/fglrx/BUILD
index f159d46..63e95cb 100644
--- a/x11/fglrx/BUILD
+++ b/x11/fglrx/BUILD
@@ -4,7 +4,7 @@
   sh $SOURCE --extract fglrx-install &&
   cd fglrx-install &&
 
-  # patch_it $SOURCE2 1 &&
+  patch_it $SOURCE2 1 &&
 
   # We build the kernel BEFORE actually calling prepare install
   # so it doesn't remove a working driver incase the kernel module
diff --git a/x11/fglrx/DETAILS b/x11/fglrx/DETAILS
index 0c07cbb..a60b8c2 100644
--- a/x11/fglrx/DETAILS
+++ b/x11/fglrx/DETAILS
@@ -1,15 +1,14 @@
           MODULE=fglrx
-         VERSION=9.10
-          SOURCE=ati-driver-installer-9-10-x86.x86_64.run
-         #SOURCE2=find_task_by_vpid.patch
+         VERSION=9.4
+          SOURCE=ati-driver-installer-9-4-x86.x86_64.run
+         SOURCE2=02-2.6.29-support.dpatch
       SOURCE_URL=https://www2.ati.com/drivers/linux/
-     #SOURCE2_URL=$PATCH_URL
-      SOURCE_VFY=sha1:d4188de2c44f2960f7a7ddc3c837206863509062
-#SOURCE2_VFY=sha1:9dc9c2ef5bd2101c2e66419c3b56745ac4ad848b
+     SOURCE2_URL=$PATCH_URL
+      SOURCE_VFY=sha1:730e9e78e4bb20994549c8f7eb539fe223bb1a69
+     SOURCE2_VFY=sha1:9dc9c2ef5bd2101c2e66419c3b56745ac4ad848b
         WEB_SITE=http://ati.amd.com/
          ENTERED=20040220
-         UPDATED=20091101
-         KEEP_SOURCE=on
+         UPDATED=20090421
          LICENSE="proprietary"
            SHORT="Proprietary X.org driver for the AMD ATI Radeon GPUs"
 cat << EOF
diff --git a/x11/synaptics/BUILD b/x11/synaptics/BUILD
new file mode 100644
index 0000000..06b642f
--- /dev/null
+++ b/x11/synaptics/BUILD
@@ -0,0 +1,8 @@
+(
+  patch_it $SOURCE2 1
+
+  sedit 's/\/usr\/local/\/usr/' Makefile &&
+  
+  default_make
+
+) > $C_FIFO 2>&1
diff --git a/x11/synaptics/DETAILS b/x11/synaptics/DETAILS
new file mode 100644
index 0000000..a6752bd
--- /dev/null
+++ b/x11/synaptics/DETAILS
@@ -0,0 +1,19 @@
+          MODULE=synaptics
+         VERSION=0.14.6
+          SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=$MODULE-$VERSION-xorg-server-1.4-1.patch.bz2
+      SOURCE_URL=http://web.telia.com/~u89404340/touchpad/files/
+     SOURCE2_URL=$PATCH_URL      
+      SOURCE_VFY=sha1:41443e253e73546657b40435c8c9bfa0a91662bc
+     SOURCE2_VFY=sha1:8bd30d2fbc46013be436a5f50b628709ef21cd2e
+        WEB_SITE=http://web.telia.com/~u89404340/touchpad/
+         ENTERED=20050307
+         UPDATED=20070911
+           SHORT="Synaptics TouchPad driver for XOrg/XFree86"
+
+cat << EOF
+This is a driver for the Synaptics TouchPad for XOrg/XFree86
+4.x. A Synaptics touchpad by default operates in compatibility
+mode by emulating a standard mouse. However, by using a dedicated
+driver, more advanced features of the touchpad becomes available.
+EOF
diff --git a/xfce4/apps/Terminal/DEPENDS b/xfce4/apps/Terminal/DEPENDS
new file mode 100644
index 0000000..72b544e
--- /dev/null
+++ b/xfce4/apps/Terminal/DEPENDS
@@ -0,0 +1,5 @@
+depends  XML-Parser
+depends  exo
+depends  vte
+
+optional_depends  "dbus-glib"  "--enable-dbus"  "--disable-dbus"  "For DBUS support"
diff --git a/xfce4/apps/Terminal/DETAILS b/xfce4/apps/Terminal/DETAILS
new file mode 100644
index 0000000..d7eec8c
--- /dev/null
+++ b/xfce4/apps/Terminal/DETAILS
@@ -0,0 +1,20 @@
+          MODULE=Terminal
+           MAJOR=0.4
+         VERSION=0.4.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/src/apps/terminal/$MAJOR/
+      SOURCE_VFY=sha1:bf4510e331284d7f68ba193fe1d6f2e57b7815bb
+   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
+        WEB_SITE=http://www.xfce.org/projects/terminal
+         ENTERED=20040930
+         UPDATED=20091005
+           SHORT="vte-based gtk+-2 lightweight X-terminal"
+
+cat << EOF
+Terminal is a modern terminal emulator for the Unix/Linux desktop -
+primarily for the Xfce desktop environment. We developed it because
+we saw the need for a lightweight and easy-to-use terminal emulator
+in the Xfce desktop environment, that doesn't require the user to
+install the GNOME platform, but still provides a worthy alternative
+to the GNOME terminal emulator.
+EOF
diff --git a/xfce4/apps/mousepad/DETAILS b/xfce4/apps/mousepad/DETAILS
index 3e9f213..b985816 100644
--- a/xfce4/apps/mousepad/DETAILS
+++ b/xfce4/apps/mousepad/DETAILS
@@ -1,19 +1,14 @@
           MODULE=mousepad
-         VERSION="svn-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE          
-     SOURCE_URL=git+http://git.xfce.org/apps/$MODULE
+         VERSION=0.2.16
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-4.6.1/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/ristretto/BUILD b/xfce4/apps/ristretto/BUILD
index a086dca..c5d54db 100644
--- a/xfce4/apps/ristretto/BUILD
+++ b/xfce4/apps/ristretto/BUILD
@@ -4,6 +4,9 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   default_cvs_build 
+#   ./autogen.sh --prefix=/usr && 
+default_cvs_build 
+
+#   default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/apps/ristretto/DETAILS b/xfce4/apps/ristretto/DETAILS
index 6fbfeba..bc2b630 100644
--- a/xfce4/apps/ristretto/DETAILS
+++ b/xfce4/apps/ristretto/DETAILS
@@ -1,13 +1,12 @@
           MODULE=ristretto
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git://git.xfce.org/apps/$MODULE:$MODULE
+         VERSION=0.0.22
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=http://goodies.xfce.org/releases/$MODULE
+      SOURCE_VFY=sha1:bddbc8618ba67699ccf5ee4ea0b538b1be7fdb0a
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://goodies.xfce.org/projects/applications/ristretto
          ENTERED=20070826
-         UPDATED=20090428
-	 PSAFE=no
+         UPDATED=20090519
            SHORT="fast and lightweight picture-viewer"
 
 cat << EOF
diff --git a/xfce4/apps/terminal/BUILD b/xfce4/apps/terminal/BUILD
deleted file mode 100644
index c59a75a..0000000
--- a/xfce4/apps/terminal/BUILD
+++ /dev/null
@@ -1,9 +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}"  &&
-
-   default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/apps/terminal/DEPENDS b/xfce4/apps/terminal/DEPENDS
deleted file mode 100644
index 72b544e..0000000
--- a/xfce4/apps/terminal/DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-depends  XML-Parser
-depends  exo
-depends  vte
-
-optional_depends  "dbus-glib"  "--enable-dbus"  "--disable-dbus"  "For DBUS support"
diff --git a/xfce4/apps/terminal/DETAILS b/xfce4/apps/terminal/DETAILS
deleted file mode 100644
index 70228be..0000000
--- a/xfce4/apps/terminal/DETAILS
+++ /dev/null
@@ -1,19 +0,0 @@
-          MODULE=terminal
-         VERSION=git-`date +%Y%U`
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/apps/$MODULE
-   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://www.os-cillation.com
-         ENTERED=20090908
-         UPDATED=20090908
-           SHORT="vte based/gtk+-2 lightweight X-terminal"
-
-cat << EOF
-Terminal is a modern terminal emulator for the Unix/Linux desktop -
-primarily for the Xfce desktop environment. We developed it because
-we saw the need for a lightweight and easy-to-use terminal emulator
-in the Xfce desktop environment, that doesn't require the user to
-install the GNOME platform, but still provides a worthy alternative
-to the GNOME terminal emulator.
-EOF
diff --git a/xfce4/apps/tumbler/BUILD b/xfce4/apps/tumbler/BUILD
deleted file mode 100644
index a086dca..0000000
--- a/xfce4/apps/tumbler/BUILD
+++ /dev/null
@@ -1,9 +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}" &&
-
-   default_cvs_build 
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/apps/tumbler/DETAILS b/xfce4/apps/tumbler/DETAILS
deleted file mode 100644
index aeb0c40..0000000
--- a/xfce4/apps/tumbler/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-          MODULE=tumbler
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git://git.xfce.org/apps/$MODULE
-   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://www.xfce.org
-         ENTERED=20090607
-         UPDATED=20090607
-	 PSAFE=no
-           SHORT="thumbnailing service"
-
-cat << EOF
-A D-Bus thumbnailing service based on the thumbnail management D-Bus
-specification
-EOF
diff --git a/xfce4/apps/xarchiver/DETAILS b/xfce4/apps/xarchiver/DETAILS
index fc7a258..762ad91 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.5.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=$SFORGE_URL/$MODULE
+      SOURCE_VFY=sha1:8c8f0ee82c93abcdcf9974fa30611aa05fa51bd0
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://xarchiver.xfce.org
          ENTERED=20060407
-         UPDATED=20071207
+         UPDATED=20090420
            SHORT="A simple archive manager"
 
 cat << EOF
diff --git a/xfce4/apps/xfburn/BUILD b/xfce4/apps/xfburn/BUILD
deleted file mode 100644
index c59a75a..0000000
--- a/xfce4/apps/xfburn/BUILD
+++ /dev/null
@@ -1,9 +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}"  &&
-
-   default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/apps/xfburn/DETAILS b/xfce4/apps/xfburn/DETAILS
index 0a1097a..cac2953 100644
--- a/xfce4/apps/xfburn/DETAILS
+++ b/xfce4/apps/xfburn/DETAILS
@@ -1,12 +1,13 @@
           MODULE=xfburn
-         VERSION=git-`date +%Y%U`
-          SOURCE=$MODULE.tar.bz2
-      SOURCE_URL=git+http://git.xfce.org/apps/$MODULE
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
+         VERSION=0.4.2
+          SOURCE=$MODULE-$VERSION.tar.bz2
+   SOURCE_URL[0]=http://goodies.xfce.org/releases/$MODULE
+   SOURCE_URL[1]=http://mocha.xfce.org/archive/src/apps/xfburn/0.4
+      SOURCE_VFY=sha1:dbc1731b8c690b0b29d3567b8e1cd93646b0c7e7
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://goodies.xfce.org/projects/applications/xfburn
-         ENTERED=20090908
-         UPDATED=20090908
+         ENTERED=20090227
+         UPDATED=20091011
            SHORT="Cd burning application for Xfce"
 
 cat << EOF
diff --git a/xfce4/apps/xfce4-power-manager/DETAILS b/xfce4/apps/xfce4-power-manager/DETAILS
index fd53080..624b639 100644
--- a/xfce4/apps/xfce4-power-manager/DETAILS
+++ b/xfce4/apps/xfce4-power-manager/DETAILS
@@ -1,6 +1,5 @@
           MODULE=xfce4-power-manager
          VERSION=0.8.4
-         VERSION=0.8.0
           SOURCE=$MODULE-$VERSION.tar.bz2
    SOURCE_URL[0]=http://goodies.xfce.org/releases/$MODULE
    SOURCE_URL[1]=http://mocha.xfce.org/archive/src/apps/$MODULE/0.8/
diff --git a/xfce4/apps/xfce4-taskmanager/BUILD b/xfce4/apps/xfce4-taskmanager/BUILD
index 0e0cc75..0a2dd59 100644
--- a/xfce4/apps/xfce4-taskmanager/BUILD
+++ b/xfce4/apps/xfce4-taskmanager/BUILD
@@ -4,9 +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                                        \
-                --prefix=${MODULE_PREFIX}        \
-                $OPTS                                           &&
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
 
    default_make
 
diff --git a/xfce4/apps/xfce4-taskmanager/DETAILS b/xfce4/apps/xfce4-taskmanager/DETAILS
index ebe5f99..20d84f1 100644
--- a/xfce4/apps/xfce4-taskmanager/DETAILS
+++ b/xfce4/apps/xfce4-taskmanager/DETAILS
@@ -1,13 +1,13 @@
           MODULE=xfce4-taskmanager
-         VERSION="svn-`date +%Y%U`"
+         VERSION=0.4.1
           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:e93824f9e9a369f6353f4b22251ff7f18468dbd4
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20061124
-         UPDATED=20071207
-           SHORT="taskmanager for the Xfce Desktop Environment"
+         UPDATED=20090420
+           SHORT="A task manager for the XFCE"
 
 cat << EOF
 Xfce4-taskmanager is a simple taskmanager for the Xfce Desktop 
diff --git a/xfce4/core/Thunar/BUILD b/xfce4/core/Thunar/BUILD
index 0e0cc75..0a2dd59 100644
--- a/xfce4/core/Thunar/BUILD
+++ b/xfce4/core/Thunar/BUILD
@@ -4,9 +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                                        \
-                --prefix=${MODULE_PREFIX}        \
-                $OPTS                                           &&
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
 
    default_make
 
diff --git a/xfce4/core/Thunar/DETAILS b/xfce4/core/Thunar/DETAILS
index a906c6c..d20d663 100644
--- a/xfce4/core/Thunar/DETAILS
+++ b/xfce4/core/Thunar/DETAILS
@@ -1,13 +1,12 @@
           MODULE=Thunar
-             MOD=thunar
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MOD.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD          
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MOD:$MOD
+         VERSION=1.0.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-4.6.1/src
+      SOURCE_VFY=sha1:2fcd3a7b0e27b01f059dffc8ffdac94e2b2aa064
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://thunar.xfce.org
          ENTERED=20060407
-         UPDATED=20071207
+         UPDATED=20090424
            SHORT="File manager for xfce"
 
 cat << EOF
diff --git a/xfce4/core/exo/BUILD b/xfce4/core/exo/BUILD
index ab1b04b..f06db4c 100644
--- a/xfce4/core/exo/BUILD
+++ b/xfce4/core/exo/BUILD
@@ -1,10 +1,7 @@
 (
-   [ -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}" &&
-   
   OPTS+=" --disable-static"  &&
-   default_cvs_build 
+
+  default_build
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/exo/DETAILS b/xfce4/core/exo/DETAILS
index 30c66a7..0831a2f 100644
--- a/xfce4/core/exo/DETAILS
+++ b/xfce4/core/exo/DETAILS
@@ -1,12 +1,13 @@
           MODULE=exo
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=0.3.104
+          MAJOR=$(echo $VERSION | cut -d. -f1,2)
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://archive.xfce.org/src/xfce/exo/$MAJOR/
+      SOURCE_VFY=sha1:ddd49dc4efd32697c195f2790c8459b5f2b7e624
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.os-cillation.de/en/open-source-projekte/libexo/
          ENTERED=20040930
-         UPDATED=20071207
+         UPDATED=20091008
            SHORT="the Xfce extension library"
 
 cat << EOF
diff --git a/xfce4/core/libxfce4menu/BUILD b/xfce4/core/libxfce4menu/BUILD
deleted file mode 100644
index c59a75a..0000000
--- a/xfce4/core/libxfce4menu/BUILD
+++ /dev/null
@@ -1,9 +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}"  &&
-
-   default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfce4menu/DETAILS b/xfce4/core/libxfce4menu/DETAILS
index add5438..cd3c84b 100644
--- a/xfce4/core/libxfce4menu/DETAILS
+++ b/xfce4/core/libxfce4menu/DETAILS
@@ -1,13 +1,13 @@
-          MODULE=libxfce4menu
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$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.1
+        SOURCE=$MODULE-$VERSION.tar.bz2
+    SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+    SOURCE_VFY=sha1:17348f661c04e8d8d633b8831638d38987269e9a
+ MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
+      WEB_SITE=http://www.xfce.org
+       ENTERED=20090227
+       UPDATED=20090424
+         SHORT="A menu library for Xfce"
 
 cat << EOF
 A menu library for Xfce.
diff --git a/xfce4/core/libxfce4ui/BUILD b/xfce4/core/libxfce4ui/BUILD
deleted file mode 100644
index 5ca1695..0000000
--- a/xfce4/core/libxfce4ui/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}        \
-                --enable-xinerama                                \
-                $OPTS                                           &&
-
-   default_make
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfce4ui/DEPENDS b/xfce4/core/libxfce4ui/DEPENDS
deleted file mode 100644
index 8d7aad5..0000000
--- a/xfce4/core/libxfce4ui/DEPENDS
+++ /dev/null
@@ -1,7 +0,0 @@
-depends  gtk+-2
-depends  libxml2
-depends  libxfce4util
-
-# not real depends, but we really want them
-depends  gtk-xfce-engine
-depends  xfce4-icon-theme
diff --git a/xfce4/core/libxfce4ui/DETAILS b/xfce4/core/libxfce4ui/DETAILS
deleted file mode 100644
index bb1093c..0000000
--- a/xfce4/core/libxfce4ui/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=libxfce4ui
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
-   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://www.xfce.org
-         ENTERED=20090908
-         UPDATED=20090908
-           SHORT="Widget library for Xfce4"
-
-cat << EOF
-libxfcegui4 -- Library that provides extra widgets and graphical user
-interface functions to the Xfce4 desktop environment.
-EOF
diff --git a/xfce4/core/libxfce4util/BUILD b/xfce4/core/libxfce4util/BUILD
index c59a75a..dedae22 100644
--- a/xfce4/core/libxfce4util/BUILD
+++ b/xfce4/core/libxfce4util/BUILD
@@ -1,9 +1,10 @@
 (
    [ -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}"  &&
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
 
-   default_cvs_build
+   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfce4util/DETAILS b/xfce4/core/libxfce4util/DETAILS
index f687ce8..751ad6b 100644
--- a/xfce4/core/libxfce4util/DETAILS
+++ b/xfce4/core/libxfce4util/DETAILS
@@ -1,8 +1,8 @@
           MODULE=libxfce4util
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=4.6.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+      SOURCE_VFY=sha1:6d14099aa095b2f5d9b6a4348968b741b9ad661d
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
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 68281e0..7018248 100644
--- a/xfce4/core/libxfcegui4/BUILD
+++ b/xfce4/core/libxfcegui4/BUILD
@@ -4,6 +4,11 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" &&
 
-   default_cvs_build
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                --enable-xinerama          \
+                $OPTS                     &&
+
+   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/libxfcegui4/DEPENDS b/xfce4/core/libxfcegui4/DEPENDS
new file mode 100644
index 0000000..2a855c9
--- /dev/null
+++ b/xfce4/core/libxfcegui4/DEPENDS
@@ -0,0 +1,9 @@
+depends  gtk+-2
+depends  libxml2
+depends  libxfce4util
+depends  xfconf
+depends  libglade
+
+# not real depends, but we really want them
+depends  gtk-xfce-engine
+depends  xfce4-icon-theme
diff --git a/xfce4/core/libxfcegui4/DETAILS b/xfce4/core/libxfcegui4/DETAILS
index aac4eb3..4c20ea4 100644
--- a/xfce4/core/libxfcegui4/DETAILS
+++ b/xfce4/core/libxfcegui4/DETAILS
@@ -1,12 +1,12 @@
           MODULE=libxfcegui4
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=4.6.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+      SOURCE_VFY=sha1:82bcfe74dd3b9188b9f41d8fa7dc4a8481461696
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090424
            SHORT="Widget library for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/thunar-vfs/BUILD b/xfce4/core/thunar-vfs/BUILD
deleted file mode 100644
index 0e0cc75..0000000
--- a/xfce4/core/thunar-vfs/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/thunar-vfs/DEPENDS b/xfce4/core/thunar-vfs/DEPENDS
deleted file mode 100644
index 62ad17c..0000000
--- a/xfce4/core/thunar-vfs/DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-depends exo
-depends eject
-depends shared-mime-info
-depends desktop-file-utils
-
-optional_depends gamin "" "" "For filesystem change updates"
diff --git a/xfce4/core/thunar-vfs/DETAILS b/xfce4/core/thunar-vfs/DETAILS
deleted file mode 100644
index 1b37c3f..0000000
--- a/xfce4/core/thunar-vfs/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=thunar-vfs
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE
-   MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
-        WEB_SITE=http://thunar.xfce.org
-         ENTERED=20060407
-         UPDATED=20071207
-           SHORT="File manager for xfce"
-
-cat << EOF
-Thunar is the default file manager for Xfce.
-EOF
diff --git a/xfce4/core/xfce-utils/BUILD b/xfce4/core/xfce-utils/BUILD
index c59a75a..0a2dd59 100644
--- a/xfce4/core/xfce-utils/BUILD
+++ b/xfce4/core/xfce-utils/BUILD
@@ -4,6 +4,10 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
 
-   default_cvs_build
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
+
+   default_make
 
 ) > $C_FIFO 2>&1
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 bd7f30d..9964e47 100644
--- a/xfce4/core/xfce-utils/DETAILS
+++ b/xfce4/core/xfce-utils/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce-utils
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=4.6.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+      SOURCE_VFY=sha1:0bdb5b6e494f15372d8c0826ac93baca476c9f16
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090424
            SHORT="Essential utilities for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfce4-dev-tools/BUILD b/xfce4/core/xfce4-dev-tools/BUILD
index c6983ea..dedae22 100644
--- a/xfce4/core/xfce4-dev-tools/BUILD
+++ b/xfce4/core/xfce4-dev-tools/BUILD
@@ -1,6 +1,10 @@
 (
    [ -f /etc/profile.d/xfce4.rc ] && . /etc/profile.d/xfce4.rc
 
-   default_cvs_build
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
+
+   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-dev-tools/DETAILS b/xfce4/core/xfce4-dev-tools/DETAILS
index 2b872a1..bfdf924 100644
--- a/xfce4/core/xfce4-dev-tools/DETAILS
+++ b/xfce4/core/xfce4-dev-tools/DETAILS
@@ -1,13 +1,13 @@
           MODULE=xfce4-dev-tools
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$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
diff --git a/xfce4/core/xfce4-panel/BUILD b/xfce4/core/xfce4-panel/BUILD
index c59a75a..0a2dd59 100644
--- a/xfce4/core/xfce4-panel/BUILD
+++ b/xfce4/core/xfce4-panel/BUILD
@@ -4,6 +4,10 @@
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
 
-   default_cvs_build
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
+
+   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-panel/DETAILS b/xfce4/core/xfce4-panel/DETAILS
index de98c38..8bc671f 100644
--- a/xfce4/core/xfce4-panel/DETAILS
+++ b/xfce4/core/xfce4-panel/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce4-panel
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=4.6.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+      SOURCE_VFY=sha1:613c66f6402feba7983a7effb008f091182350d2
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20091012
            SHORT="Xfce4 panel"
 
 cat << EOF
diff --git a/xfce4/core/xfce4-session/BUILD b/xfce4/core/xfce4-session/BUILD
index 87730cd..762557c 100644
--- a/xfce4/core/xfce4-session/BUILD
+++ b/xfce4/core/xfce4-session/BUILD
@@ -1,8 +1,15 @@
 (
    [ -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}"  &&
 
-   default_cvs_build
+   PATH="$PATH:/usr/X11/bin"
+
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
+
+   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfce4-session/DEPENDS b/xfce4/core/xfce4-session/DEPENDS
index c9cfb80..1bda173 100644
--- a/xfce4/core/xfce4-session/DEPENDS
+++ b/xfce4/core/xfce4-session/DEPENDS
@@ -1,7 +1,5 @@
-
 depends xfconf
 depends libxfce4util
 depends libxfcegui4
 
 optional_depends fortune "" "" "so xfce4-tips can give you the fortune of the day"
-
diff --git a/xfce4/core/xfce4-session/DETAILS b/xfce4/core/xfce4-session/DETAILS
index 9b1ff97..73d3637 100644
--- a/xfce4/core/xfce4-session/DETAILS
+++ b/xfce4/core/xfce4-session/DETAILS
@@ -1,12 +1,13 @@
           MODULE=xfce4-session
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=4.6.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+      SOURCE_VFY=sha1:760e05bf73783521b3ce34e91aa187c74018ab8c
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20090227
+         UPDATED=20090424
+           PSAFE=no
            SHORT="Session manager for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfce4-settings/BUILD b/xfce4/core/xfce4-settings/BUILD
index 5ca1695..df25364 100644
--- a/xfce4/core/xfce4-settings/BUILD
+++ b/xfce4/core/xfce4-settings/BUILD
@@ -1,13 +1,13 @@
 (
    [ -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}        \
-                --enable-xinerama                                \
-                $OPTS                                           &&
+   # tchan added this patch to fix the incorrect pkg-config check for libXi.
+   # This should be removed when the xfce4 devs get around to fixing this correctly
+   patch_it $SOURCE_CACHE/$SOURCE2 1  &&
+   autoconf &&
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
 
    default_make
 
diff --git a/xfce4/core/xfce4-settings/DEPENDS b/xfce4/core/xfce4-settings/DEPENDS
index 035519c..c69cde0 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
 
diff --git a/xfce4/core/xfce4-settings/DETAILS b/xfce4/core/xfce4-settings/DETAILS
index 6d04f00..3a54c09 100644
--- a/xfce4/core/xfce4-settings/DETAILS
+++ b/xfce4/core/xfce4-settings/DETAILS
@@ -1,14 +1,19 @@
           MODULE=xfce4-settings
-         VERSION=git-`date +%Y%U`
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE
+           MAJOR=4.6
+         VERSION=4.6.3
+          SOURCE=$MODULE-$VERSION.tar.bz2
+         SOURCE2=$MODULE-4.6.1-libxi-patch.diff
+      SOURCE_URL=http://www.xfce.org/archive/src/xfce/$MODULE/$MAJOR
+     SOURCE2_URL=$PATCH_URL 
+      SOURCE_VFY=sha1:8a7f114ae5cab071668937351a0b3b4be1b9b51c
+     SOURCE2_VFY=sha1:78672e11b205e388127f977f8b8e43991829abe3
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
-         ENTERED=20080705
-         UPDATED=20080705
-           SHORT="Something that does something"
+         ENTERED=20090227
+         UPDATED=20090929
+           SHORT="Xfce settings manager"
 
 cat << EOF
-Something that does that other thing
+Xfce settings manager.
 EOF
+
diff --git a/xfce4/core/xfconf/BUILD b/xfce4/core/xfconf/BUILD
deleted file mode 100644
index 68281e0..0000000
--- a/xfce4/core/xfconf/BUILD
+++ /dev/null
@@ -1,9 +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}" &&
-
-   default_cvs_build
-
-) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfconf/DETAILS b/xfce4/core/xfconf/DETAILS
index f128154..5a6b988 100644
--- a/xfce4/core/xfconf/DETAILS
+++ b/xfce4/core/xfconf/DETAILS
@@ -1,14 +1,15 @@
-          MODULE=xfconf
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$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.1
+        SOURCE=$MODULE-$VERSION.tar.bz2
+    SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+    SOURCE_VFY=sha1:6df092942c5c5af5d65a58589fb85e29755a37ee
+ MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
+      WEB_SITE=http://www.xfce.org
+       ENTERED=20090227
+       UPDATED=20090424
+         SHORT="Configuration system for Xfce"
 
 cat << EOF
 Configuration storage system for Xfce
 EOF
+
diff --git a/xfce4/core/xfdesktop/BUILD b/xfce4/core/xfdesktop/BUILD
index 808c271..0a2dd59 100644
--- a/xfce4/core/xfdesktop/BUILD
+++ b/xfce4/core/xfdesktop/BUILD
@@ -3,8 +3,11 @@
 
    # make sure proper PKG_CONFIG_PATH is set
    export PKG_CONFIG_PATH="${MODULE_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"  &&
-   OPTS+=" --enable-debug"
 
-   default_cvs_build
+   ./configure  --build=$BUILD             \
+                --prefix=${MODULE_PREFIX}  \
+                $OPTS                     &&
+
+   default_make
 
 ) > $C_FIFO 2>&1
diff --git a/xfce4/core/xfdesktop/DEPENDS b/xfce4/core/xfdesktop/DEPENDS
index ec6d557..dc5b4fe 100644
--- a/xfce4/core/xfdesktop/DEPENDS
+++ b/xfce4/core/xfdesktop/DEPENDS
@@ -1,5 +1,5 @@
 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 7a08458..6a28c4f 100644
--- a/xfce4/core/xfdesktop/DETAILS
+++ b/xfce4/core/xfdesktop/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfdesktop
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=4.6.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+      SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+      SOURCE_VFY=sha1:c2c1b54acaae924077caa3cdffe449e3bb34b2bd
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090424
            SHORT="Desktop manager for Xfce4"
 
 cat << EOF
diff --git a/xfce4/core/xfwm4/BUILD b/xfce4/core/xfwm4/BUILD
index e1765b1..bb4d418 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 f00c2fe..6b438bf 100644
--- a/xfce4/core/xfwm4/DETAILS
+++ b/xfce4/core/xfwm4/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfwm4
-         VERSION="git-`date +%Y%U`"
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-     SOURCE_URL=git+http://git.xfce.org/xfce/$MODULE:$MODULE
+         VERSION=4.6.1
+          SOURCE=$MODULE-$VERSION.tar.bz2
+     SOURCE_URL=http://www.xfce.org/archive/xfce-$VERSION/src
+     SOURCE_VFY=sha1:236622ffddd4618b94eaba8f402c0c48bdcef929
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20030715
-         UPDATED=20071207
+         UPDATED=20090424
            SHORT="Window manager for Xfce4"
 
 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..be7e6f4 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.5.3.3
+          SOURCE=$MODULE-$VERSION.tar.gz
+      SOURCE_URL=http://goodies.xfce.org/releases/$MODULE/
+      SOURCE_VFY=sha1:5e83d55cd6f14a62a87ccadd0f11eee070a6f4a7
    MODULE_PREFIX=${XFCE4_PREFIX:-/usr}
         WEB_SITE=http://www.xfce.org
          ENTERED=20061124
-         UPDATED=20081015
+         UPDATED=20090618
            SHORT="keyboard layout switcher"
 
 cat << EOF
diff --git a/xfce4/xfce4/DEPENDS b/xfce4/xfce4/DEPENDS
index 7ca6ca9..3ab1156 100644
--- a/xfce4/xfce4/DEPENDS
+++ b/xfce4/xfce4/DEPENDS
@@ -7,5 +7,5 @@ depends xfdesktop
 depends xfce4-session
 depends xfce4-icon-theme
 
-optional_depends Thunar "" "" "For the new xfce4 filemanager"
+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 96342d4..e55ff59 100644
--- a/xfce4/xfce4/DETAILS
+++ b/xfce4/xfce4/DETAILS
@@ -1,12 +1,12 @@
           MODULE=xfce4
-         VERSION="git-`date +%Y%U`"
+         VERSION=4.6.1
 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
-           SHORT="lightweight desktop environment based on GTK2"
+         UPDATED=20090424
+           SHORT="A lightweight desktop environment based on GTK2"
          PROFILE=yes
 
 cat << EOF
diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index 10e7d44..177172a 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -8,9 +8,9 @@
     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-install-libxf86config                      \
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/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/e17/e_modules-svn/DEPENDS b/zbeta/e17/e_modules-svn/DEPENDS
index 73a2efb..a5c2609 100644
--- a/zbeta/e17/e_modules-svn/DEPENDS
+++ b/zbeta/e17/e_modules-svn/DEPENDS
@@ -2,7 +2,6 @@ depends  e17-svn
 depends  emprint-svn
 depends  esmart-svn
 depends  ethumb-svn
-depends  eweather-svn
 depends  exalt-svn
 depends  exml-svn
 depends  libmpd
diff --git a/zbeta/e17/emphasis-svn/BUILD b/zbeta/e17/emphasis-svn/BUILD
new file mode 100644
index 0000000..46c8c34
--- /dev/null
+++ b/zbeta/e17/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/e17/emphasis-svn/DEPENDS b/zbeta/e17/emphasis-svn/DEPENDS
new file mode 100644
index 0000000..5448d7e
--- /dev/null
+++ b/zbeta/e17/emphasis-svn/DEPENDS
@@ -0,0 +1,5 @@
+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
new file mode 100644
index 0000000..cfc9ed9
--- /dev/null
+++ b/zbeta/e17/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/OLD/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
new file mode 100644
index 0000000..46c8c34
--- /dev/null
+++ b/zbeta/e17/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/e17/enhance-svn/DEPENDS b/zbeta/e17/enhance-svn/DEPENDS
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/zbeta/e17/enhance-svn/DEPENDS
@@ -0,0 +1 @@
+
diff --git a/zbeta/e17/enhance-svn/DETAILS b/zbeta/e17/enhance-svn/DETAILS
new file mode 100644
index 0000000..1e14a56
--- /dev/null
+++ b/zbeta/e17/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/OLD/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/epsilon-svn/DETAILS b/zbeta/e17/epsilon-svn/DETAILS
index 041dcf7..0e40698 100644
--- a/zbeta/e17/epsilon-svn/DETAILS
+++ b/zbeta/e17/epsilon-svn/DETAILS
@@ -2,7 +2,7 @@
          VERSION=svn
           SOURCE=$MODULE.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/OLD/epsilon
+      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/epsilon
         WEB_SITE=http://www.enlightenment.org/pages/epsilon.html
          ENTERED=20041002
          UPDATED=`date --date="last monday" +%Y%m%d`
diff --git a/zbeta/e17/ethumb-svn/DETAILS b/zbeta/e17/ethumb-svn/DETAILS
index b9796bd..33027f1 100644
--- a/zbeta/e17/ethumb-svn/DETAILS
+++ b/zbeta/e17/ethumb-svn/DETAILS
@@ -2,8 +2,8 @@
          VERSION=svn
           SOURCE=$MODULE.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/ethumb
-        WEB_SITE=http://www.enlightenment.org/
+      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/PROTO/ethumb
+        WEB_SITE=http://www.enlightenment.org
          ENTERED=20090907
          UPDATED=`date --date="last monday" +%Y%m%d`
    MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
diff --git a/zbeta/enna-hg/BUILD b/zbeta/enna-hg/BUILD
deleted file mode 100644
index 46c8c34..0000000
--- a/zbeta/enna-hg/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/enna-hg/DEPENDS b/zbeta/enna-hg/DEPENDS
deleted file mode 100644
index cb61427..0000000
--- a/zbeta/enna-hg/DEPENDS
+++ /dev/null
@@ -1,38 +0,0 @@
-depends e_dbus-svn
-depends elementary-svn
-depends libvalhalla-hg
-
-optional_depends  "curl"              \
-                  "--enable-libcurl"  \
-                  "--disable-libcurl" \
-                  "for curl support"
-
-optional_depends  "efreet-svn"        \
-                  "--enable-efreet"   \
-                  "--disable-efreet"  \
-                  "for freedesktop.org standards support"
-
-optional_depends  "libcddb"           \
-                  "--enable-libcddb"  \
-                  "--disable-libcddb" \
-                  "for CDDB support"
-
-optional_depends  "libexif"           \
-                  "--enable-libexif"  \
-                  "--disable-libexif" \
-                  "for EXIF file support"
-
-optional_depends  "libplayer-hg"                \
-                  "--enable-libplayer-backend"  \
-                  "--disable-libplayer-backend" \
-                  "for various A/V output support"
-
-optional_depends  "libxml2"           \
-                  "--enable-libxml2"  \
-                  "--disable-libxml2" \
-                  "for libxml2 support"
-
-optional_depends  "lirc"       \
-                  ""           \
-                  ""           \
-                  "for LIRC support"
diff --git a/zbeta/enna-hg/DETAILS b/zbeta/enna-hg/DETAILS
deleted file mode 100644
index 4dff3cb..0000000
--- a/zbeta/enna-hg/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
-          MODULE=enna-hg
-         VERSION=beta
-          SOURCE=$MODULE.tar.bz2
-      SOURCE_URL=hg+http://hg.geexbox.org/enna
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-        WEB_SITE=http://enna.geexbox.org
-         ENTERED=20091003
-         UPDATED=`date --date="last monday" +%Y%m%d`
-   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
-           SHORT="multimedia-center-thingy for E"
-cat <<EOF
-Enna is a media center based on the EFL (Enlightenment
-Foundation Libraries). It tries to be simple to use,
-fast and modular.
-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..c5a718f
--- /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/eweather-svn/BUILD b/zbeta/eweather-svn/BUILD
deleted file mode 100644
index 46c8c34..0000000
--- a/zbeta/eweather-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/eweather-svn/DEPENDS b/zbeta/eweather-svn/DEPENDS
deleted file mode 100644
index 7275226..0000000
--- a/zbeta/eweather-svn/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends  edje-svn
-
diff --git a/zbeta/eweather-svn/DETAILS b/zbeta/eweather-svn/DETAILS
deleted file mode 100644
index a1d878b..0000000
--- a/zbeta/eweather-svn/DETAILS
+++ /dev/null
@@ -1,14 +0,0 @@
-          MODULE=eweather-svn
-         VERSION=svn
-          SOURCE=$MODULE.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-      SOURCE_URL=svn+http://svn.enlightenment.org/svn/e/trunk/PROTO/eweather
-        WEB_SITE=http://enlightenment.org/pages/enlightenment.html
-         ENTERED=20091203
-         UPDATED=`date --date="last monday" +%Y%m%d`
-   MODULE_PREFIX=${E17_PREFIX:-/opt/lunar/enlightenment}
-           SHORT="a weather frontend for E"
-
-cat << EOF
-A weather frontend gadget as a supplement for the E desktop shell.
-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/gdm-old/BUILD b/zbeta/gdm-old/BUILD
deleted file mode 100644
index 98cdea6..0000000
--- a/zbeta/gdm-old/BUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-(
-
- sedit 's:GDM_KEY_HALT "daemon/DefaultPath:GDM_KEY_HALT "daemon/HaltCommand:' daemon/gdm.h
-
- add_priv_user gdm:gdm
-
- if    module_installed  Linux-PAM;  then  SCHEME="pam"
- elif  module_installed  shadow;     then  SCHEME="shadow"
-                                     else  SCHEME="auto"
- fi
-
- OPTS="$OPTS --enable-authentication-scheme=$SCHEME"
-
- LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
- 
- ./configure   --build=$BUILD                                        \
-               --prefix=${GNOME210_PREFIX:-/usr}                     \
-               --with-xinerama=yes                                   \
-               --sysconfdir=/etc/X11                                 \
-               --localstatedir=/var                                  \
-               --infodir=${GNOME210_PREFIX:-/usr}/share/info         \
-               --mandir=${GNOME210_PREFIX:-/usr}/share/man           \
-               $OPTS                                                 &&
-
- sedit 's#$(LINK)#$(LINK) $(LIBS)#' daemon/Makefile                  &&
- make                                                                &&
- prepare_install                                                     &&
- make install                                                        &&
-
- mkdir  -p           /var/gdm                                        &&
- chown  -R  gdm:gdm  /var/gdm                                        &&
- chmod  750          /var/gdm                                        &&
-
- # This has to be a DIRECTORY, not a FILE
- if [ -e "/etc/X11/gdm/Sessions" ]; then
-   rm -fr /etc/X11/gdm/Sessions || true
- fi
-
- mkdir -p /etc/X11/gdm/Sessions/                                   &&
- install --mode=644 $SCRIPT_DIRECTORY/gnomerc /etc/X11/gdm/gnomerc &&
- install --mode=755 $SCRIPT_DIRECTORY/Sessions/gnome.desktop /etc/X11/dm/Sessions &&
- install --mode=755 $SCRIPT_DIRECTORY/Default /etc/X11/gdm/PreSession/ &&
- install --mode=755 $SCRIPT_DIRECTORY/Default /etc/X11/gdm/Sessions/ 
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/gdm-old/DEPENDS b/zbeta/gdm-old/DEPENDS
deleted file mode 100644
index 7a8a2dd..0000000
--- a/zbeta/gdm-old/DEPENDS
+++ /dev/null
@@ -1,2 +0,0 @@
-depends librsvg
-depends gnome-doc-utils
diff --git a/zbeta/gdm-old/DETAILS b/zbeta/gdm-old/DETAILS
deleted file mode 100644
index 0f61f85..0000000
--- a/zbeta/gdm-old/DETAILS
+++ /dev/null
@@ -1,50 +0,0 @@
-          MODULE=gdm-old
-             MOD=gdm
-         VERSION=2.20.10
-           MAJOR=2.20
-          SOURCE=$MOD-$VERSION.tar.bz2
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD-$VERSION	  
-      SOURCE_URL=$GNOME_URL/sources/$MOD/$MAJOR/
-      SOURCE_VFY=sha1:42e9e52184393352f005f1735843a30f764aef18
-        WEB_SITE=http://www.gnome.org/projects/gdm/
-         ENTERED=20020716
-         UPDATED=20080710
-           SHORT="the Gnome Display Manager"
-
-cat << EOF
-The Gnome Display Manager is a re-implementation of the well known xdm
-program.  gdm 2.5 implements all significant features required for
-managing local and remote displays.
-
-gdm daemon:
- o X Authentication
- o Default and per-display initialization scripts
- o Pre and post session scripts
- o Pluggable Authentication Modules
- o XDMCP
- o TCP Wrappers for access control
- o Autologin for single user workstations
- o Timed login for kiosks and public terminals
-
-gdmlogin:
- o Logo image
- o Background image/color
- o Halt and reboot
- o Iconified login window
- o Session selection support
- o Language selection support
- o GNOME session selection support
- o Face browser
- o Background program support
- o Xinerama support
-
-gdmchooser:
- o Visual host browser
- o Customizable icons
-
-gdmconfig:
- o GUI way to configure everything about GDM
-
-Most features can be turned on and off in the configuration file by
-the sysadmin.
-EOF
diff --git a/zbeta/gdm-old/Default b/zbeta/gdm-old/Default
deleted file mode 100644
index f91d3ab..0000000
--- a/zbeta/gdm-old/Default
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# Note that any setup should come before the sessreg command as
-# that must be 'exec'ed for the pid to be correct (sessreg uses the parent
-# pid)
-#
-# Note that output goes into the .xsession-errors file for easy debugging
-#
-XSETROOT=`which xsetroot 2>/dev/null`
-if [ x$XSETROOT != x ] ; then
-        $XSETROOT -cursor_name left_ptr -solid "#363047"
-fi
-
-
-SESSREG=`which sessreg 2>/dev/null`
-if [ x$SESSREG != x ] ; then
-        # some output for easy debugging
-        echo "$0: Registering your session with wtmp and utmp"
-        echo "$0: running: $SESSREG -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l $DISPLAY $USER"
-
-        exec $SESSREG -a -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l $DISPLAY $USER
-        # this is not reached
-fi
-
-# some output for easy debugging
-echo "$0: could not find the sessreg utility, cannot update wtmp and utmp"
-exit 0
diff --git a/zbeta/gdm-old/POST_INSTALL b/zbeta/gdm-old/POST_INSTALL
deleted file mode 100644
index f393d4a..0000000
--- a/zbeta/gdm-old/POST_INSTALL
+++ /dev/null
@@ -1,5 +0,0 @@
-
-if module_installed gnome-session; then lin -c gnome-session; fi
-if module_installed gnome-desktop; then lin -c gnome-desktop; fi
-
-
diff --git a/zbeta/gdm-old/Sessions/gnome.desktop b/zbeta/gdm-old/Sessions/gnome.desktop
deleted file mode 100644
index 6777c17..0000000
--- a/zbeta/gdm-old/Sessions/gnome.desktop
+++ /dev/null
@@ -1,68 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=GNOME
-Name[az]=GNOME
-Name[be]=GNOME
-Name[ca]=GNOME
-Name[cs]=GNOME
-Name[cy]=GNOME
-Name[da]=Gnome
-Name[de]=GNOME
-Name[el]=GNOME
-Name[es]=GNOME
-Name[et]=GNOME
-Name[fi]=Gnome
-Name[fr]=GNOME
-Name[he]=GNOME
-Name[hu]=GNOME
-Name[it]=GNOME
-Name[ko]=그놈
-Name[ms]=GNOME
-Name[nl]=GNOME
-Name[no]=GNOME
-Name[pl]=GNOME
-Name[pt]=GNOME
-Name[pt_BR]=GNOME
-Name[ru]=GNOME
-Name[sk]=GNOME
-Name[sl]=GNOME
-Name[sq]=GNOME
-Name[sr]=Гном
-Name[sr at Latn]=Gnom
-Name[sv]=GNOME
-Name[uk]=GNOME
-Name[zh_CN]=GNOME
-Name[zh_TW]=GNOME
-Comment=This session logs you into GNOME
-Comment[az]=Bu iclas sizi GNOME'a daxil edəcək
-Comment[be]=Гэтая сэсыя завядзе вас у GNOME
-Comment[ca]=Aquesta sessió entra en GNOME
-Comment[cs]=Toto sezení vás přihlásí do GNOME
-Comment[cy]=Mae'r sesiwn hwn yn eich mewngofnodi i GNOME
-Comment[da]=Denne session logger dig på Gnome
-Comment[de]=Diese Sitzung meldet Sie an GNOME an
-Comment[el]=Αυτή η συνεδρία σας εισάγει στο GNOME
-Comment[es]=Con esta sesión accede a GNOME
-Comment[fi]=Tämä istunto kirjaa sisään Gnomeen
-Comment[fr]=Cette session vous connectera dans GNOME
-Comment[he]=תצורת הפעלה זו מחברת אותך ל GNOME
-Comment[ko]=GNOME세션으로 로그인합니다
-Comment[ms]=Sesi ini akan log anda  ke GNOME
-Comment[nl]=Deze sessie meldt u aan bij GNOME
-Comment[no]=Denne sesjonen logger deg inn til GNOME
-Comment[pl]=Sesja logowania do GNOME
-Comment[pt]=Esta sessão inicia-o no GNOME
-Comment[pt_BR]=Logar no ambiente GNOME
-Comment[sk]=Toto sedenie vás prihlási do prostredia GNOME
-Comment[sl]=Ta seja vas prijavi v GNOMe
-Comment[sq]=Kjo seancë do t'ju fusë në GNOME
-Comment[sr]=Ова сесија вас пријављује на Гнома
-Comment[sr at Latn]=Ova sesija vas prijavljuje na Gnoma
-Comment[sv]=Denna session loggar in dig i GNOME
-Comment[uk]=Сеанс роботи в середовищі GNOME
-Comment[zh_CN]=此会话使您登录到 GNOME
-Comment[zh_TW]=選取這個作業階段後會進入 GNOME 環境
-Exec=/usr/bin/gnome-session
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/zbeta/gdm-old/gnomerc b/zbeta/gdm-old/gnomerc
deleted file mode 100644
index 1fd5585..0000000
--- a/zbeta/gdm-old/gnomerc
+++ /dev/null
@@ -1,13 +0,0 @@
-startssh=
-sshagent=/usr/bin/ssh-agent
-gnomesession=/usr/bin/gnome-session
-
-if [ -x $sshagent -a -z "$SSH_AUTH_SOCK" ]; then
-  startssh=yes
-fi
-
-if [ -n "$startssh" ]; then
-  exec $sshagent -- $gnomesession
-else
-  exec $gnomesession
-fi
diff --git a/zbeta/gdm-old/init.d/gdm b/zbeta/gdm-old/init.d/gdm
deleted file mode 100644
index 32922f5..0000000
--- a/zbeta/gdm-old/init.d/gdm
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-# chkconfig: 5 95 05
-# description: gdm is gnome's version of the xdm graphical login manager
-# processname: /usr/sbin/gdm
-# sigreload: HUP
-
-. /lib/lsb/init-functions $1
-
-stop() {
-  kill `cat /var/run/gdm.pid`
-  evaluate_retval
-}
- 
-status() {
-  if [ -f /var/run/gdm.pid ]; then
-    if ps -p `cat /var/run/gdm.pid` > /dev/null; then
-      echo "gdm is running with Process ID $(cat /var/run/gdm.pid)"
-    else
-      echo "gdm is not running but /var/run/gdm.pid exists"
-      return 1
-    fi
-  else
-    echo "gdm is not running"
-  fi
-}
-
diff --git a/zbeta/gdm-old/pam.d/gdm b/zbeta/gdm-old/pam.d/gdm
deleted file mode 100644
index 47f0938..0000000
--- a/zbeta/gdm-old/pam.d/gdm
+++ /dev/null
@@ -1,14 +0,0 @@
-#%PAM-1.0
-#
-# The PAM configuration file for the `gdm' service
-#
-auth       required    pam_env.so
-auth       include     system-auth
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-
-
diff --git a/zbeta/gdm-old/pam.d/gdm-autologin b/zbeta/gdm-old/pam.d/gdm-autologin
deleted file mode 100644
index a4b0dab..0000000
--- a/zbeta/gdm-old/pam.d/gdm-autologin
+++ /dev/null
@@ -1,13 +0,0 @@
-#%PAM-1.0
-#
-# The PAM configuration file for the `gdm-autologin' service
-#
-auth       required    pam_env.so
-auth       required    pam_permit.so
-account    required    pam_nologin.so
-account    include     system-auth
-password   include     system-auth
-session    include     system-auth
-session    required    pam_loginuid.so
-session    optional    pam_console.so
-
diff --git a/zbeta/libgdata/BUILD b/zbeta/libgdata/BUILD
deleted file mode 100644
index 62fc456..0000000
--- a/zbeta/libgdata/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-(
-
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD                    \
-                --sysconfdir=/etc                 \
-                --localstatedir=/var              \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man   \
-                $OPTS                             &&
-    default_make
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/libgdata/DEPENDS b/zbeta/libgdata/DEPENDS
deleted file mode 100644
index 7c5f131..0000000
--- a/zbeta/libgdata/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends glib-2
diff --git a/zbeta/libgdata/DETAILS b/zbeta/libgdata/DETAILS
deleted file mode 100644
index fd873fd..0000000
--- a/zbeta/libgdata/DETAILS
+++ /dev/null
@@ -1,16 +0,0 @@
-          MODULE=libgdata
-           MAJOR=0.5
-         VERSION=0.5.0
-          SOURCE=$MODULE-$VERSION.tar.bz2
-      SOURCE_URL=$GNOME_URL/sources/$MODULE/$MAJOR/
-      SOURCE_VFY=sha1:93acc6ca5145aba3049b9f9240d4503b3a85e101
-        WEB_SITE=http://www.gnome.org
-         ENTERED=20091006
-         UPDATED=20091006
-           SHORT="Gnome's GData protocol library"
-cat << EOF
-Libgdata is a GLib-based library for accessing online service APIs using
-the GData protocol -- most notably, Google's services. It provides APIs
-to access the common Google services, and has full asynchronous support.
-EOF
-
diff --git a/zbeta/libvalhalla-hg/BUILD b/zbeta/libvalhalla-hg/BUILD
deleted file mode 100644
index aa1d4bb..0000000
--- a/zbeta/libvalhalla-hg/BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-(
-  # configure does not like --build.
-  ./configure --prefix=/usr $OPTS &&
-  default_make
-
-) > $C_FIFO 2>&1
diff --git a/zbeta/libvalhalla-hg/DEPENDS b/zbeta/libvalhalla-hg/DEPENDS
deleted file mode 100644
index 741db2f..0000000
--- a/zbeta/libvalhalla-hg/DEPENDS
+++ /dev/null
@@ -1,9 +0,0 @@
-depends curl
-depends libxml2
-depends sqlite
-
-optional_depends "libexif" "--enable-grabber-exif"   "" "for the EXIF grabber"
-# Disabled for now. Claims that it cannot find libavcodec due to a undefined
-# reference during the ./configure test although it is installed on my box.
-#optional_depends "ffmpeg" "--enable-grabber-ffmpeg" "" "for the FFmpeg grabber"
-
diff --git a/zbeta/libvalhalla-hg/DETAILS b/zbeta/libvalhalla-hg/DETAILS
deleted file mode 100644
index 18dc7cc..0000000
--- a/zbeta/libvalhalla-hg/DETAILS
+++ /dev/null
@@ -1,13 +0,0 @@
-          MODULE=libvalhalla-hg
-         VERSION=beta
-          SOURCE=$MODULE.tar.bz2
-      SOURCE_URL=hg+http://hg.geexbox.org/libvalhalla
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
-        WEB_SITE=http://geexbox.org/en/index.html
-         ENTERED=20091203
-         UPDATED=`date --date="last monday" +%Y%m%d`
-           SHORT="a media scanner library"
-cat <<EOF
-A library for scanning various media files.
-EOF
-
diff --git a/zbeta/midori/DETAILS b/zbeta/midori/DETAILS
index 50c3e9c..8df94fc 100644
--- a/zbeta/midori/DETAILS
+++ b/zbeta/midori/DETAILS
@@ -1,12 +1,12 @@
           MODULE=midori
-         VERSION=0.2.1
-           MAJOR=0.2
+         VERSION=0.1.10
+           MAJOR=0.1
           SOURCE=$MODULE-$VERSION.tar.bz2
       SOURCE_URL=http://archive.xfce.org/src/apps/midori/$MAJOR/
-      SOURCE_VFY=sha1:5e6e9b055cf130f30a287886d908f8a672e66e0a
+      SOURCE_VFY=sha1:9598de84d9c3283f236c3a075eb707b9423967e3
         WEB_SITE=http://www.twotoasts.de/index.php?/pages/midori_summary.html
          ENTERED=20070921
-         UPDATED=20091126
+         UPDATED=20090912
            SHORT="lightweight WebKit/Gtk+-2 based browser"
 
 cat << EOF
diff --git a/zbeta/midori/POST_INSTALL b/zbeta/midori/POST_INSTALL
deleted file mode 100644
index cfaa684..0000000
--- a/zbeta/midori/POST_INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-if module_installed xdg-utils; then  XDG_OPEN=`lvu from xdg-open|grep bin|cut -d: -f2`;sedit "s/firefox:/midori:firefox:/" $XDG_OPEN;fi
diff --git a/zbeta/mplayer/BUILD b/zbeta/mplayer/BUILD
deleted file mode 100644
index 8863686..0000000
--- a/zbeta/mplayer/BUILD
+++ /dev/null
@@ -1,48 +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 af43a19..0000000
--- a/zbeta/mplayer/CONFIGURE
+++ /dev/null
@@ -1,3 +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 20260da..0000000
--- a/zbeta/mplayer/DEPENDS
+++ /dev/null
@@ -1,16 +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"
-
diff --git a/zbeta/mplayer/DETAILS b/zbeta/mplayer/DETAILS
deleted file mode 100644
index 399d76a..0000000
--- a/zbeta/mplayer/DETAILS
+++ /dev/null
@@ -1,51 +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 410fa55..0000000
--- a/zbeta/mplayer/POST_INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-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 fdb9a44..0000000
--- a/zbeta/mplayer/PRE_BUILD
+++ /dev/null
@@ -1,13 +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/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