aboutsummaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2014-08-10 22:34:50 +0000
committerGabor Pali <pgj@FreeBSD.org>2014-08-10 22:34:50 +0000
commitcc555442337c7591ab5c3fd19ad8e3e185a256b0 (patch)
treea6a0dfa4f440949889fc7b609c83f74555f6894e /www
parent5e492199d1e024a681c6d21087c8d948cb3b7bc3 (diff)
downloadports-cc555442337c7591ab5c3fd19ad8e3e185a256b0.tar.gz
ports-cc555442337c7591ab5c3fd19ad8e3e185a256b0.zip
- Update The Glorious Glasgow Haskell Compiler to version 7.8.3
- Update Haskell Platform to version 2014.2.0.0 - Update Yesod Platform to version 1.2.13 - Update Gtk2Hs to version 0.12.5 - Update Pandoc to version 1.12.4.2 - Update git-annex to version 5.20140717 - Unbreak wxHaskell ports Please note that port revisions for all the Haskell ports without version changes are bumped. New ports (69): databases/hs-esqueleto: Type-safe EDSL for SQL queries on persistent backends devel/hs-Glob: Globbing library devel/hs-STMonadTrans: Monad transformer version of the ST monad devel/hs-auto-update: Efficiently run periodic, on-demand actions devel/hs-asn1-encoding: ASN1 data reader and writer in RAW, BER and DER forms devel/hs-asn1-parse: Simple monadic parser for ASN1 stream types devel/hs-atomic-primops: Safe approach to CAS and other atomic operations devel/hs-boxes: 2D text pretty-printing library devel/hs-byteable: Type class for sequence of bytes devel/hs-chunked-data: Typeclasses for dealing with chunked data devel/hs-conduit-combinators: Commonly used conduit functions devel/hs-conduit-extra: Conduit adapters for common libraries devel/hs-data-hash: Combinators for building fast hashing functions devel/hs-deepseq-generics: Generics-based Control.DeepSeq.rnf implementation devel/hs-dlist-instances: Difference lists instances devel/hs-enclosed-exceptions: Catching exceptions within enclosed computations devel/hs-equivalence: Maintaining equivalence relations as union-find devel/hs-exceptions: Extensible optionally-pure exceptions devel/hs-free: Monads for free devel/hs-hslua: Lua language interpreter embedding in Haskell devel/hs-keys: Keyed functors and containers devel/hs-monad-loops: Monadic loops devel/hs-monads-tf: Monad classes, using type families devel/hs-mono-traversable: Traversing monomorphic containers devel/hs-prelude-extras: Higher-order versions of Prelude classes devel/hs-prettyclass: Pretty printing class similar to Show devel/hs-scientific: Numbers represented using scientific notation devel/hs-securemem: Auto scrubbing and const time eq, memory chunk devel/hs-shake: Build system library, like Make, but more accurate dependencies devel/hs-stm-chans: Additional types of channels for STM devel/hs-streaming-commons: Common functions for streaming data libraries devel/hs-text-icu: Bindings to the ICU library devel/hs-tf-random: High-quality splittable pseudorandom number generator devel/hs-transformers-compat: Compatibility shim for transformers devel/hs-vector-binary-instances: Binary instances for vector devel/hs-vector-instances: Orphan Instances for 'Data.Vector' devel/hs-vector-th-unbox: Deriver for Data.Vector.Unboxed with Template Haskell dns/hs-dns: DNS library in Haskell dns/hs-gnuidn: Bindings for GNU IDN net/hs-connection: Simple and easy network connections API net/hs-gsasl: Bindings for GNU libgsasl net/hs-iproute: IP Routing Table net/hs-network-protocol-xmpp: Client library for the XMPP protocol security/hs-DRBG: Deterministic random bit generator security/hs-cipher-aes128: AES and common modes using AES-NI when available security/hs-cipher-blowfish: Blowfish cipher security/hs-cipher-camellia: Camellia block cipher primitives security/hs-cipher-des: DES and 3DES primitives security/hs-crypto-cipher-types: Generic cryptography cipher types security/hs-crypto-random: Simple cryptographic random related types security/hs-cryptohash-conduit: Cryptohash conduit security/hs-cryptohash-cryptoapi: Crypto-api interfaces for cryptohash security/hs-gnutls: Bindings for GNU libgnutls security/hs-x509: X509 reader and writer security/hs-x509-store: X.509 collection accessing and storing methods security/hs-x509-system: Per-operating-system X.509 accessors and storage security/hs-x509-validation: X.509 Certificate and CRL validation sysutils/hs-ekg: Remote monitoring of processes sysutils/hs-ekg-core: Tracking of system metrics textproc/hs-appar: Simple applicative parser textproc/hs-libxml-sax: Bindings for the libXML2 SAX interface textproc/hs-uri: Library for working with URIs textproc/hs-xml-hamlet: Hamlet-style quasiquoter for XML content www/hs-DAV: RFC 4918 WebDAV support www/hs-http-client: HTTP client engine www/hs-http-client-tls: http-client backend with TLS support www/hs-warp-tls: HTTP over SSL/TLS support for Warp via the TLS package www/hs-yesod-auth-hashdb: Authentication plugin for Yesod www/hs-yesod-bin: Yesod helper executable Updated ports (279): archivers/hs-zip-archive 0.1.3.4_5 --> 0.2.3.2 archivers/hs-zlib-enum 0.2.3_6 --> 0.2.3.1 audio/hs-ALUT 2.2.0.0_14 --> 2.3.0.1 audio/hs-OpenAL 1.4.0.2_5 --> 1.6.0.0 audio/hs-libmpd 0.8.0.2_5 --> 0.8.0.5 benchmarks/hs-criterion 0.6.2.1_6 --> 0.8.1.0 converters/hs-aeson 0.6.1.0_6 --> 0.7.0.6 converters/hs-dataenc 0.14.0.5_5 --> 0.14.0.7 databases/hs-mysql 0.1.1.4_8 --> 0.1.1.6 databases/hs-persistent 1.2.0.1_4 --> 1.3.1.1 databases/hs-persistent-sqlite 1.2.0_4 --> 1.3.0.5 databases/hs-persistent-template 1.2.0_4 --> 1.3.1.4 devel/hs-Boolean 0.2_5 --> 0.2.1 devel/hs-ConfigFile 1.1.1_9 --> 1.1.2 devel/hs-DrIFT 2.2.3_8 --> 2.4.2 devel/hs-MemoTrie 0.6.1_6 --> 0.6.2 devel/hs-MissingH 1.2.0.0_6 --> 1.2.1.0 devel/hs-MonadCatchIO-mtl 0.3.0.5_6 --> 0.3.1.0 devel/hs-MonadCatchIO-transformers 0.3.0.0_8 --> 0.3.1.0 devel/hs-MonadRandom 0.1.9_4 --> 0.1.13 devel/hs-SafeSemaphore 0.9.0_6 --> 0.10.1 devel/hs-Stream 0.4.6.1_6 --> 0.4.7.1 devel/hs-TypeCompose 0.9.9_5 --> 0.9.10 devel/hs-abstract-deque 0.2_4 --> 0.3 devel/hs-abstract-par 0.3.1_8 --> 0.3.3 devel/hs-alex 3.0.5_4 --> 3.1.3 devel/hs-ansi-terminal 0.6_5 --> 0.6.1.1 devel/hs-ansi-wl-pprint 0.6.6_6 --> 0.6.7.1 devel/hs-asn1-types 0.1.3_4 --> 0.2.3 devel/hs-async 2.0.1.4_4 --> 2.0.1.5 devel/hs-base16-bytestring 0.1.1.5_7 --> 0.1.1.6 devel/hs-basic-prelude 0.3.5.0_4 --> 0.3.8 devel/hs-bifunctors 3.2.0.1_5 --> 4.1.1.1 devel/hs-blaze-builder 0.3.1.1_4 --> 0.3.3.2 devel/hs-blaze-builder-enumerator 0.2.0.5_6 --> 0.2.0.6 devel/hs-blaze-textual 0.2.0.8_6 --> 0.2.0.9 devel/hs-bloomfilter 1.2.6.10_7 --> 2.0.0.0 devel/hs-bytestring-show 0.3.5.5_4 --> 0.3.5.6 devel/hs-c2hs 0.16.4_6 --> 0.17.2 devel/hs-cabal-install 1.16.0.2_4 --> 1.18.0.5 devel/hs-cereal 0.3.5.2_7 --> 0.4.0.1 devel/hs-checkers 0.3.1_5 --> 0.3.2 devel/hs-classy-prelude 0.5.7_4 --> 0.9.3 devel/hs-classy-prelude-conduit 0.5.3_5 --> 0.9.3 devel/hs-cmdargs 0.10.3_4 --> 0.10.9 devel/hs-conduit 1.0.5_4 --> 1.1.7 devel/hs-configurator 0.2.0.2_6 --> 0.3.0.0 devel/hs-convertible 1.0.11.1_8 --> 1.1.0.0 devel/hs-cpphs 1.16_5 --> 1.18.5 devel/hs-data-pprint 0.2.1.4_6 --> 0.2.3 devel/hs-directory-tree 0.11.0_6 --> 0.12.0 devel/hs-dlist 0.5_13 --> 0.7.1 devel/hs-either 3.4_5 --> 4.3.0.1 devel/hs-enumerator 0.4.19_8 --> 0.4.20 devel/hs-errors 1.4.1_5 --> 1.4.7 devel/hs-fast-logger 0.3.1_7 --> 2.2.0 devel/hs-fgl 5.4.2.4_9 --> 5.5.0.1 devel/hs-file-embed 0.0.4.7_5 --> 0.0.7 devel/hs-filestore 0.6.0.1_5 --> 0.6.0.3 devel/hs-fsnotify 0.0.11_4 --> 0.1.0.3 devel/hs-gconf 0.12.1.1_6 --> 0.12.5.0 devel/hs-generic-deriving 1.5.0_4 --> 1.6.3 devel/hs-geniplate 0.6.0.3_5 --> 0.6.0.4 devel/hs-ghc-events 0.4.2.0_6 --> 0.4.3.0 devel/hs-ghc-mtl 1.0.1.2_6 --> 1.2.1.0 devel/hs-gio 0.12.4_6 --> 0.12.5.3 devel/hs-glade 0.12.1_10 --> 0.12.5.0 devel/hs-glib 0.12.4_6 --> 0.12.5.4 devel/hs-gtk2hs-buildtools 0.12.4_6 --> 0.12.5.2 devel/hs-haddock 2.13.2_4 --> 2.14.2 devel/hs-happy 1.18.10_6 --> 1.19.4 devel/hs-hashable 1.1.2.5_4,1 --> 1.2.2.0,1 devel/hs-hashed-storage 0.5.10_6 --> 0.5.11 devel/hs-hashtables 1.1.0.2_5 --> 1.1.2.1 devel/hs-haskell-src 1.0.1.5_8 --> 1.0.1.6 devel/hs-haskell-src-exts 1.13.5_6 --> 1.15.0.1 devel/hs-hasktags 0.68.2_5 --> 0.69.0 devel/hs-hastache 0.5.0_5 --> 0.6.0 devel/hs-hinotify 0.3.5_6 --> 0.3.7 devel/hs-hint 0.3.3.6_5 --> 0.4.2.0 devel/hs-hlint 1.8.45_4 --> 1.9.3 devel/hs-hoogle 4.2.16_5 --> 4.2.34 devel/hs-hslogger 1.2.1_6 --> 1.2.4 devel/hs-hspec 1.5.4_4 --> 1.11.0 devel/hs-hspec-expectations 0.3.2_4 --> 0.6.0.1 devel/hs-kqueue 0.1.2.4_6 --> 0.1.2.6 devel/hs-language-c 0.3.2.1_11 --> 0.4.5 devel/hs-language-javascript 0.5.7_6 --> 0.5.13 devel/hs-largeword 1.0.5_4 --> 1.2.3 devel/hs-lens 3.9.0.2_4 --> 4.3.3 devel/hs-lifted-base 0.2.0.5_4 --> 0.2.3.0 devel/hs-logict 0.6_5 --> 0.6.0.2 devel/hs-mmap 0.5.8_7 --> 0.5.9 devel/hs-mmorph 1.0.0_4 --> 1.0.3 devel/hs-monad-control 0.3.2.1_4 --> 0.3.3.0 devel/hs-monad-logger 0.3.1.1_4 --> 0.3.7.1 devel/hs-monad-par 0.3.4.2_4 --> 0.3.4.6 devel/hs-monad-par-extras 0.3.2_8 --> 0.3.3 devel/hs-mtl 2.1.2_6 --> 2.1.3.1 devel/hs-mueval 0.9_5 --> 0.9.1.1 devel/hs-murmur-hash 0.1.0.6_6 --> 0.1.0.7 devel/hs-optparse-applicative 0.5.2.1_5 --> 0.9.1.1 devel/hs-parallel 3.2.0.3_6 --> 3.2.0.4 devel/hs-pcre-light 0.4_13 --> 0.4.0.2 devel/hs-primitive 0.5.0.1_6 --> 0.5.2.1 devel/hs-profunctors 3.3.0.1_4 --> 4.2.0.1 devel/hs-project-template 0.1.3_5 --> 0.1.4.1 devel/hs-quickcheck-io 0.1.0_4 --> 0.1.1 devel/hs-reflection 1.3.2_4 --> 1.5.1 devel/hs-resource-pool 0.2.1.1_6 --> 0.2.3.0 devel/hs-resourcet 0.4.7.1_4 --> 1.1.2.3 devel/hs-safe 0.3.3_9 --> 0.3.7 devel/hs-setenv 0.1.0_6 --> 0.1.1.1 devel/hs-simple-reflect 0.3.1_5 --> 0.3.2 devel/hs-smallcheck 1.0.2_5 --> 1.1.1 devel/hs-syb 0.4.0_4 --> 0.4.1 devel/hs-syb-with-class 0.6.1.4_6 --> 0.6.1.5 devel/hs-system-fileio 0.3.11_5 --> 0.3.14 devel/hs-system-filepath 0.4.7_6 --> 0.4.12 devel/hs-tagged 0.6_4 --> 0.7.2 devel/hs-temporary 1.1.2.4_6 --> 1.2.0.3 devel/hs-test-framework 0.8_7 --> 0.8.0.3 devel/hs-test-framework-hunit 0.3.0_7 --> 0.3.0.1 devel/hs-test-framework-quickcheck2 0.3.0.1_7 --> 0.3.0.3 devel/hs-text 0.11.3.1_4 --> 1.1.0.0 devel/hs-threads 0.5.0.2_5 --> 0.5.1.2 devel/hs-threadscope 0.2.2_6 --> 0.2.4 devel/hs-timezone-olson 0.1.2_5 --> 0.1.4 devel/hs-timezone-series 0.1.2_5 --> 0.1.3 devel/hs-transformers-base 0.4.1_9 --> 0.4.2 devel/hs-uniplate 1.6.10_6 --> 1.6.12 devel/hs-unix-compat 0.4.1.1_4 --> 0.4.1.3 devel/hs-unix-time 0.1.8_4 --> 0.3.3 devel/hs-unordered-containers 0.2.3.1_4 --> 0.2.4.0 devel/hs-utf8-light 0.4.0.1_8 --> 0.4.2 devel/hs-utf8-string 0.3.7_9 --> 0.3.8 devel/hs-utility-ht 0.0.9_4 --> 0.0.10 devel/hs-uuagc 0.9.42.3_4 --> 0.9.51 devel/hs-uuagc-cabal 1.0.4.0_7 --> 1.0.5.0 devel/hs-uuid 1.2.13_4 --> 1.3.3 devel/hs-uulib 0.9.15_5 --> 0.9.16 devel/hs-vault 0.2.0.4_5 --> 0.3.0.3 devel/hs-vector 0.10.0.1_6 --> 0.10.9.1 devel/hs-vector-algorithms 0.5.4.2_6 --> 0.6.0.3 devel/hs-void 0.6_4 --> 0.6.1 devel/hs-word8 0.0.3_5 --> 0.1.1 graphics/hs-HGL 3.2.0.2_14 --> 3.2.0.5 graphics/hs-cairo 0.12.4_6 --> 0.12.5.3 graphics/hs-svgcairo 0.12.1.1_8 --> 0.12.5.2 mail/hs-email-validate 1.0.0_5 --> 2.0.1 mail/hs-mime 0.3.4_6 --> 0.4.0.1 mail/hs-mime-mail 0.4.1.2_7 --> 0.4.5.2 mail/hs-mime-types 0.1.0.3_5 --> 0.1.0.4 math/hs-Agda 2.3.2_6 --> 2.4.0.2 math/hs-categories 1.0.5_5 --> 1.0.6 math/hs-comonad 3.0.2_5 --> 4.2.2 math/hs-contravariant 0.4_5 --> 1.1 math/hs-data-lens 2.10.2_7 --> 2.10.5 math/hs-data-lens-template 2.1.7_7 --> 2.1.8 math/hs-distributive 0.3.1_5 --> 0.4.4 math/hs-math-functions 0.1.3.0_5 --> 0.1.5.2 math/hs-mwc-random 0.12.0.1_6 --> 0.13.1.2 math/hs-nats 0.1_5 --> 0.2 math/hs-pointed 3.0.2_6 --> 4.1 math/hs-probability 0.2.4_8 --> 0.2.4.1 math/hs-semigroupoids 3.0.2_6 --> 4.0.4 math/hs-semigroups 0.9.1_4 --> 0.15.2 math/hs-statistics 0.10.3.1_4 --> 0.13.2.1 math/hs-vector-space 0.8.6_7 --> 0.8.7 multimedia/hs-gstreamer 0.12.1.2_6 --> 0.12.5.0 net/hs-network 2.4.1.2_4 --> 2.4.2.3 net/hs-network-info 0.2.0.3_6 --> 0.2.0.5 net/hs-network-multicast 0.0.7_6 --> 0.0.11 net/hs-simple-sendfile 0.2.11_5 --> 0.2.15 net/hs-socks 0.5.1_4 --> 0.5.4 science/hs-bio 0.5.2_8 --> 0.5.3 security/hs-HsOpenSSL 0.10.3.3_6 --> 0.11 security/hs-RSA 1.2.2.0_7 --> 2.0.0 security/hs-SHA 1.6.1_6 --> 1.6.4.1 security/hs-certificate 1.3.7_4 --> 1.3.9 security/hs-cipher-aes 0.1.8_4 --> 0.2.8 security/hs-cipher-rc4 0.1.2_5 --> 0.1.4 security/hs-clientsession 0.9_4 --> 0.9.0.3 security/hs-cprng-aes 0.3.4_6 --> 0.5.2 security/hs-crypto-api 0.12.1_4 --> 0.13 security/hs-crypto-conduit 0.5.2_4 --> 0.5.4 security/hs-crypto-numbers 0.1.3_5 --> 0.2.3 security/hs-crypto-pubkey 0.1.3_4 --> 0.2.4 security/hs-crypto-pubkey-types 0.3.2_4 --> 0.4.2.2 security/hs-cryptocipher 0.5.0_4 --> 0.6.2 security/hs-cryptohash 0.9.0_4 --> 0.11.6 security/hs-entropy 0.2.1_9 --> 0.3.2 security/hs-monadcryptorandom 0.5.1_5 --> 0.6.1 security/hs-pem 0.1.2_6 --> 0.2.2 security/hs-pwstore-fast 2.3_7 --> 2.4.1 security/hs-skein 1.0.3_4 --> 1.0.9 security/hs-tls 1.1.2_5 --> 1.2.8 sysutils/hs-angel 0.3.4_6 --> 0.5.0 sysutils/hs-cpu 0.1.1_7 --> 0.1.2 textproc/hs-Diff 0.2.0_5 --> 0.3.0 textproc/hs-HStringTemplate 0.7.1_5 --> 0.7.3 textproc/hs-HaXml 1.24_4 --> 1.24.1 textproc/hs-attoparsec-enumerator 0.3.1_7 --> 0.3.3 textproc/hs-blaze-html 0.6.1.1_4 --> 0.7.0.2 textproc/hs-blaze-markup 0.5.1.5_4 --> 0.6.1.0 textproc/hs-case-insensitive 1.0.0.2_4 --> 1.1.0.3 textproc/hs-citeproc-hs 0.3.8_5 --> 0.3.9 textproc/hs-feed 0.3.8_13 --> 0.3.9.2 textproc/hs-hexpat 0.20.3_6 --> 0.20.6 textproc/hs-highlighting-kate 0.5.3.9_4 --> 0.5.8.5 textproc/hs-html-conduit 1.1.0_5 --> 1.1.0.5 textproc/hs-hxt 9.3.1.1_7 --> 9.3.1.4 textproc/hs-hxt-charproperties 9.1.1_9 --> 9.1.1.1 textproc/hs-hxt-unicode 9.0.2_9 --> 9.0.2.2 textproc/hs-pandoc-types 1.10_5 --> 1.12.4.1 textproc/hs-parsec 3.1.3_6 --> 3.1.5 textproc/hs-regex-pcre-builtin 0.94.4.5.8.31_5 --> 0.94.4.8.8.35 textproc/hs-regex-tdfa 1.1.8_5 --> 1.2.0 textproc/hs-stringsearch 0.3.6.4_6 --> 0.3.6.5 textproc/hs-tagsoup 0.12.8_6 --> 0.13.1 textproc/hs-tagstream-conduit 0.5.4_5 --> 0.5.5.1 textproc/hs-texmath 0.6.1.5_4 --> 0.6.7 textproc/hs-xml-conduit 1.1.0.3_5 --> 1.2.1 textproc/hs-xml-types 0.3.3_6 --> 0.3.4 textproc/hs-xmlhtml 0.2.1_5 --> 0.2.3.2 textproc/hs-yaml 0.8.2.4_4 --> 0.8.8.4 www/hs-HTTP 4000.2.8_4 --> 4000.2.10 www/hs-authenticate 1.3.2.6_5 --> 1.3.2.9 www/hs-cgi 3001.1.7.5_4,1 --> 3001.1.8.5,1 www/hs-cookie 0.4.0.1_6 --> 0.4.1.2 www/hs-css-text 0.1.1_10 --> 0.1.2.1 www/hs-gitit 0.10.3.1_5 --> 0.10.4 www/hs-hS3 0.5.7_5 --> 0.5.8 www/hs-happstack 7.0.1_7 --> 7.0.2 www/hs-happstack-server 7.1.7.1_4 --> 7.3.7 www/hs-heist 0.12.0_4 --> 0.13.1.2 www/hs-hjsmin 0.1.4.1_5 --> 0.1.4.7 www/hs-http-conduit 1.9.3_4 --> 2.1.4 www/hs-http-reverse-proxy 0.1.1.6_4 --> 0.4.0.1 www/hs-http-server 1.0.2_5 --> 1.0.4 www/hs-http-types 0.8.0_5 --> 0.8.5 www/hs-oeis 0.3.1_10 --> 0.3.5 www/hs-path-pieces 0.1.2_6 --> 0.1.4 www/hs-recaptcha 0.1_9 --> 0.1.0.2 www/hs-shakespeare 1.0.5_4 --> 2.0.1.1 www/hs-snap 0.12.0_4 --> 0.13.2.8 www/hs-snap-core 0.9.3.1_5 --> 0.9.6.3 www/hs-snap-server 0.9.3.3_5 --> 0.9.4.5 www/hs-wai 1.4.0_5 --> 3.0.1.1 www/hs-wai-app-static 1.3.1.2_5 --> 3.0.0 www/hs-wai-extra 1.3.4_4 --> 3.0.1.2 www/hs-wai-logger 0.3.0_7 --> 2.2.0 www/hs-warp 1.3.8.1_4 --> 3.0.0.5 www/hs-webkit 0.12.4_8 --> 0.12.6.1 www/hs-xss-sanitize 0.3.3_6 --> 0.3.5.2 www/hs-yesod 1.2.0.1_4 --> 1.2.6.1 www/hs-yesod-auth 1.2.0_4 --> 1.3.4 www/hs-yesod-core 1.2.0.4_4 --> 1.2.19 www/hs-yesod-form 1.3.0_4 --> 1.3.14 www/hs-yesod-persistent 1.2.0_4 --> 1.2.3 www/hs-yesod-routes 1.2.0_4 --> 1.2.0.7 www/hs-yesod-static 1.2.0_4 --> 1.2.4 www/hs-yesod-test 1.2.0_4 --> 1.2.3.2 x11-toolkits/hs-GLURaw 1.3.0.0_4 --> 1.4.0.1 x11-toolkits/hs-GLUT 2.4.0.0_5,1 --> 2.5.1.1,1 x11-toolkits/hs-OpenGL 2.8.0.0_4,1 --> 2.9.2.0,1 x11-toolkits/hs-OpenGLRaw 1.3.0.0_5 --> 1.5.0.0 x11-toolkits/hs-gtk 0.12.4_6 --> 0.12.5.7 x11-toolkits/hs-gtkglext 0.12.1_10 --> 0.12.5.0 x11-toolkits/hs-gtksourceview2 0.12.3.1_8 --> 0.12.5.0 x11-toolkits/hs-pango 0.12.4_6 --> 0.12.5.3 x11-toolkits/hs-vte 0.12.1_10 --> 0.12.5.0 x11-toolkits/hs-wx 0.90.0.1_8 --> 0.90.1.0 x11-toolkits/hs-wxc 0.90.0.4_7 --> 0.90.1.1 x11-toolkits/hs-wxcore 0.90.0.3_7 --> 0.90.1.1 x11-toolkits/hs-wxdirect 0.90.0.1_8 --> 0.90.1.1 x11-wm/hs-xmonad-contrib 0.11.1_6 --> 0.11.3 x11/hs-X11 1.6.1.1_6 --> 1.6.1.2 x11/hs-xmobar 0.17_4 --> 0.21 Removed ports (28): archivers/hs-zlib-conduit: Deprecated in favor of conduit-extra devel/hs-IORefCAS: Deprecated in favor of atomic-primops devel/hs-StateVar: Deprecated devel/hs-Tensor: Depcrecated devel/hs-attempt: Deprecated in favor of exceptions devel/hs-base64-conduit: Deprecated in favor of conduit-combinators devel/hs-blaze-builder-conduit: Deprecated in favor of conduit-extra devel/hs-failure: Deprecated in favor or exceptions devel/hs-filesystem-conduit: Deprecated in favor of conduit-combinators devel/hs-haskeline: Become part of GHC devel/hs-pool-conduit: Deprecated in favor of resource-pool devel/hs-profunctor-extras: Absorbed into profunctors devel/hs-terminfo: Become part of GHC devel/hs-transformers: Become part of GHC math/hs-comonad-transformers: Deprecated in favor of comonad math/hs-comonads-fd: Deprecated in favor of comonad math/hs-groupoids: Deprecated in favor of semigroupoids math/hs-semigroupoid-extras: Deprecated in favor of semigroupoids net/hs-network-conduit: Deprecated in favor of conduit-extra security/hs-tls-extra: Deprecated in favor of tls textproc/hs-attoparsec-conduit: Deprecated in favor of conduit-extra textproc/hs-xhtml: Become part of GHC www/hs-hamlet: Deprecated in favor of shakespeare www/hs-shakespeare-css: Deprecated in favor of shakespeare www/hs-shakespeare-i18n: Deprecated in favor of shakespeare www/hs-shakespeare-js: Deprecated in favor of shakespeare www/hs-shakespeare-text: Deprecated in favor of shakespeare www/hs-wai-test: Deprecated in favor of wai-extra Approved by: portmgr (implicit, touching unstaged ports) Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=364579
Diffstat (limited to 'www')
-rw-r--r--www/Makefile12
-rw-r--r--www/hs-DAV/Makefile21
-rw-r--r--www/hs-DAV/distinfo2
-rw-r--r--www/hs-DAV/pkg-descr6
-rw-r--r--www/hs-HTTP/Makefile7
-rw-r--r--www/hs-HTTP/distinfo4
-rw-r--r--www/hs-activehs/Makefile10
-rw-r--r--www/hs-activehs/files/patch-Converter.hs20
-rw-r--r--www/hs-activehs/files/patch-QuickCheck.hs50
-rw-r--r--www/hs-activehs/files/patch-Simple.hs38
-rw-r--r--www/hs-activehs/files/patch-Specialize.hs11
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal34
-rw-r--r--www/hs-authenticate/Makefile11
-rw-r--r--www/hs-authenticate/distinfo4
-rw-r--r--www/hs-cgi/Makefile7
-rw-r--r--www/hs-cgi/distinfo4
-rw-r--r--www/hs-cgi/files/patch-Network__CGI__Monad.hs30
-rw-r--r--www/hs-cgi/files/patch-Network__CGI__Protocol.hs35
-rw-r--r--www/hs-cookie/Makefile5
-rw-r--r--www/hs-cookie/distinfo4
-rw-r--r--www/hs-css-text/Makefile7
-rw-r--r--www/hs-css-text/distinfo4
-rw-r--r--www/hs-fastcgi/Makefile4
-rw-r--r--www/hs-gitit/Makefile14
-rw-r--r--www/hs-gitit/distinfo4
-rw-r--r--www/hs-hS3/Makefile5
-rw-r--r--www/hs-hS3/distinfo4
-rw-r--r--www/hs-hamlet/Makefile17
-rw-r--r--www/hs-hamlet/distinfo2
-rw-r--r--www/hs-hamlet/pkg-descr6
-rw-r--r--www/hs-happstack-server/Makefile11
-rw-r--r--www/hs-happstack-server/distinfo4
-rw-r--r--www/hs-happstack/Makefile5
-rw-r--r--www/hs-happstack/distinfo4
-rw-r--r--www/hs-heist/Makefile7
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-hjsmin/Makefile10
-rw-r--r--www/hs-hjsmin/distinfo4
-rw-r--r--www/hs-http-client-tls/Makefile16
-rw-r--r--www/hs-http-client-tls/distinfo2
-rw-r--r--www/hs-http-client-tls/pkg-descr3
-rw-r--r--www/hs-http-client/Makefile18
-rw-r--r--www/hs-http-client/distinfo2
-rw-r--r--www/hs-http-client/pkg-descr4
-rw-r--r--www/hs-http-conduit/Makefile17
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-conduit/pkg-descr4
-rw-r--r--www/hs-http-date/Makefile4
-rw-r--r--www/hs-http-reverse-proxy/Makefile14
-rw-r--r--www/hs-http-reverse-proxy/distinfo4
-rw-r--r--www/hs-http-reverse-proxy/pkg-descr7
-rw-r--r--www/hs-http-server/Makefile8
-rw-r--r--www/hs-http-server/distinfo4
-rw-r--r--www/hs-http-types/Makefile5
-rw-r--r--www/hs-http-types/distinfo4
-rw-r--r--www/hs-oeis/Makefile9
-rw-r--r--www/hs-oeis/distinfo4
-rw-r--r--www/hs-path-pieces/Makefile5
-rw-r--r--www/hs-path-pieces/distinfo4
-rw-r--r--www/hs-recaptcha/Makefile7
-rw-r--r--www/hs-recaptcha/distinfo4
-rw-r--r--www/hs-scgi/Makefile4
-rw-r--r--www/hs-shakespeare-css/Makefile16
-rw-r--r--www/hs-shakespeare-css/distinfo2
-rw-r--r--www/hs-shakespeare-css/pkg-descr11
-rw-r--r--www/hs-shakespeare-i18n/Makefile16
-rw-r--r--www/hs-shakespeare-i18n/distinfo2
-rw-r--r--www/hs-shakespeare-i18n/pkg-descr5
-rw-r--r--www/hs-shakespeare-js/Makefile16
-rw-r--r--www/hs-shakespeare-js/distinfo2
-rw-r--r--www/hs-shakespeare-js/pkg-descr11
-rw-r--r--www/hs-shakespeare-text/Makefile16
-rw-r--r--www/hs-shakespeare-text/distinfo2
-rw-r--r--www/hs-shakespeare-text/pkg-descr11
-rw-r--r--www/hs-shakespeare/Makefile7
-rw-r--r--www/hs-shakespeare/distinfo4
-rw-r--r--www/hs-snap-core/Makefile11
-rw-r--r--www/hs-snap-core/distinfo4
-rw-r--r--www/hs-snap-server/Makefile18
-rw-r--r--www/hs-snap-server/distinfo4
-rw-r--r--www/hs-snap/Makefile23
-rw-r--r--www/hs-snap/distinfo4
-rw-r--r--www/hs-snap/files/patch-snap.cabal19
-rw-r--r--www/hs-url/Makefile4
-rw-r--r--www/hs-wai-app-static/Makefile15
-rw-r--r--www/hs-wai-app-static/distinfo4
-rw-r--r--www/hs-wai-app-static/pkg-descr2
-rw-r--r--www/hs-wai-extra/Makefile14
-rw-r--r--www/hs-wai-extra/distinfo4
-rw-r--r--www/hs-wai-logger/Makefile10
-rw-r--r--www/hs-wai-logger/distinfo4
-rw-r--r--www/hs-wai-test/Makefile19
-rw-r--r--www/hs-wai-test/distinfo2
-rw-r--r--www/hs-wai-test/pkg-descr3
-rw-r--r--www/hs-wai/Makefile9
-rw-r--r--www/hs-wai/distinfo4
-rw-r--r--www/hs-warp-tls/Makefile16
-rw-r--r--www/hs-warp-tls/distinfo2
-rw-r--r--www/hs-warp-tls/pkg-descr3
-rw-r--r--www/hs-warp/Makefile12
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-webkit/Makefile7
-rw-r--r--www/hs-webkit/distinfo4
-rw-r--r--www/hs-webkit/pkg-descr3
-rw-r--r--www/hs-xss-sanitize/Makefile5
-rw-r--r--www/hs-xss-sanitize/distinfo4
-rw-r--r--www/hs-yesod-auth-hashdb/Makefile16
-rw-r--r--www/hs-yesod-auth-hashdb/distinfo2
-rw-r--r--www/hs-yesod-auth-hashdb/pkg-descr5
-rw-r--r--www/hs-yesod-auth/Makefile17
-rw-r--r--www/hs-yesod-auth/distinfo4
-rw-r--r--www/hs-yesod-auth/files/patch-yesod-auth.cabal21
-rw-r--r--www/hs-yesod-bin/Makefile27
-rw-r--r--www/hs-yesod-bin/distinfo2
-rw-r--r--www/hs-yesod-bin/files/patch-yesod-bin.cabal21
-rw-r--r--www/hs-yesod-bin/pkg-descr3
-rw-r--r--www/hs-yesod-core/Makefile22
-rw-r--r--www/hs-yesod-core/distinfo4
-rw-r--r--www/hs-yesod-core/files/patch-yesod-core.cabal40
-rw-r--r--www/hs-yesod-core/pkg-descr2
-rw-r--r--www/hs-yesod-form/Makefile12
-rw-r--r--www/hs-yesod-form/distinfo4
-rw-r--r--www/hs-yesod-form/files/patch-yesod-form.cabal13
-rw-r--r--www/hs-yesod-persistent/Makefile8
-rw-r--r--www/hs-yesod-persistent/distinfo4
-rw-r--r--www/hs-yesod-platform/Makefile251
-rw-r--r--www/hs-yesod-platform/distinfo4
-rw-r--r--www/hs-yesod-platform/files/patch-yesod-platform.cabal62
-rw-r--r--www/hs-yesod-routes/Makefile3
-rw-r--r--www/hs-yesod-routes/distinfo4
-rw-r--r--www/hs-yesod-static/Makefile17
-rw-r--r--www/hs-yesod-static/distinfo4
-rw-r--r--www/hs-yesod-static/files/patch-yesod-static.cabal18
-rw-r--r--www/hs-yesod-test/Makefile8
-rw-r--r--www/hs-yesod-test/distinfo4
-rw-r--r--www/hs-yesod-test/files/patch-yesod-test.cabal10
-rw-r--r--www/hs-yesod/Makefile14
-rw-r--r--www/hs-yesod/distinfo4
-rw-r--r--www/hs-yesod/files/patch-yesod.cabal19
139 files changed, 968 insertions, 627 deletions
diff --git a/www/Makefile b/www/Makefile
index beec64c55d0c..323f767f9932 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -278,6 +278,7 @@
SUBDIR += horde3-passwd
SUBDIR += horde3-trean
SUBDIR += hotcrp
+ SUBDIR += hs-DAV
SUBDIR += hs-HTTP
SUBDIR += hs-activehs
SUBDIR += hs-authenticate
@@ -287,11 +288,12 @@
SUBDIR += hs-fastcgi
SUBDIR += hs-gitit
SUBDIR += hs-hS3
- SUBDIR += hs-hamlet
SUBDIR += hs-happstack
SUBDIR += hs-happstack-server
SUBDIR += hs-heist
SUBDIR += hs-hjsmin
+ SUBDIR += hs-http-client
+ SUBDIR += hs-http-client-tls
SUBDIR += hs-http-conduit
SUBDIR += hs-http-date
SUBDIR += hs-http-reverse-proxy
@@ -302,10 +304,6 @@
SUBDIR += hs-recaptcha
SUBDIR += hs-scgi
SUBDIR += hs-shakespeare
- SUBDIR += hs-shakespeare-css
- SUBDIR += hs-shakespeare-i18n
- SUBDIR += hs-shakespeare-js
- SUBDIR += hs-shakespeare-text
SUBDIR += hs-snap
SUBDIR += hs-snap-core
SUBDIR += hs-snap-server
@@ -314,12 +312,14 @@
SUBDIR += hs-wai-app-static
SUBDIR += hs-wai-extra
SUBDIR += hs-wai-logger
- SUBDIR += hs-wai-test
SUBDIR += hs-warp
+ SUBDIR += hs-warp-tls
SUBDIR += hs-webkit
SUBDIR += hs-xss-sanitize
SUBDIR += hs-yesod
SUBDIR += hs-yesod-auth
+ SUBDIR += hs-yesod-auth-hashdb
+ SUBDIR += hs-yesod-bin
SUBDIR += hs-yesod-core
SUBDIR += hs-yesod-form
SUBDIR += hs-yesod-persistent
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
new file mode 100644
index 000000000000..7322b201b148
--- /dev/null
+++ b/www/hs-DAV/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME= DAV
+PORTVERSION= 0.8
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= RFC 4918 WebDAV support
+
+LICENSE= GPLv3
+
+USE_CABAL= case-insensitive>=0.4 either>=4.1 errors http-client>=0.2 \
+ http-client-tls>=0.2 http-types>=0.7 lens>=3.0 \
+ lifted-base>=0.1 monad-control>=0.3.2 mtl>=2.1 network>=2.3 \
+ optparse-applicative>=0.5.0 transformers-base \
+ xml-conduit>=1.0 xml-hamlet>=0.4
+
+EXECUTABLE= hdav
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo
new file mode 100644
index 000000000000..653a5b45ceca
--- /dev/null
+++ b/www/hs-DAV/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/DAV-0.8.tar.gz) = 1901a62748916d37413b7cacf1eec97845e2158277b164fb60c429254b8b124e
+SIZE (cabal/DAV-0.8.tar.gz) = 19976
diff --git a/www/hs-DAV/pkg-descr b/www/hs-DAV/pkg-descr
new file mode 100644
index 000000000000..9daa0828a1d2
--- /dev/null
+++ b/www/hs-DAV/pkg-descr
@@ -0,0 +1,6 @@
+This is a library for the Web Distributed Authoring and Versioning
+(WebDAV) extensions to HTTP. At present it supports a very small subset
+of client functionality. In addition, there is an executable, hdav,
+which can be used for command-line operation.
+
+WWW: http://floss.scru.org/hDAV
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index e5a3d4af9360..438c71c7db90 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.2.8
-PORTREVISION= 4
+PORTVERSION= 4000.2.10
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for client-side HTTP
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= mtl network parsec
+USE_CABAL= mtl>=2.0 network parsec
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index b8b17ea35308..f208ba4f1656 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HTTP-4000.2.8.tar.gz) = 086a2aa771a31845b190e2f9651ab4d8e85116aa463de5bc5e0204c1e5e70c5c
-SIZE (cabal/HTTP-4000.2.8.tar.gz) = 67903
+SHA256 (cabal/HTTP-4000.2.10.tar.gz) = efde6d9f2e8cd7b72068579f0a75449703c0fa7aee76dfc0f3af175295a127d1
+SIZE (cabal/HTTP-4000.2.10.tar.gz) = 67912
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 076dea37213d..b41d551c16b0 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,21 +2,21 @@
PORTNAME= activehs
PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell code presentation tool
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \
cmdargs>=0.7 data-pprint>=0.2 dia-base>=0.1 \
- dia-functions>=0.2.1.1 haskell-src-exts>=1.12 \
+ dia-functions>=0.2.1.1 exceptions>=0.6 haskell-src-exts>=1.12 \
highlighting-kate>=0.5 hint>=0.3.3.2 hoogle>=4.2.11 mtl>=2.0 \
- pandoc>=1.10 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \
+ pandoc>=1.12 pureMD5>=2.1 QuickCheck>=2.4 simple-reflect>=0.2 \
snap-core>=0.6 snap-server>=0.6 split>=0.1 syb>=0.2 \
- text>=0.11 utf8-string>=0.3 xhtml>=3000.2
+ text>=0.11 utf8-string>=0.3
STANDALONE= yes
EXECUTABLE= activehs
diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs
index e4e7da82e900..2cab802ee939 100644
--- a/www/hs-activehs/files/patch-Converter.hs
+++ b/www/hs-activehs/files/patch-Converter.hs
@@ -1,5 +1,23 @@
--- ./Converter.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Converter.hs 2013-05-28 16:20:35.000000000 +0200
++++ ./Converter.hs 2013-12-27 18:34:37.000000000 +0100
+@@ -28,7 +28,7 @@
+
+ import Control.Monad
+ import Data.List
+-import Data.Char
++import Data.Char hiding (Format)
+
+ ----------------------------------
+
+@@ -206,7 +206,7 @@
+ ------------------------------------
+
+ rawHtml :: String -> Block
+-rawHtml x = RawBlock "html" x
++rawHtml x = RawBlock (Format "html") x
+
+ showBlockSimple :: Language -> String -> String -> Int -> String -> [Block]
+
@@ -249,8 +249,8 @@
mkName :: String -> HSyn.Name
diff --git a/www/hs-activehs/files/patch-QuickCheck.hs b/www/hs-activehs/files/patch-QuickCheck.hs
new file mode 100644
index 000000000000..3c0c2e43857a
--- /dev/null
+++ b/www/hs-activehs/files/patch-QuickCheck.hs
@@ -0,0 +1,50 @@
+--- ./QuickCheck.hs.orig 2013-02-12 20:23:46.000000000 +0100
++++ ./QuickCheck.hs 2014-07-14 02:54:45.000000000 +0200
+@@ -7,13 +7,14 @@
+ import Logger
+ import Qualify (qualify)
+ import Hash
++import Specialize (specialize)
+
+ import Test.QuickCheck hiding (Result)
+ import qualified Test.QuickCheck.Property as QC
+
+ import Data.Char (isLower)
+ import Data.List (intercalate)
+-import Control.Monad (join)
++import Control.Monad (join,forM)
+ import Control.Concurrent.MVar
+
+ ---------------------------------------
+@@ -38,19 +39,24 @@
+ return [Error True err]
+ Right s_ -> do
+ logStrMsg 3 (logger ch) $ "Qualified expressions: " ++ show s_
+-
+- let ts = mkTestCases [(v,s,s') | ((v,s),s')<- zip testcases s_]
+- logStrMsg 3 (logger ch) $ "Test cases: " ++ ts
+-
+ interp False m5 lang ch fn "" $ \a ->
+- do liftIO $ logStrMsg 3 (logger ch) "Before interpretation"
++ do ss <- forM (testcases `zip` s_) $ \((v,s1),s2) -> do
++ ts1 <- typeOf s1
++ ts2 <- typeOf s2
++ let [x1,x2] = map fixType [(s1,ts1),(s2,ts2)]
++ return $ mkTestCase (v,x1,x2)
++ let ts = "[" ++ intercalate ", " ss ++ "]"
++ liftIO $ logStrMsg 3 (logger ch) $ "Test cases: " ++ ts
++ liftIO $ logStrMsg 3 (logger ch) "Before interpretation"
+ m <- interpret ts (as :: [TestCase])
+ liftIO $ logStrMsg 3 (logger ch) "After interpretation"
+ return $ qcs lang (logger ch) m
+
+ where
+- mkTestCases ss
+- = "[" ++ intercalate ", " (map mkTestCase ss) ++ "]"
++ fixType (s,t) =
++ case (specialize t) of
++ Right (st,_) | t /= st -> unwords [s, "::", st]
++ _ -> s
+
+ mkTestCase (vars, s, s2)
+ = "TestCase (\\qcinner "
diff --git a/www/hs-activehs/files/patch-Simple.hs b/www/hs-activehs/files/patch-Simple.hs
new file mode 100644
index 000000000000..585e6ef9f436
--- /dev/null
+++ b/www/hs-activehs/files/patch-Simple.hs
@@ -0,0 +1,38 @@
+--- ./Simple.hs.orig 2013-02-12 20:23:45.000000000 +0100
++++ ./Simple.hs 2014-07-14 02:44:00.000000000 +0200
+@@ -19,9 +19,10 @@
+ import Control.Concurrent (forkIO)
+ import Control.Concurrent.MVar (MVar, newEmptyMVar, takeMVar, putMVar)
+ import Control.Concurrent.Chan (Chan, newChan, readChan, writeChan)
+-import Control.Exception (SomeException, catch)
++import Control.Exception (SomeException)
++import qualified Control.Exception as CE
+ import Control.Monad (when, forever)
+-import Control.Monad.Error (MonadError, catchError)
++import Control.Monad.Catch (catch)
+ import Data.List (isPrefixOf)
+ --import Prelude hiding (catch)
+
+@@ -42,7 +43,7 @@
+ _ <- forkIO $ forever $ do
+ logStrMsg 1 log "start interpreter"
+ e <- runInterpreter (handleTask ch Nothing)
+- `catch` \(e :: SomeException) ->
++ `CE.catch` \(e :: SomeException) ->
+ return $ Left $ UnknownError "GHCi server died."
+ case e of
+ Left e -> logStrMsg 0 log $ "stop interpreter: " ++ show e
+@@ -95,10 +96,10 @@
+ fatal (NotAllowed _) = False
+ fatal _ = True
+
+-catchError_fixed
+- :: MonadError InterpreterError m
++catchError_fixed
++ :: MonadInterpreter m
+ => m a -> (InterpreterError -> m a) -> m a
+-m `catchError_fixed` f = m `catchError` (f . fixError)
++m `catchError_fixed` f = m `catch` (f . fixError)
+ where
+ fixError (UnknownError s)
+ | Just x <- dropPrefix "GHC returned a result but said: [GhcError {errMsg =" s
diff --git a/www/hs-activehs/files/patch-Specialize.hs b/www/hs-activehs/files/patch-Specialize.hs
new file mode 100644
index 000000000000..73c64c19329d
--- /dev/null
+++ b/www/hs-activehs/files/patch-Specialize.hs
@@ -0,0 +1,11 @@
+--- ./Specialize.hs.orig 2013-02-12 19:23:45.000000000 +0000
++++ ./Specialize.hs 2013-08-28 17:32:07.000000000 +0100
+@@ -15,7 +15,7 @@
+
+ specialize :: String -> Either String (String, String)
+ specialize a
+- = case parseTypeWithMode (defaultParseMode {extensions = [FlexibleContexts]}) a of
++ = case parseTypeWithMode (defaultParseMode {extensions = [EnableExtension FlexibleContexts]}) a of
+ ParseFailed loc s -> Left $ show s
+ ParseOk t -> let
+
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 68ed888b6f5d..53f52357b85f 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,32 +1,44 @@
--- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./activehs.cabal 2013-05-28 16:18:31.000000000 +0200
-@@ -63,7 +63,7 @@
++++ ./activehs.cabal 2014-07-14 02:37:00.000000000 +0200
+@@ -62,29 +62,31 @@
+ 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,
+- 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,
- array >= 0.3 && < 0.5,
++ array >= 0.3 && < 0.6,
directory >= 1.1 && < 1.3,
containers >= 0.4 && < 0.6,
-@@ -71,16 +71,17 @@
- text >= 0.11 && < 0.12,
+ filepath >= 1.2 && < 1.4,
+- text >= 0.11 && < 0.12,
++ text >= 1.1 && < 1.2,
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.12 && < 1.14,
++ haskell-src-exts >= 1.15 && < 1.16,
bytestring >= 0.9 && < 0.11,
utf8-string >= 0.3 && < 0.4,
xhtml >= 3000.2 && < 3000.3,
- blaze-html >= 0.4 && < 0.6,
-+ blaze-html >= 0.4 && < 0.7,
-+ blaze-markup == 0.5.1.*,
++ blaze-html >= 0.4 && < 0.8,
++ blaze-markup >= 0.6 && < 0.7,
pureMD5 >= 2.1 && < 2.2,
deepseq >= 1.1 && < 1.4,
++ exceptions >= 0.6 && < 0.7,
split >= 0.1 && < 0.3,
- pandoc >= 1.10 && < 1.11,
-+ pandoc >= 1.10 && < 1.12,
++ pandoc >= 1.10 && < 1.13,
time >= 1.2 && < 1.5,
old-time >= 1.0 && < 1.2,
- process >= 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,
+ old-locale >= 1.0 && < 1.1,
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 143f25aef2ae..0aa30f30499b 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,19 +1,18 @@
# $FreeBSD$
PORTNAME= authenticate
-PORTVERSION= 1.3.2.6
-PORTREVISION= 5
+PORTVERSION= 1.3.2.9
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Authentication methods for Haskell web applications
-LICENSE= BSD
+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 network \
- tagsoup>=0.12 text transformers>=0.1 unordered-containers \
- xml-conduit>=1.0
+ 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
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index 2af618b464d9..b52343fa60b7 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/authenticate-1.3.2.6.tar.gz) = 3f4b5b35e85083c22b3ff1cfa2bb18964f203b9d36695b118452aa69b0894f8b
-SIZE (cabal/authenticate-1.3.2.6.tar.gz) = 8426
+SHA256 (cabal/authenticate-1.3.2.9.tar.gz) = b93d342b23ce9bea970b7251ae0df0026759986c05c5270f36a60ca8453d6f27
+SIZE (cabal/authenticate-1.3.2.9.tar.gz) = 8517
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index e20d858e9138..ccc35cb9a655 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -2,17 +2,16 @@
# $FreeBSD$
PORTNAME= cgi
-PORTVERSION= 3001.1.7.5
-PORTREVISION= 4
+PORTVERSION= 3001.1.8.5
PORTEPOCH= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell library for writing CGI programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl>=1 network>=2 parsec>=2 xhtml>=3000
+USE_CABAL= MonadCatchIO-mtl mtl>=1.0 network>=2.0 parsec>=2.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo
index f39abd85abc9..dfdc79e74deb 100644
--- a/www/hs-cgi/distinfo
+++ b/www/hs-cgi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cgi-3001.1.7.5.tar.gz) = 5126e2eaa53cd5de59572981c00aedae5790882afda67545228eb29fe76faffd
-SIZE (cabal/cgi-3001.1.7.5.tar.gz) = 21377
+SHA256 (cabal/cgi-3001.1.8.5.tar.gz) = 46cfb262f95348e88629fe30a9a8319aec510601be3a550cfb02fb1267b2db39
+SIZE (cabal/cgi-3001.1.8.5.tar.gz) = 21423
diff --git a/www/hs-cgi/files/patch-Network__CGI__Monad.hs b/www/hs-cgi/files/patch-Network__CGI__Monad.hs
new file mode 100644
index 000000000000..8956c1e1ad0e
--- /dev/null
+++ b/www/hs-cgi/files/patch-Network__CGI__Monad.hs
@@ -0,0 +1,30 @@
+--- ./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
new file mode 100644
index 000000000000..ab1e0cb21bec
--- /dev/null
+++ b/www/hs-cgi/files/patch-Network__CGI__Protocol.hs
@@ -0,0 +1,35 @@
+--- ./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-cookie/Makefile b/www/hs-cookie/Makefile
index bfa015a98111..9a49b3998d4c 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= cookie
-PORTVERSION= 0.4.0.1
-PORTREVISION= 6
+PORTVERSION= 0.4.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTTP cookie parsing and rendering
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2.1 data-default text>=0.7
diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo
index 464c7d760854..06b7889e4249 100644
--- a/www/hs-cookie/distinfo
+++ b/www/hs-cookie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cookie-0.4.0.1.tar.gz) = 73967e5d4a0fe43248db582ace5f0f4cb8c7085748ea90e1dc312f3e137e6506
-SIZE (cabal/cookie-0.4.0.1.tar.gz) = 3230
+SHA256 (cabal/cookie-0.4.1.2.tar.gz) = 716006fb3934f10479252c253e729fc0cd3096cf882c68ad1aea57524d51afb7
+SIZE (cabal/cookie-0.4.1.2.tar.gz) = 4577
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 9f0c65b0844e..8da590a80a4f 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= css-text
-PORTVERSION= 0.1.1
-PORTREVISION= 10
+PORTVERSION= 0.1.2.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= CSS parser and renderer
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10 text>=0.11
+USE_CABAL= attoparsec>=0.10.2.0 text>=0.11
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-css-text/distinfo b/www/hs-css-text/distinfo
index 9eb8af8db6bd..fe1828ed108f 100644
--- a/www/hs-css-text/distinfo
+++ b/www/hs-css-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/css-text-0.1.1.tar.gz) = 1ed480f350d0107e3ba95c33ab94ea4efd1956443cc7cc0f3f28616733026b83
-SIZE (cabal/css-text-0.1.1.tar.gz) = 3139
+SHA256 (cabal/css-text-0.1.2.1.tar.gz) = dc0291da7ec756e4dda9dfadef303c78750eca63d07a5ad21dc4a3079cb021f6
+SIZE (cabal/css-text-0.1.2.1.tar.gz) = 3947
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 9f3326fb18ea..60090a9523b0 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,13 +3,13 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell library for writing FastCGI programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cgi>=3000.0.0
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index e8f66d65f5f8..65fded0ce52d 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gitit
-PORTVERSION= 0.10.3.1
-PORTREVISION= 5
+PORTVERSION= 0.10.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,14 @@ COMMENT= Wiki using happstack, git or darcs, and pandoc
LICENSE= GPLv2
-USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4 cgi ConfigFile>=1 \
+USE_CABAL= base64-bytestring>=0.1 blaze-html>=0.4 ConfigFile>=1 \
feed>=0.3.6 filestore>=0.6 ghc-paths happstack-server>=7.0 \
highlighting-kate>=0.5.0.1 hslogger>=1 HStringTemplate>=0.6 \
- HTTP>=4000.0 json>=0.4 mtl network>=2.3 pandoc>=1.10.0.5 \
- pandoc-types>=1.10 parsec random recaptcha>=0.1 safe SHA>1 \
- syb tagsoup>=0.12 text url utf8-string>=0.3 xhtml xml>=1.3.5 \
- xss-sanitize>=0.3 zlib>=0.5
+ HTTP>=4000.0 HTTP json>=0.4 mtl network>=2.3 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 \
+ url utf8-string>=0.3 xml>=1.3.5 xss-sanitize>=0.3 \
+ zlib>=0.5
EXECUTABLE= expireGititCache gitit
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index a5cf3d56839f..e7539e0ab381 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gitit-0.10.3.1.tar.gz) = a5aabbac331436121d7178533fad5482fb0e4469852dea48b32063ef7ccea6ea
-SIZE (cabal/gitit-0.10.3.1.tar.gz) = 209218
+SHA256 (cabal/gitit-0.10.4.tar.gz) = f64c7c76676a765fe4bee5d43aa56e2934b0e7f883671d3f38f5e6aa6ed806fc
+SIZE (cabal/gitit-0.10.4.tar.gz) = 215467
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index 37ec079c4ef5..81aaebfc364c 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= hS3
-PORTVERSION= 0.5.7
-PORTREVISION= 5
+PORTVERSION= 0.5.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Interface to Amazon's Simple Storage Service (S3)
-LICENSE= BSD
+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
diff --git a/www/hs-hS3/distinfo b/www/hs-hS3/distinfo
index 6f7ce3b312e3..ec932c8c1412 100644
--- a/www/hs-hS3/distinfo
+++ b/www/hs-hS3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hS3-0.5.7.tar.gz) = c29979436fc81fb9a9b12a6cb18ab8d419d7d85bba8238e29d25e2aff836b7dc
-SIZE (cabal/hS3-0.5.7.tar.gz) = 19543
+SHA256 (cabal/hS3-0.5.8.tar.gz) = 759d37a56f0f3b2f1177c03da75410f8ee2b6f41c3f648cbc99062f269cdb9f2
+SIZE (cabal/hS3-0.5.8.tar.gz) = 19878
diff --git a/www/hs-hamlet/Makefile b/www/hs-hamlet/Makefile
deleted file mode 100644
index 0b8d1972873c..000000000000
--- a/www/hs-hamlet/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= hamlet
-PORTVERSION= 1.1.7.1
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haml-like template files that are compile-time checked
-
-LICENSE= MIT
-
-USE_CABAL= blaze-builder>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1 \
- failure>=0.1 parsec>=2 shakespeare>=1.0.1 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-hamlet/distinfo b/www/hs-hamlet/distinfo
deleted file mode 100644
index 28bf72ec048b..000000000000
--- a/www/hs-hamlet/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/hamlet-1.1.7.1.tar.gz) = b7e0549a2bfb4f76acba63f85a959f365785f1c42cbce3afc248c74ef5fe92cd
-SIZE (cabal/hamlet-1.1.7.1.tar.gz) = 21529
diff --git a/www/hs-hamlet/pkg-descr b/www/hs-hamlet/pkg-descr
deleted file mode 100644
index 6fa032658fb9..000000000000
--- a/www/hs-hamlet/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Hamlet gives you a type-safe tool for generating HTML code. It works
-via Quasi-Quoting, and generating extremely efficient output code. The
-syntax is white-space sensitive, and it helps you avoid cross-site
-scripting issues and 404 errors.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index 728035904c40..5687b8969021 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,20 +1,19 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.1.7.1
-PORTREVISION= 4
+PORTVERSION= 7.3.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Web-related tools and services
-LICENSE= BSD
+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>=0.1.3 \
- transformers-base>=0.4 utf8-string>=0.3.4 xhtml zlib
+ 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
.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 c2586de0b0d6..e9802bef80af 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-server-7.1.7.1.tar.gz) = e2fc2bf7a78a25c3a24f965972cd78ffa8c66755b54249ac34d0590fb63a09e1
-SIZE (cabal/happstack-server-7.1.7.1.tar.gz) = 78293
+SHA256 (cabal/happstack-server-7.3.7.tar.gz) = 013ee7be9884dd54c825a6b4a72dd40fbd5cb5e41384cdc7568dd1692f1c1cde
+SIZE (cabal/happstack-server-7.3.7.tar.gz) = 79407
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index f044cc5ee2f2..89c1b2bc47e3 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= happstack
-PORTVERSION= 7.0.1
-PORTREVISION= 7
+PORTVERSION= 7.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The haskell application server stack + code generation
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= happstack-server>=7.0
diff --git a/www/hs-happstack/distinfo b/www/hs-happstack/distinfo
index 303e92e251b5..cd49cc3f121d 100644
--- a/www/hs-happstack/distinfo
+++ b/www/hs-happstack/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-7.0.1.tar.gz) = 7da517397291c571af0606a1468911fd8f724daef67c86a6dd6b2680a9e2128b
-SIZE (cabal/happstack-7.0.1.tar.gz) = 2092
+SHA256 (cabal/happstack-7.0.2.tar.gz) = d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5
+SIZE (cabal/happstack-7.0.2.tar.gz) = 2090
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index fd7849fb9bae..8293991e3cb6 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,20 +1,19 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.12.0
-PORTREVISION= 4
+PORTVERSION= 0.13.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell template system supporting both HTML5 and XML
-LICENSE= BSD
+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.1.6
+ 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 5c4ffd04db13..447235991dec 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.12.0.tar.gz) = 49ba5adf1e223507eb965b79b22f3b211e33381523330719f592767d6fdcb839
-SIZE (cabal/heist-0.12.0.tar.gz) = 61816
+SHA256 (cabal/heist-0.13.1.2.tar.gz) = 45a7d2180f6fc257ca51aab96dfb6e343e12ba5cc15cc26b293b0e0b80a30031
+SIZE (cabal/heist-0.13.1.2.tar.gz) = 63167
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 5a6597a24150..57902785d264 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -1,16 +1,18 @@
# $FreeBSD$
PORTNAME= hjsmin
-PORTVERSION= 0.1.4.1
-PORTREVISION= 5
+PORTVERSION= 0.1.4.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell implementation of a javascript minifier
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 text>=0.8
+USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 \
+ optparse-applicative>=0.7 text>=0.8
+
+EXECUTABLE= hjsmin
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index 6200d8cf8c84..db2b1bad8c92 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hjsmin-0.1.4.1.tar.gz) = 2a2ca985c9ba648c0c96ca684c9d9f26998af1d8e68d28ea6af50c3b4d83e364
-SIZE (cabal/hjsmin-0.1.4.1.tar.gz) = 116268
+SHA256 (cabal/hjsmin-0.1.4.7.tar.gz) = 0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf
+SIZE (cabal/hjsmin-0.1.4.7.tar.gz) = 110718
diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile
new file mode 100644
index 000000000000..572667444780
--- /dev/null
+++ b/www/hs-http-client-tls/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= http-client-tls
+PORTVERSION= 0.2.2
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= http-client backend using the connection package and tls library
+
+LICENSE= MIT
+
+USE_CABAL= connection>=0.2.2 data-default-class http-client>=0.3.5 \
+ network tls>=1.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-http-client-tls/distinfo b/www/hs-http-client-tls/distinfo
new file mode 100644
index 000000000000..56b5488dcf4d
--- /dev/null
+++ b/www/hs-http-client-tls/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/http-client-tls-0.2.2.tar.gz) = 451e5833a1f07fdc162fde4371ac92986932d5c38f9969ace7babb020bc80128
+SIZE (cabal/http-client-tls-0.2.2.tar.gz) = 2962
diff --git a/www/hs-http-client-tls/pkg-descr b/www/hs-http-client-tls/pkg-descr
new file mode 100644
index 000000000000..7b8be71041ca
--- /dev/null
+++ b/www/hs-http-client-tls/pkg-descr
@@ -0,0 +1,3 @@
+Intended for use by higher-level libraries, such as http-conduit.
+
+WWW: https://github.com/snoyberg/http-client
diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile
new file mode 100644
index 000000000000..605648889caf
--- /dev/null
+++ b/www/hs-http-client/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= http-client
+PORTVERSION= 0.3.6.1
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= HTTP client engine
+
+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 \
+ streaming-commons>=0.1.0.2 text>=0.11
+
+.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
new file mode 100644
index 000000000000..27bd849d78a7
--- /dev/null
+++ b/www/hs-http-client/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/http-client-0.3.6.1.tar.gz) = 306d9073b8e8dd0f38c70fcaf532ba10a4054262116dce20837a7b277ab35555
+SIZE (cabal/http-client-0.3.6.1.tar.gz) = 33929
diff --git a/www/hs-http-client/pkg-descr b/www/hs-http-client/pkg-descr
new file mode 100644
index 000000000000..ce023b540637
--- /dev/null
+++ b/www/hs-http-client/pkg-descr
@@ -0,0 +1,4 @@
+An HTTP client engine, intended as a base layer for more user-friendly
+packages.
+
+WWW: https://github.com/snoyberg/http-client
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index afc47611f29b..4e9e401cf29a 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,24 +1,17 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 1.9.3
-PORTREVISION= 4
+PORTVERSION= 2.1.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTTP client package with conduit interface and HTTPS support
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-data>=0.5.1 base64-bytestring>=0.1 blaze-builder>=0.2.1 \
- blaze-builder-conduit>=0.5 case-insensitive>=0.2 \
- certificate>=1.3 conduit>=0.5.5 cookie>=0.4 cprng-aes>=0.3 \
- data-default failure>=0.1 http-types>=0.7 lifted-base>=0.1 \
- mime-types>=0.1 monad-control>=0.3 mtl network>=2.3 \
- publicsuffixlist>=0.0.3 random regex-compat resourcet>=0.3 \
- socks>=0.4 text tls>=1.0.0 tls-extra>=0.5.0 transformers>=0.2 \
- transformers-base>=0.4 utf8-string>=0.3.4 void>=0.5.5 \
- zlib-conduit>=0.5
+USE_CABAL= conduit>=0.5.5 http-client>=0.3.6 http-client-tls>=0.2.2 \
+ http-types>=0.7 lifted-base>=0.1 monad-control mtl \
+ resourcet>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index 5687b6a73f39..bd6f3d1e839d 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-1.9.3.tar.gz) = 73e620353cf1f818cca9c755f79ccee2768b914616181e0bed339064a444800d
-SIZE (cabal/http-conduit-1.9.3.tar.gz) = 45412
+SHA256 (cabal/http-conduit-2.1.4.tar.gz) = 4b4693a994d81d916f998218c3c89ff0fb0763b40ea6dece8354e4e38b68ae93
+SIZE (cabal/http-conduit-2.1.4.tar.gz) = 22819
diff --git a/www/hs-http-conduit/pkg-descr b/www/hs-http-conduit/pkg-descr
index e819f615fb29..0074c4073294 100644
--- a/www/hs-http-conduit/pkg-descr
+++ b/www/hs-http-conduit/pkg-descr
@@ -1,5 +1,5 @@
-This package uses attoparsec for parsing the actual contents of the HTTP
+This package uses conduit for parsing the actual contents of the HTTP
connection. It also provides higher-level functions which allow you to
-avoid direct usage of conduits.
+avoid directly dealing with streaming data.
WWW: http://www.yesodweb.com/book/http-conduit
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 1bb05bdd3b8f..5a7865a17181 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -2,13 +2,13 @@
PORTNAME= http-date
PORTVERSION= 0.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= HTTP Date parser/formatter
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index a3ddd8fef18b..5e2716351a77 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,19 +1,19 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.1.1.6
-PORTREVISION= 4
+PORTVERSION= 0.4.0.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Reverse proxy HTTP requests, either over raw sockets or with WAI
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.3 case-insensitive>=0.4 classy-prelude>=0.3 \
- conduit>=0.5 data-default http-conduit>=1.6 http-types>=0.6 \
- lifted-base>=0.1 monad-control>=0.3 network network-conduit>=0.6 \
- text>=0.11 wai>=1.3 warp>=1.3.4 word8>=0.0
+USE_CABAL= async blaze-builder>=0.3 case-insensitive>=0.4 conduit>=1.1 \
+ conduit-extra data-default-class http-client>=0.3 \
+ http-types>=0.6 lifted-base>=0.1 monad-control>=0.3 \
+ network resourcet streaming-commons text>=0.11 wai>=3.0 \
+ wai-logger word8>=0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index 6632a92f105b..4ea7d8ec4720 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.1.1.6.tar.gz) = 34ad0eab9ca014477fabf5372242dfe85837ad8b6f36a1e3871a80396a0e063a
-SIZE (cabal/http-reverse-proxy-0.1.1.6.tar.gz) = 6786
+SHA256 (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 30fc8eadde6efb2dd0548087d55f5baae63558d1442c5efbd0d978dda7afcf3f
+SIZE (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 8839
diff --git a/www/hs-http-reverse-proxy/pkg-descr b/www/hs-http-reverse-proxy/pkg-descr
index 7f0be104ad09..bb89c68e4f74 100644
--- a/www/hs-http-reverse-proxy/pkg-descr
+++ b/www/hs-http-reverse-proxy/pkg-descr
@@ -1,5 +1,6 @@
-Provides a simple means of reverse-proxying HTTP requests. The raw approach
-uses the same technique as leveraged by keter, whereas the WAI approach
-performs full request/response parsing via WAI and http-conduit.
+Provides a simple means of reverse-proxying HTTP requests. The raw
+approach uses the same technique as leveraged by keter, whereas the WAI
+approach performs full request/response parsing via WAI and
+http-conduit.
WWW: https://github.com/fpco/http-reverse-proxy
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 21115a19ec34..9145a64ad78f 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -2,16 +2,16 @@
# $FreeBSD$
PORTNAME= http-server
-PORTVERSION= 1.0.2
-PORTREVISION= 5
+PORTVERSION= 1.0.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for writing Haskell web servers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2 url>=2 utf8-string>=0.3.4
+USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.4.0.0 text>=1.0 url>=2 \
+ utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
diff --git a/www/hs-http-server/distinfo b/www/hs-http-server/distinfo
index b73a2bbb8955..fdcf4e8ce317 100644
--- a/www/hs-http-server/distinfo
+++ b/www/hs-http-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-server-1.0.2.tar.gz) = 44456c09b639c2c6259f679a2203ab995c2204f5f1402879323be37e8daaff87
-SIZE (cabal/http-server-1.0.2.tar.gz) = 27993
+SHA256 (cabal/http-server-1.0.4.tar.gz) = 985090c8490a49bbcfafc181ac60473ba49a18eb9464f2f69b54da33aea534ea
+SIZE (cabal/http-server-1.0.4.tar.gz) = 29015
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index 90e0ef260567..5062670c4ca7 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.8.0
-PORTREVISION= 5
+PORTVERSION= 0.8.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Generic HTTP types for Haskell (for both client and server code)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= blaze-builder>=0.2.1.4 case-insensitive>=0.2 text>=0.11.0.2
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index 8037ded42595..e19ca6ef7238 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-types-0.8.0.tar.gz) = e544fa89d83f4c6fa9e2a23a5389df59ee6824ded0b04a47e7d346c8df7fa191
-SIZE (cabal/http-types-0.8.0.tar.gz) = 11520
+SHA256 (cabal/http-types-0.8.5.tar.gz) = 3cb243486053f2e80af255ab79009c2ef057d314d5710ba7aa65fa3e9c164834
+SIZE (cabal/http-types-0.8.5.tar.gz) = 10781
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 70f811934686..49e1f7bb0cee 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= oeis
-PORTVERSION= 0.3.1
-PORTREVISION= 10
+PORTVERSION= 0.3.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell interface to the Online Encyclopedia of Integer Sequences
+COMMENT= Interface to the Online Encyclopedia of Integer Sequences (OEIS)
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.0.2 network>=2
+USE_CABAL= HTTP network
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-oeis/distinfo b/www/hs-oeis/distinfo
index 5f42d4140c85..833d5e78533e 100644
--- a/www/hs-oeis/distinfo
+++ b/www/hs-oeis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/oeis-0.3.1.tar.gz) = 829308a22e330bef8e39a8fa88776488eba6213b1bd90cf70168811f5611ba4f
-SIZE (cabal/oeis-0.3.1.tar.gz) = 7311
+SHA256 (cabal/oeis-0.3.5.tar.gz) = a617e60b1ffd1e7ebc3d30b291687f25651471769fb2f6a1367defed16ae4364
+SIZE (cabal/oeis-0.3.5.tar.gz) = 29204
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index b39ca0b34907..20db2efad99d 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= path-pieces
-PORTVERSION= 0.1.2
-PORTREVISION= 6
+PORTVERSION= 0.1.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Components of paths
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.5
diff --git a/www/hs-path-pieces/distinfo b/www/hs-path-pieces/distinfo
index e1eabe9b9a6b..d2807ddb49d6 100644
--- a/www/hs-path-pieces/distinfo
+++ b/www/hs-path-pieces/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/path-pieces-0.1.2.tar.gz) = 4aada5c3651017f28f0f9676f9b79868aba8b23dc1991d0d7252b8802952bab3
-SIZE (cabal/path-pieces-0.1.2.tar.gz) = 2485
+SHA256 (cabal/path-pieces-0.1.4.tar.gz) = 5b78f3375dcbac842b7b7bf08e8398255234e8f12ede96c33f75223417b9b0bb
+SIZE (cabal/path-pieces-0.1.4.tar.gz) = 2718
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index fbbee23b7894..c9451bcbf220 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= recaptcha
-PORTVERSION= 0.1
-PORTREVISION= 9
+PORTVERSION= 0.1.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Functions for using the reCAPTCHA service in web applications
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=3001.1.4 network>=2.2.0.1 xhtml>=3000.0
+USE_CABAL= HTTP>=3001.1.4 network>=2.2.0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-recaptcha/distinfo b/www/hs-recaptcha/distinfo
index 1f3bdd9b5762..34fd88dd3812 100644
--- a/www/hs-recaptcha/distinfo
+++ b/www/hs-recaptcha/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/recaptcha-0.1.tar.gz) = de00e6e3aadd99a1cd036ce4b413ebe02d59c1b9cfd3032f122735cca1f25144
-SIZE (cabal/recaptcha-0.1.tar.gz) = 2626
+SHA256 (cabal/recaptcha-0.1.0.2.tar.gz) = 30ae898cc39381b4e54bd984562a3a0e1385a393b1e318fec4a3b1bacc754d13
+SIZE (cabal/recaptcha-0.1.0.2.tar.gz) = 2667
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
index 1f7dabea926b..3694f29097e3 100644
--- a/www/hs-scgi/Makefile
+++ b/www/hs-scgi/Makefile
@@ -5,13 +5,13 @@
PORTNAME= scgi
PORTVERSION= 0.3.3
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Haskell library for writing SCGI programs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= cgi network>=2.2.3
diff --git a/www/hs-shakespeare-css/Makefile b/www/hs-shakespeare-css/Makefile
deleted file mode 100644
index e9a93e30c4a8..000000000000
--- a/www/hs-shakespeare-css/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-css
-PORTVERSION= 1.0.5.1
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Stick your Haskell variables into CSS at compile time
-
-LICENSE= MIT
-
-USE_CABAL= parsec>=2 shakespeare>=1.0 text>=0.11.1.1 transformers
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-css/distinfo b/www/hs-shakespeare-css/distinfo
deleted file mode 100644
index 3eab08f37ee4..000000000000
--- a/www/hs-shakespeare-css/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-css-1.0.5.1.tar.gz) = 5ae7e5e970affa31375e95b0d31564f0bfdaf0fdf8f3f6637bec449b2a3ba51b
-SIZE (cabal/shakespeare-css-1.0.5.1.tar.gz) = 16370
diff --git a/www/hs-shakespeare-css/pkg-descr b/www/hs-shakespeare-css/pkg-descr
deleted file mode 100644
index 55fb49f66ae5..000000000000
--- a/www/hs-shakespeare-css/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Shakespeare is a template family for type-safe, efficient templates with
-simple variable interpolation. Shakespeare templates can be used inline
-with a quasi-quoter or in an external file. Shakespeare interpolates
-variables according to the type being inserted. In this case, the
-variable type needs a ToCss instance. This package contains 2 css
-template languages. The Cassius language uses whitespace to avoid the
-need for closing brackets and semi-colons. Lucius does not care about
-whitespace and is a strict superset of css. There are also some
-significant conveniences added for css.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-i18n/Makefile b/www/hs-shakespeare-i18n/Makefile
deleted file mode 100644
index d82d084e00f7..000000000000
--- a/www/hs-shakespeare-i18n/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-i18n
-PORTVERSION= 1.0.0.2
-PORTREVISION= 9
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Type-based approach to internationalization
-
-LICENSE= MIT
-
-USE_CABAL= parsec shakespeare>=1.0 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-i18n/distinfo b/www/hs-shakespeare-i18n/distinfo
deleted file mode 100644
index 5fb70aebdd4c..000000000000
--- a/www/hs-shakespeare-i18n/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-i18n-1.0.0.2.tar.gz) = bfb8fad2ef9916cd528479e41a694bbb9d9bd2250e3ba4104e6787b10d9dcd87
-SIZE (cabal/shakespeare-i18n-1.0.0.2.tar.gz) = 5869
diff --git a/www/hs-shakespeare-i18n/pkg-descr b/www/hs-shakespeare-i18n/pkg-descr
deleted file mode 100644
index 58ac2326e290..000000000000
--- a/www/hs-shakespeare-i18n/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses the same approach of type-safe URLs to create
-translated content. It has a simple syntax for translators, while
-allowing the full power of Haskell for applying complex grammar rules.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-js/Makefile b/www/hs-shakespeare-js/Makefile
deleted file mode 100644
index af897f9128e8..000000000000
--- a/www/hs-shakespeare-js/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-js
-PORTVERSION= 1.1.4
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Stick your Haskell variables into JavaScript at compile time
-
-LICENSE= MIT
-
-USE_CABAL= aeson>=0.5 shakespeare>=1.0.5 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-js/distinfo b/www/hs-shakespeare-js/distinfo
deleted file mode 100644
index 18932dfa3cb8..000000000000
--- a/www/hs-shakespeare-js/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-js-1.1.4.tar.gz) = c3bba5e4ebb914eded23a060beb68f6e76d134aa2a42c8f654c6b118dec51616
-SIZE (cabal/shakespeare-js-1.1.4.tar.gz) = 7942
diff --git a/www/hs-shakespeare-js/pkg-descr b/www/hs-shakespeare-js/pkg-descr
deleted file mode 100644
index 81d5304b8def..000000000000
--- a/www/hs-shakespeare-js/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-Shakespeare is a template family for type-safe, efficient templates with
-simple variable interpolation . Shakespeare templates can be used inline
-with a quasi-quoter or in an external file. Shakespeare interpolates
-variables according to the type being inserted. In this case, the
-variable type needs a ToJavascript instance. There is also
-shakespeare-coffeescript for coffeescript templates. Coffescript is a
-language that compiles down to javascript. It expects a coffeescript
-compiler in your path, and variable should be a ToCoffee instance. And
-we even have a Roy template for the adventorous FP addicts.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare-text/Makefile b/www/hs-shakespeare-text/Makefile
deleted file mode 100644
index ff1b2f64bf2f..000000000000
--- a/www/hs-shakespeare-text/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= shakespeare-text
-PORTVERSION= 1.0.0.5
-PORTREVISION= 7
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Interpolation with quasi-quotation: put variables strings
-
-LICENSE= MIT
-
-USE_CABAL= shakespeare>=1.0 text>=0.7
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-shakespeare-text/distinfo b/www/hs-shakespeare-text/distinfo
deleted file mode 100644
index c609aa2120cf..000000000000
--- a/www/hs-shakespeare-text/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/shakespeare-text-1.0.0.5.tar.gz) = 669c298fbb7a06b667299f9ca185f32645d36aec13d9af6fb70e403d48ffde9c
-SIZE (cabal/shakespeare-text-1.0.0.5.tar.gz) = 4597
diff --git a/www/hs-shakespeare-text/pkg-descr b/www/hs-shakespeare-text/pkg-descr
deleted file mode 100644
index b9a7ea77dc4e..000000000000
--- a/www/hs-shakespeare-text/pkg-descr
+++ /dev/null
@@ -1,11 +0,0 @@
-interpolation with quasi-quotation: stick haskell variables into haskell
-strings Note there is no dependency on haskell-src-extras. If you don't
-mind that dependency, you may want to look at using these packages:
-Interpolation, interpolatedstring-perl6, interpolatedstring-qq. This
-package has 1 other general feature that those others may not (but would
-be easy to duplicate): instead of using quasi-quoting you can also use an
-external file. It also has url/embeding interpolation, with @ and ^,
-which are used in Yesod. This package also uses blaze-builder for efficiently
-constructing strings.
-
-WWW: http://www.yesodweb.com/book/shakespearean-templates
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index 2fa8c0eca703..8b6c1645a9cc 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 1.0.5
-PORTREVISION= 4
+PORTVERSION= 2.0.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
-USE_CABAL= parsec>=2 system-fileio>=0.3 system-filepath>=0.4 \
- text>=0.7
+USE_CABAL= aeson blaze-html blaze-markup exceptions parsec>=2 \
+ system-fileio>=0.3 system-filepath>=0.4 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 24c392adb8ff..d01e3de92a24 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-1.0.5.tar.gz) = 6e931034316149ace4a5aa2d035188786ba0d5a5763b20b62b04f65bc6f381b5
-SIZE (cabal/shakespeare-1.0.5.tar.gz) = 10552
+SHA256 (cabal/shakespeare-2.0.1.1.tar.gz) = 3781e221e0a70ea15ae023adb2a7dbd4461b9649a1b195da102305bf3aaaad75
+SIZE (cabal/shakespeare-2.0.1.1.tar.gz) = 58758
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index f79572e1c9cd..75a5b042702d 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,20 +1,19 @@
# $FreeBSD$
PORTNAME= snap-core
-PORTVERSION= 0.9.3.1
-PORTREVISION= 5
+PORTVERSION= 0.9.6.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Snap: A Haskell Web Framework (core interfaces and types)
-LICENSE= BSD
+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 HUnit>=1.2 \
- MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1 \
- regex-posix>=0.95 text>=0.11 unix-compat>=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
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 0cec282680b8..6f35255ef7a6 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-core-0.9.3.1.tar.gz) = f8aaf66a9796e8be996649eedf1e0211f835dd0a5459a9a7a1644240c19954e0
-SIZE (cabal/snap-core-0.9.3.1.tar.gz) = 91232
+SHA256 (cabal/snap-core-0.9.6.3.tar.gz) = 81b70058ec42b9344b779b3fac0c86086f96e9510d7a88b53954c4df67a06f44
+SIZE (cabal/snap-core-0.9.6.3.tar.gz) = 91549
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 58e431c45db2..7ea46c35d1bb 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= snap-server
-PORTVERSION= 0.9.3.3
-PORTREVISION= 5
+PORTVERSION= 0.9.4.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Fast, iteratee-based, epoll-enabled web server for the Snap Framework
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
@@ -16,18 +15,11 @@ USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
MonadCatchIO-transformers>=0.2.1 mtl>=2 network>=2.3 \
snap-core>=0.9.3 text>=0.11 unix-compat>=0.2
-OPTIONS_DEFINE= OPENSSL
+FLAGS_DEFINE= OPENSSL
OPENSSL_DESC= Enable HTTPS support using the HsOpenSSL library
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MOPENSSL}
-CONFIGURE_ARGS+= --flags="openssl"
-USE_CABAL+= HsOpenSSL>=0.10
-.else
-CONFIGURE_ARGS+= --flags="-openssl"
-.endif
+OPENSSL_FLAG_ENABLE= openssl
+OPENSSL_FLAG_CABAL= HsOpenSSL>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index 67d0642c56c0..c2019d9a6613 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-server-0.9.3.3.tar.gz) = 2fd23a4164334592dc2c37b973e341d800734e280281b35d3c6a67f2a0efa0d8
-SIZE (cabal/snap-server-0.9.3.3.tar.gz) = 55532
+SHA256 (cabal/snap-server-0.9.4.5.tar.gz) = 37ae3557c43dcecf6938df76af1ee274b575e50a8085d12b8f80c587e94e6924
+SIZE (cabal/snap-server-0.9.4.5.tar.gz) = 58643
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 9feb788f049c..3c28b02b3a22 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,27 +1,24 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.12.0
-PORTREVISION= 4
+PORTVERSION= 0.13.2.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Top-level package for the Snap Web Framework
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
- comonad>=1.1 configurator>=0.1 directory-tree>=0.10 \
- dlist>=0.5 errors>=1.4 hashable heist>=0.12 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 tagged \
- text>=0.11 transformers>=0.2 unordered-containers>=0.1.4 \
- vector>=0.7.1 vector-algorithms>=0.4 xmlhtml>=0.1
+USE_CABAL= aeson 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 \
+ vector-algorithms>=0.4 xmlhtml>=0.1
EXECUTABLE= snap
-IGNORE_DYNAMIC= yes
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index 541a2af02690..c03d580a7ea6 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.12.0.tar.gz) = cec5990f0063be66453941cf91226051c00a8260708573c89f8e650ef7aa8c59
-SIZE (cabal/snap-0.12.0.tar.gz) = 82197
+SHA256 (cabal/snap-0.13.2.8.tar.gz) = ef2fa6b87e2f4eac56d8c95320575adea7eb7ae1c5914209a0590aae728036cb
+SIZE (cabal/snap-0.13.2.8.tar.gz) = 83938
diff --git a/www/hs-snap/files/patch-snap.cabal b/www/hs-snap/files/patch-snap.cabal
new file mode 100644
index 000000000000..3cdfd461bfdb
--- /dev/null
+++ b/www/hs-snap/files/patch-snap.cabal
@@ -0,0 +1,19 @@
+--- ./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
+
+ extensions:
++ TemplateHaskell
+ OverloadedStrings
+
+ ghc-prof-options: -prof -auto-all
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 63a2cef099cd..cd2f846fb720 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,13 +3,13 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library for working with URLs
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= utf8-string>=0.3.4
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index d4f19f991bfb..f66c09021dd3 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= 1.3.1.2
-PORTREVISION= 5
+PORTVERSION= 3.0.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,14 @@ COMMENT= WAI application for static serving
LICENSE= MIT
USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
- blaze-markup>=0.5.1 cereal>=0.3.5 crypto-conduit>=0.4 \
- cryptohash>=0.7 file-embed>=0.0.3.1 http-date http-types>=0.7 \
- mime-types>=0.1 system-fileio>=0.3 system-filepath>=0.4 \
- text>=0.7 transformers>=0.2.2 unix-compat>=0.2 wai>=1.3
+ 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
+
+EXECUTABLE= warp
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index 40092ce2f707..05acd538a49c 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-app-static-1.3.1.2.tar.gz) = 9d149e143aa0d6e8e9ffbc41469e8e6992265567635903de20f887cb801d12c4
-SIZE (cabal/wai-app-static-1.3.1.2.tar.gz) = 14916
+SHA256 (cabal/wai-app-static-3.0.0.tar.gz) = 631cca083081803a81cf46d1b538f7c2dbe9c8310b94694a88220242f415f984
+SIZE (cabal/wai-app-static-3.0.0.tar.gz) = 20720
diff --git a/www/hs-wai-app-static/pkg-descr b/www/hs-wai-app-static/pkg-descr
index 1d2260eceb88..9ac593aa6ab1 100644
--- a/www/hs-wai-app-static/pkg-descr
+++ b/www/hs-wai-app-static/pkg-descr
@@ -1,3 +1,3 @@
Also provides some helper functions and datatypes for use outside of WAI.
-WWW: http://www.yesodweb.com/book/wai
+WWW: http://www.yesodweb.com/book/web-application-interface
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index ac08924e6143..cea0bdfb5c31 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 1.3.4
-PORTREVISION= 4
+PORTVERSION= 3.0.1.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +9,11 @@ COMMENT= Provides some basic WAI handlers and middleware
LICENSE= MIT
-USE_CABAL= ansi-terminal blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- base64-bytestring case-insensitive>=0.2 conduit>=0.5 \
- data-default date-cache>=0.3 fast-logger>=0.2 http-types>=0.7 \
- network>=2.2.1.5 resourcet>=0.3 stringsearch>=0.3 \
- text>=0.7 transformers>=0.2.2 void>=0.5 wai>=1.3 \
- wai-logger>=0.2 word8 zlib-conduit>=0.5
+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
.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 c2d91cbbce98..9a9792607a82 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-1.3.4.tar.gz) = ddbde27aa5bde76dc9e8d548ea71ff5b4ae1963f1f35023322ecc78b0a16c8ab
-SIZE (cabal/wai-extra-1.3.4.tar.gz) = 32600
+SHA256 (cabal/wai-extra-3.0.1.2.tar.gz) = 9f042de4a0d48c3415b2aacc8447bd938bf236a725adeeb4f5dbc635cfac6397
+SIZE (cabal/wai-extra-3.0.1.2.tar.gz) = 39555
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index 8337ae5cfab4..ce89b01a5693 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -1,17 +1,17 @@
# $FreeBSD$
PORTNAME= wai-logger
-PORTVERSION= 0.3.0
-PORTREVISION= 7
+PORTVERSION= 2.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Logging system for WAI
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder byteorder case-insensitive date-cache>=0.3 \
- fast-logger>=0.3 http-types network wai
+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
.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 29eb1efbf1ed..a0e62eb8e302 100644
--- a/www/hs-wai-logger/distinfo
+++ b/www/hs-wai-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-logger-0.3.0.tar.gz) = d80b264861eaeef7b37d35a49dd1a720b286fabeaaa67da2637d9d8cbd64528c
-SIZE (cabal/wai-logger-0.3.0.tar.gz) = 3642
+SHA256 (cabal/wai-logger-2.2.0.tar.gz) = 7e3f92d6be5a87df977fb9cc66e09e3aec5500e1dedc20886b42501f56628436
+SIZE (cabal/wai-logger-2.2.0.tar.gz) = 5963
diff --git a/www/hs-wai-test/Makefile b/www/hs-wai-test/Makefile
deleted file mode 100644
index 2ac5ec2e3b4f..000000000000
--- a/www/hs-wai-test/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= wai-test
-PORTVERSION= 1.3.1
-PORTREVISION= 4
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Unit test framework (built on HUnit) for WAI applications
-
-LICENSE= MIT
-
-USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- case-insensitive>=0.2 conduit>=0.5 cookie>=0.2 \
- http-types>=0.7 HUnit>=1.2 network text>=0.7 \
- transformers>=0.2.2 wai>=1.3
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-wai-test/distinfo b/www/hs-wai-test/distinfo
deleted file mode 100644
index 7952dc2b8996..000000000000
--- a/www/hs-wai-test/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/wai-test-1.3.1.tar.gz) = 6f2ac40a1cd06eaad47a48b12856d90aef78c4c980d2384a1ad91fb1f8a28937
-SIZE (cabal/wai-test-1.3.1.tar.gz) = 3800
diff --git a/www/hs-wai-test/pkg-descr b/www/hs-wai-test/pkg-descr
deleted file mode 100644
index 3de4eb028941..000000000000
--- a/www/hs-wai-test/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Unit test framework (built on HUnit) for WAI applications.
-
-WWW: http://www.yesodweb.com/book/web-application-interface
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index e35514adbd45..11282b8b74fd 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= wai
-PORTVERSION= 1.4.0
-PORTREVISION= 5
+PORTVERSION= 3.0.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Web Application Interface
-LICENSE= BSD
+LICENSE= MIT
-USE_CABAL= blaze-builder>=0.2.1.4 conduit>=0.5 http-types>=0.7 \
- network>=2.2.1.5 text>=0.7 transformers>=0.2.2 vault>=0.1
+USE_CABAL= blaze-builder>=0.2.1.4 http-types>=0.7 network>=2.2.1.5 \
+ text>=0.7 vault>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index 0af33c7c58c0..e33c45b2344d 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-1.4.0.tar.gz) = b87131aac9454e47ad4cbd19cf15000fa835df527d569bb3533d5c2c56d42388
-SIZE (cabal/wai-1.4.0.tar.gz) = 4508
+SHA256 (cabal/wai-3.0.1.1.tar.gz) = 2022773ce7137227c806a473848778e9605ce6c62f55f4eb867f32fc2a50b311
+SIZE (cabal/wai-3.0.1.1.tar.gz) = 7649
diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile
new file mode 100644
index 000000000000..4cb31ad4d14e
--- /dev/null
+++ b/www/hs-warp-tls/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= warp-tls
+PORTVERSION= 3.0.0
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+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
+
+.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
new file mode 100644
index 000000000000..fbc9ba6fdae5
--- /dev/null
+++ b/www/hs-warp-tls/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/warp-tls-3.0.0.tar.gz) = dce9d46532440c2429d72f21ee07ded929eb67f26909150f82698780d420f591
+SIZE (cabal/warp-tls-3.0.0.tar.gz) = 3905
diff --git a/www/hs-warp-tls/pkg-descr b/www/hs-warp-tls/pkg-descr
new file mode 100644
index 000000000000..e2f16ac294bd
--- /dev/null
+++ b/www/hs-warp-tls/pkg-descr
@@ -0,0 +1,3 @@
+HTTP over SSL/TLS support for Warp via the TLS package.
+
+WWW: http://github.com/yesodweb/wai
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 4c84ffa47286..d0accb095386 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 1.3.8.1
-PORTREVISION= 4
+PORTVERSION= 3.0.0.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +9,10 @@ COMMENT= Fast, light-weight web server for WAI applications
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.2.1.4 blaze-builder-conduit>=0.5 \
- case-insensitive>=0.2 conduit>=0.5 hashable http-types>=0.7 \
- lifted-base>=0.1 network>=2.3 network-conduit>=0.5 \
- simple-sendfile>=0.2.7 transformers>=0.2.2 unix-compat>=0.2 \
- void wai>=1.3
+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
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 9e21d9f00012..16976d26d481 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-1.3.8.1.tar.gz) = 7dc4b9d3d3a8590c19a17523a2bdf1086116f333d443391385d8f424d1767f1e
-SIZE (cabal/warp-1.3.8.1.tar.gz) = 19185
+SHA256 (cabal/warp-3.0.0.5.tar.gz) = a525cc131bd85586d5cc2b28d0d75502c794e101cce043e426d796b0ba7dc9c6
+SIZE (cabal/warp-3.0.0.5.tar.gz) = 38894
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index a36cd19b9aa3..7a67d88815a5 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= webkit
-PORTVERSION= 0.12.4
-PORTREVISION= 8
+PORTVERSION= 0.12.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Binding to the Webkit library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.12 glib>=0.12 gtk>=0.12 mtl pango>=0.12
-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/webkit-1.0.pc:${PORTSDIR}/www/webkit-gtk2
+USE_CABAL= cairo>=0.12 glib>=0.12.1 gtk>=0.12.5.0 mtl pango>=0.12
+LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-webkit/distinfo b/www/hs-webkit/distinfo
index 61ca8a9b68b0..abea02d2eb4a 100644
--- a/www/hs-webkit/distinfo
+++ b/www/hs-webkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/webkit-0.12.4.tar.gz) = 7043f8cc841bee5c3ed91c2e3b6652336e6598d1246b66a487b3e19b52e492cf
-SIZE (cabal/webkit-0.12.4.tar.gz) = 60094
+SHA256 (cabal/webkit-0.12.6.1.tar.gz) = 6a4e1921775f282f1a6bc912402a602f379937d2c4e754a2ee9d87ab77fd56b6
+SIZE (cabal/webkit-0.12.6.1.tar.gz) = 148047
diff --git a/www/hs-webkit/pkg-descr b/www/hs-webkit/pkg-descr
index fa30db413f27..b55e56100c60 100644
--- a/www/hs-webkit/pkg-descr
+++ b/www/hs-webkit/pkg-descr
@@ -1,7 +1,8 @@
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.
-WWW: http://www.haskell.org/gtk2hs/
+WWW: http://projects.haskell.org/gtk2hs/
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index cb00f85eda16..86a6cbe99f45 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= xss-sanitize
-PORTVERSION= 0.3.3
-PORTREVISION= 6
+PORTVERSION= 0.3.5.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Sanitize untrusted HTML to prevent XSS attacks
-LICENSE= BSD
+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
diff --git a/www/hs-xss-sanitize/distinfo b/www/hs-xss-sanitize/distinfo
index d3e8e0a5479b..b5469bed8018 100644
--- a/www/hs-xss-sanitize/distinfo
+++ b/www/hs-xss-sanitize/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xss-sanitize-0.3.3.tar.gz) = 8a9cabdfa98b686fee05171af85e45ee45887ec161cac895e204d2c72dbade76
-SIZE (cabal/xss-sanitize-0.3.3.tar.gz) = 8495
+SHA256 (cabal/xss-sanitize-0.3.5.2.tar.gz) = cbb4a0df82512ec0ddef8162d8ab26d906a98a292162748039a78367a3e66ad2
+SIZE (cabal/xss-sanitize-0.3.5.2.tar.gz) = 10856
diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile
new file mode 100644
index 000000000000..e151c0ae8015
--- /dev/null
+++ b/www/hs-yesod-auth-hashdb/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= yesod-auth-hashdb
+PORTVERSION= 1.3.0.1
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+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
+
+.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
new file mode 100644
index 000000000000..e82425382fb1
--- /dev/null
+++ b/www/hs-yesod-auth-hashdb/distinfo
@@ -0,0 +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
diff --git a/www/hs-yesod-auth-hashdb/pkg-descr b/www/hs-yesod-auth-hashdb/pkg-descr
new file mode 100644
index 000000000000..58018f786a73
--- /dev/null
+++ b/www/hs-yesod-auth-hashdb/pkg-descr
@@ -0,0 +1,5 @@
+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/
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 28581ed1990c..c23133822c4f 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.3.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,13 @@ COMMENT= Authentication for Yesod
LICENSE= MIT
-USE_CABAL= aeson>=0.5 authenticate>=1.3 blaze-html>=0.5 \
- blaze-markup>=0.5.1 data-default email-validate>=1.0 \
- file-embed hamlet>=1.1 http-conduit>=1.5 http-types \
- lifted-base>=0.1 mime-mail>=0.3 network persistent>=1.2 \
- persistent-template>=1.2 pureMD5>=2.0 pwstore-fast>=2.2 \
- random>=1.0.0.2 SHA>=1.4.1.3 shakespeare-css>=1.0 \
- shakespeare-js>=1.0.2 text>=0.7 transformers>=0.2.2 \
+USE_CABAL= aeson>=0.5 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
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index c07f593a5174..1418abc5cc97 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.2.0.tar.gz) = 0740b3fc8825ca9d97ae3589cb86ff9d81e87c1703f8d2341fd45b9ed728b7aa
-SIZE (cabal/yesod-auth-1.2.0.tar.gz) = 26852
+SHA256 (cabal/yesod-auth-1.3.4.tar.gz) = 1ee00d9afefb3fd225e5163f689561ebf8d9a1862eb04a72a2dcb89574b61c8d
+SIZE (cabal/yesod-auth-1.3.4.tar.gz) = 36720
diff --git a/www/hs-yesod-auth/files/patch-yesod-auth.cabal b/www/hs-yesod-auth/files/patch-yesod-auth.cabal
new file mode 100644
index 000000000000..4a117f77df80
--- /dev/null
+++ b/www/hs-yesod-auth/files/patch-yesod-auth.cabal
@@ -0,0 +1,21 @@
+--- ./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
new file mode 100644
index 000000000000..19d98b79123a
--- /dev/null
+++ b/www/hs-yesod-bin/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+PORTNAME= yesod-bin
+PORTVERSION= 1.2.12.3
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+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
+
+EXECUTABLE= yesod-ghc-wrapper yesod-ld-wrapper yesod-ar-wrapper yesod
+STANDALONE= yes
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-yesod-bin/distinfo b/www/hs-yesod-bin/distinfo
new file mode 100644
index 000000000000..106a58bb071b
--- /dev/null
+++ b/www/hs-yesod-bin/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/yesod-bin-1.2.12.3.tar.gz) = fdbb49b6300fc933532097e81b1b4bc13aa30f5910ae58a376e414412be7a75e
+SIZE (cabal/yesod-bin-1.2.12.3.tar.gz) = 366916
diff --git a/www/hs-yesod-bin/files/patch-yesod-bin.cabal b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
new file mode 100644
index 000000000000..9275385a07a8
--- /dev/null
+++ b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
@@ -0,0 +1,21 @@
+--- ./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-bin/pkg-descr b/www/hs-yesod-bin/pkg-descr
new file mode 100644
index 000000000000..3e72c5005a03
--- /dev/null
+++ b/www/hs-yesod-bin/pkg-descr
@@ -0,0 +1,3 @@
+Provides scaffolding, devel server, and some simple code generation helpers.
+
+WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 4a42203c2a1d..66cee0c476ab 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.2.0.4
-PORTREVISION= 4
+PORTVERSION= 1.2.19
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,16 +9,15 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= aeson>=0.5 attoparsec-conduit 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>=0.5 cookie>=0.4 \
- data-default failure>=0.2 fast-logger>=0.2 hamlet>=1.1 \
- http-types>=0.7 lifted-base>=0.1 monad-control>=0.3 \
- monad-logger>=0.3.1 parsec>=2 path-pieces>=0.1.2 \
- random>=1.0.0.2 resourcet>=0.4.6 safe shakespeare>=1.0 \
- shakespeare-css>=1.0 shakespeare-i18n>=1.0 shakespeare-js>=1.0.2 \
- text>=0.7 transformers>=0.2.2 transformers-base>=0.4 \
- vector>=0.9 wai>=1.4 wai-extra>=1.3 warp>=1.3.8 \
+USE_CABAL= aeson>=0.5 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
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index 551574a78b89..bd6bedf8a0f6 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.2.0.4.tar.gz) = b45c7a827472ea30b48e42687f6287df3cc8d43882fed6a35cc796224d455d25
-SIZE (cabal/yesod-core-1.2.0.4.tar.gz) = 54637
+SHA256 (cabal/yesod-core-1.2.19.tar.gz) = 3422d2042af60ed5bf71fdb71934b289e69a35d6cbe3adc7561e877c3f7a9b36
+SIZE (cabal/yesod-core-1.2.19.tar.gz) = 62546
diff --git a/www/hs-yesod-core/files/patch-yesod-core.cabal b/www/hs-yesod-core/files/patch-yesod-core.cabal
new file mode 100644
index 000000000000..c27fac059fbf
--- /dev/null
+++ b/www/hs-yesod-core/files/patch-yesod-core.cabal
@@ -0,0 +1,40 @@
+--- ./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-core/pkg-descr b/www/hs-yesod-core/pkg-descr
index b243d4c6a8e3..16a53f5f3e74 100644
--- a/www/hs-yesod-core/pkg-descr
+++ b/www/hs-yesod-core/pkg-descr
@@ -1,5 +1,5 @@
Yesod is a framework designed to foster creation of RESTful web
-application that have strong compile-time guarantees of correctness. It
+application that have strong compile-time guarantees of correctness. It
also affords space efficient code and portability to many deployment
backends, from CGI to stand-alone serving.
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index f606df7527f2..ae17e260a7f9 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.3.0
-PORTREVISION= 4
+PORTVERSION= 1.3.14
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,11 +10,10 @@ COMMENT= Form handling support for Yesod Web Framework
LICENSE= MIT
USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
- blaze-markup>=0.5.1 crypto-api>=0.8 data-default \
- email-validate>=1.0 hamlet>=1.1 network>=2.2 persistent>=1.2 \
- resourcet shakespeare-css>=1.0 shakespeare-js>=1.0.2 \
- text>=0.9 transformers>=0.2.2 wai>=1.3 xss-sanitize>=0.3.0.1 \
- yesod-core>=1.2 yesod-persistent>=1.2
+ 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
.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 7a77230b936b..08fdcc5c980a 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.3.0.tar.gz) = cc9a11a07d182656dd59fd4b63a10587b577c238e2a8cd2a891e0c1e0c4ce2f8
-SIZE (cabal/yesod-form-1.3.0.tar.gz) = 18892
+SHA256 (cabal/yesod-form-1.3.14.tar.gz) = 509f3c230fb33a4ddfab8f00392439248ea1acc413d18a3f221eb863b2a25d28
+SIZE (cabal/yesod-form-1.3.14.tar.gz) = 24300
diff --git a/www/hs-yesod-form/files/patch-yesod-form.cabal b/www/hs-yesod-form/files/patch-yesod-form.cabal
new file mode 100644
index 000000000000..5f7ff91d1c1c
--- /dev/null
+++ b/www/hs-yesod-form/files/patch-yesod-form.cabal
@@ -0,0 +1,13 @@
+--- ./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 c9381b7ab315..16f5a68b66f9 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,8 @@ COMMENT= Some helpers for using Persistent from Yesod
LICENSE= MIT
-USE_CABAL= blaze-builder conduit lifted-base persistent>=1.2 \
- persistent-template>=1.2 pool-conduit resourcet \
- transformers>=0.2.2 yesod-core>=1.2
+USE_CABAL= blaze-builder conduit persistent>=1.2 persistent-template>=1.2 \
+ resource-pool resourcet>=0.4.5 yesod-core>=1.2.2
.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 012fce1e320d..a566e7408d07 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-persistent-1.2.0.tar.gz) = 1334f48f1386003699a08f4e24505c633e89519874c351750958745b85d1ffbf
-SIZE (cabal/yesod-persistent-1.2.0.tar.gz) = 3926
+SHA256 (cabal/yesod-persistent-1.2.3.tar.gz) = fc3627ff021573cb92403b667e20ebb6194b227f30a189019d288be1cdbfbacd
+SIZE (cabal/yesod-persistent-1.2.3.tar.gz) = 4169
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
index 953998759fef..f0167597d96e 100644
--- a/www/hs-yesod-platform/Makefile
+++ b/www/hs-yesod-platform/Makefile
@@ -1,10 +1,11 @@
# $FreeBSD$
PORTNAME= yesod-platform
-PORTVERSION= 1.2.0.1
+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= 4
+PORTREVISION= 0
+
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,130 +13,128 @@ COMMENT= Meta package for Yesod
LICENSE= MIT
-USE_CABAL= aeson==0.6.1.0_6 \
- ansi-terminal==0.6_5 \
- asn1-data==0.7.1_6 \
- asn1-types==0.1.3_4 \
- attoparsec==0.10.4.0_5 \
- attoparsec-conduit==1.0.1_4 \
- authenticate==1.3.2.6_5 \
- base-unicode-symbols==0.2.2.4_6 \
- base64-bytestring==1.0.0.1_5 \
- blaze-builder==0.3.1.1_4 \
- blaze-builder-conduit==1.0.0_5 \
- blaze-html==0.6.1.1_4 \
- blaze-markup==0.5.1.5_4 \
- byteorder==1.0.4_4 \
- case-insensitive==1.0.0.2_4 \
- cereal==0.3.5.2_7 \
- certificate==1.3.7_4 \
- cipher-aes==0.1.8_4 \
- cipher-rc4==0.1.2_5 \
- clientsession==0.9_4 \
- conduit==1.0.5_4 \
- cookie==0.4.0.1_6 \
- cprng-aes==0.3.4_6 \
- crypto-api==0.12.1_4 \
- crypto-conduit==0.5.2_4 \
- crypto-numbers==0.1.3_5 \
- crypto-pubkey==0.1.3_4 \
- crypto-pubkey-types==0.3.2_4 \
- crypto-random-api==0.2.0_5 \
- cryptohash==0.9.0_4 \
- css-text==0.1.1_10 \
- data-default==0.5.3_4 \
- data-default-class==0.0.1_4 \
- data-default-instances-base==0.0.1_4 \
- data-default-instances-containers==0.0.1_4 \
- data-default-instances-dlist==0.0.1_4 \
- data-default-instances-old-locale==0.0.1_4 \
- date-cache==0.3.0_6 \
- dlist==0.5_13 \
- email-validate==1.0.0_5 \
- entropy==0.2.1_9 \
- failure==0.2.0.1_8 \
- fast-logger==0.3.1_7 \
- file-embed==0.0.4.7_5 \
- filesystem-conduit==1.0.0_5 \
- hamlet==1.1.7.1_4 \
- hashable==1.1.2.5_4,1 \
- hjsmin==0.1.4.1_5 \
- hspec==1.5.4_4 \
- hspec-expectations==0.3.2_4 \
- html-conduit==1.1.0_5 \
- http-conduit==1.9.3_4 \
- http-date==0.0.4_6 \
- http-types==0.8.0_5 \
- language-javascript==0.5.7_6 \
- lifted-base==0.2.0.5_4 \
- mime-mail==0.4.1.2_7 \
- mime-types==0.1.0.3_5 \
- mmorph==1.0.0_4 \
- monad-control==0.3.2.1_4 \
- monad-logger==0.3.1.1_4 \
- network-conduit==1.0.0_5 \
- path-pieces==0.1.2_6 \
- pem==0.1.2_6 \
- persistent==1.2.0.1_4 \
- persistent-template==1.2.0_4 \
- pool-conduit==0.1.2_4 \
- primitive==0.5.0.1_6 \
- publicsuffixlist==0.1_4 \
- pureMD5==2.1.2.1_7 \
- pwstore-fast==2.3_7 \
- quickcheck-io==0.1.0_4 \
- resource-pool==0.2.1.1_6 \
- resourcet==0.4.7.1_4 \
- safe==0.3.3_9 \
- semigroups==0.9.1_4 \
- setenv==0.1.0_6 \
- SHA==1.6.1_6 \
- shakespeare==1.0.5_4 \
- shakespeare-css==1.0.5.1_4 \
- shakespeare-i18n==1.0.0.2_9 \
- shakespeare-js==1.1.4_4 \
- shakespeare-text==1.0.0.5_7 \
- silently==1.2.4.1_5 \
- simple-sendfile==0.2.11_5 \
- skein==1.0.3_4 \
- socks==0.5.1_4 \
- stringsearch==0.3.6.4_6 \
- system-fileio==0.3.11_5 \
- system-filepath==0.4.7_6 \
- tagged==0.6_4 \
- tagsoup==0.12.8_6 \
- tagstream-conduit==0.5.4_5 \
- tls==1.1.2_5 \
- tls-extra==0.6.1_6 \
- transformers-base==0.4.1_9 \
- unix-compat==0.4.1.1_4 \
- unordered-containers==0.2.3.1_4 \
- utf8-light==0.4.0.1_8 \
- utf8-string==0.3.7_9 \
- vault==0.2.0.4_5 \
- vector==0.10.0.1_6 \
- void==0.6_4 \
- wai==1.4.0_5 \
- wai-app-static==1.3.1.2_5 \
- wai-extra==1.3.4_4 \
- wai-logger==0.3.0_7 \
- wai-test==1.3.1_4 \
- warp==1.3.8.1_4 \
- word8==0.0.3_5 \
- xml-conduit==1.1.0.3_5 \
- xml-types==0.3.3_6 \
- xss-sanitize==0.3.3_6 \
- yaml==0.8.2.4_4 \
- yesod==1.2.0.1_4 \
- yesod-auth==1.2.0_4 \
- yesod-core==1.2.0.4_4 \
- yesod-form==1.3.0_4 \
- yesod-persistent==1.2.0_4 \
- yesod-routes==1.2.0_4 \
- yesod-static==1.2.0_4 \
- yesod-test==1.2.0_4 \
- zlib-bindings==0.1.1.3_5 \
- zlib-conduit==1.0.0_5
+USE_CABAL= ansi-terminal==0.6.1.1 \
+ ansi-wl-pprint==0.6.7.1 \
+ asn1-encoding==0.8.1.3 \
+ asn1-parse==0.8.1 \
+ asn1-types==0.2.3 \
+ authenticate==1.3.2.9 \
+ auto-update==0.1.0.0 \
+ base16-bytestring==0.1.1.6 \
+ base64-bytestring==1.0.0.1_6 \
+ blaze-builder==0.3.3.2 \
+ blaze-html==0.7.0.2 \
+ blaze-markup==0.6.1.0 \
+ byteable==0.1.1 \
+ byteorder==1.0.4_5 \
+ cereal==0.4.0.1 \
+ cipher-aes==0.2.8 \
+ cipher-des==0.0.6 \
+ cipher-rc4==0.1.4 \
+ clientsession==0.9.0.3 \
+ conduit==1.1.7 \
+ conduit-extra==1.1.3 \
+ connection==0.2.3 \
+ cookie==0.4.1.2 \
+ cprng-aes==0.5.2 \
+ crypto-api==0.13 \
+ crypto-cipher-types==0.0.9 \
+ crypto-numbers==0.2.3 \
+ crypto-pubkey==0.2.4 \
+ crypto-pubkey-types==0.4.2.2 \
+ crypto-random==0.0.7 \
+ cryptohash==0.11.6 \
+ cryptohash-conduit==0.1.1 \
+ css-text==0.1.2.1 \
+ data-default==0.5.3_5 \
+ data-default-class==0.0.1_5 \
+ data-default-instances-base==0.0.1_5 \
+ data-default-instances-containers==0.0.1_5 \
+ data-default-instances-dlist==0.0.1_5 \
+ data-default-instances-old-locale==0.0.1_5 \
+ dlist==0.7.1 \
+ email-validate==2.0.1 \
+ entropy==0.3.2 \
+ esqueleto==1.4.4 \
+ exceptions==0.6.1 \
+ fast-logger==2.2.0 \
+ file-embed==0.0.7 \
+ hjsmin==0.1.4.7 \
+ hspec==1.11.0 \
+ hspec-expectations==0.6.0.1 \
+ html-conduit==1.1.0.5 \
+ http-client==0.3.6.1 \
+ http-client-tls==0.2.2 \
+ http-conduit==2.1.4 \
+ http-date==0.0.4_7 \
+ http-reverse-proxy==0.4.0.1 \
+ http-types==0.8.5 \
+ language-javascript==0.5.13 \
+ lifted-base==0.2.3.0 \
+ mime-mail==0.4.5.2 \
+ mime-types==0.1.0.4 \
+ mmorph==1.0.3 \
+ monad-control==0.3.3.0 \
+ monad-logger==0.3.7.1 \
+ monad-loops==0.4.2.1 \
+ nats==0.2 \
+ optparse-applicative==0.9.1.1 \
+ path-pieces==0.1.4 \
+ pem==0.2.2 \
+ persistent==1.3.1.1 \
+ persistent-template==1.3.1.4 \
+ publicsuffixlist==0.1_5 \
+ pwstore-fast==2.4.1 \
+ quickcheck-io==0.1.1 \
+ resource-pool==0.2.3.0 \
+ resourcet==1.1.2.3 \
+ safe==0.3.7 \
+ securemem==0.1.3 \
+ semigroups==0.15.2 \
+ setenv==0.1.1.1 \
+ SHA==1.6.4.1 \
+ shakespeare==2.0.1.1 \
+ silently==1.2.4.1_6 \
+ simple-sendfile==0.2.15 \
+ skein==1.0.9 \
+ socks==0.5.4 \
+ stm-chans==3.0.0.2 \
+ streaming-commons==0.1.4.1 \
+ stringsearch==0.3.6.5 \
+ system-fileio==0.3.14 \
+ system-filepath==0.4.12 \
+ tagged==0.7.2 \
+ tagsoup==0.13.1 \
+ tagstream-conduit==0.5.5.1 \
+ tf-random==0.5 \
+ tls==1.2.8 \
+ transformers-base==0.4.2 \
+ utf8-string==0.3.8 \
+ void==0.6.1 \
+ wai==3.0.1.1 \
+ wai-app-static==3.0.0 \
+ wai-extra==3.0.1.2 \
+ wai-logger==2.2.0 \
+ warp==3.0.0.5 \
+ warp-tls==3.0.0 \
+ word8==0.1.1 \
+ x509==1.4.11 \
+ x509-store==1.4.4 \
+ x509-system==1.4.5 \
+ x509-validation==1.5.0 \
+ xml-conduit==1.2.1 \
+ xml-types==0.3.4 \
+ xss-sanitize==0.3.5.2 \
+ yaml==0.8.8.4 \
+ yesod==1.2.6.1 \
+ yesod-auth==1.3.4 \
+ yesod-auth-hashdb==1.3.0.1 \
+ yesod-core==1.2.19 \
+ yesod-form==1.3.14 \
+ yesod-persistent==1.2.3 \
+ yesod-routes==1.2.0.7 \
+ yesod-static==1.2.4 \
+ yesod-test==1.2.3.2 \
.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
index da99efc3d3c3..8d4be8693a7a 100644
--- a/www/hs-yesod-platform/distinfo
+++ b/www/hs-yesod-platform/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-platform-1.2.0.1.tar.gz) = 253ce16ed96383f11959f3b345a211999c93fc86ff5b777cede88756fa44ce41
-SIZE (cabal/yesod-platform-1.2.0.1.tar.gz) = 2583
+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
index 33a0aebc30b5..14696b1716aa 100644
--- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal
+++ b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
@@ -1,11 +1,51 @@
---- ./yesod-platform.cabal.orig 2013-04-25 08:09:38.000000000 +0200
-+++ ./yesod-platform.cabal 2013-05-03 19:11:59.000000000 +0200
-@@ -67,7 +67,7 @@
- , fsnotify == 0.0.11
- , ghc-paths == 0.1.0.9
- , hamlet == 1.1.7.1
-- , hashable == 1.2.0.7
-+ , hashable == 1.1.2.5
- , hjsmin == 0.1.4.1
- , hspec == 1.5.3
- , hspec-expectations == 0.3.2
+--- ./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-routes/Makefile b/www/hs-yesod-routes/Makefile
index ac9af6b3bf26..db24bc76371e 100644
--- a/www/hs-yesod-routes/Makefile
+++ b/www/hs-yesod-routes/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-routes
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.0.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo
index 54b19c75d08a..97861b1d107c 100644
--- a/www/hs-yesod-routes/distinfo
+++ b/www/hs-yesod-routes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-routes-1.2.0.tar.gz) = 62c5aa9a212a467c5918e250247c2801efa1b56cfcaaf1f1e108d02ccd06ffb4
-SIZE (cabal/yesod-routes-1.2.0.tar.gz) = 20175
+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-static/Makefile b/www/hs-yesod-static/Makefile
index ad27340e9a97..a57fa250c45f 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +9,14 @@ COMMENT= Static file serving subsite for Yesod Web Framework
LICENSE= MIT
-USE_CABAL= base64-bytestring>=0.1.0.1 cereal>=0.3 conduit>=0.5 \
- crypto-conduit>=0.4 cryptohash>=0.6.1 data-default \
- file-embed>=0.0.4.1 http-types>=0.7 shakespeare-css>=1.0.3 \
- system-fileio>=0.3 system-filepath>=0.4.6 text>=0.9 \
- transformers>=0.2.2 unix-compat>=0.2 wai>=1.3 \
- wai-app-static>=1.3 yesod-core>=1.2
+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
.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 980979c2e51b..5d5f582e0458 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.2.0.tar.gz) = 5f72dfc5c72de6eac00b4e7f82aac185eeba2aa5bbed0872a9507f8c26bcd3a1
-SIZE (cabal/yesod-static-1.2.0.tar.gz) = 8505
+SHA256 (cabal/yesod-static-1.2.4.tar.gz) = 3f180018dee2e3dd8c306bebdedfd67a8160e8836adc097765a7c95765f8ab64
+SIZE (cabal/yesod-static-1.2.4.tar.gz) = 25099
diff --git a/www/hs-yesod-static/files/patch-yesod-static.cabal b/www/hs-yesod-static/files/patch-yesod-static.cabal
new file mode 100644
index 000000000000..85d1c2f30ae1
--- /dev/null
+++ b/www/hs-yesod-static/files/patch-yesod-static.cabal
@@ -0,0 +1,18 @@
+--- ./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 69fa68058e79..c1e118575166 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 1.2.0
-PORTREVISION= 4
+PORTVERSION= 1.2.3.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,9 +12,8 @@ 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 pool-conduit text \
- transformers>=0.2.2 wai>=1.3 wai-test>=1.3 xml-conduit>=1.0 \
- xml-types>=0.3 yesod-core>=1.2
+ network>=2.2 persistent>=1.0 text wai>=1.3 wai-extra \
+ xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.2
.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 b0921e9d0b98..281c8b35f86b 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-1.2.0.tar.gz) = 7894450772e93995bb156ffaba53024669d6f644dad0603d8b024b612e7490a0
-SIZE (cabal/yesod-test-1.2.0.tar.gz) = 11914
+SHA256 (cabal/yesod-test-1.2.3.2.tar.gz) = a9ebab87f5633bb6979d5714703b8448f1fb6d6278cf37c3d1122d9136a80716
+SIZE (cabal/yesod-test-1.2.3.2.tar.gz) = 13269
diff --git a/www/hs-yesod-test/files/patch-yesod-test.cabal b/www/hs-yesod-test/files/patch-yesod-test.cabal
new file mode 100644
index 000000000000..0d0492cc7759
--- /dev/null
+++ b/www/hs-yesod-test/files/patch-yesod-test.cabal
@@ -0,0 +1,10 @@
+--- ./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 b9a9a7b08e01..de8876a177fa 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.2.0.1
-PORTREVISION= 4
+PORTVERSION= 1.2.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +9,11 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 data-default \
- hamlet>=1.1 monad-control>=0.3 network-conduit safe \
- shakespeare-css>=1.0 shakespeare-js>=1.0.2 text \
- transformers>=0.2.2 unordered-containers wai>=1.3 \
- wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 yesod-core>=1.2 \
- yesod-form>=1.3 yesod-persistent>=1.2
+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
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index e02b4ba9d926..03a4bb5008e3 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.2.0.1.tar.gz) = a32a88bd9cd2fcda76965c66457241acc25a652e8eb9b58d144afa5929e013f2
-SIZE (cabal/yesod-1.2.0.1.tar.gz) = 7652
+SHA256 (cabal/yesod-1.2.6.1.tar.gz) = a2c624171e86f4c56f55634d02e72ea911147e1e40d3c322254cc72ed9ba38f6
+SIZE (cabal/yesod-1.2.6.1.tar.gz) = 7846
diff --git a/www/hs-yesod/files/patch-yesod.cabal b/www/hs-yesod/files/patch-yesod.cabal
new file mode 100644
index 000000000000..bbd9afdfa00a
--- /dev/null
+++ b/www/hs-yesod/files/patch-yesod.cabal
@@ -0,0 +1,19 @@
+--- ./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