diff options
Diffstat (limited to 'devel')
94 files changed, 591 insertions, 48 deletions
diff --git a/devel/Makefile b/devel/Makefile index fedeaefcb25c..e1536be9d62c 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -582,6 +582,8 @@ SUBDIR += hs-ConfigFile SUBDIR += hs-DeepArrow SUBDIR += hs-HUnit + SUBDIR += hs-IORefCAS + SUBDIR += hs-IfElse SUBDIR += hs-MaybeT SUBDIR += hs-MemoTrie SUBDIR += hs-MissingH @@ -594,6 +596,8 @@ SUBDIR += hs-Stream SUBDIR += hs-Tensor SUBDIR += hs-TypeCompose + SUBDIR += hs-abstract-deque + SUBDIR += hs-abstract-par SUBDIR += hs-alex SUBDIR += hs-ansi-terminal SUBDIR += hs-ansi-wl-pprint @@ -603,10 +607,12 @@ SUBDIR += hs-base-unicode-symbols SUBDIR += hs-base16-bytestring SUBDIR += hs-base64-bytestring - SUBDIR += hs-binary + SUBDIR += hs-bits-atomic SUBDIR += hs-blaze-builder + SUBDIR += hs-blaze-builder-conduit SUBDIR += hs-blaze-builder-enumerator SUBDIR += hs-blaze-textual + SUBDIR += hs-bloomfilter SUBDIR += hs-bsd-sysctl SUBDIR += hs-byteorder SUBDIR += hs-bytestring-nums @@ -615,20 +621,17 @@ SUBDIR += hs-cereal SUBDIR += hs-checkers SUBDIR += hs-cmdargs + SUBDIR += hs-conduit SUBDIR += hs-configurator - SUBDIR += hs-control-monad-attempt SUBDIR += hs-convertible - SUBDIR += hs-convertible-text SUBDIR += hs-cpphs SUBDIR += hs-darcs SUBDIR += hs-data-default - SUBDIR += hs-data-object - SUBDIR += hs-data-object-yaml SUBDIR += hs-datetime - SUBDIR += hs-deepseq SUBDIR += hs-directory-tree SUBDIR += hs-dlist SUBDIR += hs-drift + SUBDIR += hs-edit-distance SUBDIR += hs-enumerator SUBDIR += hs-failure SUBDIR += hs-fast-logger @@ -639,14 +642,12 @@ SUBDIR += hs-ghc-events SUBDIR += hs-ghc-mtl SUBDIR += hs-ghc-paths - SUBDIR += hs-ghc-paths-docs SUBDIR += hs-gio SUBDIR += hs-git-annex SUBDIR += hs-glade SUBDIR += hs-glib SUBDIR += hs-gtk2hs-buildtools SUBDIR += hs-haddock - SUBDIR += hs-haddock-docs SUBDIR += hs-happy SUBDIR += hs-hashable SUBDIR += hs-hashed-storage @@ -671,17 +672,20 @@ SUBDIR += hs-mmap SUBDIR += hs-monad-control SUBDIR += hs-monad-par + SUBDIR += hs-monad-par-extras SUBDIR += hs-mtl - SUBDIR += hs-mtl-docs SUBDIR += hs-mueval SUBDIR += hs-murmur-hash SUBDIR += hs-parallel SUBDIR += hs-pcre-light - SUBDIR += hs-pool + SUBDIR += hs-pool-conduit SUBDIR += hs-primitive + SUBDIR += hs-random SUBDIR += hs-ranges SUBDIR += hs-reactive SUBDIR += hs-readline + SUBDIR += hs-resource-pool + SUBDIR += hs-resourcet SUBDIR += hs-safe SUBDIR += hs-show SUBDIR += hs-smallcheck @@ -691,7 +695,9 @@ SUBDIR += hs-syb SUBDIR += hs-syb-with-class SUBDIR += hs-syb-with-class-instances-text + SUBDIR += hs-system-filepath SUBDIR += hs-tagged + SUBDIR += hs-temporary SUBDIR += hs-terminfo SUBDIR += hs-test-framework SUBDIR += hs-test-framework-hunit @@ -701,7 +707,6 @@ SUBDIR += hs-threadscope SUBDIR += hs-transformers SUBDIR += hs-transformers-base - SUBDIR += hs-transformers-docs SUBDIR += hs-unamb SUBDIR += hs-uniplate SUBDIR += hs-unix-compat @@ -712,6 +717,7 @@ SUBDIR += hs-uuagc-bootstrap SUBDIR += hs-uuagc-cabal SUBDIR += hs-uulib + SUBDIR += hs-vault SUBDIR += hs-vector SUBDIR += hs-vector-algorithms SUBDIR += hs-void diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile index 53e2538f4d8b..f966141724d2 100644 --- a/devel/hs-BNFC/Makefile +++ b/devel/hs-BNFC/Makefile @@ -7,7 +7,7 @@ PORTNAME= BNFC PORTVERSION= 2.4.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= kaiw27@gmail.com @@ -21,5 +21,7 @@ USE_CABAL= mtl STANDALONE= yes EXECUTABLE= bnfc +HASKELL98= yes + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-BNFC/files/patch-Main.hs b/devel/hs-BNFC/files/patch-Main.hs new file mode 100644 index 000000000000..cf13337bafea --- /dev/null +++ b/devel/hs-BNFC/files/patch-Main.hs @@ -0,0 +1,13 @@ +--- Main.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ Main.hs 2012-05-13 12:32:42.198463500 +0200 +@@ -41,8 +41,9 @@ + + import MultiView (preprocessMCF, mkTestMulti, mkMakefileMulti) + +-import System + import System.Exit ++import System.Environment ++import System.Process + import Char + import Data.List (elemIndex) + diff --git a/devel/hs-BNFC/files/patch-MultiView.hs b/devel/hs-BNFC/files/patch-MultiView.hs new file mode 100644 index 000000000000..75b3553e4268 --- /dev/null +++ b/devel/hs-BNFC/files/patch-MultiView.hs @@ -0,0 +1,11 @@ +--- ./MultiView.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./MultiView.hs 2012-05-12 22:16:41.000000000 +0200 +@@ -109,7 +109,7 @@ + ["import qualified Print" ++ cnc | cnc <- cncs] ++ + ["import Abs" ++ abs, + "import ErrM", +- "import System (getArgs)", ++ "import System.Environment (getArgs)", + "", + "main :: IO ()", + "main = do", diff --git a/devel/hs-BNFC/files/patch-formats__c-sharp__CSharpTop.hs b/devel/hs-BNFC/files/patch-formats__c-sharp__CSharpTop.hs new file mode 100644 index 000000000000..f2b9c8a8a692 --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__c-sharp__CSharpTop.hs @@ -0,0 +1,15 @@ +--- ./formats/c-sharp/CSharpTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/c-sharp/CSharpTop.hs 2012-05-13 12:13:16.373594632 +0200 +@@ -48,10 +48,10 @@ + import CFtoCSharpPrinter + import CFtoLatex + import CSharpUtils +-import System + import GetCF + import Char +-import System ++import System.Exit ++import System.Environment + import System.Directory + import System.IO + import System.Process diff --git a/devel/hs-BNFC/files/patch-formats__c__CTop.hs b/devel/hs-BNFC/files/patch-formats__c__CTop.hs new file mode 100644 index 000000000000..f982833d911b --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__c__CTop.hs @@ -0,0 +1,14 @@ +--- ./formats/c/CTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/c/CTop.hs 2012-05-13 12:06:24.160466196 +0200 +@@ -26,10 +26,9 @@ + import CFtoCSkel + import CFtoCPrinter + import CFtoLatex +--- import System + import GetCF + import Char +-import System ++import System.Exit + + makeC :: Bool -> String -> FilePath -> IO () + makeC make name file = do diff --git a/devel/hs-BNFC/files/patch-formats__cpp__CPPTop.hs b/devel/hs-BNFC/files/patch-formats__cpp__CPPTop.hs new file mode 100644 index 000000000000..9dc51c894329 --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__cpp__CPPTop.hs @@ -0,0 +1,14 @@ +--- ./formats/cpp/CPPTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/cpp/CPPTop.hs 2012-05-13 12:14:55.788469382 +0200 +@@ -27,10 +27,9 @@ + import CFtoCVisitSkel + import CFtoCPPPrinter + import CFtoLatex +-import System + import GetCF + import Char +-import System ++import System.Exit + + makeCPP :: Bool -> String -> FilePath -> IO () + makeCPP make name file = do diff --git a/devel/hs-BNFC/files/patch-formats__cpp_stl__STLTop.hs b/devel/hs-BNFC/files/patch-formats__cpp_stl__STLTop.hs new file mode 100644 index 000000000000..a8f030e9385b --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__cpp_stl__STLTop.hs @@ -0,0 +1,14 @@ +--- ./formats/cpp_stl/STLTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/cpp_stl/STLTop.hs 2012-05-13 12:10:03.269465642 +0200 +@@ -29,10 +29,9 @@ + import CFtoCVisitSkelSTL + import CFtoSTLPrinter + import CFtoLatex +-import System + import GetCF + import Char +-import System ++import System.Exit + import STLUtils + + makeSTL :: Bool -> Bool -> Maybe String -> String -> FilePath -> IO () diff --git a/devel/hs-BNFC/files/patch-formats__f-sharp__FSharpTop.hs b/devel/hs-BNFC/files/patch-formats__f-sharp__FSharpTop.hs new file mode 100644 index 000000000000..f9bbbea1fb25 --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__f-sharp__FSharpTop.hs @@ -0,0 +1,14 @@ +--- ./formats/f-sharp/FSharpTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/f-sharp/FSharpTop.hs 2012-05-12 23:50:50.000000000 +0200 +@@ -35,10 +35,9 @@ + import CFtoXML + import GetCF + import Utils +- ++import System.Exit + import Char + import Data.Maybe (fromMaybe,maybe) +-import System + import Monad(when) + + -- naming conventions diff --git a/devel/hs-BNFC/files/patch-formats__haskell-gadt__HaskellTopGADT.hs b/devel/hs-BNFC/files/patch-formats__haskell-gadt__HaskellTopGADT.hs new file mode 100644 index 000000000000..44716c8c428c --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__haskell-gadt__HaskellTopGADT.hs @@ -0,0 +1,29 @@ +--- ./formats/haskell-gadt/HaskellTopGADT.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/haskell-gadt/HaskellTopGADT.hs 2012-05-13 12:27:10.838459849 +0200 +@@ -42,7 +42,7 @@ +
+ import Char
+ import Data.Maybe (fromMaybe,maybe)
+-import System
++import System.Exit
+ import Monad(when)
+
+ -- naming conventions
+@@ -231,7 +231,7 @@ + ["-- automatically generated by BNF Converter",
+ "module Main where\n",
+ "",
+- "import IO ( stdin, hGetContents )",
++ "import System.IO.Error ( stdin, hGetContents )",
+ "import System ( getArgs, getProgName )",
+ "",
+ "import " ++ alexFileM opts,
+@@ -242,7 +242,7 @@ + if lay then ("import " ++ layoutFileM opts) else "",
+ if use_xml then ("import " ++ xmlFileM opts) else "",
+ if_glr "import Data.FiniteMap(FiniteMap, lookupFM, fmToList)",
+- if_glr "import Maybe(fromJust)",
++ if_glr "import Data.Maybe(fromJust)",
+ "import " ++ errFileM opts,
+ "",
+ if use_glr
diff --git a/devel/hs-BNFC/files/patch-formats__haskell2__HaskellTop.hs b/devel/hs-BNFC/files/patch-formats__haskell2__HaskellTop.hs new file mode 100644 index 000000000000..612fdf92a196 --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__haskell2__HaskellTop.hs @@ -0,0 +1,31 @@ +--- ./formats/haskell2/HaskellTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/haskell2/HaskellTop.hs 2012-05-13 12:29:09.892465893 +0200 +@@ -42,7 +42,7 @@ +
+ import Char
+ import Data.Maybe (fromMaybe,maybe)
+-import System
++import System.Exit
+ import Monad(when)
+
+ -- naming conventions
+@@ -235,8 +235,8 @@ + ["-- automatically generated by BNF Converter",
+ "module Main where\n",
+ "",
+- "import IO ( stdin, hGetContents )",
+- "import System ( getArgs, getProgName )",
++ "import System.IO ( stdin, hGetContents )",
++ "import System.Environment ( getArgs, getProgName )",
+ "",
+ "import " ++ alexFileM opts,
+ "import " ++ happyFileM opts,
+@@ -246,7 +246,7 @@ + if lay then ("import " ++ layoutFileM opts) else "",
+ if use_xml then ("import " ++ xmlFileM opts) else "",
+ if_glr "import Data.FiniteMap(FiniteMap, lookupFM, fmToList)",
+- if_glr "import Maybe(fromJust)",
++ if_glr "import Data.Maybe(fromJust)",
+ "import " ++ errFileM opts,
+ "",
+ if use_glr
diff --git a/devel/hs-BNFC/files/patch-formats__java1.5__JavaTop15.hs b/devel/hs-BNFC/files/patch-formats__java1.5__JavaTop15.hs new file mode 100644 index 000000000000..9876a272e7ae --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__java1.5__JavaTop15.hs @@ -0,0 +1,20 @@ +--- ./formats/java1.5/JavaTop15.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/java1.5/JavaTop15.hs 2012-05-13 12:20:30.194507156 +0200 +@@ -39,7 +39,7 @@ + -- Dependencies. + ------------------------------------------------------------------- + import Directory ( createDirectory ) +-import IO ( try, isAlreadyExistsError ) ++import System.IO.Error ( try, isAlreadyExistsError ) + + import Utils + import CF +@@ -54,7 +54,7 @@ + import CFtoFoldVisitor + import CFtoAllVisitor + import CFtoLatex +-import System ++import System.Exit + import GetCF ( tryReadCF, writeFileRep ) + import Char + import List(intersperse) diff --git a/devel/hs-BNFC/files/patch-formats__java__JavaTop.hs b/devel/hs-BNFC/files/patch-formats__java__JavaTop.hs new file mode 100644 index 000000000000..7bcf7de66d57 --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__java__JavaTop.hs @@ -0,0 +1,20 @@ +--- ./formats/java/JavaTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/java/JavaTop.hs 2012-05-13 12:22:38.512466534 +0200 +@@ -38,7 +38,7 @@ + -- Dependencies. + ------------------------------------------------------------------- + import Directory ( createDirectory ) +-import IO ( try, isAlreadyExistsError ) ++import System.IO.Error ( try, isAlreadyExistsError ) + + import Utils + import CF +@@ -49,7 +49,7 @@ + import CFtoJavaSkeleton + import CFtoVisitSkel + import CFtoLatex +-import System ++import System.Exit + import GetCF ( tryReadCF, writeFileRep ) + import Char + import List(intersperse) diff --git a/devel/hs-BNFC/files/patch-formats__ocaml__OCamlTop.hs b/devel/hs-BNFC/files/patch-formats__ocaml__OCamlTop.hs new file mode 100644 index 000000000000..bfa4c9c7adaa --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__ocaml__OCamlTop.hs @@ -0,0 +1,11 @@ +--- ./formats/ocaml/OCamlTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/ocaml/OCamlTop.hs 2012-05-13 12:04:23.291467169 +0200 +@@ -37,7 +37,7 @@ + + import Char + import Data.Maybe (fromMaybe,maybe) +-import System ++import System.Exit + import Monad(when) + + -- naming conventions diff --git a/devel/hs-BNFC/files/patch-formats__profile__ProfileTop.hs b/devel/hs-BNFC/files/patch-formats__profile__ProfileTop.hs new file mode 100644 index 000000000000..56003177cc93 --- /dev/null +++ b/devel/hs-BNFC/files/patch-formats__profile__ProfileTop.hs @@ -0,0 +1,22 @@ +--- ./formats/profile/ProfileTop.hs.orig 2010-09-15 16:26:38.000000000 +0200 ++++ ./formats/profile/ProfileTop.hs 2012-05-13 12:25:17.510460618 +0200 +@@ -37,7 +37,7 @@ + import Utils + + import Char +-import System ++import System.Exit + import Monad(when) + + -- naming conventions +@@ -184,8 +184,8 @@ + "", + "import Trees", + "import Profile", +- "import IO ( stdin, hGetContents )", +- "import System ( getArgs, getProgName )", ++ "import System.IO ( stdin, hGetContents )", ++ "import System.Environment ( getArgs, getProgName )", + "", + "import " ++ alexFileM inDir name, + "import " ++ happyFileM inDir name, diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile index f91e5f7f06a7..eaa1f8b40129 100644 --- a/devel/hs-Boolean/Makefile +++ b/devel/hs-Boolean/Makefile @@ -7,7 +7,7 @@ PORTNAME= Boolean PORTVERSION= 0.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile index 8c5813b11ce7..19e3cbf56d0b 100644 --- a/devel/hs-ConfigFile/Makefile +++ b/devel/hs-ConfigFile/Makefile @@ -7,6 +7,7 @@ PORTNAME= ConfigFile PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-DeepArrow/Makefile b/devel/hs-DeepArrow/Makefile index b660ae03f9b4..5e4a0e4a0e1e 100644 --- a/devel/hs-DeepArrow/Makefile +++ b/devel/hs-DeepArrow/Makefile @@ -7,6 +7,7 @@ PORTNAME= DeepArrow PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile index 66f82ab3ca9a..b065901b1891 100644 --- a/devel/hs-HUnit/Makefile +++ b/devel/hs-HUnit/Makefile @@ -7,6 +7,7 @@ PORTNAME= HUnit PORTVERSION= 1.2.4.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-MaybeT/Makefile index c9be3e7cd61e..37544d7bf837 100644 --- a/devel/hs-MaybeT/Makefile +++ b/devel/hs-MaybeT/Makefile @@ -7,6 +7,7 @@ PORTNAME= MaybeT PORTVERSION= 0.1.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile index a4ec1f89c43b..eeff1d106d32 100644 --- a/devel/hs-MissingH/Makefile +++ b/devel/hs-MissingH/Makefile @@ -7,6 +7,7 @@ PORTNAME= MissingH PORTVERSION= 1.1.1.0 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -15,7 +16,7 @@ COMMENT= Large Haskell utility library LICENSE= BSD CABAL_SETUP= Setup.hs -USE_CABAL= hslogger HUnit mtl network parsec regex-compat +USE_CABAL= hslogger HUnit mtl network parsec random regex-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile index 7eb12e0a3681..40cccc111e14 100644 --- a/devel/hs-MonadCatchIO-mtl/Makefile +++ b/devel/hs-MonadCatchIO-mtl/Makefile @@ -7,7 +7,7 @@ PORTNAME= MonadCatchIO-mtl PORTVERSION= 0.3.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile index bbcf20192ab2..fc6245c39fb5 100644 --- a/devel/hs-ObjectName/Makefile +++ b/devel/hs-ObjectName/Makefile @@ -7,7 +7,7 @@ PORTNAME= ObjectName PORTVERSION= 1.0.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile index aca9c1317107..e9482019bf29 100644 --- a/devel/hs-PSQueue/Makefile +++ b/devel/hs-PSQueue/Makefile @@ -7,7 +7,7 @@ PORTNAME= PSQueue PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile index 3eb281f06ec6..c7e92276ecef 100644 --- a/devel/hs-StateVar/Makefile +++ b/devel/hs-StateVar/Makefile @@ -7,7 +7,7 @@ PORTNAME= StateVar PORTVERSION= 1.0.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile index 2c45dbe2db50..b6c55815b2d6 100644 --- a/devel/hs-Stream/Makefile +++ b/devel/hs-Stream/Makefile @@ -6,6 +6,7 @@ PORTNAME= Stream PORTVERSION= 0.4.6 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-Tensor/Makefile b/devel/hs-Tensor/Makefile index 76fe24232c8f..0367f896c479 100644 --- a/devel/hs-Tensor/Makefile +++ b/devel/hs-Tensor/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tensor PORTVERSION= 1.0.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile index b0ecb08531a5..225c548e5925 100644 --- a/devel/hs-TypeCompose/Makefile +++ b/devel/hs-TypeCompose/Makefile @@ -7,6 +7,7 @@ PORTNAME= TypeCompose PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile index 6a1ce2c99014..cb0dd3aef4b1 100644 --- a/devel/hs-ansi-terminal/Makefile +++ b/devel/hs-ansi-terminal/Makefile @@ -7,7 +7,7 @@ PORTNAME= ansi-terminal PORTVERSION= 0.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile index 92efbd498baf..0a417b7d7202 100644 --- a/devel/hs-ansi-wl-pprint/Makefile +++ b/devel/hs-ansi-wl-pprint/Makefile @@ -7,6 +7,7 @@ PORTNAME= ansi-wl-pprint PORTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile index eeb0f61ffb68..c206e172dec7 100644 --- a/devel/hs-arrows/Makefile +++ b/devel/hs-arrows/Makefile @@ -7,7 +7,7 @@ PORTNAME= arrows PORTVERSION= 0.4.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile index dee02e2fd174..124e57d518c5 100644 --- a/devel/hs-base-unicode-symbols/Makefile +++ b/devel/hs-base-unicode-symbols/Makefile @@ -7,6 +7,7 @@ PORTNAME= base-unicode-symbols PORTVERSION= 0.2.2.3 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile index c47423cfaffd..d0acf537de1a 100644 --- a/devel/hs-base16-bytestring/Makefile +++ b/devel/hs-base16-bytestring/Makefile @@ -7,6 +7,7 @@ PORTNAME= base16-bytestring PORTVERSION= 0.1.1.4 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile index 2d50ad6dbc1b..e1f0781df4fb 100644 --- a/devel/hs-blaze-builder/Makefile +++ b/devel/hs-blaze-builder/Makefile @@ -7,6 +7,7 @@ PORTNAME= blaze-builder PORTVERSION= 0.3.1.0 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile index 8d017cb232c0..baf4a7e26e41 100644 --- a/devel/hs-blaze-textual/Makefile +++ b/devel/hs-blaze-textual/Makefile @@ -7,6 +7,7 @@ PORTNAME= blaze-textual PORTVERSION= 0.2.0.6 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile index 996627e32e39..b8b34ba2423c 100644 --- a/devel/hs-byteorder/Makefile +++ b/devel/hs-byteorder/Makefile @@ -7,6 +7,7 @@ PORTNAME= byteorder PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile index 668767ea08f3..40367e519512 100644 --- a/devel/hs-bytestring-nums/Makefile +++ b/devel/hs-bytestring-nums/Makefile @@ -7,6 +7,7 @@ PORTNAME= bytestring-nums PORTVERSION= 0.3.5 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile index ecdbfc088f8e..9c72b32ad71c 100644 --- a/devel/hs-c2hs/Makefile +++ b/devel/hs-c2hs/Makefile @@ -7,7 +7,7 @@ PORTNAME= c2hs PORTVERSION= 0.16.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile index dc747164403d..3d7f0a18fbcd 100644 --- a/devel/hs-cereal/Makefile +++ b/devel/hs-cereal/Makefile @@ -7,6 +7,7 @@ PORTNAME= cereal PORTVERSION= 0.3.5.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile index 87230a539f7e..609ed68f3501 100644 --- a/devel/hs-configurator/Makefile +++ b/devel/hs-configurator/Makefile @@ -7,6 +7,7 @@ PORTNAME= configurator PORTVERSION= 0.2.0.0 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile index d18355ee7b4d..3746f3dd4435 100644 --- a/devel/hs-datetime/Makefile +++ b/devel/hs-datetime/Makefile @@ -7,7 +7,7 @@ PORTNAME= datetime PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile index 4ed558dc5189..e42853a5d312 100644 --- a/devel/hs-directory-tree/Makefile +++ b/devel/hs-directory-tree/Makefile @@ -7,7 +7,7 @@ PORTNAME= directory-tree PORTVERSION= 0.10.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile index 19ea8c3126fa..2239d78492d5 100644 --- a/devel/hs-dlist/Makefile +++ b/devel/hs-dlist/Makefile @@ -6,7 +6,7 @@ PORTNAME= dlist PORTVERSION= 0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-drift/Makefile b/devel/hs-drift/Makefile index dcd8d007c6ad..fe536673e096 100644 --- a/devel/hs-drift/Makefile +++ b/devel/hs-drift/Makefile @@ -6,7 +6,7 @@ PORTNAME= drift PORTVERSION= 2.2.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MASTER_SITES= http://repetae.net/computer/haskell/DrIFT/drop/ PKGNAMEPREFIX= hs- @@ -21,7 +21,8 @@ OPTIONS= NHC98 "Build with nhc98" off \ .include <bsd.port.pre.mk> .if !defined(WITH_NHC98) -BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc +BUILD_DEPENDS= ghc:${PORTSDIR}/lang/ghc \ + hs-random>=0:${PORTSDIR}/devel/hs-random LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp .else BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98 @@ -46,6 +47,20 @@ pre-everything:: @${ECHO} " DrIFT will be build with ghc" @${ECHO} " Define WITH_NHC98 to build with nhc98." @${ECHO} "" + +.else +post-patch: + @${REINPLACE_CMD} 's|import List|import Data.List| ; \ + s|import Char|import Data.Char| ; \ + s|import Monad|import Control.Monad| ; \ + s|import IO|import System.IO.Error| ; \ + s|import Directory|import System.Directory| ; \ + s|import Maybe|import Data.Maybe| ; \ + s|import Array|import Data.Array| ; \ + s|import Time|import System.Time| ; \ + s|import Random|import System.Random| ; \ + s|import System[^\.]|import System.Exit|' \ + `${FIND} ${WRKSRC} -name '*.*hs'` .endif .include <bsd.port.post.mk> diff --git a/devel/hs-drift/files/patch-src__ChaseImports.hs b/devel/hs-drift/files/patch-src__ChaseImports.hs new file mode 100644 index 000000000000..61ae0b6c59fa --- /dev/null +++ b/devel/hs-drift/files/patch-src__ChaseImports.hs @@ -0,0 +1,11 @@ +--- ./src/ChaseImports.hs.orig 2008-02-10 15:38:31.000000000 +0100 ++++ ./src/ChaseImports.hs 2012-05-13 11:51:52.000000000 +0200 +@@ -24,7 +24,7 @@ + import DataP + import CommandP + import ParseLib2 +-import System ++import System.Environment + import List + import qualified Unlit + import Monad diff --git a/devel/hs-drift/files/patch-src__DrIFT.hs b/devel/hs-drift/files/patch-src__DrIFT.hs new file mode 100644 index 000000000000..0bf97251f098 --- /dev/null +++ b/devel/hs-drift/files/patch-src__DrIFT.hs @@ -0,0 +1,21 @@ +--- ./src/DrIFT.hs.orig 2008-02-10 15:38:31.000000000 +0100 ++++ ./src/DrIFT.hs 2012-05-13 11:52:13.000000000 +0200 +@@ -17,7 +17,8 @@ + import RuleUtils(Rule,Tag) + import Version + import qualified Rules(rules) +-import qualified System ++import qualified System.Environment ++import System.IO + + data Op = OpList | OpDerive | OpVersion + +@@ -78,7 +79,7 @@ + + header = "Usage: DrIFT [OPTION...] file" + main = do +- argv <- System.getArgs ++ argv <- System.Environment.getArgs + (env,n) <- case (getOpt Permute options argv) of + (as,n,[]) -> return (foldr ($) env as ,n) + (_,_,errs) -> putErrDie (concat errs ++ usageInfo header options) diff --git a/devel/hs-drift/files/patch-src__GenUtil.hs b/devel/hs-drift/files/patch-src__GenUtil.hs new file mode 100644 index 000000000000..28989419a789 --- /dev/null +++ b/devel/hs-drift/files/patch-src__GenUtil.hs @@ -0,0 +1,78 @@ +--- ./src/GenUtil.hs.orig 2008-02-10 15:38:31.000000000 +0100 ++++ ./src/GenUtil.hs 2012-05-13 11:53:22.000000000 +0200 +@@ -39,7 +39,7 @@ + -- ** Simple deconstruction + fromLeft,fromRight,fsts,snds,splitEither,rights,lefts, + -- ** System routines +- exitSuccess, System.exitFailure, epoch, lookupEnv,endOfTime, ++ exitSuccess, System.Exit.exitFailure, epoch, lookupEnv,endOfTime, + -- ** Random routines + repMaybe, + liftT2, liftT3, liftT4, +@@ -94,9 +94,11 @@ + import Char(isAlphaNum, isSpace, toLower, ord) + import List(group,sort) + import List(intersperse, sortBy, groupBy) +-import Monad +-import qualified IO +-import qualified System ++import Monad hiding (replicateM, replicateM_) ++import qualified System.IO ++import qualified System.IO.Error ++import qualified System.Exit ++import qualified System.Environment + import Random(StdGen, newStdGen, Random(randomR)) + import Time + +@@ -127,7 +129,7 @@ + + -- | write string to standard error + putErr :: String -> IO () +-putErr = IO.hPutStr IO.stderr ++putErr = System.IO.hPutStr System.IO.stderr + + -- | write string and newline to standard error + putErrLn :: String -> IO () +@@ -137,13 +139,13 @@ + -- | write string and newline to standard error, + -- then exit program with failure. + putErrDie :: String -> IO a +-putErrDie s = putErrLn s >> System.exitFailure ++putErrDie s = putErrLn s >> System.Exit.exitFailure + + + -- | exit program successfully. 'exitFailure' is + -- also exported from System. + exitSuccess :: IO a +-exitSuccess = System.exitWith System.ExitSuccess ++exitSuccess = System.Exit.exitWith System.Exit.ExitSuccess + + + {-# INLINE fromRight #-} +@@ -381,7 +383,7 @@ + -- | looks up an enviornment variable and returns it in a 'MonadPlus' rather + -- than raising an exception if the variable is not set. + lookupEnv :: MonadPlus m => String -> IO (m String) +-lookupEnv s = catch (fmap return $ System.getEnv s) (\e -> if IO.isDoesNotExistError e then return mzero else ioError e) ++lookupEnv s = catch (fmap return $ System.Environment.getEnv s) (\e -> if System.IO.Error.isDoesNotExistError e then return mzero else ioError e) + + {-# SPECIALIZE fmapLeft :: (a -> c) -> [(Either a b)] -> [(Either c b)] #-} + fmapLeft :: Functor f => (a -> c) -> f (Either a b) -> f (Either c b) +@@ -482,7 +484,7 @@ + _ `overlaps` _ = True + + -- | translate a number of seconds to a string representing the duration expressed. +-showDuration :: Integral a => a -> String ++showDuration :: (Show a, Integral a) => a -> String + showDuration x = st "d" dayI ++ st "h" hourI ++ st "m" minI ++ show secI ++ "s" where + (dayI, hourI) = divMod hourI' 24 + (hourI', minI) = divMod minI' 60 +@@ -495,7 +497,7 @@ + -- arguments are given, read stdin. + + getArgContents = do +- as <- System.getArgs ++ as <- System.Environment.getArgs + let f "-" = getContents + f fn = readFile fn + cs <- mapM f as diff --git a/devel/hs-drift/files/patch-src__Makefile.in b/devel/hs-drift/files/patch-src__Makefile.in new file mode 100644 index 000000000000..2dd1390e47a4 --- /dev/null +++ b/devel/hs-drift/files/patch-src__Makefile.in @@ -0,0 +1,11 @@ +--- ./src/Makefile.in.orig 2008-02-10 15:41:19.000000000 +0100 ++++ ./src/Makefile.in 2012-05-13 11:54:07.000000000 +0200 +@@ -364,7 +364,7 @@ + + # all: DrIFT + DrIFT: $(DrIFT_SOURCES) $(nodist_DrIFT_SOURCES) +- $(HC) $(HCFLAGS) -i. -i@srcdir@ -hidir . -odir . -o $@ --make @srcdir@/DrIFT.hs ++ $(HC) $(HCFLAGS) -i. -i@srcdir@ -hidir . -odir . -o $@ --make @srcdir@/DrIFT.hs -package random + + #.hs.o: + # $(HC) -O -i. -i@srcdir@ $(HCFLAGS) -hidir . -o $@ -c $< diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile index fdae349f8109..072658e2723e 100644 --- a/devel/hs-fast-logger/Makefile +++ b/devel/hs-fast-logger/Makefile @@ -7,6 +7,7 @@ PORTNAME= fast-logger PORTVERSION= 0.0.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile index f91f05a7fd95..578d290a25a7 100644 --- a/devel/hs-fgl/Makefile +++ b/devel/hs-fgl/Makefile @@ -7,6 +7,7 @@ PORTNAME= fgl PORTVERSION= 5.4.2.4 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile index 451e2bb45d3c..aba59983c4f7 100644 --- a/devel/hs-filemanip/Makefile +++ b/devel/hs-filemanip/Makefile @@ -7,7 +7,7 @@ PORTNAME= filemanip PORTVERSION= 0.3.5.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile index 577827bebcd0..d5d35caa018c 100644 --- a/devel/hs-gconf/Makefile +++ b/devel/hs-gconf/Makefile @@ -7,7 +7,7 @@ PORTNAME= gconf PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile index ae1fd5d0dd30..1e1588484876 100644 --- a/devel/hs-ghc-events/Makefile +++ b/devel/hs-ghc-events/Makefile @@ -7,6 +7,7 @@ PORTNAME= ghc-events PORTVERSION= 0.4.0.0 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +15,7 @@ COMMENT= Library and tool for parsing .eventlog files from GHC LICENSE= BSD -USE_CABAL= binary>=0.5 mtl>=1.1 +USE_CABAL= mtl>=1.1 EXECUTABLE= ghc-events diff --git a/devel/hs-ghc-events/files/patch-ghc-events.cabal b/devel/hs-ghc-events/files/patch-ghc-events.cabal index 1736aa0ef01f..fd73d37b9893 100644 --- a/devel/hs-ghc-events/files/patch-ghc-events.cabal +++ b/devel/hs-ghc-events/files/patch-ghc-events.cabal @@ -1,5 +1,14 @@ --- ./ghc-events.cabal.orig 2012-01-14 03:14:39.000000000 +0100 -+++ ./ghc-events.cabal 2012-01-21 14:21:48.000000000 +0100 ++++ ./ghc-events.cabal 2012-05-12 13:48:07.000000000 +0200 +@@ -27,7 +27,7 @@ + + library + build-depends: base == 4.*, +- mtl >= 1.1 && < 2.1, ++ mtl >= 1.1 && < 2.2, + containers >= 0.2 && < 0.5, + binary == 0.5.*, + bytestring == 0.9.*, @@ -40,7 +40,7 @@ GHC.RTS.Events.Analysis.Thread other-modules: GHC.RTS.EventParserUtils, diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile index 308ac8546216..e178dcaf4d52 100644 --- a/devel/hs-ghc-mtl/Makefile +++ b/devel/hs-ghc-mtl/Makefile @@ -7,6 +7,7 @@ PORTNAME= ghc-mtl PORTVERSION= 1.0.1.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile index 7cd54e6118c8..a0527ef6e5a4 100644 --- a/devel/hs-ghc-paths/Makefile +++ b/devel/hs-ghc-paths/Makefile @@ -6,7 +6,7 @@ PORTNAME= ghc-paths PORTVERSION= 0.1.0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile index f87bf23c123e..c4b1d62f46be 100644 --- a/devel/hs-glade/Makefile +++ b/devel/hs-glade/Makefile @@ -7,7 +7,7 @@ PORTNAME= glade PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile index 969ca96de02a..fd66cee2a46f 100644 --- a/devel/hs-hashed-storage/Makefile +++ b/devel/hs-hashed-storage/Makefile @@ -7,6 +7,7 @@ PORTNAME= hashed-storage PORTVERSION= 0.5.9 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -15,7 +16,7 @@ COMMENT= Hashed file storage support code LICENSE= BSD CABAL_SETUP= Setup.hs -USE_CABAL= binary dataenc mmap>=0.5 mtl zlib +USE_CABAL= dataenc mmap>=0.5 mtl zlib OPTIONS= TEST "Build tests" off diff --git a/devel/hs-hdoc/Makefile b/devel/hs-hdoc/Makefile index e02f149fbb83..bea3abc5d2bf 100644 --- a/devel/hs-hdoc/Makefile +++ b/devel/hs-hdoc/Makefile @@ -6,7 +6,7 @@ PORTNAME= hdoc PORTVERSION= 0.8.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel haskell MASTER_SITES= http://staff.fmi.uni-passau.de/~groessli/hdoc/ PKGNAMEPREFIX= hs- @@ -39,4 +39,16 @@ post-install: cd ${WRKSRC}/docs && ${INSTALL_DATA} hdoc.pdf ${DOCSDIR} .endif +post-patch: + @${REINPLACE_CMD} 's|import List|import Data.List| ; \ + s|import Char|import Data.Char| ; \ + s|import Ratio|import Data.Ratio| ; \ + s|import Monad|import Control.Monad| ; \ + s|import IO|import System.IO.Error| ; \ + s|import Directory|import System.Directory| ; \ + s|import Maybe|import Data.Maybe| ; \ + s|import Array|import Data.Array| ; \ + s|import System[^\.]|import System.Exit|' \ + `${FIND} ${WRKSRC} -name '*.*hs'` + .include <bsd.port.mk> diff --git a/devel/hs-hdoc/files/patch-Main.hs b/devel/hs-hdoc/files/patch-Main.hs new file mode 100644 index 000000000000..bbddbb29a822 --- /dev/null +++ b/devel/hs-hdoc/files/patch-Main.hs @@ -0,0 +1,11 @@ +--- ./Main.hs.orig 2004-05-18 00:27:27.000000000 +0200 ++++ ./Main.hs 2012-05-13 11:20:13.000000000 +0200 +@@ -5,7 +5,7 @@ + import List + import Maybe + import Monad +-import System ++import System.Environment + import GetOpt + + import Parser diff --git a/devel/hs-hdoc/files/patch-hsparser__HsLexer.lhs b/devel/hs-hdoc/files/patch-hsparser__HsLexer.lhs new file mode 100644 index 000000000000..bdcfa7540150 --- /dev/null +++ b/devel/hs-hdoc/files/patch-hsparser__HsLexer.lhs @@ -0,0 +1,11 @@ +--- ./hsparser/HsLexer.lhs.orig 2004-05-18 01:40:34.000000000 +0200 ++++ ./hsparser/HsLexer.lhs 2012-05-13 11:20:41.000000000 +0200 +@@ -19,7 +19,7 @@ + import HsParseUtils + import HsSyn(SrcLoc(..)) + +-import Char ++import Char hiding (isSymbol) + import Ratio + import Numeric + \end{code} diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile index 795b21b2e80c..a3007857fa9e 100644 --- a/devel/hs-hlibev/Makefile +++ b/devel/hs-hlibev/Makefile @@ -7,7 +7,7 @@ PORTNAME= hlibev PORTVERSION= 0.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile index fcd4ef8e196f..13c1d7ac7d45 100644 --- a/devel/hs-hslogger/Makefile +++ b/devel/hs-hslogger/Makefile @@ -7,6 +7,7 @@ PORTNAME= hslogger PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-idoc/Makefile b/devel/hs-idoc/Makefile index 5483a13a7822..7660546f2074 100644 --- a/devel/hs-idoc/Makefile +++ b/devel/hs-idoc/Makefile @@ -6,7 +6,7 @@ PORTNAME= idoc PORTVERSION= 0.2.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel haskell MASTER_SITES= http://www.cse.unsw.edu.au/~chak/haskell/idoc/ PKGNAMEPREFIX= hs- diff --git a/devel/hs-idoc/files/patch-GetOpt.hs b/devel/hs-idoc/files/patch-GetOpt.hs new file mode 100644 index 000000000000..e364d58ac310 --- /dev/null +++ b/devel/hs-idoc/files/patch-GetOpt.hs @@ -0,0 +1,11 @@ +--- ./GetOpt.hs.orig 2002-02-18 01:54:06.000000000 +0100 ++++ ./GetOpt.hs 2012-05-13 00:56:23.000000000 +0200 +@@ -19,7 +19,7 @@ + + module GetOpt (ArgOrder(..), OptDescr(..), ArgDescr(..), usageInfo, getOpt) where + +-import List(isPrefixOf) ++import Data.List(isPrefixOf) + + data ArgOrder a -- what to do with options following non-options: + = RequireOrder -- no option processing after first non-option diff --git a/devel/hs-idoc/files/patch-IDoc.hs b/devel/hs-idoc/files/patch-IDoc.hs new file mode 100644 index 000000000000..52c3cd820aa8 --- /dev/null +++ b/devel/hs-idoc/files/patch-IDoc.hs @@ -0,0 +1,18 @@ +--- ./IDoc.hs.orig 2004-05-14 08:54:08.000000000 +0200 ++++ ./IDoc.hs 2012-05-13 00:56:43.000000000 +0200 +@@ -181,10 +181,11 @@ + where + + -- standard libraries +-import Char (isAlpha, isDigit, toUpper, isSpace, isDigit) +-import List (isPrefixOf, intersperse) +-import IO (stderr, hPutStr) +-import System (ExitCode(..), getArgs, exitWith) ++import Data.Char (isAlpha, isDigit, toUpper, isSpace, isDigit) ++import Data.List (isPrefixOf, intersperse) ++import System.IO (stderr, hPutStr) ++import System.Environment (getArgs) ++import System.Exit (ExitCode(..), exitWith) + + -- extra library + import GetOpt (ArgOrder(..), OptDescr(..), ArgDescr(..), usageInfo, diff --git a/devel/hs-idoc/files/patch-Makefile b/devel/hs-idoc/files/patch-Makefile index 27d4bf3f2d28..ef2238db6e60 100644 --- a/devel/hs-idoc/files/patch-Makefile +++ b/devel/hs-idoc/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2002-02-28 07:33:03.000000000 +0100 -+++ Makefile 2011-03-26 12:47:27.290996479 +0100 +--- ./Makefile.orig 2002-02-28 07:33:03.000000000 +0100 ++++ ./Makefile 2012-05-13 00:56:24.000000000 +0200 @@ -56,7 +56,6 @@ # PACKAGE = idoc diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile index 5a8c4df3d3f3..6a3649377e0c 100644 --- a/devel/hs-language-c/Makefile +++ b/devel/hs-language-c/Makefile @@ -7,7 +7,7 @@ PORTNAME= language-c PORTVERSION= 0.3.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile index 7b775934f8fd..5fc050eb2f6e 100644 --- a/devel/hs-largeword/Makefile +++ b/devel/hs-largeword/Makefile @@ -7,6 +7,7 @@ PORTNAME= largeword PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile index e8f173afc746..b5f70e4cdf74 100644 --- a/devel/hs-lazysmallcheck/Makefile +++ b/devel/hs-lazysmallcheck/Makefile @@ -7,6 +7,7 @@ PORTNAME= lazysmallcheck PORTVERSION= 0.6 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile index 25f62783fb44..7d302c9eb948 100644 --- a/devel/hs-mmap/Makefile +++ b/devel/hs-mmap/Makefile @@ -6,7 +6,7 @@ PORTNAME= mmap PORTVERSION= 0.5.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile index 2e20b5cbb884..cb29b5f80c99 100644 --- a/devel/hs-murmur-hash/Makefile +++ b/devel/hs-murmur-hash/Makefile @@ -7,6 +7,7 @@ PORTNAME= murmur-hash PORTVERSION= 0.1.0.5 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile index 092e9ed17c24..93c113dd9d44 100644 --- a/devel/hs-pcre-light/Makefile +++ b/devel/hs-pcre-light/Makefile @@ -7,7 +7,7 @@ PORTNAME= pcre-light PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile index 4013b1017680..2b9a473a5248 100644 --- a/devel/hs-primitive/Makefile +++ b/devel/hs-primitive/Makefile @@ -7,6 +7,7 @@ PORTNAME= primitive PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-ranges/Makefile b/devel/hs-ranges/Makefile index 15f45810bc07..447a8392640e 100644 --- a/devel/hs-ranges/Makefile +++ b/devel/hs-ranges/Makefile @@ -7,6 +7,7 @@ PORTNAME= ranges PORTVERSION= 0.2.4 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-reactive/Makefile b/devel/hs-reactive/Makefile index 0be4e87ff7c4..0f26ed76c86b 100644 --- a/devel/hs-reactive/Makefile +++ b/devel/hs-reactive/Makefile @@ -7,7 +7,8 @@ PORTNAME= reactive PORTVERSION= 0.11.5 -PORTREVISION= 4 +PORTREVISION= 5 + CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-reactive/files/patch-src__FRP__Reactive__Improving.hs b/devel/hs-reactive/files/patch-src__FRP__Reactive__Improving.hs new file mode 100644 index 000000000000..ca37cc4cddf5 --- /dev/null +++ b/devel/hs-reactive/files/patch-src__FRP__Reactive__Improving.hs @@ -0,0 +1,18 @@ +--- ./src/FRP/Reactive/Improving.hs.orig 2010-07-28 18:48:55.000000000 +0200 ++++ ./src/FRP/Reactive/Improving.hs 2012-05-13 01:17:34.000000000 +0200 +@@ -178,13 +178,13 @@ + + -- TODO: revisit (=-=). Maybe it doesn't have to test for full equality. + +-genGE :: (Arbitrary a, Num a) => Improving a -> Gen (Improving a) ++genGE :: (Arbitrary a, Eq a, Num a) => Improving a -> Gen (Improving a) + genGE i = add i <$> oneof [pure 0, positive] + + -- I didn't use nonNegative in genGE, because I want zero pretty often, + -- especially for the antiSymmetric law. + +-add :: Num a => Improving a -> a -> Improving a ++add :: (Eq a, Num a) => Improving a -> a -> Improving a + add (Imp x comp) dx = Imp (x + dx) (comp . subtract dx) + + batch :: TestBatch diff --git a/devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Chan.hs b/devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Chan.hs new file mode 100644 index 000000000000..4eb63477eb0b --- /dev/null +++ b/devel/hs-reactive/files/patch-src__FRP__Reactive__Internal__Chan.hs @@ -0,0 +1,8 @@ +--- ./src/FRP/Reactive/Internal/Chan.hs.orig 2010-07-28 18:48:55.000000000 +0200 ++++ ./src/FRP/Reactive/Internal/Chan.hs 2012-05-12 22:41:22.000000000 +0200 +@@ -1,4 +1,4 @@ +-{-# LANGUAGE CPP #-} ++{-# LANGUAGE CPP, StandaloneDeriving, DeriveDataTypeable #-} + {-# OPTIONS_GHC -Wall #-} + ----------------------------------------------------------------------------- + -- | diff --git a/devel/hs-reactive/files/patch-src__FRP__Reactive__Num.hs b/devel/hs-reactive/files/patch-src__FRP__Reactive__Num.hs new file mode 100644 index 000000000000..ff3276685359 --- /dev/null +++ b/devel/hs-reactive/files/patch-src__FRP__Reactive__Num.hs @@ -0,0 +1,8 @@ +--- ./src/FRP/Reactive/Num.hs.orig 2010-07-28 18:48:55.000000000 +0200 ++++ ./src/FRP/Reactive/Num.hs 2012-05-13 12:54:39.226470104 +0200 +@@ -1,4 +1,4 @@ +-{-# LANGUAGE TypeSynonymInstances #-} ++{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-} + {-# OPTIONS_GHC -Wall -fno-warn-orphans #-} + ---------------------------------------------------------------------- + -- | diff --git a/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs b/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs index 6fdadf331f7d..6c53c4280011 100644 --- a/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs +++ b/devel/hs-reactive/files/patch-src__FRP__Reactive__PrimReactive.hs @@ -1,5 +1,5 @@ --- ./src/FRP/Reactive/PrimReactive.hs.orig 2010-07-28 18:48:55.000000000 +0200 -+++ ./src/FRP/Reactive/PrimReactive.hs 2011-07-16 11:19:19.000000000 +0200 ++++ ./src/FRP/Reactive/PrimReactive.hs 2012-05-13 12:51:24.045468968 +0200 @@ -63,6 +63,8 @@ import Prelude hiding (zip,zipWith) @@ -45,3 +45,28 @@ duplicate r@(_ `Stepper` Event u) = r `Stepper` Event (duplicate <$> u) +@@ -872,13 +864,13 @@ + toListE_ = map futVal . toListE + -} + +-monotonicity :: (Show a, Arbitrary a, Arbitrary t ++monotonicity :: (Show a, Show t, Arbitrary a, Arbitrary t + ,Num t, Ord t, Bounded t, Ord t', Bounded t') + => String -> (EventG t a -> EventG t' a') + -> (String,Property) + monotonicity n f = (n, property $ monotoneTest f) + +-monotonicity2 :: (Show a, Show b, Arbitrary a, Arbitrary b, Arbitrary t ++monotonicity2 :: (Show a, Show b, Show t, Arbitrary a, Arbitrary b, Arbitrary t + ,Num t, Ord t, Bounded t, Ord t', Bounded t') + => String -> (b -> EventG t a -> EventG t' a') + -> (String,Property) +@@ -921,7 +913,7 @@ + isMonotoneR' :: (Ord t, Bounded t) => Time t -> ReactiveG t a -> Bool + isMonotoneR' t (_ `Stepper` e) = isMonotoneE' t e + +-simulEventOrder :: ( Arbitrary t, Num t, Ord t, Bounded t ++simulEventOrder :: ( Arbitrary t, Show t, Show t', Show t'', Show t''', Num t, Ord t, Bounded t + , Arbitrary t', Num t', Ord t', Bounded t' + , Num t'', Ord t'', Bounded t'' + , Num t''', Ord t''', Bounded t''') diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile index 87146aa56b23..8e3d115920dd 100644 --- a/devel/hs-readline/Makefile +++ b/devel/hs-readline/Makefile @@ -6,7 +6,7 @@ PORTNAME= readline PORTVERSION= 1.0.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile index 170ac6708a05..a149fb8e9221 100644 --- a/devel/hs-safe/Makefile +++ b/devel/hs-safe/Makefile @@ -7,6 +7,7 @@ PORTNAME= safe PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile index f187405b2a50..0a75bfcd1953 100644 --- a/devel/hs-show/Makefile +++ b/devel/hs-show/Makefile @@ -7,6 +7,7 @@ PORTNAME= show PORTVERSION= 0.4.1.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile index 44c815eff7b1..c7fc6ab65193 100644 --- a/devel/hs-split/Makefile +++ b/devel/hs-split/Makefile @@ -7,6 +7,7 @@ PORTNAME= split PORTVERSION= 0.1.4.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile index 19a7b00dd38c..d135196414a6 100644 --- a/devel/hs-strict/Makefile +++ b/devel/hs-strict/Makefile @@ -7,6 +7,7 @@ PORTNAME= strict PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile index 777ea5fe89f1..33abd875af6a 100644 --- a/devel/hs-syb-with-class-instances-text/Makefile +++ b/devel/hs-syb-with-class-instances-text/Makefile @@ -7,6 +7,7 @@ PORTNAME= syb-with-class-instances-text PORTVERSION= 0.0.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile index cd7b084575c1..9b3bbfe48c89 100644 --- a/devel/hs-syb-with-class/Makefile +++ b/devel/hs-syb-with-class/Makefile @@ -7,6 +7,7 @@ PORTNAME= syb-with-class PORTVERSION= 0.6.1.3 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile index e5b49f06366b..77530942ada1 100644 --- a/devel/hs-test-framework-hunit/Makefile +++ b/devel/hs-test-framework-hunit/Makefile @@ -7,6 +7,7 @@ PORTNAME= test-framework-hunit PORTVERSION= 0.2.7 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile index 9880acdb3abb..9dace5505b55 100644 --- a/devel/hs-threadscope/Makefile +++ b/devel/hs-threadscope/Makefile @@ -7,7 +7,7 @@ PORTNAME= threadscope PORTVERSION= 0.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org @@ -17,8 +17,8 @@ LICENSE= BSD CABAL_SETUP= Setup.hs -USE_CABAL= binary cairo deepseq>=1.1 ghc-events>=0.3 glib gtk>=0.12 \ - gtk2hs-buildtools mtl pango +USE_CABAL= cairo ghc-events>=0.3 glib gtk>=0.12 gtk2hs-buildtools mtl \ + pango EXECUTABLE= threadscope STANDALONE= yes diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile index 01f34848dbc3..3819af2e33cf 100644 --- a/devel/hs-transformers-base/Makefile +++ b/devel/hs-transformers-base/Makefile @@ -7,6 +7,7 @@ PORTNAME= transformers-base PORTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile index 0fd928849897..4f057a361eda 100644 --- a/devel/hs-utf8-string/Makefile +++ b/devel/hs-utf8-string/Makefile @@ -7,6 +7,7 @@ PORTNAME= utf8-string PORTVERSION= 0.3.7 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile index ad41422bd9c6..1c03c7dd950a 100644 --- a/devel/hs-uuagc-cabal/Makefile +++ b/devel/hs-uuagc-cabal/Makefile @@ -7,6 +7,7 @@ PORTNAME= uuagc-cabal PORTVERSION= 1.0.2.0 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile index b11dec1d8368..795dfd014819 100644 --- a/devel/hs-uulib/Makefile +++ b/devel/hs-uulib/Makefile @@ -7,6 +7,7 @@ PORTNAME= uulib PORTVERSION= 0.9.14 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile index 3d2c6f3b582b..11f2e3efd284 100644 --- a/devel/hs-vector/Makefile +++ b/devel/hs-vector/Makefile @@ -7,6 +7,7 @@ PORTNAME= vector PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= devel haskell MAINTAINER= haskell@FreeBSD.org |