[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (cfaea307346a75a661caf6c123161bac651d6d03)

Vlad Glagolev scm at sourcemage.org
Fri Feb 27 16:26:28 EST 2009


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 ChangeLog                            |   14 ++
 dev/null                             |binary
 devel/geanyvc/DETAILS                |    4 
 devel/geanyvc/HISTORY                |    3 
 devel/geanyvc/geanyvc-0.4.tar.gz.sig |    0 
 devel/geanyvc/geanyvc-0.5.tar.gz.sig |binary
 xfce/dbh/BUILD                       |    1 
 xfce/dbh/DETAILS                     |    8 -
 xfce/dbh/HISTORY                     |    4 
 xfce/dbh/INSTALL                     |    3 
 xfce/dbh/PRE_BUILD                   |    1 
 xfce/dbh/TRIGGERS                    |    1 
 xfce/exo/DETAILS                     |   11 +
 xfce/exo/HISTORY                     |    4 
 xfce/exo/PRE_BUILD                   |    6 -
 xfce/exo/exo-mount-hal.patch         |  207 -----------------------------------
 xfce/gtk-xfce-engine/DETAILS         |   11 +
 xfce/gtk-xfce-engine/HISTORY         |    3 
 xfce/libxfce4mcs/BUILD               |    1 
 xfce/libxfce4mcs/DEPENDS             |    3 
 xfce/libxfce4mcs/DETAILS             |   13 +-
 xfce/libxfce4mcs/HISTORY             |    3 
 xfce/libxfce4mcs/INSTALL             |    1 
 xfce/libxfce4mcs/PRE_BUILD           |    1 
 xfce/libxfce4mcs/TRIGGERS            |    1 
 xfce/libxfce4menu/DEPENDS            |    7 +
 xfce/libxfce4menu/DETAILS            |   19 +++
 xfce/libxfce4menu/HISTORY            |    2 
 xfce/libxfce4util/DETAILS            |   11 +
 xfce/libxfce4util/HISTORY            |    3 
 xfce/libxfcegui4/DEPENDS             |   13 ++
 xfce/libxfcegui4/DETAILS             |   11 +
 xfce/libxfcegui4/HISTORY             |    4 
 xfce/mousepad/DETAILS                |   11 +
 xfce/mousepad/HISTORY                |    3 
 xfce/orage/DEPENDS                   |    7 +
 xfce/orage/DETAILS                   |   15 +-
 xfce/orage/HISTORY                   |    4 
 xfce/terminal/DETAILS                |   11 +
 xfce/terminal/HISTORY                |    4 
 xfce/terminal/PRE_BUILD              |    4 
 xfce/thunar/DEPENDS                  |   19 ++-
 xfce/thunar/DETAILS                  |   13 +-
 xfce/thunar/HISTORY                  |    6 +
 xfce/thunar/PRE_BUILD                |   12 --
 xfce/thunar/thunar-zombie.patch      |   31 -----
 xfce/xfcalendar/BUILD                |    1 
 xfce/xfcalendar/DEPENDS              |    1 
 xfce/xfcalendar/DETAILS              |   10 -
 xfce/xfcalendar/HISTORY              |   54 ---------
 xfce/xfcalendar/INSTALL              |    1 
 xfce/xfcalendar/PRE_BUILD            |    1 
 xfce/xfcalendar/TRIGGERS             |    1 
 xfce/xfce-mcs-manager/BUILD          |    1 
 xfce/xfce-mcs-manager/DEPENDS        |    4 
 xfce/xfce-mcs-manager/DETAILS        |   13 +-
 xfce/xfce-mcs-manager/HISTORY        |    3 
 xfce/xfce-mcs-manager/INSTALL        |    1 
 xfce/xfce-mcs-manager/PRE_BUILD      |    1 
 xfce/xfce-mcs-manager/TRIGGERS       |    1 
 xfce/xfce-mcs-plugins/BUILD          |    1 
 xfce/xfce-mcs-plugins/DEPENDS        |    2 
 xfce/xfce-mcs-plugins/DETAILS        |   13 +-
 xfce/xfce-mcs-plugins/HISTORY        |    3 
 xfce/xfce-mcs-plugins/INSTALL        |    1 
 xfce/xfce-mcs-plugins/PRE_BUILD      |    1 
 xfce/xfce-mcs-plugins/TRIGGERS       |    1 
 xfce/xfce-utils/DEPENDS              |    2 
 xfce/xfce-utils/DETAILS              |   11 +
 xfce/xfce-utils/HISTORY              |    4 
 xfce/xfce.version                    |    2 
 xfce/xfce4-appfinder/DEPENDS         |    3 
 xfce/xfce4-appfinder/DETAILS         |   11 +
 xfce/xfce4-appfinder/HISTORY         |    4 
 xfce/xfce4-dev-tools/DETAILS         |   13 +-
 xfce/xfce4-dev-tools/HISTORY         |    3 
 xfce/xfce4-dict-plugin/BUILD         |    1 
 xfce/xfce4-dict-plugin/DEPENDS       |    1 
 xfce/xfce4-dict-plugin/DETAILS       |   17 --
 xfce/xfce4-dict-plugin/HISTORY       |    9 -
 xfce/xfce4-dict-plugin/INSTALL       |    1 
 xfce/xfce4-dict-plugin/PRE_BUILD     |    1 
 xfce/xfce4-dict-plugin/TRIGGERS      |    1 
 xfce/xfce4-icon-theme/DETAILS        |    5 
 xfce/xfce4-icon-theme/HISTORY        |    3 
 xfce/xfce4-mixer/BUILD               |    3 
 xfce/xfce4-mixer/DEPENDS             |    9 -
 xfce/xfce4-mixer/DETAILS             |   11 +
 xfce/xfce4-mixer/HISTORY             |    4 
 xfce/xfce4-panel/DEPENDS             |   12 +-
 xfce/xfce4-panel/DETAILS             |   11 +
 xfce/xfce4-panel/HISTORY             |    4 
 xfce/xfce4-session/DEPENDS           |   11 +
 xfce/xfce4-session/DETAILS           |   11 +
 xfce/xfce4-session/HISTORY           |    4 
 xfce/xfce4-settings/DEPENDS          |   11 +
 xfce/xfce4-settings/DETAILS          |   19 +++
 xfce/xfce4-settings/HISTORY          |    2 
 xfce/xfconf/DEPENDS                  |    8 +
 xfce/xfconf/DETAILS                  |   19 +++
 xfce/xfconf/HISTORY                  |    2 
 xfce/xfdesktop/DEPENDS               |   12 +-
 xfce/xfdesktop/DETAILS               |   11 +
 xfce/xfdesktop/HISTORY               |    5 
 xfce/xfdesktop/PRE_BUILD             |    5 
 xfce/xffm/BUILD                      |    1 
 xfce/xffm/DEPENDS                    |    4 
 xfce/xffm/DETAILS                    |    7 -
 xfce/xffm/HISTORY                    |    4 
 xfce/xffm/INSTALL                    |    1 
 xfce/xffm/PRE_BUILD                  |    1 
 xfce/xffm/TRIGGERS                   |    1 
 xfce/xffm/xffm-4.2.3.tar.gz.sig      |    0 
 xfce/xfprint/DEPENDS                 |    3 
 xfce/xfprint/DETAILS                 |   11 +
 xfce/xfprint/HISTORY                 |    4 
 xfce/xfwm4-themes/DETAILS            |   11 +
 xfce/xfwm4-themes/HISTORY            |    3 
 xfce/xfwm4/DEPENDS                   |    9 +
 xfce/xfwm4/DETAILS                   |   11 +
 xfce/xfwm4/HISTORY                   |    4 
 121 files changed, 438 insertions(+), 532 deletions(-)

New commits:
commit cfaea307346a75a661caf6c123161bac651d6d03
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    XFCE 4.6.0

commit 3c1c3ee481bf199b98a11675a6581721e21f9356
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-mixer: => 4.6.0

commit 71cd2339ad579e9d68aac5fbc831c7f9c3d92461
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfprint: => 4.6.0

commit b57db9e41871e90bc00756a9f4041f9758f0facf
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-dev-tools: => 4.6.0

commit e0a1b844c1e34a253e4d0e168bea290e450292f9
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce-utils: => 4.6.0

commit c9767edd9fc9353867a9c362275537d593b24eef
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-appfinder: => 4.6.0

commit 10cd84d1ac5bcbe4a448654f591abc223eafbe0a
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfwm4-themes: => 4.6.0

commit 20fe956673045f88d8ae0c7a808515b9ab1e5ed7
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfwm4: => 4.6.0

commit 1dadd4bc6cf8fd4e1386b1f6e2c8ad2b07184226
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfdesktop: => 4.6.0

commit 7a47e986724f69ac2ece536a9abc6cdfc100a331
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    orage: => 4.6.0

commit 0c5469dfdc10b3e8f390ef508d3beee50d1b2829
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-session: => 4.6.0

commit 7c6a15ea1add4545bbd9b2f87981e08270c28b83
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    thunar: => 1.0.0

commit 4ca43253743a76f664c85596762fec3430d7d31d
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    gtk-xfce-engine: => 2.6.0

commit 76e3065c270fd49a14c4fa71191df82d4a2eabb2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    mousepad: => 0.2.16

commit 0629543fda12c167486754d216d324dbfbb807b7
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    terminal: => 0.2.10

commit 26eac2810c18f5756e72f8c46b6b3ac367e60f2e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-panel: => 4.6.0

commit 6ceac343406daf08583b17f55dec4c44b1eaddfe
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    exo: => 0.3.100

commit 56ab3932b2392624ceffa187ce2c84babdfa327f
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-icon-theme: set static 4.4.3 version

commit 5a2fcb02db3b2b62f7486d1c52bc323e16f9e050
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libxfcegui4: => 4.6.0

commit 999a1ca7ff18333f84e3f14caf6b6d3d0b5075de
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libxfce4util: => 4.6.0

commit 01d1fa7fcb8adf76f244af4b7f4d4e3757b1f800
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfconf: new spell, configuration manager for xfce

commit bd961f1b5a5cbaf327e97a2663e2f159d7efc7fd
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-settings: new spell, settings manager for the Xfce desktop environment

commit 12e45f6da3d08b2919378ec11c2aae05f0fff0ab
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libxfce4menu: new spell, menu library for xfce

commit 88f1aae5cdf6b39d1e2323d4f8d58391466ee4f8
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce-mcs-manager: spell deprecated

commit 8a4ddfc6bd9dda74daf9a8aaa0f8d7f5edf86a1e
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce-mcs-plugins: spell deprecated

commit a3a1f1603551c1c2b57123bf7d1566c485464608
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libxfce4mcs: spell deprecated

commit 8a90c2f8e2f8e0ceceb76c11c20e34c262c1bc00
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    dbh: spell deprecated

commit 3e9af6533a338e786708e27ec80126bdbc0acfb9
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xffm: spell deprecated

commit 87a7293bfb8598e21ea6747429c34a2c4f4c044c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfcalendar: spell deprecated

commit 096706526a2e6f69e8f4f35dc00720ee21922be9
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    xfce4-dict-plugin: spell deprecated

commit 3b147c16bd05d02a5434a643ba53e5e8c179b60c
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    geanyvc: => 0.5

diff --git a/ChangeLog b/ChangeLog
index 3721e99..509836b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2009-02-28 Vlad Glagolev <stealth at sourcemage.org>
+	* xfce/xfce.version: XFCE goes 4.6.0!
+	* xfce/xfce4-settings: new spell, settings manager for the Xfce desktop
+	  environment
+	* xfce/libxfce4menu: new spell, menu library for xfce
+	* xfce/xfconf: new spell, configuration manager for xfce
+	* xfce/xfce4-dict-plugin: removed, deprecation process completed
+	* xfce/xfcalendar: removed, deprecation process completed
+	* xfce/xffm: spell deprecated in favour of thunar
+	* xfce/dbh: spell deprecated
+	* xfce/libxfce4mcs: spell deprecated
+	* xfce/xfce-mcs-plugins: spell deprecated
+	* xfce/xfce-mcs-manager: spell deprecated
+
 2009-02-27 Treeve Jelbert <treeve at sourcemage.org>
 	* devel/qdevelop: ide for qt4 devel
 
diff --git a/devel/geanyvc/DETAILS b/devel/geanyvc/DETAILS
index 3783de6..a718642 100755
--- a/devel/geanyvc/DETAILS
+++ b/devel/geanyvc/DETAILS
@@ -1,10 +1,10 @@
             SPELL=geanyvc
-          VERSION=0.4
+          VERSION=0.5
            SOURCE=$SPELL-$VERSION.tar.gz
     SOURCE_URL[0]=http://users.cosmostv.by/yurand/$SPELL/$SOURCE
        SOURCE_GPG=gurus.gpg:$SOURCE.sig
  SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-         WEB_SITE=http://users.cosmostv.by/yurand/geanyvc/
+         WEB_SITE=http://plugins.geany.org/geanyvc/
        LICENSE[0]=GPL
           ENTERED=20080418
             SHORT="plugin for geany IDE to work with different VCS"
diff --git a/devel/geanyvc/HISTORY b/devel/geanyvc/HISTORY
index 9edbbb8..40ed277 100644
--- a/devel/geanyvc/HISTORY
+++ b/devel/geanyvc/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.5; fixed WEB_SITE
+
 2009-02-20 Vlad Glagolev <stealth at sourcemage.org>
 	* TRIGGERS: added, for fixing module on geany's renewal
 
diff --git a/devel/geanyvc/geanyvc-0.4.tar.gz.sig b/devel/geanyvc/geanyvc-0.4.tar.gz.sig
deleted file mode 100644
index 4363f44..0000000
Binary files a/devel/geanyvc/geanyvc-0.4.tar.gz.sig and /dev/null differ
diff --git a/devel/geanyvc/geanyvc-0.5.tar.gz.sig b/devel/geanyvc/geanyvc-0.5.tar.gz.sig
new file mode 100644
index 0000000..3e2d68a
Binary files /dev/null and b/devel/geanyvc/geanyvc-0.5.tar.gz.sig differ
diff --git a/xfce/dbh/BUILD b/xfce/dbh/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/dbh/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/dbh/DETAILS b/xfce/dbh/DETAILS
index 75ff931..7002d26 100755
--- a/xfce/dbh/DETAILS
+++ b/xfce/dbh/DETAILS
@@ -1,14 +1,14 @@
            SPELL=dbh
          VERSION=4.5.0
-     SOURCE_HASH=sha512:1ad68dc04314e11f024fd4a0b440839f70cc885c019563c906a3134d72dc717544e67b40171fcee50ac92ebfc3266fb58afbbe658803996328c2bc5ae71bec7a
-          SOURCE=$SPELL-$VERSION.tar.gz
+#     SOURCE_HASH=sha512:1ad68dc04314e11f024fd4a0b440839f70cc885c019563c906a3134d72dc717544e67b40171fcee50ac92ebfc3266fb58afbbe658803996328c2bc5ae71bec7a
+#          SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/dbh/$SOURCE
+#   SOURCE_URL[0]=${SOURCEFORGE_URL}/dbh/$SOURCE
         WEB_SITE=http://dbh.sourceforge.net
       LICENSE[0]=QPL
          ENTERED=20030608
         KEYWORDS="disk hashtable"
-      PATCHLEVEL=1
+      PATCHLEVEL=2
            SHORT="DBH is a library to create Disk Based Hashtables on POSIX systems"
 cat << EOF
 A DBH is a convenient way to associate keys composed by characters to data
diff --git a/xfce/dbh/HISTORY b/xfce/dbh/HISTORY
index 7e79437..c4adc53 100644
--- a/xfce/dbh/HISTORY
+++ b/xfce/dbh/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: spell deprecated
+
 2006-07-20 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* INSTALL: setup symlink for pkgconfig file to dbh-1.0.pc, bug #12824
 	* DETAILS: set PATCHLEVEL=1
@@ -28,4 +31,3 @@
 
 2003-06-08 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* DETAILS, HISTORY: created the spell
-
diff --git a/xfce/dbh/INSTALL b/xfce/dbh/INSTALL
index a1e18d3..27ba77d 100755
--- a/xfce/dbh/INSTALL
+++ b/xfce/dbh/INSTALL
@@ -1,2 +1 @@
-default_install  &&
-ln -sf dbh.pc $INSTALL_ROOT/usr/lib/pkgconfig/dbh-1.0.pc
+true
diff --git a/xfce/dbh/PRE_BUILD b/xfce/dbh/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/dbh/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/dbh/TRIGGERS b/xfce/dbh/TRIGGERS
new file mode 100755
index 0000000..e443275
--- /dev/null
+++ b/xfce/dbh/TRIGGERS
@@ -0,0 +1 @@
+on_cast dbh dispel_self
diff --git a/xfce/exo/DETAILS b/xfce/exo/DETAILS
index b4177a2..bae2409 100755
--- a/xfce/exo/DETAILS
+++ b/xfce/exo/DETAILS
@@ -1,13 +1,14 @@
            SPELL=exo
-         VERSION=0.3.4
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=0.3.100
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
+      SOURCE_HASH=sha512:729874fe5e51265516e30da8edf6fa9a92a855e87d310c54958df8d03e2adf59b9bd616d232c4c02a0fd1a78bc20371257702f7e96e3f6078db40cf29898f7fd
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
         WEB_SITE=http://thunar.xfce.org/
          ENTERED=20050101
          LICENSE=LGPL
diff --git a/xfce/exo/HISTORY b/xfce/exo/HISTORY
index d5cf821..46ab6aa 100644
--- a/xfce/exo/HISTORY
+++ b/xfce/exo/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 0.3.100
+	* PRE_BUILD, exo-mount-hal.patch: removed
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: quoting paths; fixed short desc
 	* DEPENDS: cleaned up
diff --git a/xfce/exo/PRE_BUILD b/xfce/exo/PRE_BUILD
deleted file mode 100755
index 3b72b91..0000000
--- a/xfce/exo/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if is_depends_enabled $SPELL hal; then
-  patch -p1 < "$SPELL_DIRECTORY/exo-mount-hal.patch"
-fi
diff --git a/xfce/exo/exo-mount-hal.patch b/xfce/exo/exo-mount-hal.patch
deleted file mode 100644
index 316f081..0000000
--- a/xfce/exo/exo-mount-hal.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff --git a/exo-mount/exo-mount-hal.c b/exo-mount/exo-mount-hal.c
-index 791a536..4084719 100644
---- a/exo-mount/exo-mount-hal.c
-+++ b/exo-mount/exo-mount-hal.c
-@@ -145,6 +145,42 @@ exo_mount_hal_propagate_error (GError   **error,
- }
- 
- 
-+static gboolean
-+string_in_list(gchar * const *haystack, const gchar *needle)
-+{
-+  gint n;
-+
-+  if (!haystack)
-+      return FALSE;
-+
-+  for (n=0; haystack[n]; ++n) {
-+      if (!strcmp (haystack[n], needle))
-+          return TRUE;
-+  }
-+  return FALSE;
-+}
-+
-+
-+static gboolean
-+device_has_interface(const gchar *udi, const gchar *iface,
-+        DBusError *derror)
-+{
-+  gboolean result;
-+  gchar **interfaces;
-+
-+  /* determine the info.interfaces property of the device */
-+  interfaces = libhal_device_get_property_strlist (hal_context, udi,
-+          "info.interfaces", derror);
-+
-+  /* check for the interface we need */
-+  result = string_in_list(interfaces, iface);
-+  libhal_free_string_array(interfaces);
-+
-+  return result;
-+}
-+
-+
-+
- 
- /**
-  * exo_mount_hal_device_from_udi:
-@@ -158,18 +194,15 @@ exo_mount_hal_propagate_error (GError   **error,
-  *               or %NULL in case of an error.
-  **/
- ExoMountHalDevice*
--exo_mount_hal_device_from_udi (const gchar *udi,
-+exo_mount_hal_device_from_udi (const gchar *in_udi,
-                                GError     **error)
- {
-   ExoMountHalDevice *device = NULL;
-   DBusError          derror;
--  gchar            **interfaces;
--  gchar            **volume_udis;
--  gchar             *volume_udi = NULL;
-   gint               n_volume_udis;
--  gint               n;
-+  gchar             *udi;
- 
--  g_return_val_if_fail (udi != NULL, NULL);
-+  g_return_val_if_fail (in_udi != NULL, NULL);
-   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- 
-   /* make sure the HAL support is initialized */
-@@ -179,55 +212,60 @@ exo_mount_hal_device_from_udi (const gchar *udi,
-   /* initialize D-Bus error */
-   dbus_error_init (&derror);
- 
--again:
--  /* determine the info.interfaces property of the device */
--  interfaces = libhal_device_get_property_strlist (hal_context, udi, "info.interfaces", &derror);
--  if (G_UNLIKELY (interfaces == NULL))
-+  udi = g_strdup (in_udi);
-+  /* at this point, we own udi */
-+
-+  /* maybe we have a mountable device here */
-+  while(G_UNLIKELY (!device_has_interface (udi,
-+                  "org.freedesktop.Hal.Device.Volume", &derror)))
-     {
--      /* reset D-Bus error */
--      dbus_error_free (&derror);
-+      gchar **volume_udis;
- 
--      /* release any previous volume UDI */
--      g_free (volume_udi);
--      volume_udi = NULL;
-+      /* maybe there was a D-Bus error? gotta check */
-+      if (G_UNLIKELY (dbus_error_is_set (&derror)))
-+        {
-+          exo_mount_hal_propagate_error (error, &derror);
-+          g_free (udi);
-+          return NULL;
-+        }
-+
-+      /* maybe we have a volume whose parent is identified by the udi */
-+      volume_udis = libhal_manager_find_device_string_match (hal_context,
-+              "info.parent", udi, &n_volume_udis, &derror);
- 
--      /* ok, but maybe we have a volume whose parent is identified by the udi */
--      volume_udis = libhal_manager_find_device_string_match (hal_context, "info.parent", udi, &n_volume_udis, &derror);
-       if (G_UNLIKELY (volume_udis == NULL))
-         {
--err0:     exo_mount_hal_propagate_error (error, &derror);
--          goto out;
-+          exo_mount_hal_propagate_error (error, &derror);
-+          g_free (udi);
-+          return NULL;
-         }
-       else if (G_UNLIKELY (n_volume_udis < 1))
-         {
--          /* no match, we cannot handle that device */
-           libhal_free_string_array (volume_udis);
--          goto err1;
-+          dbus_error_free (&derror);
-+          /* definitely not a device that we're able to
-+           * mount, eject or unmount */
-+          g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
-+                  _("Given device \"%s\" is not a volume or drive"), udi);
-+          g_free (udi);
-+          return NULL;
-         }
- 
-+      g_free (udi);
-+
-       /* use the first volume UDI... */
--      volume_udi = g_strdup (volume_udis[0]);
-+      udi = g_strdup (volume_udis[0]);
-       libhal_free_string_array (volume_udis);
--
-       /* ..and try again using that UDI */
--      udi = (const gchar *) volume_udi;
--      goto again;
-     }
- 
--  /* verify that we have a mountable device here */
--  for (n = 0; interfaces[n] != NULL; ++n)
--    if (strcmp (interfaces[n], "org.freedesktop.Hal.Device.Volume") == 0)
--      break;
--  if (G_UNLIKELY (interfaces[n] == NULL))
--    {
--      /* definitely not a device that we're able to mount, eject or unmount */
--err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%s\" is not a volume or drive"), udi);
--      goto out;
--    }
-+  /* at this point, udi contains the UDI of something
-+   * that implements Hal.Device.Volume.
-+   * udi is the only resource that we hold here. */
- 
-   /* setup the device struct */
-   device = g_new0 (ExoMountHalDevice, 1);
--  device->udi = g_strdup (udi);
-+  device->udi = udi;
- 
-   /* check if we have a volume here */
-   device->volume = libhal_volume_from_udi (hal_context, udi);
-@@ -269,8 +307,8 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
-   if (G_UNLIKELY (device->file == NULL || device->name == NULL))
-     {
-       exo_mount_hal_device_free (device);
--      device = NULL;
--      goto err0;
-+      exo_mount_hal_propagate_error(error, &derror);
-+      return NULL;
-     }
- 
-   /* check if we failed */
-@@ -282,11 +320,7 @@ err1: g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("Given device \"%
-       device = NULL;
-     }
- 
--out:
--  /* cleanup */
--  libhal_free_string_array (interfaces);
--  g_free (volume_udi);
--
-+  dbus_error_free (&derror);
-   return device;
- }
- 
-@@ -313,7 +347,7 @@ exo_mount_hal_device_from_file (const gchar *file,
-   gchar            **interfaces;
-   gchar            **udis;
-   gint               n_udis;
--  gint               n, m;
-+  gint               n;
- 
-   g_return_val_if_fail (g_path_is_absolute (file), NULL);
-   g_return_val_if_fail (error == NULL || *error == NULL, NULL);
-@@ -347,12 +381,7 @@ exo_mount_hal_device_from_file (const gchar *file,
-         continue;
- 
-       /* check if we have a mountable device here */
--      for (m = 0; interfaces[m] != NULL; ++m)
--        if (strcmp (interfaces[m], "org.freedesktop.Hal.Device.Volume") == 0)
--          break;
--
--      /* check if it's a usable device */
--      if (interfaces[m] != NULL)
-+      if (string_in_list (interfaces, "org.freedesktop.Hal.Device.Volume"))
-         {
-           libhal_free_string_array (interfaces);
-           break;
diff --git a/xfce/gtk-xfce-engine/DETAILS b/xfce/gtk-xfce-engine/DETAILS
index d0cf4df..151e9fa 100755
--- a/xfce/gtk-xfce-engine/DETAILS
+++ b/xfce/gtk-xfce-engine/DETAILS
@@ -1,14 +1,15 @@
            SPELL=gtk-xfce-engine
-         VERSION=2.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=2.6.0
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+      SOURCE_HASH=sha512:43025c27dc7314f0d2ae770e6fc1b0cbd3581d4698097bc8e1e714ac2f12ea3dd453a865c81e72cae597a151d1efd32eaf53c9c66839cc75f6547139f0987935
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="theme xfce"
diff --git a/xfce/gtk-xfce-engine/HISTORY b/xfce/gtk-xfce-engine/HISTORY
index 1194ffd..59be1c7 100644
--- a/xfce/gtk-xfce-engine/HISTORY
+++ b/xfce/gtk-xfce-engine/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 2.6.0
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 2.4.3; quoting paths; fixed descs
 
diff --git a/xfce/libxfce4mcs/BUILD b/xfce/libxfce4mcs/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/libxfce4mcs/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/libxfce4mcs/DEPENDS b/xfce/libxfce4mcs/DEPENDS
index e14dc8f..0169e26 100755
--- a/xfce/libxfce4mcs/DEPENDS
+++ b/xfce/libxfce4mcs/DEPENDS
@@ -1,2 +1 @@
-depends libxfce4util &&
-depends xorg-libs
+depends xfce4-settings
diff --git a/xfce/libxfce4mcs/DETAILS b/xfce/libxfce4mcs/DETAILS
index 0409792..f424fae 100755
--- a/xfce/libxfce4mcs/DETAILS
+++ b/xfce/libxfce4mcs/DETAILS
@@ -1,14 +1,15 @@
            SPELL=libxfce4mcs
          VERSION=4.4.3
+      PATCHLEVEL=1
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
-          SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#          SOURCE=$SPELL-$VERSION.tar.bz2
+#	 SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=LGPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/libxfce4mcs/HISTORY b/xfce/libxfce4mcs/HISTORY
index 8612b3e..4adbb13 100644
--- a/xfce/libxfce4mcs/HISTORY
+++ b/xfce/libxfce4mcs/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: spell deprecated
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3; fixed desc; corrected VERSION;
 	  quoting paths
diff --git a/xfce/libxfce4mcs/INSTALL b/xfce/libxfce4mcs/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/libxfce4mcs/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xfce/libxfce4mcs/PRE_BUILD b/xfce/libxfce4mcs/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/libxfce4mcs/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/libxfce4mcs/TRIGGERS b/xfce/libxfce4mcs/TRIGGERS
new file mode 100755
index 0000000..60bb6c8
--- /dev/null
+++ b/xfce/libxfce4mcs/TRIGGERS
@@ -0,0 +1 @@
+on_cast libxfce4mcs dispel_self
diff --git a/xfce/libxfce4menu/DEPENDS b/xfce/libxfce4menu/DEPENDS
new file mode 100755
index 0000000..de0c960
--- /dev/null
+++ b/xfce/libxfce4menu/DEPENDS
@@ -0,0 +1,7 @@
+depends glib2 &&
+depends libxfce4util &&
+
+optional_depends gtk-doc \
+                 "--enable-gtk-doc" \
+                 "--disable-gtk-doc" \
+                 "use gtk-doc to build documentation"
diff --git a/xfce/libxfce4menu/DETAILS b/xfce/libxfce4menu/DETAILS
new file mode 100755
index 0000000..46f35e3
--- /dev/null
+++ b/xfce/libxfce4menu/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=libxfce4menu
+ RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
+          SOURCE=$SPELL-$VERSION.tar.bz2
+#         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
+        WEB_SITE=http://www.xfce.org/
+      SOURCE_HASH=sha512:685144dc94a9e83719242af79f67fc16171ca180050968a9f2aa9802c68ecd41ae5a54726926d75d221e8442bb597fe15f429a2c166a01475078dcbdacc71fba
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
+      LICENSE[0]=LGPL
+         ENTERED=20090227
+        KEYWORDS="xfce"
+           SHORT="menu library for xfce"
+cat << EOF
+libxfce4menu is a menu library for xfce.
+EOF
diff --git a/xfce/libxfce4menu/HISTORY b/xfce/libxfce4menu/HISTORY
new file mode 100644
index 0000000..3bbb1da
--- /dev/null
+++ b/xfce/libxfce4menu/HISTORY
@@ -0,0 +1,2 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS, DEPENDS: spell created
diff --git a/xfce/libxfce4util/DETAILS b/xfce/libxfce4util/DETAILS
index 8e7c22b..c2c7186 100755
--- a/xfce/libxfce4util/DETAILS
+++ b/xfce/libxfce4util/DETAILS
@@ -1,14 +1,15 @@
            SPELL=libxfce4util
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:7a3cdd52741157696368da5af3224a7633654200dc2fe39a7d17bb67065170e5dd38839700185bff04903faa4545b6eb8e047232e2e2e778e5bc37d3951321ee
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=BSD
       LICENSE[1]=GPL
       LICENSE[2]=LGPL
diff --git a/xfce/libxfce4util/HISTORY b/xfce/libxfce4util/HISTORY
index 44d4596..e80b915 100644
--- a/xfce/libxfce4util/HISTORY
+++ b/xfce/libxfce4util/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; fixed
 	  short desc; fixed VERSION
diff --git a/xfce/libxfcegui4/DEPENDS b/xfce/libxfcegui4/DEPENDS
index 5756228..397fe09 100755
--- a/xfce/libxfcegui4/DEPENDS
+++ b/xfce/libxfcegui4/DEPENDS
@@ -1,3 +1,14 @@
 depends gtk+2 &&
 depends libxml2 &&
-depends libxfce4util
+depends libxfce4util &&
+depends xfconf &&
+
+optional_depends startup-notification \
+                 "--enable-startup-notification" \
+                 "--disable-startup-notification" \
+                 "for notification support" &&
+
+optional_depends glade3 \
+                 "--enable-gladeui" \
+                 "--disable-gladeui" \
+                 "for glade interface designer integration"
diff --git a/xfce/libxfcegui4/DETAILS b/xfce/libxfcegui4/DETAILS
index 85559c1..89d7b23 100755
--- a/xfce/libxfcegui4/DETAILS
+++ b/xfce/libxfcegui4/DETAILS
@@ -1,14 +1,15 @@
            SPELL=libxfcegui4
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:61a72897515c45b3195df17622269179f000598a24377cba2e49553656b1b6f4834ff3552f763570de62d10e876f4b19cfc17e530e391d2b9592d1e708357691
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=LGPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/libxfcegui4/HISTORY b/xfce/libxfcegui4/HISTORY
index 2935c5d..2f405a6 100644
--- a/xfce/libxfcegui4/HISTORY
+++ b/xfce/libxfcegui4/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: added missing deps
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths
 
diff --git a/xfce/mousepad/DETAILS b/xfce/mousepad/DETAILS
index 258ab05..b39acbd 100755
--- a/xfce/mousepad/DETAILS
+++ b/xfce/mousepad/DETAILS
@@ -1,14 +1,15 @@
            SPELL=mousepad
-         VERSION=0.2.14
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=0.2.16
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+      SOURCE_HASH=sha512:907aa63c4eabdd4683a7dddca3fea5ae3f8903fa506154f6b855dfc9ee56ac38b25eeead359730b902c21403be5c8e9243250e888305f02f9823093a6d34fce3
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20050128
         KEYWORDS="xfce editors"
diff --git a/xfce/mousepad/HISTORY b/xfce/mousepad/HISTORY
index 0eb3807..0410b73 100644
--- a/xfce/mousepad/HISTORY
+++ b/xfce/mousepad/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 0.2.16
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.2.14 (Xfce 4.4.3); quoting paths; fixed
 	  descs; use RELEASE_VERSION
diff --git a/xfce/orage/DEPENDS b/xfce/orage/DEPENDS
index 7ef23c2..c4582cf 100755
--- a/xfce/orage/DEPENDS
+++ b/xfce/orage/DEPENDS
@@ -1,4 +1,9 @@
-depends xfce4-panel &&
+depends libxfcegui4 &&
+
+optional_depends db \
+                 "--with-bdb4" \
+                 "--without-bdb4" \
+                 "for Berkeley DB support" &&
 
 optional_depends dbus-glib \
                  "--enable-dbus" \
diff --git a/xfce/orage/DETAILS b/xfce/orage/DETAILS
index 0f59e70..5d04c01 100755
--- a/xfce/orage/DETAILS
+++ b/xfce/orage/DETAILS
@@ -1,17 +1,18 @@
            SPELL=orage
 if [[ $ORAGE_STABLE == y ]]; then
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
-          SOURCE=orage-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.asc
+         VERSION=$RELEASE_VERSION
+          SOURCE=$SPELL-$VERSION.tar.bz2
+#         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
+     SOURCE_HASH=sha512:adc03cdce51a622a867bd35e634726c0fcfe8e370ea7ecbdc67e3bd2c18b5ca02d3d449535c471c90a4a2b402954817a85cc62eab89efab0b888923f44c63145
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
 else
          VERSION=4.5.91.1
-          SOURCE=orage-$VERSION.tar.bz2
+          SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://www.kolumbus.fi/~w408237/$SPELL/$SOURCE
      SOURCE_HASH=sha512:ca63365e4b4f30b92e715beab51fc12a8ec85dd51a5d05e5bee6dd4ed2fc70b2e8af89c039fa9ebbc528d67054ea2a9db9f94333a6b411380d4721477ceda8f9
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-svn"
diff --git a/xfce/orage/HISTORY b/xfce/orage/HISTORY
index 99abee9..6df1193 100644
--- a/xfce/orage/HISTORY
+++ b/xfce/orage/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated versions to 4.4.3 (stable) and 4.5.91.1 (devel);
 	  corrected VERSION; fixed desc; cleaned up; added -svn for build dir
diff --git a/xfce/terminal/DETAILS b/xfce/terminal/DETAILS
index ab2f479..905db40 100755
--- a/xfce/terminal/DETAILS
+++ b/xfce/terminal/DETAILS
@@ -1,13 +1,14 @@
            SPELL=terminal
-         VERSION=0.2.8.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=0.2.10
           SOURCE=Terminal-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Terminal-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
+     SOURCE_HASH=sha512:b0ad6bf85e4b631ad1ebbc417c3b47ddbba60089cd83745f26207aee351a36b75bb29ade5d1fa7c0866eda47b795fd9133580405efaa672bcc87911b49f7c8e5
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
         WEB_SITE=http://terminal.os-cillation.com/
          ENTERED=20050101
          LICENSE=GPL
diff --git a/xfce/terminal/HISTORY b/xfce/terminal/HISTORY
index 6e0640d..74df8ea 100644
--- a/xfce/terminal/HISTORY
+++ b/xfce/terminal/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 0.2.10
+	* PRE_BUILD: use static name
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.2.8.3 (Xfce 4.4.3); quoting paths; fixed
 	  short desc
diff --git a/xfce/terminal/PRE_BUILD b/xfce/terminal/PRE_BUILD
index 2e857c3..48ce87b 100755
--- a/xfce/terminal/PRE_BUILD
+++ b/xfce/terminal/PRE_BUILD
@@ -1,8 +1,8 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-sed -i "s:doc/Terminal:doc/$SPELL:g" TerminalHelp.in doc/Makefile.{am,in} &&
+sed -i "s:doc/Terminal:doc/terminal:g" TerminalHelp.in doc/Makefile.{am,in} &&
 
 for lang in C fr ja; do
-  sed -i "s:doc/Terminal:doc/${SPELL}:g" doc/$lang/{images/,}Makefile.{am,in}
+  sed -i "s:doc/Terminal:doc/terminal:g" doc/$lang/{images/,}Makefile.{am,in}
 done
diff --git a/xfce/thunar/DEPENDS b/xfce/thunar/DEPENDS
index 74e808d..a2163bc 100755
--- a/xfce/thunar/DEPENDS
+++ b/xfce/thunar/DEPENDS
@@ -3,28 +3,33 @@ depends shared-mime-info &&
 depends desktop-file-utils &&
 
 optional_depends dbus-glib \
-                 "--enable-dbus" "--disable-dbus" \
+                 "--enable-dbus" \
+                 "--disable-dbus" \
                  "for D-Bus support" &&
 
 optional_depends gtk-doc \
-                 "--enable-gtk-doc" "--disable-gtk-doc" \
+                 "--enable-gtk-doc" \
+                 "--disable-gtk-doc" \
                  "to build documentation" &&
 
 optional_depends hal \
-                 "--with-volume-manager=hal" "" \
-                 "to use HAL as volume manager" &&
+                 "--with-volume-manager=hal" \
+                 "--with-volume-manager=none" \
+                 "use HAL as volume manager" &&
 
 optional_depends libexif \
-                 "--enable-exif" "--disable-exif" \
+                 "--enable-exif" \
+                 "--disable-exif" \
                  "for EXIF support" &&
 
 optional_depends pcre \
-                 "--enable-pcre" "--disable-pcre" \
+                 "--enable-pcre" \
+                 "--disable-pcre" \
                  "for regular expressions support" &&
 
 optional_depends startup-notification \
                  "--enable-startup-notification" \
-		 "--disable-startup-notification" \
+                 "--disable-startup-notification" \
                  "for startup notification library support" &&
 
 optional_depends gamin "" "" "for filesystem change updates"
diff --git a/xfce/thunar/DETAILS b/xfce/thunar/DETAILS
index 5c69492..65d11e9 100755
--- a/xfce/thunar/DETAILS
+++ b/xfce/thunar/DETAILS
@@ -1,14 +1,15 @@
            SPELL=thunar
-         VERSION=0.9.3
-          SOURCE=Thunar-$VERSION.tar.bz2
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
-	 SOURCE2=$SOURCE.asc
+         VERSION=1.0.0
+          SOURCE=Thunar-$VERSION.tar.bz2
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/Thunar-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://thunar.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:1ff539c5b58d16dc712aae148b45f2af566832fed5bb4fd534db566d51af58251ae4247451c1af72ff1a2f9661cd594636d738f4f3eee877a2746e7c1dfdb212
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
       LICENSE[1]=LGPL
          ENTERED=20030608
diff --git a/xfce/thunar/HISTORY b/xfce/thunar/HISTORY
index 0d32d2e..9921d4f 100644
--- a/xfce/thunar/HISTORY
+++ b/xfce/thunar/HISTORY
@@ -1,3 +1,9 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 1.0.0
+	* DEPENDS: added missing dep
+	* PRE_BUILD: use static name; added more langs
+	* thunar-zombie.patch: removed
+
 2008-11-14 Vlad Glagolev <stealth at sourcemage.org>
 	* PRE_BUILD: don't use "SCRIPT"; quoting paths
 
diff --git a/xfce/thunar/PRE_BUILD b/xfce/thunar/PRE_BUILD
index c2d7802..2b3039a 100755
--- a/xfce/thunar/PRE_BUILD
+++ b/xfce/thunar/PRE_BUILD
@@ -1,15 +1,11 @@
 default_pre_build &&
 cd "$SOURCE_DIRECTORY" &&
 
-sed -i "s:doc/Thunar:doc/$SPELL:g" \
+sed -i "s:doc/Thunar:doc/thunar:g" \
   ThunarHelp.in \
   docs/{manual/,}/Makefile.{am,in} &&
 
-for lang in C es eu fr ja pl ru zh_TW; do
-  sed -i "s:doc/Thunar:doc/$SPELL:g" \
+for lang in C es eu fr ja nl pl ru tr zh_TW; do
+  sed -i "s:doc/Thunar:doc/thunar:g" \
          docs/manual/$lang/{images/,}Makefile.{am,in}
-done &&
-
-
-# See http://bugzilla.xfce.org/show_bug.cgi?id=2983
-patch -p0 < "$SPELL_DIRECTORY/thunar-zombie.patch"
+done
diff --git a/xfce/thunar/thunar-zombie.patch b/xfce/thunar/thunar-zombie.patch
deleted file mode 100644
index 4353c74..0000000
--- a/xfce/thunar/thunar-zombie.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: thunar-vfs/thunar-vfs-exec.c
-===================================================================
---- thunar-vfs/thunar-vfs-exec.c	(revision 26428)
-+++ thunar-vfs/thunar-vfs-exec.c	(working copy)
-@@ -324,8 +324,10 @@
-   if (startup_data->watch_id != 0)
-     g_source_remove (startup_data->watch_id);
- 
--  /* close the PID */
--  g_spawn_close_pid (startup_data->pid);
-+  /* make sure we don't leave zombies (see bug #2983 for details) */
-+  g_child_watch_add_full (G_PRIORITY_LOW, startup_data->pid,
-+                          (GChildWatchFunc) g_spawn_close_pid,
-+                          NULL, NULL);
- 
-   /* release the startup data */
-   _thunar_vfs_slice_free (TvsnStartupData, startup_data);
-@@ -513,7 +515,13 @@
-           startup_data->pid = pid;
-         }
-     }
-+  else if (G_LIKELY (succeed))
-+    {
-+      /* make sure we don't leave zombies (see bug #2983 for details) */
-+      g_child_watch_add_full (G_PRIORITY_LOW, pid, (GChildWatchFunc) g_spawn_close_pid, NULL, NULL);
- 
-+    }
-+
-   /* release the sn display */
-   if (G_LIKELY (sn_display != NULL))
-     sn_display_unref (sn_display);
diff --git a/xfce/xfcalendar/BUILD b/xfce/xfcalendar/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/xfce/xfcalendar/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/xfce/xfcalendar/DEPENDS b/xfce/xfcalendar/DEPENDS
deleted file mode 100755
index 5d3b0db..0000000
--- a/xfce/xfcalendar/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends orage
diff --git a/xfce/xfcalendar/DETAILS b/xfce/xfcalendar/DETAILS
deleted file mode 100755
index ecb5f30..0000000
--- a/xfce/xfcalendar/DETAILS
+++ /dev/null
@@ -1,10 +0,0 @@
-           SPELL=xfcalendar
-         VERSION=deprecated
-        WEB_SITE=http://www.xfce.org
-      LICENSE[0]=GPL
-         ENTERED=20040108
-        KEYWORDS="xfce"
-           SHORT="Time-managing application for xfce4"
-cat << EOF
-Time-managing application for xfce4
-EOF
diff --git a/xfce/xfcalendar/HISTORY b/xfce/xfcalendar/HISTORY
deleted file mode 100644
index f2536e5..0000000
--- a/xfce/xfcalendar/HISTORY
+++ /dev/null
@@ -1,54 +0,0 @@
-2008-09-17 Arjan Bouter <abouter at sourcemage.org>
-	* project deprecated upstream in favor of orage
-
-2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
-	* DETAILS: [automated] Removed UPDATED.
-
-2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
-	* DETAILS: (automated) Add KEYWORDS
-
-2005-11-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 4.2.3
-	  changed to use gpg source verification
-
-2005-05-17 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 4.2.2
-	  changed SOURCE_URL to
-	  http://www.xfce.org/archive/xfce-$VERSION/src/
-
-2005-03-18 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 4.2.1
-	  changed SOURCE_URL to
-	  http://www.xfce.org/archive/xfce-$VERSION.1/src/
-	  changed SOURCE to use gzipped tarballs again
-
-2005-01-14 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 4.2.0
-	  changed SOURCE_URL to
-	  http://www.xfce.org/archive/xfce-$VERSION/src-bz2/
-	  changed SOURCE to use bzipped tarballs
-
-2004-12-24 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 4.1.99.3
-	  changed SOURCE_URL to
-	  http://www.xfce.org/archive/xfce-$VERSION/src/
-
-2004-11-17 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 4.1.99.1, changed SOURCE_URL to
-	  http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-$VERSION/src/
-
-2004-07-12 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 0.1.9, changed SOURCE_URL to
-	  http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.0.6/src/
-
-2004-04-17 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 0.1.8, changed SOURCE_URL to
-	  http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.0.5/src/
-
-2004-03-10 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DETAILS: updated to 0.1.6
-	  changed SOURCE_URL to http://www.xfce.org/archive/xfce-4.0.4/src/
-
-2004-01-08 Arwed v. Merkatz <v.merkatz at gmx.net>
-	* DEPENDS, DETAILS, HISTORY: created the spell
-
diff --git a/xfce/xfcalendar/INSTALL b/xfce/xfcalendar/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/xfce/xfcalendar/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/xfce/xfcalendar/PRE_BUILD b/xfce/xfcalendar/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/xfce/xfcalendar/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/xfce/xfcalendar/TRIGGERS b/xfce/xfcalendar/TRIGGERS
deleted file mode 100755
index 6afb62f..0000000
--- a/xfce/xfcalendar/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast $SPELL dispel_self
diff --git a/xfce/xfce-mcs-manager/BUILD b/xfce/xfce-mcs-manager/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xfce-mcs-manager/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/xfce-mcs-manager/DEPENDS b/xfce/xfce-mcs-manager/DEPENDS
index 6f84638..0169e26 100755
--- a/xfce/xfce-mcs-manager/DEPENDS
+++ b/xfce/xfce-mcs-manager/DEPENDS
@@ -1,3 +1 @@
-depends libxcursor &&
-depends libxfcegui4 &&
-depends libxfce4mcs
+depends xfce4-settings
diff --git a/xfce/xfce-mcs-manager/DETAILS b/xfce/xfce-mcs-manager/DETAILS
index 4c815e3..d8c70b3 100755
--- a/xfce/xfce-mcs-manager/DETAILS
+++ b/xfce/xfce-mcs-manager/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfce-mcs-manager
          VERSION=4.4.3
+      PATCHLEVEL=1
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
-          SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.asc
+#          SOURCE=$SPELL-$VERSION.tar.bz2
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=LGPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfce-mcs-manager/HISTORY b/xfce/xfce-mcs-manager/HISTORY
index c46d0c9..cf4caf9 100644
--- a/xfce/xfce-mcs-manager/HISTORY
+++ b/xfce/xfce-mcs-manager/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: spell deprecated
+
 2009-02-05 George Sherwood <gsherwood at sourcemage.org>
 	* DEPENDS: Added depends libxcursor. Bug #15058
 
diff --git a/xfce/xfce-mcs-manager/INSTALL b/xfce/xfce-mcs-manager/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xfce-mcs-manager/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xfce/xfce-mcs-manager/PRE_BUILD b/xfce/xfce-mcs-manager/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xfce-mcs-manager/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/xfce-mcs-manager/TRIGGERS b/xfce/xfce-mcs-manager/TRIGGERS
new file mode 100755
index 0000000..9f8040d
--- /dev/null
+++ b/xfce/xfce-mcs-manager/TRIGGERS
@@ -0,0 +1 @@
+on_cast xfce-mcs-manager dispel_self
diff --git a/xfce/xfce-mcs-plugins/BUILD b/xfce/xfce-mcs-plugins/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xfce-mcs-plugins/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/xfce-mcs-plugins/DEPENDS b/xfce/xfce-mcs-plugins/DEPENDS
index 568f5c9..0169e26 100755
--- a/xfce/xfce-mcs-plugins/DEPENDS
+++ b/xfce/xfce-mcs-plugins/DEPENDS
@@ -1 +1 @@
-depends xfce-mcs-manager
+depends xfce4-settings
diff --git a/xfce/xfce-mcs-plugins/DETAILS b/xfce/xfce-mcs-plugins/DETAILS
index 63380d9..69e53e1 100755
--- a/xfce/xfce-mcs-plugins/DETAILS
+++ b/xfce/xfce-mcs-plugins/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfce-mcs-plugins
          VERSION=4.4.3
+      PATCHLEVEL=1
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
-          SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#          SOURCE=$SPELL-$VERSION.tar.bz2
+#	 SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfce-mcs-plugins/HISTORY b/xfce/xfce-mcs-plugins/HISTORY
index 78709a8..d8db1a0 100644
--- a/xfce/xfce-mcs-plugins/HISTORY
+++ b/xfce/xfce-mcs-plugins/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: spell deprecated
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION; fixed descs
diff --git a/xfce/xfce-mcs-plugins/INSTALL b/xfce/xfce-mcs-plugins/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xfce-mcs-plugins/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xfce/xfce-mcs-plugins/PRE_BUILD b/xfce/xfce-mcs-plugins/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xfce-mcs-plugins/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/xfce-mcs-plugins/TRIGGERS b/xfce/xfce-mcs-plugins/TRIGGERS
new file mode 100755
index 0000000..cedcc48
--- /dev/null
+++ b/xfce/xfce-mcs-plugins/TRIGGERS
@@ -0,0 +1 @@
+on_cast xfce-mcs-plugins dispel_self
diff --git a/xfce/xfce-utils/DEPENDS b/xfce/xfce-utils/DEPENDS
index 7c04424..722e333 100755
--- a/xfce/xfce-utils/DEPENDS
+++ b/xfce/xfce-utils/DEPENDS
@@ -1,5 +1,5 @@
 depends which &&
-depends xfce-mcs-manager &&
+depends xfconf &&
 
 optional_depends dbus-glib \
                  "--enable-dbus" \
diff --git a/xfce/xfce-utils/DETAILS b/xfce/xfce-utils/DETAILS
index e22e1ff..b549679 100755
--- a/xfce/xfce-utils/DETAILS
+++ b/xfce/xfce-utils/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfce-utils
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:ff974e22b2cb6505abca109cdf4fdc710a9b2a490f70c6f6de5ebeb01f71a656e7d830a3620f3b990e24f312a752974abd62aa2bfdd39380c48d6b93f469edeb
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfce-utils/HISTORY b/xfce/xfce-utils/HISTORY
index 57437d8..eff57dd 100644
--- a/xfce/xfce-utils/HISTORY
+++ b/xfce/xfce-utils/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3; fixed long desc; corrected VERSION;
 	  quoting paths
diff --git a/xfce/xfce.version b/xfce/xfce.version
index 9e3a933..6016e8a 100644
--- a/xfce/xfce.version
+++ b/xfce/xfce.version
@@ -1 +1 @@
-4.4.3
+4.6.0
diff --git a/xfce/xfce4-appfinder/DEPENDS b/xfce/xfce4-appfinder/DEPENDS
index 500db30..77900e1 100755
--- a/xfce/xfce4-appfinder/DEPENDS
+++ b/xfce/xfce4-appfinder/DEPENDS
@@ -1 +1,2 @@
-depends libxfcegui4
+depends libxfcegui4 &&
+depends libxfce4menu
diff --git a/xfce/xfce4-appfinder/DETAILS b/xfce/xfce4-appfinder/DETAILS
index 1628023..ff0543a 100755
--- a/xfce/xfce4-appfinder/DETAILS
+++ b/xfce/xfce4-appfinder/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfce4-appfinder
-         VERSION=4.4.3
+         VERSION=4.6.0
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:d277daa3f2c0e5a09d686a1b524bf14381fbfdde2b13da3a535e3d26b5135fe97cca827311d52c534ac5847e68bd6a49b8e7f69c9a465e2304dae5fe8fcc5d82
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="menu xfce"
diff --git a/xfce/xfce4-appfinder/HISTORY b/xfce/xfce4-appfinder/HISTORY
index 55b2aea..966b0d2 100644
--- a/xfce/xfce4-appfinder/HISTORY
+++ b/xfce/xfce4-appfinder/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION
diff --git a/xfce/xfce4-dev-tools/DETAILS b/xfce/xfce4-dev-tools/DETAILS
index 0e42979..fadac2a 100755
--- a/xfce/xfce4-dev-tools/DETAILS
+++ b/xfce/xfce4-dev-tools/DETAILS
@@ -1,12 +1,13 @@
            SPELL=xfce4-dev-tools
-         VERSION=4.4.0.1
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-         SOURCE2=$SOURCE.asc
-   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/${SOURCE}
-  SOURCE2_URL[0]=$SOURCE_URL.asc
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+#         SOURCE2=$SOURCE.asc
+   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
+     SOURCE_HASH=sha512:7bdc328d883e896a7eb7f1b38fe3f73dc27d8610d3cd69150ce00264ff8c75a236b24f29bdbf0ed5d182415f23edf6415640568029beec0ec1f9c8858e9a3c28
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
         WEB_SITE=http://www.xfce.org/
       LICENSE[0]=GPL
diff --git a/xfce/xfce4-dev-tools/HISTORY b/xfce/xfce4-dev-tools/HISTORY
index 8d5cb2b..9e3b001 100644
--- a/xfce/xfce4-dev-tools/HISTORY
+++ b/xfce/xfce4-dev-tools/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: quoting paths; cleaned up; fixed descs; added signature
 	  ignore
diff --git a/xfce/xfce4-dict-plugin/BUILD b/xfce/xfce4-dict-plugin/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/xfce/xfce4-dict-plugin/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/xfce/xfce4-dict-plugin/DEPENDS b/xfce/xfce4-dict-plugin/DEPENDS
deleted file mode 100755
index 76af1e4..0000000
--- a/xfce/xfce4-dict-plugin/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends xfce4-dict
diff --git a/xfce/xfce4-dict-plugin/DETAILS b/xfce/xfce4-dict-plugin/DETAILS
deleted file mode 100755
index 5ac4e2e..0000000
--- a/xfce/xfce4-dict-plugin/DETAILS
+++ /dev/null
@@ -1,17 +0,0 @@
-           SPELL=xfce4-dict-plugin
-         VERSION=0.3.0
-#          SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-#   SOURCE_URL[0]=http://goodies.xfce.org/releases/$SPELL/$SOURCE
-        WEB_SITE=http://goodies.xfce.org/
-#      SOURCE_GPG=gurus.gpg:$SOURCE.sig
-      PATCHLEVEL=1
-      LICENSE[0]=BSD
-         ENTERED=20071203
-        KEYWORDS="xfce dictionary"
-           SHORT="query a dictionary server from the xfce4 panel"
-cat << EOF
-With xfce4-dict you can query a dictionary server (see RFC 2229) to search
-for the translation or explanation of a word. You can also choose a
-dictionary offered by the server to improve your search results.
-EOF
diff --git a/xfce/xfce4-dict-plugin/HISTORY b/xfce/xfce4-dict-plugin/HISTORY
deleted file mode 100644
index 4b749e6..0000000
--- a/xfce/xfce4-dict-plugin/HISTORY
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-05-24 Vlad Glagolev <stealth at sourcemage.org>
-	* BUILD, PRE_BUILD, INSTALL: spell deprecated, replaced by xfce4-dict
-
-2008-03-13 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS: Changed SOURCE_URL[0] extension
-	  updated spell to 0.3.0
-
-2007-12-03 Vlad Glagolev <stealth at sourcemage.org>
-	* DETAILS, DEPENDS: created spell
diff --git a/xfce/xfce4-dict-plugin/INSTALL b/xfce/xfce4-dict-plugin/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/xfce/xfce4-dict-plugin/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/xfce/xfce4-dict-plugin/PRE_BUILD b/xfce/xfce4-dict-plugin/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/xfce/xfce4-dict-plugin/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/xfce/xfce4-dict-plugin/TRIGGERS b/xfce/xfce4-dict-plugin/TRIGGERS
deleted file mode 100755
index 1e74d70..0000000
--- a/xfce/xfce4-dict-plugin/TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-on_cast xfce4-dict-plugin dispel_self
diff --git a/xfce/xfce4-icon-theme/DETAILS b/xfce/xfce4-icon-theme/DETAILS
index fbf409d..3fd492b 100755
--- a/xfce/xfce4-icon-theme/DETAILS
+++ b/xfce/xfce4-icon-theme/DETAILS
@@ -1,10 +1,9 @@
            SPELL=xfce4-icon-theme
          VERSION=4.4.3
- RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
-   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
       SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/xfce/xfce4-icon-theme/HISTORY b/xfce/xfce4-icon-theme/HISTORY
index 1224c90..2536b8c 100644
--- a/xfce/xfce4-icon-theme/HISTORY
+++ b/xfce/xfce4-icon-theme/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: let's leave this as static
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION
diff --git a/xfce/xfce4-mixer/BUILD b/xfce/xfce4-mixer/BUILD
deleted file mode 100755
index d22e99f..0000000
--- a/xfce/xfce4-mixer/BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-make_single &&
-default_build &&
-make_normal
diff --git a/xfce/xfce4-mixer/DEPENDS b/xfce/xfce4-mixer/DEPENDS
index ea0e35e..32b70e3 100755
--- a/xfce/xfce4-mixer/DEPENDS
+++ b/xfce/xfce4-mixer/DEPENDS
@@ -1,7 +1,2 @@
-depends xfce4-panel &&
-
-optional_depends alsa-lib \
-                 "--with-sound=alsa" "" \
-                 "for ALSA support (not detected correctly if you have OSS)" &&
-
-optional_depends startup-notification "" "" "for startup notification"
+depends libxfcegui4 &&
+depends gst-plugins-base
diff --git a/xfce/xfce4-mixer/DETAILS b/xfce/xfce4-mixer/DETAILS
index 83ebe37..9c9c253 100755
--- a/xfce/xfce4-mixer/DETAILS
+++ b/xfce/xfce4-mixer/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfce4-mixer
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:02563f3b36d9a7d66bb17635a82ab40e0b40d7c6c4099ccda4a8bb1f179a056b4d413f3e0d543c676bd619a4dd63a70cc70c76e48fb9fa11711af4e3467cfed9
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=BSD
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfce4-mixer/HISTORY b/xfce/xfce4-mixer/HISTORY
index 22329da..bccc60b 100644
--- a/xfce/xfce4-mixer/HISTORY
+++ b/xfce/xfce4-mixer/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION
diff --git a/xfce/xfce4-panel/DEPENDS b/xfce/xfce4-panel/DEPENDS
index 71155fb..52828b8 100755
--- a/xfce/xfce4-panel/DEPENDS
+++ b/xfce/xfce4-panel/DEPENDS
@@ -1,4 +1,12 @@
 depends libxml2 &&
-depends xfce-mcs-manager &&
+depends libwnck &&
 
-optional_depends startup-notification "" "" "for startup notification"
+optional_depends startup-notification \
+                 "--enable-startup-notification" \
+                 "--disable-startup-notification" \
+                 "for startup notification" &&
+
+optional_depends gtk-doc \
+                 "--enable-gtk-doc" \
+                 "--disable-gtk-doc" \
+                 "to build documentation"
diff --git a/xfce/xfce4-panel/DETAILS b/xfce/xfce4-panel/DETAILS
index d15e41d..36ae9d3 100755
--- a/xfce/xfce4-panel/DETAILS
+++ b/xfce/xfce4-panel/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfce4-panel
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:4fbcdd67b92cf7dda52920fd240fe8f8c72a5a929502e4ad2c35b8a455c5d4b31c51e0e34ef7aa6f1c0835b2a53b6becca80eae6e5ed2b2e7738c73338f20955
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfce4-panel/HISTORY b/xfce/xfce4-panel/HISTORY
index d1ecdd9..fb01f99 100644
--- a/xfce/xfce4-panel/HISTORY
+++ b/xfce/xfce4-panel/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; fixed
 	  descs; corrected VERSION
diff --git a/xfce/xfce4-session/DEPENDS b/xfce/xfce4-session/DEPENDS
index 0f17abe..67b4529 100755
--- a/xfce/xfce4-session/DEPENDS
+++ b/xfce/xfce4-session/DEPENDS
@@ -1,11 +1,12 @@
 depends iceauth &&
-depends xfce-mcs-manager &&
 depends xml-parser-expat &&
+depends dbus-glib &&
+depends libxfcegui4 &&
 
-optional_depends dbus \
-                 "--enable-dbus" \
-                 "--disable-dbus" \
-                 "for D-Bus support" &&
+optional_depends gnome-keyring \
+                 "--enable-libgnome-keyring" \
+                 "--disable-libgnome-keyring" \
+                 "for gnome-keyring compatibility support" &&
 
 optional_depends gconf2 \
                  "--enable-gnome" \
diff --git a/xfce/xfce4-session/DETAILS b/xfce/xfce4-session/DETAILS
index bcc6dfb..559139e 100755
--- a/xfce/xfce4-session/DETAILS
+++ b/xfce/xfce4-session/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfce4-session
-         VERSION=4.4.3
+         VERSION=4.6.0
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+      SOURCE_HASH=sha512:39681326cfbe3c873c8d3c945de4ee05c8e9d5b08a28173f8c3b117d7feb057790efdd51e813b61de4e6c955a06da2d2e678140c7c235185216e474abc7737c4
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfce4-session/HISTORY b/xfce/xfce4-session/HISTORY
index 1c65b59..80ca570 100644
--- a/xfce/xfce4-session/HISTORY
+++ b/xfce/xfce4-session/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION
diff --git a/xfce/xfce4-settings/DEPENDS b/xfce/xfce4-settings/DEPENDS
new file mode 100755
index 0000000..f02b71a
--- /dev/null
+++ b/xfce/xfce4-settings/DEPENDS
@@ -0,0 +1,11 @@
+depends libxfcegui4
+
+optional_depends gnome-keyring \
+                 "--enable-libgnome-keyring" \
+                 "--disable-libgnome-keyring" \
+                 "for gnome-keyring compatibility support" &&
+
+optional_depends gconf2 \
+                 "--enable-gnome" \
+                 "--disable-gnome" \
+                 "for Assistive technologies support"
diff --git a/xfce/xfce4-settings/DETAILS b/xfce/xfce4-settings/DETAILS
new file mode 100755
index 0000000..0118a15
--- /dev/null
+++ b/xfce/xfce4-settings/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=xfce4-settings
+         VERSION=4.6.0
+ RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+          SOURCE=$SPELL-$VERSION.tar.bz2
+#         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
+        WEB_SITE=http://www.xfce.org/
+     SOURCE_HASH=sha512:973a60eb2fdca343a2765ef4da346b1ce1ac36c1091896953e8900d6a4f5d7d4edbfc51f37f468b0f971231de3010bba23ca31d8a08d16e9d0f648b4ae6277e8
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
+      LICENSE[0]=GPL
+         ENTERED=20090227
+        KEYWORDS="xfce"
+           SHORT="settings manager for the Xfce desktop environment"
+cat << EOF
+Settings manager for the Xfce desktop environment.
+EOF
diff --git a/xfce/xfce4-settings/HISTORY b/xfce/xfce4-settings/HISTORY
new file mode 100644
index 0000000..3bbb1da
--- /dev/null
+++ b/xfce/xfce4-settings/HISTORY
@@ -0,0 +1,2 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS, DEPENDS: spell created
diff --git a/xfce/xfconf/DEPENDS b/xfce/xfconf/DEPENDS
new file mode 100755
index 0000000..22eba63
--- /dev/null
+++ b/xfce/xfconf/DEPENDS
@@ -0,0 +1,8 @@
+depends glib2 &&
+depends dbus-glib &&
+depends libxfce4util &&
+
+optional_depends perl-glib \
+                 "--enable-perl-bindings" \
+                 "--disable-perl-bindings" \
+                 "for Perl bindings"
diff --git a/xfce/xfconf/DETAILS b/xfce/xfconf/DETAILS
new file mode 100755
index 0000000..80a0aa4
--- /dev/null
+++ b/xfce/xfconf/DETAILS
@@ -0,0 +1,19 @@
+           SPELL=xfconf
+ RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
+          SOURCE=$SPELL-$VERSION.tar.bz2
+#         SOURCE2=$SOURCE.asc
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
+        WEB_SITE=http://www.xfce.org/
+     SOURCE_HASH=sha512:4acc10949086e48045f10c9127ce79bd7aa97e7b1c95b0496ab6dcbd3ff0f966948b829432044d0c5de17a4b4d58cc3da1f423f0ab0f38ccf81e68e0267eac8f
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
+      LICENSE[0]=LGPL
+         ENTERED=20090227
+        KEYWORDS="xfce"
+           SHORT="configuration manager for xfce"
+cat << EOF
+xfconf is configuration manager for xfce.
+EOF
diff --git a/xfce/xfconf/HISTORY b/xfce/xfconf/HISTORY
new file mode 100644
index 0000000..e00a92f
--- /dev/null
+++ b/xfce/xfconf/HISTORY
@@ -0,0 +1,2 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DEPENDS, DETAILS: spell created
diff --git a/xfce/xfdesktop/DEPENDS b/xfce/xfdesktop/DEPENDS
index e717f8b..47a8bc1 100755
--- a/xfce/xfdesktop/DEPENDS
+++ b/xfce/xfdesktop/DEPENDS
@@ -1,13 +1,19 @@
-depends xfce4-panel &&
+depends libwnck &&
+depends libxfcegui4 &&
+
+optional_depends xfce4-panel \
+                 "--enable-panel-plugin" \
+                 "--disable-panel-plugin" \
+                 "for panel plugin" &&
 
 optional_depends thunar \
                  "--enable-thunarx" \
                  "--disable-thunarx" \
-                 "For desktop launcher icons" &&
+                 "for desktop launcher icons" &&
 
 optional_depends exo \
                  "--enable-exo" \
                  "--disable-exo" \
-                 "For nifty icon effects" &&
+                 "for nifty icon effects" &&
 
 optional_depends dbus "" "" "For D-Bus usage"
diff --git a/xfce/xfdesktop/DETAILS b/xfce/xfdesktop/DETAILS
index 4fa7fe4..3dd3be1 100755
--- a/xfce/xfdesktop/DETAILS
+++ b/xfce/xfdesktop/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfdesktop
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:ac405a596e78a684c8183a0c6798890d7181bde19b0a90ef99d88722bcd84261cfc5303de8724975e545736de7d7034e96e4d9ad129269a5ee46372c6f7a04a9
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfdesktop/HISTORY b/xfce/xfdesktop/HISTORY
index bab43d1..fc3b1b5 100644
--- a/xfce/xfdesktop/HISTORY
+++ b/xfce/xfdesktop/HISTORY
@@ -1,3 +1,8 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+	* PRE_BUILD: removed
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION
diff --git a/xfce/xfdesktop/PRE_BUILD b/xfce/xfdesktop/PRE_BUILD
deleted file mode 100755
index 48c1f72..0000000
--- a/xfce/xfdesktop/PRE_BUILD
+++ /dev/null
@@ -1,5 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-sed -i "s:G_INLINE_FUNC void desktop_menuspec_path_free:void desktop_menuspec_path_free:" \
-       modules/menu/desktop-menuspec.h
diff --git a/xfce/xffm/BUILD b/xfce/xffm/BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xffm/BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/xffm/DEPENDS b/xfce/xffm/DEPENDS
index d13cf55..fb361d1 100755
--- a/xfce/xffm/DEPENDS
+++ b/xfce/xffm/DEPENDS
@@ -1,3 +1 @@
-depends  dbh          &&
-depends  libxml2      &&
-depends  xfce-mcs-manager
+depends thunar
diff --git a/xfce/xffm/DETAILS b/xfce/xffm/DETAILS
index d95d359..754d234 100755
--- a/xfce/xffm/DETAILS
+++ b/xfce/xffm/DETAILS
@@ -1,10 +1,11 @@
            SPELL=xffm
          VERSION=4.2.3
-          SOURCE=$SPELL-$VERSION.tar.gz
+      PATCHLEVEL=1
+#          SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
+#   SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$VERSION/src/$SOURCE
         WEB_SITE=http://www.xfce.org
-      SOURCE_GPG="gurus.gpg:$SOURCE.sig"
+#      SOURCE_GPG="gurus.gpg:$SOURCE.sig"
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="filemanager xfce"
diff --git a/xfce/xffm/HISTORY b/xfce/xffm/HISTORY
index a1ce344..580af98 100644
--- a/xfce/xffm/HISTORY
+++ b/xfce/xffm/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: spell deprecated
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
@@ -83,4 +86,3 @@
 
 2003-06-08 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* DEPENDS, DETAILS, HISTORY: created the spell
-
diff --git a/xfce/xffm/INSTALL b/xfce/xffm/INSTALL
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xffm/INSTALL
@@ -0,0 +1 @@
+true
diff --git a/xfce/xffm/PRE_BUILD b/xfce/xffm/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/xfce/xffm/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/xfce/xffm/TRIGGERS b/xfce/xffm/TRIGGERS
new file mode 100755
index 0000000..b86960d
--- /dev/null
+++ b/xfce/xffm/TRIGGERS
@@ -0,0 +1 @@
+on_cast xffm dispel_self
diff --git a/xfce/xffm/xffm-4.2.3.tar.gz.sig b/xfce/xffm/xffm-4.2.3.tar.gz.sig
deleted file mode 100644
index 436e2fa..0000000
Binary files a/xfce/xffm/xffm-4.2.3.tar.gz.sig and /dev/null differ
diff --git a/xfce/xfprint/DEPENDS b/xfce/xfprint/DEPENDS
index f689a4c..503320a 100755
--- a/xfce/xfprint/DEPENDS
+++ b/xfce/xfprint/DEPENDS
@@ -1,8 +1,7 @@
 depends gtk+2 &&
 depends libxfcegui4 &&
 depends libxfce4util &&
-depends libxfce4mcs &&
-depends xfce-mcs-manager &&
+depends xfce4-settings &&
 depends a2ps &&
 
 optional_depends CUPS \
diff --git a/xfce/xfprint/DETAILS b/xfce/xfprint/DETAILS
index ccab5d0..b9bc912 100755
--- a/xfce/xfprint/DETAILS
+++ b/xfce/xfprint/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfprint
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:3850e36c30bb6f0a67517dd2005233ea2a55d30066e2d1c1bd86d77cab3ca7d1c47f1d0d5f1f5312c5c78a2da410a1b9249fec91263c946bc4c025fac758a0c9
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=BSD
          ENTERED=20030608
         KEYWORDS="printer xfce"
diff --git a/xfce/xfprint/HISTORY b/xfce/xfprint/HISTORY
index 270ff3e..68b3ef9 100644
--- a/xfce/xfprint/HISTORY
+++ b/xfce/xfprint/HISTORY
@@ -1,3 +1,7 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION
diff --git a/xfce/xfwm4-themes/DETAILS b/xfce/xfwm4-themes/DETAILS
index 5a9240c..7b75c41 100755
--- a/xfce/xfwm4-themes/DETAILS
+++ b/xfce/xfwm4-themes/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfwm4-themes
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-  SOURCE2_URL[0]=$SOURCE_URL.asc
+#  SOURCE2_URL[0]=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:f859c0e128e31a6af9c55762e2a5daccd155d0e1bfefb7451dc3c6c37853697fa4cf468dda901417be4bc5d34315744447455e1e9ff63e61f5f7af04c360f647
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
          ARCHIVE=off
diff --git a/xfce/xfwm4-themes/HISTORY b/xfce/xfwm4-themes/HISTORY
index 62eeb75..c0051d0 100644
--- a/xfce/xfwm4-themes/HISTORY
+++ b/xfce/xfwm4-themes/HISTORY
@@ -1,3 +1,6 @@
+2009-02-27 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected
 	  VERSION
diff --git a/xfce/xfwm4/DEPENDS b/xfce/xfwm4/DEPENDS
index cd79388..fe2a5e4 100755
--- a/xfce/xfwm4/DEPENDS
+++ b/xfce/xfwm4/DEPENDS
@@ -1,4 +1,4 @@
-depends xfce-mcs-manager &&
+depends xfce4-settings &&
 
 if [[ $COMPOSITOR == y ]]; then
   depends libxdamage "--enable-compositor" &&
@@ -10,6 +10,11 @@ optional_depends libxrandr \
                  "--disable-randr" \
                  "for X11 Xrandr extension support" &&
 
+if is_depends_enabled $SPELL libxrandr; then
+  depends libxrender
+fi &&
+
 optional_depends startup-notification \
-                 "" "" \
+                 "--enable-startup-notification" \
+                 "--disable-startup-notification" \
                  "for startup notification"
diff --git a/xfce/xfwm4/DETAILS b/xfce/xfwm4/DETAILS
index 875c1ff..8a62172 100755
--- a/xfce/xfwm4/DETAILS
+++ b/xfce/xfwm4/DETAILS
@@ -1,14 +1,15 @@
            SPELL=xfwm4
-         VERSION=4.4.3
  RELEASE_VERSION=$(cat $GRIMOIRE/xfce/xfce.version)
+         VERSION=$RELEASE_VERSION
           SOURCE=$SPELL-$VERSION.tar.bz2
-	 SOURCE2=$SOURCE.asc
+#         SOURCE2=$SOURCE.asc
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.xfce.org/archive/xfce-$RELEASE_VERSION/src/$SOURCE
-     SOURCE2_URL=$SOURCE_URL.asc
+#     SOURCE2_URL=$SOURCE_URL.asc
         WEB_SITE=http://www.xfce.org/
-      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
-  SOURCE2_IGNORE=signature
+     SOURCE_HASH=sha512:c2b7b1cde77bd5113678f341be8af12a847fd80d4b077ddf23b3369194dfdadf1294c3ed98bb6bfad8b13e460eade9f78c1af2422a20857ddbfc375f502f19ba
+#      SOURCE_GPG=xfce.gpg:$SOURCE2:UPSTREAM_KEY
+#  SOURCE2_IGNORE=signature
       LICENSE[0]=GPL
          ENTERED=20030608
         KEYWORDS="xfce"
diff --git a/xfce/xfwm4/HISTORY b/xfce/xfwm4/HISTORY
index da122e6..98c4a51 100644
--- a/xfce/xfwm4/HISTORY
+++ b/xfce/xfwm4/HISTORY
@@ -1,3 +1,7 @@
+2009-02-29 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: 4.6.0
+	* DEPENDS: fixed dependencies
+
 2008-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 4.4.3 (Xfce 4.4.3); quoting paths; corrected VERSION
 	* DEPENDS: cleaned up



More information about the SM-Commit mailing list