diff --git a/windowmanagers/openbox/DETAILS b/windowmanagers/openbox/DETAILS
index ac9e647..9d16c48 100755
--- a/windowmanagers/openbox/DETAILS
+++ b/windowmanagers/openbox/DETAILS
@@ -1,9 +1,9 @@
SPELL=openbox
- VERSION=3.5.0
+ VERSION=3.5.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://openbox.org/dist/openbox/$SOURCE
-
SOURCE_HASH=sha512:208d2641e171eca5fae0a2104a9b3c6d685293b4d66a18c0c2900df267453911b8738ef239fd84656b41440a0568279de67b9af798a6457b7716b1aab14704b5
+
SOURCE_HASH=sha512:89c58364bc482f2b098341e28b2bbab69a791430ff8924dc0dd6fe56aabadde916d42a4e7dfb47cab21afebd747698e106a19e852444d2ede05e72ef423df09d
WEB_SITE=http://www.openbox.org
ENTERED=20030126
LICENSE[0]=GPL
diff --git a/windowmanagers/openbox/HISTORY b/windowmanagers/openbox/HISTORY
index c65d0da..67d81f2 100644
--- a/windowmanagers/openbox/HISTORY
+++ b/windowmanagers/openbox/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.5.2
+
2011-08-11 Martin Spitzbarth <m.spitzbarth AT gmx.de>
* DETAILS: updated spell to 3.5.0
* DEPENDS: requires subdependency X for pango,
diff --git a/windowmanagers/xmonad/BUILD b/windowmanagers/xmonad/BUILD
index de96a0c..27ba77d 100755
--- a/windowmanagers/xmonad/BUILD
+++ b/windowmanagers/xmonad/BUILD
@@ -1,2 +1 @@
-runhaskell Setup.lhs configure --prefix=${INSTALL_ROOT}/usr &&
-runhaskell Setup.lhs build
+true
diff --git a/windowmanagers/xmonad/DEPENDS b/windowmanagers/xmonad/DEPENDS
index daac485..2e29874 100755
--- a/windowmanagers/xmonad/DEPENDS
+++ b/windowmanagers/xmonad/DEPENDS
@@ -1,5 +1 @@
-depends ghc &&
-depends haskell-x11 &&
-depends haskell-mtl &&
-depends haskell-utf8-string &&
-depends haskell-extensible-exceptions
+depends haskell-xmonad
diff --git a/windowmanagers/xmonad/DETAILS b/windowmanagers/xmonad/DETAILS
index d50c82e..ef28997 100755
--- a/windowmanagers/xmonad/DETAILS
+++ b/windowmanagers/xmonad/DETAILS
@@ -1,20 +1,7 @@
- SPELL=xmonad
- VERSION=0.11
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://xmonad.org"
- LICENSE[0]=BSD3
- ENTERED=20070812
- SHORT="a lightweight X11 window manager"
-cat << EOF
-Xmonad is a minimalist tiling window manager for X, written in Haskell.
Windows
-are managed using automatic layout algorithms, which can be dynamically
-reconfigured. At any time windows are arranged so as to maximise the use of
-screen real estate. All features of the window manager are accessible purely
-from the keyboard: a mouse is entirely optional. Xmonad is configured in
-Haskell, and custom layout algorithms may be implemented by the user in
-config files. A principle of Xmonad is predictability: the user should know
-in advance precisely the window arrangement that will result from any action.
-EOF
+ SPELL=xmonad
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by haskell-xmonad]
+ EOF
diff --git a/windowmanagers/xmonad/DOWNLOAD b/windowmanagers/xmonad/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/windowmanagers/xmonad/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index 7d43624..cedd0de 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,8 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [integrate into the grimoire's haskell build
facilities]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2013-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* INSTALL: install manpage
diff --git a/windowmanagers/xmonad/INSTALL b/windowmanagers/xmonad/INSTALL
index fcce801..27ba77d 100755
--- a/windowmanagers/xmonad/INSTALL
+++ b/windowmanagers/xmonad/INSTALL
@@ -1,5 +1 @@
-runhaskell Setup.lhs install &&
-SHARE_DIR=${INSTALL_ROOT}/usr/share/${SPELL} &&
-mkdir -vp $SHARE_DIR &&
-cp -v xmonad.cabal $SHARE_DIR &&
-install -m644 ${SOURCE_DIRECTORY}/man/xmonad.1
${INSTALL_ROOT}/usr/share/man/man1/
+true
diff --git a/windowmanagers/xmonad/POST_REMOVE
b/windowmanagers/xmonad/POST_REMOVE
deleted file mode 100755
index bf7211f..0000000
--- a/windowmanagers/xmonad/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-message "${MESSAGE_COLOR}Unregistering package with
ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg unregister xmonad
diff --git a/windowmanagers/xmonad/POST_RESURRECT
b/windowmanagers/xmonad/POST_RESURRECT
deleted file mode 100755
index b057515..0000000
--- a/windowmanagers/xmonad/POST_RESURRECT
+++ /dev/null
@@ -1,16 +0,0 @@
-# We need to restore package.conf and package.conf.old after resurrection.
-# Also we need to register package with ghc-pkg.
-
-message "${MESSAGE_COLOR}Restoring package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
-if [ -f ${GHC_DIR}/package.conf.old.bak ] ; then
- mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
-fi
-
-message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
-CABAL_FILE=${INSTALL_ROOT}/usr/share/xmonad/xmonad.cabal
-ghc-pkg register --force-files $CABAL_FILE
-message "${MESSAGE_COLOR}Exposing package with ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg expose xmonad
diff --git a/windowmanagers/xmonad/PRE_BUILD b/windowmanagers/xmonad/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/windowmanagers/xmonad/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/windowmanagers/xmonad/PRE_RESURRECT
b/windowmanagers/xmonad/PRE_RESURRECT
deleted file mode 100755
index 9ab1156..0000000
--- a/windowmanagers/xmonad/PRE_RESURRECT
+++ /dev/null
@@ -1,9 +0,0 @@
-# We need to backup package.conf and package.conf.old before resurrection
-
-message "${MESSAGE_COLOR}Backuping package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
-if [ -f ${GHC_DIR}/package.conf.old ] ; then
- cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
-fi
diff --git a/windowmanagers/xmonad/TRIGGERS b/windowmanagers/xmonad/TRIGGERS
new file mode 100755
index 0000000..dc742f8
--- /dev/null
+++ b/windowmanagers/xmonad/TRIGGERS
@@ -0,0 +1 @@
+on_cast xmonad dispel_self
diff --git a/wm-addons/xmonad-contrib/BUILD b/wm-addons/xmonad-contrib/BUILD
index de96a0c..27ba77d 100755
--- a/wm-addons/xmonad-contrib/BUILD
+++ b/wm-addons/xmonad-contrib/BUILD
@@ -1,2 +1 @@
-runhaskell Setup.lhs configure --prefix=${INSTALL_ROOT}/usr &&
-runhaskell Setup.lhs build
+true
diff --git a/wm-addons/xmonad-contrib/DEPENDS
b/wm-addons/xmonad-contrib/DEPENDS
index 6ca2034..95d5c21 100755
--- a/wm-addons/xmonad-contrib/DEPENDS
+++ b/wm-addons/xmonad-contrib/DEPENDS
@@ -1,7 +1 @@
-depends ghc &&
-depends haskell-x11 &&
-depends haskell-mtl &&
-depends haskell-utf8-string &&
-depends haskell-random &&
-depends haskell-extensible-exceptions &&
-depends xmonad
+depends haskell-xmonad-contrib
diff --git a/wm-addons/xmonad-contrib/DETAILS
b/wm-addons/xmonad-contrib/DETAILS
index 3232b12..1397d9f 100755
--- a/wm-addons/xmonad-contrib/DETAILS
+++ b/wm-addons/xmonad-contrib/DETAILS
@@ -1,16 +1,7 @@
- SPELL=xmonad-contrib
- VERSION=0.11.3
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/${SPELL}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:13a1fe176e3c099e71def2404920be33afb800e15ed8479f9d2d9810c878e417943d75af821dfe01bfa3daff3f4cfb4a1001d3c2c39e2a59f4175b76ebe9cf99
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://xmonad.org"
- LICENSE[0]=BSD3
- ENTERED=20071212
- SHORT="third party extensions for xmonad"
-cat << EOF
-A huge library of extensions to xmonad is available. These scripts provide
new
-layout algorithms, key bindings, window tabbing, emulation of other window
-managers and more. A stable version of the extension library is available
with
-each xmonad release.
-EOF
+ SPELL=xmonad-contrib
+ VERSION=0
+ PATCHLEVEL=9999
+ SHORT="deprecated"
+ cat << EOF
+ deprecated spell [replaced by haskell-xmonad-contrib]
+ EOF
diff --git a/wm-addons/xmonad-contrib/DOWNLOAD
b/wm-addons/xmonad-contrib/DOWNLOAD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/wm-addons/xmonad-contrib/DOWNLOAD
@@ -0,0 +1 @@
+true
diff --git a/wm-addons/xmonad-contrib/HISTORY
b/wm-addons/xmonad-contrib/HISTORY
index ffa6c21..3e59bca 100644
--- a/wm-addons/xmonad-contrib/HISTORY
+++ b/wm-addons/xmonad-contrib/HISTORY
@@ -1,3 +1,8 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * spell deprecated [renamed to haskell-xmonad-contrib]
+ * PATCHLEVEL=9999
+ * DETAILS: version 0
+
2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.11.3
diff --git a/wm-addons/xmonad-contrib/INSTALL
b/wm-addons/xmonad-contrib/INSTALL
index b288692..27ba77d 100755
--- a/wm-addons/xmonad-contrib/INSTALL
+++ b/wm-addons/xmonad-contrib/INSTALL
@@ -1,4 +1 @@
-runhaskell Setup.lhs install &&
-SHARE_DIR=${INSTALL_ROOT}/usr/share/${SPELL} &&
-mkdir -vp $SHARE_DIR &&
-cp -v xmonad-contrib.cabal $SHARE_DIR
+true
diff --git a/wm-addons/xmonad-contrib/POST_REMOVE
b/wm-addons/xmonad-contrib/POST_REMOVE
deleted file mode 100755
index a4709be..0000000
--- a/wm-addons/xmonad-contrib/POST_REMOVE
+++ /dev/null
@@ -1,2 +0,0 @@
-message "${MESSAGE_COLOR}Unregistering package with
ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg unregister xmonad-contrib
diff --git a/wm-addons/xmonad-contrib/POST_RESURRECT
b/wm-addons/xmonad-contrib/POST_RESURRECT
deleted file mode 100755
index b4befb1..0000000
--- a/wm-addons/xmonad-contrib/POST_RESURRECT
+++ /dev/null
@@ -1,14 +0,0 @@
-# We need to restore package.conf and package.conf.old after resurrection.
-# Also we need to register package with ghc-pkg.
-
-message "${MESSAGE_COLOR}Restoring package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
-mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
-
-message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
-CABAL_FILE=${INSTALL_ROOT}/usr/share/xmonad/xmonad-contrib.cabal
-ghc-pkg register --force-files $CABAL_FILE
-message "${MESSAGE_COLOR}Exposing package with ghc-pkg...${DEFAULT_COLOR}"
-ghc-pkg expose xmonad-contrib
diff --git a/wm-addons/xmonad-contrib/PRE_BUILD
b/wm-addons/xmonad-contrib/PRE_BUILD
new file mode 100755
index 0000000..27ba77d
--- /dev/null
+++ b/wm-addons/xmonad-contrib/PRE_BUILD
@@ -0,0 +1 @@
+true
diff --git a/wm-addons/xmonad-contrib/PRE_RESURRECT
b/wm-addons/xmonad-contrib/PRE_RESURRECT
deleted file mode 100755
index 96595c8..0000000
--- a/wm-addons/xmonad-contrib/PRE_RESURRECT
+++ /dev/null
@@ -1,7 +0,0 @@
-# We need to backup package.conf and package.conf.old before resurrection
-
-message "${MESSAGE_COLOR}Backuping package.conf and
package.conf.old...${DEFAULT_COLOR}"
-GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
-GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
-cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
-cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
diff --git a/wm-addons/xmonad-contrib/TRIGGERS
b/wm-addons/xmonad-contrib/TRIGGERS
new file mode 100755
index 0000000..decebb9
--- /dev/null
+++ b/wm-addons/xmonad-contrib/TRIGGERS
@@ -0,0 +1 @@
+on_cast xmonad-contrib dispel_self
[SM-Commit] GIT changes to master grimoire by Florian Franzmann (0e8a2116f7b51d7432ccf5f872062bbacfc68a89),
Florian Franzmann, 05/10/2014