diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2012-06-03 20:52:29 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2012-06-03 20:52:29 +0000 |
| commit | 46e9ab0ca5e504d3509678b4d43a41d938650e75 (patch) | |
| tree | a34afe36b374e7894e236fb8cee020928d36c967 | |
| parent | be44ec14c77de91f8ac86e25372545e0e39e9bcb (diff) | |
| download | ports-46e9ab0ca5e504d3509678b4d43a41d938650e75.tar.gz ports-46e9ab0ca5e504d3509678b4d43a41d938650e75.zip | |
- Update The Glorious Glasgow Haskell Compiler to version 7.4.1
Please note that port revision for all the Haskell ports without version changes
are also bumped. Other per-port updates are coming soon (in separate commits)!
In addition to that, separate -docs ports are no longer needed so they are
now removed.
Thanks ashish@ for the assistance.
Obtained from: FreeBSD Haskell
Notes
Notes:
svn path=/head/; revision=298155
190 files changed, 1091 insertions, 354 deletions
diff --git a/archivers/Makefile b/archivers/Makefile index a2cef1957ef3..f67724532f89 100644 --- a/archivers/Makefile +++ b/archivers/Makefile @@ -43,6 +43,7 @@ SUBDIR += hs-zip-archive SUBDIR += hs-zlib SUBDIR += hs-zlib-bindings + SUBDIR += hs-zlib-conduit SUBDIR += hs-zlib-enum SUBDIR += javatar SUBDIR += jzip.org diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile index 29986a65f1f6..bf5b6359eb33 100644 --- a/audio/hs-ALUT/Makefile +++ b/audio/hs-ALUT/Makefile @@ -7,7 +7,7 @@ PORTNAME= ALUT PORTVERSION= 2.2.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= audio haskell MAINTAINER= haskell@FreeBSD.org diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile index 55de48e0b3f2..bc45ccc5097d 100644 --- a/benchmarks/hs-criterion/Makefile +++ b/benchmarks/hs-criterion/Makefile @@ -7,6 +7,7 @@ PORTNAME= criterion PORTVERSION= 0.6.0.1 +PORTREVISION= 1 CATEGORIES= benchmarks haskell MAINTAINER= haskell@FreeBSD.org @@ -14,9 +15,9 @@ COMMENT= Robust, reliable performance measurement and analysis LICENSE= BSD -USE_CABAL= aeson>=0.3.2.12 deepseq>=1.1.0.0 hastache>=0.1.5 mtl>=2 \ - mwc-random>=0.8.0.3 parsec>=3.1.0 statistics>=0.10.0.0 \ - vector>=0.7.1 vector-algorithms>=0.4 +USE_CABAL= aeson>=0.3.2.12 hastache>=0.1.5 mtl>=2 mwc-random>=0.8.0.3 \ + parsec>=3.1.0 statistics>=0.10.0.0 vector>=0.7.1 \ + vector-algorithms>=0.4 INSTALL_PORTEXAMPLES= \ cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile index 923411299585..b673c9daa831 100644 --- a/converters/hs-dataenc/Makefile +++ b/converters/hs-dataenc/Makefile @@ -7,6 +7,7 @@ PORTNAME= dataenc PORTVERSION= 0.14.0.3 +PORTREVISION= 1 CATEGORIES= converters haskell MAINTAINER= haskell@FreeBSD.org diff --git a/deskutils/checkrdf/Makefile b/deskutils/checkrdf/Makefile index 996bd2341119..2e189857f287 100644 --- a/deskutils/checkrdf/Makefile +++ b/deskutils/checkrdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= checkrdf PORTVERSION= 39.4444 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils MASTER_SITES= SF diff --git a/deskutils/checkrdf/files/patch-CheckRDF.hs b/deskutils/checkrdf/files/patch-CheckRDF.hs index 5383389034d5..d60481a3afdd 100644 --- a/deskutils/checkrdf/files/patch-CheckRDF.hs +++ b/deskutils/checkrdf/files/patch-CheckRDF.hs @@ -1,10 +1,23 @@ ---- CheckRDF.hs.orig 2007-03-02 19:13:07.000000000 +0100 -+++ CheckRDF.hs 2009-01-26 18:28:22.000000000 +0100 -@@ -24,9 +24,12 @@ - import Directory ( doesFileExist, getPermissions, readable, removeFile ) - import List ( partition, intersperse, groupBy, sortBy) - import Time (getClockTime,toCalendarTime,calendarTimeToString) -+import Char (toLower) +--- ./CheckRDF.hs.orig 2007-03-02 19:13:07.000000000 +0100 ++++ ./CheckRDF.hs 2012-05-13 13:10:24.395459549 +0200 +@@ -18,15 +18,20 @@ + + import RDFConfig + +-import System (getArgs, exitWith, ExitCode(..),system,getEnv) +-import IO ( catch, openFile, IOMode(..), hIsEOF, hGetLine ++import System.Environment (getArgs, getEnv) ++import System.Process (system) ++import System.Exit (exitWith, ExitCode(..)) ++import System.IO ( openFile, IOMode(..), hIsEOF, hGetLine + , hPutStr, hClose, hFlush, stdin, Handle, hPutStrLn, hGetContents) +-import Directory ( doesFileExist, getPermissions, readable, removeFile ) +-import List ( partition, intersperse, groupBy, sortBy) +-import Time (getClockTime,toCalendarTime,calendarTimeToString) ++import System.Directory ( doesFileExist, getPermissions, readable, removeFile ) ++import Data.List ( partition, intersperse, groupBy, sortBy) ++import System.Time (getClockTime,toCalendarTime,calendarTimeToString) ++import Data.Char (toLower) import Text.XML.HaXml.Types import Text.XML.HaXml.Parse (xmlParse) @@ -13,7 +26,7 @@ import Text.XML.HaXml.Xtract.Parse (parseXtract) import Text.PrettyPrint.HughesPJ (render, vcat) import Text.XML.HaXml.Pretty (content) -@@ -52,15 +55,15 @@ +@@ -52,15 +57,15 @@ mkNewRDF :: RDFConfig -> FilePath -> String -> RDF mkNewRDF config filename contents = let elem = getElem $ xmlParse filename contents @@ -35,7 +48,7 @@ ) $ map show [0..len1-1]) else [] -@@ -69,7 +72,7 @@ +@@ -69,7 +74,7 @@ ,clink = cl ,citems = rdfitems } diff --git a/deskutils/checkrdf/files/patch-Main.hs b/deskutils/checkrdf/files/patch-Main.hs new file mode 100644 index 000000000000..f1206d55510a --- /dev/null +++ b/deskutils/checkrdf/files/patch-Main.hs @@ -0,0 +1,12 @@ +--- ./Main.hs.orig 2005-05-29 21:27:39.000000000 +0200 ++++ ./Main.hs 2012-05-12 19:33:06.000000000 +0200 +@@ -19,7 +19,8 @@ + + import CheckRDF + import RDFConfig +-import System (getArgs, exitWith, ExitCode(..),getEnv) ++import System.Environment (getArgs, getEnv) ++import System.Exit (exitWith, ExitCode(..)) + + main :: IO () + main = do files <- getArgs 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 diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile index e2f3b47e2353..5f104d9528a7 100644 --- a/ftp/hs-curl/Makefile +++ b/ftp/hs-curl/Makefile @@ -7,7 +7,7 @@ PORTNAME= curl PORTVERSION= 1.3.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= ftp haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile index eb4b5d505f74..c9084c7e7fca 100644 --- a/graphics/hs-HGL/Makefile +++ b/graphics/hs-HGL/Makefile @@ -7,7 +7,7 @@ PORTNAME= HGL PORTVERSION= 3.2.0.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile index 17736f53d4e5..d0ed91545c40 100644 --- a/graphics/hs-soegtk/Makefile +++ b/graphics/hs-soegtk/Makefile @@ -7,7 +7,7 @@ PORTNAME= soegtk PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index e5990fde8ca3..b9837f194bd0 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -5,12 +5,10 @@ # $FreeBSD$ PORTNAME= ghc -PORTVERSION= 7.0.4 +PORTVERSION= 7.4.1 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ - ${MASTER_SITE_LOCAL:S/$/:boot/} \ - http://www.autistici.org/jacula/FreeBSD/:boot \ -# http://haskell.org/ghc/dist/${PORTVERSION}/freebsd/:boot + ${MASTER_SITE_LOCAL:S/$/:boot/} MASTER_SITE_SUBDIR= pgj/:boot DISTFILES= ghc-${PORTVERSION}-src${EXTRACT_SUFX}:source @@ -20,14 +18,13 @@ COMMENT= A Compiler for the functional language Haskell ONLY_FOR_ARCHS= i386 amd64 GHC_VERSION= ${PORTVERSION} -BOOT_GHC_VERSION= 6.10.4 -HSCOLOUR_VERSION= 1.16 -GHCPATH_VERSION= 0.1.0.6 +BOOT_GHC_VERSION= 7.4.1 +HSCOLOUR_VERSION= 1.19 DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} -CONFLICTS= ghc-6.8.* ghc-6.10.* ghc-6.12.* +CONFLICTS= ghc-6.8.* ghc-6.10.* ghc-6.12.* ghc-7.0.* ghc-7.2.* USE_BZIP2= yes LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp @@ -105,7 +102,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs HACKAGE_SITE?= http://hackage.haskell.org/ HACKAGE_ARCH?= packages/archive/ -CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR}) +CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} CC=${CC} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} --with-gcc=${CC} \ --with-gmp-includes=${LOCALBASE}/include \ --with-gmp-libraries=${LOCALBASE}/lib \ @@ -128,12 +125,10 @@ MAKE_ENV+= TMPDIR=${TMPDIR} # you could view the output of: ${BOOT_GHC} describe hscolour .if defined(WITH_DOCS) -MASTER_SITES+= ${HACKAGE_SITE}${HACKAGE_ARCH}hscolour/${HSCOLOUR_VERSION}/:docs \ - ${HACKAGE_SITE}${HACKAGE_ARCH}ghc-paths/${GHCPATH_VERSION}/:docs -DISTFILES+= hscolour-${HSCOLOUR_VERSION}.tar.gz:docs \ - ghc-paths-${GHCPATH_VERSION}.tar.gz:docs +MASTER_SITES+= ${HACKAGE_SITE}${HACKAGE_ARCH}hscolour/${HSCOLOUR_VERSION}/:docs +DISTFILES+= hscolour-${HSCOLOUR_VERSION}.tar.gz:docs -EXTRACT_ONLY= ${_DISTFILES:C/ghc-paths.*$//g:C/hscolour.*$//g} +EXTRACT_ONLY= ${_DISTFILES:C/hscolour.*$//g} MAN1= ghc.1 @@ -179,7 +174,6 @@ post-extract: @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib" # @${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_NAME = ghc-\$$(ProjectVersion)-boot" # @${ECHO} >> ${WRKSRC}/mk/build.mk "BIN_DIST_TAR = ghc-\$$(ProjectVersion)-amd64-ash0-freebsd8-boot.tar" - -@${RM} -f ${BOOT_DIR}/mk/build.mk post-install-script: @${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \ @@ -227,22 +221,18 @@ post-patch: pre-configure: @${MKDIR} ${TMPDIR} - @(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT} + @(cd ${BOOT_DIR} && ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS_BOOT}) @(cd ${BOOT_DIR} && PACKAGES='' ${GMAKE} install) -# @(${BOOT_GHC-PKG} unregister haddock-${BOOT_HADDOCK_VERSION}) -# @(cd ${BOOT_DIR} && ${RM} -rf utils/haddock && ${RM} -f bin/haddock \ -# && ${RM} -f ${GHC_LIBDIR_REL}/haddock && ${RM} -rf ${GHC_LIBDIR_REL}/haddock-${BOOT_HADDOCK_VERSION}) # Defining WITH_DOCS: -# Defining "SLAVE" in devel/hs-ghc-paths devel/hs-haddock and -# print/hs-hscolour flips the building process +# Defining "SLAVE" in devel/hs-haddock and print/hs-hscolour flips the building process # functionally to this port. .if defined(WITH_DOCS) @${ECHO_MSG} -e "\a" @${ECHO_MSG} "======================================================================" - @${ECHO_MSG} " WARNING: Now (Ghc-Paths, Haddock and) HsColour will be " - @${ECHO_MSG} " built, the respective ports won't be installed, but an " - @${ECHO_MSG} " in-place installation and registration of both takes place." + @${ECHO_MSG} " WARNING: Now HsColour will be built, the respective port will not " + @${ECHO_MSG} " be installed, but an in-place installation and " + @${ECHO_MSG} " registration of both takes place. " @${ECHO_MSG} "======================================================================" @${ECHO_MSG} "" @sleep 3 @@ -251,22 +241,6 @@ pre-configure: @${MKDIR} ${SLAVES_WRKDIRPREFIX} @(cd ${SLAVES_WRKDIRPREFIX} && \ - ${TAR} xvf ${DISTDIR}/ghc-paths-${GHCPATH_VERSION}.tar.gz && \ - cd ghc-paths-${GHCPATH_VERSION} && \ - ${SLAVE_CMD} ghc --make -o Setup Setup.hs -package Cabal && \ - ${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} && \ - ${SLAVE_CMD} ./Setup build && \ - ${SLAVE_CMD} ./Setup install) - - # @(cd ${SLAVES_WRKDIRPREFIX} && \ - # ${TAR} xvf ${DISTDIR}/haddock-${HADDOCK_VERSION}.tar.gz && \ - # cd haddock-${HADDOCK_VERSION} && \ - # ${SLAVE_CMD} ghc --make -o Setup Setup.lhs -package Cabal && \ - # ${SLAVE_CMD} ./Setup configure --ghc --prefix=${SLAVES_PREFIX} && \ - # ${SLAVE_CMD} ./Setup build && \ - # ${SLAVE_CMD} ./Setup install) - - @(cd ${SLAVES_WRKDIRPREFIX} && \ ${TAR} xvf ${DISTDIR}/hscolour-${HSCOLOUR_VERSION}.tar.gz && \ cd hscolour-${HSCOLOUR_VERSION} && \ ${SLAVE_CMD} ghc --make -o Setup Setup.hs -package Cabal && \ diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk index 871db7b439a4..825b138e373a 100644 --- a/lang/ghc/bsd.cabal.mk +++ b/lang/ghc/bsd.cabal.mk @@ -26,18 +26,7 @@ DIST_SUBDIR?= cabal FILE_LICENSE?= LICENSE -.if !defined(DOCUMENTATION) && \ - (${PORTNAME} == haddock || ${PORTNAME} == ghc-paths || \ - ${PORTNAME} == hscolour || ${PORTNAME} == mtl || \ - ${PORTNAME} == transformers || ${PORTNAME} == xhtml) -NOPORTDOCS= yes -.endif - -.if defined(NOPORTDOCS) && defined(DOCUMENTATION) -IGNORE+= is a documentation-only port, do not install if no documentation needed -.endif - -.if !defined(DOCUMENTATION) && !defined(STANDALONE) +.if !defined(STANDALONE) BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc @@ -47,7 +36,7 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc .endif -GHC_VERSION?= 7.0.4 +GHC_VERSION?= 7.4.1 GHC_VERSION_N= ${GHC_VERSION:S/./0/g} GHC_CMD?= ${LOCALBASE}/bin/ghc @@ -59,14 +48,10 @@ HAPPY_CMD?= ${LOCALBASE}/bin/happy HADDOCK_CMD?= ${LOCALBASE}/bin/haddock C2HS_CMD?= ${LOCALBASE}/bin/c2hs -.if !defined(DOCUMENTATION) CABAL_DIRS+= ${DATADIR} ${EXAMPLESDIR} ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} -.endif GHC_HADDOCK_CMD=${LOCALBASE}/bin/haddock-ghc-${GHC_VERSION} -HADDOCK_PORT= ${PORTSDIR}/devel/hs-haddock - CABAL_DOCSDIR= ${PREFIX}/share/doc/ghc-${GHC_VERSION}/cabal CABAL_DOCSDIR_REL= ${CABAL_DOCSDIR:S,^${PREFIX}/,,} @@ -114,26 +99,10 @@ LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp USE_ICONV= yes .endif -.if defined(EXECUTABLE) || defined(DOCUMENTATION) +.if defined(EXECUTABLE) HADDOCK_EXE?= --executables .endif -.if defined(DOCUMENTATION) - -.if defined(PORTREVISION) && ${PORTREVISION} != 0 -_SUF1= _${PORTREVISION} -.endif - -.if defined(PORTEPOCH) && ${PORTEPOCH} != 0 -_SUF2= ,${PORTEPOCH} -.endif - -PKGVERSION= ${PORTVERSION:C/[-_,]/./g}${_SUF1}${_SUF2} - -PKGNAMESUFFIX= -docs -USE_CABAL+= ${PORTNAME}==${PKGVERSION} -.endif - .if defined(USE_CABAL) .include "bsd.hackage.mk" @@ -175,9 +144,7 @@ PLIST_SUB+= NOPORTDOCS="@comment " .endif .if !defined(NOPORTDOCS) -.if !defined(XMLDOCS) || defined(DOCUMENTATION) -BUILD_DEPENDS+= ${HADDOCK_CMD}:${HADDOCK_PORT} - +.if !defined(XMLDOCS) HADDOCK_OPTS= ${HADDOCK_EXE} .if defined(WITH_HSCOLOUR_DOCS) @@ -198,10 +165,6 @@ USE_GMAKE= yes .endif # !XMLDOCS -.if defined(DOCUMENTATION) -DOCSDIR= ${CABAL_DOCSDIR}/${DISTNAME}/html -.endif - .if !defined(METAPORT) PORTDOCS= * .endif # !METAPORT @@ -214,7 +177,7 @@ __handle_datadir__= --datadir='' --datasubdir='' --docdir='${DOCSDIR}' __handle_datadir__= --datadir='${DATADIR}' --datasubdir='' --docdir='${DOCSDIR}' .endif -.if (!defined(XMLDOCS) || defined(DOCUMENTATION)) && !defined(NOPORTDOCS) +.if !defined(XMLDOCS) && !defined(NOPORTDOCS) CONFIGURE_ARGS+= --haddock-options=-w --with-haddock=${HADDOCK_CMD} .endif @@ -242,6 +205,22 @@ post-patch:: ${WRKSRC}/doc/configure.ac .endif +# Purge Haskell 98 (required for GHC 7.2 or later) +.if defined(HASKELL98) + @${REINPLACE_CMD} -E 's|haskell98[,]?||' \ + ${WRKSRC}/${PORTNAME}.cabal + + @${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|' \ + `${FIND} ${WRKSRC} -name '*.hs'` +.endif + .if !target(do-configure) do-configure: .if !defined(METAPORT) @@ -262,15 +241,13 @@ do-configure: .if !target(do-build) do-build: .if !defined(METAPORT) -.if !defined(DOCUMENTATION) cd ${WRKSRC} && ${SETUP_CMD} build .if !defined(STANDALONE) cd ${WRKSRC} && ${SETUP_CMD} register --gen-script .endif -.endif # !DOCUMENTATION .if !defined(NOPORTDOCS) -.if (!defined(XMLDOCS) && !defined(STANDALONE)) || defined(DOCUMENTATION) +.if !defined(XMLDOCS) && !defined(STANDALONE) cd ${WRKSRC} && ${SETUP_CMD} haddock ${HADDOCK_OPTS} .endif # STANDALONE .if defined(XMLDOCS) @@ -285,7 +262,6 @@ do-build: .if !target(do-install) do-install: .if !defined(METAPORT) -.if !defined(DOCUMENTATION) cd ${WRKSRC} && ${SETUP_CMD} install .if !defined(STANDALONE) @@ -308,12 +284,6 @@ do-install: .endfor .endif # MAN1SRC -.else - - @(cd ${WRKSRC}/dist/doc/html/${PORTNAME} && ${COPYTREE_SHARE} \* ${DOCSDIR}/html) - -.endif # !DOCUMENTATION - .if !defined(NOPORTDOCS) .if !empty(XMLDOCS) .for xmldoc in ${XMLDOCS} @@ -343,13 +313,11 @@ post-install-script: add-plist-post: add-plist-cabal add-plist-cabal: .if !defined(METAPORT) -.if !defined(DOCUMENTATION) @if [ -f ${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh ]; then \ (${ECHO_CMD} '@exec ${SH} %D/${CABAL_LIBDIR_REL}/${CABAL_LIBSUBDIR}/register.sh'; \ ${ECHO_CMD} '@exec ${RM} -f %D/lib/ghc-${GHC_VERSION}/package.conf.old'; \ ${ECHO_CMD} '@unexec %D/bin/ghc-pkg unregister --force ${PORTNAME}-${PORTVERSION}'; \ ${ECHO_CMD} '@unexec ${RM} -f %D/lib/ghc-${GHC_VERSION}/package.conf.old') >> ${TMPPLIST}; fi -.endif .if defined(NOPORTDOCS) @if [ -f ${DOCSDIR}/${FILE_LICENSE} ]; then \ (${ECHO_CMD} '${DOCSDIR_REL}/${FILE_LICENSE}'; \ @@ -374,7 +342,7 @@ post-install:: fi .endif -.if !defined(STANDALONE) && !defined(DOCUMENTATION) +.if !defined(STANDALONE) ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old .endif diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index aa62aad6b075..2a469dbefc02 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,18 +1,16 @@ -SHA256 (ghc-7.0.4-src.tar.bz2) = 1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed -SIZE (ghc-7.0.4-src.tar.bz2) = 24205070 -SHA256 (hscolour-1.16.tar.gz) = 206fa8c7e2b69d16d401feec2049bf5b392b1ac4c3628baf8b172b00cc7857f5 -SIZE (hscolour-1.16.tar.gz) = 57057 -SHA256 (ghc-paths-0.1.0.6.tar.gz) = 95d8c0e6ce2f182d792e910149b3c81c381b7d2c2052ffc6d96128b071c55243 -SIZE (ghc-paths-0.1.0.6.tar.gz) = 2291 -SHA256 (ghc-6.10.4-i386-freebsd7-boot.tar.bz2) = bf9f983785a56538ab234b29316b01c0510a6f1c30e3e5cd43878f65d5e5d9b3 -SIZE (ghc-6.10.4-i386-freebsd7-boot.tar.bz2) = 39561575 -SHA256 (ghc-6.10.4-i386-freebsd8-boot.tar.bz2) = bd14311612459764f06dbad80492e69f771cac1dfa37f8bd84f7e2c9b826c762 -SIZE (ghc-6.10.4-i386-freebsd8-boot.tar.bz2) = 39575088 -SHA256 (ghc-6.10.4-i386-freebsd9-boot.tar.bz2) = 98cb2c4015b1d99940560cd1206358d568ca2e7779aacbf44901a7541cbfb129 -SIZE (ghc-6.10.4-i386-freebsd9-boot.tar.bz2) = 39578143 -SHA256 (ghc-6.10.4-amd64-freebsd7-boot.tar.bz2) = 94aebe9b4163de908463c51d923aa4b9de001fafa6a43625f32f14d9f0ba5f65 -SIZE (ghc-6.10.4-amd64-freebsd7-boot.tar.bz2) = 39398495 -SHA256 (ghc-6.10.4-amd64-freebsd8-boot.tar.bz2) = 4297776df0204f40a960521870ba10165f3ab0602df2f431a31af316fc238e1a -SIZE (ghc-6.10.4-amd64-freebsd8-boot.tar.bz2) = 39414489 -SHA256 (ghc-6.10.4-amd64-freebsd9-boot.tar.bz2) = dddb9e8b14c326ca517c673c6494dd16de9473ad87816f895ad4661ab203ee41 -SIZE (ghc-6.10.4-amd64-freebsd9-boot.tar.bz2) = 39414446 +SHA256 (ghc-7.4.1-src.tar.bz2) = 721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79 +SIZE (ghc-7.4.1-src.tar.bz2) = 25272609 +SHA256 (hscolour-1.19.tar.gz) = 7f9d2cfafbd300793686fd4e9f4ddb3f6463f300a22129db898db47956689f9f +SIZE (hscolour-1.19.tar.gz) = 25466 +SHA256 (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = e5cfc6c098179f8657d5cbf1a0fe70e8e9bfdde5a280c095e1dfc51d6e43731f +SIZE (ghc-7.4.1-i386-freebsd7-boot.tar.bz2) = 45438870 +SHA256 (ghc-7.4.1-amd64-freebsd7-boot.tar.bz2) = 836e48e2a250a43b1230eac7f04821de86d915a51d0a36d6040b48cdd25ecedb +SIZE (ghc-7.4.1-amd64-freebsd7-boot.tar.bz2) = 45310351 +SHA256 (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = b58f5b346c2b261f6357f5f72a0bf2c3c766e914cffbe6f2aefb1abf67b9a797 +SIZE (ghc-7.4.1-i386-freebsd8-boot.tar.bz2) = 45447162 +SHA256 (ghc-7.4.1-amd64-freebsd8-boot.tar.bz2) = 536da87dc9e32e98f9258e29b3a44846db6ac786f26b426da4808c33fcc92914 +SIZE (ghc-7.4.1-amd64-freebsd8-boot.tar.bz2) = 45322403 +SHA256 (ghc-7.4.1-i386-freebsd9-boot.tar.bz2) = 2af7912a14e6e31c81d2ef4505c0354ea28c3e263761f1f0282a836fe58bc8e7 +SIZE (ghc-7.4.1-i386-freebsd9-boot.tar.bz2) = 46254818 +SHA256 (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 8dc43c1ed2f026837947d938736ee6084f151fa5617998fca55420418f4ea28f +SIZE (ghc-7.4.1-amd64-freebsd9-boot.tar.bz2) = 46427727 diff --git a/lang/ghc/files/patch-.._ghc-6.10.4-boot_configure b/lang/ghc/files/patch-.._ghc-6.10.4-boot_configure deleted file mode 100644 index 2d0ea9a6ad36..000000000000 --- a/lang/ghc/files/patch-.._ghc-6.10.4-boot_configure +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- ../ghc-6.10.4-boot/configure.orig -+++ ../ghc-6.10.4-boot/configure -@@ -1942,7 +1942,7 @@ - TargetPlatform=i386-unknown-linux;; - i[3456]86-*-freebsd2*) - TargetPlatform=i386-unknown-freebsd2;; --i[3456]86-*-freebsd[3-9]*) -+i[3456]86-*-freebsd*) - TargetPlatform=i386-unknown-freebsd;; - i[3456]86-*-netbsd*) - TargetPlatform=i386-unknown-netbsd;; -@@ -1989,6 +1989,8 @@ - TargetPlatform=x86_64-unknown-linux;; - x86_64-*-freebsd*) - TargetPlatform=x86_64-unknown-freebsd;; -+amd64-*-freebsd*) -+ TargetPlatform=x86_64-unknown-freebsd;; - x86_64-*-openbsd*) - TargetPlatform=x86_64-unknown-openbsd;; - x86_64-*-netbsd*) diff --git a/lang/ghc/files/patch-.._ghc-6.10.4-boot_rts_package.conf.in b/lang/ghc/files/patch-.._ghc-7.4.1-boot_rts_package.conf.in index 428014e57ff5..7976302419f1 100644 --- a/lang/ghc/files/patch-.._ghc-6.10.4-boot_rts_package.conf.in +++ b/lang/ghc/files/patch-.._ghc-7.4.1-boot_rts_package.conf.in @@ -1,5 +1,5 @@ ---- ../ghc-6.10.4-boot/rts/package.conf.in.orig 2009-07-14 19:10:52.000000000 +0200 -+++ ../ghc-6.10.4-boot/rts/package.conf.in 2009-08-13 22:09:35.000000000 +0200 +--- ../ghc-7.4.1-boot/rts/package.conf.in.orig 2009-07-14 19:10:52.000000000 +0200 ++++ ../ghc-7.4.1-boot/rts/package.conf.in 2009-08-13 22:09:35.000000000 +0200 @@ -156,6 +156,8 @@ , "-u", "base_GHCziConc_ensureIOManagerIsRunning_closure" #endif diff --git a/lang/ghc/files/patch-compiler_ghc.mk b/lang/ghc/files/patch-compiler_ghc.mk new file mode 100644 index 000000000000..ebd1dda64453 --- /dev/null +++ b/lang/ghc/files/patch-compiler_ghc.mk @@ -0,0 +1,13 @@ +--- ./compiler/ghc.mk.orig 2012-02-01 19:10:32.000000000 +0100 ++++ ./compiler/ghc.mk 2012-05-17 11:32:41.868463028 +0200 +@@ -107,6 +107,10 @@ + @echo 'cRAWCPP_FLAGS = "$(RAWCPP_FLAGS)"' >> $@ + @echo 'cLdHasNoCompactUnwind :: String' >> $@ + @echo 'cLdHasNoCompactUnwind = "$(LdHasNoCompactUnwind)"' >> $@ ++ @echo 'cLdHashSize31 :: String' >> $@ ++ @echo 'cLdHashSize31 = "$(LdHashSize31)"' >> $@ ++ @echo 'cLdReduceMemoryOverheads :: String' >> $@ ++ @echo 'cLdReduceMemoryOverheads = "$(LdReduceMemoryOverheads)"' >> $@ + @echo 'cLdIsGNULd :: String' >> $@ + @echo 'cLdIsGNULd = "$(LdIsGNULd)"' >> $@ + @echo 'cLdHasBuildId :: String' >> $@ diff --git a/lang/ghc/files/patch-compiler_main_DriverPipeline.hs b/lang/ghc/files/patch-compiler_main_DriverPipeline.hs new file mode 100644 index 000000000000..e6740df077ae --- /dev/null +++ b/lang/ghc/files/patch-compiler_main_DriverPipeline.hs @@ -0,0 +1,17 @@ +--- ./compiler/main/DriverPipeline.hs.orig 2012-05-17 11:27:22.763461303 +0200 ++++ ./compiler/main/DriverPipeline.hs 2012-05-17 11:27:00.427463463 +0200 +@@ -1753,6 +1753,14 @@ + then ["-Wl,-no_compact_unwind"] + else []) + ++ ++ (if cLdHashSize31 == "YES" ++ then ["-Wl,--hash-size=31"] ++ else []) ++ ++ ++ (if cLdReduceMemoryOverheads == "YES" ++ then ["-Wl,--reduce-memory-overheads"] ++ else []) ++ + -- '-Wl,-read_only_relocs,suppress' + -- ld gives loads of warnings like: + -- ld: warning: text reloc in _base_GHCziArr_unsafeArray_info to _base_GHCziArr_unsafeArray_closure diff --git a/lang/ghc/files/patch-configure b/lang/ghc/files/patch-configure index 18cd7e9742bc..038cefa7a9c9 100644 --- a/lang/ghc/files/patch-configure +++ b/lang/ghc/files/patch-configure @@ -1,65 +1,200 @@ - -$FreeBSD$ - ---- configure.orig -+++ configure -@@ -3312,6 +3312,9 @@ +--- ./configure.orig 2012-02-01 19:11:45.000000000 +0100 ++++ ./configure 2012-05-18 12:40:29.000000000 +0200 +@@ -608,6 +608,8 @@ + HavePapiLib + GTK_CONFIG + LdHasNoCompactUnwind ++LdHashSize31 ++LdReduceMemoryOverheads + LdHasBuildId + LdIsGNULd + LdXFlag +@@ -3372,8 +3374,8 @@ vax) BuildArch="vax" ;; -+ amd64) -+ BuildArch="x86_64" -+ ;; - x86_64) - BuildArch="x86_64" +- x86_64) +- BuildArch="x86_64" ++ x86_64|amd64) ++ BuildArch="amd64" ;; -@@ -3330,7 +3333,7 @@ - BuildOS="linux" - ;; - # As far as I'm aware, none of these have relevant variants -- freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) -+ freebsd*|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) + *) + echo "Unknown CPU $build_cpu" +@@ -3404,7 +3406,7 @@ + freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) BuildOS="$build_os" ;; +- freebsd8) # like i686-gentoo-freebsd8 ++ freebsd*) # like i686-gentoo-freebsd8 + BuildOS="freebsd" + ;; *) -@@ -3560,7 +3563,7 @@ - - checkArch() { - case $1 in -- alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64) -+ alpha|arm|hppa|hppa1_1|i386|ia64|m68k|mips|mipseb|mipsel|powerpc|powerpc64|rs6000|s390|sparc|sparc64|vax|x86_64|amd64) - ;; - *) - echo "Unknown arch $1" -@@ -3571,7 +3574,7 @@ +@@ -3486,8 +3488,8 @@ + vax) + HostArch="vax" + ;; +- x86_64) +- HostArch="x86_64" ++ x86_64|amd64) ++ HostArch="amd64" + ;; + *) + echo "Unknown CPU $host_cpu" +@@ -3600,8 +3602,8 @@ + vax) + TargetArch="vax" + ;; +- x86_64) +- TargetArch="x86_64" ++ x86_64|amd64) ++ TargetArch="amd64" + ;; + *) + echo "Unknown CPU $target_cpu" +@@ -3712,6 +3714,9 @@ - checkVendor() { - case $1 in -- dec|unknown|hp|apple|next|sun|sgi|ibm) -+ dec|unknown|hp|apple|next|sun|sgi|ibm|portbld) - ;; - *) - echo "Unknown vendor $1" -@@ -3582,7 +3585,7 @@ - checkOS() { - case $1 in -- linux|freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) -+ linux|freebsd*|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) - ;; - *) - echo "Unknown OS '$1'" -@@ -3621,6 +3624,9 @@ - checkVendor "$TargetVendor" - checkOS "$TargetOS" +bootstrap_target=`echo "$bootstrap_target" |sed -e 's/-unknown-/-portbld-/g' -e 's/x86_64/amd64/g'` +build=`echo "$build" |sed -e 's/\(freebsd\)[[:digit:].]*$/\1/g'` + # Verify that the installed (bootstrap) GHC is capable of generating # code for the requested build platform. - if test "$build" != "$bootstrap_target" -@@ -9533,7 +9539,7 @@ + if test "$BootingFromHc" = "NO" +@@ -5313,9 +5318,9 @@ + echo 'foo() {}' > conftest.c + ${CC-cc} -c conftest.c + if ${LdCmd} -r --hash-size=31 -o conftest2.o conftest.o > /dev/null 2>&1; then +- fp_cv_LdHashSize31=--hash-size=31 ++ fp_cv_LdHashSize31=YES + else +- fp_cv_LdHashSize31= ++ fp_cv_LdHashSize31=NO + fi + rm -rf conftest* + fi +@@ -5334,9 +5339,9 @@ + echo 'foo() {}' > conftest.c + ${CC-cc} -c conftest.c + if ${LdCmd} -r --reduce-memory-overheads -o conftest2.o conftest.o > /dev/null 2>&1; then +- fp_cv_LdReduceMemoryOverheads=--reduce-memory-overheads ++ fp_cv_LdReduceMemoryOverheads=YES + else +- fp_cv_LdReduceMemoryOverheads= ++ fp_cv_LdReduceMemoryOverheads=NO + fi + rm -rf conftest* + fi +@@ -5387,18 +5392,6 @@ + CFLAGS="$CFLAGS -fno-stack-protector" + fi + +- # Reduce memory usage when linking. See trac #5240. +- if test -n "$LdHashSize31" +- then +- LDFLAGS="$LDFLAGS -Wl,$LdHashSize31" +- IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS $LdHashSize31" +- fi +- if test -n "$LdReduceMemoryOverheads" +- then +- LDFLAGS="$LDFLAGS -Wl,$LdReduceMemoryOverheads" +- IGNORE_LINKER_LD_FLAGS="$IGNORE_LINKER_LD_FLAGS $LdReduceMemoryOverheads" +- fi +- + rm -f conftest.c conftest.o + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 + $as_echo "done" >&6; } +@@ -5445,15 +5438,15 @@ + fi + + # Reduce memory usage when linking. See trac #5240. +- if test -n "$LdHashSize31" ++ if [ "$LdHashSize31" = "YES" ] + then +- CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,$LdHashSize31" +- CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 $LdHashSize31" ++ CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,--hash-size=31" ++ CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 --hash-size=31" + fi +- if test -n "$LdReduceMemoryOverheads" ++ if [ "$LdReduceMemoryOverheads" = "YES" ] + then +- CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,$LdReduceMemoryOverheads" +- CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 $LdReduceMemoryOverheads" ++ CONF_GCC_LINKER_OPTS_STAGE0="$CONF_GCC_LINKER_OPTS_STAGE0 -Wl,--reduce-memory-overheads" ++ CONF_LD_LINKER_OPTS_STAGE0="$CONF_LD_LINKER_OPTS_STAGE0 --reduce-memory-overheads" + fi + + rm -f conftest.c conftest.o +@@ -5502,15 +5495,15 @@ + fi + + # Reduce memory usage when linking. See trac #5240. +- if test -n "$LdHashSize31" ++ if [ "$LdHashSize31" = "YES" ] + then +- CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,$LdHashSize31" +- CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 $LdHashSize31" ++ CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,--hash-size=31" ++ CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 --hash-size=31" + fi +- if test -n "$LdReduceMemoryOverheads" ++ if [ "$LdReduceMemoryOverheads" = "YES" ] + then +- CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,$LdReduceMemoryOverheads" +- CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 $LdReduceMemoryOverheads" ++ CONF_GCC_LINKER_OPTS_STAGE1="$CONF_GCC_LINKER_OPTS_STAGE1 -Wl,--reduce-memory-overheads" ++ CONF_LD_LINKER_OPTS_STAGE1="$CONF_LD_LINKER_OPTS_STAGE1 --reduce-memory-overheads" + fi + + rm -f conftest.c conftest.o +@@ -5559,18 +5552,6 @@ + CONF_CC_OPTS_STAGE2="$CONF_CC_OPTS_STAGE2 -fno-stack-protector" + fi + +- # Reduce memory usage when linking. See trac #5240. +- if test -n "$LdHashSize31" +- then +- CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 -Wl,$LdHashSize31" +- CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2 $LdHashSize31" +- fi +- if test -n "$LdReduceMemoryOverheads" +- then +- CONF_GCC_LINKER_OPTS_STAGE2="$CONF_GCC_LINKER_OPTS_STAGE2 -Wl,$LdReduceMemoryOverheads" +- CONF_LD_LINKER_OPTS_STAGE2="$CONF_LD_LINKER_OPTS_STAGE2 $LdReduceMemoryOverheads" +- fi +- + rm -f conftest.c conftest.o + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 + $as_echo "done" >&6; } +@@ -5772,7 +5753,7 @@ + i386) + test -z "$2" || eval "$2=ArchX86" + ;; +- x86_64) ++ x86_64|amd64) + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +@@ -5953,7 +5934,7 @@ + + checkVendor() { + case $1 in +- dec|unknown|hp|apple|next|sun|sgi|ibm) ++ dec|unknown|hp|apple|next|sun|sgi|ibm|portbld) + ;; + *) + echo "Unknown vendor $1" +@@ -5976,7 +5957,7 @@ + mingw32) + test -z "$2" || eval "$2=OSMinGW32" + ;; +- freebsd) ++ freebsd*) + test -z "$2" || eval "$2=OSFreeBSD" + ;; + kfreebsdgnu) +@@ -9987,7 +9968,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -68,7 +203,7 @@ $FreeBSD$ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -9564,11 +9570,7 @@ +@@ -10018,11 +9999,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5 $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; } if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : diff --git a/lang/ghc/files/patch-libraries-gen_contents_index b/lang/ghc/files/patch-libraries-gen_contents_index new file mode 100644 index 000000000000..a2785da02ed9 --- /dev/null +++ b/lang/ghc/files/patch-libraries-gen_contents_index @@ -0,0 +1,10 @@ +--- ./libraries/gen_contents_index.orig 2012-02-01 19:10:32.000000000 +0100 ++++ ./libraries/gen_contents_index 2012-05-17 02:20:09.000000000 +0200 +@@ -47,7 +47,6 @@ + esac + + # Now create the combined contents and index pages +-echo $HADDOCK_ARGS + $HADDOCK --gen-index --gen-contents -o . \ + -t "Haskell Hierarchical Libraries" \ + -p "prologue.txt" \ diff --git a/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_Haddock.hs b/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_Haddock.hs deleted file mode 100644 index c8a4d6a29e90..000000000000 --- a/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_Haddock.hs +++ /dev/null @@ -1,14 +0,0 @@ ---- ./libraries/Cabal/Distribution/Simple/Haddock.hs.orig 2011-06-13 19:10:10.000000000 +0200 -+++ ./libraries/Cabal/Distribution/Simple/Haddock.hs 2012-01-25 07:33:27.000000000 +0100 -@@ -440,8 +440,9 @@ - let allPkgs = installedPkgs lbi - directDeps = map fst (externalPackageDeps lbi) - transitiveDeps <- case dependencyClosure allPkgs directDeps of -- Left x -> return x -- Right _ -> die "Can't find transitive deps for haddock" -+ Left x -> return x -+ Right inf -> die $ "internal error when calculating transative " -+ ++ "package dependencies.\nDebug info: " ++ show inf - interfaces <- sequence - [ case interfaceAndHtmlPath ipkg of - Nothing -> return (Left (packageId ipkg)) diff --git a/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_LocalBuildInfo.hs b/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_LocalBuildInfo.hs deleted file mode 100644 index f656c59d64cd..000000000000 --- a/lang/ghc/files/patch-libraries_Cabal_Distribution_Simple_LocalBuildInfo.hs +++ /dev/null @@ -1,25 +0,0 @@ ---- ./libraries/Cabal/Distribution/Simple/LocalBuildInfo.hs.orig 2011-06-13 19:10:10.000000000 +0200 -+++ ./libraries/Cabal/Distribution/Simple/LocalBuildInfo.hs 2012-01-25 07:33:27.000000000 +0100 -@@ -136,13 +136,17 @@ - } - deriving (Read, Show) - ---- | External package dependencies for the package as a whole, the union of the ---- individual 'targetPackageDeps'. -+-- | External package dependencies for the package as a whole. This is the -+-- union of the individual 'componentPackageDeps', less any internal deps. - externalPackageDeps :: LocalBuildInfo -> [(InstalledPackageId, PackageId)] --externalPackageDeps lbi = nub $ -+externalPackageDeps lbi = filter (not . internal . snd) $ nub $ - -- TODO: what about non-buildable components? -- maybe [] componentPackageDeps (libraryConfig lbi) -- ++ concatMap (componentPackageDeps . snd) (executableConfigs lbi) -+ maybe [] componentPackageDeps (libraryConfig lbi) -+ ++ concatMap (componentPackageDeps . snd) (executableConfigs lbi) -+ where -+ -- True if this dependency is an internal one (depends on the library -+ -- defined in the same package). -+ internal pkgid = pkgid == packageId (localPkgDescr lbi) - - -- | The installed package Id we use for local packages registered in the local - -- package db. This is what is used for intra-package deps between components. diff --git a/lang/ghc/files/patch-mk_config.mk.in b/lang/ghc/files/patch-mk_config.mk.in new file mode 100644 index 000000000000..091c2aadddb3 --- /dev/null +++ b/lang/ghc/files/patch-mk_config.mk.in @@ -0,0 +1,12 @@ +--- ./mk/config.mk.in.orig 2012-02-01 19:10:32.000000000 +0100 ++++ ./mk/config.mk.in 2012-05-17 11:30:15.271461640 +0200 +@@ -699,6 +699,9 @@ + # and compiler/main/DriverPipeline.hs. + LdHasNoCompactUnwind = @LdHasNoCompactUnwind@ + ++LdHashSize31 = @LdHashSize31@ ++LdReduceMemoryOverheads = @LdReduceMemoryOverheads@ ++ + # On MSYS, building with SplitObjs=YES fails with + # ar: Bad file number + # see #3201. We need to specify a smaller max command-line size diff --git a/lang/ghc/files/patch-rts_package.conf.in b/lang/ghc/files/patch-rts_package.conf.in index 4732ffc6ebe9..e3f4f73239ea 100644 --- a/lang/ghc/files/patch-rts_package.conf.in +++ b/lang/ghc/files/patch-rts_package.conf.in @@ -17,7 +17,7 @@ $FreeBSD$ , "-u", "base_GHCziConc_runSparks_closure" , "-u", "base_GHCziConc_runHandlers_closure" #endif -+ , "-L/usr/local/lib" ++ , "-L%%LOCALBASE%%/lib" /* Pick up static libraries in preference over dynamic if in earlier search * path. This is important to use the static gmp in preference on Mac OS. diff --git a/lang/ghc/pkg-descr b/lang/ghc/pkg-descr index d2357b56433e..28181522ac05 100644 --- a/lang/ghc/pkg-descr +++ b/lang/ghc/pkg-descr @@ -2,23 +2,15 @@ Haskell is the standard lazy purely functional programming language. The current language version is Haskell 98, agreed in December 1998, with a revised version published in January 2003. -A wide variety of Haskell related resources (tutorials, libraries, -specifications, documentation, compilers, interpreters, references, -contact information, links to research groups) are available from -the Haskell home page at http://haskell.org/. - The Glasgow Haskell Compiler is a robust, fully-featured, optimising compiler for the functional programming language Haskell 98 generating -good code for a variety of platforms. GHC is a state-of-the-art -programming suite for Haskell and compiles Haskell to either native -code or C. It implements numerous experimental language extensions to +good code for a variety of platforms. GHC is a state-of-the-art +programming suite for Haskell and compiles Haskell to either native code +or C. It implements numerous experimental language extensions to Haskell, including concurrency, a foreign language interface, several -type-system extensions, exceptions, and so on. GHC comes with a +type-system extensions, exceptions, and so on. GHC comes with a generational garbage collector, a space and time profiler, comprehensive set of libraries and an interactive system for convenient, quick development. -The profiling libraries for Glorious Glasgow Haskell Compilation System -should be installed when GHC's profiling subsystem is needed. - -WWW: http://www.haskell.org/ghc/ +WWW: http://www.haskell.org/ghc/ diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile index 2e379e9dae01..895bb169de37 100644 --- a/lang/hs-brainfuck/Makefile +++ b/lang/hs-brainfuck/Makefile @@ -7,7 +7,7 @@ PORTNAME= brainfuck PORTVERSION= 0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang haskell MAINTAINER= haskell@FreeBSD.org diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile index 1875ed6f816b..6c545eb49ca6 100644 --- a/lang/hs-unlambda/Makefile +++ b/lang/hs-unlambda/Makefile @@ -7,7 +7,7 @@ PORTNAME= unlambda PORTVERSION= 0.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang haskell MAINTAINER= haskell@FreeBSD.org diff --git a/lang/whitespace/Makefile b/lang/whitespace/Makefile index 1fe6554636cb..8462ed529027 100644 --- a/lang/whitespace/Makefile +++ b/lang/whitespace/Makefile @@ -7,7 +7,7 @@ PORTNAME= whitespace PORTVERSION= 0.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= lang MASTER_SITES= http://compsoc.dur.ac.uk/whitespace/downloads/ DISTNAME= wspace-${PORTVERSION} diff --git a/lang/whitespace/files/patch-VM.hs b/lang/whitespace/files/patch-VM.hs new file mode 100644 index 000000000000..3ce69251f568 --- /dev/null +++ b/lang/whitespace/files/patch-VM.hs @@ -0,0 +1,10 @@ +--- ./VM.hs.orig 2004-05-04 19:10:41.000000000 +0200 ++++ ./VM.hs 2012-05-12 21:52:19.000000000 +0200 +@@ -1,6 +1,6 @@ + module VM where + +-import IO ++import System.IO + + {- Stack machine for running whitespace programs -} + diff --git a/lang/whitespace/files/patch-main.hs b/lang/whitespace/files/patch-main.hs new file mode 100644 index 000000000000..bf7711f9d1d3 --- /dev/null +++ b/lang/whitespace/files/patch-main.hs @@ -0,0 +1,11 @@ +--- ./main.hs.orig 2003-03-31 17:33:44.000000000 +0200 ++++ ./main.hs 2012-05-12 21:52:07.000000000 +0200 +@@ -26,7 +26,7 @@ + import VM + import Tokens + +-import System(getArgs) ++import System.Environment (getArgs) + + main :: IO () + main = do diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile index 36ef82704594..5c5a72e43718 100644 --- a/mail/hs-mime-mail/Makefile +++ b/mail/hs-mime-mail/Makefile @@ -7,6 +7,7 @@ PORTNAME= mime-mail PORTVERSION= 0.4.1.1 +PORTREVISION= 1 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +15,8 @@ COMMENT= Compose MIME email messages LICENSE= BSD -USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 text>=0.7 +USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 \ + text>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile index df324213aea6..f2b5c2e520c8 100644 --- a/mail/hs-mime/Makefile +++ b/mail/hs-mime/Makefile @@ -7,6 +7,7 @@ PORTNAME= mime PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= mail haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/Makefile b/math/Makefile index 16f9ac4c0ac9..3430b71b25e3 100644 --- a/math/Makefile +++ b/math/Makefile @@ -154,6 +154,7 @@ SUBDIR += hs-data-lens-template SUBDIR += hs-distributive SUBDIR += hs-erf + SUBDIR += hs-ieee754 SUBDIR += hs-math-functions SUBDIR += hs-mwc-random SUBDIR += hs-pointed diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile index e0086e27c196..adb401e54723 100644 --- a/math/hs-NumInstances/Makefile +++ b/math/hs-NumInstances/Makefile @@ -7,6 +7,7 @@ PORTNAME= NumInstances PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile index ea7648bebd15..c29dbe2343d0 100644 --- a/math/hs-erf/Makefile +++ b/math/hs-erf/Makefile @@ -7,7 +7,7 @@ PORTNAME= erf PORTVERSION= 2.0.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile index b0e90bedec31..9c61870ea83c 100644 --- a/math/hs-math-functions/Makefile +++ b/math/hs-math-functions/Makefile @@ -7,6 +7,7 @@ PORTNAME= math-functions PORTVERSION= 0.1.1.1 +PORTREVISION= 1 CATEGORIES= math haskell MAINTAINER= wen@FreeBSD.org @@ -14,9 +15,9 @@ COMMENT= Special mathematical functions and Chebyshev polynomials LICENSE= BSD -USE_CABAL= erf>=2 vector>=0.7 - CABAL_SETUP= Setup.hs +USE_CABAL= erf>=2 vector>=0.7 + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-math-functions/pkg-descr b/math/hs-math-functions/pkg-descr index efb668ac39fe..35201804f179 100644 --- a/math/hs-math-functions/pkg-descr +++ b/math/hs-math-functions/pkg-descr @@ -2,4 +2,4 @@ This library provides implementations of special mathematical functions and Chebyshev polynomials. These functions are often useful in statistical and numerical computing. -WWW: https://github.com/bos/math-functions +WWW: https://github.com/bos/math-functions diff --git a/net/Makefile b/net/Makefile index 5c9a86de296d..4fc9cd77d6bb 100644 --- a/net/Makefile +++ b/net/Makefile @@ -226,9 +226,11 @@ SUBDIR += hping-devel SUBDIR += hs-hostname SUBDIR += hs-network + SUBDIR += hs-network-conduit SUBDIR += hs-pcap SUBDIR += hs-sendfile SUBDIR += hs-simple-sendfile + SUBDIR += hs-socks SUBDIR += htpdate SUBDIR += http_ping SUBDIR += httping diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile index 971da0d2be36..0c9b5a385bd5 100644 --- a/net/hs-hostname/Makefile +++ b/net/hs-hostname/Makefile @@ -7,7 +7,7 @@ PORTNAME= hostname PORTVERSION= 1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile index 2009d0fe5bd1..9c91d574e4a3 100644 --- a/net/hs-pcap/Makefile +++ b/net/hs-pcap/Makefile @@ -7,7 +7,7 @@ PORTNAME= pcap PORTVERSION= 0.4.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net haskell MAINTAINER= haskell@FreeBSD.org diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile index 2d5c3011c059..d063ca641ef5 100644 --- a/ports-mgmt/hs-porte/Makefile +++ b/ports-mgmt/hs-porte/Makefile @@ -6,7 +6,7 @@ PORTNAME= porte PORTVERSION= 0.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= ports-mgmt haskell MAINTAINER= sbahra@repnop.org diff --git a/print/Makefile b/print/Makefile index 19a31e665ae0..3eb9cbdcb54d 100644 --- a/print/Makefile +++ b/print/Makefile @@ -113,7 +113,6 @@ SUBDIR += hpijs SUBDIR += hplip SUBDIR += hs-hscolour - SUBDIR += hs-hscolour-docs SUBDIR += html2latex SUBDIR += html2ps-a4 SUBDIR += html2ps-letter diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile index 7604e072dfa2..ac12392f2ddd 100644 --- a/print/hs-hscolour/Makefile +++ b/print/hs-hscolour/Makefile @@ -7,7 +7,7 @@ PORTNAME= hscolour PORTVERSION= 1.19 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= print haskell @@ -21,5 +21,13 @@ CABAL_SETUP= Setup.hs EXECUTABLE= HsColour +.if defined(WITH_HSCOLOUR_DOCS) +pre-everything:: + @${ECHO_MSG} "=================================================================" + @${ECHO_MSG} " Please note that you will not be able to build HsColour-enabled " + @${ECHO_MSG} " documentation without installing HsColour without that first. " + @${ECHO_MSG} "=================================================================" +.endif + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/Makefile b/security/Makefile index 2591ddd58c07..8034439cc70f 100644 --- a/security/Makefile +++ b/security/Makefile @@ -198,6 +198,8 @@ SUBDIR += hs-cryptohash SUBDIR += hs-digest SUBDIR += hs-entropy + SUBDIR += hs-monadcryptorandom + SUBDIR += hs-pem SUBDIR += hs-pureMD5 SUBDIR += hs-pwstore-fast SUBDIR += hs-skein diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile index 69cd7c61bde7..c4b38b81be8f 100644 --- a/security/hs-cprng-aes/Makefile +++ b/security/hs-cprng-aes/Makefile @@ -7,6 +7,7 @@ PORTNAME= cprng-aes PORTVERSION= 0.2.3 +PORTREVISION= 1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org @@ -15,7 +16,8 @@ COMMENT= Crypto Pseudo Random Number Generator using AES LICENSE= BSD CABAL_SETUP= Setup.hs -USE_CABAL= cereal>=0.3.0 crypto-api>=0.8 cryptocipher>=0.2.5 entropy>=0.2 +USE_CABAL= cereal>=0.3.0 crypto-api>=0.8 cryptocipher>=0.2.5 entropy>=0.2 \ + random .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile index 1b5a8359f011..3b4ad0784c09 100644 --- a/security/hs-entropy/Makefile +++ b/security/hs-entropy/Makefile @@ -7,6 +7,7 @@ PORTNAME= entropy PORTVERSION= 0.2.1 +PORTREVISION= 1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile index fc8e9a3d4aec..befcc5457e20 100644 --- a/security/hs-pureMD5/Makefile +++ b/security/hs-pureMD5/Makefile @@ -7,6 +7,7 @@ PORTNAME= pureMD5 PORTVERSION= 2.1.0.3 +PORTREVISION= 1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +15,7 @@ COMMENT= Haskell implementation of MD5 algorithm LICENSE= BSD -USE_CABAL= binary>=0.4.0 cereal>=0.2 crypto-api tagged +USE_CABAL= cereal>=0.2 crypto-api tagged .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile index ebdc12f09ddc..5fdf0f13df28 100644 --- a/security/hs-pwstore-fast/Makefile +++ b/security/hs-pwstore-fast/Makefile @@ -7,6 +7,7 @@ PORTNAME= pwstore-fast PORTVERSION= 2.2 +PORTREVISION= 1 CATEGORIES= security haskell MAINTAINER= haskell@FreeBSD.org @@ -15,7 +16,7 @@ COMMENT= Secure password storage LICENSE= BSD CABAL_SETUP= Setup.hs -USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 +USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/sysutils/Makefile b/sysutils/Makefile index 1700d593d7e3..4058784f5fe9 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -376,6 +376,7 @@ SUBDIR += hoz SUBDIR += hpacucli SUBDIR += hploscripts + SUBDIR += hs-cpu SUBDIR += htop SUBDIR += httplog SUBDIR += hwstat diff --git a/textproc/Makefile b/textproc/Makefile index 9f49a5740c50..c47b81e296b3 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -239,8 +239,10 @@ SUBDIR += hs-HStringTemplate SUBDIR += hs-HaXml SUBDIR += hs-attoparsec + SUBDIR += hs-attoparsec-conduit SUBDIR += hs-attoparsec-enumerator SUBDIR += hs-blaze-html + SUBDIR += hs-blaze-markup SUBDIR += hs-bytestring-csv SUBDIR += hs-case-insensitive SUBDIR += hs-citeproc-hs @@ -268,9 +270,8 @@ SUBDIR += hs-tagsoup SUBDIR += hs-texmath SUBDIR += hs-xhtml - SUBDIR += hs-xhtml-docs SUBDIR += hs-xml - SUBDIR += hs-xml-enumerator + SUBDIR += hs-xml-conduit SUBDIR += hs-xml-types SUBDIR += hs-xmlhtml SUBDIR += hs-yaml diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile index 7d7a397814b9..5f066134da9a 100644 --- a/textproc/hs-Diff/Makefile +++ b/textproc/hs-Diff/Makefile @@ -7,6 +7,7 @@ PORTNAME= Diff PORTVERSION= 0.1.3 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile index 6f45f311d06c..2f004f60e1f2 100644 --- a/textproc/hs-HStringTemplate/Makefile +++ b/textproc/hs-HStringTemplate/Makefile @@ -7,6 +7,7 @@ PORTNAME= HStringTemplate PORTVERSION= 0.6.8 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile index e8a6154b7b3e..fc0d8f8cc88c 100644 --- a/textproc/hs-HaXml/Makefile +++ b/textproc/hs-HaXml/Makefile @@ -6,6 +6,7 @@ PORTNAME= HaXml PORTVERSION= 1.22.5 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -15,7 +16,7 @@ LICENSE= LGPL21 FILE_LICENSE= COPYRIGHT CABAL_SETUP= Setup.hs -USE_CABAL= polyparse>=1.5 +USE_CABAL= polyparse>=1.5 random EXECUTABLE= Canonicalise CanonicaliseLazy \ DtdToHaskell MkOneOf Validate \ diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile index 66d0e19bef8a..b00b434f7f01 100644 --- a/textproc/hs-attoparsec-enumerator/Makefile +++ b/textproc/hs-attoparsec-enumerator/Makefile @@ -7,6 +7,7 @@ PORTNAME= attoparsec-enumerator PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile index 6d351468592f..07001dbaebda 100644 --- a/textproc/hs-bytestring-csv/Makefile +++ b/textproc/hs-bytestring-csv/Makefile @@ -6,7 +6,7 @@ PORTNAME= bytestring-csv PORTVERSION= 0.1.2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile index 30085262fa0f..e6afc2e1e9d5 100644 --- a/textproc/hs-case-insensitive/Makefile +++ b/textproc/hs-case-insensitive/Makefile @@ -7,6 +7,7 @@ PORTNAME= case-insensitive PORTVERSION= 0.4.0.1 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile index 81df304cd43e..b50068667e24 100644 --- a/textproc/hs-csv/Makefile +++ b/textproc/hs-csv/Makefile @@ -7,7 +7,7 @@ PORTNAME= csv PORTVERSION= 0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile index cf506ed0c72a..92b3960ff9c7 100644 --- a/textproc/hs-double-conversion/Makefile +++ b/textproc/hs-double-conversion/Makefile @@ -7,6 +7,7 @@ PORTNAME= double-conversion PORTVERSION= 0.2.0.4 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile index 0f4d59f28f2f..84fae72ad9d3 100644 --- a/textproc/hs-feed/Makefile +++ b/textproc/hs-feed/Makefile @@ -7,7 +7,7 @@ PORTNAME= feed PORTVERSION= 0.3.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile index e8af2ff7a7e8..c678e747656d 100644 --- a/textproc/hs-hs-bibutils/Makefile +++ b/textproc/hs-hs-bibutils/Makefile @@ -7,7 +7,7 @@ PORTNAME= hs-bibutils PORTVERSION= 4.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile index 6a956cd65f5c..3aedac1bccaf 100644 --- a/textproc/hs-html/Makefile +++ b/textproc/hs-html/Makefile @@ -7,7 +7,7 @@ PORTNAME= html PORTVERSION= 1.0.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile index 95abfb4b8ddd..b62ea0f32f73 100644 --- a/textproc/hs-hxt-charproperties/Makefile +++ b/textproc/hs-hxt-charproperties/Makefile @@ -7,6 +7,7 @@ PORTNAME= hxt-charproperties PORTVERSION= 9.1.1 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile index e0979ef6b0e8..3aec85fbaa70 100644 --- a/textproc/hs-hxt-regex-xmlschema/Makefile +++ b/textproc/hs-hxt-regex-xmlschema/Makefile @@ -7,6 +7,7 @@ PORTNAME= hxt-regex-xmlschema PORTVERSION= 9.0.4 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile index 4810010cf1b5..5a93949db0c8 100644 --- a/textproc/hs-hxt-unicode/Makefile +++ b/textproc/hs-hxt-unicode/Makefile @@ -7,6 +7,7 @@ PORTNAME= hxt-unicode PORTVERSION= 9.0.2 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile index 30622ed12fba..8435601ef81e 100644 --- a/textproc/hs-lhs2tex/Makefile +++ b/textproc/hs-lhs2tex/Makefile @@ -8,7 +8,7 @@ PORTNAME= lhs2tex PORTVERSION= 1.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile index 3f52154bdb56..14a3adf34dd1 100644 --- a/textproc/hs-libxml/Makefile +++ b/textproc/hs-libxml/Makefile @@ -7,7 +7,7 @@ PORTNAME= libxml PORTVERSION= 0.1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile index 2184c57bb870..e27e4f4e1289 100644 --- a/textproc/hs-regex-base/Makefile +++ b/textproc/hs-regex-base/Makefile @@ -7,7 +7,7 @@ PORTNAME= regex-base PORTVERSION= 0.93.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile index dda4049f87b0..525c89e9d288 100644 --- a/textproc/hs-regex-compat/Makefile +++ b/textproc/hs-regex-compat/Makefile @@ -7,6 +7,7 @@ PORTNAME= regex-compat PORTVERSION= 0.95.1 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile index ddb656d60d7c..0438393a480b 100644 --- a/textproc/hs-regex-pcre-builtin/Makefile +++ b/textproc/hs-regex-pcre-builtin/Makefile @@ -7,7 +7,7 @@ PORTNAME= regex-pcre-builtin PORTVERSION= 0.94.2.1.7.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile index fb8047237d2c..c24257be37fb 100644 --- a/textproc/hs-regex-posix/Makefile +++ b/textproc/hs-regex-posix/Makefile @@ -7,6 +7,7 @@ PORTNAME= regex-posix PORTVERSION= 0.95.1 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile index ab2736521459..8060c2a466ba 100644 --- a/textproc/hs-stringsearch/Makefile +++ b/textproc/hs-stringsearch/Makefile @@ -6,6 +6,7 @@ PORTNAME= stringsearch PORTVERSION= 0.3.6.3 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile index 736b16d75285..d1de57ecd897 100644 --- a/textproc/hs-tagsoup/Makefile +++ b/textproc/hs-tagsoup/Makefile @@ -7,6 +7,7 @@ PORTNAME= tagsoup PORTVERSION= 0.12.6 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile index 6c883996db27..077f77aafb1b 100644 --- a/textproc/hs-xml-types/Makefile +++ b/textproc/hs-xml-types/Makefile @@ -7,6 +7,7 @@ PORTNAME= xml-types PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile index 0aa03b2455e4..1c4a08287ad2 100644 --- a/textproc/hs-xml/Makefile +++ b/textproc/hs-xml/Makefile @@ -7,6 +7,7 @@ PORTNAME= xml PORTVERSION= 1.3.12 +PORTREVISION= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/Makefile b/www/Makefile index 9a7f06f9c2cb..3868e2190dd9 100644 --- a/www/Makefile +++ b/www/Makefile @@ -288,13 +288,9 @@ SUBDIR += hs-hS3 SUBDIR += hs-hamlet SUBDIR += hs-happstack - SUBDIR += hs-happstack-data - SUBDIR += hs-happstack-ixset SUBDIR += hs-happstack-server - SUBDIR += hs-happstack-state - SUBDIR += hs-happstack-util SUBDIR += hs-heist - SUBDIR += hs-http-enumerator + SUBDIR += hs-http-conduit SUBDIR += hs-http-server SUBDIR += hs-http-types SUBDIR += hs-oeis @@ -322,6 +318,7 @@ SUBDIR += hs-yesod-form SUBDIR += hs-yesod-json SUBDIR += hs-yesod-persistent + SUBDIR += hs-yesod-routes SUBDIR += htdump SUBDIR += html2hdml SUBDIR += html2wml diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile index 6640af089d47..76f3436f7ab6 100644 --- a/www/hs-cgi/Makefile +++ b/www/hs-cgi/Makefile @@ -7,7 +7,7 @@ PORTNAME= cgi PORTVERSION= 3001.1.7.4 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www haskell diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile index b111f7eeeea4..1da62b78119c 100644 --- a/www/hs-css-text/Makefile +++ b/www/hs-css-text/Makefile @@ -7,6 +7,7 @@ PORTNAME= css-text PORTVERSION= 0.1.1 +PORTREVISION= 1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile index 213d98f64fe1..9a7d0d680baf 100644 --- a/www/hs-fastcgi/Makefile +++ b/www/hs-fastcgi/Makefile @@ -7,7 +7,7 @@ PORTNAME= fastcgi PORTVERSION= 3001.0.2.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile index 6cf8224e086d..3f3ca5c6d1ec 100644 --- a/www/hs-hS3/Makefile +++ b/www/hs-hS3/Makefile @@ -7,7 +7,7 @@ PORTNAME= hS3 PORTVERSION= 0.5.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile index 77ed28c69664..e3c61e122722 100644 --- a/www/hs-http-server/Makefile +++ b/www/hs-http-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= http-server PORTVERSION= 1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-server/files/patch-Network__HTTP__Server.hs b/www/hs-http-server/files/patch-Network__HTTP__Server.hs new file mode 100644 index 000000000000..0c736fa6a37d --- /dev/null +++ b/www/hs-http-server/files/patch-Network__HTTP__Server.hs @@ -0,0 +1,13 @@ +--- ./Network/HTTP/Server.hs.orig 2009-06-13 03:58:45.000000000 +0200 ++++ ./Network/HTTP/Server.hs 2012-05-13 21:03:32.137467690 +0200 +@@ -123,8 +123,9 @@ + + client sock addr = + do let name = ppSockAddr addr "" ++ let port = ppSockPort addr + logInfo lg 0 ("Accepted connection from " ++ name) +- conn <- socketConnection name sock -- XXX: name? ++ conn <- socketConnection name port sock -- XXX: name? + setStreamHooks conn nullHooks { hook_close = + logInfo lg 0 ("Closing connection to " ++ ppSockAddr addr "") + } diff --git a/www/hs-http-server/files/patch-Network__HTTP__Server__Utils.hs b/www/hs-http-server/files/patch-Network__HTTP__Server__Utils.hs new file mode 100644 index 000000000000..d816ca0cf2f9 --- /dev/null +++ b/www/hs-http-server/files/patch-Network__HTTP__Server__Utils.hs @@ -0,0 +1,18 @@ +--- ./Network/HTTP/Server/Utils.hs.orig 2009-06-13 03:58:45.000000000 +0200 ++++ ./Network/HTTP/Server/Utils.hs 2012-05-13 21:03:02.570464902 +0200 +@@ -48,11 +48,11 @@ + + ppSockAddr :: SockAddr -> ShowS + ppSockAddr (SockAddrInet port addr) = ppHostAddress addr +- . showChar ':' . shows port + #ifdef _OS_UNIX +-ppSockAddr (SockAddrInet6 port _ addr _) = +- ppHostAddress6 addr . showChar ':' . shows port ++ppSockAddr (SockAddrInet6 port _ addr _) = ppHostAddress6 addr + ppSockAddr (SockAddrUnix sock) = showString "unix/" . showString sock + #endif + +- ++ppSockPort :: SockAddr -> Int ++ppSockPort (SockAddrInet port _) = fromIntegral port ++ppSockPort (SockAddrInet6 port _ _ _) = fromIntegral port diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile index 099721e09fc3..e4897d395945 100644 --- a/www/hs-oeis/Makefile +++ b/www/hs-oeis/Makefile @@ -7,7 +7,7 @@ PORTNAME= oeis PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile index ab501b7988b6..6b48d611be4e 100644 --- a/www/hs-recaptcha/Makefile +++ b/www/hs-recaptcha/Makefile @@ -7,6 +7,7 @@ PORTNAME= recaptcha PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile index 11c748c3cb21..f34eff70d020 100644 --- a/www/hs-scgi/Makefile +++ b/www/hs-scgi/Makefile @@ -9,7 +9,7 @@ PORTNAME= scgi PORTVERSION= 0.3.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index f9b1c7a22d66..70df44131ba9 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -90,6 +90,7 @@ SUBDIR += hs-pango SUBDIR += hs-vte SUBDIR += hs-wx + SUBDIR += hs-wxc SUBDIR += hs-wxcore SUBDIR += hs-wxdirect SUBDIR += irrlicht diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile index 22a1c4ada891..7150c4b13dde 100644 --- a/x11-toolkits/hs-GLUT/Makefile +++ b/x11-toolkits/hs-GLUT/Makefile @@ -6,7 +6,7 @@ PORTNAME= GLUT PORTVERSION= 2.1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell diff --git a/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs b/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs new file mode 100644 index 000000000000..f25bc339120c --- /dev/null +++ b/x11-toolkits/hs-GLUT/files/patch-Graphics__UI__GLUT__Types.hs @@ -0,0 +1,16 @@ +--- ./Graphics/UI/GLUT/Types.hs.orig 2009-05-02 18:14:39.000000000 +0200 ++++ ./Graphics/UI/GLUT/Types.hs 2012-05-17 00:04:47.000000000 +0200 +@@ -32,11 +32,10 @@ + + -- | An opaque identifier for a top-level window or a subwindow. + +-newtype Window = Window CInt +- deriving ( Eq, Ord, Show ) ++type Window = CInt + + makeWindow :: CInt -> Window +-makeWindow = Window ++makeWindow = id + + -------------------------------------------------------------------------------- + diff --git a/x11-toolkits/hs-GLUT/pkg-descr b/x11-toolkits/hs-GLUT/pkg-descr index 3038ec260e5b..978adf6d08bc 100644 --- a/x11-toolkits/hs-GLUT/pkg-descr +++ b/x11-toolkits/hs-GLUT/pkg-descr @@ -1,6 +1,4 @@ The GLUT package contains a Haskell binding for the OpenGL Utility Toolkit, a -window system independent toolkit for writing OpenGL programs. For more -information about the C library on which this binding is based, please see: -<http://www.opengl.org/resources/libraries/glut/>. +window system independent toolkit for writing OpenGL programs. -WWW: http://www.haskell.org/HOpenGL/ +WWW: http://www.haskell.org/HOpenGL/ diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile index 4dbe59cf168b..171055139f47 100644 --- a/x11-toolkits/hs-gtk2hs/Makefile +++ b/x11-toolkits/hs-gtk2hs/Makefile @@ -7,6 +7,7 @@ PORTNAME= gtk2hs PORTVERSION= 0.12.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits haskell diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile index ebdcea8e8f8d..44650c0291f9 100644 --- a/x11-toolkits/hs-gtkglext/Makefile +++ b/x11-toolkits/hs-gtkglext/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtkglext PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile index 4b65cc43d8c0..d3f660878296 100644 --- a/x11-toolkits/hs-vte/Makefile +++ b/x11-toolkits/hs-vte/Makefile @@ -7,7 +7,7 @@ PORTNAME= vte PORTVERSION= 0.12.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile index f73988603e1e..e0698c675e25 100644 --- a/x11-wm/hs-xmonad-contrib/Makefile +++ b/x11-wm/hs-xmonad-contrib/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmonad-contrib PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org @@ -15,7 +15,7 @@ COMMENT= Third party tiling algorithms, configurations and scripts to xmonad LICENSE= BSD -USE_CABAL= mtl utf8-string X11>=1.5.0.0 xmonad>=0.10 +USE_CABAL= mtl random utf8-string X11>=1.5.0.0 xmonad>=0.10 USE_XORG= x11 RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile index e917b89d57ad..aa0208818cfe 100644 --- a/x11-wm/hs-xmonad/Makefile +++ b/x11-wm/hs-xmonad/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmonad PORTVERSION= 0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile index fc7dadc75eef..c736c4390aaa 100644 --- a/x11/hs-X11-xft/Makefile +++ b/x11/hs-X11-xft/Makefile @@ -7,6 +7,7 @@ PORTNAME= X11-xft PORTVERSION= 0.3.1 +PORTREVISION= 1 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile index 5d78e6590783..45adc59235c3 100644 --- a/x11/hs-X11/Makefile +++ b/x11/hs-X11/Makefile @@ -6,6 +6,7 @@ PORTNAME= X11 PORTVERSION= 1.5.0.1 +PORTREVISION= 1 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org @@ -17,7 +18,7 @@ CABAL_SETUP= Setup.hs USE_CABAL= syb USE_XORG= x11 xext sm -OPTIONS= XINERAMA "Build with Xinerama support" off +OPTIONS= XINERAMA "Build with Xinerama support" on .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .include <bsd.port.options.mk> diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile index d9b23ecf84d3..0ec95c7b56cb 100644 --- a/x11/hs-xmobar/Makefile +++ b/x11/hs-xmobar/Makefile @@ -6,6 +6,7 @@ PORTNAME= xmobar PORTVERSION= 0.14 +PORTREVISION= 1 CATEGORIES= x11 haskell MAINTAINER= haskell@FreeBSD.org |