cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak dependencies, add hs-syb and bump.

Browse Source
This commit is contained in:
kili 2011-04-11 14:46:52 +00:00
parent ce5f31092f
commit 7eaa1be17f
7 changed files with 64 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devel/hs-pugs-compat/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2010/11/26 07:19:00 espie Exp $
# $OpenBSD: Makefile,v 1.7 2011/04/11 14:46:52 kili Exp $
COMMENT = portable Haskell/POSIX layer for Pugs
DISTNAME = pugs-compat-0.0.6.1
REVISION = 2
REVISION = 3
CATEGORIES = devel
# BSD3
@ -15,11 +15,12 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
LIB_DEPENDS = devel/hs-regex-base \
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/hs-regex-base \
devel/hs-regex-pcre-builtin \
devel/hs-network \
devel/hs-stm \
devel/hs-stringtable-atom>=0.0.6.1
RUN_DEPENDS = ${LIB_DEPENDS}
devel/hs-stringtable-atom>=0.0.6.1 \
devel/hs-syb
.include <bsd.port.mk>

17
devel/hs-pugs-compat/patches/patch-pugs-compat_cabal Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-pugs-compat_cabal,v 1.1 2011/04/11 14:46:52 kili Exp $
From upstream git repo.
--- pugs-compat.cabal.orig Wed Dec 16 14:47:04 2009
+++ pugs-compat.cabal Sun Dec 26 15:37:56 2010
@@ -16,8 +16,8 @@ Library
TypeSynonymInstances, FlexibleInstances, PatternGuards,
UndecidableInstances, FlexibleContexts, OverlappingInstances, TypeOperators
- Build-depends : base >=3 && < 4, haskell98, time, directory, process, regex-pcre-builtin, regex-base,
- random, network, containers, bytestring, array, mtl, stm, utf8-string,
+ Build-depends : base >=3 && < 5, haskell98, time, directory, process, regex-pcre-builtin, regex-base,
+ random, network, containers, bytestring, array, mtl, stm, syb, utf8-string,
stringtable-atom >= 0.0.6.1
Exposed-modules : Pugs.Compat
Other-modules : Pugs.Compat.Cast Pugs.Compat.Global Pugs.Compat.ID

15
devel/hs-pugs-compat/patches/patch-src_Pugs_Compat_Monads_hs Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_Pugs_Compat_Monads_hs,v 1.1 2011/04/11 14:46:52 kili Exp $
From upstream git repo.
--- src/Pugs/Compat/Monads.hs.orig Wed Dec 16 14:47:04 2009
+++ src/Pugs/Compat/Monads.hs Sun Apr 10 16:52:39 2011
@@ -87,7 +87,7 @@ maybeM :: (Traversable f, Monad m)
-> m (f b) -- ^ Monad containing (@Just@ /result/) or @Nothing@
maybeM f m = mapM m =<< f
-catchIO :: IO a -> (Control.Exception.Exception -> IO a) -> IO a
+catchIO :: Exception e => forall a. IO a -> (e -> IO a) -> IO a
catchIO = Control.Exception.catch
evaluateIO :: a -> IO a

12
devel/hs-pugs-compat/patches/patch-src_Pugs_Compat_hs Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_Pugs_Compat_hs,v 1.1 2011/04/11 14:46:52 kili Exp $
--- src/Pugs/Compat.hs.orig Wed Dec 16 14:47:04 2009
+++ src/Pugs/Compat.hs Sun Apr 10 20:32:34 2011
@@ -25,7 +25,7 @@ import Pugs.Compat.Regex as X
import Control.Concurrent as X
import Control.Concurrent.STM as X
-import Control.Exception as X (catchJust, errorCalls, Exception(..))
+import Control.Exception as X (catchJust, Exception(..))
import Control.Monad as X (replicateM, forM, forM_, MonadPlus(..), msum, liftM2, liftM3, guard, foldM, unless, liftM, filterM, join, when)
import Control.Monad.Error as X (MonadError(..), ErrorT(..), Error(..))
import Control.Monad.Fix as X (fix)

8
devel/hs-pugs-compat/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2010/10/28 13:51:47 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/04/11 14:46:52 kili Exp $
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/Pugs/
@ -29,6 +29,7 @@ share/doc/hs-${DISTNAME}/html/doc-index-61.html
share/doc/hs-${DISTNAME}/html/doc-index-92.html
share/doc/hs-${DISTNAME}/html/doc-index-95.html
share/doc/hs-${DISTNAME}/html/doc-index-A.html
share/doc/hs-${DISTNAME}/html/doc-index-All.html
share/doc/hs-${DISTNAME}/html/doc-index-B.html
share/doc/hs-${DISTNAME}/html/doc-index-C.html
share/doc/hs-${DISTNAME}/html/doc-index-D.html
@ -56,11 +57,12 @@ share/doc/hs-${DISTNAME}/html/doc-index-Z.html
share/doc/hs-${DISTNAME}/html/doc-index.html
share/doc/hs-${DISTNAME}/html/frames.html
share/doc/hs-${DISTNAME}/html/haddock-util.js
share/doc/hs-${DISTNAME}/html/haddock.css
share/doc/hs-${DISTNAME}/html/haskell_icon.gif
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
share/doc/hs-${DISTNAME}/html/mini_Pugs-Compat.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif
share/doc/hs-${DISTNAME}/html/pugs-compat.haddock
share/doc/hs-${DISTNAME}/html/synopsis.png

9
devel/hs-stringtable-atom/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2010/11/15 19:45:59 espie Exp $
# $OpenBSD: Makefile,v 1.6 2011/04/11 14:46:52 kili Exp $
COMMENT = memoize strings as atoms
DISTNAME = stringtable-atom-0.0.6.1
REVISION = 2
REVISION = 3
CATEGORIES = devel
# BSD3
@ -15,7 +15,8 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
LIB_DEPENDS = devel/hs-binary
RUN_DEPENDS = ${LIB_DEPENDS}
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/hs-binary \
devel/hs-syb
.include <bsd.port.mk>

7
devel/hs-stringtable-atom/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2010/10/28 13:51:47 jasper Exp $
@comment $OpenBSD: PLIST,v 1.3 2011/04/11 14:46:53 kili Exp $
lib/ghc/${DISTNAME}/
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/StringTable/
@ -19,13 +19,14 @@ share/doc/hs-${DISTNAME}/html/StringTable-AtomSet.html
share/doc/hs-${DISTNAME}/html/doc-index.html
share/doc/hs-${DISTNAME}/html/frames.html
share/doc/hs-${DISTNAME}/html/haddock-util.js
share/doc/hs-${DISTNAME}/html/haddock.css
share/doc/hs-${DISTNAME}/html/haskell_icon.gif
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
share/doc/hs-${DISTNAME}/html/mini_StringTable-Atom.html
share/doc/hs-${DISTNAME}/html/mini_StringTable-AtomMap.html
share/doc/hs-${DISTNAME}/html/mini_StringTable-AtomSet.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
share/doc/hs-${DISTNAME}/html/plus.gif
share/doc/hs-${DISTNAME}/html/stringtable-atom.haddock
share/doc/hs-${DISTNAME}/html/synopsis.png