Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to devel-xorg-modular grimoire by Vlad Glagolev 
<stealth AT sourcemage.org>:

 ChangeLog                                                     |   22 
 chat-im/mcabber/DETAILS                                       |    8 
 chat-im/mcabber/HISTORY                                       |    7 
 chat-im/mcabber/PRE_BUILD                                     |    6 
 chat-im/mcabber/mcabber.gpg                                   |binary
 chat-im/mcabber/mcabber_use_libotr4.patch                     |  596 
----------
 devel/cppcheck/DETAILS                                        |    4 
 devel/cppcheck/HISTORY                                        |    3 
 devel/tig/DETAILS                                             |    4 
 devel/tig/HISTORY                                             |    3 
 disk/cdrtools/DETAILS                                         |    4 
 disk/cdrtools/HISTORY                                         |    3 
 disk/gummiboot/HISTORY                                        |    4 
 disk/gummiboot/INSTALL                                        |   10 
 disk/gummiboot/mkgummi                                        |   34 
 disk/gummiboot/smgl-splash.bmp.xz                             |binary
 editors/vim/DETAILS                                           |    6 
 editors/vim/HISTORY                                           |    3 
 fonts-x11/terminus-font/DETAILS                               |    4 
 fonts-x11/terminus-font/HISTORY                               |    3 
 ftp/imapsync/DEPENDS                                          |    4 
 ftp/imapsync/DETAILS                                          |    8 
 ftp/imapsync/HISTORY                                          |    5 
 graphics/libgphoto2/DETAILS                                   |    4 
 graphics/libgphoto2/HISTORY                                   |    3 
 groups                                                        |    2 
 haskell/haskell-hslogger/DETAILS                              |    4 
 haskell/haskell-hslogger/HISTORY                              |    3 
 haskell/haskell-http/DETAILS                                  |    4 
 haskell/haskell-http/HISTORY                                  |    3 
 haskell/haskell-mmap/DETAILS                                  |    4 
 haskell/haskell-mmap/HISTORY                                  |    3 
 haskell/haskell-monads-tf/DETAILS                             |    4 
 haskell/haskell-monads-tf/HISTORY                             |    3 
 haskell/haskell-mtl/DETAILS                                   |    4 
 haskell/haskell-mtl/HISTORY                                   |    3 
 haskell/haskell-network/DETAILS                               |    4 
 haskell/haskell-network/HISTORY                               |    3 
 haskell/haskell-quickcheck/DEPENDS                            |    3 
 haskell/haskell-quickcheck/DETAILS                            |    4 
 haskell/haskell-quickcheck/HISTORY                            |    4 
 haskell/haskell-safesemaphore/DETAILS                         |    4 
 haskell/haskell-safesemaphore/HISTORY                         |    3 
 haskell/haskell-tf-random/DEPENDS                             |    3 
 haskell/haskell-tf-random/DETAILS                             |   17 
 haskell/haskell-tf-random/HISTORY                             |    3 
 haskell/haskell-transformers/DETAILS                          |    4 
 haskell/haskell-transformers/HISTORY                          |    3 
 haskell/haskell-uuid/DETAILS                                  |    2 
 haskell/haskell-uuid/HISTORY                                  |    3 
 haskell/haskell-xmonad-contrib/CONFLICTS                      |    1 
 haskell/haskell-xmonad-contrib/DEPENDS                        |    7 
 haskell/haskell-xmonad-contrib/DETAILS                        |   16 
 haskell/haskell-xmonad-contrib/HISTORY                        |   34 
 haskell/haskell-xmonad/CONFLICTS                              |    1 
 haskell/haskell-xmonad/DEPENDS                                |    6 
 haskell/haskell-xmonad/DETAILS                                |   20 
 haskell/haskell-xmonad/HISTORY                                |   59 
 haskell/haskell-xmonad/INSTALL                                |    2 
 kernels/linux/HISTORY                                         |    4 
 kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3 |    5 
 kernels/linux/latest.defaults                                 |    2 
 libs/ldns/DEPENDS                                             |   14 
 libs/ldns/DETAILS                                             |   11 
 libs/ldns/HISTORY                                             |    5 
 libs/libyaml/DETAILS                                          |    4 
 libs/libyaml/HISTORY                                          |    3 
 mail/fetchmail/DETAILS                                        |    2 
 mail/fetchmail/HISTORY                                        |    3 
 mail/getmail/DETAILS                                          |    4 
 mail/getmail/HISTORY                                          |    3 
 mail/isync/DEPENDS                                            |    1 
 mail/isync/DETAILS                                            |   37 
 mail/isync/HISTORY                                            |    2 
 mail/masqmail/DETAILS                                         |    2 
 mail/masqmail/HISTORY                                         |    6 
 mail/masqmail/PRE_BUILD                                       |    6 
 mail/masqmail/log.patch                                       |   27 
 net/libreswan/BUILD                                           |    1 
 net/libreswan/CONFLICTS                                       |    1 
 net/libreswan/DEPENDS                                         |   47 
 net/libreswan/DETAILS                                         |   24 
 net/libreswan/HISTORY                                         |    3 
 net/libreswan/PRE_BUILD                                       |    7 
 net/libreswan/init.d/ipsec                                    |   23 
 net/libreswan/libreswan.gpg                                   |binary
 net/libreswan/no-pam.patch                                    |   26 
 net/minidlna/DETAILS                                          |    6 
 net/minidlna/HISTORY                                          |    3 
 net/minidlna/minidlna-1.1.2.tar.gz.sig                        |binary
 net/openswan/CONFLICTS                                        |    1 
 net/openswan/HISTORY                                          |    3 
 net/tinc/DETAILS                                              |    2 
 net/tinc/HISTORY                                              |    3 
 perl-cpan/date-manip/DETAILS                                  |    4 
 perl-cpan/date-manip/HISTORY                                  |    3 
 perl-cpan/file-copy-recursive/DEPENDS                         |    1 
 perl-cpan/file-copy-recursive/DETAILS                         |   14 
 perl-cpan/file-copy-recursive/HISTORY                         |    3 
 perl-cpan/mail-imapclient/DETAILS                             |    6 
 perl-cpan/mail-imapclient/HISTORY                             |    4 
 python-pypi/isort/DETAILS                                     |    4 
 python-pypi/isort/HISTORY                                     |    3 
 ruby-raa/ruby-2.1/DETAILS                                     |    4 
 ruby-raa/ruby-2.1/HISTORY                                     |    3 
 shell-term-fm/rxvt-unicode/DETAILS                            |    4 
 shell-term-fm/rxvt-unicode/HISTORY                            |    3 
 utils/dbus/DETAILS                                            |    4 
 utils/dbus/HISTORY                                            |    3 
 video/xbmc/DETAILS                                            |    7 
 video/xbmc/HISTORY                                            |    3 
 windowmanagers/amiwm/BUILD                                    |    3 
 windowmanagers/amiwm/HISTORY                                  |    3 
 windowmanagers/herbstluftwm/DETAILS                           |    4 
 windowmanagers/herbstluftwm/HISTORY                           |    3 
 windowmanagers/openbox/DETAILS                                |    4 
 windowmanagers/openbox/HISTORY                                |    3 
 windowmanagers/xmonad/BUILD                                   |    3 
 windowmanagers/xmonad/DEPENDS                                 |    6 
 windowmanagers/xmonad/DETAILS                                 |   27 
 windowmanagers/xmonad/DOWNLOAD                                |    1 
 windowmanagers/xmonad/HISTORY                                 |    5 
 windowmanagers/xmonad/INSTALL                                 |    6 
 windowmanagers/xmonad/POST_REMOVE                             |    2 
 windowmanagers/xmonad/POST_RESURRECT                          |   16 
 windowmanagers/xmonad/PRE_BUILD                               |    1 
 windowmanagers/xmonad/PRE_RESURRECT                           |    9 
 windowmanagers/xmonad/TRIGGERS                                |    1 
 wm-addons/xmonad-contrib/BUILD                                |    3 
 wm-addons/xmonad-contrib/DEPENDS                              |    8 
 wm-addons/xmonad-contrib/DETAILS                              |   23 
 wm-addons/xmonad-contrib/DOWNLOAD                             |    1 
 wm-addons/xmonad-contrib/HISTORY                              |    5 
 wm-addons/xmonad-contrib/INSTALL                              |    5 
 wm-addons/xmonad-contrib/POST_REMOVE                          |    2 
 wm-addons/xmonad-contrib/POST_RESURRECT                       |   14 
 wm-addons/xmonad-contrib/PRE_BUILD                            |    1 
 wm-addons/xmonad-contrib/PRE_RESURRECT                        |    7 
 wm-addons/xmonad-contrib/TRIGGERS                             |    1 
 139 files changed, 729 insertions(+), 793 deletions(-)

New commits:
commit 2d95f38eedff7fb818746439e29dd307a742fca4
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    tinc: => 1.0.24

commit eb094d90127e58deb4cdd8c36e66495592ba2180
Author: Pol Vinogradov <vin.public AT gmail.com>
Commit: Pol Vinogradov <vin.public AT gmail.com>

    video/xbmc: updated to 13.0_r2 Gotham

commit 5da1d363e609692be5c098fa9b30282fa98ea0cb
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    ruby-2.1: => 2.1.2

commit e222da5c38815b71993023c5bf65ec40f0f4c57e
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libyaml: => 0.1.6

commit 4ce84a9d71a96e79d12de7bad3788c039ec4afec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    groups: add plasma

commit 4633e0b06593b4b66bb86757af024989f5d98f6f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    masqmail: fixed logging

commit 1fa2f87dd268d7cfd73d5e4213e046c47e181419
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    shell-term-fm/rxvt-unicode: version 9.20

commit f165747c08291f78d63f19844df3a6c81bc20a08
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    imapsync: Depends on file-copy-recursive

commit cf5d5123e63973c78193df4e816f43bc4fe77666
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    getmail 4.46.0

commit 3981d149657fd75224a3bbc20b17bee8e6905c9a
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    fetchmail 6.3.26

commit 129e01a294d2ebf33a4ddd9bd03be5dc9b2f56fb
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    isync: new spell, IMAP and MailDir mailbox synchronizer

commit 59f7a17470786608e0b948aaf9b0a50473a70712
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    file-copy-recursive: new spell, Perl extension for recursively copying 
files and directories

commit 0f215829aaf5e8489df1ffa9230f7b0edc23c616
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    mail-imapclient 3.35

commit e9bff1d90b9ca633330a934a3d154392797537cd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    date-manip 6.43

commit 4903eca90e770b4ddb75d1b0f7a31c1b4541c496
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    imapsync 1.584

commit 0e8a2116f7b51d7432ccf5f872062bbacfc68a89
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    wm-addons/xmonad-contrib: moved to haskell/haskell-xmonad-contrib

commit 8bc08734e28cda8dcbd456319c05a5fbc7bd6ca6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    windowmanagers/xmonad: moved to haskell/haskell-xmonad

commit d9faec27a0474474fb9fa677d5ee092ba251f54a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    windowmanagers/openbox: version 3.5.2

commit 49d5e7c9637acc8348a5ec93f52f8d50ea827784
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    windowmanagers/herbstluftwm: version 0.6.2

commit d66f26b877186ab22909f1b2434fad33857b3e35
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    windowmanagers/amiwm: make_single

commit 1f42da5fee634043c36d2e4bf5b980b514df936f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    terminus-font: => 4.39

commit c23f130e20b60a63538fdee0a0f87d680ac7c1b7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    ldns: added openssl warn and perl opt dep

commit 3281928a716990b00d07677ebb8a67d1a27316d5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    ldns: => 1.6.17

commit 2459c59795d6d3cbb3ab204ef032b24e2899e4d5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mcabber: => 0.10.3

commit 0638fa04cb4c11b8fcf4f21ad8c55996f1e5d338
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    editors/vim: apply patches up to 7.4.282

commit f153995250054efd665070125cfe2f2432524ec5
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    cdrtools 3.01a23

commit ae87c3f0adcab1655cd6919e36ee8f8ac5eeb1e0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    devel/cppcheck: version 1.64

commit 3e1d080fadf8b15a12ff276886d53512981aa56a
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    tig 2.0.1

commit 074cfb30aed19a7b29eded7952546e3ffc2d8cc1
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    linux 3.14.3

commit 9c5525ef7e4ca273e0b059d2343cf9fb3d73f4f1
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    dbus: => 1.8.2

commit 1c2c0fb9672c8769541cd3f4cf73e306d8529fec
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gummiboot - add config script

commit 955935466d6807bc50e30d24a9a027cfdedbfcf5
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    libgphoto2: => 2.5.4

commit 0301bce2d0d5ed76708cb33c49bdf7773f44270c
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    isort: => 3.8.0

commit 612a07437183ae5730300f5c3adb5960ecb6621d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

    gummiboot - add a splash screen

commit eff180687a51db585a50299c086ba80710e1a21a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    openswan: conflicts with new libreswan spell

commit 4666ef684e2a94ac30cd75d1a400368adab38f42
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    libreswan: new spell, IPsec implementation for Linux - Openswan fork

commit 34fdf002d1c42aa697e481369d4fd1843ac57df5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-uuid: fix WEB_SITE

commit bc5b9f02e2e6a0bd05ff04739a4dfaff57bfbcbb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-safesemaphore: version 0.10.1

commit 986b2c9251da448454e2b5a87c64a5a28ffc87d4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-quickcheck: version 2.7.3

commit 307f0606c1de8ca352f078c7fbbdb36c6ae991d7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-tf-random: new spell, a high-quality splittable 
pseudorandom number generator

commit a86b63ccc9c0bc3db59ee63a000e1a2d53dc3e80
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-network: version 2.5.0.0

commit 4e46c0cd90d4429a5af02e0a40261c25f0969772
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-mtl: version 2.2.0.1

commit 7a9b19b887b25b2f399d3937694288254c8f5cb2
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-transformers: version 0.4.0.0

commit 0490238a9e2b6690b3b32bf4953564e7ccf7bedc
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-monads-tf: version 0.1.0.2

commit 11db10ce36eef65e42f3aa70997e369dc0f67d2b
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-mmap: version 0.5.9

commit 79a39e76229da2cb96f54c37b61999d2f23643fd
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-http: version 4000.2.14

commit fa2cbbc49aa36e1d05c0f015ccd07ad15b3f72f3
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    haskell/haskell-hslogger: version 1.2.4

commit 45ab44ee4b01199e16f24fb51dfd17d4d9e2474f
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

    minidlna: Updated to 1.1.2

