diff options
Diffstat (limited to 'www')
128 files changed, 507 insertions, 782 deletions
diff --git a/www/Makefile b/www/Makefile index ba983383d018..0f354194d9ef 100644 --- a/www/Makefile +++ b/www/Makefile @@ -292,10 +292,11 @@ SUBDIR += hs-http-reverse-proxy SUBDIR += hs-http-server SUBDIR += hs-http-types + SUBDIR += hs-http2 + SUBDIR += hs-multipart SUBDIR += hs-oeis SUBDIR += hs-path-pieces SUBDIR += hs-recaptcha - SUBDIR += hs-scgi SUBDIR += hs-shakespeare SUBDIR += hs-snap SUBDIR += hs-snap-core @@ -316,8 +317,6 @@ SUBDIR += hs-yesod-core SUBDIR += hs-yesod-form SUBDIR += hs-yesod-persistent - SUBDIR += hs-yesod-platform - SUBDIR += hs-yesod-routes SUBDIR += hs-yesod-static SUBDIR += hs-yesod-test SUBDIR += htdigest diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile index bc450ae7f9f7..868931ee9ba3 100644 --- a/www/hs-DAV/Makefile +++ b/www/hs-DAV/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= DAV -PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTVERSION= 1.0.7 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,13 +9,16 @@ COMMENT= RFC 4918 WebDAV support LICENSE= GPLv3 -USE_CABAL= case-insensitive>=0.4 data-default either>=4.1 errors \ +USE_CABAL= case-insensitive>=0.4 data-default either>=4.1 \ exceptions http-client>=0.2 http-client-tls>=0.2 \ - http-types>=0.7 lens>=3.0 mtl>=2.1 network>=2.3 \ - optparse-applicative>=0.5.0 transformers-base utf8-string \ - xml-conduit>=1.0 xml-hamlet>=0.4 + http-types>=0.7 lens>=3.0 mtl>=2.1 network>=2.6 \ + network-uri>=2.6 optparse-applicative>=0.10.0 \ + transformers-base utf8-string xml-conduit>=1.0 \ + xml-hamlet>=0.4 EXECUTABLE= hdav +FLAGS_ENABLE= network-uri + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo index d20c96428dd0..3589c715e6a5 100644 --- a/www/hs-DAV/distinfo +++ b/www/hs-DAV/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/DAV-1.0.1.tar.gz) = 938cb0beeecc1eaf8a844ba7191e749b7664fdfb0415d5ccae71fa56223c1f49 -SIZE (cabal/DAV-1.0.1.tar.gz) = 20133 +SHA256 (cabal/DAV-1.0.7.tar.gz) = a8a9000b544e872296c8597edd9df10d10ceaa097f981d98bd315c1dfb637c2e +SIZE (cabal/DAV-1.0.7.tar.gz) = 19768 diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile index c3c934474e10..f605ada38d79 100644 --- a/www/hs-HTTP/Makefile +++ b/www/hs-HTTP/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= HTTP -PORTVERSION= 4000.2.10 -PORTREVISION= 1 +PORTVERSION= 4000.2.20 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,11 @@ COMMENT= Library for client-side HTTP LICENSE= BSD3CLAUSE -USE_CABAL= mtl>=2.0 network parsec +USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 \ + parsec>=2.0 + +FLAGS_ENABLE= network-uri +FLAGS_DISABLE= mtl1 warn-as-error network23 conduit10 warp-tests .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo index f208ba4f1656..888d8dc22189 100644 --- a/www/hs-HTTP/distinfo +++ b/www/hs-HTTP/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/HTTP-4000.2.10.tar.gz) = efde6d9f2e8cd7b72068579f0a75449703c0fa7aee76dfc0f3af175295a127d1 -SIZE (cabal/HTTP-4000.2.10.tar.gz) = 67912 +SHA256 (cabal/HTTP-4000.2.20.tar.gz) = 4407cc863699720d179b36257baf21b5f1df4be8c30545dcec4d685a726fd85b +SIZE (cabal/HTTP-4000.2.20.tar.gz) = 71475 diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile index 19c8044922c3..1176f54b2ce5 100644 --- a/www/hs-activehs/Makefile +++ b/www/hs-activehs/Makefile @@ -2,7 +2,7 @@ PORTNAME= activehs PORTVERSION= 0.3.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs index 2cab802ee939..b0d545cc772e 100644 --- a/www/hs-activehs/files/patch-Converter.hs +++ b/www/hs-activehs/files/patch-Converter.hs @@ -1,6 +1,6 @@ ---- ./Converter.hs.orig 2013-02-12 20:23:45.000000000 +0100 -+++ ./Converter.hs 2013-12-27 18:34:37.000000000 +0100 -@@ -28,7 +28,7 @@ +--- Converter.hs.orig 2013-02-12 19:23:45 UTC ++++ Converter.hs +@@ -28,7 +28,7 @@ import System.Directory (getTemporaryDir import Control.Monad import Data.List @@ -9,7 +9,7 @@ ---------------------------------- -@@ -206,7 +206,7 @@ +@@ -206,7 +206,7 @@ preprocessForSlides x = case span (not . ------------------------------------ rawHtml :: String -> Block @@ -18,7 +18,13 @@ showBlockSimple :: Language -> String -> String -> Int -> String -> [Block] -@@ -249,8 +249,8 @@ +@@ -244,13 +244,13 @@ mkImport m d + , HSyn.importSrc = False + , HSyn.importPkg = Nothing + , HSyn.importAs = Nothing +- , HSyn.importSpecs = Just (True, map (HSyn.IVar . mkName) d) ++ , HSyn.importSpecs = Just (True, map (HSyn.IVar HSyn.NoNamespace . mkName) d) + } mkName :: String -> HSyn.Name mkName n@(c:_) diff --git a/www/hs-activehs/files/patch-Main.hs b/www/hs-activehs/files/patch-Main.hs new file mode 100644 index 000000000000..dd63e11e4705 --- /dev/null +++ b/www/hs-activehs/files/patch-Main.hs @@ -0,0 +1,12 @@ +--- Main.hs.orig 2013-02-12 19:23:46 UTC ++++ Main.hs +@@ -28,8 +28,7 @@ import System.Directory (doesFileExist) + import Control.Concurrent (threadDelay) + import Control.Monad (when) + import Control.Applicative ((<|>)) +-import System.Locale (defaultTimeLocale) +-import Data.Time (getCurrentTime, formatTime, diffUTCTime) ++import Data.Time (getCurrentTime, formatTime, diffUTCTime, defaultTimeLocale) + import Data.Maybe (listToMaybe) + --import Prelude hiding (catch) + diff --git a/www/hs-activehs/files/patch-Parse.hs b/www/hs-activehs/files/patch-Parse.hs new file mode 100644 index 000000000000..1ebb809b29bb --- /dev/null +++ b/www/hs-activehs/files/patch-Parse.hs @@ -0,0 +1,27 @@ +--- Parse.hs.orig 2013-02-12 19:23:45 UTC ++++ Parse.hs +@@ -72,12 +72,13 @@ mainParse :: ParseMode -> FilePath -> IO + mainParse mode s = do + c <- readFile s + case readMarkdown pState . unlines . concatMap preprocess . lines $ c of +- Pandoc meta (CodeBlock ("",["sourceCode","literate","haskell"],[]) h: blocks) -> do ++ Right (Pandoc meta (CodeBlock ("",["sourceCode","literate","haskell"],[]) h: blocks)) -> do + header <- parseModule mode $ h + fmap (Doc meta header) $ collectTests mode $ map ({-highlight . -}interpreter . Text) blocks +- Pandoc meta blocks -> do ++ Right (Pandoc meta blocks) -> do + header <- parseModule mode $ "module Unknown where" + fmap (Doc meta header) $ collectTests mode $ map ({-highlight . -}interpreter . Text) blocks ++ Left err -> fail $ "readMarkdown: " ++ show err + where + parseModule :: ParseMode -> String -> IO Module + parseModule HaskellMode m = case HPar.parseModuleWithMode HPar.defaultParseMode m of +@@ -137,7 +138,7 @@ processHaskellLines isExercise l_ = retu + + getFName (HPar.ParseOk x) = case x of + HSyn.TypeSig _ a _ -> map printName a +- HSyn.PatBind _ (HSyn.PVar a) _ _ _ -> [printName a] ++ HSyn.PatBind _ (HSyn.PVar a) _ _ -> [printName a] + HSyn.FunBind (HSyn.Match _ a _ _ _ _ :_) -> [printName a] + HSyn.TypeDecl _ a _ _ -> [printName a] + HSyn.DataDecl _ _ _ a _ x _ -> printName a: [printName n | HSyn.QualConDecl _ _ _ y<-x, n <- getN y] diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal index 170b056abcf3..01f9fac518ae 100644 --- a/www/hs-activehs/files/patch-activehs.cabal +++ b/www/hs-activehs/files/patch-activehs.cabal @@ -1,44 +1,58 @@ ---- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100 -+++ ./activehs.cabal 2014-07-14 02:37:00.000000000 +0200 -@@ -62,29 +62,31 @@ +--- activehs.cabal.orig 2013-02-12 19:23:46 UTC ++++ activehs.cabal +@@ -56,37 +56,39 @@ Executable activehs + Special + + Build-Depends: +- highlighting-kate >= 0.5 && < 0.6, ++ highlighting-kate >= 0.5 && < 0.7, + hoogle >= 4.2.11 && < 4.3, + dia-base >= 0.1 && < 0.2, dia-functions >= 0.2.1.1 && < 0.3, activehs-base >= 0.2 && < 0.4, data-pprint >= 0.2 && < 0.3, - base >= 4.0 && < 4.7, - QuickCheck >= 2.4 && < 2.6, - array >= 0.3 && < 0.5, -+ base >= 4.0 && < 4.8, -+ QuickCheck >= 2.4 && < 2.7, ++ base >= 4.0 && < 4.9, ++ QuickCheck >= 2.4 && < 2.9, + array >= 0.3 && < 0.6, directory >= 1.1 && < 1.3, containers >= 0.4 && < 0.6, - filepath >= 1.2 && < 1.4, +- filepath >= 1.2 && < 1.4, - text >= 0.11 && < 0.12, -+ text >= 1.1 && < 1.2, ++ filepath >= 1.2 && < 1.5, ++ text >= 1.1 && < 1.3, snap-core >= 0.6 && < 0.10, snap-server >= 0.6 && < 0.10, - syb >= 0.2 && < 0.4, - haskell-src-exts >= 1.12 && < 1.14, -+ syb >= 0.2 && < 0.5, -+ haskell-src-exts >= 1.15 && < 1.16, ++ syb >= 0.2 && < 0.6, ++ haskell-src-exts >= 1.16 && < 1.17, bytestring >= 0.9 && < 0.11, - utf8-string >= 0.3 && < 0.4, +- utf8-string >= 0.3 && < 0.4, ++ utf8-string >= 0.3 && < 1.1, xhtml >= 3000.2 && < 3000.3, - blaze-html >= 0.4 && < 0.6, -+ blaze-html >= 0.4 && < 0.8, -+ blaze-markup >= 0.6 && < 0.7, ++ blaze-html >= 0.4 && < 0.9, ++ blaze-markup >= 0.6 && < 0.8, pureMD5 >= 2.1 && < 2.2, - deepseq >= 1.1 && < 1.4, -+ exceptions >= 0.6 && < 0.7, +- deepseq >= 1.1 && < 1.4, ++ deepseq >= 1.1 && < 1.5, ++ exceptions >= 0.6 && < 0.9, split >= 0.1 && < 0.3, - pandoc >= 1.10 && < 1.11, -+ pandoc >= 1.10 && < 1.14, - time >= 1.2 && < 1.5, +- time >= 1.2 && < 1.5, ++ pandoc >= 1.10 && < 1.16, ++ time >= 1.2 && < 1.6, old-time >= 1.0 && < 1.2, - process >= 1.0 && < 1.2, - hint >= 0.3.3.2 && < 0.4, + process >= 1.0 && < 1.3, + hint >= 0.4 && < 0.5, simple-reflect >= 0.2 && < 0.4, - mtl >= 2.0 && < 2.2, +- mtl >= 2.0 && < 2.2, ++ mtl >= 2.0 && < 2.3, old-locale >= 1.0 && < 1.1, + cmdargs >= 0.7 && < 0.11 + diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile index 74ce2ba11243..60c8651f563d 100644 --- a/www/hs-authenticate/Makefile +++ b/www/hs-authenticate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= authenticate -PORTVERSION= 1.3.2.9 -PORTREVISION= 1 +PORTVERSION= 1.3.2.11 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,8 +11,11 @@ LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \ conduit>=0.5 http-conduit>=1.5 http-types>=0.6 monad-control \ - network resourcet tagstream-conduit>=0.5.5 text \ - unordered-containers xml-conduit>=1.0 + network>=2.6 network-uri>=2.6 resourcet \ + tagstream-conduit>=0.5.5 text unordered-containers \ + xml-conduit>=1.0 + +FLAGS_ENABLE= network-uri .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo index b52343fa60b7..537b9cdb3748 100644 --- a/www/hs-authenticate/distinfo +++ b/www/hs-authenticate/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/authenticate-1.3.2.9.tar.gz) = b93d342b23ce9bea970b7251ae0df0026759986c05c5270f36a60ca8453d6f27 -SIZE (cabal/authenticate-1.3.2.9.tar.gz) = 8517 +SHA256 (cabal/authenticate-1.3.2.11.tar.gz) = 049388bf2ebf9017f3854462e1e2af57366959528e815017651e8da112577ff6 +SIZE (cabal/authenticate-1.3.2.11.tar.gz) = 8728 diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile index 9ab4af02f5d8..7558b3dabb6f 100644 --- a/www/hs-cgi/Makefile +++ b/www/hs-cgi/Makefile @@ -2,17 +2,20 @@ # $FreeBSD$ PORTNAME= cgi -PORTVERSION= 3001.1.8.5 -PORTREVISION= 1 +PORTVERSION= 3001.2.2.2 PORTEPOCH= 1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Haskell library for writing CGI programs +COMMENT= Library for writing CGI programs LICENSE= BSD3CLAUSE -USE_CABAL= MonadCatchIO-mtl mtl>=1.0 network>=2.0 parsec>=2.0 +USE_CABAL= exceptions mtl>=2.2.1 multipart>=0.1.2 network>=2.6 \ + network-uri>=2.6 old-locale old-time parsec>=2.0 + +FLAGS_ENABLE= network-uri +FLAGS_DISABLE= old-mtl .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo index dfdc79e74deb..64262abe23e2 100644 --- a/www/hs-cgi/distinfo +++ b/www/hs-cgi/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/cgi-3001.1.8.5.tar.gz) = 46cfb262f95348e88629fe30a9a8319aec510601be3a550cfb02fb1267b2db39 -SIZE (cabal/cgi-3001.1.8.5.tar.gz) = 21423 +SHA256 (cabal/cgi-3001.2.2.2.tar.gz) = 23850f29cd80a5ac671c5663b8b3b3aae45e269c8db5a8216082c487d4ed3760 +SIZE (cabal/cgi-3001.2.2.2.tar.gz) = 17270 diff --git a/www/hs-cgi/files/patch-Network__CGI__Monad.hs b/www/hs-cgi/files/patch-Network__CGI__Monad.hs deleted file mode 100644 index 8956c1e1ad0e..000000000000 --- a/www/hs-cgi/files/patch-Network__CGI__Monad.hs +++ /dev/null @@ -1,30 +0,0 @@ ---- ./Network/CGI/Monad.hs.orig 2014-02-04 09:00:24.000000000 +0100 -+++ ./Network/CGI/Monad.hs 2014-07-13 18:20:00.000000000 +0200 -@@ -1,4 +1,4 @@ --{-# OPTIONS_GHC -fglasgow-exts #-} -+{-# LANGUAGE DeriveDataTypeable #-} - ----------------------------------------------------------------------------- - -- | - -- Module : Network.CGI.Monad -@@ -40,8 +40,7 @@ - import Control.Monad.Reader (ReaderT(..), asks) - import Control.Monad.Writer (WriterT(..), tell) - import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift) --import Data.Typeable (Typeable(..), Typeable1(..), -- mkTyConApp, mkTyCon) -+import Data.Typeable - - import Network.CGI.Protocol - -@@ -55,10 +54,7 @@ - - -- | The CGIT monad transformer. - newtype CGIT m a = CGIT { unCGIT :: ReaderT CGIRequest (WriterT Headers m) a } -- --instance (Typeable1 m, Typeable a) => Typeable (CGIT m a) where -- typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Monad.CGIT") -- [typeOf1 (undefined :: m a), typeOf (undefined :: a)] -+ deriving Typeable - - instance (Functor m, Monad m) => Functor (CGIT m) where - fmap f c = CGIT (fmap f (unCGIT c)) diff --git a/www/hs-cgi/files/patch-Network__CGI__Protocol.hs b/www/hs-cgi/files/patch-Network__CGI__Protocol.hs deleted file mode 100644 index ab1e0cb21bec..000000000000 --- a/www/hs-cgi/files/patch-Network__CGI__Protocol.hs +++ /dev/null @@ -1,35 +0,0 @@ ---- ./Network/CGI/Protocol.hs.orig 2014-02-04 09:00:24.000000000 +0100 -+++ ./Network/CGI/Protocol.hs 2014-07-13 18:20:00.000000000 +0200 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE DeriveDataTypeable #-} - ----------------------------------------------------------------------------- - -- | - -- Module : Network.CGI.Protocol -@@ -44,7 +45,7 @@ - import qualified Data.ByteString.Lazy.Char8 as BS - import Data.ByteString.Lazy.Char8 (ByteString) - --import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon) -+import Data.Typeable - - import Network.CGI.Header - import Network.CGI.Multipart -@@ -72,9 +73,6 @@ - } - deriving (Show) - --instance Typeable CGIResult where -- typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Protocol.CGIResult") [] -- - -- | The value of an input parameter, and some metadata. - data Input = Input { - inputValue :: ByteString, -@@ -90,7 +88,7 @@ - -- | The result of a CGI program. - data CGIResult = CGIOutput ByteString - | CGINothing -- deriving (Show, Read, Eq, Ord) -+ deriving (Show, Read, Eq, Ord, Typeable) - - -- - -- * Running CGI actions diff --git a/www/hs-cgi/pkg-descr b/www/hs-cgi/pkg-descr index 51768124759e..4d364c7e00f6 100644 --- a/www/hs-cgi/pkg-descr +++ b/www/hs-cgi/pkg-descr @@ -1,3 +1,3 @@ This is a Haskell library for writing CGI programs. -WWW: http://andersk.mit.edu/haskell/cgi/ +WWW: https://github.com/cheecheeo/haskell-cgi diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile index 48cb114c1892..727f86d676bf 100644 --- a/www/hs-cookie/Makefile +++ b/www/hs-cookie/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cookie -PORTVERSION= 0.4.1.2 -PORTREVISION= 1 +PORTVERSION= 0.4.1.6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= HTTP cookie parsing and rendering LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.2.1 data-default text>=0.7 +USE_CABAL= blaze-builder>=0.2.1 data-default-class old-locale>=1 text>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo index 06b7889e4249..87f08e72f354 100644 --- a/www/hs-cookie/distinfo +++ b/www/hs-cookie/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/cookie-0.4.1.2.tar.gz) = 716006fb3934f10479252c253e729fc0cd3096cf882c68ad1aea57524d51afb7 -SIZE (cabal/cookie-0.4.1.2.tar.gz) = 4577 +SHA256 (cabal/cookie-0.4.1.6.tar.gz) = 3a2da4db7478ae45f848ebd5fcd40c23c84ecd00be79dec857e526619da9de2c +SIZE (cabal/cookie-0.4.1.6.tar.gz) = 5319 diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile index 7d0fd5867bbd..af0dffa33521 100644 --- a/www/hs-css-text/Makefile +++ b/www/hs-css-text/Makefile @@ -2,7 +2,7 @@ PORTNAME= css-text PORTVERSION= 0.1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile index 1311487d1c32..117feee72682 100644 --- a/www/hs-fastcgi/Makefile +++ b/www/hs-fastcgi/Makefile @@ -3,7 +3,7 @@ PORTNAME= fastcgi PORTVERSION= 3001.0.2.4 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile index 700fcb4674c0..59c00e09d15b 100644 --- a/www/hs-gitit/Makefile +++ b/www/hs-gitit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= gitit -PORTVERSION= 0.10.6.1 -PORTREVISION= 1 +PORTVERSION= 0.11.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -13,12 +12,13 @@ LICENSE= GPLv2 USE_CABAL= aeson>=0.7 base64-bytestring>=0.1 blaze-html>=0.4 \ ConfigFile>=1 feed>=0.3.6 filestore>=0.6 \ happstack-server>=7.0 highlighting-kate>=0.5.0.1 \ - hoauth2>=0.4.1 hslogger>=1 HStringTemplate>=0.6 HTTP>=4000.0 \ + hoauth2>=0.4.2 hslogger>=1 HStringTemplate>=0.6 HTTP>=4000.0 \ http-client-tls>=0.2.2 http-conduit>=2.1.4 json>=0.4 mtl \ - network>=2 pandoc>=1.12.4 pandoc-types>=1.12.3 parsec random \ - recaptcha>=0.1 safe SHA>1 split syb tagsoup>=0.13 text \ - uri>=0.1 url>=2.1 utf8-string>=0.3 uuid>=1.3 xml>=1.3.5 \ - xss-sanitize>=0.3 zlib>=0.5 + network>=2.6 network-uri>=2.6 pandoc>=1.12.4 \ + pandoc-types>=1.12.3 parsec random recaptcha>=0.1 safe SHA>1 \ + split syb tagsoup>=0.13 text uri>=0.1 url>=2.1 \ + utf8-string>=0.3 uuid>=1.3 xml>=1.3.5 xss-sanitize>=0.3 \ + zlib>=0.5 EXECUTABLE= expireGititCache gitit @@ -29,7 +29,7 @@ PLUGINS_DESC= Enable support for plugins PLUGINS_FLAG_ENABLE= plugins PLUGINS_FLAG_CABAL= ghc-paths -FLAGS_DISABLE= network-uri +FLAGS_ENABLE= network-uri .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo index 8fcfa88c4a99..f352d876fceb 100644 --- a/www/hs-gitit/distinfo +++ b/www/hs-gitit/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/gitit-0.10.6.1.tar.gz) = c0ceb611e3e61f37af9e1fd1330a493ffbd07c59455cba988f35f3e881cadfd0 -SIZE (cabal/gitit-0.10.6.1.tar.gz) = 265716 +SHA256 (cabal/gitit-0.11.1.tar.gz) = 29bbb782e2066bf831ad1aff471208e928310fc9ab6bfb32a775cd7521f19d1b +SIZE (cabal/gitit-0.11.1.tar.gz) = 275587 diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile index f5d95a64943a..ca9bb94b81e3 100644 --- a/www/hs-hS3/Makefile +++ b/www/hs-hS3/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hS3 -PORTVERSION= 0.5.8 -PORTREVISION= 1 +PORTVERSION= 0.5.9 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,9 +10,12 @@ COMMENT= Interface to Amazon's Simple Storage Service (S3) LICENSE= BSD3CLAUSE USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \ - MissingH>=0.18.6 network random regex-compat utf8-string + MissingH>=0.18.6 network>=2.6 network-uri>=2.6 random \ + regex-compat utf8-string EXECUTABLE= hs3 +FLAGS_ENABLE= network-uri + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-hS3/distinfo b/www/hs-hS3/distinfo index ec932c8c1412..1a2bf965a49e 100644 --- a/www/hs-hS3/distinfo +++ b/www/hs-hS3/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/hS3-0.5.8.tar.gz) = 759d37a56f0f3b2f1177c03da75410f8ee2b6f41c3f648cbc99062f269cdb9f2 -SIZE (cabal/hS3-0.5.8.tar.gz) = 19878 +SHA256 (cabal/hS3-0.5.9.tar.gz) = 7ee0ba24b01cdefc02f683aef16d33ac146928ae75a00e566673be12960cc759 +SIZE (cabal/hS3-0.5.9.tar.gz) = 19981 diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile index a4c58c29373d..c15ccd058c62 100644 --- a/www/hs-happstack-server/Makefile +++ b/www/hs-happstack-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= happstack-server -PORTVERSION= 7.3.7 -PORTREVISION= 1 +PORTVERSION= 7.4.4 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,11 +9,13 @@ COMMENT= Web-related tools and services LICENSE= BSD3CLAUSE -USE_CABAL= base64-bytestring blaze-html>=0.5 extensible-exceptions \ - hslogger>=1.0.2 html monad-control>=0.3 mtl>=2 network>=2.2.3 \ - parsec sendfile>=0.7.1 syb system-filepath>=0.3.1 \ - text>=0.10 threads>=0.5 time-compat transformers-base>=0.4 \ - utf8-string>=0.3.4 zlib +USE_CABAL= base64-bytestring>=1.0 blaze-html>=0.5 exceptions \ + extensible-exceptions hslogger>=1.0.2 html monad-control>=0.3 \ + mtl>=2 network>=2.6 network-uri>=2.6 parsec sendfile>=0.7.1 \ + syb system-filepath>=0.3.1 text>=0.10 threads>=0.5 \ + time-compat transformers-base>=0.4 utf8-string>=0.3.4 zlib + +FLAGS_ENABLE= network-uri template_haskell .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo index e9802bef80af..62978d1c207b 100644 --- a/www/hs-happstack-server/distinfo +++ b/www/hs-happstack-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/happstack-server-7.3.7.tar.gz) = 013ee7be9884dd54c825a6b4a72dd40fbd5cb5e41384cdc7568dd1692f1c1cde -SIZE (cabal/happstack-server-7.3.7.tar.gz) = 79407 +SHA256 (cabal/happstack-server-7.4.4.tar.gz) = 4e5a650554e6c04f2db7ffbed4e0c1af9163d14848bb80464d3d2db2b2d91ef2 +SIZE (cabal/happstack-server-7.4.4.tar.gz) = 79920 diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile index 84841c735670..a59f94783125 100644 --- a/www/hs-happstack/Makefile +++ b/www/hs-happstack/Makefile @@ -2,7 +2,7 @@ PORTNAME= happstack PORTVERSION= 7.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-happstack/files/patch-happstack.cabal b/www/hs-happstack/files/patch-happstack.cabal new file mode 100644 index 000000000000..6a12463b9e09 --- /dev/null +++ b/www/hs-happstack/files/patch-happstack.cabal @@ -0,0 +1,11 @@ +--- happstack.cabal.orig 2014-06-26 00:31:28 UTC ++++ happstack.cabal +@@ -29,7 +29,7 @@ Library + other-modules: Paths_happstack + + build-depends: base >= 3 && <5, +- happstack-server >= 7.0 && < 7.4 ++ happstack-server >= 7.0 && < 7.5 + + if flag(tests) + hs-source-dirs: tests diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile index 0d997701ef60..1de77f20679d 100644 --- a/www/hs-heist/Makefile +++ b/www/hs-heist/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= heist -PORTVERSION= 0.13.1.2 -PORTREVISION= 1 +PORTVERSION= 0.14.1.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,10 +10,11 @@ COMMENT= Haskell template system supporting both HTML5 and XML LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \ - blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 errors>=1.4 \ - hashable>=1.1 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \ - random>=1.0.1.0 text>=0.10 unordered-containers>=0.1.4 \ - vector>=0.9 xmlhtml>=0.2.3 + blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 either>=3.1 \ + hashable>=1.1 map-syntax>=0.2 \ + MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1.0.1.0 \ + text>=0.10 unordered-containers>=0.1.4 vector>=0.9 \ + xmlhtml>=0.2.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo index 447235991dec..6832208e0e20 100644 --- a/www/hs-heist/distinfo +++ b/www/hs-heist/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/heist-0.13.1.2.tar.gz) = 45a7d2180f6fc257ca51aab96dfb6e343e12ba5cc15cc26b293b0e0b80a30031 -SIZE (cabal/heist-0.13.1.2.tar.gz) = 63167 +SHA256 (cabal/heist-0.14.1.1.tar.gz) = 2934ece5e58b4a180a6975c0404a2a48e46b85693822aa6ab18f700a44438e43 +SIZE (cabal/heist-0.14.1.1.tar.gz) = 65797 diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile index 32fa11bff294..dcf2585d0bab 100644 --- a/www/hs-hjsmin/Makefile +++ b/www/hs-hjsmin/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hjsmin -PORTVERSION= 0.1.4.7 -PORTREVISION= 1 +PORTVERSION= 0.1.5.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Haskell implementation of a javascript minifier LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 \ +USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.14 \ optparse-applicative>=0.7 text>=0.8 EXECUTABLE= hjsmin diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo index db2b1bad8c92..750efc977de9 100644 --- a/www/hs-hjsmin/distinfo +++ b/www/hs-hjsmin/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/hjsmin-0.1.4.7.tar.gz) = 0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf -SIZE (cabal/hjsmin-0.1.4.7.tar.gz) = 110718 +SHA256 (cabal/hjsmin-0.1.5.0.tar.gz) = f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7 +SIZE (cabal/hjsmin-0.1.5.0.tar.gz) = 117050 diff --git a/www/hs-hjsmin/pkg-descr b/www/hs-hjsmin/pkg-descr index a71a0e0d1a95..37e4e3b5e39f 100644 --- a/www/hs-hjsmin/pkg-descr +++ b/www/hs-hjsmin/pkg-descr @@ -1,4 +1,4 @@ Reduces size of javascript files by stripping out extraneous whitespace and other syntactic elements, without changing the semantics. -WWW: http://github.com/alanz/hjsmin +WWW: http://github.com/erikd/hjsmin diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile index a60a863f30d8..77457f2dac10 100644 --- a/www/hs-http-client-tls/Makefile +++ b/www/hs-http-client-tls/Makefile @@ -2,7 +2,7 @@ PORTNAME= http-client-tls PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile index aae3287ca05a..6c9df9b0a8d6 100644 --- a/www/hs-http-client/Makefile +++ b/www/hs-http-client/Makefile @@ -1,19 +1,20 @@ # $FreeBSD$ PORTNAME= http-client -PORTVERSION= 0.3.6.1 -PORTREVISION= 1 +PORTVERSION= 0.4.20 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= HTTP client engine +COMMENT= HTTP client engine, intended as a base layer for more user-friendly packages LICENSE= MIT USE_CABAL= base64-bytestring>=1.0 blaze-builder>=0.3 case-insensitive>=1.0 \ cookie data-default-class exceptions>=0.4 http-types>=0.8 \ - mime-types network>=2.3 publicsuffixlist random \ + mime-types network>=2.6 network-uri>=2.6 random \ streaming-commons>=0.1.0.2 text>=0.11 +FLAGS_ENABLE= network-uri + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-http-client/distinfo b/www/hs-http-client/distinfo index 27bd849d78a7..68b01b93b26b 100644 --- a/www/hs-http-client/distinfo +++ b/www/hs-http-client/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/http-client-0.3.6.1.tar.gz) = 306d9073b8e8dd0f38c70fcaf532ba10a4054262116dce20837a7b277ab35555 -SIZE (cabal/http-client-0.3.6.1.tar.gz) = 33929 +SHA256 (cabal/http-client-0.4.20.tar.gz) = 8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24 +SIZE (cabal/http-client-0.4.20.tar.gz) = 75960 diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile index 0694b53571a8..4a6b8dd5ac57 100644 --- a/www/hs-http-conduit/Makefile +++ b/www/hs-http-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-conduit -PORTVERSION= 2.1.4 -PORTREVISION= 1 +PORTVERSION= 2.1.8 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= HTTP client package with conduit interface and HTTPS support LICENSE= BSD3CLAUSE -USE_CABAL= conduit>=0.5.5 http-client>=0.3.6 http-client-tls>=0.2.2 \ +USE_CABAL= conduit>=0.5.5 http-client>=0.4.19 http-client-tls>=0.2.2 \ http-types>=0.7 lifted-base>=0.1 monad-control mtl \ resourcet>=1.1 diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo index bd6f3d1e839d..0f939df80544 100644 --- a/www/hs-http-conduit/distinfo +++ b/www/hs-http-conduit/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/http-conduit-2.1.4.tar.gz) = 4b4693a994d81d916f998218c3c89ff0fb0763b40ea6dece8354e4e38b68ae93 -SIZE (cabal/http-conduit-2.1.4.tar.gz) = 22819 +SHA256 (cabal/http-conduit-2.1.8.tar.gz) = 550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d +SIZE (cabal/http-conduit-2.1.8.tar.gz) = 23331 diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile index 620864c38ffa..fa7de2115363 100644 --- a/www/hs-http-date/Makefile +++ b/www/hs-http-date/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-date -PORTVERSION= 0.0.4 -PORTREVISION= 8 +PORTVERSION= 0.0.6.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-date/distinfo b/www/hs-http-date/distinfo index df9dd8509260..8118038e7a49 100644 --- a/www/hs-http-date/distinfo +++ b/www/hs-http-date/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/http-date-0.0.4.tar.gz) = 25228b2456b319c7c777ea3673f441ddf68881da176b37c51feab2108d0175dd -SIZE (cabal/http-date-0.0.4.tar.gz) = 4865 +SHA256 (cabal/http-date-0.0.6.1.tar.gz) = f2e106603e2b3f710f1189e478f6c20067d9a9d21a20a633fe362b3f91807636 +SIZE (cabal/http-date-0.0.6.1.tar.gz) = 4989 diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile index 30a919b5b829..b61b236a473a 100644 --- a/www/hs-http-reverse-proxy/Makefile +++ b/www/hs-http-reverse-proxy/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-reverse-proxy -PORTVERSION= 0.4.0.1 -PORTREVISION= 1 +PORTVERSION= 0.4.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo index 4ea7d8ec4720..c945e1f31dbb 100644 --- a/www/hs-http-reverse-proxy/distinfo +++ b/www/hs-http-reverse-proxy/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 30fc8eadde6efb2dd0548087d55f5baae63558d1442c5efbd0d978dda7afcf3f -SIZE (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 8839 +SHA256 (cabal/http-reverse-proxy-0.4.2.tar.gz) = 3118eae07425ee5e44fb309f6a99f09d6a4fccb4965cc6af2ce5ba6003348d81 +SIZE (cabal/http-reverse-proxy-0.4.2.tar.gz) = 9641 diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile index 1b1fa469268d..ed4a37a16d53 100644 --- a/www/hs-http-server/Makefile +++ b/www/hs-http-server/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= http-server -PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTVERSION= 1.0.6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ COMMENT= Library for writing Haskell web servers LICENSE= BSD3CLAUSE -USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.4.0.0 text>=1.0 url>=2 \ - utf8-string>=0.3.4 +USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.6 network-uri>=2.6 \ + text>=1.0 url>=2.0 utf8-string>=0.3.4 INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \ ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} @@ -20,6 +19,8 @@ INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \ OPTIONS_DEFINE= EXAMPLES OPTIONS_DEFAULT= EXAMPLES +FLAGS_ENABLE= network-uri + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" .if ${PORT_OPTIONS:MEXAMPLES} diff --git a/www/hs-http-server/distinfo b/www/hs-http-server/distinfo index fdcf4e8ce317..c8e2803ef926 100644 --- a/www/hs-http-server/distinfo +++ b/www/hs-http-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/http-server-1.0.4.tar.gz) = 985090c8490a49bbcfafc181ac60473ba49a18eb9464f2f69b54da33aea534ea -SIZE (cabal/http-server-1.0.4.tar.gz) = 29015 +SHA256 (cabal/http-server-1.0.6.tar.gz) = 5cd44741053aef8ba7bd6b6d8d0a8048a171db42e2b7cb5013a99fcd754143b5 +SIZE (cabal/http-server-1.0.6.tar.gz) = 29071 diff --git a/www/hs-http-server/pkg-descr b/www/hs-http-server/pkg-descr index 283b50434178..7badaeb8fb11 100644 --- a/www/hs-http-server/pkg-descr +++ b/www/hs-http-server/pkg-descr @@ -1,3 +1,3 @@ A library for writing Haskell web servers. -WWW: http://code.galois.com/ +WWW: https://github.com/GaloisInc/http-server diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile index a51cc6808e0b..8ab63f64dab4 100644 --- a/www/hs-http-types/Makefile +++ b/www/hs-http-types/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= http-types -PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTVERSION= 0.8.6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo index e19ca6ef7238..d2f13f61d879 100644 --- a/www/hs-http-types/distinfo +++ b/www/hs-http-types/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/http-types-0.8.5.tar.gz) = 3cb243486053f2e80af255ab79009c2ef057d314d5710ba7aa65fa3e9c164834 -SIZE (cabal/http-types-0.8.5.tar.gz) = 10781 +SHA256 (cabal/http-types-0.8.6.tar.gz) = b03b1893e0148169087f64ef0b1dedcf2382865352f4306d4fa7219d118a36e0 +SIZE (cabal/http-types-0.8.6.tar.gz) = 10796 diff --git a/www/hs-http2/Makefile b/www/hs-http2/Makefile new file mode 100644 index 000000000000..f62c1985a734 --- /dev/null +++ b/www/hs-http2/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +PORTNAME= http2 +PORTVERSION= 1.0.4 +CATEGORIES= www haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= HTTP/2.0 library including frames and HPACK + +LICENSE= BSD3CLAUSE + +USE_CABAL= aeson aeson-pretty hex mwc-random stm text \ + unordered-containers vector word8 + +FLAGS_DISABLE= devel + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include <bsd.port.mk> diff --git a/www/hs-http2/distinfo b/www/hs-http2/distinfo new file mode 100644 index 000000000000..bb0f78780479 --- /dev/null +++ b/www/hs-http2/distinfo @@ -0,0 +1,2 @@ +SHA256 (cabal/http2-1.0.4.tar.gz) = 727fc0d39a62b02b677189f9ef745e3c8fd574334736594139767940dc4647b7 +SIZE (cabal/http2-1.0.4.tar.gz) = 35760 diff --git a/www/hs-http2/files/patch-http2.cabal b/www/hs-http2/files/patch-http2.cabal new file mode 100644 index 000000000000..661339af0e6f --- /dev/null +++ b/www/hs-http2/files/patch-http2.cabal @@ -0,0 +1,50 @@ +--- http2.cabal.orig 2015-07-31 05:18:14 UTC ++++ http2.cabal +@@ -60,7 +60,6 @@ Library + Build-Depends: base >= 4.6 && < 5 + , array + , bytestring >= 0.10 +- , bytestring-builder + , containers >= 0.5 + , mwc-random + , stm +@@ -93,7 +92,6 @@ Test-Suite spec + Build-Depends: base >= 4 && < 5 + , array + , bytestring +- , bytestring-builder + , containers + , hex + , hspec >= 1.3 +@@ -116,7 +114,6 @@ Test-Suite hpack + , aeson-pretty + , array + , bytestring +- , bytestring-builder + , containers + , directory + , filepath +@@ -165,7 +162,6 @@ Executable hpack-encode + , aeson-pretty + , array + , bytestring +- , bytestring-builder + , containers + , hex + , text +@@ -186,7 +182,6 @@ Executable hpack-debug + , aeson + , array + , bytestring +- , bytestring-builder + , containers + , hex + , text +@@ -208,7 +203,6 @@ Executable hpack-stat + , aeson-pretty + , array + , bytestring +- , bytestring-builder + , containers + , directory + , filepath diff --git a/www/hs-http2/pkg-descr b/www/hs-http2/pkg-descr new file mode 100644 index 000000000000..dde5115be78c --- /dev/null +++ b/www/hs-http2/pkg-descr @@ -0,0 +1,4 @@ +HTTP/2.0 library including frames and HPACK. Currently HTTP/2 16 +framing and HPACK 10 is supported. + +WWW: http://hackage.haskell.org/package/http2 diff --git a/www/hs-multipart/Makefile b/www/hs-multipart/Makefile new file mode 100644 index 000000000000..768c9e033f5b --- /dev/null +++ b/www/hs-multipart/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +PORTNAME= multipart +PORTVERSION= 0.1.2 +CATEGORIES= www haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= HTTP multipart split out of the cgi package + +LICENSE= BSD3CLAUSE + +USE_CABAL= parsec>=2.0 + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include <bsd.port.mk> diff --git a/www/hs-multipart/distinfo b/www/hs-multipart/distinfo new file mode 100644 index 000000000000..a2243063b0ad --- /dev/null +++ b/www/hs-multipart/distinfo @@ -0,0 +1,2 @@ +SHA256 (cabal/multipart-0.1.2.tar.gz) = e543fb307beb14fc366171d7767a6a18244bacf78db295d8d161c5c03d94043c +SIZE (cabal/multipart-0.1.2.tar.gz) = 6787 diff --git a/www/hs-multipart/pkg-descr b/www/hs-multipart/pkg-descr new file mode 100644 index 000000000000..8e68e6c7e575 --- /dev/null +++ b/www/hs-multipart/pkg-descr @@ -0,0 +1,3 @@ +HTTP multipart split out of the cgi package. + +WWW: http://www.github.com/silkapp/multipart diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile index 6f258f3ae904..3346065b70aa 100644 --- a/www/hs-oeis/Makefile +++ b/www/hs-oeis/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= oeis -PORTVERSION= 0.3.5 -PORTREVISION= 1 +PORTVERSION= 0.3.6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,9 @@ COMMENT= Interface to the Online Encyclopedia of Integer Sequences (OEIS) LICENSE= BSD3CLAUSE -USE_CABAL= HTTP network +USE_CABAL= HTTP>=4000.2 network>=2.6 network-uri>=2.6 + +FLAGS_ENABLE= network-uri .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-oeis/distinfo b/www/hs-oeis/distinfo index 833d5e78533e..6eb7298cacf6 100644 --- a/www/hs-oeis/distinfo +++ b/www/hs-oeis/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/oeis-0.3.5.tar.gz) = a617e60b1ffd1e7ebc3d30b291687f25651471769fb2f6a1367defed16ae4364 -SIZE (cabal/oeis-0.3.5.tar.gz) = 29204 +SHA256 (cabal/oeis-0.3.6.tar.gz) = 4039b69a7aa0412eb4a37f36be7bf442ea32dd4672fc8765b6b134513fe3fee0 +SIZE (cabal/oeis-0.3.6.tar.gz) = 29275 diff --git a/www/hs-oeis/pkg-descr b/www/hs-oeis/pkg-descr index fe31ed201757..2d2537f0f1ab 100644 --- a/www/hs-oeis/pkg-descr +++ b/www/hs-oeis/pkg-descr @@ -1,3 +1,3 @@ -Haskell interface to the Online Encyclopedia of Integer Sequences. +Interface to the Online Encyclopedia of Integer Sequences. -WWW: http://code.haskell.org/oeis +WWW: http://hackage.haskell.org/package/oeis diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile index 3ef19f22743c..162ba50296b0 100644 --- a/www/hs-path-pieces/Makefile +++ b/www/hs-path-pieces/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= path-pieces -PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTVERSION= 0.2.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-path-pieces/distinfo b/www/hs-path-pieces/distinfo index d2807ddb49d6..fd147c11d7df 100644 --- a/www/hs-path-pieces/distinfo +++ b/www/hs-path-pieces/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/path-pieces-0.1.4.tar.gz) = 5b78f3375dcbac842b7b7bf08e8398255234e8f12ede96c33f75223417b9b0bb -SIZE (cabal/path-pieces-0.1.4.tar.gz) = 2718 +SHA256 (cabal/path-pieces-0.2.0.tar.gz) = c097672ab0dd1835b8cadbbd9db412893f02e02eca044c5a1690fbefb3e8df84 +SIZE (cabal/path-pieces-0.2.0.tar.gz) = 3267 diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile index ec1184ef98ac..14d91e218ec7 100644 --- a/www/hs-recaptcha/Makefile +++ b/www/hs-recaptcha/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= recaptcha -PORTVERSION= 0.1.0.2 -PORTREVISION= 1 +PORTVERSION= 0.1.0.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,9 @@ COMMENT= Functions for using the reCAPTCHA service in web applications LICENSE= BSD3CLAUSE -USE_CABAL= HTTP>=3001.1.4 network>=2.2.0.1 +USE_CABAL= HTTP>=3001.1.4 network>=2.6 network-uri>=2.6 + +FLAGS_ENABLE= network-uri .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-recaptcha/distinfo b/www/hs-recaptcha/distinfo index 34fd88dd3812..3194b7b95378 100644 --- a/www/hs-recaptcha/distinfo +++ b/www/hs-recaptcha/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/recaptcha-0.1.0.2.tar.gz) = 30ae898cc39381b4e54bd984562a3a0e1385a393b1e318fec4a3b1bacc754d13 -SIZE (cabal/recaptcha-0.1.0.2.tar.gz) = 2667 +SHA256 (cabal/recaptcha-0.1.0.3.tar.gz) = 29a898bc7a063be88c05ac3ec0446a23117ed04c501dbd99c83684683fd638a3 +SIZE (cabal/recaptcha-0.1.0.3.tar.gz) = 2742 diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile deleted file mode 100644 index 3f2a6b959637..000000000000 --- a/www/hs-scgi/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com> -# $FreeBSD$ - -# deprecated: use wai - -PORTNAME= scgi -PORTVERSION= 0.3.3 -PORTREVISION= 13 -CATEGORIES= www haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Haskell library for writing SCGI programs - -LICENSE= BSD3CLAUSE - -USE_CABAL= cgi network>=2.2.3 - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include <bsd.port.mk> diff --git a/www/hs-scgi/distinfo b/www/hs-scgi/distinfo deleted file mode 100644 index c4c58eec3160..000000000000 --- a/www/hs-scgi/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cabal/scgi-0.3.3.tar.gz) = 55b40f48739aefb7f25ac971a1b3f27aaf0a9d0c32afe62dd56877be0b2fb67e -SIZE (cabal/scgi-0.3.3.tar.gz) = 3235 diff --git a/www/hs-scgi/pkg-descr b/www/hs-scgi/pkg-descr deleted file mode 100644 index ef953544baeb..000000000000 --- a/www/hs-scgi/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -This Haskell library lets you write SCGI programs. This package reuses -the cgi package API, making it very easy to port CGI programs to SCGI. - -WWW: http://github.com/esessoms/scgi diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile index d57440b09f80..3a302a71214b 100644 --- a/www/hs-shakespeare/Makefile +++ b/www/hs-shakespeare/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shakespeare -PORTVERSION= 2.0.1.1 -PORTREVISION= 1 +PORTVERSION= 2.0.5 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Toolkit for making compile-time interpolated templates LICENSE= MIT USE_CABAL= aeson blaze-html blaze-markup exceptions parsec>=2 \ - system-fileio>=0.3 system-filepath>=0.4 text>=0.7 + text>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo index d01e3de92a24..6da4edd29547 100644 --- a/www/hs-shakespeare/distinfo +++ b/www/hs-shakespeare/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/shakespeare-2.0.1.1.tar.gz) = 3781e221e0a70ea15ae023adb2a7dbd4461b9649a1b195da102305bf3aaaad75 -SIZE (cabal/shakespeare-2.0.1.1.tar.gz) = 58758 +SHA256 (cabal/shakespeare-2.0.5.tar.gz) = f0ff00f9262f874512ce7624c45c0e9f6e90dd1c4bf9e81891f7e34f5faeb549 +SIZE (cabal/shakespeare-2.0.5.tar.gz) = 61636 diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile index 991dd8c9c607..a09f7a810c15 100644 --- a/www/hs-snap-core/Makefile +++ b/www/hs-snap-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= snap-core -PORTVERSION= 0.9.6.3 -PORTREVISION= 1 +PORTVERSION= 0.9.7.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,10 +11,12 @@ LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \ blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \ - case-insensitive>=0.3 enumerator>=0.4.15 hashable \ - HUnit>=1.2 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \ - random>=1 regex-posix>=0.95 text>=0.11 unix-compat>=0.2 \ - unordered-containers>=0.1.4.3 vector>=0.6 zlib-enum>=0.2.1 + bytestring-mmap>=0.2.2 case-insensitive>=0.3 \ + enumerator>=0.4.15 hashable>=1.1 HUnit>=1.2 \ + MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1 \ + regex-posix>=0.95 text>=0.11 time-locale-compat>=0.1 \ + unix-compat>=0.2 unordered-containers>=0.1.4.3 \ + vector>=0.6 zlib-enum>=0.2.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo index 6f35255ef7a6..26986eb0979d 100644 --- a/www/hs-snap-core/distinfo +++ b/www/hs-snap-core/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/snap-core-0.9.6.3.tar.gz) = 81b70058ec42b9344b779b3fac0c86086f96e9510d7a88b53954c4df67a06f44 -SIZE (cabal/snap-core-0.9.6.3.tar.gz) = 91549 +SHA256 (cabal/snap-core-0.9.7.2.tar.gz) = 526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651 +SIZE (cabal/snap-core-0.9.7.2.tar.gz) = 91604 diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile index 0962b27c4792..cdbd8470e7b4 100644 --- a/www/hs-snap-server/Makefile +++ b/www/hs-snap-server/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= snap-server -PORTVERSION= 0.9.4.5 -PORTREVISION= 1 +PORTVERSION= 0.9.5.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,7 +13,7 @@ USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \ blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \ case-insensitive>=0.3 enumerator>=0.4.15 \ MonadCatchIO-transformers>=0.2.1 mtl>=2 network>=2.3 \ - snap-core>=0.9.3 text>=0.11 unix-compat>=0.2 + old-locale snap-core>=0.9.3 text>=0.11 unix-compat>=0.2 FLAGS_DEFINE= OPENSSL diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo index c2019d9a6613..59b0b2cc253c 100644 --- a/www/hs-snap-server/distinfo +++ b/www/hs-snap-server/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/snap-server-0.9.4.5.tar.gz) = 37ae3557c43dcecf6938df76af1ee274b575e50a8085d12b8f80c587e94e6924 -SIZE (cabal/snap-server-0.9.4.5.tar.gz) = 58643 +SHA256 (cabal/snap-server-0.9.5.1.tar.gz) = af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3 +SIZE (cabal/snap-server-0.9.5.1.tar.gz) = 59062 diff --git a/www/hs-snap-server/files/patch-snap-server.cabal b/www/hs-snap-server/files/patch-snap-server.cabal deleted file mode 100644 index 9021030bfcfb..000000000000 --- a/www/hs-snap-server/files/patch-snap-server.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- snap-server.cabal.orig 2014-06-04 16:23:51 UTC -+++ snap-server.cabal -@@ -129,7 +129,7 @@ Library - - if flag(openssl) - cpp-options: -DOPENSSL -- build-depends: HsOpenSSL >= 0.10 && <0.11 -+ build-depends: HsOpenSSL >= 0.10 && <0.12 - - if os(linux) && !flag(portable) - cpp-options: -DLINUX -DHAS_SENDFILE diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile index 2b8355f3a784..4da6be8e8465 100644 --- a/www/hs-snap/Makefile +++ b/www/hs-snap/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= snap -PORTVERSION= 0.13.2.8 -PORTREVISION= 1 +PORTVERSION= 0.14.0.6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,13 +9,14 @@ COMMENT= Top-level package for the Snap Web Framework LICENSE= BSD3CLAUSE -USE_CABAL= aeson attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \ +USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \ comonad>=1.1 configurator>=0.1 directory-tree>=0.11 \ - directory-tree>=0.10 dlist>=0.5 errors>=1.4 hashable \ - heist>=0.13 lens>=3.7.6 logict>=0.4.2 MonadCatchIO-transformers>=0.2 \ - mtl>2.0 mwc-random>=0.8 pwstore-fast>=2.2 regex-posix>=0.95 \ - snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 \ - text>=0.11 unordered-containers>=0.1.4 vector>=0.7.1 \ + directory-tree>=0.10 dlist>=0.5 either>=4.3 hashable>=1.1 \ + heist>=0.14 lens>=3.7.6 logict>=0.4.2 \ + MonadCatchIO-transformers>=0.2 mtl>2.0 mwc-random>=0.8 \ + old-time>=1.0 pwstore-fast>=2.2 regex-posix>=0.95 \ + snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 text>=0.11 \ + unordered-containers>=0.1.4 vector>=0.7.1 \ vector-algorithms>=0.4 xmlhtml>=0.1 EXECUTABLE= snap diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo index c03d580a7ea6..c861133d2dbe 100644 --- a/www/hs-snap/distinfo +++ b/www/hs-snap/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/snap-0.13.2.8.tar.gz) = ef2fa6b87e2f4eac56d8c95320575adea7eb7ae1c5914209a0590aae728036cb -SIZE (cabal/snap-0.13.2.8.tar.gz) = 83938 +SHA256 (cabal/snap-0.14.0.6.tar.gz) = fa9ffc7bf5c6729f7e204daecd50765a220a0ffc2feaf3f6b29977370d8db617 +SIZE (cabal/snap-0.14.0.6.tar.gz) = 84164 diff --git a/www/hs-snap/files/patch-snap.cabal b/www/hs-snap/files/patch-snap.cabal index 3cdfd461bfdb..284efd938544 100644 --- a/www/hs-snap/files/patch-snap.cabal +++ b/www/hs-snap/files/patch-snap.cabal @@ -1,16 +1,7 @@ ---- ./snap.cabal.orig 2014-07-03 21:45:03.000000000 +0200 -+++ ./snap.cabal 2014-07-29 12:40:27.405965571 +0200 -@@ -186,7 +186,7 @@ - else - build-depends: - base >= 4.4 && < 5, -- lens >= 3.7.6 && < 4.2 -+ lens >= 3.7.6 && < 4.4 - - extensions: - BangPatterns, -@@ -236,6 +236,7 @@ - text >= 0.11 && < 1.2 +--- snap.cabal.orig 2015-07-19 02:19:23 UTC ++++ snap.cabal +@@ -237,6 +237,7 @@ Executable snap + text >= 0.11 && < 1.3 extensions: + TemplateHaskell diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile index 7cbe98804d92..30b576f9f276 100644 --- a/www/hs-url/Makefile +++ b/www/hs-url/Makefile @@ -3,7 +3,7 @@ PORTNAME= url PORTVERSION= 2.1.3 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile index 6ad395e6db11..b9b7fca63fec 100644 --- a/www/hs-wai-app-static/Makefile +++ b/www/hs-wai-app-static/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-app-static -PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTVERSION= 3.1.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,9 +13,8 @@ USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ blaze-markup>=0.5.1 byteable cryptohash>=0.11 \ cryptohash-conduit file-embed>=0.0.3.1 http-date \ http-types>=0.7 mime-types>=0.1 optparse-applicative>=0.7 \ - system-fileio>=0.3 system-filepath>=0.4 text>=0.7 \ - unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \ - wai-extra>=3.0 warp>=3.0 zlib>=0.5 + text>=0.7 unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \ + wai-extra>=3.0 warp>=3.0.11 zlib>=0.5 EXECUTABLE= warp diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo index 05acd538a49c..c0ab65fdbc9d 100644 --- a/www/hs-wai-app-static/distinfo +++ b/www/hs-wai-app-static/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/wai-app-static-3.0.0.tar.gz) = 631cca083081803a81cf46d1b538f7c2dbe9c8310b94694a88220242f415f984 -SIZE (cabal/wai-app-static-3.0.0.tar.gz) = 20720 +SHA256 (cabal/wai-app-static-3.1.1.tar.gz) = 5b7ed5028584bbefbbf3da6869ad9fe5ed4fe28ad599ca5d9ad715a1cee43e2a +SIZE (cabal/wai-app-static-3.1.1.tar.gz) = 21781 diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile index 487701e6abc1..075579285cb6 100644 --- a/www/hs-wai-extra/Makefile +++ b/www/hs-wai-extra/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-extra -PORTVERSION= 3.0.1.2 -PORTREVISION= 1 +PORTVERSION= 3.0.10 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,10 +10,11 @@ COMMENT= Provides some basic WAI handlers and middleware LICENSE= MIT USE_CABAL= ansi-terminal base64-bytestring blaze-builder>=0.2.1.4 \ - case-insensitive>=0.2 data-default-class fast-logger>=2.1 \ - http-types>=0.7 lifted-base>=0.1.2 network>=2.2.1.5 \ - resourcet>=0.4.6 streaming-commons stringsearch>=0.3 \ - text>=0.7 void>=0.5 wai>=3.0 wai-logger>=2.0 word8 + case-insensitive>=0.2 cookie data-default-class \ + fast-logger>=2.1 http-types>=0.7 lifted-base>=0.1.2 \ + network>=2.2.1.5 resourcet>=0.4.6 streaming-commons \ + stringsearch>=0.3 text>=0.7 unix-compat vault void>=0.5 \ + wai>=3.0.3.0 wai-logger>=2.0 word8 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo index 9a9792607a82..e3fc952ee6bf 100644 --- a/www/hs-wai-extra/distinfo +++ b/www/hs-wai-extra/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/wai-extra-3.0.1.2.tar.gz) = 9f042de4a0d48c3415b2aacc8447bd938bf236a725adeeb4f5dbc635cfac6397 -SIZE (cabal/wai-extra-3.0.1.2.tar.gz) = 39555 +SHA256 (cabal/wai-extra-3.0.10.tar.gz) = 503af31217c29d1bcec10a6806ea119aab9d68f29f12a1c1006fe4f931771b37 +SIZE (cabal/wai-extra-3.0.10.tar.gz) = 49846 diff --git a/www/hs-wai-extra/pkg-descr b/www/hs-wai-extra/pkg-descr index d549df211d86..1874f4c29a99 100644 --- a/www/hs-wai-extra/pkg-descr +++ b/www/hs-wai-extra/pkg-descr @@ -1,3 +1,3 @@ -The goal here is to provide common features without many dependencies. +Provides basic WAI handler and middleware functionality. WWW: http://github.com/yesodweb/wai diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile index f447e53de05f..29fbbfc11b32 100644 --- a/www/hs-wai-logger/Makefile +++ b/www/hs-wai-logger/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai-logger -PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTVERSION= 2.2.4.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ COMMENT= Logging system for WAI LICENSE= BSD3CLAUSE USE_CABAL= auto-update blaze-builder byteorder case-insensitive \ - fast-logger>=2.2 http-types network unix-time>=0.2.2 \ - wai>=2.0.0 + easy-file>=0.2 fast-logger>=2.2 http-types network \ + unix-time>=0.2.2 wai>=2.0.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-wai-logger/distinfo b/www/hs-wai-logger/distinfo index a0e62eb8e302..8878aca54e75 100644 --- a/www/hs-wai-logger/distinfo +++ b/www/hs-wai-logger/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/wai-logger-2.2.0.tar.gz) = 7e3f92d6be5a87df977fb9cc66e09e3aec5500e1dedc20886b42501f56628436 -SIZE (cabal/wai-logger-2.2.0.tar.gz) = 5963 +SHA256 (cabal/wai-logger-2.2.4.1.tar.gz) = f37d6bb6ea4a5f881ab2c9df571c923c5624cc83882b19640b924436fcdedae8 +SIZE (cabal/wai-logger-2.2.4.1.tar.gz) = 6585 diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile index 970f72bcef4d..528957d6a2d4 100644 --- a/www/hs-wai/Makefile +++ b/www/hs-wai/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= wai -PORTVERSION= 3.0.1.1 -PORTREVISION= 1 +PORTVERSION= 3.0.3.0 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo index e33c45b2344d..0df0712350ec 100644 --- a/www/hs-wai/distinfo +++ b/www/hs-wai/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/wai-3.0.1.1.tar.gz) = 2022773ce7137227c806a473848778e9605ce6c62f55f4eb867f32fc2a50b311 -SIZE (cabal/wai-3.0.1.1.tar.gz) = 7649 +SHA256 (cabal/wai-3.0.3.0.tar.gz) = c47eb435a3320795f21bee8585abc8164aaf3bfde86f7e1e13e98190cb968d10 +SIZE (cabal/wai-3.0.3.0.tar.gz) = 9532 diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile index 8435ca9bcf28..fdb77f931939 100644 --- a/www/hs-warp-tls/Makefile +++ b/www/hs-warp-tls/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= warp-tls -PORTVERSION= 3.0.0 -PORTREVISION= 1 +PORTVERSION= 3.1.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= HTTP over SSL/TLS support for Warp via the TLS package LICENSE= MIT USE_CABAL= cprng-aes>=0.5.0 data-default-class>=0.0.1 network>=2.2.1 \ - streaming-commons tls>=1.2.1 wai>=3.0 warp>=3.0 + streaming-commons tls>=1.2.16 wai>=3.0 warp>=3.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-warp-tls/distinfo b/www/hs-warp-tls/distinfo index fbc9ba6fdae5..3f4f70aa73f4 100644 --- a/www/hs-warp-tls/distinfo +++ b/www/hs-warp-tls/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/warp-tls-3.0.0.tar.gz) = dce9d46532440c2429d72f21ee07ded929eb67f26909150f82698780d420f591 -SIZE (cabal/warp-tls-3.0.0.tar.gz) = 3905 +SHA256 (cabal/warp-tls-3.1.1.tar.gz) = 5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd +SIZE (cabal/warp-tls-3.1.1.tar.gz) = 6426 diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile index 940deaec5672..c2eb11c0d3d7 100644 --- a/www/hs-warp/Makefile +++ b/www/hs-warp/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= warp -PORTVERSION= 3.0.0.5 -PORTREVISION= 1 +PORTVERSION= 3.1.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,10 +9,14 @@ COMMENT= Fast, light-weight web server for WAI applications LICENSE= MIT -USE_CABAL= blaze-builder>=0.3.3 case-insensitive>=0.2 hashable \ - http-date http-types>=0.8.5 network>=2.3 \ - simple-sendfile>=0.2.7 streaming-commons>=0.1.2 text \ - unix-compat>=0.2 void wai>=3.0 +USE_CABAL= auto-update>=0.1.1 blaze-builder>=0.4 case-insensitive>=0.2 \ + hashable http-date http-types>=0.8.5 http2>=1.0.2 \ + iproute>=1.3.1 network>=2.3 old-locale simple-sendfile>=0.2.7 \ + stm>=2.3 streaming-commons>=0.1.10 text unix-compat>=0.2 \ + vault>=0.3 wai>=3.0 word8 + +FLAGS_ENABLE= allow-sendfilefd +FLAGS_DISABLE= network-bytestring warp-debug use-bytestring-builder .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo index 16976d26d481..567f7247a00f 100644 --- a/www/hs-warp/distinfo +++ b/www/hs-warp/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/warp-3.0.0.5.tar.gz) = a525cc131bd85586d5cc2b28d0d75502c794e101cce043e426d796b0ba7dc9c6 -SIZE (cabal/warp-3.0.0.5.tar.gz) = 38894 +SHA256 (cabal/warp-3.1.3.tar.gz) = f65d32e374da0c1c1a44624e9744e4e2b5e325ca1e24a6aeae5719ee48c2b8e3 +SIZE (cabal/warp-3.1.3.tar.gz) = 64154 diff --git a/www/hs-warp/files/patch-warp.cabal b/www/hs-warp/files/patch-warp.cabal new file mode 100644 index 000000000000..bf0c57a64148 --- /dev/null +++ b/www/hs-warp/files/patch-warp.cabal @@ -0,0 +1,18 @@ +--- warp.cabal.orig 2015-08-18 02:00:41 UTC ++++ warp.cabal +@@ -36,7 +36,6 @@ Library + , auto-update >= 0.1.1 && < 0.2 + , blaze-builder >= 0.4 + , bytestring >= 0.9.1.4 +- , bytestring-builder + , case-insensitive >= 0.2 + , containers + , ghc-prim +@@ -134,7 +133,6 @@ Test-Suite spec + , auto-update + , blaze-builder >= 0.4 + , bytestring >= 0.9.1.4 +- , bytestring-builder + , case-insensitive >= 0.2 + , ghc-prim + , HTTP diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile index b9921d10c253..2a7d0d79a56a 100644 --- a/www/hs-webkit/Makefile +++ b/www/hs-webkit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= webkit -PORTVERSION= 0.12.6.1 -PORTREVISION= 1 +PORTVERSION= 0.13.1.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,8 @@ COMMENT= Binding to the Webkit library LICENSE= LGPL21 USES= pkgconfig -USE_CABAL= cairo>=0.12 glib>=0.12.1 gtk>=0.12.5.0 mtl pango>=0.12 +USE_CABAL= cairo>=0.13.0.0 glib>=0.13.1.0 gtk>=0.13.0.0 mtl \ + pango>=0.13.0.0 text>=1.0.0.0 LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-webkit/distinfo b/www/hs-webkit/distinfo index abea02d2eb4a..f83ca6ff8fb0 100644 --- a/www/hs-webkit/distinfo +++ b/www/hs-webkit/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/webkit-0.12.6.1.tar.gz) = 6a4e1921775f282f1a6bc912402a602f379937d2c4e754a2ee9d87ab77fd56b6 -SIZE (cabal/webkit-0.12.6.1.tar.gz) = 148047 +SHA256 (cabal/webkit-0.13.1.3.tar.gz) = 068c23b5ceebb725f113d519dadb30deaa5bc747c656264eb32e1bda8b210902 +SIZE (cabal/webkit-0.13.1.3.tar.gz) = 152548 diff --git a/www/hs-webkit/pkg-descr b/www/hs-webkit/pkg-descr index b55e56100c60..756f41b2a6af 100644 --- a/www/hs-webkit/pkg-descr +++ b/www/hs-webkit/pkg-descr @@ -1,8 +1,7 @@ WebKit is a web content engine, derived from KHTML and KJS from KDE, and used primarily in Apple's Safari browser. It is made to be embedded in -other applications, such as mail readers, or web browsers. - -It is able to display content such as HTML, SVG, XML, and others. It also -supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more. +other applications, such as mail readers, or web browsers. It is able to +display content such as HTML, SVG, XML, and others. It also supports DOM, +XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more. WWW: http://projects.haskell.org/gtk2hs/ diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile index 810a23d2fdf2..97fc0b54c2d2 100644 --- a/www/hs-xss-sanitize/Makefile +++ b/www/hs-xss-sanitize/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xss-sanitize -PORTVERSION= 0.3.5.2 -PORTREVISION= 1 +PORTVERSION= 0.3.5.6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,10 @@ COMMENT= Sanitize untrusted HTML to prevent XSS attacks LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2 \ - tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3 +USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2.6 \ + network-uri>=2.6 tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3 + +FLAGS_ENABLE= network-uri .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-xss-sanitize/distinfo b/www/hs-xss-sanitize/distinfo index b5469bed8018..6f71fb5ce019 100644 --- a/www/hs-xss-sanitize/distinfo +++ b/www/hs-xss-sanitize/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/xss-sanitize-0.3.5.2.tar.gz) = cbb4a0df82512ec0ddef8162d8ab26d906a98a292162748039a78367a3e66ad2 -SIZE (cabal/xss-sanitize-0.3.5.2.tar.gz) = 10856 +SHA256 (cabal/xss-sanitize-0.3.5.6.tar.gz) = 008a20e0266f7e4255cb6009336bc25cfe74eda3314dff4f0da0bbd584cd58c8 +SIZE (cabal/xss-sanitize-0.3.5.6.tar.gz) = 10874 diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile index 0b0db22cd14b..b70de20f4228 100644 --- a/www/hs-yesod-auth-hashdb/Makefile +++ b/www/hs-yesod-auth-hashdb/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-auth-hashdb -PORTVERSION= 1.3.0.1 -PORTREVISION= 1 +PORTVERSION= 1.4.2.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,9 @@ COMMENT= Authentication plugin for Yesod LICENSE= MIT -USE_CABAL= cryptohash>=0.8 pwstore-fast>=2.2 text>=0.7 yesod-auth>=1.3 \ - yesod-core>=1.2 yesod-form>=1.3 yesod-persistent>=1.2 +USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 text>=0.7 \ + yesod-auth>=1.4 yesod-core>=1.4 yesod-form>=1.4 \ + yesod-persistent>=1.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo index e82425382fb1..2edd0c2f7bdb 100644 --- a/www/hs-yesod-auth-hashdb/distinfo +++ b/www/hs-yesod-auth-hashdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-auth-hashdb-1.3.0.1.tar.gz) = 984c38923340cd59b87f0862024cb5a9c02a84184093f2d52760999700afe860 -SIZE (cabal/yesod-auth-hashdb-1.3.0.1.tar.gz) = 6772 +SHA256 (cabal/yesod-auth-hashdb-1.4.2.2.tar.gz) = d904933fa5172cc330785591eb92fa61a3cb86599c617ff4bdedf348ecad5868 +SIZE (cabal/yesod-auth-hashdb-1.4.2.2.tar.gz) = 10290 diff --git a/www/hs-yesod-auth-hashdb/pkg-descr b/www/hs-yesod-auth-hashdb/pkg-descr index 58018f786a73..184468b38fc7 100644 --- a/www/hs-yesod-auth-hashdb/pkg-descr +++ b/www/hs-yesod-auth-hashdb/pkg-descr @@ -2,4 +2,14 @@ This package is the Yesod.Auth.HashDB plugin, originally included in yesod-auth, but now modified to be more secure and placed in a separate package. -WWW: http://www.yesodweb.com/ +It provides authentication using hashed passwords stored in a database, +and works best in situations where an administrator is involved in +setting up a user with an initial password. + +The complete login process, including a default form, is implemented by +this plugin, but the application developer must design the interfaces +for setting up users and allowing them to change their own passwords, +since only the low-level password-setting functions are provided by this +package. + +WWW: https://github.com/paul-rouse/yesod-auth-hashdb diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile index 5b1f9365d88f..08d92b2b8128 100644 --- a/www/hs-yesod-auth/Makefile +++ b/www/hs-yesod-auth/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-auth -PORTVERSION= 1.3.4 -PORTREVISION= 1 +PORTVERSION= 1.4.6 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,15 +9,17 @@ COMMENT= Authentication for Yesod LICENSE= MIT -USE_CABAL= aeson>=0.5 authenticate>=1.3 base16-bytestring \ +USE_CABAL= aeson>=0.7 authenticate>=1.3 base16-bytestring \ base64-bytestring blaze-builder blaze-html>=0.5 \ blaze-markup>=0.5.1 byteable conduit conduit-extra cryptohash \ data-default email-validate>=1.0 file-embed http-client \ http-conduit>=1.5 http-types lifted-base>=0.1 mime-mail>=0.3 \ - network persistent>=1.2 persistent-template>=1.2 \ - random>=1.0.0.2 resourcet safe shakespeare text>=0.7 \ - unordered-containers wai>=1.4 yesod-core>=1.2 yesod-form>=1.3 \ - yesod-persistent>=1.2 + network>=2.6 network-uri>=2.6 nonce>=1.0.2 persistent>=2.1 \ + persistent-template>=2.1 random>=1.0.0.2 resourcet safe \ + shakespeare text>=0.7 unordered-containers wai>=1.4 \ + yesod-core>=1.4 yesod-form>=1.4 yesod-persistent>=1.4 + +FLAGS_ENABLE= network-uri .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo index 1418abc5cc97..ef7e0a9b6c2c 100644 --- a/www/hs-yesod-auth/distinfo +++ b/www/hs-yesod-auth/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-auth-1.3.4.tar.gz) = 1ee00d9afefb3fd225e5163f689561ebf8d9a1862eb04a72a2dcb89574b61c8d -SIZE (cabal/yesod-auth-1.3.4.tar.gz) = 36720 +SHA256 (cabal/yesod-auth-1.4.6.tar.gz) = 5d6c74908daabe5e6d5bdff919d3e8e2bccdf5e599da430135474cbce30d1030 +SIZE (cabal/yesod-auth-1.4.6.tar.gz) = 42895 diff --git a/www/hs-yesod-auth/files/patch-yesod-auth.cabal b/www/hs-yesod-auth/files/patch-yesod-auth.cabal deleted file mode 100644 index 4a117f77df80..000000000000 --- a/www/hs-yesod-auth/files/patch-yesod-auth.cabal +++ /dev/null @@ -1,21 +0,0 @@ ---- ./yesod-auth.cabal.orig 2014-06-05 07:12:31.000000000 +0200 -+++ ./yesod-auth.cabal 2014-07-13 02:34:37.000000000 +0200 -@@ -33,10 +33,7 @@ - , text >= 0.7 - , mime-mail >= 0.3 - , yesod-persistent >= 1.2 -- , hamlet >= 1.1 - , shakespeare -- , shakespeare-css >= 1.0 -- , shakespeare-js >= 1.0.2 - , containers - , unordered-containers - , yesod-form >= 1.3 && < 1.4 -@@ -63,7 +60,6 @@ - , blaze-builder - , conduit - , conduit-extra -- , attoparsec-conduit - - exposed-modules: Yesod.Auth - Yesod.Auth.BrowserId diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile index f6e2f469edf3..7097bc560b4e 100644 --- a/www/hs-yesod-bin/Makefile +++ b/www/hs-yesod-bin/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-bin -PORTVERSION= 1.2.12.3 -PORTREVISION= 1 +PORTVERSION= 1.4.13.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,18 +9,19 @@ COMMENT= Yesod helper executable LICENSE= MIT -USE_CABAL= attoparsec>=0.10 base64-bytestring blaze-builder>=0.2.1.4 \ - conduit>=0.5 conduit-extra data-default-class file-embed \ - fsnotify>=0.0 ghc-paths>=0.1 http-conduit \ - http-reverse-proxy>=0.1.1 http-types>=0.7 lifted-base \ - network optparse-applicative>=0.5 parsec>=2.1 \ - project-template>=0.1.1 resourcet>=0.3 shakespeare>=1.0.2 \ - split>=0.2 streaming-commons system-fileio>=0.3 \ - system-filepath>=0.4 tar>=0.4 text>=0.11 unix-compat>=0.2 \ - unordered-containers wai>=1.4 wai-extra warp>=1.3.7.5 \ - yaml>=0.8 zlib>=0.5 +USE_CABAL= async attoparsec>=0.10 base64-bytestring \ + blaze-builder>=0.2.1.4 conduit>=1.2 conduit-extra \ + data-default-class file-embed fsnotify>=0.0 ghc-paths>=0.1 \ + http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \ + http-types>=0.7 lifted-base network \ + optparse-applicative>=0.11 parsec>=2.1 \ + project-template>=0.1.1 resourcet>=0.3 shakespeare>=2.0 \ + split>=0.2 streaming-commons tar>=0.4 text>=0.11 \ + transformers-compat unix-compat>=0.2 unordered-containers \ + wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \ + zlib>=0.5 -EXECUTABLE= yesod-ghc-wrapper yesod-ld-wrapper yesod-ar-wrapper yesod +EXECUTABLE= yesod yesod-ar-wrapper yesod-ghc-wrapper yesod-ld-wrapper STANDALONE= yes .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/www/hs-yesod-bin/distinfo b/www/hs-yesod-bin/distinfo index 106a58bb071b..29503448aab0 100644 --- a/www/hs-yesod-bin/distinfo +++ b/www/hs-yesod-bin/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-bin-1.2.12.3.tar.gz) = fdbb49b6300fc933532097e81b1b4bc13aa30f5910ae58a376e414412be7a75e -SIZE (cabal/yesod-bin-1.2.12.3.tar.gz) = 366916 +SHA256 (cabal/yesod-bin-1.4.13.3.tar.gz) = cc84e0c8f081211c01a6c8d58544b9b7fe5c5c180d8a2edcb30a79edbe198e61 +SIZE (cabal/yesod-bin-1.4.13.3.tar.gz) = 808012 diff --git a/www/hs-yesod-bin/files/patch-yesod-bin.cabal b/www/hs-yesod-bin/files/patch-yesod-bin.cabal deleted file mode 100644 index 9275385a07a8..000000000000 --- a/www/hs-yesod-bin/files/patch-yesod-bin.cabal +++ /dev/null @@ -1,21 +0,0 @@ ---- ./yesod-bin.cabal.orig 2014-06-18 07:02:50.000000000 +0200 -+++ ./yesod-bin.cabal 2014-07-13 02:02:06.000000000 +0200 -@@ -52,10 +52,6 @@ - , parsec >= 2.1 && < 4 - , text >= 0.11 - , shakespeare -- , shakespeare-text >= 1.0 -- , shakespeare >= 1.0.2 && < 2.1 -- , shakespeare-js >= 1.0.2 -- , shakespeare-css >= 1.0.2 - , bytestring >= 0.9.1.4 - , time >= 1.1.4 - , template-haskell -@@ -86,7 +82,6 @@ - , http-reverse-proxy >= 0.1.1 - , network - , http-conduit -- , network-conduit - , project-template >= 0.1.1 - , transformers - , warp >= 1.3.7.5 diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile index 596a4359cb7c..b7639d6140d7 100644 --- a/www/hs-yesod-core/Makefile +++ b/www/hs-yesod-core/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-core -PORTVERSION= 1.2.19 -PORTREVISION= 1 +PORTVERSION= 1.4.13 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,16 +9,16 @@ COMMENT= Creation of type-safe, RESTful web applications LICENSE= MIT -USE_CABAL= aeson>=0.5 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ +USE_CABAL= aeson>=0.5 auto-update blaze-builder>=0.2.1.4 blaze-html>=0.5 \ blaze-markup>=0.5.1 case-insensitive>=0.2 cereal>=0.3 \ - clientsession>=0.9 conduit>=1.0.11 conduit-extra \ - cookie>=0.4.1 data-default exceptions fast-logger>=0.2 \ - http-types>=0.7 lifted-base>=0.1.2 monad-control>=0.3 \ - monad-logger>=0.3.1 mtl parsec>=2 path-pieces>=0.1.2 \ - random>=1.0.0.2 resourcet>=0.4.9 safe shakespeare>=1.0 \ - text>=0.7 transformers-base>=0.4 unix-compat vector>=0.9 \ - wai>=1.4 wai-extra>=1.3 wai-logger>=0.2 warp>=1.3.8 \ - yesod-routes>=1.2 + clientsession>=0.9.1 conduit>=1.2 conduit-extra cookie>=0.4.1 \ + data-default exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \ + lifted-base>=0.1.2 monad-control>=0.3 monad-logger>=0.3.1 mtl \ + mwc-random old-locale>=1.0.0.2 parsec>=2 path-pieces>=0.1.2 \ + primitive random>=1.0.0.2 resourcet>=0.4.9 safe semigroups \ + shakespeare>=2.0 text>=0.7 transformers-base>=0.4 unix-compat \ + unordered-containers>=0.2 vector>=0.9 wai>=3.0 \ + wai-extra>=3.0.5 wai-logger>=0.2 warp>=3.0.2 word8 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo index bd6bedf8a0f6..6ea6b64f8df5 100644 --- a/www/hs-yesod-core/distinfo +++ b/www/hs-yesod-core/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-core-1.2.19.tar.gz) = 3422d2042af60ed5bf71fdb71934b289e69a35d6cbe3adc7561e877c3f7a9b36 -SIZE (cabal/yesod-core-1.2.19.tar.gz) = 62546 +SHA256 (cabal/yesod-core-1.4.13.tar.gz) = 219bf0858977468d9aa74ab5f2d330e46bbbe95d700c989b3565be5d99d319da +SIZE (cabal/yesod-core-1.4.13.tar.gz) = 81300 diff --git a/www/hs-yesod-core/files/patch-yesod-core.cabal b/www/hs-yesod-core/files/patch-yesod-core.cabal deleted file mode 100644 index c27fac059fbf..000000000000 --- a/www/hs-yesod-core/files/patch-yesod-core.cabal +++ /dev/null @@ -1,40 +0,0 @@ ---- ./yesod-core.cabal.orig 2014-06-09 09:45:07.000000000 +0200 -+++ ./yesod-core.cabal 2014-07-13 01:09:02.000000000 +0200 -@@ -32,11 +32,7 @@ - , text >= 0.7 - , template-haskell - , path-pieces >= 0.1.2 && < 0.2 -- , hamlet >= 1.1 - , shakespeare >= 1.0 && < 2.1 -- , shakespeare-js >= 1.0.2 -- , shakespeare-css >= 1.0 -- , shakespeare-i18n >= 1.0 - , blaze-builder >= 0.2.1.4 && < 0.4 - , transformers >= 0.2.2 - , mtl -@@ -60,7 +56,6 @@ - , conduit >= 1.0.11 - , resourcet >= 0.4.9 && < 1.2 - , lifted-base >= 0.1.2 -- , attoparsec-conduit - , blaze-html >= 0.5 - , blaze-markup >= 0.5.1 - , data-default -@@ -111,9 +106,6 @@ - ,wai - ,yesod-core - ,bytestring -- ,hamlet -- ,shakespeare-css -- ,shakespeare-js - ,text - ,http-types - , random -@@ -142,7 +134,6 @@ - , criterion - , bytestring - , text -- , hamlet - , transformers - , yesod-core - , blaze-html diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile index 1f909b5dbbb3..cb8280a2062b 100644 --- a/www/hs-yesod-form/Makefile +++ b/www/hs-yesod-form/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-form -PORTVERSION= 1.3.14 -PORTREVISION= 1 +PORTVERSION= 1.4.4.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,9 +11,11 @@ LICENSE= MIT USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \ blaze-markup>=0.5.1 byteable data-default email-validate>=1.0 \ - network>=2.2 persistent>=1.2 resourcet shakespeare text>=0.9 \ - wai>=1.3 xss-sanitize>=0.3.0.1 yesod-core>=1.2 \ - yesod-persistent>=1.2 + network>=2.6 network-uri>=2.6 persistent resourcet semigroups \ + shakespeare>=2.0 text>=0.9 wai>=1.3 xss-sanitize>=0.3.0.1 \ + yesod-core>=1.4 yesod-persistent>=1.4 + +FLAGS_ENABLE= network-uri .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo index 08fdcc5c980a..4f6460aff74b 100644 --- a/www/hs-yesod-form/distinfo +++ b/www/hs-yesod-form/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-form-1.3.14.tar.gz) = 509f3c230fb33a4ddfab8f00392439248ea1acc413d18a3f221eb863b2a25d28 -SIZE (cabal/yesod-form-1.3.14.tar.gz) = 24300 +SHA256 (cabal/yesod-form-1.4.4.1.tar.gz) = 83aec216b6c5179c373d1b76ab3cca219ebacc98db2e5163400228b632dc6493 +SIZE (cabal/yesod-form-1.4.4.1.tar.gz) = 29487 diff --git a/www/hs-yesod-form/files/patch-yesod-form.cabal b/www/hs-yesod-form/files/patch-yesod-form.cabal deleted file mode 100644 index 5f7ff91d1c1c..000000000000 --- a/www/hs-yesod-form/files/patch-yesod-form.cabal +++ /dev/null @@ -1,13 +0,0 @@ ---- ./yesod-form.cabal.orig 2014-06-09 09:46:28.000000000 +0200 -+++ ./yesod-form.cabal 2014-07-13 02:03:44.000000000 +0200 -@@ -17,10 +17,7 @@ - , yesod-core >= 1.2 && < 1.3 - , yesod-persistent >= 1.2 && < 1.3 - , time >= 1.1.4 -- , hamlet >= 1.1.8 - , shakespeare -- , shakespeare-css >= 1.0 -- , shakespeare-js >= 1.0.2 - , persistent >= 1.2 && < 1.4 - , template-haskell - , transformers >= 0.2.2 diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile index bc3a90488338..d5e1de1fdf23 100644 --- a/www/hs-yesod-persistent/Makefile +++ b/www/hs-yesod-persistent/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-persistent -PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTVERSION= 1.4.0.3 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ COMMENT= Some helpers for using Persistent from Yesod LICENSE= MIT -USE_CABAL= blaze-builder conduit persistent>=1.2 persistent-template>=1.2 \ - resource-pool resourcet>=0.4.5 yesod-core>=1.2.2 +USE_CABAL= blaze-builder conduit persistent>=2.1 persistent-template>=2.1 \ + resource-pool resourcet>=0.4.5 yesod-core>=1.4.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo index a566e7408d07..3cba6dfb829b 100644 --- a/www/hs-yesod-persistent/distinfo +++ b/www/hs-yesod-persistent/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-persistent-1.2.3.tar.gz) = fc3627ff021573cb92403b667e20ebb6194b227f30a189019d288be1cdbfbacd -SIZE (cabal/yesod-persistent-1.2.3.tar.gz) = 4169 +SHA256 (cabal/yesod-persistent-1.4.0.3.tar.gz) = 6455b79eda028e12caefc9d89808fbc611ece36ef64bab3426f90a26cacf3b5f +SIZE (cabal/yesod-persistent-1.4.0.3.tar.gz) = 4283 diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile deleted file mode 100644 index cef398b99166..000000000000 --- a/www/hs-yesod-platform/Makefile +++ /dev/null @@ -1,140 +0,0 @@ -# $FreeBSD$ - -PORTNAME= yesod-platform -PORTVERSION= 1.2.13 -# Please note that the port *strictly depends* on certain versions of other -# ports, so revisit the USE_CABAL line on bumping the portrevision. Thanks! -PORTREVISION= 1 - -CATEGORIES= www haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Meta package for Yesod - -LICENSE= MIT - -USE_CABAL= ansi-terminal==0.6.1.1_1 \ - ansi-wl-pprint==0.6.7.1_1 \ - asn1-encoding==0.8.1.3_1 \ - asn1-parse==0.8.1_1 \ - asn1-types==0.2.3_1 \ - authenticate==1.3.2.9_1 \ - auto-update==0.1.0.0_1 \ - base16-bytestring==0.1.1.6_1 \ - base64-bytestring==1.0.0.1_7 \ - blaze-builder==0.3.3.2_1 \ - blaze-html==0.7.0.2_1 \ - blaze-markup==0.6.1.0_1 \ - byteable==0.1.1_1 \ - byteorder==1.0.4_6 \ - cereal==0.4.0.1_1 \ - cipher-aes==0.2.8_1 \ - cipher-des==0.0.6_1 \ - cipher-rc4==0.1.4_1 \ - clientsession==0.9.0.3_1 \ - conduit==1.1.7_1 \ - conduit-extra==1.1.3_1 \ - connection==0.2.3_1 \ - cookie==0.4.1.2_1 \ - cprng-aes==0.5.2_1 \ - crypto-api==0.13_1 \ - crypto-cipher-types==0.0.9_1 \ - crypto-numbers==0.2.3_1 \ - crypto-pubkey==0.2.4_1 \ - crypto-pubkey-types==0.4.2.2_1 \ - crypto-random==0.0.7_1 \ - cryptohash==0.11.6_1 \ - cryptohash-conduit==0.1.1_1 \ - css-text==0.1.2.1_1 \ - data-default==0.5.3_6 \ - data-default-class==0.0.1_6 \ - data-default-instances-base==0.0.1_6 \ - data-default-instances-containers==0.0.1_6 \ - data-default-instances-dlist==0.0.1_6 \ - data-default-instances-old-locale==0.0.1_6 \ - dlist==0.7.1_1 \ - email-validate==2.0.1_1 \ - entropy==0.3.2_1 \ - esqueleto==1.4.4_1 \ - exceptions==0.6.1_1 \ - fast-logger==2.2.0_1 \ - file-embed==0.0.7_1 \ - hjsmin==0.1.4.7_1 \ - hspec==1.11.0_1 \ - hspec-expectations==0.6.0.1_1 \ - html-conduit==1.1.0.5_1 \ - http-client==0.3.6.1_1 \ - http-client-tls==0.2.2_1 \ - http-conduit==2.1.4_1 \ - http-date==0.0.4_8 \ - http-reverse-proxy==0.4.0.1_1 \ - http-types==0.8.5_1 \ - language-javascript==0.5.13_1 \ - lifted-base==0.2.3.0_1 \ - mime-mail==0.4.5.2_1 \ - mime-types==0.1.0.4_1 \ - mmorph==1.0.3_1 \ - monad-control==0.3.3.0_1 \ - monad-logger==0.3.7.1_1 \ - monad-loops==0.4.2.1_1 \ - nats==0.2_1 \ - optparse-applicative==0.9.1.1_1 \ - path-pieces==0.1.4_1 \ - pem==0.2.2_1 \ - persistent==1.3.1.1_1 \ - persistent-template==1.3.1.4_1 \ - publicsuffixlist==0.1_6 \ - pwstore-fast==2.4.1_1 \ - quickcheck-io==0.1.1_1 \ - resource-pool==0.2.3.0_1 \ - resourcet==1.1.2.3_1 \ - safe==0.3.7_1 \ - securemem==0.1.3_1 \ - semigroups==0.15.2_1 \ - setenv==0.1.1.1_1 \ - SHA==1.6.4.1_1 \ - shakespeare==2.0.1.1_1 \ - silently==1.2.4.1_7 \ - simple-sendfile==0.2.15_1 \ - skein==1.0.9_1 \ - socks==0.5.4_1 \ - stm-chans==3.0.0.2_1 \ - streaming-commons==0.1.4.1_1 \ - stringsearch==0.3.6.5_1 \ - system-fileio==0.3.14_1 \ - system-filepath==0.4.12_1 \ - tagged==0.7.2_1 \ - tagsoup==0.13.1_1 \ - tagstream-conduit==0.5.5.1_1 \ - tf-random==0.5_1 \ - tls==1.2.8_1 \ - transformers-base==0.4.2_1 \ - utf8-string==0.3.8_1 \ - void==0.6.1_1 \ - wai==3.0.1.1_1 \ - wai-app-static==3.0.0_1 \ - wai-extra==3.0.1.2_1 \ - wai-logger==2.2.0_1 \ - warp==3.0.0.5_1 \ - warp-tls==3.0.0_1 \ - word8==0.1.1_1 \ - x509==1.4.11_1 \ - x509-store==1.4.4_1 \ - x509-system==1.4.5_1 \ - x509-validation==1.5.0_1 \ - xml-conduit==1.2.1_1 \ - xml-types==0.3.4_1 \ - xss-sanitize==0.3.5.2_1 \ - yaml==0.8.8.4_1 \ - yesod==1.2.6.1_1 \ - yesod-auth==1.3.4_1 \ - yesod-auth-hashdb==1.3.0.1_1 \ - yesod-core==1.2.19_1 \ - yesod-form==1.3.14_1 \ - yesod-persistent==1.2.3_1 \ - yesod-routes==1.2.0.7_1 \ - yesod-static==1.2.4_1 \ - yesod-test==1.2.3.2_1 \ - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include <bsd.port.mk> diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo deleted file mode 100644 index 8d4be8693a7a..000000000000 --- a/www/hs-yesod-platform/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cabal/yesod-platform-1.2.13.tar.gz) = 547e18f9a4e64ac16ae77ed3975898203cf915c9c280c1c30dcc3a286858e854 -SIZE (cabal/yesod-platform-1.2.13.tar.gz) = 2671 diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal deleted file mode 100644 index 14696b1716aa..000000000000 --- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal +++ /dev/null @@ -1,51 +0,0 @@ ---- ./yesod-platform.cabal.orig 2014-08-05 20:57:15.000000000 +0100 -+++ ./yesod-platform.cabal 2014-08-10 03:02:38.000000000 +0100 -@@ -20,13 +20,11 @@ - , asn1-encoding == 0.8.1.3 - , asn1-parse == 0.8.1 - , asn1-types == 0.2.3 -- , attoparsec-conduit == 1.1.0 - , authenticate == 1.3.2.9 - , auto-update == 0.1.0.0 - , base16-bytestring == 0.1.1.6 - , base64-bytestring == 1.0.0.1 - , blaze-builder == 0.3.3.2 -- , blaze-builder-conduit == 1.1.0 - , blaze-html == 0.7.0.2 - , blaze-markup == 0.6.1.0 - , byteable == 0.1.1 -@@ -63,7 +61,6 @@ - , exceptions == 0.6.1 - , fast-logger == 2.2.0 - , file-embed == 0.0.7 -- , hamlet == 1.2.0 - , hjsmin == 0.1.4.7 - , hspec == 1.11.0 - , hspec-expectations == 0.6.0.1 -@@ -83,7 +80,6 @@ - , monad-logger == 0.3.7.1 - , monad-loops == 0.4.2.1 - , nats == 0.2 -- , network-conduit == 1.1.0 - , optparse-applicative == 0.9.1.1 - , path-pieces == 0.1.4 - , pem == 0.2.2 -@@ -99,10 +95,6 @@ - , semigroups == 0.15.2 - , setenv == 0.1.1.1 - , shakespeare == 2.0.1.1 -- , shakespeare-css == 1.1.0 -- , shakespeare-i18n == 1.1.0 -- , shakespeare-js == 1.3.0 -- , shakespeare-text == 1.1.0 - , silently == 1.2.4.1 - , simple-sendfile == 0.2.15 - , skein == 1.0.9 -@@ -124,7 +116,6 @@ - , wai-app-static == 3.0.0 - , wai-extra == 3.0.1.2 - , wai-logger == 2.2.0 -- , wai-test == 3.0.0 - , warp == 3.0.0.5 - , warp-tls == 3.0.0 - , word8 == 0.1.1 diff --git a/www/hs-yesod-platform/pkg-descr b/www/hs-yesod-platform/pkg-descr deleted file mode 100644 index c9590d88665f..000000000000 --- a/www/hs-yesod-platform/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -Instead of allowing version ranges of dependencies, this package requires -specific versions to avoid dependency hell. - -WWW: http://www.yesodweb.com/ diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile deleted file mode 100644 index a6bc9434bf20..000000000000 --- a/www/hs-yesod-routes/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $FreeBSD$ - -PORTNAME= yesod-routes -PORTVERSION= 1.2.0.7 -PORTREVISION= 1 -CATEGORIES= www haskell - -MAINTAINER= haskell@FreeBSD.org -COMMENT= Efficient routing for Yesod - -LICENSE= MIT - -USE_CABAL= path-pieces>=0.1 text>=0.5 vector>=0.8 - -.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" -.include <bsd.port.mk> diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo deleted file mode 100644 index 97861b1d107c..000000000000 --- a/www/hs-yesod-routes/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (cabal/yesod-routes-1.2.0.7.tar.gz) = d25cd11aef62bb11ea630f758b86f20019dfa1355d36b71bc0b657b8b4b72202 -SIZE (cabal/yesod-routes-1.2.0.7.tar.gz) = 21387 diff --git a/www/hs-yesod-routes/pkg-descr b/www/hs-yesod-routes/pkg-descr deleted file mode 100644 index 45e5b2dfb72d..000000000000 --- a/www/hs-yesod-routes/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -Provides an efficient routing system, a parser and TH code generation. - -WWW: http://www.yesodweb.com/ diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile index 91a8c2979fc5..7f74e2ed0518 100644 --- a/www/hs-yesod-static/Makefile +++ b/www/hs-yesod-static/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-static -PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTVERSION= 1.5.0.2 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -14,10 +13,9 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring>=0.1.0.1 \ blaze-builder>=0.3 byteable>=0.1 conduit>=0.5 conduit-extra \ cryptohash>=0.11 cryptohash-conduit>=0.1 css-text>=0.1.2 \ data-default file-embed>=0.0.4.1 hashable>=1.1 hjsmin \ - http-types>=0.7 mime-types>=0.1 resourcet>=0.4 \ - shakespeare>=2.0 system-fileio>=0.3 system-filepath>=0.4.6 \ - text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 \ - wai>=1.3 wai-app-static>=1.3.2 yesod-core>=1.2 + http-types>=0.7 mime-types>=0.1 old-time>=1.0 resourcet>=0.4 \ + text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 wai>=1.3 \ + wai-app-static>=3.1 yesod-core>=1.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo index 5d5f582e0458..363c4fdc62c6 100644 --- a/www/hs-yesod-static/distinfo +++ b/www/hs-yesod-static/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-static-1.2.4.tar.gz) = 3f180018dee2e3dd8c306bebdedfd67a8160e8836adc097765a7c95765f8ab64 -SIZE (cabal/yesod-static-1.2.4.tar.gz) = 25099 +SHA256 (cabal/yesod-static-1.5.0.2.tar.gz) = 8aec8fc99df9a9910d7a3f732b669753c01dd3ea4177f9e5a7f8cea936b62ea9 +SIZE (cabal/yesod-static-1.5.0.2.tar.gz) = 25037 diff --git a/www/hs-yesod-static/files/patch-yesod-static.cabal b/www/hs-yesod-static/files/patch-yesod-static.cabal deleted file mode 100644 index 85d1c2f30ae1..000000000000 --- a/www/hs-yesod-static/files/patch-yesod-static.cabal +++ /dev/null @@ -1,18 +0,0 @@ ---- ./yesod-static.cabal.orig 2014-06-09 09:45:32.000000000 +0200 -+++ ./yesod-static.cabal 2014-07-13 02:04:58.000000000 +0200 -@@ -47,7 +47,6 @@ - , system-filepath >= 0.4.6 && < 0.5 - , system-fileio >= 0.3 - , data-default -- , shakespeare-css >= 1.0.3 - , mime-types >= 0.1 - , hjsmin - , filepath >= 1.3 -@@ -107,7 +106,6 @@ - , system-filepath - , system-fileio - , data-default -- , shakespeare-css - , mime-types - , hjsmin - , filepath diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile index db4c958576a8..455e25d3ae5f 100644 --- a/www/hs-yesod-test/Makefile +++ b/www/hs-yesod-test/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod-test -PORTVERSION= 1.2.3.2 -PORTREVISION= 1 +PORTVERSION= 1.4.3.1 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -11,10 +10,10 @@ COMMENT= Integration testing for WAI/Yesod Applications LICENSE= MIT USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \ - blaze-markup>=0.5.1 case-insensitive>=0.2 cookie hspec>=1.4 \ - html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 monad-control \ - network>=2.2 persistent>=1.0 text wai>=1.3 wai-extra \ - xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.2 + blaze-markup>=0.5.1 case-insensitive>=0.2 cookie \ + hspec-core>=2.0 html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 \ + monad-control network>=2.2 persistent>=1.0 text wai>=3.0 \ + wai-extra xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo index 281c8b35f86b..07ab4f770c65 100644 --- a/www/hs-yesod-test/distinfo +++ b/www/hs-yesod-test/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-test-1.2.3.2.tar.gz) = a9ebab87f5633bb6979d5714703b8448f1fb6d6278cf37c3d1122d9136a80716 -SIZE (cabal/yesod-test-1.2.3.2.tar.gz) = 13269 +SHA256 (cabal/yesod-test-1.4.3.1.tar.gz) = a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394 +SIZE (cabal/yesod-test-1.4.3.1.tar.gz) = 15284 diff --git a/www/hs-yesod-test/files/patch-yesod-test.cabal b/www/hs-yesod-test/files/patch-yesod-test.cabal deleted file mode 100644 index 0d0492cc7759..000000000000 --- a/www/hs-yesod-test/files/patch-yesod-test.cabal +++ /dev/null @@ -1,10 +0,0 @@ ---- ./yesod-test.cabal.orig 2014-06-09 09:47:25.000000000 +0200 -+++ ./yesod-test.cabal 2014-07-13 02:06:10.000000000 +0200 -@@ -19,7 +19,6 @@ - , persistent >= 1.0 - , transformers >= 0.2.2 - , wai >= 1.3 -- , wai-test >= 1.3 - , wai-extra - , network >= 2.2 - , http-types >= 0.7 diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile index d62b97919cfb..0dc663f5b0b6 100644 --- a/www/hs-yesod/Makefile +++ b/www/hs-yesod/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yesod -PORTVERSION= 1.2.6.1 -PORTREVISION= 1 +PORTVERSION= 1.4.1.5 CATEGORIES= www haskell MAINTAINER= haskell@FreeBSD.org @@ -12,9 +11,10 @@ LICENSE= MIT USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 conduit-extra \ data-default fast-logger monad-control>=0.3 monad-logger \ - safe shakespeare>=2.0 text unordered-containers wai>=1.3 \ - wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 \ - yesod-core>=1.2.2 yesod-form>=1.3 yesod-persistent>=1.2 + safe shakespeare>=2.0 streaming-commons text \ + unordered-containers wai>=1.3 wai-extra>=1.3 wai-logger \ + warp>=1.3 yaml yesod-auth>=1.4 yesod-core>=1.4 \ + yesod-form>=1.3 yesod-persistent>=1.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo index 03a4bb5008e3..89afdf1c56a3 100644 --- a/www/hs-yesod/distinfo +++ b/www/hs-yesod/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/yesod-1.2.6.1.tar.gz) = a2c624171e86f4c56f55634d02e72ea911147e1e40d3c322254cc72ed9ba38f6 -SIZE (cabal/yesod-1.2.6.1.tar.gz) = 7846 +SHA256 (cabal/yesod-1.4.1.5.tar.gz) = a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b +SIZE (cabal/yesod-1.4.1.5.tar.gz) = 9570 diff --git a/www/hs-yesod/files/patch-yesod.cabal b/www/hs-yesod/files/patch-yesod.cabal deleted file mode 100644 index bbd9afdfa00a..000000000000 --- a/www/hs-yesod/files/patch-yesod.cabal +++ /dev/null @@ -1,19 +0,0 @@ ---- ./yesod.cabal.orig 2014-06-09 09:48:13.000000000 +0200 -+++ ./yesod.cabal 2014-07-13 03:05:49.000000000 +0200 -@@ -30,16 +30,12 @@ - , transformers >= 0.2.2 - , wai >= 1.3 - , wai-extra >= 1.3 -- , hamlet >= 1.1 -- , shakespeare-js >= 1.0.2 -- , shakespeare-css >= 1.0 - , warp >= 1.3 - , blaze-html >= 0.5 - , blaze-markup >= 0.5.1 - , aeson - , safe - , data-default -- , network-conduit - , unordered-containers - , yaml - , text |