Unbreak, now that devel/hs-test-framework-hunit builds again.

This commit is contained in:
kili 2016-01-09 21:04:42 +00:00
parent fe77ef3ead
commit a6b565a388
3 changed files with 24 additions and 21 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2015/07/24 14:44:02 dcoppa Exp $
# $OpenBSD: Makefile,v 1.9 2016/01/09 21:04:42 kili Exp $
COMMENT = client library for the Redis datastore
@ -16,18 +16,20 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
MODGHC_PACKAGE_KEY = C6ZU1oAuddrEFizmiiy5cJ
MODGHC_SETUP_CONF_ARGS =--enable-tests
RUN_DEPENDS += textproc/hs-attoparsec>=0.11 \
devel/hs-BoundedChan>=1.0,<1.1 \
RUN_DEPENDS += textproc/hs-attoparsec>=0.12 \
devel/hs-BoundedChan>=1.0 \
textproc/hs-bytestring-lexing>=0.5 \
devel/hs-mtl>=2.0,<3.0 \
devel/hs-network>=2.0,<3.0 \
databases/hs-resource-pool>=0.2,<0.3 \
devel/hs-vector>=0.9,<0.11
devel/hs-network>=2.0 \
databases/hs-resource-pool>=0.2 \
devel/hs-vector>=0.9
BUILD_DEPENDS += ${RUN_DEPENDS} \
devel/hs-HUnit>=1.2,<1.3 \
devel/hs-HUnit>=1.2 \
devel/hs-test-framework \
devel/hs-test-framework-hunit

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-hedis_cabal,v 1.3 2015/07/24 14:44:02 dcoppa Exp $
$OpenBSD: patch-hedis_cabal,v 1.4 2016/01/09 21:04:42 kili Exp $
--- hedis.cabal.orig Sat Jul 18 11:51:21 2015
+++ hedis.cabal Sun Jul 19 16:59:08 2015
@@ -55,7 +55,7 @@ library
ghc-options: -Wall -fwarn-tabs
ghc-prof-options: -auto-all
exposed-modules: Database.Redis
- build-depends: attoparsec >= 0.12,
+ build-depends: attoparsec >= 0.11,
base >= 4.6 && < 5,
BoundedChan >= 1.0,
bytestring >= 0.9,
+++ hedis.cabal Sat Jan 9 21:45:13 2016
@@ -93,7 +93,7 @@ test-suite hedis-test
base == 4.*,
bytestring >= 0.9 && < 0.11,
hedis,
- HUnit == 1.2.*,
+ HUnit >= 1.2,
mtl == 2.*,
test-framework,
test-framework-hunit,

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2014/12/15 15:14:35 kili Exp $
@comment $OpenBSD: PLIST,v 1.3 2016/01/09 21:04:43 kili Exp $
@conflict hs-redis-*
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/Database/
@ -21,8 +21,9 @@ lib/ghc/${DISTNAME}/Database/Redis/Transactions.hi
lib/ghc/${DISTNAME}/Database/Redis/Transactions.p_hi
lib/ghc/${DISTNAME}/Database/Redis/Types.hi
lib/ghc/${DISTNAME}/Database/Redis/Types.p_hi
lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
lib/ghc/${DISTNAME}/libHS${DISTNAME}_p.a
lib/ghc/${DISTNAME}/HS${DISTNAME}-${MODGHC_PACKAGE_KEY}.o
lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}.a
lib/ghc/${DISTNAME}/libHS${DISTNAME}-${MODGHC_PACKAGE_KEY}_p.a
lib/ghc/${DISTNAME}/register.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/LICENSE