diff --git a/ChangeLog b/ChangeLog
index 5d7088d..7654278 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2014-05-10  Ismael Luceno <ismael AT sourcemage.org>
+       * mail/isync: new spell, IMAP and MailDir mailbox synchronizer
+
+2014-05-10  Ismael Luceno <ismael AT sourcemage.org>
+       * perl-cpan/file-copy-recursive: new spell, Perl extension for 
recursively copying files and directories
+
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * windowmanagers/xmonad: spell deprecated [integrate into the 
grimoire's
+         haskell build facilities]
+       * wm-addons/xmonad-contrib: moved to haskell/haskell-xmonad-contrib
+
+2014-05-08  Treeve Jelbert <treeve AT sourcemage.org>
+       * groups: kde5 => plasma
+
+2014-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+       * net/libreswan: new spell, IPsec implementation for Linux - Openswan
+         fork
+
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * haskell/haskell-tf-random: new spell, a high-quality splittable
+         pseudorandom number generator
+
 2014-04-30 Vlad Glagolev <stealth AT sourcemage.org>
        * net/proxychains-ng: new spell, TCP and DNS through proxy server
 
diff --git a/chat-im/mcabber/DETAILS b/chat-im/mcabber/DETAILS
index 06efa93..16f19da 100755
--- a/chat-im/mcabber/DETAILS
+++ b/chat-im/mcabber/DETAILS
@@ -1,9 +1,13 @@
            SPELL=mcabber
-         VERSION=0.10.2
+         VERSION=0.10.3
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
+         SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://mcabber.com/files/${SOURCE}
    SOURCE_URL[1]=http://www.lilotux.net/~mikael/${SPELL}/files/${SOURCE}
-     
SOURCE_HASH=sha512:976c29ec753a364392ba6b5280c9031d9eb8884236b7d07fbeaa69a731806706f72b93a0bbbca1eca4f11325412d5beff62b14d94acca912841b8b820c2b3652
+  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+  SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+      SOURCE_GPG=mcabber.gpg:$SOURCE2:UPSTREAM_KEY
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         DOC_DIRS=""
             DOCS="doc/*.txt mcabberrc.example"
diff --git a/chat-im/mcabber/HISTORY b/chat-im/mcabber/HISTORY
index 5d84099..c8290ff 100644
--- a/chat-im/mcabber/HISTORY
+++ b/chat-im/mcabber/HISTORY
@@ -1,3 +1,10 @@
+2014-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 0.10.3; converted to upstream signature
+         checking
+       * mcabber.gpg: added ACB7FC95 public key (Mikael BERTHE (MiKael)
+         <mikael.berthe AT lilotux.net>)
+       * PRE_BUILD, mcabber_use_libotr4.patch: dropped, fixed by upstream
+
 2014-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, PRE_BUILD, mcabber_use_libotr4.patch: fix build with 
libotr >= 4.0.0,
          patch is from Debian
