5 files changed, 11 insertions, 67 deletions

diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 6fba544e5362..b8716f6abf37 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	darcs
-PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTVERSION=	2.8.4
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -13,9 +12,9 @@ LICENSE=	GPLv2
 FILE_LICENSE=	COPYING
 
 USE_CABAL=	hashed-storage>=0.5.6 haskeline>=0.6.3 html \
-		mtl>=1.0 parsec>=2.0 random regex-compat>=0.95.1 \
+		mtl>=1.0 parsec>=2.2 random regex-compat>=0.95.1 \
 		regex-posix>=0.95.1 tar>=0.4 text>=0.11.0.6 unix-compat>=0.1.2 \
-		vector>=0.7 zlib>=0.5.1.0
+		utf8-string>=0.3.6 vector>=0.7 zlib>=0.5.1.0
 
 EXECUTABLE=	darcs
 
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 0e7662e0cca2..c2655e42837f 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/darcs-2.8.3.tar.gz) = 90750842926750cd60a97c61f8ba08e90faffdcb11478d10617a3d5d62216f59
-SIZE (cabal/darcs-2.8.3.tar.gz) = 1289187
+SHA256 (cabal/darcs-2.8.4.tar.gz) = 3fab4dbb2d5dd9f381d49f4730c12e1534b5c484b0dde9712614a7151f659f98
+SIZE (cabal/darcs-2.8.4.tar.gz) = 1301464
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index df31ea371518..c2ecc0e43c6e 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,15 +1,15 @@
---- ./Setup.lhs.orig	2011-02-11 00:35:43.000000000 +0100
-+++ ./Setup.lhs	2011-03-13 18:05:02.180256196 +0100
-@@ -21,7 +21,7 @@
+--- Setup.lhs.orig	2013-02-06 07:07:21.000000000 +0100
++++ Setup.lhs	2013-02-10 10:48:49.000000000 +0100
+@@ -26,7 +26,7 @@
  import Data.Version( showVersion )
  import Distribution.Simple.LocalBuildInfo
           ( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
 -import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
 +import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
+ import Distribution.Simple.PackageIndex ( topologicalOrder )
+ import Distribution.Simple.Program ( gccProgram, rawSystemProgramStdoutConf )
  import Distribution.Simple.Setup
-     (buildVerbosity, copyDest, copyVerbosity, fromFlag,
-      haddockVerbosity, installVerbosity, sDistVerbosity)
-@@ -180,7 +180,7 @@
+@@ -200,7 +200,7 @@
                    -> Verbosity -> CopyDest -> IO ()
  installManpage pkg lbi verbosity copy =
      copyFiles verbosity
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
deleted file mode 100644
index e07520c70785..000000000000
--- a/devel/hs-darcs/files/patch-darcs.cabal
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./darcs.cabal.orig	2012-05-14 13:10:13.000000000 +0200
-+++ ./darcs.cabal	2012-05-15 15:33:40.000000000 +0200
-@@ -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/devel/hs-darcs/files/patch-src__Darcs__Repository.hs b/devel/hs-darcs/files/patch-src__Darcs__Repository.hs
deleted file mode 100644
index 1bbacd8dd907..000000000000
--- a/devel/hs-darcs/files/patch-src__Darcs__Repository.hs
+++ /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