development/darcs: Updated for version 2.8.4.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

5 files changed, 11 insertions, 71 deletions

diff --git a/development/darcs/darcs.SlackBuild b/development/darcs/darcs.SlackBuild
index caaea0ba024d..e7ea086a5d64 100644
--- a/development/darcs/darcs.SlackBuild
+++ b/development/darcs/darcs.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for darcs
 
-# Copyright 2012 Mikko Värri, Finland
+# Copyright 2013 Mikko Värri, Finland
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=darcs
-VERSION=${VERSION:-2.8.1}
+VERSION=${VERSION:-2.8.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -71,11 +71,6 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Bump haskell-tar version (all tests pass)
-patch -p0 <$CWD/darcs_cabal_tar.patch
-# Fix haskell-tar compatibility
-patch -p0 <$CWD/src_Darcs_Repository_hs.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 runghc Setup configure \
diff --git a/development/darcs/darcs.info b/development/darcs/darcs.info
index 1624bade6686..bfb2f8e29284 100644
--- a/development/darcs/darcs.info
+++ b/development/darcs/darcs.info
@@ -1,10 +1,10 @@
 PRGNAM="darcs"
-VERSION="2.8.1"
+VERSION="2.8.4"
 HOMEPAGE="http://darcs.net/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/darcs/2.8.1/darcs-2.8.1.tar.gz"
-MD5SUM="cb70989f4011c1c9826a266622e8304c"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/darcs/2.8.4/darcs-2.8.4.tar.gz"
+MD5SUM="7456b7957add1b04c49de1b72c137a77"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="haskell-vector haskell-random haskell-syb haskell-html haskell-tar haskell-text haskell-parsec haskell-hashed-storage haskell-haskeline haskell-network haskell-HTTP haskell-regex-compat"
+REQUIRES="haskell-extensible-exceptions haskell-vector haskell-random haskell-syb haskell-html haskell-tar haskell-text haskell-parsec haskell-hashed-storage haskell-haskeline haskell-network haskell-HTTP haskell-regex-compat"
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
diff --git a/development/darcs/darcs_cabal_tar.patch b/development/darcs/darcs_cabal_tar.patch
deleted file mode 100644
index 5b1ec5aff521..000000000000
--- a/development/darcs/darcs_cabal_tar.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- darcs.cabal.orig	2012-05-14 14:10:13.000000000 +0300
-+++ darcs.cabal	2012-05-19 13:30:01.180000016 +0300
-@@ -371,7 +371,7 @@
-                      haskeline    >= 0.6.3 && < 0.7,
-                      hashed-storage >= 0.5.6 && < 0.6,
-                      vector       >= 0.7,
--                     tar          == 0.3.*
-+                     tar          == 0.4.*
- 
-     if !os(windows)
-       build-depends: unix >= 1.0 && < 2.6
-@@ -532,7 +532,7 @@
-                    haskeline    >= 0.6.3 && < 0.7,
-                    hashed-storage >= 0.5.6 && < 0.6,
-                    vector       >= 0.7,
--                   tar          == 0.3.*
-+                   tar          == 0.4.*
- 
-   if !os(windows)
-     build-depends: unix >= 1.0 && < 2.6
-@@ -729,7 +729,7 @@
-                    array      >= 0.1 && < 0.5,
-                    hashed-storage >= 0.5.6 && < 0.6,
-                    vector       >= 0.7,
--                   tar        == 0.3.*,
-+                   tar        == 0.4.*,
-                    random     == 1.0.*
- 
-     if flag(mmap) && !os(windows)
diff --git a/development/darcs/slack-desc b/development/darcs/slack-desc
index 91d2aa3514ca..4381fa11923b 100644
--- a/development/darcs/slack-desc
+++ b/development/darcs/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
      |-----handy-ruler------------------------------------------------------|
 darcs: darcs (a distributed, interactive, smart revision control system)
diff --git a/development/darcs/src_Darcs_Repository_hs.patch b/development/darcs/src_Darcs_Repository_hs.patch
deleted file mode 100644
index 1bbacd8dd907..000000000000
--- a/development/darcs/src_Darcs_Repository_hs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./src/Darcs/Repository.hs.orig	2012-04-22 17:14:14.000000000 +0200
-+++ ./src/Darcs/Repository.hs	2012-05-10 16:44:09.000000000 +0200
-@@ -302,19 +302,19 @@
- removeMetaFiles = mapM_ (removeFile . (darcsdir </>)) .
-   filter ("meta-" `isPrefixOf`) =<< getDirectoryContents darcsdir
- 
--unpackBasic :: Cache -> Tar.Entries -> IO ()
-+unpackBasic :: Cache -> Tar.Entries Tar.FormatError -> IO ()
- unpackBasic c x = do
-   withControlMVar $ \mv -> unpackTar c (basicMetaHandler c mv) x
-   removeMetaFiles
- 
--unpackPatches :: Cache -> [String] -> Tar.Entries -> IO ()
-+unpackPatches :: Cache -> [String] -> Tar.Entries Tar.FormatError -> IO ()
- unpackPatches c ps x = do
-   withControlMVar $ \mv -> unpackTar c (patchesMetaHandler c ps mv) x
-   removeMetaFiles
- 
--unpackTar :: Cache -> IO () -> Tar.Entries -> IO ()
-+unpackTar :: Cache -> IO () -> Tar.Entries Tar.FormatError -> IO ()
- unpackTar  _ _ Tar.Done = return ()
--unpackTar  _ _ (Tar.Fail e)= fail e
-+unpackTar  _ _ (Tar.Fail e) = fail $ show e
- unpackTar c mh (Tar.Next x xs) = case Tar.entryContent x of
-   Tar.NormalFile x' _ -> do
-     let p = Tar.entryPath x