diff --git a/chat-im/mcabber/PRE_BUILD b/chat-im/mcabber/PRE_BUILD
deleted file mode 100755
index 82029af..0000000
--- a/chat-im/mcabber/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build      &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < $SPELL_DIRECTORY/mcabber_use_libotr4.patch &&
-aclocal &&
-automake --add-missing &&
-autoreconf
diff --git a/chat-im/mcabber/mcabber.gpg b/chat-im/mcabber/mcabber.gpg
new file mode 100644
index 0000000..1705c37
Binary files /dev/null and b/chat-im/mcabber/mcabber.gpg differ
diff --git a/chat-im/mcabber/mcabber_use_libotr4.patch 
b/chat-im/mcabber/mcabber_use_libotr4.patch
deleted file mode 100644
index ac044b3..0000000
--- a/chat-im/mcabber/mcabber_use_libotr4.patch
+++ /dev/null
@@ -1,596 +0,0 @@
-# HG changeset patch
-# Parent 1b31bdb72d83850b146a0e1e135eba35bad73d29
-Switch to libotr v4 API
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -184,16 +184,26 @@
- 
- # Check for otr
- AC_ARG_ENABLE(otr,
--              AC_HELP_STRING([--enable-otr],
--                             [enable OTR (Off-the-Record) messaging 
support]),
--              enable_otr=$enableval, otr="")
-+    AC_HELP_STRING([--enable-otr],
-+                   [enable OTR (Off-the-Record) messaging support]),
-+    enable_otr=$enableval,
-+    otr="")
- if test "x$enable_otr" = "xyes"; then
--  # Look for libgcrypt and libotr
--  AM_PATH_LIBGCRYPT(1.2.2, [
--          AM_PATH_LIBOTR(3.1.0, ,
--                         AC_MSG_ERROR(libotr 3.1.0 or newer is required.))
--      ], AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
--  )
-+    # Look for libgcrypt and libotr
-+    AM_PATH_LIBGCRYPT(1.2.2, [
-+        AM_PATH_LIBOTR(4.0.0, [
-+            AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
-+        ], [
-+            AM_PATH_LIBOTR(3.1.0, [
-+                AC_DEFINE([HAVE_LIBOTR], 1, [Define if you use libotr])
-+                AC_DEFINE([HAVE_LIBOTR3], 1, [Define if you use libotr v3])
-+            ], [
-+                AC_MSG_ERROR(libotr 3.1.0 or newer is required.)
-+            ])
-+        ])
-+    ], [
-+        AC_MSG_ERROR(libgcrypt 1.2.2 or newer is required.)
-+    ])
- fi
- 
- # Check for Enchant stuff
-@@ -290,3 +300,4 @@
-                  mcabber.pc
-                  Makefile])
- AC_OUTPUT
-+dnl vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2:  For Vim 
users...
---- a/mcabber/otr.c
-+++ b/mcabber/otr.c
-@@ -56,6 +56,20 @@
-                                          const char *protocol,
-                                          const char *recipient,
-                                          const char *message);
-+static void       cb_update_context_list(void *opdata);
-+static void       cb_new_fingerprint    (void *opdata, OtrlUserState us,
-+                                         const char *accountname,
-+                                         const char *protocol,
-+                                         const char *username,
-+                                         unsigned char fingerprint[20]);
-+static void       cb_write_fingerprints (void *opdata);
-+static void       cb_gone_secure        (void *opdata, ConnContext 
*context);
-+static void       cb_gone_insecure      (void *opdata, ConnContext 
*context);
-+static void       cb_still_secure       (void *opdata, ConnContext *context,
-+                                         int is_reply);
-+static int        cb_max_message_size   (void *opdata, ConnContext 
*context);
-+
-+#ifdef HAVE_LIBOTR3
- static void       cb_notify             (void *opdata,
-                                          OtrlNotifyLevel level,
-                                          const char *accountname,
-@@ -69,22 +83,26 @@
-                                          const char *protocol,
-                                          const char *username,
-                                          const char *msg);
--static void       cb_update_context_list(void *opdata);
- static const char *cb_protocol_name     (void *opdata, const char 
*protocol);
- static void       cb_protocol_name_free (void *opdata,
-                                          const char *protocol_name);
--static void       cb_new_fingerprint    (void *opdata, OtrlUserState us,
--                                         const char *accountname,
--                                         const char *protocol,
--                                         const char *username,
--                                         unsigned char fingerprint[20]);
--static void       cb_write_fingerprints (void *opdata);
--static void       cb_gone_secure        (void *opdata, ConnContext 
*context);
--static void       cb_gone_insecure      (void *opdata, ConnContext 
*context);
--static void       cb_still_secure       (void *opdata, ConnContext *context,
--                                         int is_reply);
- static void       cb_log_message        (void *opdata, const char *message);
--static int        cb_max_message_size   (void *opdata, ConnContext 
*context);
-+
-+static void       otr_handle_smp_tlvs   (OtrlTLV *tlvs, ConnContext *ctx);
-+#else /* HAVE_LIBOTR3 */
-+static char *tagfile = NULL;
-+static guint otr_timer_source = 0;
-+
-+static void       cb_handle_smp_event   (void *opdata, OtrlSMPEvent event,
-+                                         ConnContext *context, unsigned 
short percent,
-+                                         char *question);
-+static void       cb_handle_msg_event   (void *opdata, OtrlMessageEvent 
event,
-+                                         ConnContext *context, const char 
*message,
-+                                         gcry_error_t err);
-+static void       cb_create_instag      (void *opdata, const char 
*accountname,
-+                                         const char *protocol);
-+static void       cb_timer_control      (void *opdata, unsigned int 
interval);
-+#endif /* HAVE_LIBOTR3 */
- 
- static OtrlMessageAppOps ops =
- {
-@@ -92,26 +110,44 @@
-   cb_create_privkey,
-   cb_is_logged_in,
-   cb_inject_message,
-+#ifdef HAVE_LIBOTR3
-   cb_notify,
-   cb_display_otr_message,
-+#endif
-   cb_update_context_list,
-+#ifdef HAVE_LIBOTR3
-   cb_protocol_name,
-   cb_protocol_name_free,
-+#endif
-   cb_new_fingerprint,
-   cb_write_fingerprints,
-   cb_gone_secure,
-   cb_gone_insecure,
-   cb_still_secure,
-+#ifdef HAVE_LIBOTR3
-   cb_log_message,
-+#endif
-   cb_max_message_size,
--  NULL, /*account_name*/
--  NULL  /*account_name_free*/
-+  NULL, /* account_name */
-+  NULL, /* account_name_free */
-+#ifndef HAVE_LIBOTR3
-+  NULL, /* received_symkey */
-+  NULL, /* otr_error_message */
-+  NULL, /* otr_error_message_free */
-+  NULL, /* resent_msg_prefix */
-+  NULL, /* resent_msg_prefix_free */
-+  cb_handle_smp_event,
-+  cb_handle_msg_event,
-+  cb_create_instag,
-+  NULL, /* convert_msg */
-+  NULL, /* convert_free */
-+  cb_timer_control,
-+#endif
- };
- 
- static void otr_message_disconnect(ConnContext *ctx);
- static ConnContext *otr_get_context(const char *buddy);
- static void otr_startstop(const char *buddy, int start);
--static void otr_handle_smp_tlvs(OtrlTLV *tlvs, ConnContext *ctx);
- 
- static char *otr_get_dir(void);
- 
-@@ -135,7 +171,6 @@
-   account = jidtodisp(fjid);
-   keyfile = g_strdup_printf("%s%s.key", root, account);
-   fprfile = g_strdup_printf("%s%s.fpr", root, account);
--  g_free(root);
- 
-   if (otrl_privkey_read(userstate, keyfile)){
-     scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR key from %s", keyfile);
-@@ -145,6 +180,14 @@
-     scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR fingerprints from %s",
-                  fprfile);
-   }
-+#ifndef HAVE_LIBOTR3
-+  tagfile = g_strdup_printf("%s%s.tag", root, account);
-+  if (otrl_instag_read(userstate, tagfile)) {
-+    scr_LogPrint(LPRINT_LOGNORM, "Could not read OTR instance tag from %s", 
tagfile);
-+    cb_create_instag(NULL, account, OTR_PROTOCOL_NAME);
-+  }
-+#endif
-+  g_free(root);
- }
- 
- void otr_terminate(void)
-@@ -154,6 +197,13 @@
-   if (!otr_is_enabled)
-     return;
- 
-+#ifndef HAVE_LIBOTR3
-+  if (otr_timer_source > 0) {
-+    g_source_remove (otr_timer_source);
-+    otr_timer_source = 0;
-+  }
-+#endif
-+
-   for (ctx = userstate->context_root; ctx; ctx = ctx->next)
-     if (ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED)
-       otr_message_disconnect(ctx);
-@@ -175,6 +225,12 @@
-   userstate = NULL;
-   g_free(keyfile);
-   keyfile = NULL;
-+  g_free(fprfile);
-+  fprfile = NULL;
-+#ifndef HAVE_LIBOTR3
-+  g_free(tagfile);
-+  tagfile = NULL;
-+#endif
- }
- 
- static char *otr_get_dir(void)
-@@ -206,7 +262,12 @@
- 
-   mc_strtolower(lowcasebuddy);
-   ctx = otrl_context_find(userstate, lowcasebuddy, account, 
OTR_PROTOCOL_NAME,
-+#ifdef HAVE_LIBOTR3
-                           1, &null, NULL, NULL);
-+#else
-+                          // INSTAG XXX
-+                          OTRL_INSTAG_BEST, 1, &null, NULL, NULL);
-+#endif
-   g_free(lowcasebuddy);
-   return ctx;
- }
-@@ -216,7 +277,12 @@
-   if (ctx->msgstate == OTRL_MSGSTATE_ENCRYPTED)
-     cb_gone_insecure(NULL, ctx);
-   otrl_message_disconnect(userstate, &ops, NULL, ctx->accountname,
-+#ifdef HAVE_LIBOTR3
-                           ctx->protocol, ctx->username);
-+#else
-+                          // INSTAG XXX
-+                          ctx->protocol, ctx->username, OTRL_INSTAG_BEST);
-+#endif
- }
- 
- static void otr_startstop(const char *buddy, int start)
-@@ -283,6 +349,8 @@
-   cb_write_fingerprints(NULL);
- }
- 
-+#ifdef HAVE_LIBOTR3
-+
- static void otr_handle_smp_tlvs(OtrlTLV *tlvs, ConnContext *ctx)
- {
-   OtrlTLV *tlv = NULL;
-@@ -354,6 +422,130 @@
-   }
- }
- 
-+#else /* HAVE_LIBOTR3 */
-+
-+static void cb_handle_smp_event(void *opdata, OtrlSMPEvent event,
-+                                ConnContext *context, unsigned short 
percent,
-+                                char *question)
-+{
-+  const char *msg = NULL;
-+  char *freeme = NULL;
-+  switch (event) {
-+    case OTRL_SMPEVENT_ASK_FOR_SECRET:
-+      msg = freeme = g_strdup_printf("OTR: Socialist Millionaires' 
Protocol: "
-+                                     "Received SMP Initiation.\n"
-+                                     "Answer with /otr smpr %s $secret",
-+                                     context->username);
-+      break;
-+    case OTRL_SMPEVENT_ASK_FOR_ANSWER:
-+      msg = freeme = g_strdup_printf("OTR: Socialist Millionaires' 
Protocol: "
-+                                     "Received SMP Initiation.\n"
-+                                     "Answer with /otr smpr %s $secret\n"
-+                                     "Question: %s", context->username,
-+                                     question);
-+      break;
-+    case OTRL_SMPEVENT_CHEATED:
-+      msg = "OTR: Socialist Millionaires' Protocol: Correspondent cancelled 
negotiation!";
-+      otrl_message_abort_smp(userstate, &ops, opdata, context);
-+      break;
-+    case OTRL_SMPEVENT_IN_PROGRESS:
-+      scr_log_print(LPRINT_DEBUG, "OTR: Socialist Millionaires' Protocol: "
-+                                  "Negotiation is in pogress...");
-+      break;
-+    case OTRL_SMPEVENT_SUCCESS:
-+      msg = "OTR: Socialist Millionaires' Protocol: Success!";
-+      break;
-+    case OTRL_SMPEVENT_FAILURE:
-+      msg = "OTR: Socialist Millionaires' Protocol: Failure.";
-+      break;
-+    case OTRL_SMPEVENT_ABORT:
-+      msg = "OTR: Socialist Millionaires' Protocol: Aborted.";
-+      break;
-+    case OTRL_SMPEVENT_ERROR:
-+      msg = "OTR: Socialist Millionaires' Protocol: Error occured, aborting 
negotiations!";
-+      otrl_message_abort_smp(userstate, &ops, opdata, context);
-+      break;
-+    default:
-+      break;
-+  }
-+
-+  if (msg) {
-+    scr_WriteIncomingMessage(context->username, msg, 0, HBB_PREFIX_INFO, 0);
-+    g_free(freeme);
-+  }
-+}
-+
-+static void cb_handle_msg_event(void *opdata, OtrlMessageEvent event,
-+                                ConnContext *context, const char *message,
-+                                gcry_error_t err)
-+{
-+  const char *msg = NULL;
-+  char *freeme = NULL;
-+  switch (event) {
-+    case OTRL_MSGEVENT_ENCRYPTION_REQUIRED:
-+      msg = "OTR: Policy requires encryption on message!";
-+      break;
-+    case OTRL_MSGEVENT_ENCRYPTION_ERROR:
-+      msg = "OTR: Encryption error! Message not sent.";
-+      break;
-+    case OTRL_MSGEVENT_CONNECTION_ENDED:
-+      msg = "OTR: Connection closed by remote end, message lost. "
-+            "Close or refresh connection.";
-+      break;
-+    case OTRL_MSGEVENT_SETUP_ERROR:
-+      // FIXME
-+      msg = freeme = g_strdup_printf("OTR: Error setting up private 
conversation: %u",
-+                                     err);
-+      break;
-+    case OTRL_MSGEVENT_MSG_REFLECTED:
-+      msg = "OTR: Received own OTR message!";
-+      break;
-+    case OTRL_MSGEVENT_MSG_RESENT:
-+      msg = "OTR: Previous message was resent.";
-+      break;
-+    case OTRL_MSGEVENT_RCVDMSG_NOT_IN_PRIVATE:
-+      msg = "OTR: Received encrypted message, but connection is not 
established " \
-+            "yet! Message lost.";
-+      break;
-+    case OTRL_MSGEVENT_RCVDMSG_UNREADABLE:
-+      msg = "OTR: Unable to read incoming message!";
-+      break;
-+    case OTRL_MSGEVENT_RCVDMSG_MALFORMED:
-+      msg = "OTR: Malformed incoming message!";
-+      break;
-+    case OTRL_MSGEVENT_LOG_HEARTBEAT_RCVD:
-+      scr_log_print(LPRINT_DEBUG, "OTR: Received heartbeat.");
-+      break;
-+    case OTRL_MSGEVENT_LOG_HEARTBEAT_SENT:
-+      scr_log_print(LPRINT_DEBUG, "OTR: Sent heartbeat.");
-+      break;
-+    case OTRL_MSGEVENT_RCVDMSG_GENERAL_ERR:
-+      msg = freeme = g_strdup_printf("OTR: Received general otr error: %s",
-+                                     message);
-+      break;
-+    case OTRL_MSGEVENT_RCVDMSG_UNENCRYPTED:
-+      msg = freeme = g_strdup_printf("OTR: Received unencrypted message: 
%s",
-+                                     message);
-+      break;
-+    case OTRL_MSGEVENT_RCVDMSG_UNRECOGNIZED:
-+      msg = "OTR: Unable to determine type of received OTR message!";
-+      break;
-+    case OTRL_MSGEVENT_RCVDMSG_FOR_OTHER_INSTANCE:
-+      // XXX
-+      scr_log_print(LPRINT_DEBUG, "OTR: Received message for other 
instance.");
-+      break;
-+    default:
-+      break;
-+  }
-+
-+  if (msg) {
-+    scr_WriteIncomingMessage(context->username, msg, 0, HBB_PREFIX_INFO, 0);
-+    g_free(freeme);
-+  }
-+}
-+
-+#endif /* HAVE_LIBOTR3 */
-+
- /*
-  * returns whether a otr_message was received
-  * sets *otr_data to NULL, when it was an internal otr message
-@@ -362,8 +554,10 @@
- {
-   int ignore_message;
-   char *newmessage = NULL;
-+#ifdef HAVE_LIBOTR3
-   OtrlTLV *tlvs = NULL;
-   OtrlTLV *tlv = NULL;
-+#endif
-   ConnContext *ctx;
- 
-   ctx = otr_get_context(buddy);
-@@ -371,8 +565,8 @@
-   ignore_message = otrl_message_receiving(userstate, &ops, NULL,
-                                           ctx->accountname, ctx->protocol,
-                                           ctx->username, *otr_data,
--                                          &newmessage, &tlvs,NULL, NULL);
--
-+#ifdef HAVE_LIBOTR3
-+                                          &newmessage, &tlvs, NULL, NULL);
- 
-   tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED);
-   if (tlv) {
-@@ -387,6 +581,9 @@
- 
-   if (tlvs != NULL)
-     otrl_tlv_free(tlvs);
-+#else
-+                                          &newmessage, NULL, NULL, NULL, 
NULL);
-+#endif
- 
-   if (ignore_message)
-     *otr_data = NULL;
-@@ -410,13 +607,27 @@
- 
-   if (ctx->msgstate == OTRL_MSGSTATE_PLAINTEXT)
-     err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
-+#ifdef HAVE_LIBOTR3
-                                ctx->protocol, ctx->username, *msg, NULL,
-                                &newmessage, NULL, NULL);
-+#else
-+                               // INSTAG XXX
-+                               ctx->protocol, ctx->username, 
OTRL_INSTAG_BEST,
-+                               *msg, NULL, &newmessage, 
OTRL_FRAGMENT_SEND_SKIP,
-+                               NULL, NULL, NULL);
-+#endif
-   else {
-     htmlmsg = html_escape(*msg);
-     err = otrl_message_sending(userstate, &ops, NULL, ctx->accountname,
-+#ifdef HAVE_LIBOTR3
-                                ctx->protocol, ctx->username, htmlmsg, NULL,
-                                &newmessage, NULL, NULL);
-+#else
-+                               // INSTAG XXX
-+                               ctx->protocol, ctx->username, 
OTRL_INSTAG_BEST,
-+                               htmlmsg, NULL, &newmessage, 
OTRL_FRAGMENT_SEND_SKIP,
-+                               NULL, NULL, NULL);
-+#endif
-     g_free(htmlmsg);
-   }
- 
-@@ -648,6 +859,59 @@
-                   LM_MESSAGE_SUB_TYPE_NOT_SET, NULL);
- }
- 
-+/* When the list of ConnContexts changes (including a change in
-+ * state), this is called so the UI can be updated. */
-+static void cb_update_context_list(void *opdata)
-+{
-+  /*maybe introduce new status characters for mcabber,
-+   * then use this function (?!)*/
-+}
-+
-+/* A new fingerprint for the given user has been received. */
-+static void cb_new_fingerprint(void *opdata, OtrlUserState us,
-+                               const char *accountname, const char 
*protocol,
-+                               const char *username,
-+                               unsigned char fingerprint[20])
-+{
-+  char *sbuf = NULL;
-+  char readable[45];
-+
-+  otrl_privkey_hash_to_human(readable, fingerprint);
-+  sbuf = g_strdup_printf("OTR: new fingerprint: %s", readable);
-+  scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
-+  g_free(sbuf);
-+}
-+
-+/* The list of known fingerprints has changed.  Write them to disk. */
-+static void cb_write_fingerprints(void *opdata)
-+{
-+  otrl_privkey_write_fingerprints(userstate, fprfile);
-+}
-+
-+/* A ConnContext has entered a secure state. */
-+static void cb_gone_secure(void *opdata, ConnContext *context)
-+{
-+  scr_WriteIncomingMessage(context->username, "OTR: channel established", 0,
-+                           HBB_PREFIX_INFO, 0);
-+}
-+
-+/* A ConnContext has left a secure state. */
-+static void cb_gone_insecure(void *opdata, ConnContext *context)
-+{
-+  scr_WriteIncomingMessage(context->username, "OTR: channel closed", 0,
-+                           HBB_PREFIX_INFO, 0);
-+}
-+
-+/* We have completed an authentication, using the D-H keys we
-+ * already knew.  is_reply indicates whether we initiated the AKE. */
-+static void cb_still_secure(void *opdata, ConnContext *context, int 
is_reply)
-+{
-+  scr_WriteIncomingMessage(context->username, "OTR: channel reestablished", 
0,
-+                           HBB_PREFIX_INFO, 0);
-+}
-+
-+#ifdef HAVE_LIBOTR3
-+
- /* Display a notification message for a particular
-  * accountname / protocol / username conversation. */
- static void cb_notify(void *opdata, OtrlNotifyLevel level,
-@@ -684,14 +948,6 @@
-   return 0;
- }
- 
--/* When the list of ConnContexts changes (including a change in
-- * state), this is called so the UI can be updated. */
--static void cb_update_context_list(void *opdata)
--{
--  /*maybe introduce new status characters for mcabber,
--   * then use this function (?!)*/
--}
--
- /* Return a newly allocated string containing a human-friendly name
-  * for the given protocol id */
- static const char *cb_protocol_name(void *opdata, const char *protocol)
-@@ -705,54 +961,40 @@
-   /* We didn't allocated memory, so we don't have to free anything :p */
- }
- 
--/* A new fingerprint for the given user has been received. */
--static void cb_new_fingerprint(void *opdata, OtrlUserState us,
--                               const char *accountname, const char 
*protocol,
--                               const char *username,
--                               unsigned char fingerprint[20])
-+/* Log a message.  The passed message will end in "\n". */
-+static void cb_log_message(void *opdata, const char *message)
- {
--  char *sbuf = NULL;
--  char readable[45];
--
--  otrl_privkey_hash_to_human(readable, fingerprint);
--  sbuf = g_strdup_printf("OTR: new fingerprint: %s", readable);
--  scr_WriteIncomingMessage(username, sbuf, 0, HBB_PREFIX_INFO, 0);
--  g_free(sbuf);
-+  scr_LogPrint(LPRINT_DEBUG, "OTR: %s", message);
- }
- 
--/* The list of known fingerprints has changed.  Write them to disk. */
--static void cb_write_fingerprints(void *opdata)
--{
--  otrl_privkey_write_fingerprints(userstate, fprfile);
--}
-+#else /* HAVE_LIBOTR3 */
- 
--/* A ConnContext has entered a secure state. */
--static void cb_gone_secure(void *opdata, ConnContext *context)
-+/* Generate unique instance tag for account. */
-+static void cb_create_instag(void *opdata, const char *accountname,
-+                             const char *protocol)
- {
--  scr_WriteIncomingMessage(context->username, "OTR: channel established", 0,
--                           HBB_PREFIX_INFO, 0);
-+  if (otrl_instag_generate(userstate, tagfile, accountname, protocol)) {
-+    scr_LogPrint(LPRINT_LOGNORM, "OTR instance tag generation failed!");
-+  }
- }
- 
--/* A ConnContext has left a secure state. */
--static void cb_gone_insecure(void *opdata, ConnContext *context)
-+static gboolean otr_timer_cb(gpointer userdata)
- {
--  scr_WriteIncomingMessage(context->username, "OTR: channel closed", 0,
--                           HBB_PREFIX_INFO, 0);
-+  otrl_message_poll(userstate, &ops, userdata);
-+  return TRUE;
- }
- 
--/* We have completed an authentication, using the D-H keys we
-- * already knew.  is_reply indicates whether we initiated the AKE. */
--static void cb_still_secure(void *opdata, ConnContext *context, int 
is_reply)
-+static void cb_timer_control(void *opdata, unsigned int interval)
- {
--  scr_WriteIncomingMessage(context->username, "OTR: channel reestablished", 
0,
--                           HBB_PREFIX_INFO, 0);
-+  if (otr_timer_source > 0) {
-+    g_source_remove(otr_timer_source);
-+    otr_timer_source = 0;
-+  }
-+  if (interval > 0)
-+    otr_timer_source = g_timeout_add_seconds(interval, otr_timer_cb, 
opdata);
- }
- 
--/* Log a message.  The passed message will end in "\n". */
--static void cb_log_message(void *opdata, const char *message)
--{
--  scr_LogPrint(LPRINT_DEBUG, "OTR: %s", message);
--}
-+#endif /* HAVE_LIBOTR3 */
- 
- /* Find the maximum message size supported by this protocol. */
- static int cb_max_message_size(void *opdata, ConnContext *context)
---- a/mcabber/otr.h
-+++ b/mcabber/otr.h
-@@ -5,6 +5,9 @@
- 
- #ifdef HAVE_LIBOTR
- 
-+#ifndef HAVE_LIBOTR3
-+# include <libotr/instag.h>
-+#endif
- #include <libotr/proto.h>
- #include <libotr/message.h>
- #include <libotr/privkey.h>
diff --git a/devel/cppcheck/DETAILS b/devel/cppcheck/DETAILS
index 7736155..315a84e 100755
--- a/devel/cppcheck/DETAILS
+++ b/devel/cppcheck/DETAILS
@@ -1,8 +1,8 @@
            SPELL=cppcheck
-         VERSION=1.63
+         VERSION=1.64
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
    
SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:4c2f6080ce72ffa24f929a2b74c656538d9f555fb14b3e6f3a2632eca8973a8b711831ddd698e13059643446b0e90619f71e13b1d06b6fefc4b4562622939508
+     
SOURCE_HASH=sha512:2721248e4f0cf0b6899b8cbc18bcbb23d1e212dcaf1392b8f81094baba34d9dcb091fa6007696885bc11c84ecb13353360c7238f218c5e4b56ddcbdfef855ee2
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         
WEB_SITE="http://sourceforge.net/apps/mediawiki/cppcheck/index.php?title=Main_Page";
       LICENSE[0]=GPL
diff --git a/devel/cppcheck/HISTORY b/devel/cppcheck/HISTORY
index 6280628..dd49159 100644
--- a/devel/cppcheck/HISTORY
+++ b/devel/cppcheck/HISTORY
@@ -1,3 +1,6 @@
+2014-05-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.64
+
 2014-01-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.63
        * INSTALL, BUILD: install cfg files necessary for using cppcheck
