4 files changed, 3 insertions, 59 deletions

diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index 8d5f95f4c231..aa59f4a86059 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	testpack
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
diff --git a/devel/hs-testpack/distinfo b/devel/hs-testpack/distinfo
index 46c0ba8b3156..6084b0631599 100644
--- a/devel/hs-testpack/distinfo
+++ b/devel/hs-testpack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/testpack-2.0.1.tar.gz) = 621a6bb0bc5d6be6460c5892338b78f42fdf33c6291ef58e296fefb654e16979
-SIZE (cabal/testpack-2.0.1.tar.gz) = 14574
+SHA256 (cabal/testpack-2.1.0.tar.gz) = 8128f3a409855fca1d431391b2cbf6a9f4dec32dd6f26825960b936fe578c476
+SIZE (cabal/testpack-2.1.0.tar.gz) = 14882
diff --git a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
deleted file mode 100644
index 2d60c1dda342..000000000000
--- a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./src/Test/HUnit/Tools.hs.orig	2010-08-11 21:28:05.000000000 +0200
-+++ ./src/Test/HUnit/Tools.hs	2011-03-13 15:12:06.976261554 +0100
-@@ -61,7 +61,7 @@
-     HU.TestLabel lbl $ HU.TestCase $
-       do result <- localquickCheckWithResult config property
-          case result of
--           Success _ -> return ()
-+           Success _ _ _ -> return ()
-            _ -> HU.assertFailure (show result)
- 
- -- Modified from HUnit
-@@ -159,7 +159,7 @@
- -- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
- localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
- localquickCheckWithResult args p =
--  do tm  <- newTerminal
-+  do tm  <- newStdioTerminal
-      rnd <- case replay args of
-               Nothing      -> newStdGen
-               Just (rnd,_) -> return rnd
-@@ -176,7 +176,6 @@
-                  , collected         = []
-                  , expectedFailure   = False
-                  , randomSeed        = rnd
--                 , isShrinking       = False
-                  , numSuccessShrinks = 0
-                  , numTryShrinks     = 0
-                  } (unGen (property p))
-@@ -207,8 +206,7 @@
-     runATest st f =
-       do
-         let size = computeSize st (numSuccessTests st) (numDiscardedTests st)
--        MkRose mres ts <- protectRose (unProp (f rnd1 size))
--        res <- mres
-+        MkRose res ts <- protectRose (return $ unProp (f rnd1 size))
-         callbackPostTest st res
-      
-         case ok res of
diff --git a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Instances.hs b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Instances.hs
deleted file mode 100644
index 542adf9bd649..000000000000
--- a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Instances.hs
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./src/Test/QuickCheck/Instances.hs.orig	2010-08-11 21:28:05.000000000 +0200
-+++ ./src/Test/QuickCheck/Instances.hs	2011-03-13 14:56:30.837261486 +0100
-@@ -36,12 +36,14 @@
- instance (CoArbitrary k, CoArbitrary v, Eq k, Ord k) => CoArbitrary (Map.Map k v) where
-     coarbitrary = coarbitrary . Map.keys
- 
-+{-
- instance Arbitrary Word8 where
-     arbitrary = sized $ \n -> choose (0, min (fromIntegral n) maxBound)
- 
- instance CoArbitrary Word8 where
-     coarbitrary n = variant (if n >= 0 then 2 * x else 2 * x + 1)
-                 where x = abs . fromIntegral $ n
-+-}
- 
- instance Random Word8 where
-     randomR (a, b) g = (\(x, y) -> (fromInteger x, y)) $