development/darcs: Updated for version 2.5.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 75 insertions, 47 deletions

diff --git a/development/darcs/darcs.SlackBuild b/development/darcs/darcs.SlackBuild
index d7a1da22dd23..13c8e5e98fbf 100644
--- a/development/darcs/darcs.SlackBuild
+++ b/development/darcs/darcs.SlackBuild
@@ -6,7 +6,7 @@
 # Public domain.
 
 PRGNAM=darcs
-VERSION=${VERSION:-2.5.1}
+VERSION=${VERSION:-2.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -54,11 +54,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Lift upper bound on parsec3 dependency
-patch -p0 <$CWD/darcs_cabal_parsec.patch
-
 # Link darcs binary dynamically
 patch -p0 <$CWD/darcs_cabal_dynamic.patch
+# Bump regex-{posix,compat} version bounds (all tests pass)
+patch -p0 <$CWD/darcs_cabal_regex.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -100,4 +99,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/development/darcs/darcs.info b/development/darcs/darcs.info
index 80151b63ad5a..3baf63c80d54 100644
--- a/development/darcs/darcs.info
+++ b/development/darcs/darcs.info
@@ -1,10 +1,10 @@
 PRGNAM="darcs"
-VERSION="2.5.1"
+VERSION="2.5.2"
 HOMEPAGE="http://darcs.net/"
-DOWNLOAD="http://darcs.net/releases/darcs-2.5.1.tar.gz"
-MD5SUM="247151771f6dd39db697c586069cb1c9"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/darcs/2.5.2/darcs-2.5.2.tar.gz"
+MD5SUM="491b6ca01dec245a16112ad2c7e07dc1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="Niels Horn"
+APPROVED="rworkman"
diff --git a/development/darcs/darcs_cabal_parsec.patch b/development/darcs/darcs_cabal_parsec.patch
deleted file mode 100644
index bd0718c0672a..000000000000
--- a/development/darcs/darcs_cabal_parsec.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- darcs.cabal.orig	2011-02-11 23:36:22.000000000 +0200
-+++ darcs.cabal	2011-02-11 23:37:16.000000000 +0200
-@@ -172,7 +172,7 @@
-                      extensible-exceptions >= 0.1 && < 0.2,
-                      regex-compat >= 0.71 && < 0.94,
-                      mtl          >= 1.0 && < 2.1,
--                     parsec       >= 2.0 && < 3.1,
-+                     parsec       >= 2.0 && < 3.2,
-                      html         == 1.0.*,
-                      filepath     >= 1.1.0.0 && < 1.3.0.0,
-                      haskeline    >= 0.6.2.2 && < 0.7,
-@@ -377,7 +377,7 @@
-                      extensible-exceptions >= 0.1 && < 0.2,
-                      regex-compat >= 0.71 && < 0.94,
-                      mtl          >= 1.0 && < 2.1,
--                     parsec       >= 2.0 && < 3.1,
-+                     parsec       >= 2.0 && < 3.2,
-                      html         == 1.0.*,
-                      filepath     >= 1.1.0.0 && < 1.3.0.0,
-                      haskeline    >= 0.6.2.2 && < 0.7,
-@@ -525,7 +525,7 @@
-                    extensible-exceptions >= 0.1 && < 0.2,
-                    regex-compat >= 0.71 && < 0.94,
-                    mtl          >= 1.0 && < 2.1,
--                   parsec       >= 2.0 && < 3.1,
-+                   parsec       >= 2.0 && < 3.2,
-                    html         == 1.0.*,
-                    filepath     >= 1.1.0.0 && < 1.3.0.0,
-                    haskeline    >= 0.6.2.2 && < 0.7,
-@@ -621,7 +621,7 @@
-                      extensible-exceptions >= 0.1 && < 0.2,
-                      regex-compat >= 0.71 && < 0.94,
-                      mtl          >= 1.0 && < 2.1,
--                     parsec       >= 2.0 && < 3.1,
-+                     parsec       >= 2.0 && < 3.2,
-                      html         == 1.0.*,
-                      filepath     >= 1.1.0.0 && < 1.3.0.0,
-                      QuickCheck   >= 2.1.0.0,
diff --git a/development/darcs/darcs_cabal_regex.patch b/development/darcs/darcs_cabal_regex.patch
new file mode 100644
index 000000000000..305ffc4f6990
--- /dev/null
+++ b/development/darcs/darcs_cabal_regex.patch
@@ -0,0 +1,68 @@
+--- darcs.cabal.orig	2011-05-31 11:46:05.441999585 +0300
++++ darcs.cabal	2011-05-31 11:47:59.589999593 +0300
+@@ -170,11 +170,11 @@
+       cpp-options:    -DWIN32
+       c-sources:      src/win32/send_email.c
+       build-depends:  unix-compat >= 0.1.2,
+-                      regex-posix >= 0.94.4 && < 0.95
++                      regex-posix >= 0.94.4 && <= 0.95.1
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71 && <= 0.95.1,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+@@ -372,14 +372,14 @@
+       cpp-options:    -DWIN32
+       c-sources:      src/win32/send_email.c
+       build-depends:  unix-compat >= 0.1.2,
+-                      regex-posix >= 0.94.4 && < 0.95
++                      regex-posix >= 0.94.4 && <= 0.95.1
+ 
+     if os(solaris)
+       cc-options:     -DHAVE_SIGINFO_H
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71 && <= 0.95.1,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+@@ -522,14 +522,14 @@
+     cpp-options:    -DWIN32
+     c-sources:      src/win32/send_email.c
+     build-depends:  unix-compat >= 0.1.2,
+-                    regex-posix >= 0.94.4 && < 0.95
++                    regex-posix >= 0.94.4 && <= 0.95.1
+ 
+   if os(solaris)
+     cc-options:     -DHAVE_SIGINFO_H
+ 
+   build-depends:   base          < 5,
+                    extensible-exceptions >= 0.1 && < 0.2,
+-                   regex-compat >= 0.71 && < 0.94,
++                   regex-compat >= 0.71 && <= 0.95.1,
+                    mtl          >= 1.0 && < 2.1,
+                    parsec       >= 2.0 && < 3.2,
+                    html         == 1.0.*,
+@@ -625,7 +625,7 @@
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71 && <= 0.95.1,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+@@ -678,7 +678,7 @@
+       cpp-options:    -DWIN32
+       c-sources:      src/win32/send_email.c
+       build-depends:  unix-compat >= 0.1.2,
+-                      regex-posix >= 0.94.4 && < 0.95
++                      regex-posix >= 0.94.4 && <= 0.95.1
+ 
+     if os(solaris)
+       cc-options:     -DHAVE_SIGINFO_H