diff --git a/devel/tig/DETAILS b/devel/tig/DETAILS
index fce0bce..9e2d6fd 100755
--- a/devel/tig/DETAILS
+++ b/devel/tig/DETAILS
@@ -1,8 +1,8 @@
            SPELL=tig
-         VERSION=1.2
+         VERSION=2.0.1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://jonas.nitro.dk/${SPELL}/releases/${SOURCE}
-     
SOURCE_HASH=sha512:4c769c2aca5d8957f322beb41f340a439315587194106e8f18cba75cbe3b61f8beda8d5de85699bbd93306ec8caceeb342bb1861556d50f46a955710e81f920f
+     
SOURCE_HASH=sha512:e29621bee6c23e1492513dcad8fe1c1ff83a56d8d8ea003b07b476de39dfa937a94e72f1f1268064df2d9c507f03451edefe2614930db9b68aa06479179222a3
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://jonas.nitro.dk/tig/";
       LICENSE[0]=GPL
diff --git a/devel/tig/HISTORY b/devel/tig/HISTORY
index f2386eb..2872f63 100644
--- a/devel/tig/HISTORY
+++ b/devel/tig/HISTORY
@@ -1,3 +1,6 @@
+2014-05-07 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 2.0.1
+
 2013-08-11 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.2
 
diff --git a/disk/cdrtools/DETAILS b/disk/cdrtools/DETAILS
index 2bf63b8..1c3c32d 100755
--- a/disk/cdrtools/DETAILS
+++ b/disk/cdrtools/DETAILS
@@ -1,10 +1,10 @@
            SPELL=cdrtools
-         VERSION=3.01a14
+         VERSION=3.01a23
            ALPHA=$([ "${VERSION//a/}" != "$VERSION" ] && echo 1)
           SOURCE=${SPELL}-${VERSION}.tar.gz
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION%a*}
    SOURCE_URL[0]=ftp://ftp.berlios.de/pub/cdrecord/${ALPHA:+alpha/}${SOURCE}
-     
SOURCE_HASH=sha512:6b345346696c58b19beda33db10fb0b409ded85877091f642cb8567e37f19e576c7ab92a8e2e2e7318bd272268d6615816a1fddd2728bfb2c202368c9e5e5a4e
+     
SOURCE_HASH=sha512:1be49bf26947aaf6b9b962b71311b044de97b2a0c0ca2133ef39c43908a9758f39d954447db553f581b2403d7df7328b63e79e8c5a632df5102920c7d37ab67e
       LICENSE[0]=GPL
         KEYWORDS="disk"
         WEB_SITE=http://cdrecord.berlios.de/private/cdrecord.html
diff --git a/disk/cdrtools/HISTORY b/disk/cdrtools/HISTORY
index b82920a..ff9d084 100644
--- a/disk/cdrtools/HISTORY
+++ b/disk/cdrtools/HISTORY
@@ -1,3 +1,6 @@
+2014-05-08 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 3.01a23
+
 2013-04-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 3.01a14
 
diff --git a/disk/gummiboot/HISTORY b/disk/gummiboot/HISTORY
index 4918aa3..ab8909c 100644
--- a/disk/gummiboot/HISTORY
+++ b/disk/gummiboot/HISTORY
@@ -1,3 +1,7 @@
+2014-04-04 Treeve Jelbert <treeve AT sourcemage.org>
+       * INSTALL, smgl-splash.bmp.xz: provide splash screen
+       * INSTALL, mkgummi: provide a configuration script
+
 2014-03-31 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 44
        * CONFLICTS: added
