aboutsummaryrefslogtreecommitdiff
path: root/devel/hs-testpack
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
committerGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
commit109269205e521bb1d2d87678a391e5adefff88d6 (patch)
tree93f1f9278a9a48902904b7ff4a5ce711c10efe08 /devel/hs-testpack
parentad7295cafd0e46ece6fcbf594ef39a767c296d0e (diff)
- Update The Glorious Glasgow Haskell Compiler to version 7.6.3
- Update Haskell Platform to version 2013.2.0.0 Please note that port revisions for all the Haskell ports without version changes are bumped. Some highlights of the update: - Fix PDF generation for pandoc [1] - From now on, PREFIX/{lib,share,share/doc}/cabal/ghc-GHC_VERSION are used for hs- ports (Cabal packages) as prefixes to avoid problems when upgrading with portmaster(8) [2] - Experimental support for LLVM-based code generation (disabled by default) - Many simplifications, refactoring in bsd.cabal.mk New ports (11): devel/hs-asn1-types 0.1.3 devel/hs-data-default-class 0.0.1 devel/hs-data-default-instances-base 0.0.1 devel/hs-data-default-instances-containers 0.0.1 devel/hs-data-default-instances-dlist 0.0.1 devel/hs-data-default-instances-old-locale 0.0.1 devel/hs-extensible-exceptions 0.1.1.4 devel/hs-mmorph 1.0.0 devel/hs-quickcheck-io 0.1.0 x11-toolkits/hs-GLURaw 1.3.0.0 x11-toolkits/hs-OpenGLRaw 1.3.0.0 Updated ports (104): archivers/hs-zlib 0.5.4.0_1 --> 0.5.4.1 databases/hs-persistent 1.1.5.1 --> 1.2.0.1 databases/hs-persistent-sqlite 1.1.5 --> 1.2.0 databases/hs-persistent-template 1.1.2.4 --> 1.2.0 devel/hs-HUnit 1.2.5.1_1 --> 1.2.5.2 devel/hs-IORefCAS 0.2_3 --> 0.2.0.1 devel/hs-MonadRandom 0.1.8 --> 0.1.9 devel/hs-QuickCheck 2.5.1.1_1 --> 2.6 devel/hs-abstract-deque 0.1.6_1 --> 0.2 devel/hs-alex 3.0.2_1 --> 3.0.5 devel/hs-async 2.0.1.3_1 --> 2.0.1.4 devel/hs-basic-prelude 0.3.4.0 --> 0.3.5.0 devel/hs-blaze-builder 0.3.1.0_4 --> 0.3.1.1 devel/hs-byteorder 1.0.3_4 --> 1.0.4 devel/hs-cabal-install 0.14.0_4 --> 1.16.0.2 devel/hs-classy-prelude 0.5.3 --> 0.5.7 devel/hs-cmdargs 0.10.2 --> 0.10.3 devel/hs-conduit 1.0.2 --> 1.0.5 devel/hs-data-default 0.5.0_1 --> 0.5.3 devel/hs-fsnotify 0.0.6 --> 0.0.11 devel/hs-generic-deriving 1.4.0 --> 1.5.0 devel/hs-git-annex 4.20130323_1 --> 4.20130601 devel/hs-haddock 2.11.0_1 --> 2.13.2 devel/hs-hashable 1.2.0.5 --> 1.1.2.5,1 devel/hs-hlint 1.8.43 --> 1.8.45 devel/hs-hspec 1.4.4 --> 1.5.4 devel/hs-hspec-expectations 0.3.0.3_1 --> 0.3.2 devel/hs-largeword 1.0.4 --> 1.0.5 devel/hs-lens 3.8.7.3 --> 3.9.0.2 devel/hs-lifted-base 0.2.0.2 --> 0.2.0.5 devel/hs-monad-control 0.3.1.4_1 --> 0.3.2.1 devel/hs-monad-logger 0.3.0.1 --> 0.3.1.1 devel/hs-monad-par 0.3.4.1 --> 0.3.4.2 devel/hs-pool-conduit 0.1.1_1 --> 0.1.2 devel/hs-profunctors 3.3 --> 3.3.0.1 devel/hs-reflection 1.1.7 --> 1.3.2 devel/hs-resourcet 0.4.5 --> 0.4.7.1 devel/hs-show 0.5 --> 0.6 devel/hs-split 0.2.1.1_1 --> 0.2.2 devel/hs-stm 2.4_1 --> 2.4.2 devel/hs-syb 0.3.7_1 --> 0.4.0 devel/hs-tagged 0.4.4_1 --> 0.6 devel/hs-text 0.11.2.3_1 --> 0.11.3.1 devel/hs-unix-compat 0.4.1.0 --> 0.4.1.1 devel/hs-unix-time 0.1.5 --> 0.1.8 devel/hs-unordered-containers 0.2.3.0 --> 0.2.3.1 devel/hs-utility-ht 0.0.8_3 --> 0.0.9 devel/hs-uuagc 0.9.42.2_3 --> 0.9.42.3 devel/hs-uuid 1.2.9 --> 1.2.13 devel/hs-void 0.5.11 --> 0.6 math/hs-NumInstances 1.2 --> 1.3 math/hs-comonad-transformers 3.0.1_1 --> 3.0.2 math/hs-semigroups 0.9 --> 0.9.1 math/hs-statistics 0.10.2.0_2 --> 0.10.3.1 net/hs-network 2.3.1.0_1 --> 2.4.1.2 net/hs-publicsuffixlist 0.0.3 --> 0.1 net/hs-socks 0.5.0 --> 0.5.1 security/hs-certificate 1.3.5_1 --> 1.3.7 security/hs-cipher-aes 0.1.7 --> 0.1.8 security/hs-clientsession 0.8.1_1 --> 0.9 security/hs-crypto-api 0.11 --> 0.12.1 security/hs-crypto-conduit 0.5.0 --> 0.5.2 security/hs-crypto-pubkey 0.1.2_1 --> 0.1.3 security/hs-crypto-pubkey-types 0.2.0_1 --> 0.3.2 security/hs-cryptocipher 0.4.0_1 --> 0.5.0 security/hs-cryptohash 0.8.3_1 --> 0.9.0 security/hs-skein 0.1.0.12 --> 1.0.3 textproc/hs-HaXml 1.23.3_2 --> 1.24 textproc/hs-attoparsec-conduit 1.0.0 --> 1.0.1 textproc/hs-blaze-html 0.6.0.0 --> 0.6.1.1 textproc/hs-blaze-markup 0.5.1.4 --> 0.5.1.5 textproc/hs-case-insensitive 1.0 --> 1.0.0.2 textproc/hs-highlighting-kate 0.5.3.8 --> 0.5.3.9 textproc/hs-hs-bibutils 4.17 --> 5.0 textproc/hs-polyparse 1.8_3 --> 1.9 textproc/hs-texmath 0.6.1.3 --> 0.6.1.5 textproc/hs-xml 1.3.12_4 --> 1.3.13 textproc/hs-yaml 0.8.2.3 --> 0.8.2.4 www/hs-HTTP 4000.2.5_1 --> 4000.2.8 www/hs-cgi 3001.1.7.4_6,1 --> 3001.1.7.5,1 www/hs-hamlet 1.1.6.3 --> 1.1.7.1 www/hs-happstack-server 7.1.7 --> 7.1.7.1 www/hs-heist 0.11.1 --> 0.12.0 www/hs-http-conduit 1.9.0 --> 1.9.3 www/hs-http-reverse-proxy 0.1.1.3 --> 0.1.1.6 www/hs-shakespeare 1.0.3.1 --> 1.0.5 www/hs-shakespeare-css 1.0.3 --> 1.0.5.1 www/hs-shakespeare-js 1.1.2.1 --> 1.1.4 www/hs-snap 0.11.2 --> 0.12.0 www/hs-wai-extra 1.3.2.4 --> 1.3.4 www/hs-wai-test 1.3.0.4 --> 1.3.1 www/hs-warp 1.3.7.4 --> 1.3.8.1 www/hs-yesod 1.1.9.2 --> 1.2.0.1 www/hs-yesod-auth 1.1.5.3 --> 1.2.0 www/hs-yesod-core 1.1.8.2 --> 1.2.0.4 www/hs-yesod-form 1.2.1.3 --> 1.3.0 www/hs-yesod-persistent 1.1.0.1_1 --> 1.2.0 www/hs-yesod-platform 1.1.8 --> 1.2.0.1 www/hs-yesod-routes 1.1.2 --> 1.2.0 www/hs-yesod-static 1.1.2.2 --> 1.2.0 www/hs-yesod-test 0.3.5 --> 1.2.0 x11-toolkits/hs-GLUT 2.1.2.1_7,1 --> 2.4.0.0,1 x11-toolkits/hs-OpenGL 2.2.3.1_4,1 --> 2.8.0.0,1 x11/hs-xmobar 0.16_2 --> 0.17 Removed ports (2): www/hs-yesod-default 1.1.3.2 www/hs-yesod-json 1.1.2.1 PR: ports/179146 [1] Requested by: Omar Thameen <omar@biglist.com> [1] Reported by: sperber, bapt [2] Tested by: sperber [2] Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=319894
Diffstat (limited to 'devel/hs-testpack')
-rw-r--r--devel/hs-testpack/Makefile4
-rw-r--r--devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs56
-rw-r--r--devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs22
-rw-r--r--devel/hs-testpack/files/patch-testpack.cabal4
4 files changed, 77 insertions, 9 deletions
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
index 8457e7319b3c..e83fa58c96cf 100644
--- a/devel/hs-testpack/Makefile
+++ b/devel/hs-testpack/Makefile
@@ -3,15 +3,13 @@
PORTNAME= testpack
PORTVERSION= 2.1.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Test Utility Pack for HUnit and QuickCheck
LICENSE= LGPL21
-FILE_LICENSE= COPYRIGHT
-
-CABAL_SETUP= Setup.hs
USE_CABAL= HUnit mtl QuickCheck>=2.1.0.3 random
diff --git a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
index 3bb1c4fa0204..c0bab41941e2 100644
--- a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
+++ b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
@@ -1,6 +1,18 @@
---- ./src/Test/HUnit/Tools.hs.orig 2012-02-28 23:20:32.000000000 +0100
-+++ ./src/Test/HUnit/Tools.hs 2012-10-04 00:04:08.000000000 +0200
-@@ -128,7 +128,11 @@
+--- ./src/Test/HUnit/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
++++ ./src/Test/HUnit/Tools.hs 2013-05-04 00:47:19.298796917 +0200
+@@ -22,7 +22,11 @@
+ import Test.QuickCheck.Gen
+ import Test.QuickCheck.State
+ import qualified Test.QuickCheck.Property as P
++#if MIN_VERSION_QuickCheck(2,6,0)
++import Test.QuickCheck.Property hiding (Result(reason), interrupted)
++#else
+ import Test.QuickCheck.Property hiding (Result(reason))
++#endif
+ import qualified Control.Exception
+ import qualified Test.HUnit as HU
+ import System.Random
+@@ -128,7 +132,11 @@
> q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
-}
qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
@@ -12,7 +24,23 @@
{- | Run verbose tests. Example:
-@@ -174,7 +178,11 @@
+@@ -163,18 +171,26 @@
+ -- | 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
++#if MIN_VERSION_QuickCheck(2,6,0)
++ (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
++#else
++ do
+ #if MIN_VERSION_QuickCheck(2,3,0)
+ tm <- if chatty args then newStdioTerminal else newNullTerminal
+ #else
+ tm <- newTerminal
+ #endif
++#endif
+ rnd <- case replay args of
+ Nothing -> newStdGen
Just (rnd,_) -> return rnd
test MkState{ terminal = tm
, maxSuccessTests = maxSuccess args
@@ -24,3 +52,23 @@
, computeSize = case replay args of
Nothing -> \n d -> (n * maxSize args)
`div` maxSuccess args
+@@ -190,6 +206,10 @@
+ #endif
+ , numSuccessShrinks = 0
+ , numTryShrinks = 0
++#if MIN_VERSION_QuickCheck(2,6,0)
++ , numRecentlyDiscardedTests = 0
++ , numTotTryShrinks = 0
++#endif
+ } (unGen (property p))
+ where
+ --------------------------------------------------------------------------
+@@ -288,5 +308,8 @@
+ , numShrinks = numShrinks
+ , output = theOutput
+ #endif
++#if MIN_VERSION_QuickCheck(2,6,0)
++ , interrupted = False
++#endif
+ }
+ where (rnd1,rnd2) = split (randomSeed st)
diff --git a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
new file mode 100644
index 000000000000..446d7dfc5e98
--- /dev/null
+++ b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
@@ -0,0 +1,22 @@
+--- ./src/Test/QuickCheck/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
++++ ./src/Test/QuickCheck/Tools.hs 2013-05-04 00:42:02.274698941 +0200
+@@ -23,14 +23,18 @@
+
+ )
+ where
++#if MIN_VERSION_QuickCheck(2,6,0)
++import Test.QuickCheck hiding (Result, reason, interrupted)
++#else
+ import Test.QuickCheck hiding (Result, reason)
++#endif
+ import Test.QuickCheck.Property
+
+ {- | Compare two values. If same, the test passes. If different, the result indicates
+ what was expected and what was received as part of the error. -}
+ (@=?) :: (Eq a, Show a) => a -> a -> Result
+ expected @=? actual =
+- MkResult {ok = Just (expected == actual),
++ result { ok = Just (expected == actual),
+ expect = True, interrupted = False,
+ reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
+ stamp = [], callbacks = []}
diff --git a/devel/hs-testpack/files/patch-testpack.cabal b/devel/hs-testpack/files/patch-testpack.cabal
index f349491c00c9..ad3736aabe80 100644
--- a/devel/hs-testpack/files/patch-testpack.cabal
+++ b/devel/hs-testpack/files/patch-testpack.cabal
@@ -1,11 +1,11 @@
--- ./testpack.cabal.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./testpack.cabal 2013-03-09 17:54:39.000000000 +0100
++++ ./testpack.cabal 2013-05-04 00:08:00.417315359 +0200
@@ -39,7 +39,7 @@
Build-Depends: base >= 3 && < 5,
mtl, HUnit,
- QuickCheck >= 2.1.0.3 && < 2.5
-+ QuickCheck >= 2.1.0.3 && < 2.6
++ QuickCheck >= 2.1.0.3 && < 2.7
If flag(splitBase)
Build-Depends: base >= 3 && < 5, containers, random
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-06 11:06:28 +0000