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