diff --git a/disk/gummiboot/INSTALL b/disk/gummiboot/INSTALL
new file mode 100755
index 0000000..e4a7337
--- /dev/null
+++ b/disk/gummiboot/INSTALL
@@ -0,0 +1,10 @@
+default_install &&
+DEST=$INSTALL_ROOT/usr/sbin &&
+mkdir -p $DEST  &&
+cp $SPELL_DIRECTORY/mkgummi $DEST &&
+DEST=$INSTALL_ROOT/boot &&
+SPLASH=smgl-splash.bmp  &&
+mkdir -p $DEST   &&
+xzcat $SPELL_DIRECTORY/$SPLASH.xz > $DEST/$SPLASH &&
+message "A SMGL splash screen is available in /boot"
+message "use mkgummi to update the gummiboot configuration"
diff --git a/disk/gummiboot/mkgummi b/disk/gummiboot/mkgummi
new file mode 100755
index 0000000..825bd64
--- /dev/null
+++ b/disk/gummiboot/mkgummi
@@ -0,0 +1,34 @@
+#!/bin/bash
+root_dev()
+{
+  ROOT_DEV=$( mount | grep ' / ' | awk ' $1 ~ /\/dev\/*/ {print $1}')
+  ROOT_DEV=${ROOT_DEV/\/dev\//}
+  ROOT_PART=$(ls -l /dev/disk/by-uuid | grep ${ROOT_DEV}$ |cut -d\  -f10 )
+}
+# find the root partiton
+root_dev
+echo root = $ROOT_DEV
+echo root partition = $ROOT_PART
+
+modprobe efivarfs &&
+mount -t efivarfs efivarfs /sys/firmware/efi/efivars &&
+gummiboot install &&
+cd /boot &&
+DEST=/boot/loader/entries &&
+
+# delete existing smgl confif files
+mkdir -p $DEST    &&
+rm -f $DEST/smgl* &&
+
+# create the smgl config files for gummiboot
+for VX in `ls vmlinuz-* | cut -d- -f2`;do
+  echo creating efi config for $VX &&
+  cat > $DEST/smgl-$VX.conf << EOF
+title SourceMage GNU/Linux
+version $VX
+linux /vmlinuz-$VX
+#options ro root=/dev/$ROOT_DEV
+options ro root=PARTUUID=$ROOT_PART
+EOF
+done &&
+umount  /sys/firmware/efi/efivars
diff --git a/disk/gummiboot/smgl-splash.bmp.xz 
b/disk/gummiboot/smgl-splash.bmp.xz
new file mode 100644
index 0000000..937f0a1
Binary files /dev/null and b/disk/gummiboot/smgl-splash.bmp.xz differ
diff --git a/editors/vim/DETAILS b/editors/vim/DETAILS
index 726bf49..6982815 100755
--- a/editors/vim/DETAILS
+++ b/editors/vim/DETAILS
@@ -14,9 +14,9 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
 
 else
         XVERSION=7.4
-   PATCH_VERSION=183
+   PATCH_VERSION=282
          VERSION=$XVERSION.$PATCH_VERSION
-      PATCHLEVEL=1
+      PATCHLEVEL=2
           SOURCE=${SPELL}-${XVERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
    SOURCE_URL[0]=http://ftp.vim.org/pub/vim/unix/${SOURCE}
@@ -30,7 +30,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}${XVERSION/\./}
          SOURCE2=vim-$XVERSION-patches-001-$PATCH_VERSION.tar.xz
   SOURCE2_URL[0]=http://www.hawo.net/~siflfran/smgl/$SOURCE2
   SOURCE2_URL[1]=http://download.sourcemage.org/grimoire/distro/$SOURCE2
-    
SOURCE2_HASH=sha512:5590a70ca2b0d0511401775e009bc19c77cea32d2c3e6313d4c4873c18dbf6f352090185e44cb203753288f9b1f5703287254157a86066f615362aa6cda19182
+    
SOURCE2_HASH=sha512:90a68e2a6628f218e8c75762289ec2784f318b4070d40fbc112621e582742398b36d81aab0029542413ee945b6fa951839e3bfc3bc8dcc96a986c9a2d05ef80d
 fi
 
         WEB_SITE=http://www.vim.org
diff --git a/editors/vim/HISTORY b/editors/vim/HISTORY
index 0f60c18..1778a55 100644
--- a/editors/vim/HISTORY
+++ b/editors/vim/HISTORY
@@ -1,3 +1,6 @@
+2014-05-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS, PRE_BUILD: apply upstream patches 7.4.001 to 7.4.282
+
 2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, PRE_BUILD: apply upstream patches 7.4.001 to 7.4.183
        * vim-patches-tarball: adapted to current version
diff --git a/fonts-x11/terminus-font/DETAILS b/fonts-x11/terminus-font/DETAILS
index b743851..c7bf7b2 100755
--- a/fonts-x11/terminus-font/DETAILS
+++ b/fonts-x11/terminus-font/DETAILS
@@ -1,9 +1,9 @@
            SPELL=terminus-font
-         VERSION=4.38
+         VERSION=4.39
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    
SOURCE_URL[0]=http://sourceforge.net/projects/$SPELL/files/$SPELL-$VERSION/$SOURCE/download
-     
SOURCE_HASH=sha512:e37e20852645b247dffedf37f864e1cdbe2a23287e7f5737d89289eef1058f9621ef8d6339045b1be9ef603237a855a9f295022b8117685a6840c1f260966fd5
+     
SOURCE_HASH=sha512:d2b1c55584eabf423a455ea11d90ba8037b4e5823c677a8c604de1e41c55d829b743db2d1932cd755064db681fcd0b5be8484439ddde4394955d0af5174ff591
         WEB_SITE=http://terminus-font.sourceforge.net/
          ENTERED=20050720
       LICENSE[0]=GPL
diff --git a/fonts-x11/terminus-font/HISTORY b/fonts-x11/terminus-font/HISTORY
index 4524e98..5d6d20e 100644
--- a/fonts-x11/terminus-font/HISTORY
+++ b/fonts-x11/terminus-font/HISTORY
@@ -1,3 +1,6 @@
+2014-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 4.39
+
 2013-06-24 Remko van der Vossen <wich AT sourcemage.org>
        * DETAILS: Proper download link
 
diff --git a/ftp/imapsync/DEPENDS b/ftp/imapsync/DEPENDS
index cef08d7..cda471e 100755
--- a/ftp/imapsync/DEPENDS
+++ b/ftp/imapsync/DEPENDS
@@ -3,5 +3,5 @@ depends mail-imapclient &&
 depends digest-md5      &&
 depends term-readkey    &&
 depends io-socket-ssl   &&
-depends date-manip
-
+depends date-manip      &&
+depends file-copy-recursive
diff --git a/ftp/imapsync/DETAILS b/ftp/imapsync/DETAILS
index 4bd2dd8..1076ce1 100755
--- a/ftp/imapsync/DETAILS
+++ b/ftp/imapsync/DETAILS
@@ -1,10 +1,10 @@
            SPELL=imapsync
-         VERSION=1.267
-     
SOURCE_HASH=sha512:5cf124db38c0fd99ab214741d1759c48e4fc24f08365d8eb70c833964b90ef6c980731728ccced2276beb007e4763dda64cf6e5f4d550f8b729509d3cbd76ace
+         VERSION=1.584
+     
SOURCE_HASH=sha512:8978cc999b9af38b8d135a226456f858e265e21b138990b926d8b569088ccafc035dba9426f1a7f0d1027ef5e4432eec9ad113d8eb18c00c199afa3fb803eebe
           SOURCE=${SPELL}-$VERSION.tgz
-   SOURCE_URL[0]=http://www.linux-france.org/prj/imapsync/dist/$SOURCE
+   SOURCE_URL[0]=https://fedorahosted.org/released/$SPELL/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
-        WEB_SITE=http://www.linux-france.org/prj/imapsync/
+        WEB_SITE=http://imapsync.lamiral.info/
          ENTERED=20081015
       LICENSE[0]=GPL
         KEYWORDS="mail imap sync"
diff --git a/ftp/imapsync/HISTORY b/ftp/imapsync/HISTORY
index 09e2333..d110124 100644
--- a/ftp/imapsync/HISTORY
+++ b/ftp/imapsync/HISTORY
@@ -1,3 +1,8 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS: Depends on file-copy-recursive
+       * DETAILS: Fixed SOURCE_URL[0]
+         updated spell to 1.584
+
 2011-09-26 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap
 
diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index f74c1a4..64c62e3 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,6 +1,6 @@
            SPELL=libgphoto2
-         VERSION=2.5.3
-     
SOURCE_HASH=sha512:57dc0edaec47bc07f41632ac6b5731296671f6ca53176cb9ef63efc4b0e397bcef6672aed5299c7e44fc1adff08d2e8c6706e1bfc3ac6dafd8429de7ef0ad238
+         VERSION=2.5.4
+     
SOURCE_HASH=sha512:04494918aedb4dcb1b7d57a5756b9a00366f87034d1c622dfaeb129fa7988974f3abba31f5acdd1f9041aaaf55a301128c906242610b6f5cb1796451240be9d5
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 9e84fae..4d29fc1 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Treeve Jelbert <treeve AT sourcemage.org> 
+       * DETAILS: version 2.5.4
+
 2014-01-29 Treeve Jelbert <treeve AT sourcemage.org> 
        * DETAILS: version 2.5.3
 
diff --git a/groups b/groups
index 25f9eaa..9cdb4df 100755
--- a/groups
+++ b/groups
@@ -124,7 +124,7 @@ mdm:196:
 polkitd:197:
 opendkim:198:
 dk-milter:199:
-kde5:200:
+plasma:200:
 gnarwl:201:
 users:1000:
 nogroup:65534:
diff --git a/haskell/haskell-hslogger/DETAILS 
b/haskell/haskell-hslogger/DETAILS
index 1a450d1..4b763b3 100755
--- a/haskell/haskell-hslogger/DETAILS
+++ b/haskell/haskell-hslogger/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-hslogger
-         VERSION=1.2.3
+         VERSION=1.2.4
           SOURCE="hslogger-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/hslogger/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:ebf1108efd8ecbcd8b67c3ce646f5ffde3f95ff8092ab8f9d0fb00b1207fc69db45b2abfdf71312b32e86d922672f88ca6dfce15c0c7371fc78dc223fdf61356
+     
SOURCE_HASH=sha512:41880352ea3883bcdf12b50d6d7933ef092c715ff69f5b8bb57e4a603f09443cbf8188475b2968af04965387d4723fc194786794d9765c004a41541b70598581
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/hslogger-${VERSION}"
         WEB_SITE="http://software.complete.org/hslogger";
       LICENSE[0]=BSD3
diff --git a/haskell/haskell-hslogger/HISTORY 
b/haskell/haskell-hslogger/HISTORY
index 5ea4cec..fbabcff 100644
--- a/haskell/haskell-hslogger/HISTORY
+++ b/haskell/haskell-hslogger/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 1.2.4
+
 2013-09-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 1.2.3
 
diff --git a/haskell/haskell-http/DETAILS b/haskell/haskell-http/DETAILS
index 370edc0..843e8c3 100755
--- a/haskell/haskell-http/DETAILS
+++ b/haskell/haskell-http/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-http
-         VERSION=4000.2.11
+         VERSION=4000.2.14
           SOURCE="HTTP-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/HTTP/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:3c7d91de84d55ca010e066f823f7b7220db27b0746ca26baee6bf549fa16767e54a31735a69e66d8debd5f1cd9a793210c324aebca4b903627ec5ea673dfc912
+     
SOURCE_HASH=sha512:d571884fe414cab99dd2a2364a25eba0320689d428cd6d4415f291fce2d66f56c7282eb4b4a3d6847f9334dc6b67d96a0efbe541f6ff5129de048869558e9e13
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/HTTP-${VERSION}"
         WEB_SITE="https://github.com/haskell/HTTP";
       LICENSE[0]=BSD3
diff --git a/haskell/haskell-http/HISTORY b/haskell/haskell-http/HISTORY
index 0cbeaad..b8e2782 100644
--- a/haskell/haskell-http/HISTORY
+++ b/haskell/haskell-http/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 4000.2.14
+
 2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 4000.2.11
 
diff --git a/haskell/haskell-mmap/DETAILS b/haskell/haskell-mmap/DETAILS
index f197e9c..1c1b47f 100755
--- a/haskell/haskell-mmap/DETAILS
+++ b/haskell/haskell-mmap/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-mmap
-         VERSION=0.5.8
+         VERSION=0.5.9
           SOURCE="mmap-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/mmap/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:6c8b526ec9fedba195ce021f86eeb3fa35f7c95b9299d17503ad7d7e91b9485b3d9980e0ccbdc3876ec465ec8aa07cf9d0521c62e2c8a652a36df11b9badffb5
+     
SOURCE_HASH=sha512:3b9ac1150050ac9d8e7870610923c8303b5fc74a4fdd796d7b6b411e2ba836111ae8520e16ad345aaf93b4dbcd27abd4c359a89b27d854db8dbd252b90a5298d
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mmap-${VERSION}"
         WEB_SITE="http://hackage.haskell.org/package/mmap";
       LICENSE[0]=License: BSD3
diff --git a/haskell/haskell-mmap/HISTORY b/haskell/haskell-mmap/HISTORY
index cd05d20..da365e5 100644
--- a/haskell/haskell-mmap/HISTORY
+++ b/haskell/haskell-mmap/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.5.9
+
 2013-03-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/haskell/haskell-monads-tf/DETAILS 
b/haskell/haskell-monads-tf/DETAILS
index d5002a2..ca9352e 100755
--- a/haskell/haskell-monads-tf/DETAILS
+++ b/haskell/haskell-monads-tf/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-monads-tf
-         VERSION=0.1.0.1
+         VERSION=0.1.0.2
           SOURCE="monads-tf-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/package/monads-tf-${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:ea087bc58e4116accdb8d210d66a6ebdbe927ffacebc6f80aaf9fe288541eb1f721d846243aa9098e7f23c145845b508c1ead75e7892eb5a372a22b45fd9ec35
+     
SOURCE_HASH=sha512:5539d735f3d638a700a36e1d3cf0a96dbfd15f9701208e2a6ab71eaee2d00b6e2bd49acbc3e561414e923952ca702d33662511fe057a95bad125609f6216b620
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/monads-tf-${VERSION}"
         WEB_SITE="http://hackage.haskell.org/package/monads-tf";
       LICENSE[0]=BSD
diff --git a/haskell/haskell-monads-tf/HISTORY 
b/haskell/haskell-monads-tf/HISTORY
index e59d8c4..18da165 100644
--- a/haskell/haskell-monads-tf/HISTORY
+++ b/haskell/haskell-monads-tf/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.1.0.2
+
 2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS, DETAILS: spell created
 
diff --git a/haskell/haskell-mtl/DETAILS b/haskell/haskell-mtl/DETAILS
index 898513d..15cc5fd 100755
--- a/haskell/haskell-mtl/DETAILS
+++ b/haskell/haskell-mtl/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-mtl
-         VERSION=2.1.3.1
+         VERSION=2.2.0.1
           SOURCE="mtl-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/mtl/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:dbb388eda920ba23525f89f1be840f23e7afdf8a0efdbee9a2efd03eb0c9fd64e0788e186236bbdcc6203c9fc02a3512a63ad4dc82946f6e9364bdb1a94e5f62
+     
SOURCE_HASH=sha512:7e201bbaf96da123c6c9e38e68bc1161c7cfcec39ae2828cf495e5082608e1e84b83f3d3ff9cff6fe884b4bf43dc46692e980382b38808f55ecf1ad7f5d01a5e
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/mtl-${VERSION}"
         
WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/mtl";
       LICENSE[0]=BSD3
diff --git a/haskell/haskell-mtl/HISTORY b/haskell/haskell-mtl/HISTORY
index 210ef8a..5b24de5 100644
--- a/haskell/haskell-mtl/HISTORY
+++ b/haskell/haskell-mtl/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.2.0.1
+
 2014-04-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.1.3.1
 
diff --git a/haskell/haskell-network/DETAILS b/haskell/haskell-network/DETAILS
index 31641b6..2e902e3 100755
--- a/haskell/haskell-network/DETAILS
+++ b/haskell/haskell-network/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-network
-         VERSION=2.4.2.2
+         VERSION=2.5.0.0
           SOURCE="network-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/network/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:e1aa5caa4e3ca368f8499ff9ed337e6827909a6d1c622cc2133871eac3b9d257d982c421f40d4d0118e50a5a421102f084d95b4e98faf91599b6c002988b1466
+     
SOURCE_HASH=sha512:37048752b5d4d68f9ce57f9c7a3bfe2657a207c5853a6ecaae74ff9c8f9afb2ba76c9e517bfd955c427cbfccc39d921a1849c5a8094603ad5081012d9f5bb47d
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/network-${VERSION}"
         
WEB_SITE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/network";
       LICENSE[0]=BSD3
diff --git a/haskell/haskell-network/HISTORY b/haskell/haskell-network/HISTORY
index b9ba92c..80f0beb 100644
--- a/haskell/haskell-network/HISTORY
+++ b/haskell/haskell-network/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.5.0.0
+
 2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.4.2.2
 
diff --git a/haskell/haskell-quickcheck/DEPENDS 
b/haskell/haskell-quickcheck/DEPENDS
index 8eace53..32e0c14 100755
--- a/haskell/haskell-quickcheck/DEPENDS
+++ b/haskell/haskell-quickcheck/DEPENDS
@@ -1 +1,2 @@
-depends ghc
+depends ghc &&
+depends haskell-tf-random
diff --git a/haskell/haskell-quickcheck/DETAILS 
b/haskell/haskell-quickcheck/DETAILS
index dac0394..c6d9578 100755
--- a/haskell/haskell-quickcheck/DETAILS
+++ b/haskell/haskell-quickcheck/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-quickcheck
-         VERSION=2.6
+         VERSION=2.7.3
           SOURCE="QuickCheck-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/QuickCheck/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:17cfa7b9ee2fa3e31b48ed3609d5e3bb2316b99251e45e56d377a198d8cb429696e25ecb35ef1bf5cac7e313381274c646393697604f1feefe225fc692e01166
+     
SOURCE_HASH=sha512:7aac1ec22085862219d83b4acff2098bca6d1471ac26f45a8886aaae277d5a9f2de43a7110341cf9c079f89b6396db66060f31c100002e90382f941a3d3a54e3
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/QuickCheck-${VERSION}"
         WEB_SITE="http://www.math.chalmers.se/~rjmh/QuickCheck/";
       LICENSE[0]=BSD3
diff --git a/haskell/haskell-quickcheck/HISTORY 
b/haskell/haskell-quickcheck/HISTORY
index f38ba1e..3bf2ae6 100644
--- a/haskell/haskell-quickcheck/HISTORY
+++ b/haskell/haskell-quickcheck/HISTORY
@@ -1,3 +1,7 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 2.7.3
+       * DEPENDS: depend on haskell-tf-random
+
 2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 2.6
 
diff --git a/haskell/haskell-safesemaphore/DETAILS 
b/haskell/haskell-safesemaphore/DETAILS
index 07a805c..565d4f1 100755
--- a/haskell/haskell-safesemaphore/DETAILS
+++ b/haskell/haskell-safesemaphore/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-safesemaphore
-         VERSION=0.10.0
+         VERSION=0.10.1
           SOURCE="SafeSemaphore-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/SafeSemaphore/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:9dfde05927b9e000a998c164454715f68b7d3ece7c9078e53f6de1be18096e58d7fe68f3547f9414d341f9a8fd58a9ff0085c2bb6c78d5957b428d917e03af58
+     
SOURCE_HASH=sha512:877731622e1942f45fcc43e2ed8ba7ddfa2c1f4a7ea4f36cdf425a98acc9c2f54c742d98a7d1bb457ff122f20a5af399ac776bff7403b892353f812e42007250
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/SafeSemaphore-${VERSION}"
         WEB_SITE="https://github.com/ChrisKuklewicz/SafeSemaphore";
       LICENSE[0]=BSD3
diff --git a/haskell/haskell-safesemaphore/HISTORY 
b/haskell/haskell-safesemaphore/HISTORY
index af01445..d979583 100644
--- a/haskell/haskell-safesemaphore/HISTORY
+++ b/haskell/haskell-safesemaphore/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.10.1
+
 2014-02-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.10.0
 
diff --git a/haskell/haskell-tf-random/DEPENDS 
b/haskell/haskell-tf-random/DEPENDS
new file mode 100755
index 0000000..c988845
--- /dev/null
+++ b/haskell/haskell-tf-random/DEPENDS
@@ -0,0 +1,3 @@
+depends ghc &&
+depends haskell-primitive &&
+depends haskell-random
diff --git a/haskell/haskell-tf-random/DETAILS 
b/haskell/haskell-tf-random/DETAILS
new file mode 100755
index 0000000..e4506da
--- /dev/null
+++ b/haskell/haskell-tf-random/DETAILS
@@ -0,0 +1,17 @@
+           SPELL=haskell-tf-random
+         VERSION=0.5
+          SOURCE="tf-random-${VERSION}.tar.gz"
+   
SOURCE_URL[0]=http://hackage.haskell.org/package/tf-random-${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:a766909571b4b37daaaaa9fa1aa9739bd2db8c32c0f64452fd7c3717f4578090e5227b763772858c6c311c5f366dd461421ffc3beb295455902fea1fb133deb7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/tf-random-${VERSION}"
+        WEB_SITE="http://hackage.haskell.org/package/tf-random";
+      LICENSE[0]=BSD
+         ENTERED=20140505
+           SHORT="a high-quality splittable pseudorandom number generator"
+cat << EOF
+This package contains an implementation of a high-quality splittable
+pseudorandom number generator. The generator is based on a cryptographic
+hash function built on top of the ThreeFish block cipher. See the paper
+Splittable Pseudorandom Number Generators Using Cryptographic Hashing by
+Claessen, Pałka for details and the rationale of the design.
+EOF
diff --git a/haskell/haskell-tf-random/HISTORY 
b/haskell/haskell-tf-random/HISTORY
new file mode 100644
index 0000000..02f39ee
--- /dev/null
+++ b/haskell/haskell-tf-random/HISTORY
@@ -0,0 +1,3 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS, DETAILS: spell created
+
diff --git a/haskell/haskell-transformers/DETAILS 
b/haskell/haskell-transformers/DETAILS
index b26c350..d0c9592 100755
--- a/haskell/haskell-transformers/DETAILS
+++ b/haskell/haskell-transformers/DETAILS
@@ -1,8 +1,8 @@
            SPELL=haskell-transformers
-         VERSION=0.3.0.0
+         VERSION=0.4.0.0
           SOURCE="transformers-${VERSION}.tar.gz"
    
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/transformers/${VERSION}/${SOURCE}
-     
SOURCE_HASH=sha512:aa444d01ea2296f9a94908872f167f383b0299768b8599b7f488c1d7499b027a90ffd1ef56e250b474d7c547e0acd94ae91b1cc80cdbd4943b5dca2770e2ab93
+     
SOURCE_HASH=sha512:d6d40c60f7df1a7af0853aad285da4ef36cc57df586b49a827e67dcbf31e86a15cc2456cd9b38906c3dcb205871b876ed7c0633a098e106026b18751c9610e41
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/transformers-${VERSION}"
         WEB_SITE="http://hackage.haskell.org/package/transformers";
       LICENSE[0]=BSD3
diff --git a/haskell/haskell-transformers/HISTORY 
b/haskell/haskell-transformers/HISTORY
index 719b8d3..4327493 100644
--- a/haskell/haskell-transformers/HISTORY
+++ b/haskell/haskell-transformers/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.4.0.0
+
 2012-05-19 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.3.0.0
 
diff --git a/haskell/haskell-uuid/DETAILS b/haskell/haskell-uuid/DETAILS
index 8fdc4df..2b12f9c 100755
--- a/haskell/haskell-uuid/DETAILS
+++ b/haskell/haskell-uuid/DETAILS
@@ -4,7 +4,7 @@
    SOURCE_URL[0]=http://hackage.haskell.org/package/uuid-${VERSION}/${SOURCE}
      
SOURCE_HASH=sha512:de60f5d4b150be8c13e26f6dbe8e35c25cad799f3b3bfdfdf80e6dcacc241eec845cae211da8e0b1e0be37245cb97ca65e3a3ed2482a1112eb66a3b7edb0c45c
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/uuid-${VERSION}"
-        WEB_SITE="http://projects.haskell.org/uuid/";
+        WEB_SITE="http://hackage.haskell.org/package/uuid";
       LICENSE[0]=BSD3
          ENTERED=20130709
            SHORT="For creating, comparing, parsing and printing Universally 
Unique Identifiers"
diff --git a/haskell/haskell-uuid/HISTORY b/haskell/haskell-uuid/HISTORY
index 75cad1a..2dce165 100644
--- a/haskell/haskell-uuid/HISTORY
+++ b/haskell/haskell-uuid/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: fix WEB_SITE
+
 2014-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, DEPENDS: version 1.3.3
 
diff --git a/haskell/haskell-xmonad-contrib/CONFLICTS 
b/haskell/haskell-xmonad-contrib/CONFLICTS
new file mode 100755
index 0000000..68523e8
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/CONFLICTS
@@ -0,0 +1 @@
+conflicts xmonad-contrib y
diff --git a/haskell/haskell-xmonad-contrib/DEPENDS 
b/haskell/haskell-xmonad-contrib/DEPENDS
new file mode 100755
index 0000000..82aef12
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/DEPENDS
@@ -0,0 +1,7 @@
+depends ghc &&
+depends haskell-x11 &&
+depends haskell-mtl &&
+depends haskell-utf8-string &&
+depends haskell-random &&
+depends haskell-extensible-exceptions &&
+depends haskell-xmonad
diff --git a/haskell/haskell-xmonad-contrib/DETAILS 
b/haskell/haskell-xmonad-contrib/DETAILS
new file mode 100755
index 0000000..16bb485
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/DETAILS
@@ -0,0 +1,16 @@
+           SPELL=haskell-xmonad-contrib
+         VERSION=0.11.3
+          SOURCE="xmonad-contrib-${VERSION}.tar.gz"
+   
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/xmonad-contrib/${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:13a1fe176e3c099e71def2404920be33afb800e15ed8479f9d2d9810c878e417943d75af821dfe01bfa3daff3f4cfb4a1001d3c2c39e2a59f4175b76ebe9cf99
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xmonad-contrib-${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
diff --git a/haskell/haskell-xmonad-contrib/HISTORY 
b/haskell/haskell-xmonad-contrib/HISTORY
new file mode 100644
index 0000000..4f11921
--- /dev/null
+++ b/haskell/haskell-xmonad-contrib/HISTORY
@@ -0,0 +1,34 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * CONFLICTS: conflict with xmonad-contrib
+
+2014-05-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.11.3
+
+2013-09-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.11.2
+
+2012-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.11
+       * DEPENDS: added dependency on haskell-extensible-exceptions
+       * PRE_BUILD, 0001-getAtomName-is-now-defined-in-the-X11-library.patch:
+         fix compile error
+
+2011-11-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.10
+
+2011-10-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: add dependency on haskell-random
+
+2010-12-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.9.2
+       * DEPENDS: added dependency on haskell-utf8-string
+
+2008-03-30 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS: updated spell to 0.7
+
+2008-02-01 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS: updated spell to 0.6
+
+2007-12-12 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS, DEPENDS, BUILD, INSTALL, POST_REMOVE, PRE_RESURRECT,
+         POST_RESURRECT, HISTORY: created this spell
diff --git a/haskell/haskell-xmonad/CONFLICTS 
b/haskell/haskell-xmonad/CONFLICTS
new file mode 100755
index 0000000..5152361
--- /dev/null
+++ b/haskell/haskell-xmonad/CONFLICTS
@@ -0,0 +1 @@
+conflicts xmonad y
diff --git a/haskell/haskell-xmonad/DEPENDS b/haskell/haskell-xmonad/DEPENDS
new file mode 100755
index 0000000..b2f2e50
--- /dev/null
+++ b/haskell/haskell-xmonad/DEPENDS
@@ -0,0 +1,6 @@
+depends ghc &&
+depends haskell-x11 &&
+depends haskell-mtl &&
+depends haskell-utf8-string &&
+depends haskell-extensible-exceptions &&
+depends xmessage
diff --git a/haskell/haskell-xmonad/DETAILS b/haskell/haskell-xmonad/DETAILS
new file mode 100755
index 0000000..640fe26
--- /dev/null
+++ b/haskell/haskell-xmonad/DETAILS
@@ -0,0 +1,20 @@
+           SPELL=haskell-xmonad
+         VERSION=0.11
+          SOURCE="xmonad-${VERSION}.tar.gz"
+   
SOURCE_URL[0]=http://hackage.haskell.org/packages/archive/xmonad/${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:34740f032508584f34f6b138d21394eca17e8020bccc4d8c6e8b3cb6b7ca64b153077cfd16636a6130768ebd145fe993569f8a229862d7816d0c89c905ee08bc
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/xmonad-${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
diff --git a/haskell/haskell-xmonad/HISTORY b/haskell/haskell-xmonad/HISTORY
new file mode 100644
index 0000000..3f11209
--- /dev/null
+++ b/haskell/haskell-xmonad/HISTORY
@@ -0,0 +1,59 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * CONFLICTS: conflict with xmonad
+
+2013-02-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * INSTALL: install manpage
+
+2013-01-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.11
+       * DEPENDS: added dependency on haskell-utf8-string
+
+2012-09-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DEPENDS: add dependency on haskell-extensible-exceptions
+
+2011-11-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.10
+
+2010-12-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.9.2
+
+2009-10-31 Bor Kraljič <pyrobor AT ver.si>
+       * DETAILS: updated spell to 0.9
+
+2009-07-26 Peng Chang (Charles) <chp AT sourcemage.org>
+       * PRE_RESURRECT, POST_RESURRECT: check whether
+         package.conf.old exists before backing up
+
+2009-04-22 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 0.8.1
+
+2008-03-30 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS: updated spell to 0.7
+
+2008-02-01 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS: updated spell to 0.6
+
+2007-12-10 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS: updated spell to 0.5
+       * CONFIGURE, PRE_BUILD, ghc-6.8.patch: removed
+       * INSTALL, POST_REMOVE, PRE_RESURRECT, POST_RESURRECT:
+         a set of procedures on package.conf
+
+2007-12-06 Alexander Tsamutali <astsmtl AT gmail.com>
+       * PRE_BUILD, ghc-6.8.patch: fixed building with ghc-6.8
+
+2007-12-02 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DEPENDS: doesn't depend on haskell-x11-extras
+
+2007-11-28 Arjan Bouter <abouter AT sourcemage.org>
+       * DETAILS: version 0.4.1
+
+2007-10-21 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS: updated spell to 0.4
+
+2007-09-05 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS: updated spell to 0.3
+
+2007-08-12 Alexander Tsamutali <astsmtl AT gmail.com>
+       * DETAILS, DEPENDS, CONFIGURE, PRE_BUILD, BUILD, INSTALL, HISTORY:
+         created spell
diff --git a/haskell/haskell-xmonad/INSTALL b/haskell/haskell-xmonad/INSTALL
new file mode 100755
index 0000000..e1bd5c9
--- /dev/null
+++ b/haskell/haskell-xmonad/INSTALL
@@ -0,0 +1,2 @@
+default_install &&
+install -m644 ${SOURCE_DIRECTORY}/man/xmonad.1 
${INSTALL_ROOT}/usr/share/man/man1/
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index cf86606..9134692 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,7 @@
+2014-05-07 Ladislav Hagara <hgr AT vabo.cz>
+       * latest.defaults: LATEST_maintenance_patches_3=patch-3.14.3
+       * info/patches/maintenance_patches_3/patch-3.14.3: added
+
 2014-04-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * info/patches/maintenance_patches_3/patch-3.14.2: added
        * latest_defaults: version 3.14.2
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3 
b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3
new file mode 100755
index 0000000..94b9151
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.14.3
@@ -0,0 +1,5 @@
+appliedkernels="3.14"
+patchversion="${appliedkernels}.3"
+source="patch-${patchversion}.xz"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.x/${source}"
+sha1sum="31a81e08b3bb1c571c949aac95996a44c2c59d2f"
diff --git a/kernels/linux/latest.defaults b/kernels/linux/latest.defaults
index 1c18ad4..6421d00 100644
--- a/kernels/linux/latest.defaults
+++ b/kernels/linux/latest.defaults
@@ -2,7 +2,7 @@ LATEST_3=3.14
 LATEST_2_6=2.6.39
 LATEST_PRE_2_6=patch-2.6.39
 LATEST_maintenance_patches=patch-2.6.39.4
-LATEST_maintenance_patches_3=patch-3.14.2
+LATEST_maintenance_patches_3=patch-3.14.3
 LATEST_git_patches=patch-2.6.25-rc6-git7
 LATEST_2_4=2.4.37.9
 LATEST_PRE_2_4=patch-2.4.33-pre1
diff --git a/libs/ldns/DEPENDS b/libs/ldns/DEPENDS
index ce0aff0..f463248 100755
--- a/libs/ldns/DEPENDS
+++ b/libs/ldns/DEPENDS
@@ -1,7 +1,14 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
 depends make &&
 depends libtool &&
 depends openssl &&
 
+if spell_ok openssl && is_version_less $(installed_version openssl) 1.0; then
+  message "${MESSAGE_COLOR}WARNING: GOST support requires OpenSSL 1.0, which 
is not installed."
+  message "Answer 'y' to replace current version $(installed_version 
openssl) with one from OpenSSL 1.0 branch.${DEFAULT_COLOR}"
+fi &&
+
 optional_depends -sub "1.0" openssl \
                             "--enable-gost" \
                             "--disable-gost" \
@@ -16,4 +23,9 @@ if is_depends_enabled $SPELL swig; then
   config_query_option LDNS_OPTS "Install ldnsx Python module?" y \
                                 "--with-pyldnsx" \
                                 "--without-pyldnsx"
-fi
+fi &&
+
+optional_depends perl \
+                 "--with-p5-dns-ldns" \
+                 "--without-p5-dns-ldns" \
+                 "to generate DNS::LDNS Perl bindings"
diff --git a/libs/ldns/DETAILS b/libs/ldns/DETAILS
index af3114d..d39fe25 100755
--- a/libs/ldns/DETAILS
+++ b/libs/ldns/DETAILS
@@ -1,16 +1,15 @@
            SPELL=ldns
-         VERSION=1.6.16
+         VERSION=1.6.17
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-   SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/ldns/$SOURCE
-     
SOURCE_HASH=sha512:ae32abf4fc146b4f8efb7d7751b09f629d28cbcb39d9493e5c00198b862d16274bc1bf6ac68c4fe35f177184bfe71bf68e1e6461c0fe6b6d57855549b08a4515
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+   SOURCE_URL[0]=http://www.nlnetlabs.nl/downloads/$SPELL/$SOURCE
+     
SOURCE_HASH=sha512:5de42b4b8622591db51efb0956735deee9cd5e0bee12249a03b65c5b45d7c51bf9c2edb310ef9d7431af49aef77d968bfa2455a7dedfa80cde3d433436c83785
       LICENSE[0]=MIT
         WEB_SITE=http://www.nlnetlabs.nl/projects/ldns/
      GATHER_DOCS=off
          ENTERED=20060126
         KEYWORDS="dns libs"
-           SHORT="ldns is a DNS programming library"
-
+           SHORT="DNS programming library"
 cat << EOF
 ldns is a library to simplify (experimental) DNS programming,
 also included is the first tool to make use of this library
diff --git a/libs/ldns/HISTORY b/libs/ldns/HISTORY
index a4d2c03..9b86960 100644
--- a/libs/ldns/HISTORY
+++ b/libs/ldns/HISTORY
@@ -1,3 +1,8 @@
+2014-05-09 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.6.17
+       * DEPENDS: added warning on switching openssl branches; added perl
+         optional dependency
+
 2012-11-19 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 1.6.16
 
diff --git a/libs/libyaml/DETAILS b/libs/libyaml/DETAILS
index 0c91b31..1b77ec8 100755
--- a/libs/libyaml/DETAILS
+++ b/libs/libyaml/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libyaml
-         VERSION=0.1.4
+         VERSION=0.1.6
+     
SOURCE_HASH=sha512:eef1f26fec0a305836b8c6a65def4e2864fe2415618e7490717d4e42f0fc51048727ab0e7e4a6c3a2783ae762fddd6b78091a76a6cd3a2710ae18e3dfb27cd44
           SOURCE=yaml-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/yaml-$VERSION
    SOURCE_URL[0]=http://pyyaml.org/download/libyaml/$SOURCE
-     
SOURCE_HASH=sha512:5864412b462f30e36550a1dcf52f66da9035aa17ee367bd41d0ba74d6809e281ea00c0bb78f9c2c7e08d4689f8ff6220d684dbe8dcd83cc172282c58d695d784
         WEB_SITE=http://pyyaml.org/wiki/LibYAML
          ENTERED=20120417
       LICENSE[0]=MIT
diff --git a/libs/libyaml/HISTORY b/libs/libyaml/HISTORY
index fc80446..753296f 100644
--- a/libs/libyaml/HISTORY
+++ b/libs/libyaml/HISTORY
@@ -1,3 +1,6 @@
+2014-05-11 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 0.1.6
+
 2012-04-17 David Kowis<dkowis AT shlrm.org>
        * DETAILS,HISTORY: created libyaml spell
 
diff --git a/mail/fetchmail/DETAILS b/mail/fetchmail/DETAILS
index 7f5f792..1bc85f8 100755
--- a/mail/fetchmail/DETAILS
+++ b/mail/fetchmail/DETAILS
@@ -1,5 +1,5 @@
            SPELL=fetchmail
-         VERSION=6.3.20
+         VERSION=6.3.26
   SECURITY_PATCH=8
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
diff --git a/mail/fetchmail/HISTORY b/mail/fetchmail/HISTORY
index c7bc93e..83d7a6c 100644
--- a/mail/fetchmail/HISTORY
+++ b/mail/fetchmail/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 6.3.26
+
 2011-06-12 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 6.3.20, SECURITY_PATCH=8, fetchmail-SA-2011-01, 
CVE-2011-1947
 
diff --git a/mail/getmail/DETAILS b/mail/getmail/DETAILS
index 7eb2bdd..e855eb9 100755
--- a/mail/getmail/DETAILS
+++ b/mail/getmail/DETAILS
@@ -1,9 +1,9 @@
            SPELL=getmail
-         VERSION=4.20.4
+         VERSION=4.46.0
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://pyropus.ca/software/getmail/old-versions/$SOURCE
-     
SOURCE_HASH=sha512:d1c3aeb11db363027f030a7fa6ddd222d3c4223c25f8f0242f73cdbfa29301f25b681ea347be79d75f61e727bea9b7bc75c755403e1944f661e760bf139f825f
+     
SOURCE_HASH=sha512:f0ff29cf78ff1fbc6e0c16b3fa9342d72fb70590aa0b944977906171e8a68423a4442cde38b2585956cd1855458a4b3fc0dd0a8507bda24a722325e9c0704a33
         WEB_SITE=http://pyropus.ca/software/getmail
          LICENSE=GPL
          ENTERED=20020716
diff --git a/mail/getmail/HISTORY b/mail/getmail/HISTORY
index 655ada6..7754090 100644
--- a/mail/getmail/HISTORY
+++ b/mail/getmail/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 4.46.0
+
 2011-07-17 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 4.20.4
 
diff --git a/mail/isync/DEPENDS b/mail/isync/DEPENDS
new file mode 100755
index 0000000..ed472ed
--- /dev/null
+++ b/mail/isync/DEPENDS
@@ -0,0 +1 @@
+depends openssl
diff --git a/mail/isync/DETAILS b/mail/isync/DETAILS
new file mode 100755
index 0000000..7ad5d99
--- /dev/null
+++ b/mail/isync/DETAILS
@@ -0,0 +1,37 @@
+           SPELL=isync
+         VERSION=1.1.0
+          SOURCE="${SPELL}-${VERSION}.tar.gz"
+   
SOURCE_URL[0]=http://sourceforge.net/projects/${SPELL}/files/${SPELL}/${VERSION}/${SOURCE}
+     
SOURCE_HASH=sha512:6503c1d8ba412274a09f468994a54dd2d13af2601da3dbfe1ba3f8aefc33cb2a5effd2ca66fcff1c5224ce80ffb11c42d8f362f7cc6409760c32e4031ea87744
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE="http://isync.sourceforge.net/";
+      LICENSE[0]="GPLv2"
+         ENTERED=20140510
+        KEYWORDS=""
+           SHORT="IMAP and MailDir mailbox synchronizer"
+cat << EOF
+isync is a command line application which synchronizes mailboxes; currently
+Maildir and IMAP4 mailboxes are supported. New messages, message deletions
+and flag changes can be propagated both ways. isync is suitable for use in
+IMAP-disconnected mode.
+
+Synchronization is based on unique message identifiers (UIDs), so
+no identification conflicts can occur (as opposed to some other mail
+synchronizers).  Synchronization state is kept in one local text file per
+mailbox pair; multiple replicas of a mailbox can be maintained.
+
+
+Features:
+* Fine-grained selection of synchronization operations to perform.
+* Synchronizes single mailboxes or entire mailbox collections.
+* Partial mirrors possible: keep only the latest messages locally.
+* Trash functionality: backup messages before removing them.
+* IMAP features:
+  - Security: supports TLS/SSL via imaps: (port 993) and STARTTLS; CRAM-MD5 
for
+    authentication.
+  - Supports NAMESPACE for simplified configuration.
+  - Pipelining for maximum speed (currently only partially implemented).
+
+isync should work fairly well with any IMAP4 compliant server; particularily
+efficient with those that support the UIDPLUS and LITERAL+ extensions.
+EOF
diff --git a/mail/isync/HISTORY b/mail/isync/HISTORY
new file mode 100644
index 0000000..a421732
--- /dev/null
+++ b/mail/isync/HISTORY
@@ -0,0 +1,2 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS, DETAILS: spell created
diff --git a/mail/masqmail/DETAILS b/mail/masqmail/DETAILS
index 6dfe039..6ea2d64 100755
--- a/mail/masqmail/DETAILS
+++ b/mail/masqmail/DETAILS
@@ -1,6 +1,6 @@
            SPELL=masqmail
          VERSION=0.3.4
-      PATCHLEVEL=1
+      PATCHLEVEL=2
           SOURCE=$SPELL-$VERSION.tar.gz
          SOURCE2=$SOURCE.asc
    SOURCE_URL[0]=http://marmaro.de/prog/$SPELL/files/$SOURCE
diff --git a/mail/masqmail/HISTORY b/mail/masqmail/HISTORY
index 43e78f6..589cd19 100644
--- a/mail/masqmail/HISTORY
+++ b/mail/masqmail/HISTORY
@@ -1,3 +1,9 @@
+2014-05-11 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL+=1
+       * PRE_BUILD: added, to apply log patch and prevent a log dir from
+         installing
+       * log.patch: added, to fix empty log file creation
+
 2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
        * CONFLICTS: added msmtp
 
diff --git a/mail/masqmail/PRE_BUILD b/mail/masqmail/PRE_BUILD
new file mode 100755
index 0000000..28ef01f
--- /dev/null
+++ b/mail/masqmail/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+sedit "s:install-data-local\: log_dir:install-data-local\::" Makefile.in &&
+
+patch -p0 < "$SPELL_DIRECTORY/log.patch"
diff --git a/mail/masqmail/log.patch b/mail/masqmail/log.patch
new file mode 100644
index 0000000..71e5122
--- /dev/null
+++ b/mail/masqmail/log.patch
@@ -0,0 +1,27 @@
+--- src/conf.c.orig    2012-01-18 12:31:45.000000000 +0400
++++ src/conf.c 2014-05-11 15:40:03.205332624 +0400
+@@ -416,6 +416,7 @@
+       conf.localpartcmp = strcmp;
+       conf.max_defer_time = 86400 * 4;  /* 4 days */
+       conf.max_msg_size = 0; /* no limit on msg size */
++      conf.log_dir = LOG_DIR;
+       conf.spool_dir = SPOOL_DIR;
+       conf.mail_dir = "/var/mail";
+       conf.listen_addresses = g_list_append(NULL, 
parse_interface("localhost", 25));
+--- src/masqmail.c.orig        2012-01-18 12:31:45.000000000 +0400
++++ src/masqmail.c     2014-05-11 15:48:18.197013226 +0400
+@@ -640,14 +640,10 @@
+               }
+       }
+ 
+-      conf.log_dir = LOG_DIR;
+-      /* FIXME: fails if we run as user */
+-      logopen();
+       if (!read_conf(conf_file)) {
+               logwrite(LOG_ALERT, "SHUTTING DOWN due to problems reading 
config\n");
+               exit(5);
+       }
+-      logclose();
+ 
+       if (do_queue) {
+               conf.do_queue = TRUE;
diff --git a/net/libreswan/BUILD b/net/libreswan/BUILD
new file mode 100755
index 0000000..5ddecbb
--- /dev/null
+++ b/net/libreswan/BUILD
@@ -0,0 +1 @@
+make $OPTS programs
diff --git a/net/libreswan/CONFLICTS b/net/libreswan/CONFLICTS
new file mode 100755
index 0000000..140c856
--- /dev/null
+++ b/net/libreswan/CONFLICTS
@@ -0,0 +1 @@
+conflicts openswan
diff --git a/net/libreswan/DEPENDS b/net/libreswan/DEPENDS
new file mode 100755
index 0000000..fbc7591
--- /dev/null
+++ b/net/libreswan/DEPENDS
@@ -0,0 +1,47 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
+depends gmp &&
+depends nspr &&
+depends nss &&
+depends pkgconfig &&
+depends iptables &&
+
+if is_version_less $(get_kernel_version) 2.6.9; then
+  depends ipsec-tools
+else
+  depends iproute2 &&
+
+  if spell_ok iproute2 && is_version_less $(installed_version iproute2) 
2.6.8; then
+    force_depends iproute2
+  fi
+fi &&
+
+optional_depends linux-pam \
+                 "USE_XAUTHPAM=true" \
+                 "USE_XAUTHPAM=false" \
+                 "for pam/xauth support" &&
+
+optional_depends curl \
+                 "USE_LIBCURL=true" \
+                 "USE_LIBCURL=false" \
+                 "for CRL fetching support via curl" &&
+
+optional_depends openldap \
+                 "USE_LDAP=true" \
+                 "USE_LDAP=false" \
+                 "for CRL fetching support via openldap" &&
+
+optional_depends libselinux \
+                 "USE_LABELED_IPSEC=true" \
+                 "USE_LABELED_IPSEC=false" \
+                 "for Labeled IPSec Functionality" &&
+
+optional_depends unbound \
+                 "USE_DNSSEC=true" \
+                 "USE_DNSSEC=false" \
+                 "for DNSSEC support" &&
+
+optional_depends libcap-ng \
+                 "USE_LIBCAP_NG=true" \
+                 "USE_LIBCAP_NG=false" \
+                 "to drop unneeded capabilities for the pluto daemon"
diff --git a/net/libreswan/DETAILS b/net/libreswan/DETAILS
new file mode 100755
index 0000000..1c82ab1
--- /dev/null
+++ b/net/libreswan/DETAILS
@@ -0,0 +1,24 @@
+            SPELL=libreswan
+          VERSION=3.8
+           SOURCE=$SPELL-$VERSION.tar.gz
+          SOURCE2=$SOURCE.asc
+ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+    SOURCE_URL[0]=https://download.libreswan.org/$SOURCE
+    SOURCE_URL[1]=ftp://ftp.libreswan.org/$SOURCE
+   SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+   SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
+       SOURCE_GPG=libreswan.gpg:$SOURCE2:UPSTREAM_KEY
+   SOURCE2_IGNORE=signature
+       LICENSE[0]=GPL
+         WEB_SITE=http://libreswan.org/
+          ENTERED=20140506
+         KEYWORDS="net"
+            SHORT="IPsec implementation for Linux - Openswan fork"
+cat << EOF
+Libreswan is an IPsec implementation for Linux. It has support for most of 
the
+extensions (RFC + IETF drafts) related to IPsec, including  IKEv2, X.509
+Digital Certificates, NAT Traversal, and many others.
+Libreswan uses the native Linux IPsec stack (NETKEY/XFRM) per default.
+
+Libreswan was forked from Openswan 2.6.38, which was forked from FreeS/WAN 
1.99.
+EOF
diff --git a/net/libreswan/HISTORY b/net/libreswan/HISTORY
new file mode 100644
index 0000000..2693e86
--- /dev/null
+++ b/net/libreswan/HISTORY
@@ -0,0 +1,3 @@
+2014-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS, DEPENDS, CONFLICTS, {PRE_,}BUILD, libreswan.gpg,
+         init.d/ipsec, no-pam.patch: created the spell
diff --git a/net/libreswan/PRE_BUILD b/net/libreswan/PRE_BUILD
new file mode 100755
index 0000000..8bfe733
--- /dev/null
+++ b/net/libreswan/PRE_BUILD
@@ -0,0 +1,7 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/no-pam.patch" &&
+
+sedit "s:/usr/local:$INSTALL_ROOT/usr:g" Makefile.inc &&        # Install to 
/usr
+sedit "s:=man:=share/man:" Makefile.inc                         # Install 
manpages to /usr/share
diff --git a/net/libreswan/init.d/ipsec b/net/libreswan/init.d/ipsec
new file mode 100644
index 0000000..18fe740
--- /dev/null
+++ b/net/libreswan/init.d/ipsec
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/ipsec
+ARGS="setup"
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+
+status()
+{
+  $PROGRAM $ARGS status
+}
+
+start()
+{
+  $PROGRAM $ARGS start
+}
+
+stop()
+{
+  $PROGRAM $ARGS stop
+}
diff --git a/net/libreswan/libreswan.gpg b/net/libreswan/libreswan.gpg
new file mode 100644
index 0000000..f42c13c
Binary files /dev/null and b/net/libreswan/libreswan.gpg differ
diff --git a/net/libreswan/no-pam.patch b/net/libreswan/no-pam.patch
new file mode 100644
index 0000000..087ad83
--- /dev/null
+++ b/net/libreswan/no-pam.patch
@@ -0,0 +1,26 @@
+--- programs/pluto/state.h.orig
++++ programs/pluto/state.h
+@@ -213,10 +213,8 @@ struct state {
+       so_serial_t st_clonedfrom;              /* serial number of parent */
+       int st_usage;
+ 
+-#ifdef XAUTH_HAVE_PAM
+       pthread_mutex_t xauth_mutex;            /* per state xauth_mutex */
+       pthread_t xauth_tid;                    /* per state XAUTH_RO thread 
id */
+-#endif
+ 
+       bool st_ikev2;                          /* is this an IKEv2 state? */
+       bool st_rekeytov2;                      /* true if this IKEv1 is about
+--- programs/pluto/xauth.c.orig
++++ programs/pluto/xauth.c
+       2014-05-05 21:25:14.112883644 +0400
+@@ -99,9 +99,7 @@
+       chunk_t name;
+       chunk_t password;
+       chunk_t connname;
+-#ifdef XAUTH_HAVE_PAM
+       st_jbuf_t *ptr;
+-#endif
+ };
+ 
+ #ifdef XAUTH_HAVE_PAM
diff --git a/net/minidlna/DETAILS b/net/minidlna/DETAILS
index dca2692..d76f2e3 100755
--- a/net/minidlna/DETAILS
+++ b/net/minidlna/DETAILS
@@ -1,9 +1,9 @@
            SPELL=minidlna
-         VERSION=1.1.1
+         VERSION=1.1.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-     
SOURCE_HASH=sha512:e8be77777f147f95b308d9b10d40f239e3031da1b5b074fd3bff8bb11e0234ca4eaf1a942527755cbc83f97c8dd0a768c284fd63601b3ca05f2bd5db6eb02e49
+      SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
+#     
SOURCE_HASH=sha512:e8be77777f147f95b308d9b10d40f239e3031da1b5b074fd3bff8bb11e0234ca4eaf1a942527755cbc83f97c8dd0a768c284fd63601b3ca05f2bd5db6eb02e49
    SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$VERSION/$SOURCE
-#     
SOURCE_HASH=sha512:bf1c2e7465ad24ae7c57f4270d40875227e0fb0e3db6c20fee7e286d7f93cfa17935475a8e9dda2da539d88f33fc4ec123a55e8cdf8e6656ae0e37306bb9625e
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://minidlna.sourceforge.net/";
       LICENSE[0]=GPL
diff --git a/net/minidlna/HISTORY b/net/minidlna/HISTORY
index 581e7da..ed88cfe 100644
--- a/net/minidlna/HISTORY
+++ b/net/minidlna/HISTORY
@@ -1,3 +1,6 @@
+2014-05-05 Eric Sandall <sandalle AT sourcemage.org>
+       * DETAILS: Updated to 1.1.2
+
 2013-12-07 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: Fixed SOURCE_URL[0]
          updated spell to 1.1.1
diff --git a/net/minidlna/minidlna-1.1.2.tar.gz.sig 
b/net/minidlna/minidlna-1.1.2.tar.gz.sig
new file mode 100644
index 0000000..b79fc65
Binary files /dev/null and b/net/minidlna/minidlna-1.1.2.tar.gz.sig differ
diff --git a/net/openswan/CONFLICTS b/net/openswan/CONFLICTS
new file mode 100755
index 0000000..132638a
--- /dev/null
+++ b/net/openswan/CONFLICTS
@@ -0,0 +1 @@
+conflicts libreswan
diff --git a/net/openswan/HISTORY b/net/openswan/HISTORY
index 93f38bb..318473b 100644
--- a/net/openswan/HISTORY
+++ b/net/openswan/HISTORY
@@ -1,3 +1,6 @@
+2014-05-06 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, conflicts with new libreswan spell
+
 2013-10-10 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.6.39; SECURITY_PATCH++ (CVE-2013-2053)
        * openswan.gpg: added 9FC816CA public key (Openswan Master Signing Key
diff --git a/net/tinc/DETAILS b/net/tinc/DETAILS
index fc927a0..b02bcf0 100755
--- a/net/tinc/DETAILS
+++ b/net/tinc/DETAILS
@@ -1,5 +1,5 @@
            SPELL=tinc
-         VERSION=1.0.23
+         VERSION=1.0.24
   SECURITY_PATCH=1
           SOURCE="$SPELL-$VERSION.tar.gz"
          SOURCE2=$SOURCE.sig
diff --git a/net/tinc/HISTORY b/net/tinc/HISTORY
index 897e994..f3ddaf3 100644
--- a/net/tinc/HISTORY
+++ b/net/tinc/HISTORY
@@ -1,3 +1,6 @@
+2014-05-12 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.0.24
+
 2013-10-21 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.0.23; don't do useless doc'ing
 
diff --git a/perl-cpan/date-manip/DETAILS b/perl-cpan/date-manip/DETAILS
index c705947..5f971c4 100755
--- a/perl-cpan/date-manip/DETAILS
+++ b/perl-cpan/date-manip/DETAILS
@@ -1,6 +1,6 @@
            SPELL=date-manip
-         VERSION=6.39
-     
SOURCE_HASH=sha512:1d4c0a3d997f623686acb5689458e78f023c608fc59d47b8bbf582470a144a84d043f7e1c9768f9191d4418e4c1195bc850a64ee84982c0ef1b0ee266680167d
+         VERSION=6.43
+     
SOURCE_HASH=sha512:00b60957f11c076ecb6f971911d33c438d68e9b9c22ca7425cdd700c397ce6f0d4e876a9d666295a009c2efd9bf617af633662b7ea29d4ee07e2b48927bc5020
           SOURCE=Date-Manip-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Date-Manip-$VERSION
    SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/S/SB/SBECK/$SOURCE
diff --git a/perl-cpan/date-manip/HISTORY b/perl-cpan/date-manip/HISTORY
index af72d6b..4b2728c 100644
--- a/perl-cpan/date-manip/HISTORY
+++ b/perl-cpan/date-manip/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 6.43
+
 2013-03-09 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 6.39
 
diff --git a/perl-cpan/file-copy-recursive/DEPENDS 
b/perl-cpan/file-copy-recursive/DEPENDS
new file mode 100755
index 0000000..c1a1bc6
--- /dev/null
+++ b/perl-cpan/file-copy-recursive/DEPENDS
@@ -0,0 +1 @@
+depends perl 
diff --git a/perl-cpan/file-copy-recursive/DETAILS 
b/perl-cpan/file-copy-recursive/DETAILS
new file mode 100755
index 0000000..f7c1e05
--- /dev/null
+++ b/perl-cpan/file-copy-recursive/DETAILS
@@ -0,0 +1,14 @@
+           SPELL=file-copy-recursive
+         VERSION=0.38
+          SOURCE="File-Copy-Recursive-${VERSION}.tar.gz"
+   SOURCE_URL[0]=http://search.cpan.org/CPAN/authors/id/D/DM/DMUEY/${SOURCE}
+     
SOURCE_HASH=sha512:49e5dbfc5bdbc554ad8a019c25db85ebfa55765a73758d95271b5f3de9550fd68b4d99aa287898d86bc6c11ea8de97469a85c53d4ad8534594b411be1f18eb87
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/File-Copy-Recursive-${VERSION}"
+        WEB_SITE="http://search.cpan.org/~dmuey/File-Copy-Recursive-0.38/";
+      LICENSE[0]="Artistic"
+         ENTERED=20140510
+        KEYWORDS=""
+           SHORT="Perl extension for recursively copying files and 
directories"
+cat << EOF
+Perl extension for recursively copying files and directories.
+EOF
diff --git a/perl-cpan/file-copy-recursive/HISTORY 
b/perl-cpan/file-copy-recursive/HISTORY
new file mode 100644
index 0000000..d56d6ac
--- /dev/null
+++ b/perl-cpan/file-copy-recursive/HISTORY
@@ -0,0 +1,3 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+       * DEPENDS, DETAILS: spell created
+
diff --git a/perl-cpan/mail-imapclient/DETAILS 
b/perl-cpan/mail-imapclient/DETAILS
index b6fde77..e9ffec1 100755
--- a/perl-cpan/mail-imapclient/DETAILS
+++ b/perl-cpan/mail-imapclient/DETAILS
@@ -1,9 +1,9 @@
            SPELL=mail-imapclient
-         VERSION=2.2.9
+         VERSION=3.35
           SOURCE=Mail-IMAPClient-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mail-IMAPClient-$VERSION
-   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/D/DJ/DJKERNEN/$SOURCE
-     
SOURCE_HASH=sha512:231b9f7c6d0118aaa1c4a940c65ff30b9ca9041563f59279b900d881756e23cc3a440046273e48e5bc106bac00080020c427e41b6a1b8fe55be19b12eda22e80
+   SOURCE_URL[0]=$PERL_CPAN_URL/authors/id/P/PL/PLOBBES/$SOURCE
+     
SOURCE_HASH=sha512:c8fc11d098a0c0370347155e860e4eb1b0842c5de825f206d166bd6d99d510a492aa0ebe5a15f561aae1f379641f502fc4984660be2a0b42be52a01a58661595
          LICENSE=ART
         WEB_SITE="http://search.cpan.org/search?module=Mail::IMAPClient";
          ENTERED=20081015
diff --git a/perl-cpan/mail-imapclient/HISTORY 
b/perl-cpan/mail-imapclient/HISTORY
index 7ddac42..6c05910 100644
--- a/perl-cpan/mail-imapclient/HISTORY
+++ b/perl-cpan/mail-imapclient/HISTORY
@@ -1,3 +1,7 @@
+2014-05-10 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: Fixed SOURCE_URL[0]
+         updated spell to 3.35
+
 2011-10-14 Bor Kraljič <pyrobor AT ver.si>
        * DETAILS: fixed long description wrap (scripted)
 
diff --git a/python-pypi/isort/DETAILS b/python-pypi/isort/DETAILS
index 7e0fce0..30448c8 100755
--- a/python-pypi/isort/DETAILS
+++ b/python-pypi/isort/DETAILS
@@ -1,6 +1,6 @@
            SPELL=isort
-         VERSION=3.6.2
-     
SOURCE_HASH=sha512:30d15c392a48b8fca915b568edf309ce3aceb3e7d744e5abd3154783164c37869f142825d437f4ac8a79d578beec7bff243977294f1f4cd1001481a3c650773d
+         VERSION=3.8.0
+     
SOURCE_HASH=sha512:5ea46f160144183ae0b0b0ca3aab011355644ed057186b01f9d996e2f77c321d35607eb0268b57a24701e00c51a1a607e7bb8351c727942a7360f2c337d42eb4
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
         WEB_SITE=http://pypi.python.org/pypi/$SPELL
diff --git a/python-pypi/isort/HISTORY b/python-pypi/isort/HISTORY
index f1e3828..e26d559 100644
--- a/python-pypi/isort/HISTORY
+++ b/python-pypi/isort/HISTORY
@@ -1,3 +1,6 @@
+2014-05-04 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 3.8.0
+
 2014-03-09 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.6.2
 
diff --git a/ruby-raa/ruby-2.1/DETAILS b/ruby-raa/ruby-2.1/DETAILS
index 307d63e..f2d14d3 100755
--- a/ruby-raa/ruby-2.1/DETAILS
+++ b/ruby-raa/ruby-2.1/DETAILS
@@ -1,7 +1,7 @@
            SPELL=ruby-2.1
          PACKAGE=ruby
-         VERSION=2.1.1
-     
SOURCE_HASH=sha512:9850bdb785e87705e72f302822a530d8552fbeb739d59a408786e892d007ee0077271bf148e3928d85d30570dfae951142434ada6cc238e208d0cb12de32c21f
+         VERSION=2.1.2
+     
SOURCE_HASH=sha512:51594ecee8ef6ad45e4a835d7671d11c126826fdaaeddfd361a6640bf30077e22212ee00342fe705c564225f637f8d692572c56b553a188bba507499b55d8843
   SECURITY_PATCH=0
           BRANCH=`echo $VERSION|cut -d . -f 1,2`
           SOURCE=$PACKAGE-$VERSION.tar.bz2
diff --git a/ruby-raa/ruby-2.1/HISTORY b/ruby-raa/ruby-2.1/HISTORY
index 9f0e504..78afaa9 100644
--- a/ruby-raa/ruby-2.1/HISTORY
+++ b/ruby-raa/ruby-2.1/HISTORY
@@ -1,3 +1,6 @@
+2014-05-11 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 2.1.2
+
 2014-02-28 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 2.1.1
 
diff --git a/shell-term-fm/rxvt-unicode/DETAILS 
b/shell-term-fm/rxvt-unicode/DETAILS
index 9894182..d16ebcd 100755
--- a/shell-term-fm/rxvt-unicode/DETAILS
+++ b/shell-term-fm/rxvt-unicode/DETAILS
@@ -1,6 +1,6 @@
            SPELL=rxvt-unicode
-         VERSION=9.19
-     
SOURCE_HASH=sha512:357f2b9a299b816264e8cece3200338369399e4f760622daec1520d05c75e93d44e2dee3351c8e31765ab8f2218dbb9d239960ae8112e2f75d988785373d7f26
+         VERSION=9.20
+     
SOURCE_HASH=sha512:39e1574f7b7034c07ab2e836bb77e0fb0536830df873cc54e6c7583be5e20d36dea3fe0fc889283f163530c77534a3a55de227ee0a8f03564d0f030e60461ff9
           SOURCE=$SPELL-$VERSION.tar.bz2
 SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://dist.schmorp.de/$SPELL/$SOURCE
diff --git a/shell-term-fm/rxvt-unicode/HISTORY 
b/shell-term-fm/rxvt-unicode/HISTORY
index 5e4255b..fd8025a 100644
--- a/shell-term-fm/rxvt-unicode/HISTORY
+++ b/shell-term-fm/rxvt-unicode/HISTORY
@@ -1,3 +1,6 @@
+2014-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETILA: version 9.20
+
 2013-11-06 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 9.19
        * PRE_BUILD, fix-tabber-perl-5.18-ext.diff: removed
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 0582a27..1506737 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -1,6 +1,6 @@
            SPELL=dbus
-         VERSION=1.8.0
-     
SOURCE_HASH=sha512:39b1c294abe25e80d741a294b67a9691337cc71f69f8db03e4e6588512a94de2b772b74ae5cb35fa91da812293f0cf392cb51823ebe3c21f7f9ea99287d0655f
+         VERSION=1.8.2
+     
SOURCE_HASH=sha512:44e07ba57d89be4af3e305afcc21ee437dfa86e2dc17c7c6c81bf4f29aa5de3269281f684fa9ac8a6021b6d2b1f1f6bd901c17f783a692eb6435c087bd62c54d
   SECURITY_PATCH=9
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 7cf11b4..5d78760 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,6 @@
+2014-05-07 Treeve Jelbert <treeve AT sourcemage.org>
+       * DETAILS: version 1.8.2
+
 2014-01-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 1.8.0
 
diff --git a/video/xbmc/DETAILS b/video/xbmc/DETAILS
index 5e8b900..49a6b01 100755
--- a/video/xbmc/DETAILS
+++ b/video/xbmc/DETAILS
@@ -1,9 +1,10 @@
            SPELL=xbmc
-         VERSION=12.2
+         VERSION=13.0_r2
+         VERSIONX=${VERSION:0:4}-Gotham${VERSION[@]:4}
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://mirrors.${SPELL}.org/releases/source/${SOURCE}
-     
SOURCE_HASH=sha512:d6812886b4d1a5c28c8150b164d714f8855ccb1ac4e74811c9eb03d09e12a6f05bedd3c034132ae79e0bff66efd54ced9c2c1140da6b4ad7b82dbb90fa3d1c39
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+     
SOURCE_HASH=sha512:c56d11959797f4c6c3b1831afeab03332913fe6cc00f2542c45af725fe932ba3b997c2af997a602665734a6bcc061c40b8e876144894fdeab91b56df98958433
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSIONX}"
         WEB_SITE="http://xbmc.org";
       LICENSE[0]=GPL
          ENTERED=20101225
diff --git a/video/xbmc/HISTORY b/video/xbmc/HISTORY
index 0a3c108..aa52954 100644
--- a/video/xbmc/HISTORY
+++ b/video/xbmc/HISTORY
@@ -1,3 +1,6 @@
+2014-05-11 Pol Vinogradov <vin.public AT gmail.com>
+       * DETAILS: version 13.0_r2 Gotham
+
 2013-10-26 Jeremy Blosser <jblosser AT sourcemage.org>
        * DETAILS, DEPENDS: version 12.2
 
diff --git a/windowmanagers/amiwm/BUILD b/windowmanagers/amiwm/BUILD
new file mode 100755
index 0000000..de33b68
--- /dev/null
+++ b/windowmanagers/amiwm/BUILD
@@ -0,0 +1,3 @@
+make_single   &&
+default_build &&
+make_normal
diff --git a/windowmanagers/amiwm/HISTORY b/windowmanagers/amiwm/HISTORY
index 9638e6d..35d9227 100644
--- a/windowmanagers/amiwm/HISTORY
+++ b/windowmanagers/amiwm/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * BUILD: make_single
+
 2012-03-28 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS, DEPENDS, PRE_BUILD: spell created
 
diff --git a/windowmanagers/herbstluftwm/DETAILS 
b/windowmanagers/herbstluftwm/DETAILS
index 22c6672..f298e6e 100755
--- a/windowmanagers/herbstluftwm/DETAILS
+++ b/windowmanagers/herbstluftwm/DETAILS
@@ -1,8 +1,8 @@
            SPELL=herbstluftwm
-         VERSION=0.5.1
+         VERSION=0.6.2
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=http://${SPELL}.org/tarballs/${SOURCE}
-     
SOURCE_HASH=sha512:f31d2eff15f95d62b0beeff8ced88551bd01b63edfd92f358b57a04b850505beefbe1fae53c6e6c24b2407e03966b57c1ce1ef8e11d333efe8165f3abe141747
+     
SOURCE_HASH=sha512:3fa70a285e21c9e0717f3301227b2fcc578e819c50d2bf380311253db2f5c864d6e42020b8b278ba4e555b5d75e0572144e06c0e8f2a395155415a4902a95421
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://herbstluftwm.org";
       LICENSE[0]=BSD
diff --git a/windowmanagers/herbstluftwm/HISTORY 
b/windowmanagers/herbstluftwm/HISTORY
index 878de57..6d01674 100644
--- a/windowmanagers/herbstluftwm/HISTORY
+++ b/windowmanagers/herbstluftwm/HISTORY
@@ -1,3 +1,6 @@
+2014-05-10 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: version 0.6.2
+
 2013-06-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * BUILD, PRE_BUILD, DEPENDS, DETAILS: spell created
 
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