summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpgj <pgj@FreeBSD.org>2015-08-20 23:02:14 +0000
committerpgj <pgj@FreeBSD.org>2015-08-20 23:02:14 +0000
commit28f3daa3db1a02ef56aa677eccd053223c740402 (patch)
tree607a5ca77efd301a2b4dc49b05d108829fcffa77
parentb9abb39738d3acc9d1938e87002d98cc5fb34c35 (diff)
downloadFreeBSD-ports-28f3daa3db1a02ef56aa677eccd053223c740402.zip
FreeBSD-ports-28f3daa3db1a02ef56aa677eccd053223c740402.tar.gz
- Update The Glorious Glasgow Haskell Compiler to version 7.10.2
- Include a patch for addressing timer issues [1] - Add support for building both GHC and Haskell ports with Clang, either from ports or the base system - Discontinue supporting Haskell Platform, use Stackage instead as a reference - Drop support for FreeBSD 8.x, optimize bootstrap compiler tarballs - Update Gtk2Hs to version 0.13 [2] - Update Pandoc to version 1.15.0.6 - Update git-annex to version 5.20150727 - Update Darcs to 2.10 [3] - Unbreak wxHaskell ports Please note that port revisions for all the Haskell ports without version changes are bumped. New ports (48): converters/hs-aeson-pretty JSON pretty-printing library and command-line tool converters/hs-sandi Data encoding library devel/hs-StateVar State variables devel/hs-base-orphans Backwards-compatible orphan instances for base devel/hs-bytestring-mmap Mmap support for strict ByteStrings devel/hs-constraints Constraint manipulation devel/hs-data-ordlist Set and bag operations on ordered lists devel/hs-easy-file Cross-platform File handling devel/hs-extra Extra functions devel/hs-geniplate-mirror Use Template Haskell to generate Uniplate-like functions devel/hs-haddock-api Documentation-generation tool for Haskell libraries devel/hs-hex Convert strings into hexadecimal and back devel/hs-hourglass Simple performant time related library devel/hs-hsb2hs Preprocesses a file, adding blobs from files as string literals devel/hs-hspec-core Testing Framework for Haskell devel/hs-hspec-discover Automatically discover and run Hspec tests devel/hs-js-flot Obtain minified flot code devel/hs-js-jquery Obtain minified jQuery code devel/hs-lifted-async Run lifted IO operations asynchronously and wait for their results devel/hs-map-syntax Syntax sugar for defining maps devel/hs-memory Memory and related abtraction stuff devel/hs-mutable-containers Abstactions and concrete implementations of mutable containers devel/hs-newtype Typeclass and set of functions for working with newtypes devel/hs-old-locale Locale library devel/hs-old-time Time library devel/hs-preprocessor-tools Framework for extending Haskell's syntax via quick-and-dirty preprocessors devel/hs-time-locale-compat Compatibility of TimeLocale between old-locale and time-1.5 devel/hs-uuid-types Type definitions for Universally Unique Identifiers math/hs-Agda-stdlib Agda standard library math/hs-adjunctions Adjunctions and representable functors math/hs-kan-extensions Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads net-im/hs-haskell-xmpp Haskell XMPP library based on HaXml & STM net-p2p/hs-torrent BitTorrent file parser and generater net/hs-aws Amazon Web Services (AWS) for Haskell net/hs-network-uri URI manipulation security/hs-cryptonite Cryptography Primitives sink security/hs-nonce Generate cryptographic nonces shells/hs-shelly Shell-like (systems) programming in Haskell sysutils/hs-ekg-json JSON encoding of ekg metrics textproc/hs-bencode Parser and printer for bencoded data textproc/hs-cassava CSV parsing and encoding library textproc/hs-cmark Fast, accurate CommonMark (Markdown) parser and renderer textproc/hs-pandoc-citeproc Supports using pandoc with citeproc textproc/hs-regex-applicative Regex-based parsing with applicative interface textproc/hs-regex-compat-tdfa Unicode Support version of Text.Regex, using regex-tdfa textproc/hs-rfc5051 Simple unicode collation as per RFC5051 www/hs-http2 HTTP/2.0 library including frames and HPACK www/hs-multipart HTTP multipart split out of the cgi package Updated ports (317): archivers/hs-tar 0.4.0.1_8 --> 0.4.2.1 archivers/hs-zip-archive 0.2.3.4_1 --> 0.2.3.7 archivers/hs-zlib 0.5.4.1_6 --> 0.5.4.2 archivers/hs-zlib-bindings 0.1.1.3_7 --> 0.1.1.5 audio/hs-ALUT 2.3.0.1_2 --> 2.4.0.0 audio/hs-OpenAL 1.6.0.0_1 --> 1.7.0.0 audio/hs-libmpd 0.8.0.5_1 --> 0.9.0.2 benchmarks/hs-criterion 0.8.1.0_1 --> 1.1.0.0 converters/hs-aeson 0.7.0.6_1 --> 0.8.0.2 converters/hs-json 0.7_8 --> 0.9.1 databases/hs-esqueleto 1.4.4_1 --> 2.4.1 databases/hs-hedis 0.6.5 --> 0.6.9 databases/hs-mysql 0.1.1.6_1 --> 0.1.1.8 databases/hs-persistent 1.3.1.1_1 --> 2.2 databases/hs-persistent-sqlite 1.3.0.5_1 --> 2.2 databases/hs-persistent-template 1.3.1.4_1 --> 2.1.3.4 devel/hs-BNFC 2.6.0.3_8 --> 2.8 devel/hs-Boolean 0.2.1_1 --> 0.2.3 devel/hs-ConfigFile 1.1.2_1 --> 1.1.4 devel/hs-List 0.5.1_8 --> 0.5.2 devel/hs-MissingH 1.2.1.0_1 --> 1.3.0.1 devel/hs-MonadCatchIO-transformers 0.3.1.0_1 --> 0.3.1.3 devel/hs-MonadRandom 0.1.13_1 --> 0.4 devel/hs-ObjectName 1.0.0.0_14 --> 1.1.0.0 devel/hs-QuickCheck 2.6_6 --> 2.8.1 devel/hs-ReadArgs 1.2.1_8 --> 1.2.2 devel/hs-STMonadTrans 0.3.2_1 --> 0.3.3 devel/hs-ShellCheck 0.3.5 --> 0.3.8 devel/hs-Stream 0.4.7.1_1 --> 0.4.7.2 devel/hs-alex 3.1.3_1 --> 3.1.4 devel/hs-ansi-terminal 0.6.1.1_1 --> 0.6.2.1 devel/hs-ansi-wl-pprint 0.6.7.1_1 --> 0.6.7.3 devel/hs-asn1-encoding 0.8.1.3_1 --> 0.9.0 devel/hs-asn1-parse 0.8.1_1 --> 0.9.1 devel/hs-asn1-types 0.2.3_1 --> 0.3.0 devel/hs-async 2.0.1.5_1 --> 2.0.2 devel/hs-atomic-primops 0.6.0.6_1 --> 0.8 devel/hs-auto-update 0.1.0.0_1 --> 0.1.2.2 devel/hs-basic-prelude 0.3.8_1 --> 0.5.0 devel/hs-bifunctors 4.1.1.1_1 --> 5 devel/hs-blaze-builder 0.3.3.2_1 --> 0.4.0.1 devel/hs-blaze-builder-enumerator 0.2.0.6_1 --> 0.2.1.0 devel/hs-blaze-textual 0.2.0.9_1 --> 0.2.1.0 devel/hs-bloomfilter 2.0.0.0_1 --> 2.0.1.0 devel/hs-boxes 0.1.3_1 --> 0.1.4 devel/hs-bytestring-lexing 0.4.3.2 --> 0.5.0.2 devel/hs-c2hs 0.17.2_1 --> 0.26.1 devel/hs-cabal-install 1.18.0.5_1 --> 1.22.6.0 devel/hs-cereal 0.4.0.1_1 --> 0.4.1.1 devel/hs-checkers 0.3.2_1 --> 0.4.3 devel/hs-chunked-data 0.1.0.1_1 --> 0.2.0 devel/hs-classy-prelude 0.9.3_1 --> 0.12.1.1 devel/hs-classy-prelude-conduit 0.9.3_1 --> 0.12.0.1 devel/hs-cmdargs 0.10.9_1 --> 0.10.13 devel/hs-conduit 1.1.7_1 --> 1.2.5 devel/hs-conduit-combinators 0.2.8.2_1 --> 1.0.3 devel/hs-conduit-extra 1.1.3_1 --> 1.1.9.1 devel/hs-convertible 1.1.0.0_1 --> 1.1.1.0 devel/hs-cpphs 1.18.5_1 --> 1.19 devel/hs-darcs 2.8.5 --> 2.10.1 devel/hs-data-hash 0.2.0.0_1 --> 0.2.0.1 devel/hs-data-pprint 0.2.3_1 --> 0.2.4 devel/hs-datetime 0.2.1_12 --> 0.3.1 devel/hs-deepseq-generics 0.1.1.1_1 --> 0.1.1.2 devel/hs-dlist 0.7.1_1 --> 0.7.1.1 devel/hs-edit-distance 0.2.1.2_7 --> 0.2.2.1 devel/hs-either 4.3.0.1_1 --> 4.4.1 devel/hs-enclosed-exceptions 1.0.0.2_1 --> 1.0.1.1 devel/hs-equivalence 0.2.5_1 --> 0.3.1 devel/hs-errors 1.4.7_1 --> 2.0.0 devel/hs-exceptions 0.6.1_1 --> 0.8.0.2 devel/hs-fast-logger 2.2.0_1 --> 2.4.1 devel/hs-fgl 5.5.0.1_1 --> 5.5.2.1 devel/hs-file-embed 0.0.7_1 --> 0.0.9 devel/hs-filemanip 0.3.6.2_8 --> 0.3.6.3 devel/hs-filestore 0.6.0.3_1 --> 0.6.1 devel/hs-free 4.9_1 --> 4.12.1 devel/hs-fsnotify 0.1.0.3_1 --> 0.2.1 devel/hs-gconf 0.12.5.0_1 --> 0.13.0.2 devel/hs-generic-deriving 1.6.3_1 --> 1.8.0 devel/hs-ghc-events 0.4.3.0_1 --> 0.4.4.0 devel/hs-gio 0.12.5.3_1 --> 0.13.1.0 devel/hs-git-annex 5.20140817_1 --> 5.20150727 devel/hs-glib 0.12.5.4_1 --> 0.13.1.1 devel/hs-gtk2hs-buildtools 0.12.5.2_2 --> 0.13.0.4 devel/hs-haddock 2.14.3_1 --> 2.16.1 devel/hs-haddock-library 1.1.0_1 --> 1.2.1 devel/hs-happy 1.19.4_1 --> 1.19.5 devel/hs-hashable 1.2.2.0_1,1 --> 1.2.3.3,1 devel/hs-hashtables 1.1.2.1_1 --> 1.2.0.2 devel/hs-haskell-src 1.0.1.6_1 --> 1.0.2.0 devel/hs-haskell-src-exts 1.15.0.1_1 --> 1.16.0.1 devel/hs-hasktags 0.69.0_1 --> 0.69.1 devel/hs-hastache 0.6.0_1 --> 0.6.1 devel/hs-hinotify 0.3.7_1 --> 0.3.8.1 devel/hs-hint 0.4.2.0_1 --> 0.4.2.3 devel/hs-hlint 1.9.3_1 --> 1.9.21 devel/hs-hoogle 4.2.34_1 --> 4.2.41 devel/hs-hslogger 1.2.4_1 --> 1.2.9 devel/hs-hslua 0.3.13_1 --> 0.4.0 devel/hs-hspec 1.11.0_1 --> 2.1.10 devel/hs-hspec-expectations 0.6.0.1_1 --> 0.7.1 devel/hs-keys 3.10.1_1 --> 3.10.2 devel/hs-language-c 0.4.5_1 --> 0.4.7 devel/hs-language-javascript 0.5.13_1 --> 0.5.14.2 devel/hs-lens 4.3.3_1 --> 4.12.3 devel/hs-lifted-base 0.2.3.0_1 --> 0.2.3.6 devel/hs-mmorph 1.0.3_1 --> 1.0.4 devel/hs-monad-control 0.3.3.0_1 --> 1.0.0.4 devel/hs-monad-logger 0.3.7.1_1 --> 0.3.13.2 devel/hs-monad-loops 0.4.2.1_1 --> 0.4.3 devel/hs-monad-par 0.3.4.6_1 --> 0.3.4.7 devel/hs-mono-traversable 0.6.1_1 --> 0.9.2.1 devel/hs-mtl 2.1.3.1_1 --> 2.2.1 devel/hs-mueval 0.9.1.1_1 --> 0.9.1.1.2 devel/hs-murmur-hash 0.1.0.7_1 --> 0.1.0.8 devel/hs-optparse-applicative 0.9.1.1_1 --> 0.11.0.2 devel/hs-parallel 3.2.0.4_1 --> 3.2.0.6 devel/hs-pcre-light 0.4.0.2_1 --> 0.4.0.3 devel/hs-primitive 0.5.2.1_1 --> 0.6 devel/hs-profunctors 4.2.0.1_1 --> 5.1.1 devel/hs-project-template 0.1.4.1_1 --> 0.2.0 devel/hs-random 1.0.1.1_10 --> 1.1 devel/hs-reflection 1.5.1_1 --> 2 devel/hs-resource-pool 0.2.3.0_1 --> 0.2.3.2 devel/hs-resourcet 1.1.2.3_1 --> 1.1.6 devel/hs-safe 0.3.7_1 --> 0.3.9 devel/hs-scientific 0.3.3.0_1 --> 0.3.3.8 devel/hs-securemem 0.1.3_1 --> 0.1.9 devel/hs-setenv 0.1.1.1_1 --> 0.1.1.3 devel/hs-shake 0.13.2_1 --> 0.15.5 devel/hs-silently 1.2.4.1_7 --> 1.2.5 devel/hs-stm 2.4.2_6 --> 2.4.4 devel/hs-stm-chans 3.0.0.2_1 --> 3.0.0.4 devel/hs-streaming-commons 0.1.4.1_1 --> 0.1.12.1 devel/hs-syb 0.4.1_1 --> 0.5.1 devel/hs-syb-with-class 0.6.1.5_1 --> 0.6.1.6 devel/hs-system-fileio 0.3.14_1 --> 0.3.16.3 devel/hs-system-filepath 0.4.12_1 --> 0.4.13.4 devel/hs-tagged 0.7.2_1 --> 0.8.1 devel/hs-test-framework 0.8.0.3_1 --> 0.8.1.1 devel/hs-text 1.1.0.0_1 --> 1.2.1.3 devel/hs-text-icu 0.6.3.7_2 --> 0.7.0.1 devel/hs-threads 0.5.1.2_1 --> 0.5.1.3 devel/hs-threadscope 0.2.4_1 --> 0.2.7 devel/hs-timezone-olson 0.1.4_1 --> 0.1.7 devel/hs-timezone-series 0.1.3_1 --> 0.1.5.1 devel/hs-transformers-base 0.4.2_1 --> 0.4.4 devel/hs-transformers-compat 0.3.3.4_1 --> 0.4.0.4 devel/hs-unix-compat 0.4.1.3_1 --> 0.4.1.4 devel/hs-unix-time 0.3.3_1 --> 0.3.5 devel/hs-unordered-containers 0.2.4.0_1 --> 0.2.5.1 devel/hs-utf8-string 0.3.8_1 --> 1 devel/hs-uuagc 0.9.51_1 --> 0.9.52.1 devel/hs-uuagc-cabal 1.0.5.0_1 --> 1.0.6.0 devel/hs-uuid 1.3.3_1 --> 1.3.11 devel/hs-uulib 0.9.16_1 --> 0.9.20 devel/hs-vault 0.3.0.3_1 --> 0.3.0.4 devel/hs-vector 0.10.9.1_1 --> 0.10.12.3 devel/hs-vector-algorithms 0.6.0.3_1 --> 0.7.0.1 devel/hs-vector-instances 3.3_1 --> 3.3.1 devel/hs-vector-th-unbox 0.2.1.0_1 --> 0.2.1.2 devel/hs-void 0.6.1_1 --> 0.7 devel/hs-word8 0.1.1_1 --> 0.1.2 dns/hs-dns 1.4.2_1 --> 2.0.0 graphics/hs-JuicyPixels 3.1.6.1_1 --> 3.2.6 graphics/hs-cairo 0.12.5.3_1 --> 0.13.1.0 graphics/hs-dia-base 0.1.1.2_8 --> 0.1.1.3 graphics/hs-dia-functions 0.2.1.3_8 --> 0.2.1.4 graphics/hs-svgcairo 0.12.5.2_1 --> 0.13.0.3 lang/hs-brainfuck 0.1_15 --> 0.1.0.2 lang/hs-unlambda 0.1.3_8 --> 0.1.4.1 mail/hs-email-validate 2.0.1_1 --> 2.1.3 mail/hs-mime 0.4.0.1_1 --> 0.4.0.2 mail/hs-mime-mail 0.4.5.2_1 --> 0.4.9 mail/hs-mime-types 0.1.0.4_1 --> 0.1.0.6 math/hs-Agda 2.4.0.2_1 --> 2.4.2.3 math/hs-NumInstances 1.3_6 --> 1.4 math/hs-categories 1.0.6_1 --> 1.0.7 math/hs-comonad 4.2.2_1 --> 4.2.7.2 math/hs-contravariant 1.1_1 --> 1.3.2 math/hs-data-lens 2.10.5_1 --> 2.10.7 math/hs-data-lens-template 2.1.8_1 --> 2.1.9 math/hs-ieee754 0.7.3_10 --> 0.7.6 math/hs-mwc-random 0.13.1.2_1 --> 0.13.3.2 math/hs-pointed 4.1_1 --> 4.2.0.2 math/hs-semigroupoids 4.0.4_1 --> 5.0.0.3 math/hs-semigroups 0.15.2_1 --> 0.16.2.2 math/hs-statistics 0.13.2.1_1 --> 0.13.2.3 math/hs-vector-space 0.8.7_1 --> 0.10.2 net/hs-connection 0.2.3_1 --> 0.2.5 net/hs-gsasl 0.3.5_1 --> 0.3.6 net/hs-hoauth2 0.4.3 --> 0.4.8 net/hs-iproute 1.3.1_1 --> 1.5.0 net/hs-network 2.4.2.3_1 --> 2.6.2.1 net/hs-network-info 0.2.0.5_1 --> 0.2.0.7 net/hs-network-multicast 0.0.11_1 --> 0.1.0 net/hs-network-protocol-xmpp 0.4.6_2 --> 0.4.8 net/hs-simple-sendfile 0.2.15_1 --> 0.2.21 print/hs-hscolour 1.20.3_8,1 --> 1.23,1 security/hs-DRBG 0.5.2_1 --> 0.5.4 security/hs-HsOpenSSL 0.11_2 --> 0.11.1.1 security/hs-RSA 2.0.0_1 --> 2.1.0.1 security/hs-SHA 1.6.4.1_1 --> 1.6.4.2 security/hs-cipher-aes 0.2.8_1 --> 0.2.11 security/hs-cipher-aes128 0.6.4_1 --> 0.7.0.1 security/hs-clientsession 0.9.0.3_1 --> 0.9.1.1 security/hs-cprng-aes 0.5.2_1 --> 0.6.1 security/hs-crypto-api 0.13_1 --> 0.13.2 security/hs-crypto-conduit 0.5.4_1 --> 0.5.5 security/hs-crypto-numbers 0.2.3_1 --> 0.2.7 security/hs-crypto-pubkey 0.2.4_1 --> 0.2.8 security/hs-crypto-pubkey-types 0.4.2.2_1 --> 0.4.3 security/hs-crypto-random 0.0.7_1 --> 0.0.9 security/hs-entropy 0.3.2_1 --> 0.3.7 security/hs-gnutls 0.1.5_1 --> 0.2 security/hs-pwstore-fast 2.4.1_1 --> 2.4.4 security/hs-skein 1.0.9_1 --> 1.0.9.3 security/hs-tls 1.2.8_1 --> 1.3.1 security/hs-x509 1.4.11_1 --> 1.6.0 security/hs-x509-store 1.4.4_1 --> 1.6.0 security/hs-x509-system 1.4.5_1 --> 1.6.0 security/hs-x509-validation 1.5.0_1 --> 1.6.0 sysutils/hs-angel 0.5.0_1 --> 0.6.2 sysutils/hs-ekg 0.4.0.1_1 --> 0.4.0.8 sysutils/hs-ekg-core 0.1.0.1_1 --> 0.1.1.0 textproc/hs-Diff 0.3.0_1 --> 0.3.2 textproc/hs-HStringTemplate 0.7.3_1 --> 0.8.3 textproc/hs-HaXml 1.24.1_1 --> 1.25.3 textproc/hs-attoparsec 0.10.4.0_7 --> 0.12.1.6 textproc/hs-attoparsec-enumerator 0.3.3_1 --> 0.3.4 textproc/hs-blaze-html 0.7.0.2_1 --> 0.8.1.0 textproc/hs-blaze-markup 0.6.1.0_1 --> 0.7.0.2 textproc/hs-case-insensitive 1.1.0.3_1 --> 1.2.0.4 textproc/hs-citeproc-hs 0.3.9_1 --> 0.3.10 textproc/hs-double-conversion 0.2.0.6_7 --> 2.0.1.0 textproc/hs-feed 0.3.9.2_1 --> 0.3.10.0 textproc/hs-hexpat 0.20.6_1 --> 0.20.9 textproc/hs-highlighting-kate 0.5.11.1 --> 0.6 textproc/hs-hs-bibutils 5.0_6 --> 5.5 textproc/hs-html-conduit 1.1.0.5_1 --> 1.2.0 textproc/hs-hxt 9.3.1.4_1 --> 9.3.1.15 textproc/hs-hxt-charproperties 9.1.1.1_1 --> 9.2.0.1 textproc/hs-hxt-regex-xmlschema 9.1.0_7 --> 9.2.0.2 textproc/hs-hxt-unicode 9.0.2.2_1 --> 9.0.2.4 textproc/hs-lhs2tex 1.18.1_8 --> 1.19 textproc/hs-pandoc 1.13.2 --> 1.15.0.6 textproc/hs-pandoc-types 1.12.4.1_1 --> 1.12.4.5 textproc/hs-parsec 3.1.5_1 --> 3.1.9 textproc/hs-polyparse 1.9_6 --> 1.11 textproc/hs-stringsearch 0.3.6.5_1 --> 0.3.6.6 textproc/hs-tagsoup 0.13.1_1 --> 0.13.3 textproc/hs-tagstream-conduit 0.5.5.1_1 --> 0.5.5.3 textproc/hs-texmath 0.8.0.1 --> 0.8.3 textproc/hs-uri 0.1.6.2_1 --> 0.1.6.3 textproc/hs-xml 1.3.13_6 --> 1.3.14 textproc/hs-xml-conduit 1.2.1_1 --> 1.3.1 textproc/hs-xml-hamlet 0.4.0.9_1 --> 0.4.0.11 textproc/hs-xml-types 0.3.4_1 --> 0.3.6 textproc/hs-xmlhtml 0.2.3.2_1 --> 0.2.3.4 textproc/hs-yaml 0.8.8.4_1 --> 0.8.13 www/hs-DAV 1.0.1_1 --> 1.0.7 www/hs-HTTP 4000.2.10_1 --> 4000.2.20 www/hs-authenticate 1.3.2.9_1 --> 1.3.2.11 www/hs-cgi 3001.1.8.5_1,1 --> 3001.2.2.2,1 www/hs-cookie 0.4.1.2_1 --> 0.4.1.6 www/hs-gitit 0.10.6.1_1 --> 0.11.1 www/hs-hS3 0.5.8_1 --> 0.5.9 www/hs-happstack-server 7.3.7_1 --> 7.4.4 www/hs-heist 0.13.1.2_1 --> 0.14.1.1 www/hs-hjsmin 0.1.4.7_1 --> 0.1.5.0 www/hs-http-client 0.3.6.1_1 --> 0.4.20 www/hs-http-conduit 2.1.4_1 --> 2.1.8 www/hs-http-date 0.0.4_8 --> 0.0.6.1 www/hs-http-reverse-proxy 0.4.0.1_1 --> 0.4.2 www/hs-http-server 1.0.4_1 --> 1.0.6 www/hs-http-types 0.8.5_1 --> 0.8.6 www/hs-oeis 0.3.5_1 --> 0.3.6 www/hs-path-pieces 0.1.4_1 --> 0.2.0 www/hs-recaptcha 0.1.0.2_1 --> 0.1.0.3 www/hs-shakespeare 2.0.1.1_1 --> 2.0.5 www/hs-snap 0.13.2.8_1 --> 0.14.0.6 www/hs-snap-core 0.9.6.3_1 --> 0.9.7.2 www/hs-snap-server 0.9.4.5_1 --> 0.9.5.1 www/hs-wai 3.0.1.1_1 --> 3.0.3.0 www/hs-wai-app-static 3.0.0_1 --> 3.1.1 www/hs-wai-extra 3.0.1.2_1 --> 3.0.10 www/hs-wai-logger 2.2.0_1 --> 2.2.4.1 www/hs-warp 3.0.0.5_1 --> 3.1.3 www/hs-warp-tls 3.0.0_1 --> 3.1.1 www/hs-webkit 0.12.6.1_1 --> 0.13.1.3 www/hs-xss-sanitize 0.3.5.2_1 --> 0.3.5.6 www/hs-yesod 1.2.6.1_1 --> 1.4.1.5 www/hs-yesod-auth 1.3.4_1 --> 1.4.6 www/hs-yesod-auth-hashdb 1.3.0.1_1 --> 1.4.2.2 www/hs-yesod-bin 1.2.12.3_1 --> 1.4.13.3 www/hs-yesod-core 1.2.19_1 --> 1.4.13 www/hs-yesod-form 1.3.14_1 --> 1.4.4.1 www/hs-yesod-persistent 1.2.3_1 --> 1.4.0.3 www/hs-yesod-static 1.2.4_1 --> 1.5.0.2 www/hs-yesod-test 1.2.3.2_1 --> 1.4.3.1 x11-toolkits/hs-GLURaw 1.4.0.1_1 --> 1.5.0.1 x11-toolkits/hs-GLUT 2.5.1.1_1,1 --> 2.7.0.1,1 x11-toolkits/hs-OpenGL 2.9.2.0_1,1 --> 2.12.0.1,1 x11-toolkits/hs-OpenGLRaw 1.5.0.0_1 --> 2.5.1.0 x11-toolkits/hs-gtk 0.12.5.7_1 --> 0.13.9 x11-toolkits/hs-gtk2hs 0.12.5_1,1 --> 0.13,1 x11-toolkits/hs-gtksourceview2 0.12.5.0_1 --> 0.13.1.3 x11-toolkits/hs-pango 0.12.5.3_1 --> 0.13.1.0 x11-toolkits/hs-vte 0.12.5.0_1 --> 0.13.0.2 x11-toolkits/hs-wx 0.90.1.0_1 --> 0.91.0.0 x11-toolkits/hs-wxc 0.90.1.1_1 --> 0.91.0.0 x11-toolkits/hs-wxcore 0.90.1.1_1 --> 0.91.0.0 x11-toolkits/hs-wxdirect 0.90.1.1_1 --> 0.91.0.0 x11-wm/hs-xmonad 0.11_10 --> 0.11.1 x11-wm/hs-xmonad-contrib 0.11.3_2 --> 0.11.4 x11/hs-xmobar 0.21_1 --> 0.23.1 Removed ports (14): devel/hs-MaybeT Support for computations with failures (deprecated) devel/hs-geniplate Use template Haskell to generate Uniplate-like functions (upstream support is discontinued) devel/hs-glade Binding to the glade library (upstream support is discontinued) devel/hs-haskell-platform The Haskell Platform (it is not tracked any more) devel/hs-ranges Ranges and various functions on them (deprecated) devel/hs-testpack Test Utility Pack for HUnit and QuickCheck (upstream is unmaintained) graphics/hs-soegtk GUI functions as used in the book "The Haskell School of Expression" (upstream support is discontinued) lang/hs-epic Compiler for a simple functional language (it is not needed any more) math/hs-nats Natural numbers (it has been merged into the base library of GHC) multimedia/hs-gstreamer Binding to the GStreamer open source multimedia framework (upstream support is discontinued) [2] www/hs-scgi Haskell library for writing SCGI programs (deprecated) www/hs-yesod-platform Meta package for Yesod (upstream support is discontinued) www/hs-yesod-routes Effective routing for Yesod (upstream support is discontinued) x11-toolkits/hs-gtkglext Binding to the GTK+ OpenGL Extension (upstream support is discontinued) PR: 181049 [1] PR: 197925 [2] PR: 200684 [3] Submitted by: arrowdodger <6yearold@gmail.com> [1] Obtained from: FreeBSD Haskell
-rw-r--r--MOVED15
-rw-r--r--UPDATING25
-rw-r--r--archivers/hs-tar/Makefile3
-rw-r--r--archivers/hs-tar/distinfo4
-rw-r--r--archivers/hs-zip-archive/Makefile5
-rw-r--r--archivers/hs-zip-archive/distinfo4
-rw-r--r--archivers/hs-zlib-bindings/Makefile3
-rw-r--r--archivers/hs-zlib-bindings/distinfo4
-rw-r--r--archivers/hs-zlib-enum/Makefile2
-rw-r--r--archivers/hs-zlib/Makefile3
-rw-r--r--archivers/hs-zlib/distinfo4
-rw-r--r--audio/hs-ALUT/Makefile3
-rw-r--r--audio/hs-ALUT/distinfo4
-rw-r--r--audio/hs-OpenAL/Makefile5
-rw-r--r--audio/hs-OpenAL/distinfo4
-rw-r--r--audio/hs-OpenAL/pkg-descr5
-rw-r--r--audio/hs-libmpd/Makefile9
-rw-r--r--audio/hs-libmpd/distinfo4
-rw-r--r--audio/hs-libmpd/pkg-descr2
-rw-r--r--benchmarks/hs-criterion/Makefile8
-rw-r--r--benchmarks/hs-criterion/distinfo4
-rw-r--r--benchmarks/hs-criterion/pkg-descr2
-rw-r--r--converters/Makefile2
-rw-r--r--converters/hs-aeson-pretty/Makefile18
-rw-r--r--converters/hs-aeson-pretty/distinfo2
-rw-r--r--converters/hs-aeson-pretty/pkg-descr9
-rw-r--r--converters/hs-aeson/Makefile9
-rw-r--r--converters/hs-aeson/distinfo4
-rw-r--r--converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs76
-rw-r--r--converters/hs-aeson/files/patch-aeson.cabal11
-rw-r--r--converters/hs-dataenc/Makefile2
-rw-r--r--converters/hs-dataenc/files/patch-dataenc.cabal11
-rw-r--r--converters/hs-json/Makefile8
-rw-r--r--converters/hs-json/distinfo4
-rw-r--r--converters/hs-sandi/Makefile15
-rw-r--r--converters/hs-sandi/distinfo2
-rw-r--r--converters/hs-sandi/pkg-descr3
-rw-r--r--databases/hs-esqueleto/Makefile7
-rw-r--r--databases/hs-esqueleto/distinfo4
-rw-r--r--databases/hs-esqueleto/pkg-descr7
-rw-r--r--databases/hs-hedis/Makefile8
-rw-r--r--databases/hs-hedis/distinfo4
-rw-r--r--databases/hs-mysql/Makefile3
-rw-r--r--databases/hs-mysql/distinfo4
-rw-r--r--databases/hs-mysql/pkg-descr4
-rw-r--r--databases/hs-persistent-sqlite/Makefile8
-rw-r--r--databases/hs-persistent-sqlite/distinfo4
-rw-r--r--databases/hs-persistent-template/Makefile7
-rw-r--r--databases/hs-persistent-template/distinfo4
-rw-r--r--databases/hs-persistent/Makefile10
-rw-r--r--databases/hs-persistent/distinfo4
-rw-r--r--devel/Makefile32
-rw-r--r--devel/hs-BNFC/Makefile7
-rw-r--r--devel/hs-BNFC/distinfo4
-rw-r--r--devel/hs-Boolean/Makefile3
-rw-r--r--devel/hs-Boolean/distinfo4
-rw-r--r--devel/hs-BoundedChan/Makefile1
-rw-r--r--devel/hs-ConfigFile/Makefile5
-rw-r--r--devel/hs-ConfigFile/distinfo4
-rw-r--r--devel/hs-DrIFT/Makefile4
-rw-r--r--devel/hs-DrIFT/files/patch-src_ParseLib2.hs25
-rw-r--r--devel/hs-Glob/Makefile2
-rw-r--r--devel/hs-Glob/files/patch-Glob.cabal11
-rw-r--r--devel/hs-HUnit/Makefile2
-rw-r--r--devel/hs-IfElse/Makefile2
-rw-r--r--devel/hs-List/Makefile3
-rw-r--r--devel/hs-List/distinfo4
-rw-r--r--devel/hs-MaybeT/distinfo2
-rw-r--r--devel/hs-MaybeT/pkg-descr3
-rw-r--r--devel/hs-MemoTrie/Makefile2
-rw-r--r--devel/hs-MissingH/Makefile5
-rw-r--r--devel/hs-MissingH/distinfo4
-rw-r--r--devel/hs-MissingH/pkg-descr6
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile5
-rw-r--r--devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal11
-rw-r--r--devel/hs-MonadCatchIO-transformers/Makefile3
-rw-r--r--devel/hs-MonadCatchIO-transformers/distinfo4
-rw-r--r--devel/hs-MonadRandom/Makefile5
-rw-r--r--devel/hs-MonadRandom/distinfo4
-rw-r--r--devel/hs-ObjectName/Makefile3
-rw-r--r--devel/hs-ObjectName/distinfo4
-rw-r--r--devel/hs-ObjectName/pkg-descr2
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-QuickCheck/Makefile5
-rw-r--r--devel/hs-QuickCheck/distinfo4
-rw-r--r--devel/hs-QuickCheck/pkg-descr2
-rw-r--r--devel/hs-ReadArgs/Makefile3
-rw-r--r--devel/hs-ReadArgs/distinfo4
-rw-r--r--devel/hs-STMonadTrans/Makefile3
-rw-r--r--devel/hs-STMonadTrans/distinfo4
-rw-r--r--devel/hs-SafeSemaphore/Makefile2
-rw-r--r--devel/hs-ShellCheck/Makefile7
-rw-r--r--devel/hs-ShellCheck/distinfo4
-rw-r--r--devel/hs-ShellCheck/files/patch-ShellCheck.cabal28
-rw-r--r--devel/hs-StateVar/Makefile (renamed from devel/hs-ranges/Makefile)9
-rw-r--r--devel/hs-StateVar/distinfo2
-rw-r--r--devel/hs-StateVar/pkg-descr4
-rw-r--r--devel/hs-Stream/Makefile3
-rw-r--r--devel/hs-Stream/distinfo4
-rw-r--r--devel/hs-TypeCompose/Makefile2
-rw-r--r--devel/hs-abstract-deque/Makefile8
-rw-r--r--devel/hs-abstract-par/Makefile2
-rw-r--r--devel/hs-activehs-base/Makefile2
-rw-r--r--devel/hs-activehs-base/files/patch-activehs-base.cabal10
-rw-r--r--devel/hs-alex/Makefile3
-rw-r--r--devel/hs-alex/distinfo4
-rw-r--r--devel/hs-ansi-terminal/Makefile3
-rw-r--r--devel/hs-ansi-terminal/distinfo4
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile5
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo4
-rw-r--r--devel/hs-ansi-wl-pprint/pkg-descr2
-rw-r--r--devel/hs-arrows/Makefile2
-rw-r--r--devel/hs-asn1-data/Makefile2
-rw-r--r--devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs11
-rw-r--r--devel/hs-asn1-encoding/Makefile5
-rw-r--r--devel/hs-asn1-encoding/distinfo4
-rw-r--r--devel/hs-asn1-parse/Makefile5
-rw-r--r--devel/hs-asn1-parse/distinfo4
-rw-r--r--devel/hs-asn1-types/Makefile5
-rw-r--r--devel/hs-asn1-types/distinfo4
-rw-r--r--devel/hs-async/Makefile3
-rw-r--r--devel/hs-async/distinfo4
-rw-r--r--devel/hs-atomic-primops/Makefile3
-rw-r--r--devel/hs-atomic-primops/distinfo4
-rw-r--r--devel/hs-auto-update/Makefile3
-rw-r--r--devel/hs-auto-update/distinfo4
-rw-r--r--devel/hs-base-orphans/Makefile13
-rw-r--r--devel/hs-base-orphans/distinfo2
-rw-r--r--devel/hs-base-orphans/pkg-descr6
-rw-r--r--devel/hs-base-unicode-symbols/Makefile2
-rw-r--r--devel/hs-base16-bytestring/Makefile2
-rw-r--r--devel/hs-base64-bytestring/Makefile2
-rw-r--r--devel/hs-basic-prelude/Makefile7
-rw-r--r--devel/hs-basic-prelude/distinfo4
-rw-r--r--devel/hs-bifunctors/Makefile5
-rw-r--r--devel/hs-bifunctors/distinfo4
-rw-r--r--devel/hs-bits-atomic/Makefile2
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile6
-rw-r--r--devel/hs-blaze-builder-enumerator/distinfo4
-rw-r--r--devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal12
-rw-r--r--devel/hs-blaze-builder/Makefile3
-rw-r--r--devel/hs-blaze-builder/distinfo4
-rw-r--r--devel/hs-blaze-builder/pkg-descr2
-rw-r--r--devel/hs-blaze-textual/Makefile6
-rw-r--r--devel/hs-blaze-textual/distinfo4
-rw-r--r--devel/hs-bloomfilter/Makefile3
-rw-r--r--devel/hs-bloomfilter/distinfo4
-rw-r--r--devel/hs-boxes/Makefile3
-rw-r--r--devel/hs-boxes/distinfo4
-rw-r--r--devel/hs-bsd-sysctl/Makefile2
-rw-r--r--devel/hs-byteable/Makefile2
-rw-r--r--devel/hs-byteorder/Makefile2
-rw-r--r--devel/hs-bytestring-lexing/Makefile4
-rw-r--r--devel/hs-bytestring-lexing/distinfo4
-rw-r--r--devel/hs-bytestring-mmap/Makefile13
-rw-r--r--devel/hs-bytestring-mmap/distinfo2
-rw-r--r--devel/hs-bytestring-mmap/pkg-descr5
-rw-r--r--devel/hs-bytestring-nums/Makefile2
-rw-r--r--devel/hs-bytestring-show/Makefile2
-rw-r--r--devel/hs-c2hs/Makefile5
-rw-r--r--devel/hs-c2hs/distinfo4
-rw-r--r--devel/hs-cabal-install/Makefile6
-rw-r--r--devel/hs-cabal-install/distinfo4
-rw-r--r--devel/hs-cereal/Makefile3
-rw-r--r--devel/hs-cereal/distinfo4
-rw-r--r--devel/hs-cereal/pkg-descr6
-rw-r--r--devel/hs-checkers/Makefile3
-rw-r--r--devel/hs-checkers/distinfo4
-rw-r--r--devel/hs-checkers/pkg-descr8
-rw-r--r--devel/hs-chunked-data/Makefile7
-rw-r--r--devel/hs-chunked-data/distinfo4
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile7
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo4
-rw-r--r--devel/hs-classy-prelude/Makefile10
-rw-r--r--devel/hs-classy-prelude/distinfo4
-rw-r--r--devel/hs-cmdargs/Makefile3
-rw-r--r--devel/hs-cmdargs/distinfo4
-rw-r--r--devel/hs-conduit-combinators/Makefile8
-rw-r--r--devel/hs-conduit-combinators/distinfo4
-rw-r--r--devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs68
-rw-r--r--devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal19
-rw-r--r--devel/hs-conduit-extra/Makefile5
-rw-r--r--devel/hs-conduit-extra/distinfo4
-rw-r--r--devel/hs-conduit/Makefile7
-rw-r--r--devel/hs-conduit/distinfo4
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-constraints/Makefile15
-rw-r--r--devel/hs-constraints/distinfo2
-rw-r--r--devel/hs-constraints/pkg-descr5
-rw-r--r--devel/hs-convertible/Makefile5
-rw-r--r--devel/hs-convertible/distinfo4
-rw-r--r--devel/hs-convertible/pkg-descr2
-rw-r--r--devel/hs-cpphs/Makefile5
-rw-r--r--devel/hs-cpphs/distinfo4
-rw-r--r--devel/hs-darcs/Makefile23
-rw-r--r--devel/hs-darcs/distinfo4
-rw-r--r--devel/hs-data-default-class/Makefile2
-rw-r--r--devel/hs-data-default-instances-base/Makefile2
-rw-r--r--devel/hs-data-default-instances-containers/Makefile2
-rw-r--r--devel/hs-data-default-instances-dlist/Makefile2
-rw-r--r--devel/hs-data-default-instances-old-locale/Makefile4
-rw-r--r--devel/hs-data-default/Makefile2
-rw-r--r--devel/hs-data-hash/Makefile3
-rw-r--r--devel/hs-data-hash/distinfo4
-rw-r--r--devel/hs-data-ordlist/Makefile13
-rw-r--r--devel/hs-data-ordlist/distinfo2
-rw-r--r--devel/hs-data-ordlist/pkg-descr3
-rw-r--r--devel/hs-data-pprint/Makefile3
-rw-r--r--devel/hs-data-pprint/distinfo4
-rw-r--r--devel/hs-data-pprint/files/patch-data-pprint.cabal11
-rw-r--r--devel/hs-date-cache/Makefile2
-rw-r--r--devel/hs-datetime/Makefile7
-rw-r--r--devel/hs-datetime/distinfo4
-rw-r--r--devel/hs-datetime/pkg-descr6
-rw-r--r--devel/hs-deepseq-generics/Makefile3
-rw-r--r--devel/hs-deepseq-generics/distinfo4
-rw-r--r--devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal11
-rw-r--r--devel/hs-directory-tree/Makefile2
-rw-r--r--devel/hs-dlist-instances/Makefile2
-rw-r--r--devel/hs-dlist/Makefile3
-rw-r--r--devel/hs-dlist/distinfo4
-rw-r--r--devel/hs-easy-file/Makefile13
-rw-r--r--devel/hs-easy-file/distinfo2
-rw-r--r--devel/hs-easy-file/pkg-descr3
-rw-r--r--devel/hs-edit-distance/Makefile3
-rw-r--r--devel/hs-edit-distance/distinfo4
-rw-r--r--devel/hs-edit-distance/pkg-descr2
-rw-r--r--devel/hs-either/Makefile9
-rw-r--r--devel/hs-either/distinfo4
-rw-r--r--devel/hs-enclosed-exceptions/Makefile3
-rw-r--r--devel/hs-enclosed-exceptions/distinfo4
-rw-r--r--devel/hs-enumerator/Makefile2
-rw-r--r--devel/hs-equivalence/Makefile5
-rw-r--r--devel/hs-equivalence/distinfo4
-rw-r--r--devel/hs-errors/Makefile5
-rw-r--r--devel/hs-errors/distinfo4
-rw-r--r--devel/hs-exceptions/Makefile5
-rw-r--r--devel/hs-exceptions/distinfo4
-rw-r--r--devel/hs-extensible-exceptions/Makefile2
-rw-r--r--devel/hs-extra/Makefile13
-rw-r--r--devel/hs-extra/distinfo2
-rw-r--r--devel/hs-extra/pkg-descr10
-rw-r--r--devel/hs-fast-logger/Makefile5
-rw-r--r--devel/hs-fast-logger/distinfo4
-rw-r--r--devel/hs-fast-logger/files/patch-fast-logger.cabal10
-rw-r--r--devel/hs-fgl/Makefile5
-rw-r--r--devel/hs-fgl/distinfo4
-rw-r--r--devel/hs-fgl/pkg-descr4
-rw-r--r--devel/hs-file-embed/Makefile3
-rw-r--r--devel/hs-file-embed/distinfo4
-rw-r--r--devel/hs-filemanip/Makefile3
-rw-r--r--devel/hs-filemanip/distinfo4
-rw-r--r--devel/hs-filestore/Makefile6
-rw-r--r--devel/hs-filestore/distinfo4
-rw-r--r--devel/hs-free/Makefile9
-rw-r--r--devel/hs-free/distinfo4
-rw-r--r--devel/hs-fsnotify/Makefile6
-rw-r--r--devel/hs-fsnotify/distinfo4
-rw-r--r--devel/hs-fsnotify/pkg-descr2
-rw-r--r--devel/hs-gconf/Makefile5
-rw-r--r--devel/hs-gconf/distinfo4
-rw-r--r--devel/hs-generic-deriving/Makefile3
-rw-r--r--devel/hs-generic-deriving/distinfo4
-rw-r--r--devel/hs-geniplate-mirror/Makefile (renamed from devel/hs-geniplate/Makefile)7
-rw-r--r--devel/hs-geniplate-mirror/distinfo2
-rw-r--r--devel/hs-geniplate-mirror/pkg-descr3
-rw-r--r--devel/hs-geniplate/distinfo2
-rw-r--r--devel/hs-geniplate/pkg-descr3
-rw-r--r--devel/hs-ghc-events/Makefile5
-rw-r--r--devel/hs-ghc-events/distinfo4
-rw-r--r--devel/hs-ghc-mtl/Makefile2
-rw-r--r--devel/hs-ghc-paths/Makefile2
-rw-r--r--devel/hs-gio/Makefile5
-rw-r--r--devel/hs-gio/distinfo4
-rw-r--r--devel/hs-git-annex/Makefile51
-rw-r--r--devel/hs-git-annex/distinfo4
-rw-r--r--devel/hs-git-annex/files/patch-Setup.hs28
-rw-r--r--devel/hs-git-annex/files/patch-Utility__Yesod.hs20
-rw-r--r--devel/hs-git-annex/files/patch-git-annex.cabal19
-rw-r--r--devel/hs-git-annex/pkg-descr27
-rw-r--r--devel/hs-glade/Makefile18
-rw-r--r--devel/hs-glade/distinfo2
-rw-r--r--devel/hs-glade/pkg-descr4
-rw-r--r--devel/hs-glib/Makefile5
-rw-r--r--devel/hs-glib/distinfo4
-rw-r--r--devel/hs-glib/pkg-descr9
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile5
-rw-r--r--devel/hs-gtk2hs-buildtools/distinfo4
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs11
-rw-r--r--devel/hs-haddock-api/Makefile15
-rw-r--r--devel/hs-haddock-api/distinfo2
-rw-r--r--devel/hs-haddock-api/pkg-descr3
-rw-r--r--devel/hs-haddock-library/Makefile3
-rw-r--r--devel/hs-haddock-library/distinfo4
-rw-r--r--devel/hs-haddock/Makefile7
-rw-r--r--devel/hs-haddock/distinfo4
-rw-r--r--devel/hs-happy/Makefile3
-rw-r--r--devel/hs-happy/distinfo4
-rw-r--r--devel/hs-hashable/Makefile3
-rw-r--r--devel/hs-hashable/distinfo4
-rw-r--r--devel/hs-hashed-storage/Makefile2
-rw-r--r--devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs8
-rw-r--r--devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs8
-rw-r--r--devel/hs-hashtables/Makefile5
-rw-r--r--devel/hs-hashtables/distinfo4
-rw-r--r--devel/hs-haskell-platform/Makefile58
-rw-r--r--devel/hs-haskell-platform/pkg-descr15
-rw-r--r--devel/hs-haskell-src-exts/Makefile3
-rw-r--r--devel/hs-haskell-src-exts/distinfo4
-rw-r--r--devel/hs-haskell-src/Makefile3
-rw-r--r--devel/hs-haskell-src/distinfo4
-rw-r--r--devel/hs-hasktags/Makefile3
-rw-r--r--devel/hs-hasktags/distinfo4
-rw-r--r--devel/hs-hastache/Makefile7
-rw-r--r--devel/hs-hastache/distinfo4
-rw-r--r--devel/hs-hex/Makefile (renamed from devel/hs-MaybeT/Makefile)7
-rw-r--r--devel/hs-hex/distinfo2
-rw-r--r--devel/hs-hex/pkg-descr3
-rw-r--r--devel/hs-hinotify/Makefile3
-rw-r--r--devel/hs-hinotify/distinfo4
-rw-r--r--devel/hs-hinotify/files/patch-hinotify.cabal12
-rw-r--r--devel/hs-hint/Makefile3
-rw-r--r--devel/hs-hint/distinfo4
-rw-r--r--devel/hs-hint/pkg-descr8
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlint/Makefile7
-rw-r--r--devel/hs-hlint/distinfo4
-rw-r--r--devel/hs-hoogle/Makefile9
-rw-r--r--devel/hs-hoogle/distinfo4
-rw-r--r--devel/hs-hourglass/Makefile13
-rw-r--r--devel/hs-hourglass/distinfo2
-rw-r--r--devel/hs-hourglass/pkg-descr6
-rw-r--r--devel/hs-hsb2hs/Makefile18
-rw-r--r--devel/hs-hsb2hs/distinfo2
-rw-r--r--devel/hs-hsb2hs/pkg-descr6
-rw-r--r--devel/hs-hslogger/Makefile5
-rw-r--r--devel/hs-hslogger/distinfo4
-rw-r--r--devel/hs-hslogger/pkg-descr12
-rw-r--r--devel/hs-hslua/Makefile5
-rw-r--r--devel/hs-hslua/distinfo4
-rw-r--r--devel/hs-hslua/pkg-descr2
-rw-r--r--devel/hs-hspec-core/Makefile17
-rw-r--r--devel/hs-hspec-core/distinfo2
-rw-r--r--devel/hs-hspec-core/pkg-descr4
-rw-r--r--devel/hs-hspec-discover/Makefile17
-rw-r--r--devel/hs-hspec-discover/distinfo2
-rw-r--r--devel/hs-hspec-discover/pkg-descr3
-rw-r--r--devel/hs-hspec-expectations/Makefile3
-rw-r--r--devel/hs-hspec-expectations/distinfo4
-rw-r--r--devel/hs-hspec/Makefile12
-rw-r--r--devel/hs-hspec/distinfo4
-rw-r--r--devel/hs-hspec/pkg-descr11
-rw-r--r--devel/hs-js-flot/Makefile13
-rw-r--r--devel/hs-js-flot/distinfo2
-rw-r--r--devel/hs-js-flot/pkg-descr7
-rw-r--r--devel/hs-js-jquery/Makefile13
-rw-r--r--devel/hs-js-jquery/distinfo2
-rw-r--r--devel/hs-js-jquery/pkg-descr7
-rw-r--r--devel/hs-keys/Makefile6
-rw-r--r--devel/hs-keys/distinfo4
-rw-r--r--devel/hs-kqueue/Makefile2
-rw-r--r--devel/hs-kqueue/files/patch-kqueue.cabal17
-rw-r--r--devel/hs-language-c/Makefile4
-rw-r--r--devel/hs-language-c/distinfo4
-rw-r--r--devel/hs-language-javascript/Makefile3
-rw-r--r--devel/hs-language-javascript/distinfo4
-rw-r--r--devel/hs-language-javascript/pkg-descr2
-rw-r--r--devel/hs-largeword/Makefile2
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lens/Makefile17
-rw-r--r--devel/hs-lens/distinfo4
-rw-r--r--devel/hs-lifted-async/Makefile16
-rw-r--r--devel/hs-lifted-async/distinfo2
-rw-r--r--devel/hs-lifted-async/pkg-descr4
-rw-r--r--devel/hs-lifted-base/Makefile3
-rw-r--r--devel/hs-lifted-base/distinfo4
-rw-r--r--devel/hs-logict/Makefile2
-rw-r--r--devel/hs-map-syntax/Makefile (renamed from math/hs-nats/Makefile)9
-rw-r--r--devel/hs-map-syntax/distinfo2
-rw-r--r--devel/hs-map-syntax/pkg-descr6
-rw-r--r--devel/hs-memory/Makefile13
-rw-r--r--devel/hs-memory/distinfo2
-rw-r--r--devel/hs-memory/pkg-descr9
-rw-r--r--devel/hs-mmap/Makefile2
-rw-r--r--devel/hs-mmorph/Makefile3
-rw-r--r--devel/hs-mmorph/distinfo4
-rw-r--r--devel/hs-monad-control/Makefile3
-rw-r--r--devel/hs-monad-control/distinfo4
-rw-r--r--devel/hs-monad-logger/Makefile3
-rw-r--r--devel/hs-monad-logger/distinfo4
-rw-r--r--devel/hs-monad-loops/Makefile3
-rw-r--r--devel/hs-monad-loops/distinfo4
-rw-r--r--devel/hs-monad-par-extras/Makefile2
-rw-r--r--devel/hs-monad-par/Makefile5
-rw-r--r--devel/hs-monad-par/distinfo4
-rw-r--r--devel/hs-monad-par/pkg-descr4
-rw-r--r--devel/hs-monads-tf/Makefile2
-rw-r--r--devel/hs-mono-traversable/Makefile5
-rw-r--r--devel/hs-mono-traversable/distinfo4
-rw-r--r--devel/hs-mono-traversable/pkg-descr3
-rw-r--r--devel/hs-mtl/Makefile3
-rw-r--r--devel/hs-mtl/distinfo4
-rw-r--r--devel/hs-mueval/Makefile5
-rw-r--r--devel/hs-mueval/distinfo4
-rw-r--r--devel/hs-murmur-hash/Makefile3
-rw-r--r--devel/hs-murmur-hash/distinfo4
-rw-r--r--devel/hs-mutable-containers/Makefile15
-rw-r--r--devel/hs-mutable-containers/distinfo2
-rw-r--r--devel/hs-mutable-containers/pkg-descr10
-rw-r--r--devel/hs-newtype/Makefile13
-rw-r--r--devel/hs-newtype/distinfo2
-rw-r--r--devel/hs-newtype/pkg-descr5
-rw-r--r--devel/hs-old-locale/Makefile13
-rw-r--r--devel/hs-old-locale/distinfo2
-rw-r--r--devel/hs-old-locale/pkg-descr4
-rw-r--r--devel/hs-old-time/Makefile15
-rw-r--r--devel/hs-old-time/distinfo2
-rw-r--r--devel/hs-old-time/pkg-descr3
-rw-r--r--devel/hs-optparse-applicative/Makefile5
-rw-r--r--devel/hs-optparse-applicative/distinfo4
-rw-r--r--devel/hs-parallel/Makefile3
-rw-r--r--devel/hs-parallel/distinfo4
-rw-r--r--devel/hs-pcre-light/Makefile3
-rw-r--r--devel/hs-pcre-light/distinfo4
-rw-r--r--devel/hs-prelude-extras/Makefile2
-rw-r--r--devel/hs-preprocessor-tools/Makefile15
-rw-r--r--devel/hs-preprocessor-tools/distinfo2
-rw-r--r--devel/hs-preprocessor-tools/pkg-descr6
-rw-r--r--devel/hs-prettyclass/Makefile2
-rw-r--r--devel/hs-primitive/Makefile3
-rw-r--r--devel/hs-primitive/distinfo4
-rw-r--r--devel/hs-profunctors/Makefile6
-rw-r--r--devel/hs-profunctors/distinfo4
-rw-r--r--devel/hs-project-template/Makefile6
-rw-r--r--devel/hs-project-template/distinfo4
-rw-r--r--devel/hs-quickcheck-io/Makefile2
-rw-r--r--devel/hs-random/Makefile3
-rw-r--r--devel/hs-random/distinfo4
-rw-r--r--devel/hs-ranges/distinfo2
-rw-r--r--devel/hs-ranges/pkg-descr4
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-reflection/Makefile3
-rw-r--r--devel/hs-reflection/distinfo4
-rw-r--r--devel/hs-reflection/pkg-descr12
-rw-r--r--devel/hs-resource-pool/Makefile7
-rw-r--r--devel/hs-resource-pool/distinfo4
-rw-r--r--devel/hs-resourcet/Makefile5
-rw-r--r--devel/hs-resourcet/distinfo4
-rw-r--r--devel/hs-safe/Makefile3
-rw-r--r--devel/hs-safe/distinfo4
-rw-r--r--devel/hs-safe/pkg-descr16
-rw-r--r--devel/hs-scientific/Makefile3
-rw-r--r--devel/hs-scientific/distinfo4
-rw-r--r--devel/hs-securemem/Makefile5
-rw-r--r--devel/hs-securemem/distinfo4
-rw-r--r--devel/hs-setenv/Makefile3
-rw-r--r--devel/hs-setenv/distinfo4
-rw-r--r--devel/hs-shake/Makefile7
-rw-r--r--devel/hs-shake/distinfo4
-rw-r--r--devel/hs-shake/pkg-descr2
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-silently/Makefile3
-rw-r--r--devel/hs-silently/distinfo4
-rw-r--r--devel/hs-silently/pkg-descr2
-rw-r--r--devel/hs-simple-reflect/Makefile2
-rw-r--r--devel/hs-smallcheck/Makefile2
-rw-r--r--devel/hs-split/Makefile2
-rw-r--r--devel/hs-split/files/patch-split.cabal11
-rw-r--r--devel/hs-stm-chans/Makefile3
-rw-r--r--devel/hs-stm-chans/distinfo4
-rw-r--r--devel/hs-stm/Makefile3
-rw-r--r--devel/hs-stm/distinfo4
-rw-r--r--devel/hs-streaming-commons/Makefile3
-rw-r--r--devel/hs-streaming-commons/distinfo4
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile2
-rw-r--r--devel/hs-syb-with-class/Makefile3
-rw-r--r--devel/hs-syb-with-class/distinfo4
-rw-r--r--devel/hs-syb/Makefile3
-rw-r--r--devel/hs-syb/distinfo4
-rw-r--r--devel/hs-system-fileio/Makefile3
-rw-r--r--devel/hs-system-fileio/distinfo4
-rw-r--r--devel/hs-system-filepath/Makefile5
-rw-r--r--devel/hs-system-filepath/distinfo4
-rw-r--r--devel/hs-system-filepath/pkg-descr2
-rw-r--r--devel/hs-tagged/Makefile3
-rw-r--r--devel/hs-tagged/distinfo4
-rw-r--r--devel/hs-temporary/Makefile2
-rw-r--r--devel/hs-test-framework-hunit/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile2
-rw-r--r--devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal11
-rw-r--r--devel/hs-test-framework/Makefile5
-rw-r--r--devel/hs-test-framework/distinfo4
-rw-r--r--devel/hs-test-framework/pkg-descr2
-rw-r--r--devel/hs-testpack/Makefile17
-rw-r--r--devel/hs-testpack/distinfo2
-rw-r--r--devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs74
-rw-r--r--devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs22
-rw-r--r--devel/hs-testpack/files/patch-testpack.cabal11
-rw-r--r--devel/hs-testpack/pkg-descr9
-rw-r--r--devel/hs-text-icu/Makefile3
-rw-r--r--devel/hs-text-icu/distinfo4
-rw-r--r--devel/hs-text/Makefile3
-rw-r--r--devel/hs-text/distinfo4
-rw-r--r--devel/hs-tf-random/Makefile2
-rw-r--r--devel/hs-threads/Makefile5
-rw-r--r--devel/hs-threads/distinfo4
-rw-r--r--devel/hs-threadscope/Makefile5
-rw-r--r--devel/hs-threadscope/distinfo4
-rw-r--r--devel/hs-time-compat/Makefile4
-rw-r--r--devel/hs-time-locale-compat/Makefile13
-rw-r--r--devel/hs-time-locale-compat/distinfo2
-rw-r--r--devel/hs-time-locale-compat/pkg-descr3
-rw-r--r--devel/hs-timezone-olson/Makefile3
-rw-r--r--devel/hs-timezone-olson/distinfo4
-rw-r--r--devel/hs-timezone-series/Makefile3
-rw-r--r--devel/hs-timezone-series/distinfo4
-rw-r--r--devel/hs-timezone-series/pkg-descr3
-rw-r--r--devel/hs-transformers-base/Makefile5
-rw-r--r--devel/hs-transformers-base/distinfo4
-rw-r--r--devel/hs-transformers-compat/Makefile5
-rw-r--r--devel/hs-transformers-compat/distinfo4
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-uniplate/Makefile2
-rw-r--r--devel/hs-unix-compat/Makefile3
-rw-r--r--devel/hs-unix-compat/distinfo4
-rw-r--r--devel/hs-unix-time/Makefile10
-rw-r--r--devel/hs-unix-time/distinfo4
-rw-r--r--devel/hs-unix-time/files/nopatch-unix-time.cabal11
-rw-r--r--devel/hs-unordered-containers/Makefile3
-rw-r--r--devel/hs-unordered-containers/distinfo4
-rw-r--r--devel/hs-utf8-light/Makefile2
-rw-r--r--devel/hs-utf8-string/Makefile5
-rw-r--r--devel/hs-utf8-string/distinfo4
-rw-r--r--devel/hs-utility-ht/Makefile2
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-cabal/Makefile3
-rw-r--r--devel/hs-uuagc-cabal/distinfo4
-rw-r--r--devel/hs-uuagc/Makefile5
-rw-r--r--devel/hs-uuagc/distinfo4
-rw-r--r--devel/hs-uuid-types/Makefile15
-rw-r--r--devel/hs-uuid-types/distinfo2
-rw-r--r--devel/hs-uuid-types/pkg-descr4
-rw-r--r--devel/hs-uuid/Makefile6
-rw-r--r--devel/hs-uuid/distinfo4
-rw-r--r--devel/hs-uuid/pkg-descr2
-rw-r--r--devel/hs-uulib/Makefile3
-rw-r--r--devel/hs-uulib/distinfo4
-rw-r--r--devel/hs-uulib/pkg-descr3
-rw-r--r--devel/hs-vault/Makefile3
-rw-r--r--devel/hs-vault/distinfo4
-rw-r--r--devel/hs-vault/pkg-descr10
-rw-r--r--devel/hs-vector-algorithms/Makefile3
-rw-r--r--devel/hs-vector-algorithms/distinfo4
-rw-r--r--devel/hs-vector-binary-instances/Makefile2
-rw-r--r--devel/hs-vector-instances/Makefile3
-rw-r--r--devel/hs-vector-instances/distinfo4
-rw-r--r--devel/hs-vector-th-unbox/Makefile3
-rw-r--r--devel/hs-vector-th-unbox/distinfo4
-rw-r--r--devel/hs-vector-th-unbox/pkg-descr3
-rw-r--r--devel/hs-vector/Makefile3
-rw-r--r--devel/hs-vector/distinfo4
-rw-r--r--devel/hs-void/Makefile3
-rw-r--r--devel/hs-void/distinfo4
-rw-r--r--devel/hs-word8/Makefile3
-rw-r--r--devel/hs-word8/distinfo4
-rw-r--r--dns/hs-dns/Makefile3
-rw-r--r--dns/hs-dns/distinfo4
-rw-r--r--dns/hs-gnuidn/Makefile2
-rw-r--r--ftp/hs-curl/Makefile2
-rw-r--r--games/hedgewars/Makefile2
-rw-r--r--games/hedgewars/files/patch-gameServer_CoreTypes.hs11
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/hs-HGL/Makefile2
-rw-r--r--graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs22
-rw-r--r--graphics/hs-JuicyPixels/Makefile3
-rw-r--r--graphics/hs-JuicyPixels/distinfo4
-rw-r--r--graphics/hs-cairo/Makefile5
-rw-r--r--graphics/hs-cairo/distinfo4
-rw-r--r--graphics/hs-dia-base/Makefile3
-rw-r--r--graphics/hs-dia-base/distinfo4
-rw-r--r--graphics/hs-dia-base/files/patch-dia-base.cabal11
-rw-r--r--graphics/hs-dia-functions/Makefile3
-rw-r--r--graphics/hs-dia-functions/distinfo4
-rw-r--r--graphics/hs-dia-functions/files/patch-dia-functions.cabal11
-rw-r--r--graphics/hs-soegtk/Makefile17
-rw-r--r--graphics/hs-soegtk/distinfo2
-rw-r--r--graphics/hs-soegtk/pkg-descr5
-rw-r--r--graphics/hs-svgcairo/Makefile5
-rw-r--r--graphics/hs-svgcairo/distinfo4
-rw-r--r--lang/Makefile1
-rw-r--r--lang/ghc/Makefile103
-rw-r--r--lang/ghc/bsd.cabal.mk34
-rw-r--r--lang/ghc/bsd.cabal.options.mk14
-rw-r--r--lang/ghc/bsd.hackage.mk61
-rw-r--r--lang/ghc/distinfo24
-rw-r--r--lang/ghc/files/patch-aclocal.m457
-rw-r--r--lang/ghc/files/patch-configure.ac14
-rw-r--r--lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs11
-rw-r--r--lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs18
-rw-r--r--lang/hs-brainfuck/Makefile5
-rw-r--r--lang/hs-brainfuck/distinfo4
-rw-r--r--lang/hs-brainfuck/pkg-descr4
-rw-r--r--lang/hs-epic/Makefile30
-rw-r--r--lang/hs-epic/distinfo2
-rw-r--r--lang/hs-epic/files/patch-Epic__Language.lhs23
-rw-r--r--lang/hs-epic/files/patch-Setup.hs32
-rw-r--r--lang/hs-epic/files/patch-evm__Makefile10
-rw-r--r--lang/hs-epic/pkg-descr10
-rw-r--r--lang/hs-epic/pkg-plist5
-rw-r--r--lang/hs-unlambda/Makefile3
-rw-r--r--lang/hs-unlambda/distinfo4
-rw-r--r--mail/hs-email-validate/Makefile3
-rw-r--r--mail/hs-email-validate/distinfo4
-rw-r--r--mail/hs-mime-mail/Makefile5
-rw-r--r--mail/hs-mime-mail/distinfo4
-rw-r--r--mail/hs-mime-types/Makefile3
-rw-r--r--mail/hs-mime-types/distinfo4
-rw-r--r--mail/hs-mime/Makefile3
-rw-r--r--mail/hs-mime/distinfo4
-rw-r--r--math/Makefile3
-rw-r--r--math/hs-Agda-stdlib/Makefile45
-rw-r--r--math/hs-Agda-stdlib/distinfo2
-rw-r--r--math/hs-Agda-stdlib/files/patch-lib.cabal18
-rw-r--r--math/hs-Agda-stdlib/files/patch-src_Size.agda21
-rw-r--r--math/hs-Agda-stdlib/pkg-descr3
-rw-r--r--math/hs-Agda/Makefile27
-rw-r--r--math/hs-Agda/distinfo6
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal28
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs11
-rw-r--r--math/hs-NumInstances/Makefile3
-rw-r--r--math/hs-NumInstances/distinfo4
-rw-r--r--math/hs-adjunctions/Makefile17
-rw-r--r--math/hs-adjunctions/distinfo2
-rw-r--r--math/hs-adjunctions/pkg-descr3
-rw-r--r--math/hs-categories/Makefile3
-rw-r--r--math/hs-categories/distinfo4
-rw-r--r--math/hs-categories/files/patch-src__Control__Categorical__Functor.hs101
-rw-r--r--math/hs-categories/files/patch-src__Control__Category__Dual.hs61
-rw-r--r--math/hs-comonad/Makefile5
-rw-r--r--math/hs-comonad/distinfo4
-rw-r--r--math/hs-contravariant/Makefile6
-rw-r--r--math/hs-contravariant/distinfo4
-rw-r--r--math/hs-data-lens-template/Makefile3
-rw-r--r--math/hs-data-lens-template/distinfo4
-rw-r--r--math/hs-data-lens/Makefile3
-rw-r--r--math/hs-data-lens/distinfo4
-rw-r--r--math/hs-distributive/Makefile2
-rw-r--r--math/hs-erf/Makefile2
-rw-r--r--math/hs-ieee754/Makefile3
-rw-r--r--math/hs-ieee754/distinfo4
-rw-r--r--math/hs-kan-extensions/Makefile17
-rw-r--r--math/hs-kan-extensions/distinfo2
-rw-r--r--math/hs-kan-extensions/pkg-descr4
-rw-r--r--math/hs-math-functions/Makefile2
-rw-r--r--math/hs-mwc-random/Makefile3
-rw-r--r--math/hs-mwc-random/distinfo4
-rw-r--r--math/hs-nats/distinfo2
-rw-r--r--math/hs-nats/pkg-descr3
-rw-r--r--math/hs-pointed/Makefile8
-rw-r--r--math/hs-pointed/distinfo4
-rw-r--r--math/hs-probability/Makefile2
-rw-r--r--math/hs-probability/files/patch-probability.cabal11
-rw-r--r--math/hs-semigroupoids/Makefile11
-rw-r--r--math/hs-semigroupoids/distinfo4
-rw-r--r--math/hs-semigroups/Makefile5
-rw-r--r--math/hs-semigroups/distinfo4
-rw-r--r--math/hs-semigroups/files/patch-semigroups.cabal12
-rw-r--r--math/hs-statistics/Makefile3
-rw-r--r--math/hs-statistics/distinfo4
-rw-r--r--math/hs-vector-space/Makefile3
-rw-r--r--math/hs-vector-space/distinfo4
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/hs-gstreamer/Makefile21
-rw-r--r--multimedia/hs-gstreamer/distinfo2
-rw-r--r--multimedia/hs-gstreamer/pkg-descr6
-rw-r--r--net-im/Makefile1
-rw-r--r--net-im/hs-haskell-xmpp/Makefile17
-rw-r--r--net-im/hs-haskell-xmpp/distinfo2
-rw-r--r--net-im/hs-haskell-xmpp/files/patch-src_Network_XMPP_Stream.hs7
-rw-r--r--net-im/hs-haskell-xmpp/files/patch-src__Network__XMPP__Types.hs12
-rw-r--r--net-im/hs-haskell-xmpp/pkg-descr10
-rw-r--r--net-p2p/Makefile1
-rw-r--r--net-p2p/hs-torrent/Makefile15
-rw-r--r--net-p2p/hs-torrent/distinfo2
-rw-r--r--net-p2p/hs-torrent/pkg-descr3
-rw-r--r--net/Makefile2
-rw-r--r--net/hs-aws/Makefile24
-rw-r--r--net/hs-aws/distinfo2
-rw-r--r--net/hs-aws/pkg-descr4
-rw-r--r--net/hs-connection/Makefile7
-rw-r--r--net/hs-connection/distinfo4
-rw-r--r--net/hs-gsasl/Makefile3
-rw-r--r--net/hs-gsasl/distinfo4
-rw-r--r--net/hs-hoauth2/Makefile5
-rw-r--r--net/hs-hoauth2/distinfo4
-rw-r--r--net/hs-hostname/Makefile2
-rw-r--r--net/hs-iproute/Makefile3
-rw-r--r--net/hs-iproute/distinfo4
-rw-r--r--net/hs-maccatcher/Makefile2
-rw-r--r--net/hs-network-info/Makefile3
-rw-r--r--net/hs-network-info/distinfo4
-rw-r--r--net/hs-network-info/pkg-descr4
-rw-r--r--net/hs-network-multicast/Makefile3
-rw-r--r--net/hs-network-multicast/distinfo4
-rw-r--r--net/hs-network-protocol-xmpp/Makefile3
-rw-r--r--net/hs-network-protocol-xmpp/distinfo4
-rw-r--r--net/hs-network-uri/Makefile15
-rw-r--r--net/hs-network-uri/distinfo2
-rw-r--r--net/hs-network-uri/pkg-descr3
-rw-r--r--net/hs-network/Makefile5
-rw-r--r--net/hs-network/distinfo4
-rw-r--r--net/hs-pcap/Makefile2
-rw-r--r--net/hs-publicsuffixlist/Makefile2
-rw-r--r--net/hs-sendfile/Makefile2
-rw-r--r--net/hs-simple-sendfile/Makefile5
-rw-r--r--net/hs-simple-sendfile/distinfo4
-rw-r--r--net/hs-socks/Makefile2
-rw-r--r--ports-mgmt/hs-porte/Makefile2
-rw-r--r--ports-mgmt/hs-porte/files/patch-Porte_Tool.hs10
-rw-r--r--print/hs-hscolour/Makefile3
-rw-r--r--print/hs-hscolour/distinfo4
-rw-r--r--print/hs-hscolour/pkg-descr14
-rw-r--r--science/hs-bio/Makefile4
-rw-r--r--science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs7
-rw-r--r--science/hs-bio/files/patch-examples__RSelectPE.hs8
-rw-r--r--security/Makefile2
-rw-r--r--security/hs-Crypto/Makefile2
-rw-r--r--security/hs-DRBG/Makefile3
-rw-r--r--security/hs-DRBG/distinfo4
-rw-r--r--security/hs-HsOpenSSL/Makefile6
-rw-r--r--security/hs-HsOpenSSL/distinfo4
-rw-r--r--security/hs-RSA/Makefile11
-rw-r--r--security/hs-RSA/distinfo4
-rw-r--r--security/hs-SHA/Makefile9
-rw-r--r--security/hs-SHA/distinfo4
-rw-r--r--security/hs-certificate/Makefile2
-rw-r--r--security/hs-certificate/files/patch-Data_Certificate_X509_Cert.hs7
-rw-r--r--security/hs-certificate/files/patch-Data_Certificate_X509_Ext.hs7
-rw-r--r--security/hs-cipher-aes/Makefile3
-rw-r--r--security/hs-cipher-aes/distinfo4
-rw-r--r--security/hs-cipher-aes128/Makefile5
-rw-r--r--security/hs-cipher-aes128/distinfo4
-rw-r--r--security/hs-cipher-aes128/pkg-descr6
-rw-r--r--security/hs-cipher-blowfish/Makefile2
-rw-r--r--security/hs-cipher-camellia/Makefile2
-rw-r--r--security/hs-cipher-des/Makefile2
-rw-r--r--security/hs-cipher-rc4/Makefile2
-rw-r--r--security/hs-clientsession/Makefile7
-rw-r--r--security/hs-clientsession/distinfo4
-rw-r--r--security/hs-cprng-aes/Makefile7
-rw-r--r--security/hs-cprng-aes/distinfo4
-rw-r--r--security/hs-crypto-api/Makefile3
-rw-r--r--security/hs-crypto-api/distinfo4
-rw-r--r--security/hs-crypto-cipher-types/Makefile2
-rw-r--r--security/hs-crypto-conduit/Makefile5
-rw-r--r--security/hs-crypto-conduit/distinfo4
-rw-r--r--security/hs-crypto-numbers/Makefile5
-rw-r--r--security/hs-crypto-numbers/distinfo4
-rw-r--r--security/hs-crypto-pubkey-types/Makefile5
-rw-r--r--security/hs-crypto-pubkey-types/distinfo4
-rw-r--r--security/hs-crypto-pubkey/Makefile5
-rw-r--r--security/hs-crypto-pubkey/distinfo4
-rw-r--r--security/hs-crypto-random-api/Makefile2
-rw-r--r--security/hs-crypto-random/Makefile3
-rw-r--r--security/hs-crypto-random/distinfo4
-rw-r--r--security/hs-cryptocipher/Makefile2
-rw-r--r--security/hs-cryptohash-conduit/Makefile2
-rw-r--r--security/hs-cryptohash-cryptoapi/Makefile2
-rw-r--r--security/hs-cryptohash/Makefile2
-rw-r--r--security/hs-cryptonite/Makefile18
-rw-r--r--security/hs-cryptonite/distinfo2
-rw-r--r--security/hs-cryptonite/pkg-descr19
-rw-r--r--security/hs-digest/Makefile2
-rw-r--r--security/hs-entropy/Makefile3
-rw-r--r--security/hs-entropy/distinfo4
-rw-r--r--security/hs-gnutls/Makefile5
-rw-r--r--security/hs-gnutls/distinfo4
-rw-r--r--security/hs-monadcryptorandom/Makefile2
-rw-r--r--security/hs-nonce/Makefile15
-rw-r--r--security/hs-nonce/distinfo2
-rw-r--r--security/hs-nonce/pkg-descr8
-rw-r--r--security/hs-pem/Makefile2
-rw-r--r--security/hs-pureMD5/Makefile2
-rw-r--r--security/hs-pwstore-fast/Makefile5
-rw-r--r--security/hs-pwstore-fast/distinfo4
-rw-r--r--security/hs-skein/Makefile3
-rw-r--r--security/hs-skein/distinfo4
-rw-r--r--security/hs-skein/pkg-descr18
-rw-r--r--security/hs-tls/Makefile11
-rw-r--r--security/hs-tls/distinfo4
-rw-r--r--security/hs-tls/pkg-descr7
-rw-r--r--security/hs-x509-store/Makefile7
-rw-r--r--security/hs-x509-store/distinfo4
-rw-r--r--security/hs-x509-system/Makefile5
-rw-r--r--security/hs-x509-system/distinfo4
-rw-r--r--security/hs-x509-validation/Makefile9
-rw-r--r--security/hs-x509-validation/distinfo4
-rw-r--r--security/hs-x509/Makefile7
-rw-r--r--security/hs-x509/distinfo4
-rw-r--r--shells/Makefile1
-rw-r--r--shells/hs-shelly/Makefile17
-rw-r--r--shells/hs-shelly/distinfo2
-rw-r--r--shells/hs-shelly/pkg-descr13
-rw-r--r--sysutils/Makefile1
-rw-r--r--sysutils/hs-angel/Makefile7
-rw-r--r--sysutils/hs-angel/distinfo4
-rw-r--r--sysutils/hs-cpu/Makefile2
-rw-r--r--sysutils/hs-ekg-core/Makefile3
-rw-r--r--sysutils/hs-ekg-core/distinfo4
-rw-r--r--sysutils/hs-ekg-json/Makefile15
-rw-r--r--sysutils/hs-ekg-json/distinfo2
-rw-r--r--sysutils/hs-ekg-json/pkg-descr5
-rw-r--r--sysutils/hs-ekg/Makefile7
-rw-r--r--sysutils/hs-ekg/distinfo4
-rw-r--r--textproc/Makefile7
-rw-r--r--textproc/hs-Diff/Makefile5
-rw-r--r--textproc/hs-Diff/distinfo4
-rw-r--r--textproc/hs-Diff/pkg-descr3
-rw-r--r--textproc/hs-HStringTemplate/Makefile5
-rw-r--r--textproc/hs-HStringTemplate/distinfo4
-rw-r--r--textproc/hs-HaXml/Makefile5
-rw-r--r--textproc/hs-HaXml/distinfo4
-rw-r--r--textproc/hs-HaXml/pkg-descr2
-rw-r--r--textproc/hs-appar/Makefile2
-rw-r--r--textproc/hs-attoparsec-enumerator/Makefile3
-rw-r--r--textproc/hs-attoparsec-enumerator/distinfo4
-rw-r--r--textproc/hs-attoparsec/Makefile7
-rw-r--r--textproc/hs-attoparsec/distinfo4
-rw-r--r--textproc/hs-bencode/Makefile15
-rw-r--r--textproc/hs-bencode/distinfo2
-rw-r--r--textproc/hs-bencode/pkg-descr5
-rw-r--r--textproc/hs-blaze-html/Makefile5
-rw-r--r--textproc/hs-blaze-html/distinfo4
-rw-r--r--textproc/hs-blaze-markup/Makefile5
-rw-r--r--textproc/hs-blaze-markup/distinfo4
-rw-r--r--textproc/hs-bytestring-csv/Makefile2
-rw-r--r--textproc/hs-case-insensitive/Makefile3
-rw-r--r--textproc/hs-case-insensitive/distinfo4
-rw-r--r--textproc/hs-cassava/Makefile16
-rw-r--r--textproc/hs-cassava/distinfo2
-rw-r--r--textproc/hs-cassava/pkg-descr4
-rw-r--r--textproc/hs-citeproc-hs/Makefile11
-rw-r--r--textproc/hs-citeproc-hs/distinfo4
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs8
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs8
-rw-r--r--textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs10
-rw-r--r--textproc/hs-citeproc-hs/pkg-descr2
-rw-r--r--textproc/hs-cmark/Makefile15
-rw-r--r--textproc/hs-cmark/distinfo2
-rw-r--r--textproc/hs-cmark/pkg-descr6
-rw-r--r--textproc/hs-csv/Makefile2
-rw-r--r--textproc/hs-double-conversion/Makefile10
-rw-r--r--textproc/hs-double-conversion/distinfo4
-rw-r--r--textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal12
-rw-r--r--textproc/hs-feed/Makefile6
-rw-r--r--textproc/hs-feed/distinfo4
-rw-r--r--textproc/hs-feed/pkg-descr2
-rw-r--r--textproc/hs-hexpat/Makefile5
-rw-r--r--textproc/hs-hexpat/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/Makefile8
-rw-r--r--textproc/hs-highlighting-kate/distinfo4
-rw-r--r--textproc/hs-highlighting-kate/pkg-descr4
-rw-r--r--textproc/hs-hs-bibutils/Makefile3
-rw-r--r--textproc/hs-hs-bibutils/distinfo4
-rw-r--r--textproc/hs-hs-bibutils/pkg-descr2
-rw-r--r--textproc/hs-html-conduit/Makefile7
-rw-r--r--textproc/hs-html-conduit/distinfo4
-rw-r--r--textproc/hs-html/Makefile2
-rw-r--r--textproc/hs-hxt-charproperties/Makefile3
-rw-r--r--textproc/hs-hxt-charproperties/distinfo4
-rw-r--r--textproc/hs-hxt-charproperties/pkg-descr4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/Makefile5
-rw-r--r--textproc/hs-hxt-regex-xmlschema/distinfo4
-rw-r--r--textproc/hs-hxt-regex-xmlschema/pkg-descr17
-rw-r--r--textproc/hs-hxt-unicode/Makefile5
-rw-r--r--textproc/hs-hxt-unicode/distinfo4
-rw-r--r--textproc/hs-hxt-unicode/pkg-descr2
-rw-r--r--textproc/hs-hxt/Makefile8
-rw-r--r--textproc/hs-hxt/distinfo4
-rw-r--r--textproc/hs-hxt/pkg-descr9
-rw-r--r--textproc/hs-lhs2tex/Makefile3
-rw-r--r--textproc/hs-lhs2tex/distinfo4
-rw-r--r--textproc/hs-libxml-sax/Makefile2
-rw-r--r--textproc/hs-libxml/Makefile2
-rw-r--r--textproc/hs-pandoc-citeproc/Makefile36
-rw-r--r--textproc/hs-pandoc-citeproc/distinfo2
-rw-r--r--textproc/hs-pandoc-citeproc/pkg-descr6
-rw-r--r--textproc/hs-pandoc-types/Makefile5
-rw-r--r--textproc/hs-pandoc-types/distinfo4
-rw-r--r--textproc/hs-pandoc/Makefile34
-rw-r--r--textproc/hs-pandoc/distinfo4
-rw-r--r--textproc/hs-pandoc/pkg-descr30
-rw-r--r--textproc/hs-parsec/Makefile3
-rw-r--r--textproc/hs-parsec/distinfo4
-rw-r--r--textproc/hs-parsec/pkg-descr2
-rw-r--r--textproc/hs-polyparse/Makefile3
-rw-r--r--textproc/hs-polyparse/distinfo4
-rw-r--r--textproc/hs-regex-applicative/Makefile13
-rw-r--r--textproc/hs-regex-applicative/distinfo2
-rw-r--r--textproc/hs-regex-applicative/pkg-descr4
-rw-r--r--textproc/hs-regex-base/Makefile2
-rw-r--r--textproc/hs-regex-compat-tdfa/Makefile15
-rw-r--r--textproc/hs-regex-compat-tdfa/distinfo2
-rw-r--r--textproc/hs-regex-compat-tdfa/pkg-descr4
-rw-r--r--textproc/hs-regex-compat/Makefile2
-rw-r--r--textproc/hs-regex-pcre-builtin/Makefile2
-rw-r--r--textproc/hs-regex-posix/Makefile2
-rw-r--r--textproc/hs-regex-tdfa/Makefile2
-rw-r--r--textproc/hs-rfc5051/Makefile13
-rw-r--r--textproc/hs-rfc5051/distinfo2
-rw-r--r--textproc/hs-rfc5051/pkg-descr7
-rw-r--r--textproc/hs-stringsearch/Makefile3
-rw-r--r--textproc/hs-stringsearch/distinfo4
-rw-r--r--textproc/hs-tagsoup/Makefile8
-rw-r--r--textproc/hs-tagsoup/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/Makefile7
-rw-r--r--textproc/hs-tagstream-conduit/distinfo4
-rw-r--r--textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal11
-rw-r--r--textproc/hs-texmath/Makefile8
-rw-r--r--textproc/hs-texmath/distinfo4
-rw-r--r--textproc/hs-uri/Makefile3
-rw-r--r--textproc/hs-uri/distinfo4
-rw-r--r--textproc/hs-xml-conduit/Makefile9
-rw-r--r--textproc/hs-xml-conduit/distinfo4
-rw-r--r--textproc/hs-xml-conduit/files/patch-xml-conduit.cabal11
-rw-r--r--textproc/hs-xml-hamlet/Makefile3
-rw-r--r--textproc/hs-xml-hamlet/distinfo4
-rw-r--r--textproc/hs-xml-types/Makefile3
-rw-r--r--textproc/hs-xml-types/distinfo4
-rw-r--r--textproc/hs-xml/Makefile3
-rw-r--r--textproc/hs-xml/distinfo4
-rw-r--r--textproc/hs-xmlhtml/Makefile3
-rw-r--r--textproc/hs-xmlhtml/distinfo4
-rw-r--r--textproc/hs-xmlhtml/files/patch-xmlhtml.cabal15
-rw-r--r--textproc/hs-yaml/Makefile9
-rw-r--r--textproc/hs-yaml/distinfo4
-rw-r--r--www/Makefile5
-rw-r--r--www/hs-DAV/Makefile14
-rw-r--r--www/hs-DAV/distinfo4
-rw-r--r--www/hs-HTTP/Makefile9
-rw-r--r--www/hs-HTTP/distinfo4
-rw-r--r--www/hs-activehs/Makefile2
-rw-r--r--www/hs-activehs/files/patch-Converter.hs16
-rw-r--r--www/hs-activehs/files/patch-Main.hs12
-rw-r--r--www/hs-activehs/files/patch-Parse.hs27
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal48
-rw-r--r--www/hs-authenticate/Makefile10
-rw-r--r--www/hs-authenticate/distinfo4
-rw-r--r--www/hs-cgi/Makefile11
-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-cgi/pkg-descr2
-rw-r--r--www/hs-cookie/Makefile5
-rw-r--r--www/hs-cookie/distinfo4
-rw-r--r--www/hs-css-text/Makefile2
-rw-r--r--www/hs-fastcgi/Makefile2
-rw-r--r--www/hs-gitit/Makefile16
-rw-r--r--www/hs-gitit/distinfo4
-rw-r--r--www/hs-hS3/Makefile8
-rw-r--r--www/hs-hS3/distinfo4
-rw-r--r--www/hs-happstack-server/Makefile15
-rw-r--r--www/hs-happstack-server/distinfo4
-rw-r--r--www/hs-happstack/Makefile2
-rw-r--r--www/hs-happstack/files/patch-happstack.cabal11
-rw-r--r--www/hs-heist/Makefile12
-rw-r--r--www/hs-heist/distinfo4
-rw-r--r--www/hs-hjsmin/Makefile5
-rw-r--r--www/hs-hjsmin/distinfo4
-rw-r--r--www/hs-hjsmin/pkg-descr2
-rw-r--r--www/hs-http-client-tls/Makefile2
-rw-r--r--www/hs-http-client/Makefile9
-rw-r--r--www/hs-http-client/distinfo4
-rw-r--r--www/hs-http-conduit/Makefile5
-rw-r--r--www/hs-http-conduit/distinfo4
-rw-r--r--www/hs-http-date/Makefile3
-rw-r--r--www/hs-http-date/distinfo4
-rw-r--r--www/hs-http-reverse-proxy/Makefile3
-rw-r--r--www/hs-http-reverse-proxy/distinfo4
-rw-r--r--www/hs-http-server/Makefile9
-rw-r--r--www/hs-http-server/distinfo4
-rw-r--r--www/hs-http-server/pkg-descr2
-rw-r--r--www/hs-http-types/Makefile3
-rw-r--r--www/hs-http-types/distinfo4
-rw-r--r--www/hs-http2/Makefile18
-rw-r--r--www/hs-http2/distinfo2
-rw-r--r--www/hs-http2/files/patch-http2.cabal50
-rw-r--r--www/hs-http2/pkg-descr4
-rw-r--r--www/hs-multipart/Makefile15
-rw-r--r--www/hs-multipart/distinfo2
-rw-r--r--www/hs-multipart/pkg-descr3
-rw-r--r--www/hs-oeis/Makefile7
-rw-r--r--www/hs-oeis/distinfo4
-rw-r--r--www/hs-oeis/pkg-descr4
-rw-r--r--www/hs-path-pieces/Makefile3
-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/Makefile19
-rw-r--r--www/hs-scgi/distinfo2
-rw-r--r--www/hs-scgi/pkg-descr4
-rw-r--r--www/hs-shakespeare/Makefile5
-rw-r--r--www/hs-shakespeare/distinfo4
-rw-r--r--www/hs-snap-core/Makefile13
-rw-r--r--www/hs-snap-core/distinfo4
-rw-r--r--www/hs-snap-server/Makefile5
-rw-r--r--www/hs-snap-server/distinfo4
-rw-r--r--www/hs-snap-server/files/patch-snap-server.cabal11
-rw-r--r--www/hs-snap/Makefile16
-rw-r--r--www/hs-snap/distinfo4
-rw-r--r--www/hs-snap/files/patch-snap.cabal17
-rw-r--r--www/hs-url/Makefile2
-rw-r--r--www/hs-wai-app-static/Makefile8
-rw-r--r--www/hs-wai-app-static/distinfo4
-rw-r--r--www/hs-wai-extra/Makefile12
-rw-r--r--www/hs-wai-extra/distinfo4
-rw-r--r--www/hs-wai-extra/pkg-descr2
-rw-r--r--www/hs-wai-logger/Makefile7
-rw-r--r--www/hs-wai-logger/distinfo4
-rw-r--r--www/hs-wai/Makefile3
-rw-r--r--www/hs-wai/distinfo4
-rw-r--r--www/hs-warp-tls/Makefile5
-rw-r--r--www/hs-warp-tls/distinfo4
-rw-r--r--www/hs-warp/Makefile15
-rw-r--r--www/hs-warp/distinfo4
-rw-r--r--www/hs-warp/files/patch-warp.cabal18
-rw-r--r--www/hs-webkit/Makefile6
-rw-r--r--www/hs-webkit/distinfo4
-rw-r--r--www/hs-webkit/pkg-descr7
-rw-r--r--www/hs-xss-sanitize/Makefile9
-rw-r--r--www/hs-xss-sanitize/distinfo4
-rw-r--r--www/hs-yesod-auth-hashdb/Makefile8
-rw-r--r--www/hs-yesod-auth-hashdb/distinfo4
-rw-r--r--www/hs-yesod-auth-hashdb/pkg-descr12
-rw-r--r--www/hs-yesod-auth/Makefile15
-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/Makefile26
-rw-r--r--www/hs-yesod-bin/distinfo4
-rw-r--r--www/hs-yesod-bin/files/patch-yesod-bin.cabal21
-rw-r--r--www/hs-yesod-core/Makefile21
-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-form/Makefile11
-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/Makefile7
-rw-r--r--www/hs-yesod-persistent/distinfo4
-rw-r--r--www/hs-yesod-platform/Makefile140
-rw-r--r--www/hs-yesod-platform/distinfo2
-rw-r--r--www/hs-yesod-platform/files/patch-yesod-platform.cabal51
-rw-r--r--www/hs-yesod-platform/pkg-descr4
-rw-r--r--www/hs-yesod-routes/Makefile16
-rw-r--r--www/hs-yesod-routes/distinfo2
-rw-r--r--www/hs-yesod-routes/pkg-descr3
-rw-r--r--www/hs-yesod-static/Makefile10
-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/Makefile11
-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/Makefile10
-rw-r--r--www/hs-yesod/distinfo4
-rw-r--r--www/hs-yesod/files/patch-yesod.cabal19
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/hs-GLURaw/Makefile5
-rw-r--r--x11-toolkits/hs-GLURaw/distinfo4
-rw-r--r--x11-toolkits/hs-GLUT/Makefile5
-rw-r--r--x11-toolkits/hs-GLUT/distinfo4
-rw-r--r--x11-toolkits/hs-OpenGL/Makefile6
-rw-r--r--x11-toolkits/hs-OpenGL/distinfo4
-rw-r--r--x11-toolkits/hs-OpenGL/pkg-descr2
-rw-r--r--x11-toolkits/hs-OpenGLRaw/Makefile3
-rw-r--r--x11-toolkits/hs-OpenGLRaw/distinfo4
-rw-r--r--x11-toolkits/hs-gtk/Makefile6
-rw-r--r--x11-toolkits/hs-gtk/distinfo4
-rw-r--r--x11-toolkits/hs-gtk2hs/Makefile17
-rw-r--r--x11-toolkits/hs-gtk2hs/pkg-descr23
-rw-r--r--x11-toolkits/hs-gtkglext/Makefile19
-rw-r--r--x11-toolkits/hs-gtkglext/distinfo2
-rw-r--r--x11-toolkits/hs-gtkglext/pkg-descr4
-rw-r--r--x11-toolkits/hs-gtksourceview2/Makefile5
-rw-r--r--x11-toolkits/hs-gtksourceview2/distinfo4
-rw-r--r--x11-toolkits/hs-pango/Makefile5
-rw-r--r--x11-toolkits/hs-pango/distinfo4
-rw-r--r--x11-toolkits/hs-pango/pkg-descr6
-rw-r--r--x11-toolkits/hs-vte/Makefile5
-rw-r--r--x11-toolkits/hs-vte/distinfo4
-rw-r--r--x11-toolkits/hs-wx/Makefile5
-rw-r--r--x11-toolkits/hs-wx/distinfo4
-rw-r--r--x11-toolkits/hs-wx/files/patch-src_Graphics_UI_WX_Window.hs8
-rw-r--r--x11-toolkits/hs-wxc/Makefile17
-rw-r--r--x11-toolkits/hs-wxc/distinfo4
-rw-r--r--x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal11
-rw-r--r--x11-toolkits/hs-wxc/files/patch-Setup.hs42
-rw-r--r--x11-toolkits/hs-wxc/files/patch-wxc.cabal (renamed from x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal)8
-rw-r--r--x11-toolkits/hs-wxcore/Makefile5
-rw-r--r--x11-toolkits/hs-wxcore/distinfo4
-rw-r--r--x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs10
-rw-r--r--x11-toolkits/hs-wxcore/files/patch-wxcore.cabal16
-rw-r--r--x11-toolkits/hs-wxdirect/Makefile4
-rw-r--r--x11-toolkits/hs-wxdirect/distinfo4
-rw-r--r--x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal18
-rw-r--r--x11-wm/hs-xmonad-contrib/Makefile9
-rw-r--r--x11-wm/hs-xmonad-contrib/distinfo4
-rw-r--r--x11-wm/hs-xmonad/Makefile5
-rw-r--r--x11-wm/hs-xmonad/distinfo4
-rw-r--r--x11-wm/hs-xmonad/files/patch-xmonad.cabal11
-rw-r--r--x11/hs-X11-xft/Makefile2
-rw-r--r--x11/hs-X11/Makefile2
-rw-r--r--x11/hs-xmobar/Makefile8
-rw-r--r--x11/hs-xmobar/distinfo4
1113 files changed, 3823 insertions, 3650 deletions
diff --git a/MOVED b/MOVED
index 9dae080..3cbd5f1 100644
--- a/MOVED
+++ b/MOVED
@@ -6368,7 +6368,6 @@ news/husky-base-devel||2014-08-05|Has been incorporated into the build process o
archivers/hs-zlib-conduit||2014-08-10|Removed: Deprecated in favor of conduit-extra
devel/hs-IORefCAS||2014-08-10|Removed: Deprecated in favor of atomic-primops
devel/hs-Tensor||2014-08-10|Removed: Deprecated
-devel/hs-StateVar||2014-08-10|Removed: Deprecated
devel/hs-attempt||2014-08-10|Removed: Deprecated in favor of exceptions
devel/hs-base64-conduit||2014-08-10|Removed: Deprecated in favor of conduit-combinators
devel/hs-blaze-builder-conduit||2014-08-10|Removed: Deprecated in favor of conduit-extra
@@ -7826,3 +7825,17 @@ games/galaxymage||2015-08-16|Has expired: Runtime broken and abandoned upstream
devel/rubygem-fog-brightbox|net/rubygem-fog-brightbox|2015-08-19|Move to a better place
www/ompload||2015-08-20|Has expired: omploader.org is down for many years
devel/ocaml-equeue|www/ocaml-net|2015-08-20|Has expired: Superseded by www/ocaml-net
+devel/hs-MaybeT||2015-08-20|Removed: Deprecated.
+devel/hs-geniplate||2015-08-20|Removed: Upstream support is discontinued.
+devel/hs-glade||2015-08-20|Removed: Upstream support is discontinued.
+devel/hs-haskell-platform||2015-08-20|Removed: It is not tracked any more.
+devel/hs-ranges||2015-08-20|Removed: Deprecated.
+devel/hs-testpack||2015-08-20|Removed: Upstream is unmaintained.
+graphics/hs-soegtk||2015-08-20|Removed: Upstream support is discontinued.
+lang/hs-epic||2015-08-20|Removed: It is not needed any more.
+math/hs-nats||2015-08-20|Removed: It has been merged into the base library of GHC.
+multimedia/hs-gstreamer||2015-08-20|Removed: Upstream support is discontinued.
+www/hs-scgi||2015-08-20|Removed: Deprecated.
+www/hs-yesod-platform||2015-08-20|Removed: Upstream support is discontinued.
+www/hs-yesod-routes||2015-08-20|Removed: Upstream support is discontinued.
+x11-toolkits/hs-gtkglext||2015-08-20|Removed: Upstream support is discontinued.
diff --git a/UPDATING b/UPDATING
index 38aba09..53efde1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,31 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20150820:
+ AFFECTS: users of lang/ghc and */hs-*
+ AUTHOR: haskell@FreeBSD.org
+
+ The Glorious Glasgow Haskell Compiler has been updated to version
+ 7.10.2 and Haskell Platform has been removed. As a result, it is
+ recommended to rebuild or reinstall all the dependent ports and the
+ lang/ghc port itself in one of the following ways:
+
+ # portmaster -w -r ghc
+ or
+ # portupgrade -fr lang/ghc
+
+ In case of pkg(8), it is probably safer to remove all the GHC-dependent
+ packages along with GHC and reinstall everything from scratch. For
+ example:
+
+ # pkg query "%ro" ghc > ghc-pkgs.txt
+ # pkg delete -y lang/ghc
+
+ In ghc-pkgs.txt, check and remove all the packages that have been moved,
+ then:
+
+ # pkg install -y `cat ghc-pkgs.txt`
+
20150817:
AFFECTS: everybody who still uses <UNIQUENAME>_SET/UNSET in make.conf
AUTHOR: mat@FreeBSD.org
diff --git a/archivers/hs-tar/Makefile b/archivers/hs-tar/Makefile
index 1b4a393..fffe7ba 100644
--- a/archivers/hs-tar/Makefile
+++ b/archivers/hs-tar/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tar
-PORTVERSION= 0.4.0.1
-PORTREVISION= 8
+PORTVERSION= 0.4.2.1
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-tar/distinfo b/archivers/hs-tar/distinfo
index 1fc78b0..49518ad 100644
--- a/archivers/hs-tar/distinfo
+++ b/archivers/hs-tar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tar-0.4.0.1.tar.gz) = a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d
-SIZE (cabal/tar-0.4.0.1.tar.gz) = 17875
+SHA256 (cabal/tar-0.4.2.1.tar.gz) = 2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080
+SIZE (cabal/tar-0.4.2.1.tar.gz) = 29825
diff --git a/archivers/hs-zip-archive/Makefile b/archivers/hs-zip-archive/Makefile
index e9d6757..4589806 100644
--- a/archivers/hs-zip-archive/Makefile
+++ b/archivers/hs-zip-archive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= zip-archive
-PORTVERSION= 0.2.3.4
-PORTREVISION= 1
+PORTVERSION= 0.2.3.7
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Library for creating and modifying zip archives
LICENSE= BSD3CLAUSE
-USE_CABAL= digest>=0.0.0.1 mtl text>=0.11 zlib
+USE_CABAL= digest>=0.0.0.1 mtl old-time text>=0.11 zlib
FLAGS_DEFINE= EXECUTABLE
diff --git a/archivers/hs-zip-archive/distinfo b/archivers/hs-zip-archive/distinfo
index d51d7df..8631b49 100644
--- a/archivers/hs-zip-archive/distinfo
+++ b/archivers/hs-zip-archive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zip-archive-0.2.3.4.tar.gz) = f719e2fca32d7606d386cdb6a176fec72c0050f84aa4054c0e5dc9402f4ba8b0
-SIZE (cabal/zip-archive-0.2.3.4.tar.gz) = 12319
+SHA256 (cabal/zip-archive-0.2.3.7.tar.gz) = 41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699
+SIZE (cabal/zip-archive-0.2.3.7.tar.gz) = 12902
diff --git a/archivers/hs-zlib-bindings/Makefile b/archivers/hs-zlib-bindings/Makefile
index 068ef2e..7f54a48 100644
--- a/archivers/hs-zlib-bindings/Makefile
+++ b/archivers/hs-zlib-bindings/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= zlib-bindings
-PORTVERSION= 0.1.1.3
-PORTREVISION= 7
+PORTVERSION= 0.1.1.5
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib-bindings/distinfo b/archivers/hs-zlib-bindings/distinfo
index 3e6da25..11fb154f 100644
--- a/archivers/hs-zlib-bindings/distinfo
+++ b/archivers/hs-zlib-bindings/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-bindings-0.1.1.3.tar.gz) = d96193eaa6ca5bb1f92bbc05f3153e37ee47935dc7f29aea54572dc8ce5650a2
-SIZE (cabal/zlib-bindings-0.1.1.3.tar.gz) = 55555
+SHA256 (cabal/zlib-bindings-0.1.1.5.tar.gz) = c83bb438f9b6c5fe860982731eb8ac7eff993e8b56cbc15ef5b471f229f79109
+SIZE (cabal/zlib-bindings-0.1.1.5.tar.gz) = 54770
diff --git a/archivers/hs-zlib-enum/Makefile b/archivers/hs-zlib-enum/Makefile
index 1d28b3e..cf394a4 100644
--- a/archivers/hs-zlib-enum/Makefile
+++ b/archivers/hs-zlib-enum/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zlib-enum
PORTVERSION= 0.2.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/Makefile b/archivers/hs-zlib/Makefile
index b21b4cf..0f5fa62 100644
--- a/archivers/hs-zlib/Makefile
+++ b/archivers/hs-zlib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= zlib
-PORTVERSION= 0.5.4.1
-PORTREVISION= 6
+PORTVERSION= 0.5.4.2
CATEGORIES= archivers haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/archivers/hs-zlib/distinfo b/archivers/hs-zlib/distinfo
index 0dbf926..12c07cf 100644
--- a/archivers/hs-zlib/distinfo
+++ b/archivers/hs-zlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/zlib-0.5.4.1.tar.gz) = cca365e4c52c90be41a5754943134da5ce6c60bb52fa00c128fd118e0505a550
-SIZE (cabal/zlib-0.5.4.1.tar.gz) = 127760
+SHA256 (cabal/zlib-0.5.4.2.tar.gz) = 75d617d8a77d85ba5a0d69e42c2cd5371b56140b5fb028be3e75bff1cfd41096
+SIZE (cabal/zlib-0.5.4.2.tar.gz) = 127818
diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index b07f301..146a778 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ALUT
-PORTVERSION= 2.3.0.1
-PORTREVISION= 2
+PORTVERSION= 2.4.0.0
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/audio/hs-ALUT/distinfo b/audio/hs-ALUT/distinfo
index 96a2d54..7c1b341 100644
--- a/audio/hs-ALUT/distinfo
+++ b/audio/hs-ALUT/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ALUT-2.3.0.1.tar.gz) = f9511be911b73eb4c7358f69e1ed12746ba0b30e7e26e9a4a5825dcbd6a23e66
-SIZE (cabal/ALUT-2.3.0.1.tar.gz) = 25500
+SHA256 (cabal/ALUT-2.4.0.0.tar.gz) = 0f5cf9362ace34a9739cd3a45015782a0102015e62c8dd8e290d7952e6ff193d
+SIZE (cabal/ALUT-2.4.0.0.tar.gz) = 26075
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index c614ec6..241725d 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= OpenAL
-PORTVERSION= 1.6.0.0
-PORTREVISION= 1
+PORTVERSION= 1.7.0.0
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the OpenAL cross-platform 3D audio API
LICENSE= BSD3CLAUSE
-USE_CABAL= OpenGL>=2.9.0.0
+USE_CABAL= ObjectName>=1.1 OpenGL>=2.12 StateVar>=1.1
USES= openal:al
INSTALL_PORTEXAMPLES= @(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR})
diff --git a/audio/hs-OpenAL/distinfo b/audio/hs-OpenAL/distinfo
index 0d4b175..84422e2 100644
--- a/audio/hs-OpenAL/distinfo
+++ b/audio/hs-OpenAL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenAL-1.6.0.0.tar.gz) = ed919152957ce4d5f81f4835d42dc709e370cf77595b522379236e64a707822f
-SIZE (cabal/OpenAL-1.6.0.0.tar.gz) = 41111
+SHA256 (cabal/OpenAL-1.7.0.0.tar.gz) = 5c427a07c1b26eaaa372dcc526a2c9d593b80021be5e81af75dea6d13f3a3984
+SIZE (cabal/OpenAL-1.7.0.0.tar.gz) = 41297
diff --git a/audio/hs-OpenAL/pkg-descr b/audio/hs-OpenAL/pkg-descr
index 9698bec..16ca51e 100644
--- a/audio/hs-OpenAL/pkg-descr
+++ b/audio/hs-OpenAL/pkg-descr
@@ -1,5 +1,4 @@
-A Haskell binding for the OpenAL cross-platform 3D audio API,
-appropriate for use with gaming applications and many other types of
-audio applications. For more information about OpenAL.
+A Haskell binding for the OpenAL cross-platform 3D audio API, appropriate for
+use with gaming applications and many other types of audio applications.
WWW: https://github.com/haskell-openal/ALUT
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index 91175cd..cb3d269 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= libmpd
-PORTVERSION= 0.8.0.5
-PORTREVISION= 1
+PORTVERSION= 0.9.0.2
CATEGORIES= audio haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= MPD client library
-LICENSE= LGPL21
+LICENSE= MIT
-USE_CABAL= attoparsec>=0.10.1 data-default>=0.4.0 mtl>=2.0 network>=2.1 \
- text>=0.11 utf8-string>=0.3.1
+USE_CABAL= attoparsec>=0.10.1 data-default-class>=0.0.1 mtl>=2.0 \
+ network>=2.1 old-locale>=1.0 text>=0.11 utf8-string>=0.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index bae7762..65d5291 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/libmpd-0.8.0.5.tar.gz) = 10ca58e2e27e3d3f79e9b90d7ac562822b9146ff1cfff3db58dbd5986817ad4b
-SIZE (cabal/libmpd-0.8.0.5.tar.gz) = 39993
+SHA256 (cabal/libmpd-0.9.0.2.tar.gz) = 5fb64d0196204a29bfb655118891c19310969e452599fda2667f7ff7d265d4e0
+SIZE (cabal/libmpd-0.9.0.2.tar.gz) = 38392
diff --git a/audio/hs-libmpd/pkg-descr b/audio/hs-libmpd/pkg-descr
index e31667d..7490839 100644
--- a/audio/hs-libmpd/pkg-descr
+++ b/audio/hs-libmpd/pkg-descr
@@ -1,3 +1,3 @@
A client library for MPD, the Music Player Daemon.
-WWW: http://github.com/joachifm/libmpd-haskell#readme
+WWW: http://github.com/vimus/libmpd-haskell#readme
diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 9dfc67e..589010d 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= criterion
-PORTVERSION= 0.8.1.0
-PORTREVISION= 1
+PORTVERSION= 1.1.0.0
CATEGORIES= benchmarks haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,9 @@ COMMENT= Robust, reliable performance measurement and analysis
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.3.2.12 Glob>=0.7.2 hastache>=0.6.0 mtl>=2 \
- mwc-random>=0.8.0.3 parsec>=3.1.0 statistics>=0.11 \
+USE_CABAL= aeson>=0.8 ansi-wl-pprint>=0.6.7.2 cassava>=0.3.0.0 \
+ Glob>=0.7.2 hastache>=0.6.0 mtl>=2 mwc-random>=0.8.0.3 \
+ optparse-applicative>=0.11 parsec>=3.1.0 statistics>=0.13.2.1 \
text>=0.11 vector>=0.7.1 vector-algorithms>=0.4
INSTALL_PORTEXAMPLES= \
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index 84f9c95..dc7ddf9 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/criterion-0.8.1.0.tar.gz) = ed8b5950afb9b4b73204226aea5659e1dbd7bd2682131fa56da4412e54b5f97b
-SIZE (cabal/criterion-0.8.1.0.tar.gz) = 155095
+SHA256 (cabal/criterion-1.1.0.0.tar.gz) = 5cedd41bb6e5a85e65b51fdb00cb32038b826b8d18af072a8319cab43a452d38
+SIZE (cabal/criterion-1.1.0.0.tar.gz) = 1004534
diff --git a/benchmarks/hs-criterion/pkg-descr b/benchmarks/hs-criterion/pkg-descr
index f433122..334e1e8 100644
--- a/benchmarks/hs-criterion/pkg-descr
+++ b/benchmarks/hs-criterion/pkg-descr
@@ -3,4 +3,4 @@ performance. It provides both a framework for executing and analysing
benchmarks and a set of driver functions that makes it easy to build and
run benchmarks, and to analyse their results.
-WWW: https://github.com/bos/criterion
+WWW: http://www.serpentine.com/criterion
diff --git a/converters/Makefile b/converters/Makefile
index 6848f2b..cdb003e 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -31,8 +31,10 @@
SUBDIR += gbase
SUBDIR += gbsdconv
SUBDIR += hs-aeson
+ SUBDIR += hs-aeson-pretty
SUBDIR += hs-dataenc
SUBDIR += hs-json
+ SUBDIR += hs-sandi
SUBDIR += htx
SUBDIR += i18ntools
SUBDIR += ical2html
diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile
new file mode 100644
index 0000000..77e6a9b
--- /dev/null
+++ b/converters/hs-aeson-pretty/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= aeson-pretty
+PORTVERSION= 0.7.2
+CATEGORIES= converters haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= JSON pretty-printing library and command-line tool
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson>=0.7 attoparsec>=0.10 cmdargs>=0.7 text>=0.11 \
+ unordered-containers>=0.1.3.0 vector>=0.9
+
+EXECUTABLE= aeson-pretty
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/converters/hs-aeson-pretty/distinfo b/converters/hs-aeson-pretty/distinfo
new file mode 100644
index 0000000..21548d0
--- /dev/null
+++ b/converters/hs-aeson-pretty/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/aeson-pretty-0.7.2.tar.gz) = 6408b8b2bcd12cf591e4b93b4d9f5143449b33a59fbd3653f328e2515040570d
+SIZE (cabal/aeson-pretty-0.7.2.tar.gz) = 4838
diff --git a/converters/hs-aeson-pretty/pkg-descr b/converters/hs-aeson-pretty/pkg-descr
new file mode 100644
index 0000000..3d1c4c7
--- /dev/null
+++ b/converters/hs-aeson-pretty/pkg-descr
@@ -0,0 +1,9 @@
+A JSON pretty-printing library compatible with aeson as well as a
+command-line tool to improve readabilty of streams of JSON data. The
+/library/ provides the function "encodePretty". It is a drop-in
+replacement for aeson's "encode" function, producing JSON-ByteStrings
+for human readers. The /command-line tool/ reads JSON from stdin and
+writes prettified JSON to stdout. It also offers a complementary
+"compact"-mode, essentially the opposite of pretty-printing.
+
+WWW: http://github.com/informatikr/aeson-pretty
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 0f380f7..8cd0e7c 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= aeson
-PORTVERSION= 0.7.0.6
-PORTREVISION= 1
+PORTVERSION= 0.8.0.2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT= Fast JSON parsing and encoding
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.4.0 dlist>=0.2 hashable>=1.1.2.0 mtl \
- scientific>=0.3.1 syb text>=0.11.1.0 unordered-containers>=0.2.3.0 \
- vector>=0.7.1
+USE_CABAL= attoparsec>=0.11.3.4 dlist>=0.2 hashable>=1.1.2.0 mtl \
+ old-locale scientific>=0.3.1 syb text>=1.1.1.0 \
+ unordered-containers>=0.2.3.0 vector>=0.7.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo
index c64246d..5d67e7c 100644
--- a/converters/hs-aeson/distinfo
+++ b/converters/hs-aeson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/aeson-0.7.0.6.tar.gz) = 645531759ba18105cadf024415e1be60353ad704ac686ff5ee67c7f4754d4e6f
-SIZE (cabal/aeson-0.7.0.6.tar.gz) = 141565
+SHA256 (cabal/aeson-0.8.0.2.tar.gz) = 0707588dfb5fdfe787eba5b3d5a9950acb224a8dae9dcdcfc9c974ae2b6788d5
+SIZE (cabal/aeson-0.8.0.2.tar.gz) = 143850
diff --git a/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs b/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs
deleted file mode 100644
index 759362b..0000000
--- a/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs
+++ /dev/null
@@ -1,76 +0,0 @@
---- ./Data/Aeson/Parser/Internal.hs.orig 2014-05-16 17:43:52.000000000 +0200
-+++ ./Data/Aeson/Parser/Internal.hs 2014-07-12 19:54:00.000000000 +0200
-@@ -41,25 +41,29 @@
- (Builder, byteString, toLazyByteString, charUtf8, word8)
- #endif
-
--import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)
-+import Control.Applicative ((*>), (<$>), (<*), (<|>), liftA2, pure)
-+import Control.Monad (when, void)
- import Data.Aeson.Types (Result(..), Value(..))
--import Data.Attoparsec.Char8 (Parser, char, endOfInput, scientific,
-- skipSpace, string)
-+import Data.Attoparsec.Char8 (Parser, char, endOfInput, isDigit_w8,
-+ skipSpace, string, decimal, signed)
- import Data.Bits ((.|.), shiftL)
- import Data.ByteString (ByteString)
- import Data.Char (chr)
- import Data.Monoid (mappend, mempty)
-+import Data.Scientific (Scientific)
- import Data.Text (Text)
- import Data.Text.Encoding (decodeUtf8')
- import Data.Vector as Vector (Vector, fromList)
- import Data.Word (Word8)
- import qualified Data.Attoparsec as A
-+import qualified Data.Attoparsec.ByteString as I
- import qualified Data.Attoparsec.Lazy as L
- import qualified Data.Attoparsec.Zepto as Z
- import qualified Data.ByteString as B
- import qualified Data.ByteString.Lazy as L
- import qualified Data.ByteString.Unsafe as B
- import qualified Data.HashMap.Strict as H
-+import qualified Data.Scientific as Sci
-
- #define BACKSLASH 92
- #define CLOSE_CURLY 125
-@@ -356,3 +360,40 @@
- #else
- peekWord8' = maybe (fail "not enough bytes") return =<< A.peekWord8
- #endif
-+
-+scientific :: A.Parser Scientific
-+scientific = scientifically id
-+
-+-- A strict pair
-+data SP = SP !Integer {-# UNPACK #-}!Int
-+
-+{-# INLINE scientifically #-}
-+scientifically :: (Scientific -> a) -> Parser a
-+scientifically h = do
-+ let minus = 45
-+ plus = 43
-+ sign <- peekWord8'
-+ let !positive = sign == plus || sign /= minus
-+ when (sign == plus || sign == minus) $
-+ void $ I.anyWord8
-+
-+ n <- decimal
-+
-+ let f fracDigits = SP (B.foldl' step n fracDigits)
-+ (negate $ B.length fracDigits)
-+ step a w = a * 10 + fromIntegral (w - 48)
-+
-+ dotty <- I.peekWord8
-+ -- '.' -> ascii 46
-+ SP c e <- case dotty of
-+ Just 46 -> I.anyWord8 *> (f <$> I.takeWhile isDigit_w8)
-+ _ -> pure (SP n 0)
-+
-+ let !signedCoeff | positive = c
-+ | otherwise = -c
-+
-+ let littleE = 101
-+ bigE = 69
-+ (I.satisfy (\ex -> ex == littleE || ex == bigE) *>
-+ fmap (h . Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
-+ return (h $ Sci.scientific signedCoeff e)
diff --git a/converters/hs-aeson/files/patch-aeson.cabal b/converters/hs-aeson/files/patch-aeson.cabal
deleted file mode 100644
index 0d26837..0000000
--- a/converters/hs-aeson/files/patch-aeson.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./aeson.cabal.orig 2014-05-16 17:43:52.000000000 +0200
-+++ ./aeson.cabal 2014-07-12 19:15:00.000000000 +0200
-@@ -112,7 +112,7 @@
- Data.Aeson.Types.Generic
-
- build-depends:
-- attoparsec >= 0.11.3.4,
-+ attoparsec >= 0.10.4.0,
- base == 4.*,
- containers,
- deepseq,
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index 2befe22..c512965 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dataenc
PORTVERSION= 0.14.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/files/patch-dataenc.cabal b/converters/hs-dataenc/files/patch-dataenc.cabal
new file mode 100644
index 0000000..cc9b9c0
--- /dev/null
+++ b/converters/hs-dataenc/files/patch-dataenc.cabal
@@ -0,0 +1,11 @@
+--- dataenc.cabal.orig 2014-04-22 18:38:41 UTC
++++ dataenc.cabal
+@@ -21,7 +21,7 @@ flag tests
+
+ library
+ hs-source-dirs: src
+- build-depends: array, base >= 3.0.0 && < 4.8, containers
++ build-depends: array, base >= 3.0.0 && < 4.9, containers
+ exposed-modules:
+ Codec.Binary.Base16
+ Codec.Binary.Base32
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 214f7f3..96c8e34 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= json
-PORTVERSION= 0.7
-PORTREVISION= 8
+PORTVERSION= 0.9.1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,7 @@ COMMENT= Support for serialising Haskell to and from JSON
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl syb>=0.3.3 text
-
-FLAGS_ENABLE= split-base generic
-FLAGS_DISABLE= parse pretty mapdict
+USE_CABAL= mtl parsec syb>=0.3.3 text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-json/distinfo b/converters/hs-json/distinfo
index 58b1f3d..81625de 100644
--- a/converters/hs-json/distinfo
+++ b/converters/hs-json/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/json-0.7.tar.gz) = d3654272caa269bc65f6f2af82b583ef05434613fe5272d57053fb3bfada68a3
-SIZE (cabal/json-0.7.tar.gz) = 22411
+SHA256 (cabal/json-0.9.1.tar.gz) = 96b57e4d167e45dc80aeff872a922ae9cdb953a1ded29ebbb51019b68f0085a2
+SIZE (cabal/json-0.9.1.tar.gz) = 22568
diff --git a/converters/hs-sandi/Makefile b/converters/hs-sandi/Makefile
new file mode 100644
index 0000000..258cf20
--- /dev/null
+++ b/converters/hs-sandi/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= sandi
+PORTVERSION= 0.3.5
+CATEGORIES= converters haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Data encoding library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= conduit exceptions>=0.6
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/converters/hs-sandi/distinfo b/converters/hs-sandi/distinfo
new file mode 100644
index 0000000..a49a5d2
--- /dev/null
+++ b/converters/hs-sandi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/sandi-0.3.5.tar.gz) = 856ed995bad4183a69f65c70a78c4be37cf614c906097ea126bae75ce08daea5
+SIZE (cabal/sandi-0.3.5.tar.gz) = 18700
diff --git a/converters/hs-sandi/pkg-descr b/converters/hs-sandi/pkg-descr
new file mode 100644
index 0000000..17ff49e
--- /dev/null
+++ b/converters/hs-sandi/pkg-descr
@@ -0,0 +1,3 @@
+Reasonably fast data encoding library.
+
+WWW: http://hackage.haskell.org/package/sandi
diff --git a/databases/hs-esqueleto/Makefile b/databases/hs-esqueleto/Makefile
index edb2a6b..e2283ef 100644
--- a/databases/hs-esqueleto/Makefile
+++ b/databases/hs-esqueleto/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= esqueleto
-PORTVERSION= 1.4.4
-PORTREVISION= 1
+PORTVERSION= 2.4.1
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Type-safe EDSL for SQL queries on persistent backends
LICENSE= BSD3CLAUSE
-USE_CABAL= conduit>=1.1 monad-logger persistent>=1.3 resourcet \
- tagged>=0.2 text>=0.11 unordered-containers>=0.2
+USE_CABAL= blaze-html conduit>=1.1 monad-logger persistent>=2.1.1.7 \
+ resourcet>=1.1 tagged>=0.2 text>=0.11 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-esqueleto/distinfo b/databases/hs-esqueleto/distinfo
index d353013..ef71a71 100644
--- a/databases/hs-esqueleto/distinfo
+++ b/databases/hs-esqueleto/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/esqueleto-1.4.4.tar.gz) = 401921e7d5d3c419f9dfbb408d6bbafeea08fb000d6137d0527add4291134503
-SIZE (cabal/esqueleto-1.4.4.tar.gz) = 29338
+SHA256 (cabal/esqueleto-2.4.1.tar.gz) = 12cc83bd2774906c29df20be8b77d11e0fc6efedadf208714494dc406cd8f7fd
+SIZE (cabal/esqueleto-2.4.1.tar.gz) = 39113
diff --git a/databases/hs-esqueleto/pkg-descr b/databases/hs-esqueleto/pkg-descr
index 09ad96f..0db5225 100644
--- a/databases/hs-esqueleto/pkg-descr
+++ b/databases/hs-esqueleto/pkg-descr
@@ -1,4 +1,9 @@
esqueleto is a bare bones, type-safe EDSL for SQL queries that works
-with unmodified persistent SQL backends.
+with unmodified persistent SQL backends. Its language closely resembles
+SQL, so you don't have to learn new concepts, just new syntax, and it's
+fairly easy to predict the generated SQL and optimize it for your
+backend. Most kinds of errors committed when writing SQL are caught as
+compile-time errors---although it is possible to write type-checked
+esqueleto queries that fail at runtime.
WWW: https://github.com/prowdsponsor/esqueleto
diff --git a/databases/hs-hedis/Makefile b/databases/hs-hedis/Makefile
index 6916ded..cd043fd 100644
--- a/databases/hs-hedis/Makefile
+++ b/databases/hs-hedis/Makefile
@@ -2,16 +2,16 @@
# $FreeBSD$
PORTNAME= hedis
-PORTVERSION= 0.6.5
+PORTVERSION= 0.6.9
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell API for Redis
+COMMENT= Client library for the Redis datastore
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10 BoundedChan>=1.0 bytestring-lexing>=0.4 \
- mtl>=2.0 network>=2.0 resource-pool>=0.2 vector>=0.9
+USE_CABAL= attoparsec>=0.12 BoundedChan>=1.0 bytestring-lexing>=0.5 \
+ mtl>=2 network>=2 resource-pool>=0.2 vector>=0.9
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-hedis/distinfo b/databases/hs-hedis/distinfo
index 24cfdf9..07042c4 100644
--- a/databases/hs-hedis/distinfo
+++ b/databases/hs-hedis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hedis-0.6.5.tar.gz) = 70fa3843b3d52203b831ec13bf7f29273ee6fd4695f8cbe55d41d7ee1389c8ce
-SIZE (cabal/hedis-0.6.5.tar.gz) = 27113
+SHA256 (cabal/hedis-0.6.9.tar.gz) = ead8c36dcb7093be9e414da900e2b6fa2f4bc8723a3a5346020d316c75e79179
+SIZE (cabal/hedis-0.6.9.tar.gz) = 27140
diff --git a/databases/hs-mysql/Makefile b/databases/hs-mysql/Makefile
index b1ba943..f26a324 100644
--- a/databases/hs-mysql/Makefile
+++ b/databases/hs-mysql/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mysql
-PORTVERSION= 0.1.1.6
-PORTREVISION= 1
+PORTVERSION= 0.1.1.8
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/databases/hs-mysql/distinfo b/databases/hs-mysql/distinfo
index eeb934f..7fdc009 100644
--- a/databases/hs-mysql/distinfo
+++ b/databases/hs-mysql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mysql-0.1.1.6.tar.gz) = b2d6c47e3176ddb4e192133c5e2ecff7c4831cef44ce1a6dc0b06b4f5ce9bfeb
-SIZE (cabal/mysql-0.1.1.6.tar.gz) = 14071
+SHA256 (cabal/mysql-0.1.1.8.tar.gz) = 90f02af1c81e2189f65dcef0f78327eba4b0ef40bea5bde5cb74920727f9bd84
+SIZE (cabal/mysql-0.1.1.8.tar.gz) = 14092
diff --git a/databases/hs-mysql/pkg-descr b/databases/hs-mysql/pkg-descr
index fe3037d..683488c 100644
--- a/databases/hs-mysql/pkg-descr
+++ b/databases/hs-mysql/pkg-descr
@@ -1,4 +1,4 @@
-A low-level client library for the MySQL database, implemented as
-bindings to the C mysqlclient API.
+A low-level client library for the MySQL database, implemented as bindings to
+the C mysqlclient API.
WWW: https://github.com/bos/mysql
diff --git a/databases/hs-persistent-sqlite/Makefile b/databases/hs-persistent-sqlite/Makefile
index 722e6ec..b13fb2f 100644
--- a/databases/hs-persistent-sqlite/Makefile
+++ b/databases/hs-persistent-sqlite/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-sqlite
-PORTVERSION= 1.3.0.5
-PORTREVISION= 1
+PORTVERSION= 2.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Backend for the persistent library using sqlite3
LICENSE= MIT
-USE_CABAL= aeson>=0.5 conduit>=0.5.3 monad-control>=0.2 \
- monad-logger>=0.2.4 persistent>=1.3 resourcet text>=0.7
+USE_CABAL= aeson>=0.6.2 conduit>=0.5.3 monad-control>=0.2 \
+ monad-logger>=0.2.4 persistent>=2.2 resourcet>=1.1 \
+ text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent-sqlite/distinfo b/databases/hs-persistent-sqlite/distinfo
index cea8cc8..362c952 100644
--- a/databases/hs-persistent-sqlite/distinfo
+++ b/databases/hs-persistent-sqlite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-sqlite-1.3.0.5.tar.gz) = eb477f7f98d4af69aa5ef88750c0e62915378c554a480652b4b09e4f985f6715
-SIZE (cabal/persistent-sqlite-1.3.0.5.tar.gz) = 1353303
+SHA256 (cabal/persistent-sqlite-2.2.tar.gz) = f11005a23df9ad0740111e675aab42f40eda7e37f4996ebae15e1fe48692c794
+SIZE (cabal/persistent-sqlite-2.2.tar.gz) = 1460775
diff --git a/databases/hs-persistent-template/Makefile b/databases/hs-persistent-template/Makefile
index f43d846..3bb0f65 100644
--- a/databases/hs-persistent-template/Makefile
+++ b/databases/hs-persistent-template/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent-template
-PORTVERSION= 1.3.1.4
-PORTREVISION= 1
+PORTVERSION= 2.1.3.4
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Type-safe, non-relational, multi-backend persistence
LICENSE= MIT
-USE_CABAL= aeson monad-control>=0.2 monad-logger persistent>=1.3 \
- text>=0.5 unordered-containers
+USE_CABAL= aeson>=0.7 monad-control>=0.2 monad-logger path-pieces \
+ persistent>=2.1.3 tagged text>=0.5 unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/databases/hs-persistent-template/distinfo b/databases/hs-persistent-template/distinfo
index 79fd83c..69211f2 100644
--- a/databases/hs-persistent-template/distinfo
+++ b/databases/hs-persistent-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-template-1.3.1.4.tar.gz) = d3313840ef0258775b2ce0d37ba9be0948a11d97ef6f3ed3ce76f0b476d045fb
-SIZE (cabal/persistent-template-1.3.1.4.tar.gz) = 14384
+SHA256 (cabal/persistent-template-2.1.3.4.tar.gz) = 4f28c9ef478e3835de5bc0105907582b2e0229cecc84ffa895c67c1a59ae2172
+SIZE (cabal/persistent-template-2.1.3.4.tar.gz) = 19084
diff --git a/databases/hs-persistent/Makefile b/databases/hs-persistent/Makefile
index 8710af2..0df540b 100644
--- a/databases/hs-persistent/Makefile
+++ b/databases/hs-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= persistent
-PORTVERSION= 1.3.1.1
-PORTREVISION= 1
+PORTVERSION= 2.2
CATEGORIES= databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,9 +10,10 @@ COMMENT= Type-safe, multi-backend data serialization
LICENSE= MIT
USE_CABAL= aeson>=0.5 attoparsec base64-bytestring blaze-html>=0.5 \
- blaze-markup>=0.5.1 conduit>=1.0 exceptions lifted-base>=0.1 \
- monad-control>=0.3 monad-logger>=0.3 path-pieces>=0.1 \
- resource-pool resourcet>=0.4 scientific silently text>=0.8 \
+ blaze-markup>=0.5.1 conduit>=1.0 exceptions>=0.6 \
+ fast-logger>=2.1 lifted-base>=0.1 monad-control>=0.3 \
+ monad-logger>=0.3 mtl path-pieces>=0.1 resource-pool \
+ resourcet>=1.1 scientific silently tagged text>=0.8 \
transformers-base unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/databases/hs-persistent/distinfo b/databases/hs-persistent/distinfo
index efa853d..d76c723 100644
--- a/databases/hs-persistent/distinfo
+++ b/databases/hs-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/persistent-1.3.1.1.tar.gz) = 7db789abfdd485f6f8a5f27613115f53f0d9702b87e1d200d91fa27a22ab4159
-SIZE (cabal/persistent-1.3.1.1.tar.gz) = 37042
+SHA256 (cabal/persistent-2.2.tar.gz) = 174047d7f140571081459713fbdeeabbd4a52bbc02dbf35969a0daec491a8512
+SIZE (cabal/persistent-2.2.tar.gz) = 43419
diff --git a/devel/Makefile b/devel/Makefile
index 7b15bb0..2b9280b 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -758,7 +758,6 @@
SUBDIR += hs-HUnit
SUBDIR += hs-IfElse
SUBDIR += hs-List
- SUBDIR += hs-MaybeT
SUBDIR += hs-MemoTrie
SUBDIR += hs-MissingH
SUBDIR += hs-MonadCatchIO-mtl
@@ -771,6 +770,7 @@
SUBDIR += hs-STMonadTrans
SUBDIR += hs-SafeSemaphore
SUBDIR += hs-ShellCheck
+ SUBDIR += hs-StateVar
SUBDIR += hs-Stream
SUBDIR += hs-TypeCompose
SUBDIR += hs-abstract-deque
@@ -787,6 +787,7 @@
SUBDIR += hs-async
SUBDIR += hs-atomic-primops
SUBDIR += hs-auto-update
+ SUBDIR += hs-base-orphans
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
SUBDIR += hs-base64-bytestring
@@ -802,6 +803,7 @@
SUBDIR += hs-byteable
SUBDIR += hs-byteorder
SUBDIR += hs-bytestring-lexing
+ SUBDIR += hs-bytestring-mmap
SUBDIR += hs-bytestring-nums
SUBDIR += hs-bytestring-show
SUBDIR += hs-c2hs
@@ -816,6 +818,7 @@
SUBDIR += hs-conduit-combinators
SUBDIR += hs-conduit-extra
SUBDIR += hs-configurator
+ SUBDIR += hs-constraints
SUBDIR += hs-convertible
SUBDIR += hs-cpphs
SUBDIR += hs-darcs
@@ -826,6 +829,7 @@
SUBDIR += hs-data-default-instances-dlist
SUBDIR += hs-data-default-instances-old-locale
SUBDIR += hs-data-hash
+ SUBDIR += hs-data-ordlist
SUBDIR += hs-data-pprint
SUBDIR += hs-date-cache
SUBDIR += hs-datetime
@@ -833,6 +837,7 @@
SUBDIR += hs-directory-tree
SUBDIR += hs-dlist
SUBDIR += hs-dlist-instances
+ SUBDIR += hs-easy-file
SUBDIR += hs-edit-distance
SUBDIR += hs-either
SUBDIR += hs-enclosed-exceptions
@@ -841,6 +846,7 @@
SUBDIR += hs-errors
SUBDIR += hs-exceptions
SUBDIR += hs-extensible-exceptions
+ SUBDIR += hs-extra
SUBDIR += hs-fast-logger
SUBDIR += hs-fgl
SUBDIR += hs-file-embed
@@ -850,35 +856,41 @@
SUBDIR += hs-fsnotify
SUBDIR += hs-gconf
SUBDIR += hs-generic-deriving
- SUBDIR += hs-geniplate
+ SUBDIR += hs-geniplate-mirror
SUBDIR += hs-ghc-events
SUBDIR += hs-ghc-mtl
SUBDIR += hs-ghc-paths
SUBDIR += hs-gio
SUBDIR += hs-git-annex
- SUBDIR += hs-glade
SUBDIR += hs-glib
SUBDIR += hs-gtk2hs-buildtools
SUBDIR += hs-haddock
+ SUBDIR += hs-haddock-api
SUBDIR += hs-haddock-library
SUBDIR += hs-happy
SUBDIR += hs-hashable
SUBDIR += hs-hashed-storage
SUBDIR += hs-hashtables
- SUBDIR += hs-haskell-platform
SUBDIR += hs-haskell-src
SUBDIR += hs-haskell-src-exts
SUBDIR += hs-hasktags
SUBDIR += hs-hastache
+ SUBDIR += hs-hex
SUBDIR += hs-hinotify
SUBDIR += hs-hint
SUBDIR += hs-hlibev
SUBDIR += hs-hlint
SUBDIR += hs-hoogle
+ SUBDIR += hs-hourglass
+ SUBDIR += hs-hsb2hs
SUBDIR += hs-hslogger
SUBDIR += hs-hslua
SUBDIR += hs-hspec
+ SUBDIR += hs-hspec-core
+ SUBDIR += hs-hspec-discover
SUBDIR += hs-hspec-expectations
+ SUBDIR += hs-js-flot
+ SUBDIR += hs-js-jquery
SUBDIR += hs-keys
SUBDIR += hs-kqueue
SUBDIR += hs-language-c
@@ -886,8 +898,11 @@
SUBDIR += hs-largeword
SUBDIR += hs-lazysmallcheck
SUBDIR += hs-lens
+ SUBDIR += hs-lifted-async
SUBDIR += hs-lifted-base
SUBDIR += hs-logict
+ SUBDIR += hs-map-syntax
+ SUBDIR += hs-memory
SUBDIR += hs-mmap
SUBDIR += hs-mmorph
SUBDIR += hs-monad-control
@@ -900,17 +915,21 @@
SUBDIR += hs-mtl
SUBDIR += hs-mueval
SUBDIR += hs-murmur-hash
+ SUBDIR += hs-mutable-containers
+ SUBDIR += hs-newtype
+ SUBDIR += hs-old-locale
+ SUBDIR += hs-old-time
SUBDIR += hs-optparse-applicative
SUBDIR += hs-parallel
SUBDIR += hs-pcre-light
SUBDIR += hs-prelude-extras
+ SUBDIR += hs-preprocessor-tools
SUBDIR += hs-prettyclass
SUBDIR += hs-primitive
SUBDIR += hs-profunctors
SUBDIR += hs-project-template
SUBDIR += hs-quickcheck-io
SUBDIR += hs-random
- SUBDIR += hs-ranges
SUBDIR += hs-readline
SUBDIR += hs-reflection
SUBDIR += hs-resource-pool
@@ -939,13 +958,13 @@
SUBDIR += hs-test-framework
SUBDIR += hs-test-framework-hunit
SUBDIR += hs-test-framework-quickcheck2
- SUBDIR += hs-testpack
SUBDIR += hs-text
SUBDIR += hs-text-icu
SUBDIR += hs-tf-random
SUBDIR += hs-threads
SUBDIR += hs-threadscope
SUBDIR += hs-time-compat
+ SUBDIR += hs-time-locale-compat
SUBDIR += hs-timezone-olson
SUBDIR += hs-timezone-series
SUBDIR += hs-transformers-base
@@ -962,6 +981,7 @@
SUBDIR += hs-uuagc-bootstrap
SUBDIR += hs-uuagc-cabal
SUBDIR += hs-uuid
+ SUBDIR += hs-uuid-types
SUBDIR += hs-uulib
SUBDIR += hs-vault
SUBDIR += hs-vector
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index af88fa7..84eafee 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= BNFC
-PORTVERSION= 2.6.0.3
-PORTREVISION= 8
+PORTVERSION= 2.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -17,9 +16,5 @@ USE_HAPPY= yes
EXECUTABLE= bnfc
-# Force regeneration of the lexer and parser.
-post-patch::
- @${RM} -rf ${WRKSRC}/dist
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo
index e9bab0a..b8879a2 100644
--- a/devel/hs-BNFC/distinfo
+++ b/devel/hs-BNFC/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/BNFC-2.6.0.3.tar.gz) = 583aeac56d9444ba191501936c290136ba37b95dbee7d5a965d1ee4935cf6844
-SIZE (cabal/BNFC-2.6.0.3.tar.gz) = 202928
+SHA256 (cabal/BNFC-2.8.tar.gz) = 21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34
+SIZE (cabal/BNFC-2.8.tar.gz) = 183591
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 91e9854..7ec21fe 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= Boolean
-PORTVERSION= 0.2.1
-PORTREVISION= 1
+PORTVERSION= 0.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index faa46cd..1e07967 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Boolean-0.2.1.tar.gz) = 994a6d08702c248595b44405e39a1619925e03b2c1d182faaaa408c6594c206e
-SIZE (cabal/Boolean-0.2.1.tar.gz) = 6551
+SHA256 (cabal/Boolean-0.2.3.tar.gz) = f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3
+SIZE (cabal/Boolean-0.2.3.tar.gz) = 6608
diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile
index 131bed2..c8119ab5 100644
--- a/devel/hs-BoundedChan/Makefile
+++ b/devel/hs-BoundedChan/Makefile
@@ -3,6 +3,7 @@
PORTNAME= BoundedChan
PORTVERSION= 1.0.3.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 70e100d..4c6a953 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= ConfigFile
-PORTVERSION= 1.1.2
-PORTREVISION= 1
+PORTVERSION= 1.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Configuration file reading and writing
-LICENSE= LGPL21
+LICENSE= BSD3CLAUSE
USE_CABAL= MissingH>=1.0.0 mtl parsec
diff --git a/devel/hs-ConfigFile/distinfo b/devel/hs-ConfigFile/distinfo
index 00591e7..e680782 100644
--- a/devel/hs-ConfigFile/distinfo
+++ b/devel/hs-ConfigFile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ConfigFile-1.1.2.tar.gz) = 38f6df24926c4952af198cbc9e45e72a62af73adeef097767889e9321bca2d76
-SIZE (cabal/ConfigFile-1.1.2.tar.gz) = 28947
+SHA256 (cabal/ConfigFile-1.1.4.tar.gz) = ae087b359ff2945a62b671449227e0a811d143ee651179f4e7e9c66548e0f514
+SIZE (cabal/ConfigFile-1.1.4.tar.gz) = 28969
diff --git a/devel/hs-DrIFT/Makefile b/devel/hs-DrIFT/Makefile
index 8f15319..d95e146 100644
--- a/devel/hs-DrIFT/Makefile
+++ b/devel/hs-DrIFT/Makefile
@@ -2,7 +2,7 @@
PORTNAME= DrIFT
PORTVERSION= 2.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Program to derive type class instances
LICENSE= BSD3CLAUSE
-USE_CABAL= random
+USE_CABAL= old-time random
EXECUTABLE= DrIFT drift-ghc
diff --git a/devel/hs-DrIFT/files/patch-src_ParseLib2.hs b/devel/hs-DrIFT/files/patch-src_ParseLib2.hs
new file mode 100644
index 0000000..19cfa80
--- /dev/null
+++ b/devel/hs-DrIFT/files/patch-src_ParseLib2.hs
@@ -0,0 +1,25 @@
+--- src/ParseLib2.hs.orig 2013-11-11 15:22:00 UTC
++++ src/ParseLib2.hs
+@@ -32,6 +32,7 @@ module ParseLib2
+ opt, skipUntil, skipUntilOff,skipUntilParse,skipNest) where
+
+ import Data.Char
++import Control.Applicative (Alternative, empty, (<|>))
+ import Control.Monad
+
+ infixr 5 +++
+@@ -62,6 +63,14 @@ instance MonadPlus Parser where
+ -- mplus :: Parser a -> Parser a -> Parser a
+ (P p) `mplus` (P q) = P (\pos inp -> (p pos inp ++ q pos inp))
+
++instance Applicative Parser where
++ pure = return
++ (<*>) = ap
++
++instance Alternative Parser where
++ empty = mzero
++ (<|>) = mplus
++
+ -- bits which donn't fit into Haskell's type classes just yet :-(
+
+ env :: Parser Pos
diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile
index b1770a3..9897d6c 100644
--- a/devel/hs-Glob/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Glob
PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Glob/files/patch-Glob.cabal b/devel/hs-Glob/files/patch-Glob.cabal
new file mode 100644
index 0000000..70ad0f1
--- /dev/null
+++ b/devel/hs-Glob/files/patch-Glob.cabal
@@ -0,0 +1,11 @@
+--- Glob.cabal.orig 2014-05-08 18:30:42 UTC
++++ Glob.cabal
+@@ -28,7 +28,7 @@ Library
+ , containers < 0.6
+ , directory < 1.3
+ , dlist >= 0.4 && < 0.8
+- , filepath >= 1.1 && < 1.4
++ , filepath >= 1.1 && < 1.5
+ , transformers >= 0.2 && < 0.6
+
+ if os(windows)
diff --git a/devel/hs-HUnit/Makefile b/devel/hs-HUnit/Makefile
index 0ea1145..3c35bfe 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= HUnit
PORTVERSION= 1.2.5.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index 22293a3..b32219b 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 3425de3..1dec721 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= List
-PORTVERSION= 0.5.1
-PORTREVISION= 8
+PORTVERSION= 0.5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo
index 3defb90..4ce3b38 100644
--- a/devel/hs-List/distinfo
+++ b/devel/hs-List/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/List-0.5.1.tar.gz) = 3778f7695dbd2b75840724a1dea0430801d65242117df3815e6500281155f3c1
-SIZE (cabal/List-0.5.1.tar.gz) = 6234
+SHA256 (cabal/List-0.5.2.tar.gz) = 27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac
+SIZE (cabal/List-0.5.2.tar.gz) = 6242
diff --git a/devel/hs-MaybeT/distinfo b/devel/hs-MaybeT/distinfo
deleted file mode 100644
index 29fcb61..0000000
--- a/devel/hs-MaybeT/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/MaybeT-0.1.2.tar.gz) = 995e61165122656807d84174e5c1516340fd7ddeba6571c20751352a8476b632
-SIZE (cabal/MaybeT-0.1.2.tar.gz) = 3206
diff --git a/devel/hs-MaybeT/pkg-descr b/devel/hs-MaybeT/pkg-descr
deleted file mode 100644
index d608e29..0000000
--- a/devel/hs-MaybeT/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Support for computations with failures.
-
-WWW: http://hackage.haskell.org/package/MaybeT
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index 5f2fb3c..a94f819 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MemoTrie
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index a0f3a6b..6566861 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= MissingH
-PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTVERSION= 1.3.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Large utility library
LICENSE= BSD3CLAUSE
-USE_CABAL= hslogger HUnit mtl network parsec random regex-compat
+USE_CABAL= hslogger HUnit mtl network old-time parsec random regex-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index d07a86e..5093588 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MissingH-1.2.1.0.tar.gz) = 5aafea2d9e8e64644c8b7b6c149bb74422501aaff1aa3d422f838741a1fbf723
-SIZE (cabal/MissingH-1.2.1.0.tar.gz) = 116445
+SHA256 (cabal/MissingH-1.3.0.1.tar.gz) = ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3
+SIZE (cabal/MissingH-1.3.0.1.tar.gz) = 116812
diff --git a/devel/hs-MissingH/pkg-descr b/devel/hs-MissingH/pkg-descr
index 132fdd8..1eba7e5 100644
--- a/devel/hs-MissingH/pkg-descr
+++ b/devel/hs-MissingH/pkg-descr
@@ -1,5 +1,5 @@
-MissingH is a library of all sorts of utility functions for
-Haskell programmers. It is written in pure Haskell and thus
-should be extremely portable and easy to use.
+MissingH is a library of all sorts of utility functions for Haskell
+programmers. It is written in pure Haskell and thus should be extremely
+portable and easy to use.
WWW: http://software.complete.org/missingh
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
index 994f983..6a337d0 100644
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ b/devel/hs-MonadCatchIO-mtl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= MonadCatchIO-mtl
PORTVERSION= 0.3.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +11,7 @@ COMMENT= Monad-transformer version of the Control.Exception module
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions MonadCatchIO-transformers>=0.3.1.0 \
- MonadCatchIO-transformers<=0.3.1.1
+USE_CABAL= extensible-exceptions MonadCatchIO-transformers>=0.3.1.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal b/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
new file mode 100644
index 0000000..987af20
--- /dev/null
+++ b/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
@@ -0,0 +1,11 @@
+--- MonadCatchIO-mtl.cabal.orig 2014-01-04 20:24:53 UTC
++++ MonadCatchIO-mtl.cabal
+@@ -18,7 +18,7 @@ build-type: Simple
+ tested-with: GHC==6.12.3, GHC==7.0.3, GHC==7.2.1, GHC==7.4.2, GHC==7.6.0
+
+ Library
+- build-depends: base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.0
++ build-depends: base < 5, extensible-exceptions, MonadCatchIO-transformers==0.3.1.*
+ extensions: PackageImports
+
+ exposed-modules: Control.Monad.CatchIO
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-MonadCatchIO-transformers/Makefile
index 54f8df1..cbc9815 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-MonadCatchIO-transformers/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= MonadCatchIO-transformers
-PORTVERSION= 0.3.1.0
-PORTREVISION= 1
+PORTVERSION= 0.3.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MonadCatchIO-transformers/distinfo b/devel/hs-MonadCatchIO-transformers/distinfo
index edba838..d186071 100644
--- a/devel/hs-MonadCatchIO-transformers/distinfo
+++ b/devel/hs-MonadCatchIO-transformers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadCatchIO-transformers-0.3.1.0.tar.gz) = b62beda19ba6bb407113e5ad7b6fa63bb77d24b83e8d09fd0a48a14995f7bae4
-SIZE (cabal/MonadCatchIO-transformers-0.3.1.0.tar.gz) = 4530
+SHA256 (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 10a49c32c22123e053377fe558d0c136c2b3746d15954d60f66f6bc80f0404bd
+SIZE (cabal/MonadCatchIO-transformers-0.3.1.3.tar.gz) = 4526
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index 312259c..eb2e52e 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= MonadRandom
-PORTVERSION= 0.1.13
-PORTREVISION= 1
+PORTVERSION= 0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Random-number generation monad
-USE_CABAL= mtl random
+USE_CABAL= mtl random transformers-compat>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MonadRandom/distinfo b/devel/hs-MonadRandom/distinfo
index 8c3fe55..ab6bac3 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/MonadRandom-0.1.13.tar.gz) = d3ae5f7c2e9703a31e4b81d4634457073105327a30be373c0554d0a5ab1721de
-SIZE (cabal/MonadRandom-0.1.13.tar.gz) = 4465
+SHA256 (cabal/MonadRandom-0.4.tar.gz) = d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93
+SIZE (cabal/MonadRandom-0.4.tar.gz) = 5064
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 4f0f606..968768c 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ObjectName
-PORTVERSION= 1.0.0.0
-PORTREVISION= 14
+PORTVERSION= 1.1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/distinfo b/devel/hs-ObjectName/distinfo
index 978ef01..ecc5124 100644
--- a/devel/hs-ObjectName/distinfo
+++ b/devel/hs-ObjectName/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ObjectName-1.0.0.0.tar.gz) = 358b7185d1f3e414a4a28155a93e15b433833967542f81354e50d0a88052217b
-SIZE (cabal/ObjectName-1.0.0.0.tar.gz) = 1843
+SHA256 (cabal/ObjectName-1.1.0.0.tar.gz) = afa91a31b325d2d70b27c367cf0447410f31f8e80bb851b5cbe6a9e9d372054e
+SIZE (cabal/ObjectName-1.1.0.0.tar.gz) = 2583
diff --git a/devel/hs-ObjectName/pkg-descr b/devel/hs-ObjectName/pkg-descr
index 3dda124..36b626f 100644
--- a/devel/hs-ObjectName/pkg-descr
+++ b/devel/hs-ObjectName/pkg-descr
@@ -2,4 +2,4 @@ This tiny Haskell package contains the class ObjectName, which corresponds to
the general notion of explicitly handled identifiers for API objects, e.g. a
texture object name in OpenGL or a buffer object name in OpenAL.
-WWW: http://www.haskell.org/HOpenGL/
+WWW: https://github.com/svenpanne/ObjectName
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index d07c5ba..d1e0618 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index 6cb9901..fe1fad8 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= QuickCheck
-PORTVERSION= 2.6
-PORTREVISION= 6
+PORTVERSION= 2.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Automatic testing of Haskell programs
LICENSE= BSD3CLAUSE
-USE_CABAL= random
+USE_CABAL= extensible-exceptions random tf-random>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 2529651..87c1a1a 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/QuickCheck-2.6.tar.gz) = 8001c00a1892714d914e5007ba72cdd428c1ea4c6b8418c6cb5e7809753d970d
-SIZE (cabal/QuickCheck-2.6.tar.gz) = 26466
+SHA256 (cabal/QuickCheck-2.8.1.tar.gz) = 7073aa3635660476aa31df7cf0476926a1ac0231235020122eb276070675763b
+SIZE (cabal/QuickCheck-2.8.1.tar.gz) = 38999
diff --git a/devel/hs-QuickCheck/pkg-descr b/devel/hs-QuickCheck/pkg-descr
index ad7ef2b..5664e38 100644
--- a/devel/hs-QuickCheck/pkg-descr
+++ b/devel/hs-QuickCheck/pkg-descr
@@ -9,4 +9,4 @@ the QuickCheck library. QuickCheck provides combinators to define
properties, observe the distribution of test data, and define test data
generators.
-WWW: http://code.haskell.org/QuickCheck
+WWW: https://github.com/nick8325/quickcheck
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index 831b6f1..146a4d2 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ReadArgs
-PORTVERSION= 1.2.1
-PORTREVISION= 8
+PORTVERSION= 1.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/distinfo b/devel/hs-ReadArgs/distinfo
index dd9187f..37d4784 100644
--- a/devel/hs-ReadArgs/distinfo
+++ b/devel/hs-ReadArgs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ReadArgs-1.2.1.tar.gz) = dbae7a2b77bc4d2acb159e946d99cda5234e07020e295fe815ce8383ad792f25
-SIZE (cabal/ReadArgs-1.2.1.tar.gz) = 5102
+SHA256 (cabal/ReadArgs-1.2.2.tar.gz) = 47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec
+SIZE (cabal/ReadArgs-1.2.2.tar.gz) = 5102
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
index 044bbc2..25128f8 100644
--- a/devel/hs-STMonadTrans/Makefile
+++ b/devel/hs-STMonadTrans/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= STMonadTrans
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-STMonadTrans/distinfo b/devel/hs-STMonadTrans/distinfo
index d032299..6b2f9f9 100644
--- a/devel/hs-STMonadTrans/distinfo
+++ b/devel/hs-STMonadTrans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/STMonadTrans-0.3.2.tar.gz) = 70be84c06ce312a56dbf37d674ad709700850b7fd4cb55198d7ae45a985e85b2
-SIZE (cabal/STMonadTrans-0.3.2.tar.gz) = 4792
+SHA256 (cabal/STMonadTrans-0.3.3.tar.gz) = d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315
+SIZE (cabal/STMonadTrans-0.3.3.tar.gz) = 4820
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 9261c25..09e5c15 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.10.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index 8eb6951..356124b 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= ShellCheck
-PORTVERSION= 0.3.5
+PORTVERSION= 0.3.8
CATEGORIES= devel haskell
MAINTAINER= luca.pizzamiglio@gmail.com
COMMENT= Shell script analysis tool
-LICENSE= AGPLv3
+LICENSE= GPLv3
-USE_CABAL= json>=0.7 parsec QuickCheck>=2.6 regex-posix>=0.95.2 \
- regex-compat>=0.95.1 tf-random>=0.5
+USE_CABAL= json mtl parsec QuickCheck>=2.7.4 regex-tdfa
EXECUTABLE= shellcheck
diff --git a/devel/hs-ShellCheck/distinfo b/devel/hs-ShellCheck/distinfo
index 31b6216..d50766e 100644
--- a/devel/hs-ShellCheck/distinfo
+++ b/devel/hs-ShellCheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ShellCheck-0.3.5.tar.gz) = 9289fda0b3683f4e7c2c003f875a9e308897368fe956ed924a76cafc2fdc9974
-SIZE (cabal/ShellCheck-0.3.5.tar.gz) = 77173
+SHA256 (cabal/ShellCheck-0.3.8.tar.gz) = c185b77166724c06531b3e07b7a8353c0451809a1f60e9f6756d29247853651a
+SIZE (cabal/ShellCheck-0.3.8.tar.gz) = 86202
diff --git a/devel/hs-ShellCheck/files/patch-ShellCheck.cabal b/devel/hs-ShellCheck/files/patch-ShellCheck.cabal
deleted file mode 100644
index 0783474..0000000
--- a/devel/hs-ShellCheck/files/patch-ShellCheck.cabal
+++ /dev/null
@@ -1,28 +0,0 @@
---- ShellCheck.cabal.orig 2014-11-10 01:30:00.000000000 +0100
-+++ ShellCheck.cabal 2015-02-03 18:19:38.355225341 +0100
-@@ -42,7 +42,7 @@
- mtl,
- parsec,
- regex-compat,
-- QuickCheck >= 2.7.4
-+ QuickCheck >= 2.6
- exposed-modules:
- ShellCheck.Analytics
- ShellCheck.AST
-@@ -64,7 +64,7 @@
- parsec,
- regex-compat,
- transformers,
-- QuickCheck >= 2.7.4
-+ QuickCheck >= 2.6
- main-is: shellcheck.hs
-
- test-suite test-shellcheck
-@@ -79,6 +79,6 @@
- parsec,
- regex-compat,
- transformers,
-- QuickCheck >= 2.7.4
-+ QuickCheck >= 2.6
- main-is: test/shellcheck.hs
-
diff --git a/devel/hs-ranges/Makefile b/devel/hs-StateVar/Makefile
index b6ef556..1bbf8dd 100644
--- a/devel/hs-ranges/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
-PORTNAME= ranges
-PORTVERSION= 0.2.4
-PORTREVISION= 11
+PORTNAME= StateVar
+PORTVERSION= 1.1.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Ranges and various functions on them
+COMMENT= State variables
LICENSE= BSD3CLAUSE
+USE_CABAL= stm>=2.0
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
new file mode 100644
index 0000000..584800b
--- /dev/null
+++ b/devel/hs-StateVar/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/StateVar-1.1.0.1.tar.gz) = 0eae79ccc58509f2302cb90f2306d6bb2f1805a2847058fa643d18cc370be5aa
+SIZE (cabal/StateVar-1.1.0.1.tar.gz) = 4462
diff --git a/devel/hs-StateVar/pkg-descr b/devel/hs-StateVar/pkg-descr
new file mode 100644
index 0000000..2ebca92
--- /dev/null
+++ b/devel/hs-StateVar/pkg-descr
@@ -0,0 +1,4 @@
+This package contains state variables, which are references in the IO monad,
+like IORefs or parts of the OpenGL state.
+
+WWW: https://github.com/haskell-opengl/StateVar
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index 1ab08f9..a1a634b 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= Stream
-PORTVERSION= 0.4.7.1
-PORTREVISION= 1
+PORTVERSION= 0.4.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index 2650324..04b62c9 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Stream-0.4.7.1.tar.gz) = c3779c9c848f7f64daa69289d095c5f7a9d4cd50bfcc7aac4892b9cdaf810022
-SIZE (cabal/Stream-0.4.7.1.tar.gz) = 6208
+SHA256 (cabal/Stream-0.4.7.2.tar.gz) = 990be249b3ef1b0075563026d4d2c803b86e3cbf168965ba6f9f2b4227a007d1
+SIZE (cabal/Stream-0.4.7.2.tar.gz) = 6543
diff --git a/devel/hs-TypeCompose/Makefile b/devel/hs-TypeCompose/Makefile
index 82265d6..4c9b281 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -3,7 +3,7 @@
PORTNAME= TypeCompose
PORTVERSION= 0.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 251b6dc..7ac40b0 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,11 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= random
-FLAGS_DEFINE= USECAS
-
-USECAS_DESC= Use hardware compare-and-swap
-USECAS_FLAG_ENABLE= useCAS
-USECAS_FLAG_CABAL= atomic-primops>=0.5.0.2
+FLAGS_DISABLE= useCAS
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index 2175c91..f0b5245 100644
--- a/devel/hs-abstract-par/Makefile
+++ b/devel/hs-abstract-par/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-par
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 4f135c3..2d421bb 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= activehs-base
PORTVERSION= 0.3.0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
index 81d7f9f..9f24f99 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -1,12 +1,12 @@
---- ./activehs-base.cabal.orig 2012-09-11 09:56:08.000000000 +0200
-+++ ./activehs-base.cabal 2014-07-12 18:56:46.000000000 +0200
-@@ -21,7 +21,7 @@
+--- activehs-base.cabal.orig 2012-09-11 07:56:08 UTC
++++ activehs-base.cabal
+@@ -21,7 +21,7 @@ Library
Exposed-Modules:
ActiveHs.Base
Build-Depends:
- base >= 4.0 && < 4.7,
- QuickCheck >= 2.4 && < 2.6
-+ base >= 4.0 && < 4.8,
-+ QuickCheck >= 2.4 && < 2.7
++ base >= 4.0 && < 4.9,
++ QuickCheck >= 2.4 && < 2.9
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 1bcecfe..48134fc 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 3.1.3
-PORTREVISION= 1
+PORTVERSION= 3.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index 2fb8b8d..be00f43 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/alex-3.1.3.tar.gz) = 8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92
-SIZE (cabal/alex-3.1.3.tar.gz) = 99868
+SHA256 (cabal/alex-3.1.4.tar.gz) = d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f
+SIZE (cabal/alex-3.1.4.tar.gz) = 101827
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index e208e0f..400c637 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.6.1.1
-PORTREVISION= 1
+PORTVERSION= 0.6.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index ab58727..718b46e 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-terminal-0.6.1.1.tar.gz) = 9133a6dc6f99fff3f7d004aa400f4b40424c8999fcd392674d939f2fee65ed1a
-SIZE (cabal/ansi-terminal-0.6.1.1.tar.gz) = 14169
+SHA256 (cabal/ansi-terminal-0.6.2.1.tar.gz) = 965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6
+SIZE (cabal/ansi-terminal-0.6.2.1.tar.gz) = 14652
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index 967bdd4..d9fb740 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= ansi-wl-pprint
-PORTVERSION= 0.6.7.1
-PORTREVISION= 1
+PORTVERSION= 0.6.7.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= The Wadler/Leijen Pretty Printer for colored ANSI terminal output
+COMMENT= Wadler/Leijen Pretty Printer for colored ANSI terminal output
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index 54ada87..fed41c5 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ansi-wl-pprint-0.6.7.1.tar.gz) = d980c265cacf6d6aa37a24d056e730b678680e07d3ab87210affb415de0ac1af
-SIZE (cabal/ansi-wl-pprint-0.6.7.1.tar.gz) = 14862
+SHA256 (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708
+SIZE (cabal/ansi-wl-pprint-0.6.7.3.tar.gz) = 14983
diff --git a/devel/hs-ansi-wl-pprint/pkg-descr b/devel/hs-ansi-wl-pprint/pkg-descr
index d50b3ea..9d46ece 100644
--- a/devel/hs-ansi-wl-pprint/pkg-descr
+++ b/devel/hs-ansi-wl-pprint/pkg-descr
@@ -1,5 +1,5 @@
This is a pretty printing library based on Wadler's paper "A Prettier
-Printer". It has been enhanced with support for ANSI terminal colored
+Printer". It has been enhanced with support for ANSI terminal colored
output using the ansi-terminal package.
WWW: http://github.com/batterseapower/ansi-wl-pprint
diff --git a/devel/hs-arrows/Makefile b/devel/hs-arrows/Makefile
index 6bec6c6..aa861a9 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,7 +3,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index 71e04c9..ebef297 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asn1-data
PORTVERSION= 0.7.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs b/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
new file mode 100644
index 0000000..2ead068
--- /dev/null
+++ b/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
@@ -0,0 +1,11 @@
+--- Data/ASN1/Parse.hs.orig 2012-08-28 06:24:31 UTC
++++ Data/ASN1/Parse.hs
+@@ -25,7 +25,7 @@ import Control.Applicative ((<$>))
+
+ -- | Parse ASN1 Monad
+ newtype ParseASN1 a = P { runP :: ErrorT String (State [ASN1]) a }
+- deriving (Functor, Monad, MonadError String)
++ deriving (Functor, Applicative, Monad, MonadError String)
+
+ -- | run the parse monad over a stream and returns the result and the remaining ASN1 Stream.
+ runParseASN1State :: ParseASN1 a -> [ASN1] -> Either String (a,[ASN1])
diff --git a/devel/hs-asn1-encoding/Makefile b/devel/hs-asn1-encoding/Makefile
index ed5163b..1eec53a 100644
--- a/devel/hs-asn1-encoding/Makefile
+++ b/devel/hs-asn1-encoding/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-encoding
-PORTVERSION= 0.8.1.3
-PORTREVISION= 1
+PORTVERSION= 0.9.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= ASN1 data reader and writer in RAW, BER and DER forms
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-types>=0.2.1 mtl text>=0.11
+USE_CABAL= asn1-types>=0.3.0 hourglass>=0.2.6 mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-asn1-encoding/distinfo b/devel/hs-asn1-encoding/distinfo
index 4cbf02a..a96bb12 100644
--- a/devel/hs-asn1-encoding/distinfo
+++ b/devel/hs-asn1-encoding/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-encoding-0.8.1.3.tar.gz) = d1a26d9e2df6f0c815ff347093b20e06a21feeaee2f9204af7aeb797ba541900
-SIZE (cabal/asn1-encoding-0.8.1.3.tar.gz) = 16099
+SHA256 (cabal/asn1-encoding-0.9.0.tar.gz) = 17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b
+SIZE (cabal/asn1-encoding-0.9.0.tar.gz) = 15997
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
index 9d72a74..e341cd3 100644
--- a/devel/hs-asn1-parse/Makefile
+++ b/devel/hs-asn1-parse/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-parse
-PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTVERSION= 0.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Simple monadic parser for ASN1 stream types
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-encoding>=0.8 asn1-types>=0.2 mtl text>=0.11
+USE_CABAL= asn1-encoding>=0.9 asn1-types>=0.3 mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-asn1-parse/distinfo b/devel/hs-asn1-parse/distinfo
index 24f8b3b..1f5f1e1 100644
--- a/devel/hs-asn1-parse/distinfo
+++ b/devel/hs-asn1-parse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-parse-0.8.1.tar.gz) = 09567b3f06d428a194fe8132acf002f8dbfb8694a113dce14edd79a54a5d3508
-SIZE (cabal/asn1-parse-0.8.1.tar.gz) = 2724
+SHA256 (cabal/asn1-parse-0.9.1.tar.gz) = e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de
+SIZE (cabal/asn1-parse-0.9.1.tar.gz) = 2785
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index 62af283..e3d8a82 100644
--- a/devel/hs-asn1-types/Makefile
+++ b/devel/hs-asn1-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-types
-PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTVERSION= 0.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= ASN.1 types
LICENSE= BSD3CLAUSE
+USE_CABAL= hourglass
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-asn1-types/distinfo b/devel/hs-asn1-types/distinfo
index 8de841f..784bf5e 100644
--- a/devel/hs-asn1-types/distinfo
+++ b/devel/hs-asn1-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/asn1-types-0.2.3.tar.gz) = 84c3778b36978f673fe916b325759ff9ac2294900c052190afd868fa8d84bfb1
-SIZE (cabal/asn1-types-0.2.3.tar.gz) = 5411
+SHA256 (cabal/asn1-types-0.3.0.tar.gz) = b998dad88b94f8da7058df52f03936d66c81a2d012549c87affeecac5cb5a8aa
+SIZE (cabal/asn1-types-0.3.0.tar.gz) = 5391
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index 3080730..0477a9e 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= async
-PORTVERSION= 2.0.1.5
-PORTREVISION= 1
+PORTVERSION= 2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index eb7776b..ff48c05 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/async-2.0.1.5.tar.gz) = cd13ac558f4f63e567100805770648e89307a3210852b17038c9be4fcc3aa83c
-SIZE (cabal/async-2.0.1.5.tar.gz) = 8350
+SHA256 (cabal/async-2.0.2.tar.gz) = db54d384259eee2f3ca525821f45fe509b9a101fbf3a8df7132aa9622626fd2b
+SIZE (cabal/async-2.0.2.tar.gz) = 8565
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
index e60e8a7..17672a1 100644
--- a/devel/hs-atomic-primops/Makefile
+++ b/devel/hs-atomic-primops/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= atomic-primops
-PORTVERSION= 0.6.0.6
-PORTREVISION= 1
+PORTVERSION= 0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo
index 6fd81c03..8ec74aa 100644
--- a/devel/hs-atomic-primops/distinfo
+++ b/devel/hs-atomic-primops/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/atomic-primops-0.6.0.6.tar.gz) = 8bf1532162ec95f68de7c84d8245ed2afdb41ceb3b7084dc4a3f94949ad12982
-SIZE (cabal/atomic-primops-0.6.0.6.tar.gz) = 30305
+SHA256 (cabal/atomic-primops-0.8.tar.gz) = c0e19e8005bb7320a0a9f6eaa5b464adb14aa88308e9922249305eeaa42f6471
+SIZE (cabal/atomic-primops-0.8.tar.gz) = 33588
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
index 96dce5a..b0219c0 100644
--- a/devel/hs-auto-update/Makefile
+++ b/devel/hs-auto-update/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= auto-update
-PORTVERSION= 0.1.0.0
-PORTREVISION= 1
+PORTVERSION= 0.1.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-auto-update/distinfo b/devel/hs-auto-update/distinfo
index d135259..5e05268 100644
--- a/devel/hs-auto-update/distinfo
+++ b/devel/hs-auto-update/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/auto-update-0.1.0.0.tar.gz) = 1430f24db953b022fa2d425ec3c77ecc2211464300db6aad1b67c4cb19530a00
-SIZE (cabal/auto-update-0.1.0.0.tar.gz) = 4018
+SHA256 (cabal/auto-update-0.1.2.2.tar.gz) = 7b3000c330055d4059fe8d9ab044c29e3a57b4dc31b88ea386a75a886b6144db
+SIZE (cabal/auto-update-0.1.2.2.tar.gz) = 6651
diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile
new file mode 100644
index 0000000..4bda662
--- /dev/null
+++ b/devel/hs-base-orphans/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= base-orphans
+PORTVERSION= 0.4.4
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Backwards-compatible orphan instances for base
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-base-orphans/distinfo b/devel/hs-base-orphans/distinfo
new file mode 100644
index 0000000..96924c0
--- /dev/null
+++ b/devel/hs-base-orphans/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/base-orphans-0.4.4.tar.gz) = f4323cc2ae2b25ce228d7291ff65ac5e6c583070b53eaf21dd509ebe25bf0f42
+SIZE (cabal/base-orphans-0.4.4.tar.gz) = 13068
diff --git a/devel/hs-base-orphans/pkg-descr b/devel/hs-base-orphans/pkg-descr
new file mode 100644
index 0000000..fb5d278
--- /dev/null
+++ b/devel/hs-base-orphans/pkg-descr
@@ -0,0 +1,6 @@
+base-orphans defines orphan instances that mimic instances available in
+later versions of base to a wider (older) range of compilers.
+base-orphans does not export anything except the orphan instances
+themselves and complements.
+
+WWW: https://github.com/haskell-compat/base-orphans#readme
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 2efbbc4..66fed67 100644
--- a/devel/hs-base-unicode-symbols/Makefile
+++ b/devel/hs-base-unicode-symbols/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base-unicode-symbols
PORTVERSION= 0.2.2.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 4c38126..781e32c 100644
--- a/devel/hs-base16-bytestring/Makefile
+++ b/devel/hs-base16-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base16-bytestring
PORTVERSION= 0.1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 718bc0d..3e577f7 100644
--- a/devel/hs-base64-bytestring/Makefile
+++ b/devel/hs-base64-bytestring/Makefile
@@ -2,7 +2,7 @@
PORTNAME= base64-bytestring
PORTVERSION= 1.0.0.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index c8ab94d..ac37d87 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTVERSION= 0.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Enhanced core prelude; a common foundation for alternate preludes
LICENSE= MIT
-USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe system-filepath>=0.4 \
- text unordered-containers vector
+USE_CABAL= hashable lifted-base ReadArgs>=1.2 safe text \
+ unordered-containers vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index 527c742..a1e555b 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/basic-prelude-0.3.8.tar.gz) = effa8e5982753ddace4ccfc6f387b81395ec7e14ec0e6d0cc93660a09bb6dc53
-SIZE (cabal/basic-prelude-0.3.8.tar.gz) = 4887
+SHA256 (cabal/basic-prelude-0.5.0.tar.gz) = d1f562338ed9934a02b4fadc9f9a33f467d10105dbe03f527b47d4ae536210d1
+SIZE (cabal/basic-prelude-0.5.0.tar.gz) = 5743
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 2a53c30..95a22f4 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 4.1.1.1
-PORTREVISION= 1
+PORTVERSION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Bifunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= semigroupoids semigroups>=0.8.3.1 tagged>=0.4.4
+USE_CABAL= semigroups>=0.8.3.1 tagged>=0.7.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-bifunctors/distinfo b/devel/hs-bifunctors/distinfo
index c538d89..29f009f 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bifunctors-4.1.1.1.tar.gz) = 115fd3a4b592ec6de09c6e2311d365968e0e6669745a96943352357bbdc1612c
-SIZE (cabal/bifunctors-4.1.1.1.tar.gz) = 10310
+SHA256 (cabal/bifunctors-5.tar.gz) = 41df923a03f15ba2d00335aea2409ebf48ee7585f0a1101f1ec282fe5a07298d
+SIZE (cabal/bifunctors-5.tar.gz) = 10562
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 960a9c5..6d852cd 100644
--- a/devel/hs-bits-atomic/Makefile
+++ b/devel/hs-bits-atomic/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bits-atomic
PORTVERSION= 0.1.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 87ae149..5681e08 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder-enumerator
-PORTVERSION= 0.2.0.6
-PORTREVISION= 1
+PORTVERSION= 0.2.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Enumeratees for the incremental conversion of builders to bytestrings
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1
+USE_CABAL= blaze-builder>=0.2.1.4 enumerator>=0.4.3.1 \
+ streaming-commons>=0.1.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-blaze-builder-enumerator/distinfo b/devel/hs-blaze-builder-enumerator/distinfo
index 4dee740..03c8919 100644
--- a/devel/hs-blaze-builder-enumerator/distinfo
+++ b/devel/hs-blaze-builder-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-enumerator-0.2.0.6.tar.gz) = d7cfd62b51b5c4ec82609f791a191f12dfed25476b10888b216bc69d1b0abc5d
-SIZE (cabal/blaze-builder-enumerator-0.2.0.6.tar.gz) = 3785
+SHA256 (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 50f52918a130e81971d01782ead343cdc9bfbf7270ec1e5630943e6b5d23bf96
+SIZE (cabal/blaze-builder-enumerator-0.2.1.0.tar.gz) = 4248
diff --git a/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
new file mode 100644
index 0000000..2cc38b1
--- /dev/null
+++ b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
@@ -0,0 +1,12 @@
+--- blaze-builder-enumerator.cabal.orig 2015-04-01 17:10:57 UTC
++++ blaze-builder-enumerator.cabal
+@@ -49,8 +49,7 @@ Library
+
+ if flag(newbuilder)
+ Build-depends:
+- bytestring-builder >= 0.10.4 && <0.11
+- , blaze-builder >= 0.2.1.4 && <0.5
++ blaze-builder >= 0.2.1.4 && <0.5
+ else
+ Build-depends:
+ blaze-builder >= 0.3 && <0.4
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index 8c6ba8f..d09ea06 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder
-PORTVERSION= 0.3.3.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index 1077153..2f75f60 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-builder-0.3.3.2.tar.gz) = 80b43d4a012a513c3c012de0f76858e74765e079c58d42cd6010fc185478110d
-SIZE (cabal/blaze-builder-0.3.3.2.tar.gz) = 67371
+SHA256 (cabal/blaze-builder-0.4.0.1.tar.gz) = c136ec877bb8d1558409e87b77174977ae01f8dff5bddb472df8b8d4c7e0a3c5
+SIZE (cabal/blaze-builder-0.4.0.1.tar.gz) = 57113
diff --git a/devel/hs-blaze-builder/pkg-descr b/devel/hs-blaze-builder/pkg-descr
index b0596e9..3dea556 100644
--- a/devel/hs-blaze-builder/pkg-descr
+++ b/devel/hs-blaze-builder/pkg-descr
@@ -6,4 +6,4 @@ prefetching in later processing steps (e.g. compression) and reduces the sytem
call overhead when writing the resulting lazy bytestring to a file or sending
it over the network.
-WWW: http://github.com/meiersi/blaze-builder
+WWW: http://github.com/lpsmith/blaze-builder
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index 74c4836..e34329a 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-textual
-PORTVERSION= 0.2.0.9
-PORTREVISION= 1
+PORTVERSION= 0.2.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Fast rendering of common datatypes
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1.4 text>=0.11.0.2 vector
+USE_CABAL= blaze-builder>=0.2.1.4 double-conversion>=0.2.0.1 \
+ old-locale text>=0.11.0.2 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-blaze-textual/distinfo b/devel/hs-blaze-textual/distinfo
index ee3585b..08620f5 100644
--- a/devel/hs-blaze-textual/distinfo
+++ b/devel/hs-blaze-textual/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-textual-0.2.0.9.tar.gz) = c005e4e8e33b696b7b127384e96885c1e7e66d0ee5b064bbeb330a66e50d9ebf
-SIZE (cabal/blaze-textual-0.2.0.9.tar.gz) = 6848
+SHA256 (cabal/blaze-textual-0.2.1.0.tar.gz) = 1042795ab0bab891c034c24a51bafecbb89870ccd28af39534ab3d9ae7f46c2d
+SIZE (cabal/blaze-textual-0.2.1.0.tar.gz) = 6914
diff --git a/devel/hs-bloomfilter/Makefile b/devel/hs-bloomfilter/Makefile
index f472f5f..9922815 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= bloomfilter
-PORTVERSION= 2.0.0.0
-PORTREVISION= 1
+PORTVERSION= 2.0.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/distinfo b/devel/hs-bloomfilter/distinfo
index 417ce9e..85c94c7 100644
--- a/devel/hs-bloomfilter/distinfo
+++ b/devel/hs-bloomfilter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bloomfilter-2.0.0.0.tar.gz) = ee1cff0f5ad4afd238e169277ed4467ccf02c81429de1a22d5dec65c2272d11d
-SIZE (cabal/bloomfilter-2.0.0.0.tar.gz) = 22090
+SHA256 (cabal/bloomfilter-2.0.1.0.tar.gz) = 6c5e0d357d5d39efe97ae2776e8fb533fa50c1c05397c7b85020b0f098ad790f
+SIZE (cabal/bloomfilter-2.0.1.0.tar.gz) = 22100
diff --git a/devel/hs-boxes/Makefile b/devel/hs-boxes/Makefile
index a8f6077..e77118f 100644
--- a/devel/hs-boxes/Makefile
+++ b/devel/hs-boxes/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= boxes
-PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTVERSION= 0.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo
index 8932bb3..e6d8638 100644
--- a/devel/hs-boxes/distinfo
+++ b/devel/hs-boxes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/boxes-0.1.3.tar.gz) = 78fe880778f3ee427b0ab4a4d6e7ddd194e7030d711d9ba491c8d4d3811c2aea
-SIZE (cabal/boxes-0.1.3.tar.gz) = 5347
+SHA256 (cabal/boxes-0.1.4.tar.gz) = 4e3ee9a88a28ed14a61b2c885b111922f201f56392ff68d350418ff6e98dfdd8
+SIZE (cabal/boxes-0.1.4.tar.gz) = 6481
diff --git a/devel/hs-bsd-sysctl/Makefile b/devel/hs-bsd-sysctl/Makefile
index 3d23d62..e9240b6 100644
--- a/devel/hs-bsd-sysctl/Makefile
+++ b/devel/hs-bsd-sysctl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bsd-sysctl
PORTVERSION= 1.0.7
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
index cfe0bfa..543bb55 100644
--- a/devel/hs-byteable/Makefile
+++ b/devel/hs-byteable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteable
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 83968ba..0c66707 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile
index ea57dd6..adf7ab3 100644
--- a/devel/hs-bytestring-lexing/Makefile
+++ b/devel/hs-bytestring-lexing/Makefile
@@ -2,13 +2,13 @@
# $FreeBSD$
PORTNAME= bytestring-lexing
-PORTVERSION= 0.4.3.2
+PORTVERSION= 0.5.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Parse and produce literals from strict or lazy bytestrings
-LICENSE= BSD3CLAUSE
+LICENSE= BSD2CLAUSE
USE_ALEX= yes
diff --git a/devel/hs-bytestring-lexing/distinfo b/devel/hs-bytestring-lexing/distinfo
index fd3aa82..5ad0318 100644
--- a/devel/hs-bytestring-lexing/distinfo
+++ b/devel/hs-bytestring-lexing/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/bytestring-lexing-0.4.3.2.tar.gz) = 05b0c59969e70b9e92bfcfaa0552fa0ea54f3103af670589e5c898206c78d527
-SIZE (cabal/bytestring-lexing-0.4.3.2.tar.gz) = 15975
+SHA256 (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 01f9add3f25067a89c5ae9ab1f2fd8ab75ec9f386987ee0d83f73ec855b43f73
+SIZE (cabal/bytestring-lexing-0.5.0.2.tar.gz) = 13859
diff --git a/devel/hs-bytestring-mmap/Makefile b/devel/hs-bytestring-mmap/Makefile
new file mode 100644
index 0000000..c23b2e7
--- /dev/null
+++ b/devel/hs-bytestring-mmap/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= bytestring-mmap
+PORTVERSION= 0.2.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Mmap support for strict ByteStrings
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-bytestring-mmap/distinfo b/devel/hs-bytestring-mmap/distinfo
new file mode 100644
index 0000000..93a825b
--- /dev/null
+++ b/devel/hs-bytestring-mmap/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/bytestring-mmap-0.2.2.tar.gz) = 7bbcaeeccec5cf448ba59c9ed4de95bcc47b11ae2b9bcddb6201decb88eb69af
+SIZE (cabal/bytestring-mmap-0.2.2.tar.gz) = 7188
diff --git a/devel/hs-bytestring-mmap/pkg-descr b/devel/hs-bytestring-mmap/pkg-descr
new file mode 100644
index 0000000..7d20948
--- /dev/null
+++ b/devel/hs-bytestring-mmap/pkg-descr
@@ -0,0 +1,5 @@
+This library provides a wrapper to mmap(2), allowing files or devices to
+be lazily loaded into memory as strict or lazy ByteStrings, using the
+virtual memory subsystem to do on-demand loading.
+
+WWW: http://code.haskell.org/~dons/code/bytestring-mmap/
diff --git a/devel/hs-bytestring-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index a9954ed..0cb43c1 100644
--- a/devel/hs-bytestring-nums/Makefile
+++ b/devel/hs-bytestring-nums/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-nums
PORTVERSION= 0.3.6
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index 3eb3720..ebb40e4 100644
--- a/devel/hs-bytestring-show/Makefile
+++ b/devel/hs-bytestring-show/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bytestring-show
PORTVERSION= 0.3.5.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index 8fa69a8..96771a6 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= c2hs
-PORTVERSION= 0.17.2
-PORTREVISION= 1
+PORTVERSION= 0.26.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= C->Haskell FFI tool that gives some cross-language type safety
LICENSE= GPLv2
-USE_CABAL= language-c>=0.4.2
+USE_CABAL= dlist language-c>=0.4.7 shelly>=1.0 text yaml>=0.8
XMLDOCS= doc/users_guide:html
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index a1a3c78..9c6f117 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/c2hs-0.17.2.tar.gz) = b32ff232cf59d41ed875579400f95661bf5a194b94ccf4ea935315df7e0433f7
-SIZE (cabal/c2hs-0.17.2.tar.gz) = 167739
+SHA256 (cabal/c2hs-0.26.1.tar.gz) = f0c491cca64a9d5c14eb1ea926785642b2dbbaed03144ee2e1d8d47c60985c65
+SIZE (cabal/c2hs-0.26.1.tar.gz) = 203194
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index f30c7b8..4b18119 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 1.18.0.5
-PORTREVISION= 1
+PORTVERSION= 1.22.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Command-line interface for Cabal and Hackage
LICENSE= BSD3CLAUSE
-USE_CABAL= network>=1 random>=1 HTTP>=4000.0.8 stm>=2.0 zlib>=0.5.3
+USE_CABAL= HTTP>=4000.2.5 mtl>=2.0 network>=2.6 network-uri>=2.6 \
+ random>=1 stm>=2.0 zlib>=0.5.3
STANDALONE= yes
EXECUTABLE= cabal
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index 00ea6a0..3194cae 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cabal-install-1.18.0.5.tar.gz) = 477df8ef73916e8bc23c727280a1700939131a3e2809a057668c883b0b521782
-SIZE (cabal/cabal-install-1.18.0.5.tar.gz) = 256777
+SHA256 (cabal/cabal-install-1.22.6.0.tar.gz) = 9d239e385696a7faa49f068aea451882baec6a7df26fbddbd08271c9053cb0b4
+SIZE (cabal/cabal-install-1.22.6.0.tar.gz) = 302564
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 19587c3..8915783 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cereal
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.4.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo
index c4dd560..2853ab1 100644
--- a/devel/hs-cereal/distinfo
+++ b/devel/hs-cereal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cereal-0.4.0.1.tar.gz) = 5b0adf19d17c902ecd9e875587601294f9fb47027a43b37f1ff0f52e171be289
-SIZE (cabal/cereal-0.4.0.1.tar.gz) = 22305
+SHA256 (cabal/cereal-0.4.1.1.tar.gz) = df047216179ba3817134e32c73ef9e3b5dddbd4efff604f50ca0ca0c93753097
+SIZE (cabal/cereal-0.4.1.1.tar.gz) = 22656
diff --git a/devel/hs-cereal/pkg-descr b/devel/hs-cereal/pkg-descr
index 9f81e45..99db369 100644
--- a/devel/hs-cereal/pkg-descr
+++ b/devel/hs-cereal/pkg-descr
@@ -1,7 +1,5 @@
A binary serialization library, similar to binary, that introduces an
-isolate primitive for parser isolation, and replaces the asynchronous
-errors with a user-handleable Either type. Similar to binary in
-performance, but uses a strict ByteString instead of a lazy
-ByteString, thus restricting it to operating on finite inputs.
+isolate primitive for parser isolation, and labeled blocks for better
+error messages.
WWW: http://hackage.haskell.org/package/cereal
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 125c0f4..76af9e6 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= checkers
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/distinfo b/devel/hs-checkers/distinfo
index f9b2cfd..8f64068 100644
--- a/devel/hs-checkers/distinfo
+++ b/devel/hs-checkers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/checkers-0.3.2.tar.gz) = 239bae1d36304d0e95d52dbe7340ca6a723d644910375cae80727b4dca31116d
-SIZE (cabal/checkers-0.3.2.tar.gz) = 14895
+SHA256 (cabal/checkers-0.4.3.tar.gz) = c0589321485225b7f37f108d232eb4caa42ba52afe0d28dccbe932185862c567
+SIZE (cabal/checkers-0.4.3.tar.gz) = 15022
diff --git a/devel/hs-checkers/pkg-descr b/devel/hs-checkers/pkg-descr
index aa9255c..70242e6 100644
--- a/devel/hs-checkers/pkg-descr
+++ b/devel/hs-checkers/pkg-descr
@@ -1,6 +1,6 @@
-Checkers wraps up the expected properties associated with various
-standard Haskell type classes as QuickCheck properties. Also some
-morphism properties. It also provides arbitrary instances and
-generator combinators for common data types.
+'Checkers' wraps up the expected properties associated with various
+standard type classes as QuickCheck properties. Also some morphism
+properties. It also provides arbitrary instances and generator
+combinators for common data types.
WWW: http://hackage.haskell.org/package/checkers
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
index fbfe4b5..e320c81 100644
--- a/devel/hs-chunked-data/Makefile
+++ b/devel/hs-chunked-data/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= chunked-data
-PORTVERSION= 0.1.0.1
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Typeclasses for dealing with various chunked data representations
LICENSE= MIT
-USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups \
- system-filepath text>=0.11 vector
+USE_CABAL= blaze-builder mono-traversable>=0.2 semigroups text>=0.11 \
+ vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-chunked-data/distinfo b/devel/hs-chunked-data/distinfo
index e606f0a..3f032ba 100644
--- a/devel/hs-chunked-data/distinfo
+++ b/devel/hs-chunked-data/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/chunked-data-0.1.0.1.tar.gz) = f9702c5ec695178a0de18e25dcb2e33d93ee5c7103098edbf0d0a6d86b3ab84d
-SIZE (cabal/chunked-data-0.1.0.1.tar.gz) = 4815
+SHA256 (cabal/chunked-data-0.2.0.tar.gz) = 9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272
+SIZE (cabal/chunked-data-0.2.0.tar.gz) = 4923
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 0ddd5e3..116e25f 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude-conduit
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTVERSION= 0.12.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Conduit instances for classy-prelude
LICENSE= MIT
-USE_CABAL= classy-prelude>=0.9.3 conduit>=1.0 conduit-combinators>=0.2.8 \
- monad-control resourcet system-fileio void
+USE_CABAL= classy-prelude>=0.12.0 conduit>=1.0 \
+ conduit-combinators>=0.2.8 monad-control resourcet void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index 745e0a3..02e71d9 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-conduit-0.9.3.tar.gz) = f9377aeb359bfaf6ef1374102cc907e4ac160028fb3624a3a1ddc6cf601d5473
-SIZE (cabal/classy-prelude-conduit-0.9.3.tar.gz) = 1607
+SHA256 (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7
+SIZE (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = 1598
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index f0751ad..5f910e7 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.9.3
-PORTREVISION= 1
+PORTVERSION= 0.12.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,10 @@ COMMENT= Typeclass-based Prelude
LICENSE= MIT
-USE_CABAL= basic-prelude>=0.3.8 chunked-data enclosed-exceptions \
- exceptions>=0.5 hashable lifted-base>=0.2 mono-traversable>=0.6.1 \
- semigroups stm system-filepath>=0.4 text unordered-containers \
+USE_CABAL= basic-prelude>=0.4 bifunctors chunked-data dlist>=0.7 \
+ enclosed-exceptions exceptions>=0.5 hashable lifted-base>=0.2 \
+ mono-traversable>=0.9.1 mtl mutable-containers>=0.3 primitive \
+ semigroups stm text time-locale-compat unordered-containers \
vector vector-instances
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index f15efdc9..166c94d 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/classy-prelude-0.9.3.tar.gz) = 3bea9e24259a7c7e40ac4bf066673832ae73eca7ebf8738b8256e25a47ffc61b
-SIZE (cabal/classy-prelude-0.9.3.tar.gz) = 9343
+SHA256 (cabal/classy-prelude-0.12.1.1.tar.gz) = 670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13
+SIZE (cabal/classy-prelude-0.12.1.1.tar.gz) = 10273
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index dfa6aae..901c6e0 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.9
-PORTREVISION= 1
+PORTVERSION= 0.10.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index f4415ad..13b88cc 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cmdargs-0.10.9.tar.gz) = bea251c0e5e12017062b566ad2792e40ce192b4085febe5e315bc41c85b0f08a
-SIZE (cabal/cmdargs-0.10.9.tar.gz) = 63624
+SHA256 (cabal/cmdargs-0.10.13.tar.gz) = 66117c1fadaa2a79be07998287ca7cee334c249615b0fab9b91467ad813bbf6e
+SIZE (cabal/cmdargs-0.10.13.tar.gz) = 64008
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
index 0cb31d3..c5f79cb 100644
--- a/devel/hs-conduit-combinators/Makefile
+++ b/devel/hs-conduit-combinators/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-combinators
-PORTVERSION= 0.2.8.2
-PORTREVISION= 1
+PORTVERSION= 1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,9 @@ COMMENT= Commonly used conduit functions, for both chunked and unchunked data
LICENSE= MIT
USE_CABAL= base16-bytestring base64-bytestring>=0.1.1.1 chunked-data \
- conduit>=1.0.12 conduit-extra monad-control \
+ conduit>=1.2.2 conduit-extra>=1.1.1 monad-control \
mono-traversable>=0.4 mwc-random primitive resourcet \
- streaming-commons system-fileio system-filepath text \
- transformers-base unix-compat vector void
+ text transformers-base unix-compat vector void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-conduit-combinators/distinfo b/devel/hs-conduit-combinators/distinfo
index 752e302..b8915bb 100644
--- a/devel/hs-conduit-combinators/distinfo
+++ b/devel/hs-conduit-combinators/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-combinators-0.2.8.2.tar.gz) = 0a06ff14ebad9778c1fe0f3bcc00aae587ce673a8553d2f99664c7e7c7184ff4
-SIZE (cabal/conduit-combinators-0.2.8.2.tar.gz) = 28058
+SHA256 (cabal/conduit-combinators-1.0.3.tar.gz) = 29c1f3dd854d11212474692c6c3a4158ed2929e8443ff2878eee5ea1ed6700bf
+SIZE (cabal/conduit-combinators-1.0.3.tar.gz) = 38172
diff --git a/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs b/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs
deleted file mode 100644
index 460fc8f..0000000
--- a/devel/hs-conduit-combinators/files/patch-Data__Conduit__Combinators.hs
+++ /dev/null
@@ -1,68 +0,0 @@
---- ./Data/Conduit/Combinators.hs.orig 2014-07-26 20:08:37.000000000 +0200
-+++ ./Data/Conduit/Combinators.hs 2014-07-29 14:03:36.000000000 +0200
-@@ -204,6 +204,7 @@
- import qualified Data.Sequences as Seq
- import Data.Sequences.Lazy
- import qualified Data.Vector.Generic as V
-+import qualified Data.Text as T
- import qualified Data.Vector.Generic.Mutable as VM
- import Data.Void (absurd)
- import qualified Filesystem as F
-@@ -228,6 +229,8 @@
- import qualified System.PosixCompat.Files as PosixC
- import Data.Primitive.MutVar (MutVar, newMutVar, readMutVar,
- writeMutVar)
-+import Data.Streaming.Text hiding (decodeUtf8)
-+import qualified Data.Streaming.Text as DST
-
- #ifndef WINDOWS
- import qualified System.Posix.Directory as Dir
-@@ -1646,7 +1649,47 @@
- --
- -- Since 1.0.0
- decodeUtf8Lenient :: MonadThrow m => Conduit ByteString m Text
--decodeUtf8Lenient = CT.decodeUtf8Lenient
-+decodeUtf8Lenient =
-+ decodeNew onFailure "UTF8-lenient" 0 DST.decodeUtf8
-+ where
-+ onFailure _consumed _bs t rest = do
-+ unless (T.null t) (yield t)
-+ case S.uncons rest of
-+ Nothing -> return ()
-+ Just (_, rest') -> do
-+ unless (S.null rest') (leftover rest')
-+ yield $ T.singleton '\xFFFD'
-+ decodeUtf8Lenient
-+
-+decodeNew
-+ :: Monad m
-+ => (Int -> S.ByteString -> T.Text -> S.ByteString -> Conduit S.ByteString m T.Text)
-+ -> t
-+ -> Int
-+ -> (S.ByteString -> DecodeResult)
-+ -> Conduit S.ByteString m T.Text
-+decodeNew onFailure name =
-+ loop
-+ where
-+ loop consumed dec =
-+ await >>= maybe finish go
-+ where
-+ finish =
-+ case dec S.empty of
-+ DecodeResultSuccess _ _ -> return ()
-+ DecodeResultFailure t rest -> onFailure consumed S.empty t rest
-+ {-# INLINE finish #-}
-+
-+ go bs | S.null bs = loop consumed dec
-+ go bs =
-+ case dec bs of
-+ DecodeResultSuccess t dec' -> do
-+ let consumed' = consumed + S.length bs
-+ next = do
-+ unless (T.null t) (yield t)
-+ loop consumed' dec'
-+ in consumed' `seq` next
-+ DecodeResultFailure t rest -> onFailure consumed bs t rest
-
- -- | Stream in the entirety of a single line.
- --
diff --git a/devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal b/devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal
deleted file mode 100644
index 2e01c96..0000000
--- a/devel/hs-conduit-combinators/files/patch-conduit-combinators.cabal
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./conduit-combinators.cabal.orig 2014-07-26 20:08:37.000000000 +0200
-+++ ./conduit-combinators.cabal 2014-07-29 14:01:52.000000000 +0200
-@@ -20,7 +20,7 @@
- build-depends: base >= 4 && < 5
- , chunked-data
- , conduit >= 1.0.12
-- , conduit-extra >= 1.1.1
-+ , conduit-extra
- , transformers
- , transformers-base
- , primitive
-@@ -37,6 +37,7 @@
- , base64-bytestring >= 0.1.1.1
- , resourcet
- , monad-control
-+ , streaming-commons
- if os(windows)
- cpp-options: -DWINDOWS
- else
diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile
index 94a201c..12683b5 100644
--- a/devel/hs-conduit-extra/Makefile
+++ b/devel/hs-conduit-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-extra
-PORTVERSION= 1.1.3
-PORTREVISION= 1
+PORTVERSION= 1.1.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,7 @@ LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder>=0.3 conduit>=1.1 \
monad-control network>=2.3 primitive>=0.5 resourcet>=1.1 \
- streaming-commons>=0.1.4 text transformers-base
+ stm streaming-commons>=0.1.11 text transformers-base
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-conduit-extra/distinfo b/devel/hs-conduit-extra/distinfo
index 3c6d108..50bdc24 100644
--- a/devel/hs-conduit-extra/distinfo
+++ b/devel/hs-conduit-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-extra-1.1.3.tar.gz) = 3d3ea5b83e913c8166eb94a4f2fd181e840fb8201f51f3865011d3db15bdfbbf
-SIZE (cabal/conduit-extra-1.1.3.tar.gz) = 25753
+SHA256 (cabal/conduit-extra-1.1.9.1.tar.gz) = 3f1be15bef32652caa9a98e175c95614c0f6d04ca29c35d30ddbc940a90fa0a3
+SIZE (cabal/conduit-extra-1.1.9.1.tar.gz) = 29571
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index 5a75a33..b337635 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 1.1.7
-PORTREVISION= 1
+PORTVERSION= 1.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Streaming data processing library
LICENSE= MIT
-USE_CABAL= exceptions lifted-base>=0.1 mmorph monad-control>=0.3.1 \
- mtl resourcet>=1.1 transformers-base>=0.4.1 void>=0.5.5
+USE_CABAL= exceptions>=0.6 lifted-base>=0.1 mmorph mtl resourcet>=1.1 \
+ transformers-base>=0.4.1 void>=0.5.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index 5123f21..dcde764 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/conduit-1.1.7.tar.gz) = e6d7df3ac473dabfb66bc86372a0ad15db75a3b48f7553f4b72d2e7c74846276
-SIZE (cabal/conduit-1.1.7.tar.gz) = 30175
+SHA256 (cabal/conduit-1.2.5.tar.gz) = b100cdb428731923205372dded60b6529d33728f69a0eb951a01f53c182c2a46
+SIZE (cabal/conduit-1.2.5.tar.gz) = 46805
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index 7ec4ca5..e121c37 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.3.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile
new file mode 100644
index 0000000..aa95bda
--- /dev/null
+++ b/devel/hs-constraints/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= constraints
+PORTVERSION= 0.4.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Constraint manipulation
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= newtype>=0.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo
new file mode 100644
index 0000000..1bb8e26
--- /dev/null
+++ b/devel/hs-constraints/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/constraints-0.4.1.3.tar.gz) = dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0
+SIZE (cabal/constraints-0.4.1.3.tar.gz) = 7311
diff --git a/devel/hs-constraints/pkg-descr b/devel/hs-constraints/pkg-descr
new file mode 100644
index 0000000..307e5d3
--- /dev/null
+++ b/devel/hs-constraints/pkg-descr
@@ -0,0 +1,5 @@
+GHC 7.4 gave us the ability to talk about ConstraintKinds. They stopped
+crashing the compiler in GHC 7.6. This package provides a vocabulary for
+working with them.
+
+WWW: http://github.com/ekmett/constraints/
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index d6b3391..737bdfb 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= convertible
-PORTVERSION= 1.1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.1.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Typeclasses and instances for converting between types
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl text>=0.7
+USE_CABAL= mtl old-locale old-time text>=0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-convertible/distinfo b/devel/hs-convertible/distinfo
index 7d4c407..76a4901 100644
--- a/devel/hs-convertible/distinfo
+++ b/devel/hs-convertible/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/convertible-1.1.0.0.tar.gz) = 13c4943c302700a207426aabcd6dab5a5de85de2353acacbcf4159e924f9835d
-SIZE (cabal/convertible-1.1.0.0.tar.gz) = 14087
+SHA256 (cabal/convertible-1.1.1.0.tar.gz) = e9f9a70904b9995314c2aeb41580d654a2c76293feb955fb6bd63256c355286c
+SIZE (cabal/convertible-1.1.1.0.tar.gz) = 14354
diff --git a/devel/hs-convertible/pkg-descr b/devel/hs-convertible/pkg-descr
index cf89aba..f6bfd61 100644
--- a/devel/hs-convertible/pkg-descr
+++ b/devel/hs-convertible/pkg-descr
@@ -11,4 +11,4 @@ described above. Convertible is also used by HDBC 2.0 for handling
marshalling of data to and from databases. Convertible is backed by an
extensive test suite and passes tests on GHC and Hugs.
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/convertible
+WWW: http://hackage.haskell.org/package/convertible
diff --git a/devel/hs-cpphs/Makefile b/devel/hs-cpphs/Makefile
index 8b84227..c27affa 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= cpphs
-PORTVERSION= 1.18.5
-PORTREVISION= 1
+PORTVERSION= 1.19
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Liberalised re-implementation of cpp, the C pre-processor
LICENSE= LGPL21
-USE_CABAL= polyparse>=1.9
+USE_CABAL= old-locale old-time polyparse>=1.9
EXECUTABLE= cpphs
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index 1c291b9..e79d6bd 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cpphs-1.18.5.tar.gz) = e71d9ea2c4999905f9910bbb1b947dcef1950dacb03e17c2d9bb5b3739f80e2f
-SIZE (cabal/cpphs-1.18.5.tar.gz) = 72221
+SHA256 (cabal/cpphs-1.19.tar.gz) = e05c97be645eafeed5c7475f84a02016ad56eaf67ad0a725b8ebff7fbcc73e3a
+SIZE (cabal/cpphs-1.19.tar.gz) = 44056
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 8f2c115..65fc81c 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= darcs
-PORTVERSION= 2.8.5
+PORTVERSION= 2.10.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,16 +10,18 @@ COMMENT= Distributed, interactive, smart revision control system
LICENSE= GPLv2
-USE_CABAL= hashed-storage>=0.5.6 html mtl>=1.0 parsec>=2.2 random \
- regex-compat>=0.95.1 regex-posix>=0.95.1 tar>=0.4 \
- text>=0.11.0.6 unix-compat>=0.1.2 utf8-string>=0.3.6 \
- vector>=0.7 zlib>=0.5.1.0
+USE_CABAL= attoparsec>=0.11 base16-bytestring>=0.1 cryptohash>=0.4 \
+ data-ordlist>=0.4 dataenc>=0.11 hashable>=1.0 html \
+ mmap>=0.5 mtl>=2.1 parsec>=3.1 random>=1.0 \
+ regex-applicative>=0.2 regex-compat-tdfa>=0.95.1 tar>=0.4 \
+ text>=0.11.2.0 transformers-compat>=0.4 unix-compat>=0.1.2 \
+ utf8-string>=0.3.6 vector>=0.7 zip-archive>=0.2.3 zlib>=0.5.3.0
EXECUTABLE= darcs
MAN1PAGES= darcs.1
-FLAGS_DEFINE= STATIC TERMINFO THREADED COLOR MMAP
+FLAGS_DEFINE= STATIC TERMINFO THREADED
FLAGS_MULTI= WEB
FLAGS_MULTI_WEB= CURL HTTP
WEB_DESC= HTTP backend
@@ -33,7 +35,7 @@ CURL_FLAG_LIB= libcurl.so:${PORTSDIR}/ftp/curl
HTTP_DESC= Use the pure HTTP package
HTTP_FLAG_ENABLE= http
-HTTP_FLAG_CABAL= HTTP>=4000.0.8 network>=2.2
+HTTP_FLAG_CABAL= HTTP>=4000.2.3 network>=2.6 network-uri>=2.6
STATIC_DESC= Build static binary
STATIC_FLAG_ENABLE= static
@@ -44,13 +46,6 @@ TERMINFO_FLAG_ENABLE= terminfo
THREADED_DESC= Use threading and SMP support
THREADED_FLAG_ENABLE= threaded
-COLOR_DESC= Use ANSI color escapes
-COLOR_FLAG_ENABLE= color
-
-MMAP_DESC= Compile with mmap support
-MMAP_FLAG_ENABLE= mmap
-MMAP_FLAG_CABAL= mmap>=0.5
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MCURL}
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index bee49c6..674b313 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/darcs-2.8.5.tar.gz) = 064310ed589c89500e224ad5254ab88de815c349f14f9aef9513720eb857e399
-SIZE (cabal/darcs-2.8.5.tar.gz) = 1306525
+SHA256 (cabal/darcs-2.10.1.tar.gz) = f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94
+SIZE (cabal/darcs-2.10.1.tar.gz) = 1509208
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index 887d406..ff03287 100644
--- a/devel/hs-data-default-class/Makefile
+++ b/devel/hs-data-default-class/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-class
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
index 54aef63..bec4750 100644
--- a/devel/hs-data-default-instances-base/Makefile
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-base
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
index 9d6ce12..70d4525 100644
--- a/devel/hs-data-default-instances-containers/Makefile
+++ b/devel/hs-data-default-instances-containers/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-containers
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
index 045be78..f86cd46 100644
--- a/devel/hs-data-default-instances-dlist/Makefile
+++ b/devel/hs-data-default-instances-dlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-dlist
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
index 7afb745..9da6291 100644
--- a/devel/hs-data-default-instances-old-locale/Makefile
+++ b/devel/hs-data-default-instances-old-locale/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default-instances-old-locale
PORTVERSION= 0.0.1
-PORTREVISION= 6
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Default instances for types in old-locale
LICENSE= BSD3CLAUSE
-USE_CABAL= data-default-class
+USE_CABAL= data-default-class old-locale
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 72bd215..5266420 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -2,7 +2,7 @@
PORTNAME= data-default
PORTVERSION= 0.5.3
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
index a7764e5..7ebe7de 100644
--- a/devel/hs-data-hash/Makefile
+++ b/devel/hs-data-hash/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-hash
-PORTVERSION= 0.2.0.0
-PORTREVISION= 1
+PORTVERSION= 0.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/distinfo b/devel/hs-data-hash/distinfo
index 773c4a4..9f44700 100644
--- a/devel/hs-data-hash/distinfo
+++ b/devel/hs-data-hash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-hash-0.2.0.0.tar.gz) = 35b39a4ec9efaad0c1fac2c1d5f7b6fe4717a67935a8f9d6c372bce9085bdaad
-SIZE (cabal/data-hash-0.2.0.0.tar.gz) = 8486
+SHA256 (cabal/data-hash-0.2.0.1.tar.gz) = 9117dd49013ca28ff188fc71c3595ac3af23d56d301c1f39bac93d44d8c60bbe
+SIZE (cabal/data-hash-0.2.0.1.tar.gz) = 8504
diff --git a/devel/hs-data-ordlist/Makefile b/devel/hs-data-ordlist/Makefile
new file mode 100644
index 0000000..3d7e5e7
--- /dev/null
+++ b/devel/hs-data-ordlist/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= data-ordlist
+PORTVERSION= 0.4.7.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Set and bag operations on ordered lists
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-ordlist/distinfo b/devel/hs-data-ordlist/distinfo
new file mode 100644
index 0000000..84fbd37
--- /dev/null
+++ b/devel/hs-data-ordlist/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/data-ordlist-0.4.7.0.tar.gz) = 6f6c1e7a9a9155ad78ca78cb9abd6f7e2e1c78b3e549b179dc0874e6428f490d
+SIZE (cabal/data-ordlist-0.4.7.0.tar.gz) = 8906
diff --git a/devel/hs-data-ordlist/pkg-descr b/devel/hs-data-ordlist/pkg-descr
new file mode 100644
index 0000000..846de98
--- /dev/null
+++ b/devel/hs-data-ordlist/pkg-descr
@@ -0,0 +1,3 @@
+This module provides set and multiset operations on ordered lists.
+
+WWW: http://hackage.haskell.org/package/data-ordlist
diff --git a/devel/hs-data-pprint/Makefile b/devel/hs-data-pprint/Makefile
index c059d75..5935bd5 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-pprint
-PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTVERSION= 0.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-pprint/distinfo b/devel/hs-data-pprint/distinfo
index 8867030..cc58350 100644
--- a/devel/hs-data-pprint/distinfo
+++ b/devel/hs-data-pprint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-pprint-0.2.3.tar.gz) = deb8f5b176409a7a7606486173d159cd4f55f2eaefbc2a5ba690b4948685ebf9
-SIZE (cabal/data-pprint-0.2.3.tar.gz) = 10099
+SHA256 (cabal/data-pprint-0.2.4.tar.gz) = 659bf5b10d5c177982bed9f6676a656387c70e9223ea0b1060afbe446f499864
+SIZE (cabal/data-pprint-0.2.4.tar.gz) = 10112
diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal
deleted file mode 100644
index 4354dd1..0000000
--- a/devel/hs-data-pprint/files/patch-data-pprint.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./data-pprint.cabal.orig 2013-10-19 16:24:17.000000000 +0200
-+++ ./data-pprint.cabal 2014-07-12 22:25:47.000000000 +0200
-@@ -68,7 +68,7 @@
- System.IO.Parallel
- other-modules:
- build-depends:
-- base >= 4.0 && < 4.7,
-+ base >= 4.0 && < 4.8,
- pretty >= 1.0 && < 1.2,
- mtl >= 2.0 && < 2.2,
- deepseq >= 1.1 && < 1.4,
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index 38425c3..1dda19d 100644
--- a/devel/hs-date-cache/Makefile
+++ b/devel/hs-date-cache/Makefile
@@ -2,7 +2,7 @@
PORTNAME= date-cache
PORTVERSION= 0.3.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 53a7bd6..583939a 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= datetime
-PORTVERSION= 0.2.1
-PORTREVISION= 12
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Utilities to make Data.Time.* easier to use in Haskell
+COMMENT= Utilities to make Data.Time.* easier to use
LICENSE= GPLv3
-USE_CABAL= QuickCheck>=2
+USE_CABAL= old-locale>=1.0.0.1 old-time>=1.0.0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-datetime/distinfo b/devel/hs-datetime/distinfo
index 6d65c5d..67c44c6 100644
--- a/devel/hs-datetime/distinfo
+++ b/devel/hs-datetime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/datetime-0.2.1.tar.gz) = ef67dac4cc8c2c84c164b2acec95a08f0d6d096fac6a075b11278f10371fcff9
-SIZE (cabal/datetime-0.2.1.tar.gz) = 14498
+SHA256 (cabal/datetime-0.3.1.tar.gz) = 333c7577c5051eb23d172568b9d4fe186f8b5bc750ba1d09822c275d76edbd4a
+SIZE (cabal/datetime-0.3.1.tar.gz) = 15071
diff --git a/devel/hs-datetime/pkg-descr b/devel/hs-datetime/pkg-descr
index 22749c3..5f8166f 100644
--- a/devel/hs-datetime/pkg-descr
+++ b/devel/hs-datetime/pkg-descr
@@ -1,5 +1,5 @@
-This Haskell library provides several utilities for easily converting
-among the various standard library Date and Time types, and for
-converting between these and standard external representations.
+Provides several utilities for easily converting among the various
+standard library Date and Time types, and for converting between these
+and standard external representations.
WWW: http://hackage.haskell.org/package/datetime
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
index 1cdedb4..c7ef01f 100644
--- a/devel/hs-deepseq-generics/Makefile
+++ b/devel/hs-deepseq-generics/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= deepseq-generics
-PORTVERSION= 0.1.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/distinfo b/devel/hs-deepseq-generics/distinfo
index 87caaf7..5359067 100644
--- a/devel/hs-deepseq-generics/distinfo
+++ b/devel/hs-deepseq-generics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/deepseq-generics-0.1.1.1.tar.gz) = 08e8438de375a822f38fa33ea1cd9a24e494b7f6deea0a4aa052daa5fb138cc5
-SIZE (cabal/deepseq-generics-0.1.1.1.tar.gz) = 5061
+SHA256 (cabal/deepseq-generics-0.1.1.2.tar.gz) = 839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06
+SIZE (cabal/deepseq-generics-0.1.1.2.tar.gz) = 5304
diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
new file mode 100644
index 0000000..0245d53
--- /dev/null
+++ b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
@@ -0,0 +1,11 @@
+--- deepseq-generics.cabal.orig 2014-12-17 12:16:47 UTC
++++ deepseq-generics.cabal
+@@ -42,7 +42,7 @@ source-repository head
+ library
+ default-language: Haskell2010
+ exposed-modules: Control.DeepSeq.Generics
+- build-depends: base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.4, deepseq >= 1.2.0.1 && < 1.5
++ build-depends: base >= 4.5 && < 4.9, ghc-prim >= 0.2 && < 0.5, deepseq >= 1.2.0.1 && < 1.5
+ other-extensions: BangPatterns, FlexibleContexts, TypeOperators
+ ghc-options: -Wall
+
diff --git a/devel/hs-directory-tree/Makefile b/devel/hs-directory-tree/Makefile
index f01cfbf..e9d095a 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -2,7 +2,7 @@
PORTNAME= directory-tree
PORTVERSION= 0.12.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
index 9f0aa94..fd05f71 100644
--- a/devel/hs-dlist-instances/Makefile
+++ b/devel/hs-dlist-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dlist-instances
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index bbaf84b..6288b35 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= dlist
-PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTVERSION= 0.7.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index 82ec578..a41378f 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dlist-0.7.1.tar.gz) = d9f5609dc1aa9756372a43f8f8414be6380e778754c8e7986a54906317186a8e
-SIZE (cabal/dlist-0.7.1.tar.gz) = 6137
+SHA256 (cabal/dlist-0.7.1.1.tar.gz) = 08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd
+SIZE (cabal/dlist-0.7.1.1.tar.gz) = 6161
diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile
new file mode 100644
index 0000000..1c0a16c
--- /dev/null
+++ b/devel/hs-easy-file/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= easy-file
+PORTVERSION= 0.2.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cross-platform File handling
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-easy-file/distinfo b/devel/hs-easy-file/distinfo
new file mode 100644
index 0000000..442be3e
--- /dev/null
+++ b/devel/hs-easy-file/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/easy-file-0.2.1.tar.gz) = ff86e1b29284499bea5f1d0ff539b3ed64fa6d1a06c2243ca61f93be0202e56c
+SIZE (cabal/easy-file-0.2.1.tar.gz) = 12610
diff --git a/devel/hs-easy-file/pkg-descr b/devel/hs-easy-file/pkg-descr
new file mode 100644
index 0000000..acf3df2
--- /dev/null
+++ b/devel/hs-easy-file/pkg-descr
@@ -0,0 +1,3 @@
+Cross-platform file handling for Unix/Mac/Windows.
+
+WWW: http://github.com/kazu-yamamoto/easy-file
diff --git a/devel/hs-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index 20eb068..e383af3 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= edit-distance
-PORTVERSION= 0.2.1.2
-PORTREVISION= 7
+PORTVERSION= 0.2.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/distinfo b/devel/hs-edit-distance/distinfo
index 6a1292d..85c6455 100644
--- a/devel/hs-edit-distance/distinfo
+++ b/devel/hs-edit-distance/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/edit-distance-0.2.1.2.tar.gz) = 84bcc319f4b7dc48994de082819bc656e6a001fdf40c2f7327b9a2acc2d5bd21
-SIZE (cabal/edit-distance-0.2.1.2.tar.gz) = 11335
+SHA256 (cabal/edit-distance-0.2.2.1.tar.gz) = 3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a
+SIZE (cabal/edit-distance-0.2.2.1.tar.gz) = 13228
diff --git a/devel/hs-edit-distance/pkg-descr b/devel/hs-edit-distance/pkg-descr
index 6db6f7a..48cad5b 100644
--- a/devel/hs-edit-distance/pkg-descr
+++ b/devel/hs-edit-distance/pkg-descr
@@ -1,4 +1,4 @@
Optimized edit distances for fuzzy matching, including Levenshtein and
restricted Damerau-Levenshtein algorithms.
-WWW: http://github.com/batterseapower/edit-distance
+WWW: http://github.com/phadej/edit-distance
diff --git a/devel/hs-either/Makefile b/devel/hs-either/Makefile
index bc68e7e..95f7c31 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= either
-PORTVERSION= 4.3.0.1
-PORTREVISION= 1
+PORTVERSION= 4.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT= Either monad transformer
LICENSE= BSD3CLAUSE
-USE_CABAL= exceptions>=0.5 free>=4.9 monad-control>=0.3.2 MonadRandom \
- mtl>=2.0 semigroupoids>=4 semigroups>=0.8.3.1 \
- transformers-base>=0.4
+USE_CABAL= exceptions>=0.5 free>=4.9 mmorph>=1.0.0 monad-control>=0.3.2 \
+ MonadRandom>=0.1 mtl>=2.0 profunctors>=4 semigroupoids>=4 \
+ semigroups>=0.8.3.1 transformers-base>=0.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index b4f4f67..84bef27 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/either-4.3.0.1.tar.gz) = 2e60523cabe1190389ccec1e503be6b422543084bfa114bca80efffe101266c5
-SIZE (cabal/either-4.3.0.1.tar.gz) = 7420
+SHA256 (cabal/either-4.4.1.tar.gz) = 91e57debc09bcaa7d4b884902ea6d3201ca3fec77625a059edd84bcaeb5909cb
+SIZE (cabal/either-4.4.1.tar.gz) = 9243
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
index 5a23ed0..d2306d4 100644
--- a/devel/hs-enclosed-exceptions/Makefile
+++ b/devel/hs-enclosed-exceptions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= enclosed-exceptions
-PORTVERSION= 1.0.0.2
-PORTREVISION= 1
+PORTVERSION= 1.0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enclosed-exceptions/distinfo b/devel/hs-enclosed-exceptions/distinfo
index e2eb504..bd569bc 100644
--- a/devel/hs-enclosed-exceptions/distinfo
+++ b/devel/hs-enclosed-exceptions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/enclosed-exceptions-1.0.0.2.tar.gz) = 90002c271fe779ffe054f4f65ad489beb27cc2866d9d9057e9e2c3b915c66fc9
-SIZE (cabal/enclosed-exceptions-1.0.0.2.tar.gz) = 3635
+SHA256 (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = e5236133ba5a2395fbac9f8436eb8765ede4a0a8b36341ccbb8a4cddf00c5d99
+SIZE (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = 4566
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index fbe9053..78876b4 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= enumerator
PORTVERSION= 0.4.20
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile
index ddff0ed..eaa20d8 100644
--- a/devel/hs-equivalence/Makefile
+++ b/devel/hs-equivalence/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= equivalence
-PORTVERSION= 0.2.5
-PORTREVISION= 1
+PORTVERSION= 0.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Maintaining an equivalence relation implemented as union-find using STT
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl STMonadTrans
+USE_CABAL= mtl STMonadTrans transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-equivalence/distinfo b/devel/hs-equivalence/distinfo
index 43736c0..9349edb 100644
--- a/devel/hs-equivalence/distinfo
+++ b/devel/hs-equivalence/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/equivalence-0.2.5.tar.gz) = 03969a9a89bc90a4d282b33f37442060425229517c4c67fd2dd29e1cd04e9904
-SIZE (cabal/equivalence-0.2.5.tar.gz) = 8013
+SHA256 (cabal/equivalence-0.3.1.tar.gz) = 7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e
+SIZE (cabal/equivalence-0.3.1.tar.gz) = 8350
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index 316eb44..a5029c3 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= errors
-PORTVERSION= 1.4.7
-PORTREVISION= 1
+PORTVERSION= 2.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Simplified error-handling
LICENSE= BSD3CLAUSE
-USE_CABAL= either>=3.1 safe>=0.3.3
+USE_CABAL= safe>=0.3.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo
index 2d963a2..f846dda 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/errors-1.4.7.tar.gz) = 8732ebeae477feeb5b669532bc6ffc985f7b115e13fe823bbc816b4e7d1be525
-SIZE (cabal/errors-1.4.7.tar.gz) = 7922
+SHA256 (cabal/errors-2.0.0.tar.gz) = 4527db37c2560b9b3a96eab58c632bf1fbb5e2d530b378eb9043ecedb0de4703
+SIZE (cabal/errors-2.0.0.tar.gz) = 8051
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index fe570c9..383bf7f 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= exceptions
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.8.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Extensible optionally-pure exceptions
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0
+USE_CABAL= mtl>=2.0 stm>=2.2 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo
index 6b64d99..7e31169 100644
--- a/devel/hs-exceptions/distinfo
+++ b/devel/hs-exceptions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/exceptions-0.6.1.tar.gz) = f56b3f97f5ad49c6e7efde386683ec52c8c4b853bbdda068690e913db52c5b26
-SIZE (cabal/exceptions-0.6.1.tar.gz) = 11392
+SHA256 (cabal/exceptions-0.8.0.2.tar.gz) = 070a3e0d1495243770fb3a629d5187ce898f069cb3621c5f7c610ae264982bf4
+SIZE (cabal/exceptions-0.8.0.2.tar.gz) = 12241
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 3bfecb7..4368706 100644
--- a/devel/hs-extensible-exceptions/Makefile
+++ b/devel/hs-extensible-exceptions/Makefile
@@ -2,7 +2,7 @@
PORTNAME= extensible-exceptions
PORTVERSION= 0.1.1.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile
new file mode 100644
index 0000000..848f063
--- /dev/null
+++ b/devel/hs-extra/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= extra
+PORTVERSION= 1.4.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Extra functions
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-extra/distinfo b/devel/hs-extra/distinfo
new file mode 100644
index 0000000..10c9ac0
--- /dev/null
+++ b/devel/hs-extra/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/extra-1.4.1.tar.gz) = e02ca751533eb44b221a8e6250c70a125627be8fc1c9711092dc3d2668f2d001
+SIZE (cabal/extra-1.4.1.tar.gz) = 31235
diff --git a/devel/hs-extra/pkg-descr b/devel/hs-extra/pkg-descr
new file mode 100644
index 0000000..9507a27
--- /dev/null
+++ b/devel/hs-extra/pkg-descr
@@ -0,0 +1,10 @@
+A library of extra functions for the standard Haskell libraries. Most
+functions are simple additions, filling out missing functionality. A few
+functions are available in later versions of GHC, but this package makes
+them available back to GHC 7.2. The module "Extra" documents all functions
+provided by this library. Modules such as "Data.List.Extra" provide extra
+functions over "Data.List" and also reexport "Data.List". Users are
+recommended to replace "Data.List" imports with "Data.List.Extra" if they
+need the extra functionality.
+
+WWW: https://github.com/ndmitchell/extra#readme
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index e90b97d..41139b2 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fast-logger
-PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTVERSION= 2.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Fast logging system
LICENSE= BSD3CLAUSE
-USE_CABAL= auto-update blaze-builder text
+USE_CABAL= auto-update>=0.1.2 text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fast-logger/distinfo b/devel/hs-fast-logger/distinfo
index 5e8025b..1e2a7ad 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fast-logger-2.2.0.tar.gz) = 3973fbc26e028e5547c5c4405e006d8b8e4173ef244eae1ca4cdf1b78f2bec09
-SIZE (cabal/fast-logger-2.2.0.tar.gz) = 6205
+SHA256 (cabal/fast-logger-2.4.1.tar.gz) = e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e
+SIZE (cabal/fast-logger-2.4.1.tar.gz) = 6211
diff --git a/devel/hs-fast-logger/files/patch-fast-logger.cabal b/devel/hs-fast-logger/files/patch-fast-logger.cabal
new file mode 100644
index 0000000..3f9ce7c
--- /dev/null
+++ b/devel/hs-fast-logger/files/patch-fast-logger.cabal
@@ -0,0 +1,10 @@
+--- fast-logger.cabal.orig 2015-07-06 02:52:26 UTC
++++ fast-logger.cabal
+@@ -23,7 +23,6 @@ Library
+ , array
+ , auto-update >= 0.1.2
+ , bytestring
+- , bytestring-builder
+ , directory
+ , filepath
+ , text
diff --git a/devel/hs-fgl/Makefile b/devel/hs-fgl/Makefile
index 90e4c61..937cd5b 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= fgl
-PORTVERSION= 5.5.0.1
-PORTREVISION= 1
+PORTVERSION= 5.5.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,5 @@ COMMENT= Martin Erwig Functional Graph Library
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index f26e2d6..42f437b 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fgl-5.5.0.1.tar.gz) = aa61664ba38db3e54124b702b1ee92a72a569c981b759e48cfb567078b038763
-SIZE (cabal/fgl-5.5.0.1.tar.gz) = 35963
+SHA256 (cabal/fgl-5.5.2.1.tar.gz) = 0c2e745b7c2532f67b87a1c97ef016dca7444113d3901722c48c3193e71bd5d9
+SIZE (cabal/fgl-5.5.2.1.tar.gz) = 51963
diff --git a/devel/hs-fgl/pkg-descr b/devel/hs-fgl/pkg-descr
index 9b3f068..d07d29b 100644
--- a/devel/hs-fgl/pkg-descr
+++ b/devel/hs-fgl/pkg-descr
@@ -1,3 +1,3 @@
-Martin Erwig's Functional Graph Library.
+An inductive representation of manipulating graph data structures.
-WWW: http://web.engr.oregonstate.edu/~erwig/fgl/haskell
+WWW: http://hackage.haskell.org/package/fgl
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index 3faf165..ccc2968 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= file-embed
-PORTVERSION= 0.0.7
-PORTREVISION= 1
+PORTVERSION= 0.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index 7f3d2f6..1f6cd82 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/file-embed-0.0.7.tar.gz) = 4f4489207dcfeb5eafd699e51442ad4e49f535323c95cebee4e8cce4c0714856
-SIZE (cabal/file-embed-0.0.7.tar.gz) = 4283
+SHA256 (cabal/file-embed-0.0.9.tar.gz) = 58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005
+SIZE (cabal/file-embed-0.0.9.tar.gz) = 5624
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 25a16c8..5b1dd78 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= filemanip
-PORTVERSION= 0.3.6.2
-PORTREVISION= 8
+PORTVERSION= 0.3.6.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/distinfo b/devel/hs-filemanip/distinfo
index 0d2855e..6ea5003 100644
--- a/devel/hs-filemanip/distinfo
+++ b/devel/hs-filemanip/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filemanip-0.3.6.2.tar.gz) = 3f93da5faa33d675b1a64a90a262c2decfd3d28924f0a4bfb7c691053309810e
-SIZE (cabal/filemanip-0.3.6.2.tar.gz) = 10192
+SHA256 (cabal/filemanip-0.3.6.3.tar.gz) = 8836da17baaaf02ca080c9990ece4e0b0c8d6a128f458f8b64fd07b225ca9846
+SIZE (cabal/filemanip-0.3.6.3.tar.gz) = 10369
diff --git a/devel/hs-filestore/Makefile b/devel/hs-filestore/Makefile
index f549dda..6fcbe68 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6.0.3
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Interface for versioning file stores
LICENSE= BSD3CLAUSE
-USE_CABAL= Diff>=0.2 parsec>=2 split>=0.1 utf8-string>=0.3 xml>=1.3
+USE_CABAL= Diff>=0.2 old-locale>=1.0 parsec>=2 split>=0.1 \
+ utf8-string>=0.3 xml>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index 82ab670..df9d1c9 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/filestore-0.6.0.3.tar.gz) = 0006c8d3e43821ece6661336c9f9926e1db19808bdc976cf3adb858bd9d8150f
-SIZE (cabal/filestore-0.6.0.3.tar.gz) = 29910
+SHA256 (cabal/filestore-0.6.1.tar.gz) = 0009c97f00044d2902209050d3b85a32dbad656ad0bb6276e811d7b0aca5d455
+SIZE (cabal/filestore-0.6.1.tar.gz) = 31837
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
index 87b3e84..86194dc 100644
--- a/devel/hs-free/Makefile
+++ b/devel/hs-free/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= free
-PORTVERSION= 4.9
-PORTREVISION= 1
+PORTVERSION= 4.12.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT= Monads for free
LICENSE= BSD3CLAUSE
-USE_CABAL= bifunctors comonad distributive>=0.2.1 mtl>=2.0.1.0 \
- prelude-extras>=0.4 profunctors semigroupoids \
- semigroups>=0.8.3.1
+USE_CABAL= bifunctors>=4 comonad>=4 distributive>=0.2.1 exceptions>=0.6 \
+ mtl>=2.0.1.0 prelude-extras>=0.4 profunctors>=4 \
+ semigroupoids>=4 semigroups>=0.8.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo
index 2c157b7..e523078 100644
--- a/devel/hs-free/distinfo
+++ b/devel/hs-free/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/free-4.9.tar.gz) = dd3292f587e96cf5337aa7d46ca685bbeba34b6f1632555482f39298ba4aea06
-SIZE (cabal/free-4.9.tar.gz) = 43414
+SHA256 (cabal/free-4.12.1.tar.gz) = 376559042204e56bcd1152f04bf01079118c6ccba5e0cf8344de929537bc286b
+SIZE (cabal/free-4.12.1.tar.gz) = 49736
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 9e91dfe..72bad04 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= fsnotify
-PORTVERSION= 0.1.0.3
-PORTREVISION= 1
+PORTVERSION= 0.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Cross-platform library for file system notifications
LICENSE= BSD3CLAUSE
-USE_CABAL= async>=2.0.1 hinotify>=0.3.7 system-fileio>=0.3.8 \
- system-filepath>=0.4.6 text>=0.11.0
+USE_CABAL= async>=2.0.1 hinotify>=0.3.7 text>=0.11.0 unix-compat>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 05cdbe7..1dc69d4 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/fsnotify-0.1.0.3.tar.gz) = 1f15cc1380d3feaf12f4d7fed23a2327e0927ac69e3f3ae539637e55c8f3d254
-SIZE (cabal/fsnotify-0.1.0.3.tar.gz) = 14116
+SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b
+SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689
diff --git a/devel/hs-fsnotify/pkg-descr b/devel/hs-fsnotify/pkg-descr
index 55616f3..ed087a7 100644
--- a/devel/hs-fsnotify/pkg-descr
+++ b/devel/hs-fsnotify/pkg-descr
@@ -2,4 +2,4 @@ Cross-platform library for file creation, modification, and deletion
notification. This library builds upon existing libraries for
platform-specific Window, Mac, and Linux file system event notification.
-WWW: http://hackage.haskell.org/package/fsnotify
+WWW: https://github.com/haskell-fswatch/hfsnotify
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 20896d4..365f105 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gconf
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
+PORTVERSION= 0.13.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GNOME configuration database system
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12.5.0 gtk2hs-buildtools
+USE_CABAL= glib>=0.13.0.0 gtk2hs-buildtools text>=0.11.0.6
USE_GNOME= gconf2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-gconf/distinfo b/devel/hs-gconf/distinfo
index 6e3486a..bccf100 100644
--- a/devel/hs-gconf/distinfo
+++ b/devel/hs-gconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gconf-0.12.5.0.tar.gz) = 075b4cbd9797dcf555b24bc1f3310ebddabd60eb096b996a5104dda0afdbed34
-SIZE (cabal/gconf-0.12.5.0.tar.gz) = 34938
+SHA256 (cabal/gconf-0.13.0.2.tar.gz) = 930ac96d4e46d6fc8f5fb9c5a19ff79695f8d01fa3a110da25f1ba95828add77
+SIZE (cabal/gconf-0.13.0.2.tar.gz) = 35926
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 11a6460..3802562 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= generic-deriving
-PORTVERSION= 1.6.3
-PORTREVISION= 1
+PORTVERSION= 1.8.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index 90e9abb..4cfb6fb 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/generic-deriving-1.6.3.tar.gz) = c738b1947aa2cc86a8baf68b7f0e73a10489738bb51cbb1636c3c1ab0af59211
-SIZE (cabal/generic-deriving-1.6.3.tar.gz) = 25268
+SHA256 (cabal/generic-deriving-1.8.0.tar.gz) = 26b3d927c1341e372118c976d4d8b33a7c4a42ec657734ef9b4653ab1aa486cd
+SIZE (cabal/generic-deriving-1.8.0.tar.gz) = 29935
diff --git a/devel/hs-geniplate/Makefile b/devel/hs-geniplate-mirror/Makefile
index 5cb3a38..4ff2868 100644
--- a/devel/hs-geniplate/Makefile
+++ b/devel/hs-geniplate-mirror/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
-PORTNAME= geniplate
-PORTVERSION= 0.6.0.4
-PORTREVISION= 1
+PORTNAME= geniplate-mirror
+PORTVERSION= 0.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Use template Haskell to generate Uniplate-like functions
+COMMENT= Use Template Haskell to generate Uniplate-like functions
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-geniplate-mirror/distinfo b/devel/hs-geniplate-mirror/distinfo
new file mode 100644
index 0000000..4cf96ad
--- /dev/null
+++ b/devel/hs-geniplate-mirror/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/geniplate-mirror-0.7.1.tar.gz) = 60d4b0a0d01a93ee9188eb52d39803d9c2c814d321f95acfb0fdb8c7c075e773
+SIZE (cabal/geniplate-mirror-0.7.1.tar.gz) = 9259
diff --git a/devel/hs-geniplate-mirror/pkg-descr b/devel/hs-geniplate-mirror/pkg-descr
new file mode 100644
index 0000000..33fcbd4
--- /dev/null
+++ b/devel/hs-geniplate-mirror/pkg-descr
@@ -0,0 +1,3 @@
+Use Template Haskell to generate Uniplate-like functions.
+
+WWW: https://github.com/danr/geniplate
diff --git a/devel/hs-geniplate/distinfo b/devel/hs-geniplate/distinfo
deleted file mode 100644
index ec4ecab..0000000
--- a/devel/hs-geniplate/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/geniplate-0.6.0.4.tar.gz) = 40ec6e1296d54b1cb789a17fbddfc48d230f08bdc5bce2e1ddb5ad6f875e81eb
-SIZE (cabal/geniplate-0.6.0.4.tar.gz) = 6819
diff --git a/devel/hs-geniplate/pkg-descr b/devel/hs-geniplate/pkg-descr
deleted file mode 100644
index 32cc193..0000000
--- a/devel/hs-geniplate/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Use template Haskell to generate Uniplate-like functions.
-
-WWW: http://hackage.haskell.org/package/geniplate
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index d8ee111..e3bc987 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ghc-events
-PORTVERSION= 0.4.3.0
-PORTREVISION= 1
+PORTVERSION= 0.4.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Library and tool for parsing .eventlog files from GHC
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=1.1
+USE_CABAL= mtl>=2.2.1
EXECUTABLE= ghc-events
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index b10cacd..49f9790 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ghc-events-0.4.3.0.tar.gz) = f94743d5b5ef86a347414bc2d87e66525173d580ae32a6228861a30b43311789
-SIZE (cabal/ghc-events-0.4.3.0.tar.gz) = 69875
+SHA256 (cabal/ghc-events-0.4.4.0.tar.gz) = ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d
+SIZE (cabal/ghc-events-0.4.4.0.tar.gz) = 102944
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index d6f1fb8..826d267 100644
--- a/devel/hs-ghc-mtl/Makefile
+++ b/devel/hs-ghc-mtl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ghc-mtl
PORTVERSION= 1.2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index b69e7cd..0bcd5f8 100644
--- a/devel/hs-ghc-paths/Makefile
+++ b/devel/hs-ghc-paths/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ghc-paths
PORTVERSION= 0.1.0.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 4d463c2..5c4930c 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gio
-PORTVERSION= 0.12.5.3
-PORTREVISION= 1
+PORTVERSION= 0.13.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GIO
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12.5.3 mtl
+USE_CABAL= glib>=0.13.0.0 mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-gio/distinfo b/devel/hs-gio/distinfo
index 02f158e..67620fc 100644
--- a/devel/hs-gio/distinfo
+++ b/devel/hs-gio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gio-0.12.5.3.tar.gz) = 8cfbfe99d3c019d8f804717ebaefdbe6bccc95238b83e9ea0a1c8c0a548d3ad9
-SIZE (cabal/gio-0.12.5.3.tar.gz) = 79099
+SHA256 (cabal/gio-0.13.1.0.tar.gz) = b274b121b7814d25e0125f3129287a2407c83f458731040297a6fc6ebf6cabe3
+SIZE (cabal/gio-0.13.1.0.tar.gz) = 79367
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 2b43917..41bcba9 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 5.20140817
-PORTREVISION= 1
+PORTVERSION= 5.20150727
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,12 +10,12 @@ COMMENT= Manage files with git, without checking their contents into git
LICENSE= GPLv3
-USE_CABAL= MissingH hslogger utf8-string network>=2.0 mtl>=2 HTTP \
- extensible-exceptions exceptions>=0.5 dataenc SHA json \
- monad-control MonadCatchIO-transformers IfElse text \
- QuickCheck>=2.1 bloomfilter edit-distance SafeSemaphore \
- uuid random dlist unix-compat aeson data-default \
- case-insensitive
+USE_CABAL= optparse-applicative>=0.10 cryptohash>=0.11.0 exceptions>=0.6 \
+ QuickCheck>=2.1 stm>=2.3 mtl>=2 data-default case-insensitive \
+ uuid random dlist unix-compat SafeSemaphore async IfElse \
+ MissingH hslogger monad-logger utf8-string text sandi json \
+ monad-control bloomfilter edit-distance resourcet aws>=0.9.2 \
+ http-conduit http-types network>=2.6 network-uri>=2.6
USES= gmake perl5
USE_PERL5= build
@@ -35,9 +34,10 @@ EXECUTABLE= git-annex git-annex-shell
STANDALONE= yes
FLAGS_DEFINE= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
- XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE CRYPTOHASH EKG
+ XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DESKTOPNOTIFY \
+ TORRENTPARSER EKG DATABASE
FLAGS_DEFAULT= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
- XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE CRYPTOHASH
+ XMPP DNS PRODUCTION TDFA FEED QUVI TAHOE DATABASE
S3_DESC= S3 support
S3_FLAG_ENABLE= S3
@@ -45,19 +45,18 @@ S3_FLAG_CABAL= hS3
ASSISTANT_DESC= 'assistant' and 'watch' commands
ASSISTANT_FLAG_ENABLE= Assistant
-ASSISTANT_FLAG_CABAL= async stm>=2.3
INOTIFY_DESC= File system notifications support
INOTIFY_FLAG_ENABLE= Inotify
-INOTIFY_FLAG_CABAL= kqueue
+INOTIFY_FLAG_CABAL= hinotify
WEBAPP_DESC= Web application (requires assistant)
WEBAPP_FLAG_DEPENDS= ASSISTANT
WEBAPP_FLAG_ENABLE= Webapp
-WEBAPP_FLAG_CABAL= yesod yesod-static yesod-static yesod-form yesod-core \
- case-insensitive http-types wai wai-logger warp \
- blaze-builder crypto-api shakespeare clientsession \
- data-default warp-tls path-pieces
+WEBAPP_FLAG_CABAL= yesod>=1.2.6 yesod-static>=1.2.4 yesod-form>=1.3.15 \
+ yesod-core>=1.2.19 path-pieces>=0.1.4 warp>=3.0.05 \
+ warp-tls wai wai-extra blaze-builder crypto-api \
+ clientsession aeson shakespeare>=2.0.0
WEBAPP_SECURE_DESC= Secure webapp (requires webbapp)
WEBAPP_SECURE_FLAG_DEPENDS= WEBAPP
@@ -98,17 +97,25 @@ QUVI_DESC= quvi to download videos
QUVI_FLAG_ENABLE= Quvi
QUVI_FLAG_CABAL= aeson
-CRYPTOHASH_DESC= cryptohash for checksumming
-CRYPTOHASH_FLAG_ENABLE= CryptoHash
-CRYPTOHASH_FLAG_CABAL= cryptohash>=0.10.0
+TAHOE_DESC= Tahoe special remote
+TAHOE_FLAG_ENABLE= Tahoe
+TAHOE_FLAG_CABAL= aeson
+
+DESKTOPNOTIFY_DESC= Desktop environment notifications
+DESKTOPNOTIFY_FLAG_ENABLE= DesktopNotify
+
+TORRENTPARSER_DESC= Use haskell torrent library to parse torrent files
+TORRENTPARSER_FLAG_ENABLE= TorrentParser
+TORRENTPARSER_FLAG_CABAL= torrent>=10000.0.0
EKG_DESC= EKG for run-time monitoring
EKG_FLAG_ENABLE= EKG
EKG_FLAG_CABAL= ekg
-TAHOE_DESC= Enable the tahoe special remote
-TAHOE_FLAG_ENABLE= Tahoe
-TAHOE_FLAG_CABAL= aeson
+DATABASE_DESC= Build with persistent for database use
+DATABASE_FLAG_ENABLE= Database
+DATABASE_FLAG_CABAL= esqueleto persistent-sqlite persistent \
+ persistent-template
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-git-annex/distinfo b/devel/hs-git-annex/distinfo
index b7e575c..1cc0fbc 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/git-annex-5.20140817.tar.gz) = acc3c1ef2875b16864448b6d00f204a7fc5eb268ea7dfd678c1814d1720a9e32
-SIZE (cabal/git-annex-5.20140817.tar.gz) = 4464505
+SHA256 (cabal/git-annex-5.20150727.tar.gz) = 9826836bd0eb4e35be8664862405afbf2ff4dff9a643b2f8ec61c295bd16099f
+SIZE (cabal/git-annex-5.20150727.tar.gz) = 5095110
diff --git a/devel/hs-git-annex/files/patch-Setup.hs b/devel/hs-git-annex/files/patch-Setup.hs
index e08c40a..9691658 100644
--- a/devel/hs-git-annex/files/patch-Setup.hs
+++ b/devel/hs-git-annex/files/patch-Setup.hs
@@ -1,14 +1,14 @@
---- ./Setup.hs.orig 2014-01-22 21:23:18.000000000 +0100
-+++ ./Setup.hs 2014-07-10 21:52:00.000000000 +0200
-@@ -19,6 +19,7 @@
- main = defaultMainWithHooks simpleUserHooks
- { preConf = configure
+--- Setup.hs.orig 2015-07-27 16:25:52 UTC
++++ Setup.hs
+@@ -23,6 +23,7 @@ main = defaultMainWithHooks simpleUserHo
+ Configure.run Configure.tests
+ return (Nothing, [])
, postInst = myPostInst
+ , postCopy = myPostCopy
}
- configure _ _ = do
-@@ -34,6 +35,15 @@
+ myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
+@@ -34,6 +35,15 @@ myPostInst _ (InstallFlags { installVerb
dest = NoCopyDest
verbosity = fromFlag installVerbosity
@@ -24,17 +24,21 @@
installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
installGitAnnexShell copyDest verbosity pkg lbi =
rawSystemExit verbosity "ln"
-@@ -50,7 +60,7 @@
+@@ -50,14 +60,14 @@ installManpages :: CopyDest -> Verbosity
installManpages copyDest verbosity pkg lbi =
installOrdinaryFiles verbosity dstManDir =<< srcManpages
where
- dstManDir = mandir (absoluteInstallDirs pkg lbi copyDest) </> "man1"
+ dstManDir = prefix (absoluteInstallDirs pkg lbi copyDest) </> "man" </> "man1"
srcManpages = zip (repeat srcManDir)
- <$> filterM doesFileExist manpages
- srcManDir = ""
-@@ -60,4 +70,4 @@
- installDesktopFile copyDest verbosity pkg lbi =
+- <$> filterM doesFileExist manpages
+- srcManDir = ""
++ <$> filterM (doesFileExist . (srcManDir </>)) manpages
++ srcManDir = "man"
+ manpages = ["git-annex.1", "git-annex-shell.1"]
+
+ installDesktopFile :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
+ installDesktopFile copyDest _verbosity pkg lbi =
DesktopFile.install $ dstBinDir </> "git-annex"
where
- dstBinDir = bindir $ absoluteInstallDirs pkg lbi copyDest
diff --git a/devel/hs-git-annex/files/patch-Utility__Yesod.hs b/devel/hs-git-annex/files/patch-Utility__Yesod.hs
deleted file mode 100644
index 2dd51c6..0000000
--- a/devel/hs-git-annex/files/patch-Utility__Yesod.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Utility/Yesod.hs.orig 2013-07-09 22:04:16.000000000 +0200
-+++ ./Utility/Yesod.hs 2013-07-16 12:02:57.000000000 +0200
-@@ -31,7 +31,7 @@
- #ifndef __ANDROID__
- import Yesod.Default.Util
- import Language.Haskell.TH.Syntax (Q, Exp)
--#if MIN_VERSION_yesod_default(1,1,0)
-+#if MIN_VERSION_yesod(1,2,0)
- import Data.Default (def)
- import Text.Hamlet hiding (Html)
- #endif
-@@ -39,7 +39,7 @@
-
- #ifndef __ANDROID__
- widgetFile :: String -> Q Exp
--#if ! MIN_VERSION_yesod_default(1,1,0)
-+#if ! MIN_VERSION_yesod(1,2,0)
- widgetFile = widgetFileNoReload
- #else
- widgetFile = widgetFileNoReload $ def
diff --git a/devel/hs-git-annex/files/patch-git-annex.cabal b/devel/hs-git-annex/files/patch-git-annex.cabal
index b9fb976..fb102a0 100644
--- a/devel/hs-git-annex/files/patch-git-annex.cabal
+++ b/devel/hs-git-annex/files/patch-git-annex.cabal
@@ -1,16 +1,13 @@
---- ./git-annex.cabal.orig 2014-08-17 16:50:18.000000000 +0200
-+++ ./git-annex.cabal 2014-08-25 13:15:46.000000000 +0200
-@@ -185,10 +185,11 @@
+--- git-annex.cabal.orig 2015-07-27 16:25:52 UTC
++++ git-annex.cabal
+@@ -218,9 +218,9 @@ Executable git-annex
CPP-Options: -DANDROID_SPLICES
if flag(Webapp)
+ extensions: TemplateHaskell
Build-Depends:
-- yesod, yesod-default, yesod-static, yesod-form, yesod-core,
-+ yesod (>= 1.2), yesod-static, yesod-form, yesod-core,
- wai, wai-extra, warp, warp-tls,
-- blaze-builder, crypto-api, hamlet, clientsession,
-+ blaze-builder, crypto-api, clientsession,
- template-haskell, data-default, aeson, path-pieces,
- shakespeare
- CPP-Options: -DWITH_WEBAPP
+ yesod (>= 1.2.6),
+- yesod-default (>= 1.2.0),
+ yesod-static (>= 1.2.4),
+ yesod-form (>= 1.3.15),
+ yesod-core (>= 1.2.19),
diff --git a/devel/hs-git-annex/pkg-descr b/devel/hs-git-annex/pkg-descr
index 177cad8..90cb501 100644
--- a/devel/hs-git-annex/pkg-descr
+++ b/devel/hs-git-annex/pkg-descr
@@ -1,12 +1,19 @@
-git-annex allows managing files with git, without checking the file contents
-into git. While that may seem paradoxical, it is useful when dealing with
-files larger than git can currently easily handle, whether due to limitations
-in memory, time, or disk space. Even without file content tracking, being
-able to manage files with git, move files around and delete files with
-versioned directory trees, and use branches and distributed clones, are
-all very handy reasons to use git. And annexed files can co-exist in the
-same git repository with regularly versioned files, which is convenient
-for maintaining documents, Makefiles, etc that are associated with annexed
-files but that benefit from full revision control.
+git-annex allows managing files with git, without checking the file
+contents into git. While that may seem paradoxical, it is useful when
+dealing with files larger than git can currently easily handle, whether
+due to limitations in memory, time, or disk space.
+
+It can store large files in many places, from local hard drives, to a
+large number of cloud storage services, including S3, WebDAV, and rsync,
+with a dozen cloud storage providers usable via plugins. Files can be
+stored encrypted with gpg, so that the cloud storage provider cannot see
+your data. git-annex keeps track of where each file is stored, so it
+knows how many copies are available, and has many facilities to ensure
+your data is preserved.
+
+git-annex can also be used to keep a folder in sync between computers,
+noticing when files are changed, and automatically committing them to
+git and transferring them to other computers. The git-annex webapp
+makes it easy to set up and use git-annex this way.
WWW: http://git-annex.branchable.com/
diff --git a/devel/hs-glade/Makefile b/devel/hs-glade/Makefile
deleted file mode 100644
index 90b322f..0000000
--- a/devel/hs-glade/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= glade
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Binding to the glade library
-
-LICENSE= LGPL21
-
-USES= pkgconfig
-USE_CABAL= glib>=0.12.5.0 gtk>=0.12.5.0
-USE_GNOME= libglade2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-glade/distinfo b/devel/hs-glade/distinfo
deleted file mode 100644
index ca737bc..0000000
--- a/devel/hs-glade/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/glade-0.12.5.0.tar.gz) = 79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435
-SIZE (cabal/glade-0.12.5.0.tar.gz) = 152942
diff --git a/devel/hs-glade/pkg-descr b/devel/hs-glade/pkg-descr
deleted file mode 100644
index 17cbfe6..0000000
--- a/devel/hs-glade/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This library allows to load externally stored user interfaces into programs.
-This allows alteration of the interface without recompilation of the program.
-
-WWW: http://www.haskell.org/gtk2hs/
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index b24cf9a..ee5031e 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 0.12.5.4
-PORTREVISION= 1
+PORTVERSION= 0.13.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GLIB library for Gtk2Hs
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= utf8-string>=0.2 gtk2hs-buildtools
+USE_CABAL= gtk2hs-buildtools text>=1.0.0.0 utf8-string>=0.2
USE_GNOME= glib20
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 004653d..6d08348 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/glib-0.12.5.4.tar.gz) = e63346df27cb45aa7c76bfffe5ba81bb5332b48bde4ccbe931183e5d357378c9
-SIZE (cabal/glib-0.12.5.4.tar.gz) = 46080
+SHA256 (cabal/glib-0.13.1.1.tar.gz) = e494b416ee7b80743af586edf5f7f497b4ce5eae6c070ec12b0e9ec5b99b43f1
+SIZE (cabal/glib-0.13.1.1.tar.gz) = 48228
diff --git a/devel/hs-glib/pkg-descr b/devel/hs-glib/pkg-descr
index eae843a..70de5d0 100644
--- a/devel/hs-glib/pkg-descr
+++ b/devel/hs-glib/pkg-descr
@@ -1,6 +1,7 @@
-The GNU Library is a collection of C data structures and utility function
-for dealing with Unicode. This package only binds as much functionality
-as required to support the packages that wrap libraries that are themselves
-based on GLib.
+GLib is a collection of C data structures and utility functions for the
+GObject system, main loop implementation, for strings and common data
+structures dealing with Unicode. This package only binds as much
+functionality as required to support the packages that wrap libraries
+that are themselves based on GLib.
WWW: http://projects.haskell.org/gtk2hs/
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index a4e8ac6..55b8bd1 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.12.5.2
-PORTREVISION= 2
+PORTVERSION= 0.13.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= hashtables random
USE_ALEX= yes
USE_HAPPY= yes
-EXECUTABLE= gtk2hsTypeGen gtk2hsHookGenerator gtk2hsC2hs
+EXECUTABLE= gtk2hsC2hs gtk2hsHookGenerator gtk2hsTypeGen
STANDALONE= yes
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 6a0c90a..02392bc 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtk2hs-buildtools-0.12.5.2.tar.gz) = 3c7a0c106acaad01b9816c13755687c650bbcdaa1112da43eb89461c277795f0
-SIZE (cabal/gtk2hs-buildtools-0.12.5.2.tar.gz) = 169072
+SHA256 (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 2a24c2d4124ec046800326922807ab457e2beaf0ffb320162687e1475dbe3510
+SIZE (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 169272
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
deleted file mode 100644
index 8892f37..0000000
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- c2hs/toplevel/C2HSConfig.hs.orig 2014-04-13 05:14:06 UTC
-+++ c2hs/toplevel/C2HSConfig.hs
-@@ -70,7 +70,7 @@ cpp = case os of
- cppopts :: [String]
- cppopts = case (os,cpp) of
- ("openbsd","cpp") -> ["-xc", "-w"]
-- (_,"cpp") -> ["-x", "c", "-w"]
-+ (_,"cpp") -> ["-x", "c", "-P", "-w"]
- (_,"gcc") -> ["-E", "-x", "c", "-w"]
- _ -> []
-
diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile
new file mode 100644
index 0000000..2ec7d93
--- /dev/null
+++ b/devel/hs-haddock-api/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= haddock-api
+PORTVERSION= 2.16.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Documentation-generation tool for Haskell libraries
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= ghc-paths haddock-library>=1.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo
new file mode 100644
index 0000000..1d7a4bb
--- /dev/null
+++ b/devel/hs-haddock-api/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/haddock-api-2.16.1.tar.gz) = e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea
+SIZE (cabal/haddock-api-2.16.1.tar.gz) = 125372
diff --git a/devel/hs-haddock-api/pkg-descr b/devel/hs-haddock-api/pkg-descr
new file mode 100644
index 0000000..17176ab
--- /dev/null
+++ b/devel/hs-haddock-api/pkg-descr
@@ -0,0 +1,3 @@
+Haddock is a documentation-generation tool for Haskell libraries.
+
+WWW: http://www.haskell.org/haddock/
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
index b406fe1..49e1f3a 100644
--- a/devel/hs-haddock-library/Makefile
+++ b/devel/hs-haddock-library/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-library
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
index 88c543c..63fd398 100644
--- a/devel/hs-haddock-library/distinfo
+++ b/devel/hs-haddock-library/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-library-1.1.0.tar.gz) = cd26439dabfe98bc5888e0cbb64163811df3091ea946052fdb77f5d76daaf82a
-SIZE (cabal/haddock-library-1.1.0.tar.gz) = 33032
+SHA256 (cabal/haddock-library-1.2.1.tar.gz) = 0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056
+SIZE (cabal/haddock-library-1.2.1.tar.gz) = 38606
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 4e5f79e..9783669 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.14.3
-PORTREVISION= 1
+PORTVERSION= 2.16.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,13 +10,15 @@ COMMENT= Documentation-generation tool for Haskell libraries
LICENSE= BSD3CLAUSE
-USE_CABAL= ghc-paths
+USE_CABAL= haddock-api>=2.16
USE_ALEX= true
USE_HAPPY= true
EXECUTABLE= haddock-${PORTVERSION}
+STANDALONE= yes
+
PLIST_SUB+= GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXECUTABLE=${PREFIX}/bin/haddock-${PORTVERSION}
CONFIGURE_ARGS+= --program-suffix=-${PORTVERSION}
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 631bfb1..340a26f 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-2.14.3.tar.gz) = d454f64ed0ea79ec9a94d4d79c8635be74d752d028b737dbe3b5deb9749e310c
-SIZE (cabal/haddock-2.14.3.tar.gz) = 232158
+SHA256 (cabal/haddock-2.16.1.tar.gz) = 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6
+SIZE (cabal/haddock-2.16.1.tar.gz) = 216323
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 388c9f6..06a878c 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= happy
-PORTVERSION= 1.19.4
-PORTREVISION= 1
+PORTVERSION= 1.19.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index d8bed0a..aa01760 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happy-1.19.4.tar.gz) = 6be499f66c61f8c48cbbbcb70515eb8e62c2bfa08adcc8c9474e7ae343a6936d
-SIZE (cabal/happy-1.19.4.tar.gz) = 160497
+SHA256 (cabal/happy-1.19.5.tar.gz) = 62f03ac11d7b4b9913f212f5aa2eee1087f3b46dc07d799d41e1854ff02843da
+SIZE (cabal/happy-1.19.5.tar.gz) = 159280
diff --git a/devel/hs-hashable/Makefile b/devel/hs-hashable/Makefile
index 8b4f6fd..8748ce4 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.2.2.0
-PORTREVISION= 1
+PORTVERSION= 1.2.3.3
PORTEPOCH= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 734f99f..4afe612 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashable-1.2.2.0.tar.gz) = 033a90b0369af59bf922d0c2af8d73a18432b46b0a47607f436d38f873a88e21
-SIZE (cabal/hashable-1.2.2.0.tar.gz) = 23456
+SHA256 (cabal/hashable-1.2.3.3.tar.gz) = fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e
+SIZE (cabal/hashable-1.2.3.3.tar.gz) = 23944
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index ce80dbc..2613f4c 100644
--- a/devel/hs-hashed-storage/Makefile
+++ b/devel/hs-hashed-storage/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hashed-storage
PORTVERSION= 0.5.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs
new file mode 100644
index 0000000..df8aba9
--- /dev/null
+++ b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Index.hs
@@ -0,0 +1,8 @@
+--- Storage/Hashed/Index.hs.orig 2014-04-07 13:32:06 UTC
++++ Storage/Hashed/Index.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE CPP, ScopedTypeVariables, MultiParamTypeClasses #-}
++{-# LANGUAGE CPP, ScopedTypeVariables, MultiParamTypeClasses, FlexibleContexts #-}
+
+ -- | This module contains plain tree indexing code. The index itself is a
+ -- CACHE: you should only ever use it as an optimisation and never as a primary
diff --git a/devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs
new file mode 100644
index 0000000..174237d
--- /dev/null
+++ b/devel/hs-hashed-storage/files/patch-Storage_Hashed_Monad.hs
@@ -0,0 +1,8 @@
+--- Storage/Hashed/Monad.hs.orig 2014-04-07 13:32:06 UTC
++++ Storage/Hashed/Monad.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE ScopedTypeVariables, BangPatterns, TypeSynonymInstances, UndecidableInstances, FlexibleInstances #-}
++{-# LANGUAGE ScopedTypeVariables, BangPatterns, TypeSynonymInstances, UndecidableInstances, FlexibleInstances, FlexibleContexts #-}
+
+ -- | An experimental monadic interface to Tree mutation. The main idea is to
+ -- simulate IO-ish manipulation of real filesystem (that's the state part of
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index 74c244a..2a04617 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hashtables
-PORTVERSION= 1.1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Mutable hash tables in the ST monad
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable primitive vector>=0.7
+USE_CABAL= hashable>=1.1 primitive vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo
index 8921c6f..cb3331d 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hashtables-1.1.2.1.tar.gz) = c50d910fea2e81eca53d9a2dfbc925246be5b7cc2d0854c6d9e95eaab05ac684
-SIZE (cabal/hashtables-1.1.2.1.tar.gz) = 48553
+SHA256 (cabal/hashtables-1.2.0.2.tar.gz) = 012be9fa5e91118b9301ca58138fbf45222119a284d5561ca6f7e3f9b42e1837
+SIZE (cabal/hashtables-1.2.0.2.tar.gz) = 54283
diff --git a/devel/hs-haskell-platform/Makefile b/devel/hs-haskell-platform/Makefile
deleted file mode 100644
index 8064446..0000000
--- a/devel/hs-haskell-platform/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= haskell-platform
-PORTVERSION= 2014.2.0.0
-# Please note that the port *strictly depends* on certain versions of other
-# ports, so revisit the USE_CABAL line on bumping the portrevision. Thanks!
-PORTREVISION= 1
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= The Haskell Platform
-
-LICENSE= BSD3CLAUSE
-
-METAPORT= yes
-
-USE_CABAL= async==2.0.1.5_1 \
- attoparsec==0.10.4.0_7 \
- case-insensitive==1.1.0.3_1 \
- fgl==5.5.0.1_1 \
- GLUT==2.5.1.1_1,1 \
- GLURaw==1.4.0.1_1 \
- haskell-src==1.0.1.6_1 \
- hashable==1.2.2.0_1,1 \
- html==1.0.1.2_13 \
- HTTP==4000.2.10_1 \
- HUnit==1.2.5.2_6 \
- mtl==2.1.3.1_1 \
- network==2.4.2.3_1 \
- OpenGL==2.9.2.0_1,1 \
- OpenGLRaw==1.5.0.0_1 \
- parallel==3.2.0.4_1 \
- parsec==3.1.5_1 \
- primitive==0.5.2.1_1 \
- QuickCheck==2.6_6 \
- random==1.0.1.1_10 \
- regex-base==0.93.2_13 \
- regex-compat==0.95.1_11 \
- regex-posix==0.95.2_8 \
- split==0.2.2_6 \
- stm==2.4.2_6 \
- syb==0.4.1_1 \
- text==1.1.0.0_1 \
- unordered-containers==0.2.4.0_1 \
- vector==0.10.9.1_1 \
- zlib==0.5.4.1_6 \
- cabal-install==1.18.0.5_1 \
- alex==3.1.3_1 \
- happy==1.19.4_1 \
- hscolour==1.20.3_8,1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-
-.if ${GHC_VERSION} != 7.8.3
-IGNORE= will not work: GHC ${GHC_VERSION} is not supported
-.endif
-
-.include <bsd.port.mk>
diff --git a/devel/hs-haskell-platform/pkg-descr b/devel/hs-haskell-platform/pkg-descr
deleted file mode 100644
index 2f80071..0000000
--- a/devel/hs-haskell-platform/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The Haskell Platform (HP) is the blessed set of libraries and tools on which
-to build further Haskell libraries and applications. It is intended to
-provide a comprehensive, stable, and quality-tested base for Haskell projects
-to work from.
-
-This version specifies the following additional developer tools be installed,
-for a system to be in full compliance:
-
- * cabal-install
- * alex
- * happy
- * haddock
-
-
-WWW: http://haskell.org/platform/
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index 17104af..a92a23d 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= haskell-src-exts
-PORTVERSION= 1.15.0.1
-PORTREVISION= 1
+PORTVERSION= 1.16.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index 53c47d6..e2d628a 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haskell-src-exts-1.15.0.1.tar.gz) = 85f475693a87fd26a3a8b32dea2660bfdca35c2b5d11506ab11b1dc20c88e576
-SIZE (cabal/haskell-src-exts-1.15.0.1.tar.gz) = 1605910
+SHA256 (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 3f3bd41ad3a346a78e80195eca83de529d3ece63fa7edcd4df3b8bf40a970fc1
+SIZE (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 1410081
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index b524f80..92047cb 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= haskell-src
-PORTVERSION= 1.0.1.6
-PORTREVISION= 1
+PORTVERSION= 1.0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo
index 27d292c..2ed2cd3 100644
--- a/devel/hs-haskell-src/distinfo
+++ b/devel/hs-haskell-src/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haskell-src-1.0.1.6.tar.gz) = c7c556366025d9895d1110ecfa30a29e29d7d0a8cb447716fe601e4ff5da4cef
-SIZE (cabal/haskell-src-1.0.1.6.tar.gz) = 52967
+SHA256 (cabal/haskell-src-1.0.2.0.tar.gz) = 2a25ee5729230edddb94af8d9881efbc1d8798bd316097f4646749cb2fa491a6
+SIZE (cabal/haskell-src-1.0.2.0.tar.gz) = 53636
diff --git a/devel/hs-hasktags/Makefile b/devel/hs-hasktags/Makefile
index 9070909..b05ca0f 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hasktags
-PORTVERSION= 0.69.0
-PORTREVISION= 1
+PORTVERSION= 0.69.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo
index 7acaf6d..193a3cc 100644
--- a/devel/hs-hasktags/distinfo
+++ b/devel/hs-hasktags/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hasktags-0.69.0.tar.gz) = 08e200e30929e4a950307e61464db40d47a83debb4b19410cbaea8020b376aad
-SIZE (cabal/hasktags-0.69.0.tar.gz) = 55885
+SHA256 (cabal/hasktags-0.69.1.tar.gz) = 243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6
+SIZE (cabal/hasktags-0.69.1.tar.gz) = 55906
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index 3f30885..f9e004b 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hastache
-PORTVERSION= 0.6.0
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,9 @@ COMMENT= Haskell implementation of Mustache templates
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder ieee754 mtl syb text utf8-string
+USE_CABAL= blaze-builder ieee754 mtl syb text
+
+EXECUTABLE= mkReadme
INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README.md ${STAGEDIR}${DATADIR}
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 7a3ef32..35d7df6 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hastache-0.6.0.tar.gz) = b033a0dd3a38e0ef0772562bb1d5ed8f535c2fa6955633875ae520a6614dc0fc
-SIZE (cabal/hastache-0.6.0.tar.gz) = 13195
+SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464
+SIZE (cabal/hastache-0.6.1.tar.gz) = 16452
diff --git a/devel/hs-MaybeT/Makefile b/devel/hs-hex/Makefile
index 1b79718..501e1ff 100644
--- a/devel/hs-MaybeT/Makefile
+++ b/devel/hs-hex/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
-PORTNAME= MaybeT
+PORTNAME= hex
PORTVERSION= 0.1.2
-PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Support for computations with failures
+COMMENT= Convert strings into hexadecimal and back
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hex/distinfo b/devel/hs-hex/distinfo
new file mode 100644
index 0000000..028bd5b
--- /dev/null
+++ b/devel/hs-hex/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hex-0.1.2.tar.gz) = 12ee1243edd80570a486521565fb0c9b5e39374f21a12f050636e71d55ec61ec
+SIZE (cabal/hex-0.1.2.tar.gz) = 1956
diff --git a/devel/hs-hex/pkg-descr b/devel/hs-hex/pkg-descr
new file mode 100644
index 0000000..470b803
--- /dev/null
+++ b/devel/hs-hex/pkg-descr
@@ -0,0 +1,3 @@
+Convert strings into hexadecimal and back.
+
+WWW: http://hackage.haskell.org/package/hex
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 129da26..25f4c3f 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hinotify
-PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTVERSION= 0.3.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
index d53c2ea..0786180 100644
--- a/devel/hs-hinotify/distinfo
+++ b/devel/hs-hinotify/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hinotify-0.3.7.tar.gz) = 0b702d104f35ca925c748deb9e2a1faaaf6b7b517e48a39a8c8f7d1ad3ebf544
-SIZE (cabal/hinotify-0.3.7.tar.gz) = 6760
+SHA256 (cabal/hinotify-0.3.8.1.tar.gz) = 37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d
+SIZE (cabal/hinotify-0.3.8.1.tar.gz) = 8344
diff --git a/devel/hs-hinotify/files/patch-hinotify.cabal b/devel/hs-hinotify/files/patch-hinotify.cabal
new file mode 100644
index 0000000..b2a293f
--- /dev/null
+++ b/devel/hs-hinotify/files/patch-hinotify.cabal
@@ -0,0 +1,12 @@
+--- hinotify.cabal.orig 2015-08-08 07:35:44 UTC
++++ hinotify.cabal
+@@ -32,6 +32,9 @@ library
+ includes: sys/inotify.h
+ hs-source-dirs: src
+
++ if os(freebsd)
++ extra-libraries: inotify
++
+ test-suite test001
+ type: exitcode-stdio-1.0
+ build-depends: base, directory, hinotify
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 9644005..8718f71 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hint
-PORTVERSION= 0.4.2.0
-PORTREVISION= 1
+PORTVERSION= 0.4.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 50473e4..0705311 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hint-0.4.2.0.tar.gz) = add643926ef91cb886968cb36efb92621bbe6d7e4d570906ebecf8ecfd4f9821
-SIZE (cabal/hint-0.4.2.0.tar.gz) = 29449
+SHA256 (cabal/hint-0.4.2.3.tar.gz) = cf2b3f98ba6929e2e79dfc373e101ee6ae1711a5706e718cf0152733da4a40b7
+SIZE (cabal/hint-0.4.2.3.tar.gz) = 30117
diff --git a/devel/hs-hint/pkg-descr b/devel/hs-hint/pkg-descr
index 50dc7bb..3d4c881 100644
--- a/devel/hs-hint/pkg-descr
+++ b/devel/hs-hint/pkg-descr
@@ -1,6 +1,8 @@
-This library defines an Interpreter monad. It allows to load Haskell
+This library defines an Interpreter monad. It allows to load Haskell
modules, browse them, type-check and evaluate strings with Haskell
-expressions and even coerce them into values. The library is thread-safe
-and type-safe (even the coercion of expressions to values).
+expressions and even coerce them into values. The library is
+thread-safe and type-safe (even the coercion of expressions to values).
+It is, essentially, a huge subset of the GHC API wrapped in a simpler
+API.
WWW: http://hub.darcs.net/jcpetruzza/hint
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 7bda4b2..6a05960 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index b42c582..c1d1ecd 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 1.9.3
-PORTREVISION= 1
+PORTVERSION= 1.9.21
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Source code suggestions
LICENSE= BSD3CLAUSE
-USE_CABAL= cmdargs>=0.10 cpphs>=1.18.1 haskell-src-exts>=1.14 \
- hscolour>=1.17 uniplate>=1.5
+USE_CABAL= ansi-terminal>=0.6.2 cmdargs>=0.10 cpphs>=1.18.1 extra>=0.5 \
+ haskell-src-exts>=1.16 hscolour>=1.21 uniplate>=1.5
EXECUTABLE= hlint
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index f033199..797190e 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hlint-1.9.3.tar.gz) = 2b017bc6bcf02ef2dfb0439f734b57d92bd02656a0438313d75501ec034abfe9
-SIZE (cabal/hlint-1.9.3.tar.gz) = 86068
+SHA256 (cabal/hlint-1.9.21.tar.gz) = 8694a193e0f55b9a74ddd4fb44a242872f91e36ea59dd96ab489562a65cb6393
+SIZE (cabal/hlint-1.9.21.tar.gz) = 88802
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index 098b341..b4e7d34 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 4.2.34
-PORTREVISION= 1
+PORTVERSION= 4.2.41
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,10 +11,10 @@ COMMENT= Haskell API Search
LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.6.1 blaze-builder>=0.2 case-insensitive>=0.2 \
- cmdargs>=0.7 conduit>=0.2 haskell-src-exts>=1.14 \
+ cmdargs>=0.7 conduit>=0.2 haskell-src-exts>=1.16 \
http-types>=0.7 parsec>=2.1 QuickCheck random resourcet \
- safe shake>=0.11 tagsoup>=0.11 text>=0.11 uniplate>=1.6 \
- vector>=0.9 vector-algorithms>=0.6 wai>=1.1 warp>=1.1
+ safe shake>=0.14 tagsoup>=0.11 text>=0.11 uniplate>=1.6 \
+ vector>=0.9 vector-algorithms>=0.6 wai>=1.1 warp>=2.1
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index 310494b..ad1f0b7 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hoogle-4.2.34.tar.gz) = 4f960af1947a0a49e7288dd18029e0fd82c76976f4b76e6b97e0603bf4618d6e
-SIZE (cabal/hoogle-4.2.34.tar.gz) = 131854
+SHA256 (cabal/hoogle-4.2.41.tar.gz) = a6b80301849314399f622d8c68c3b46cb0ae85a65f625f47817f23d40ed7a1be
+SIZE (cabal/hoogle-4.2.41.tar.gz) = 135709
diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile
new file mode 100644
index 0000000..d262dac
--- /dev/null
+++ b/devel/hs-hourglass/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= hourglass
+PORTVERSION= 0.2.9
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple performant time related library
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hourglass/distinfo b/devel/hs-hourglass/distinfo
new file mode 100644
index 0000000..84a2f94
--- /dev/null
+++ b/devel/hs-hourglass/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hourglass-0.2.9.tar.gz) = 9b54f163a1ecad98fbd14cb9737c28001b2648106d98cbd68fb2f5cfed090af6
+SIZE (cabal/hourglass-0.2.9.tar.gz) = 24919
diff --git a/devel/hs-hourglass/pkg-descr b/devel/hs-hourglass/pkg-descr
new file mode 100644
index 0000000..f889cef
--- /dev/null
+++ b/devel/hs-hourglass/pkg-descr
@@ -0,0 +1,6 @@
+Simple time library focusing on simple but powerful and performant API
+The backbone of the library are the Timeable and Time type classes.
+Each Timeable instances can be converted to type that has a Time
+instances, and thus are different representations of current time.
+
+WWW: https://github.com/vincenthz/hs-hourglass
diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile
new file mode 100644
index 0000000..62692b4
--- /dev/null
+++ b/devel/hs-hsb2hs/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= hsb2hs
+PORTVERSION= 0.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Preprocesses a file, adding blobs from files as string literals
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= preprocessor-tools>1.0
+
+EXECUTABLE= hsb2hs
+STANDALONE= yes
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hsb2hs/distinfo b/devel/hs-hsb2hs/distinfo
new file mode 100644
index 0000000..dfc1480
--- /dev/null
+++ b/devel/hs-hsb2hs/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hsb2hs-0.3.1.tar.gz) = 8ad800820554f273ada083dfce2f463d920fb1ceb053255023a4c883b090f9d8
+SIZE (cabal/hsb2hs-0.3.1.tar.gz) = 2387
diff --git a/devel/hs-hsb2hs/pkg-descr b/devel/hs-hsb2hs/pkg-descr
new file mode 100644
index 0000000..60ea929
--- /dev/null
+++ b/devel/hs-hsb2hs/pkg-descr
@@ -0,0 +1,6 @@
+Hsb2hs is a preprocessor that allows you to include the contents of
+files as string literals in your Haskell programs and libraries. It is
+an alternative to file-embed for those who do not want to rely on
+Template Haskell.
+
+WWW: http://hackage.haskell.org/package/hsb2hs
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index 873a871..fba6efa 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hslogger
-PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTVERSION= 1.2.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Versatile logging framework
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl network
+USE_CABAL= mtl network old-locale
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index a865655..a3c3b8c 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hslogger-1.2.4.tar.gz) = 8c0fa8051efb693e398eddeece3486dfdb5eb9357c4ea5cfeb9f26f2313f0c64
-SIZE (cabal/hslogger-1.2.4.tar.gz) = 35794
+SHA256 (cabal/hslogger-1.2.9.tar.gz) = be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476
+SIZE (cabal/hslogger-1.2.9.tar.gz) = 35576
diff --git a/devel/hs-hslogger/pkg-descr b/devel/hs-hslogger/pkg-descr
index 3b616f2..290e170 100644
--- a/devel/hs-hslogger/pkg-descr
+++ b/devel/hs-hslogger/pkg-descr
@@ -1,7 +1,9 @@
-Package hslogger is a logging framework for Haskell, roughly similar to
-Python's logging module, and lets each log message have a priority and
-source be associated with it. The programmer can then define global
-handlers that route or filter messages based on the priority and source.
-hslogger also has a syslog handler built in.
+hslogger is a logging framework for Haskell, roughly similar to Python's
+logging module.
+
+hslogger lets each log message have a priority and source be associated
+with it. The programmer can then define global handlers that route or
+filter messages based on the priority and source. hslogger also has a
+syslog handler built in.
WWW: http://software.complete.org/hslogger
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
index eb8a51b..226fa65 100644
--- a/devel/hs-hslua/Makefile
+++ b/devel/hs-hslua/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hslua
-PORTVERSION= 0.3.13
-PORTREVISION= 1
+PORTVERSION= 0.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Lua language interpreter embedding in Haskell
LICENSE= MIT
-USE_CABAL= mtl>=2.1
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo
index f767b1a..2bd5033 100644
--- a/devel/hs-hslua/distinfo
+++ b/devel/hs-hslua/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hslua-0.3.13.tar.gz) = e95774d21ac4378e799af4b8dce9068bfedd3109bf13b717d9ecb5817f86430a
-SIZE (cabal/hslua-0.3.13.tar.gz) = 128230
+SHA256 (cabal/hslua-0.4.0.tar.gz) = 77a865a3258656c2536c154d18ac38873a371685fde6ba03a3436f65f7bda050
+SIZE (cabal/hslua-0.4.0.tar.gz) = 129883
diff --git a/devel/hs-hslua/pkg-descr b/devel/hs-hslua/pkg-descr
index c4496cb..f2dc241 100644
--- a/devel/hs-hslua/pkg-descr
+++ b/devel/hs-hslua/pkg-descr
@@ -1,4 +1,4 @@
The Scripting.Lua module is a wrapper of Lua language interpreter. This
-package contains full Lua interpreter version 5.1.4.
+package contains full Lua interpreter version 5.1.5.
WWW: http://hackage.haskell.org/package/hslua
diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile
new file mode 100644
index 0000000..f295c7b
--- /dev/null
+++ b/devel/hs-hspec-core/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= hspec-core
+PORTVERSION= 2.1.10
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Testing Framework for Haskell
+
+LICENSE= MIT
+
+USE_CABAL= ansi-terminal>=0.5 async>=2 hspec-expectations>=0.7.1 \
+ HUnit>=1.2.5 QuickCheck>=2.5.1 quickcheck-io random setenv \
+ tf-random
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hspec-core/distinfo b/devel/hs-hspec-core/distinfo
new file mode 100644
index 0000000..b61d2cf
--- /dev/null
+++ b/devel/hs-hspec-core/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hspec-core-2.1.10.tar.gz) = 682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0
+SIZE (cabal/hspec-core-2.1.10.tar.gz) = 31124
diff --git a/devel/hs-hspec-core/pkg-descr b/devel/hs-hspec-core/pkg-descr
new file mode 100644
index 0000000..5ba9ca9
--- /dev/null
+++ b/devel/hs-hspec-core/pkg-descr
@@ -0,0 +1,4 @@
+This package exposes internal types and functions that can be used to
+extend Hspec's functionality.
+
+WWW: http://hspec.github.io/
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
new file mode 100644
index 0000000..93d2f36
--- /dev/null
+++ b/devel/hs-hspec-discover/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= hspec-discover
+PORTVERSION= 2.1.10
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Automatically discover and run Hspec tests
+
+LICENSE= MIT
+
+EXECUTABLE= hspec-discover
+
+OPTIONS_EXCLUDE= DOCS
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo
new file mode 100644
index 0000000..d7e8b09
--- /dev/null
+++ b/devel/hs-hspec-discover/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/hspec-discover-2.1.10.tar.gz) = efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b
+SIZE (cabal/hspec-discover-2.1.10.tar.gz) = 5646
diff --git a/devel/hs-hspec-discover/pkg-descr b/devel/hs-hspec-discover/pkg-descr
new file mode 100644
index 0000000..ff34278
--- /dev/null
+++ b/devel/hs-hspec-discover/pkg-descr
@@ -0,0 +1,3 @@
+Automatically discover and run Hspec tests.
+
+WWW: http://hspec.github.io/
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index 8c24057..51fff1e 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-expectations
-PORTVERSION= 0.6.0.1
-PORTREVISION= 1
+PORTVERSION= 0.7.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
index f32a4a7..8a32497 100644
--- a/devel/hs-hspec-expectations/distinfo
+++ b/devel/hs-hspec-expectations/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-expectations-0.6.0.1.tar.gz) = 941f27d0fa358889ac43496a49570a4baea93fcd59fdab03249e7eb34f1f0198
-SIZE (cabal/hspec-expectations-0.6.0.1.tar.gz) = 4212
+SHA256 (cabal/hspec-expectations-0.7.1.tar.gz) = afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258
+SIZE (cabal/hspec-expectations-0.7.1.tar.gz) = 4005
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index 99b6ab2..e59cfd8 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,20 +1,16 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 1.11.0
-PORTREVISION= 1
+PORTVERSION= 2.1.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Behavior-Driven Development for Haskell
+COMMENT= Testing Framework for Haskell
LICENSE= MIT
-USE_CABAL= ansi-terminal>=0.5 async>=2 hspec-expectations>=0.5.0 \
- HUnit>=1.2.5 QuickCheck>=2.5.1 quickcheck-io random \
- setenv tf-random
-
-EXECUTABLE= hspec-discover
+USE_CABAL= hspec-core>=2.1.10 hspec-discover>=2.1.10 \
+ hspec-expectations>=0.7.1 HUnit>=1.2.5 QuickCheck>=2.5.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index 9c734f6..f5e185f 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hspec-1.11.0.tar.gz) = 4eff14713863b2b882d1e28eaf8fb8b6007c0bcd03d7c0c2023ff153b5a26ec2
-SIZE (cabal/hspec-1.11.0.tar.gz) = 32083
+SHA256 (cabal/hspec-2.1.10.tar.gz) = f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154
+SIZE (cabal/hspec-2.1.10.tar.gz) = 5382
diff --git a/devel/hs-hspec/pkg-descr b/devel/hs-hspec/pkg-descr
index d0dedf6..7a2d958 100644
--- a/devel/hs-hspec/pkg-descr
+++ b/devel/hs-hspec/pkg-descr
@@ -1,6 +1,9 @@
-Behavior Driven Development for Haskell. Hspec is roughly based on the
-Ruby library RSpec. However, Hspec is just a framework for running
-HUnit and QuickCheck tests. Compared to other options, it provides a
-much nicer syntax that makes tests very easy to read.
+Hspec is a testing framework for Haskell. It is inspired by the Ruby
+library RSpec. Some of Hspec's distinctive features are:
+
+ * a friendly DSL for defining tests
+ * integration with QuickCheck, SmallCheck, and HUnit
+ * parallel test execution
+ * automatic discovery of test files
WWW: http://hspec.github.io/
diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile
new file mode 100644
index 0000000..afe5f5c
--- /dev/null
+++ b/devel/hs-js-flot/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= js-flot
+PORTVERSION= 0.8.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Obtain minified flot code
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-js-flot/distinfo b/devel/hs-js-flot/distinfo
new file mode 100644
index 0000000..1872277
--- /dev/null
+++ b/devel/hs-js-flot/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/js-flot-0.8.3.tar.gz) = 1ba2f2a6b8d85da76c41f526c98903cbb107f8642e506c072c1e7e3c20fe5e7a
+SIZE (cabal/js-flot-0.8.3.tar.gz) = 662691
diff --git a/devel/hs-js-flot/pkg-descr b/devel/hs-js-flot/pkg-descr
new file mode 100644
index 0000000..3caa8dd
--- /dev/null
+++ b/devel/hs-js-flot/pkg-descr
@@ -0,0 +1,7 @@
+This package bundles the minified Flot code (a jQuery plotting library)
+into a Haskell package, so it can be depended upon by Cabal packages.
+The first three components of the version number match the upstream flot
+version. The package is designed to meet the redistribution
+requirements of downstream users (e.g. Debian).
+
+WWW: https://github.com/ndmitchell/js-flot#readme
diff --git a/devel/hs-js-jquery/Makefile b/devel/hs-js-jquery/Makefile
new file mode 100644
index 0000000..02093d6
--- /dev/null
+++ b/devel/hs-js-jquery/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= js-jquery
+PORTVERSION= 1.11.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Obtain minified jQuery code
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-js-jquery/distinfo b/devel/hs-js-jquery/distinfo
new file mode 100644
index 0000000..acae74b
--- /dev/null
+++ b/devel/hs-js-jquery/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/js-jquery-1.11.3.tar.gz) = 3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257
+SIZE (cabal/js-jquery-1.11.3.tar.gz) = 120919
diff --git a/devel/hs-js-jquery/pkg-descr b/devel/hs-js-jquery/pkg-descr
new file mode 100644
index 0000000..18c4f14
--- /dev/null
+++ b/devel/hs-js-jquery/pkg-descr
@@ -0,0 +1,7 @@
+This package bundles the minified jQuery code into a Haskell package, so
+it can be depended upon by Cabal packages. The first three components
+of the version number match the upstream jQuery version. The package is
+designed to meet the redistribution requirements of downstream users
+(e.g. Debian).
+
+WWW: https://github.com/ndmitchell/js-jquery#readme
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
index 5908eef..f221c32 100644
--- a/devel/hs-keys/Makefile
+++ b/devel/hs-keys/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= keys
-PORTVERSION= 3.10.1
-PORTREVISION= 1
+PORTVERSION= 3.10.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Keyed functors and containers
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 free>=4 semigroupoids>=4 semigroups>=0.8.3.1
+USE_CABAL= comonad>=4 free>=4 hashable>=1.1.2.3 semigroupoids>=4 \
+ semigroups>=0.8.3.1 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
index 4ec78f7..4cf4edf 100644
--- a/devel/hs-keys/distinfo
+++ b/devel/hs-keys/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/keys-3.10.1.tar.gz) = 9644f4aeb3744cfe46c59712bb5396554eb06527ec67cdf563c116abdc5df400
-SIZE (cabal/keys-3.10.1.tar.gz) = 7702
+SHA256 (cabal/keys-3.10.2.tar.gz) = 425f1ee508efd371220d2eae4d81be1423797968af2387a2a83b937fb186bef6
+SIZE (cabal/keys-3.10.2.tar.gz) = 8635
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index 25ded12..fd95a55 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= kqueue
PORTVERSION= 0.1.2.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal
new file mode 100644
index 0000000..a6145d6
--- /dev/null
+++ b/devel/hs-kqueue/files/patch-kqueue.cabal
@@ -0,0 +1,17 @@
+--- kqueue.cabal.orig 2014-05-08 16:35:57 UTC
++++ kqueue.cabal
+@@ -21,11 +21,11 @@ Library
+ Hs-Source-Dirs: src
+ Exposed-modules: System.KQueue
+ System.KQueue.HighLevel
+- Build-depends: base >= 4.0 && < 4.8
++ Build-depends: base >= 4.0 && < 4.9
+ , directory >= 1.0 && < 1.4
+- , filepath >= 1.1 && < 1.4
++ , filepath >= 1.1 && < 1.5
+ , mtl >= 1.1 && < 2.3
+- , time >= 1.1 && < 1.5
++ , time >= 1.1 && < 1.6
+ , unix >= 2.3 && < 2.8
+ Build-tools: c2hs
+ GHC-Options: -Wall
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 5eeb4c1..23de771 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
PORTNAME= language-c
-PORTVERSION= 0.4.5
-PORTREVISION= 1
+PORTVERSION= 0.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Analysis and generation of C code
LICENSE= BSD3CLAUSE
+
USE_ALEX= yes
USE_HAPPY= yes
USE_CABAL= syb
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index c5a5d34..81eceb2 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/language-c-0.4.5.tar.gz) = 644a7f6657f0325149f16c755ba3e51353f0d18484282989cf473c726a0e1d60
-SIZE (cabal/language-c-0.4.5.tar.gz) = 168971
+SHA256 (cabal/language-c-0.4.7.tar.gz) = 5f6dc9d86b1f88dec1800e1a4fc43aa52f85fe4bb865ba268aca34b399a512e4
+SIZE (cabal/language-c-0.4.7.tar.gz) = 112569
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index aafd5c2..0f8a5f5 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= language-javascript
-PORTVERSION= 0.5.13
-PORTREVISION= 1
+PORTVERSION= 0.5.14.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo
index 965cdf8..c9de397 100644
--- a/devel/hs-language-javascript/distinfo
+++ b/devel/hs-language-javascript/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/language-javascript-0.5.13.tar.gz) = 5cd824989ab56a87874dacc4335aa89cb97a649d71747a555c6fc45ea0e38640
-SIZE (cabal/language-javascript-0.5.13.tar.gz) = 48398
+SHA256 (cabal/language-javascript-0.5.14.2.tar.gz) = 2a86bd58b1821f1522be191c8d77a80e35550d43637a37644cbb15caac37d546
+SIZE (cabal/language-javascript-0.5.14.2.tar.gz) = 48466
diff --git a/devel/hs-language-javascript/pkg-descr b/devel/hs-language-javascript/pkg-descr
index b7da79b..1974076 100644
--- a/devel/hs-language-javascript/pkg-descr
+++ b/devel/hs-language-javascript/pkg-descr
@@ -1,4 +1,4 @@
Parses Javascript into an Abstract Syntax Tree (AST). Initially intended
as frontend to hjsmin.
-WWW: http://github.com/alanz/language-javascript
+WWW: http://github.com/erikd/language-javascript
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 3be3ee3..19f9cd7 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -2,7 +2,7 @@
PORTNAME= largeword
PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 94eb783..561edf5 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index f639451..9f8cb01 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 4.3.3
-PORTREVISION= 1
+PORTVERSION= 4.12.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,15 @@ COMMENT= Lenses, Folds and Traversals
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.7.0.5 attoparsec>=0.10 bifunctors>=4 comonad>=4 \
+USE_CABAL= base-orphans>=0.3 bifunctors>=5 comonad>=4 \
contravariant>=0.3 distributive>=0.3 exceptions>=0.1.1 \
- free>=4 hashable>=1.1.2.3 mtl>=2.0.1 parallel>=3.1.0.1 \
- primitive>=0.4.0.1 profunctors>=4 reflection>=1.1.6 \
- scientific>=0.3.2 semigroupoids>=4 semigroups>=0.8.4 \
- split>=0.2 tagged>=0.4.4 text>=0.11 transformers-compat>=0.3 \
- unordered-containers>=0.2 vector>=0.9 void>=0.5 zlib>=0.5.4
+ free>=4 hashable>=1.1.2.3 kan-extensions>=4.2.1 mtl>=2.0.1 \
+ parallel>=3.1.0.1 profunctors>=5 reflection>=2 \
+ semigroupoids>=5 semigroups>=0.8.4 tagged>=0.4.4 text>=0.11 \
+ transformers-compat>=0.4 unordered-containers>=0.2.4 \
+ vector>=0.9 void>=0.5
+
+FLAGS_DISABLE= test-hlint test-doctests test-hunit test-properties test-templates
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index ff8c3ae..90b626c 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lens-4.3.3.tar.gz) = 2e6449fb0a4a93b7779dbd8147541d663cf3770557736e90ccb697002dd5f84c
-SIZE (cabal/lens-4.3.3.tar.gz) = 767895
+SHA256 (cabal/lens-4.12.3.tar.gz) = 48fa9d46b37ff4f650204f82df7d40f7ae78418badf40d9d3fc7eba479f82821
+SIZE (cabal/lens-4.12.3.tar.gz) = 967851
diff --git a/devel/hs-lifted-async/Makefile b/devel/hs-lifted-async/Makefile
new file mode 100644
index 0000000..a8e0776
--- /dev/null
+++ b/devel/hs-lifted-async/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= lifted-async
+PORTVERSION= 0.7.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Run lifted IO operations asynchronously and wait for their results
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= async>=2.0.1 constraints>=0.2 lifted-base>=0.2 \
+ monad-control>=0.3.1 transformers-base>=0.4
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-lifted-async/distinfo b/devel/hs-lifted-async/distinfo
new file mode 100644
index 0000000..3e32b11
--- /dev/null
+++ b/devel/hs-lifted-async/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/lifted-async-0.7.0.1.tar.gz) = c3235d0f4a90baba3217269562bee655c6d9c538e2b57b6c5b23da4ef1bb6e6a
+SIZE (cabal/lifted-async-0.7.0.1.tar.gz) = 9060
diff --git a/devel/hs-lifted-async/pkg-descr b/devel/hs-lifted-async/pkg-descr
new file mode 100644
index 0000000..cd748ed
--- /dev/null
+++ b/devel/hs-lifted-async/pkg-descr
@@ -0,0 +1,4 @@
+This package provides IO operations from async package lifted to any
+instance of 'MonadBase' or 'MonadBaseControl'.
+
+WWW: https://github.com/maoe/lifted-async
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index 060a5c2..d4f9139 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-base
-PORTVERSION= 0.2.3.0
-PORTREVISION= 1
+PORTVERSION= 0.2.3.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index 6d5d907..a672801d 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lifted-base-0.2.3.0.tar.gz) = 365d6fbe9f87dfeaa89fda8ba6ff21811b6cd1babb2adfe975fb2d0d0f4d7071
-SIZE (cabal/lifted-base-0.2.3.0.tar.gz) = 11610
+SHA256 (cabal/lifted-base-0.2.3.6.tar.gz) = 57c5837d83f569bb72136ca89256e50e1ac168ee935804a8e7763e9d8322e1fb
+SIZE (cabal/lifted-base-0.2.3.6.tar.gz) = 11613
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 5aa2d19..7cba036 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.6.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-nats/Makefile b/devel/hs-map-syntax/Makefile
index 45ddd26..9b5211d 100644
--- a/math/hs-nats/Makefile
+++ b/devel/hs-map-syntax/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
-PORTNAME= nats
+PORTNAME= map-syntax
PORTVERSION= 0.2
-PORTREVISION= 1
-CATEGORIES= math haskell
+CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Natural numbers
+COMMENT= Syntax sugar for defining maps
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1
+USE_CABAL= mtl>=2.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-map-syntax/distinfo b/devel/hs-map-syntax/distinfo
new file mode 100644
index 0000000..43334ad
--- /dev/null
+++ b/devel/hs-map-syntax/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/map-syntax-0.2.tar.gz) = 395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b
+SIZE (cabal/map-syntax-0.2.tar.gz) = 7129
diff --git a/devel/hs-map-syntax/pkg-descr b/devel/hs-map-syntax/pkg-descr
new file mode 100644
index 0000000..9cdde85
--- /dev/null
+++ b/devel/hs-map-syntax/pkg-descr
@@ -0,0 +1,6 @@
+Haskell's canonical list of tuples syntax for defining maps is not very
+convenient and also has ambiguous semantics. This package leverages do
+notation to create a lighter syntax that makes semantics explicit and
+also allows the option of fail-fast handling of duplicate keys.
+
+WWW: http://hackage.haskell.org/package/map-syntax
diff --git a/devel/hs-memory/Makefile b/devel/hs-memory/Makefile
new file mode 100644
index 0000000..5850cc3
--- /dev/null
+++ b/devel/hs-memory/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= memory
+PORTVERSION= 0.8
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Memory and related abtraction stuff
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-memory/distinfo b/devel/hs-memory/distinfo
new file mode 100644
index 0000000..970dfe7
--- /dev/null
+++ b/devel/hs-memory/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/memory-0.8.tar.gz) = 7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de
+SIZE (cabal/memory-0.8.tar.gz) = 35030
diff --git a/devel/hs-memory/pkg-descr b/devel/hs-memory/pkg-descr
new file mode 100644
index 0000000..5aa0cfe
--- /dev/null
+++ b/devel/hs-memory/pkg-descr
@@ -0,0 +1,9 @@
+Chunk of memory, polymorphic byte array management and manipulation:
+
+ * A polymorphic byte array abstraction and function similar to strict
+ ByteString.
+ * Different type of byte array abstraction.
+ * Raw memory IO operations (memory set, memory copy, ..).
+ * Aliasing with endianness support.
+
+WWW: https://github.com/vincenthz/hs-memory
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index c7a032d..d7cbc66 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
index c173deb..1cc5678 100644
--- a/devel/hs-mmorph/Makefile
+++ b/devel/hs-mmorph/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mmorph
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmorph/distinfo b/devel/hs-mmorph/distinfo
index 9d29f38..0e1846b 100644
--- a/devel/hs-mmorph/distinfo
+++ b/devel/hs-mmorph/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mmorph-1.0.3.tar.gz) = 151bd6a93bcaabbc7ad0b106fe286129568837d7e3488fb86483f73fccfa172d
-SIZE (cabal/mmorph-1.0.3.tar.gz) = 6023
+SHA256 (cabal/mmorph-1.0.4.tar.gz) = 22e3665b4c86bf28cb4e836da91f586294d74d1cf1c18db364dcf568eba7bf4c
+SIZE (cabal/mmorph-1.0.4.tar.gz) = 6100
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 751b48e..6c99ba9 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-control
-PORTVERSION= 0.3.3.0
-PORTREVISION= 1
+PORTVERSION= 1.0.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/distinfo b/devel/hs-monad-control/distinfo
index 3237fa4..6f5a9de 100644
--- a/devel/hs-monad-control/distinfo
+++ b/devel/hs-monad-control/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-control-0.3.3.0.tar.gz) = ef44c9943760f2120eb450182852d6150390daa2de4b87e9dda9591e89714e6e
-SIZE (cabal/monad-control-0.3.3.0.tar.gz) = 10518
+SHA256 (cabal/monad-control-1.0.0.4.tar.gz) = e984b7346af6d31b7ce918e1a0263075af8cbcf5440bc3df698d0354c90df61e
+SIZE (cabal/monad-control-1.0.0.4.tar.gz) = 10709
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index a40060f..6400fc9 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.3.7.1
-PORTREVISION= 1
+PORTVERSION= 0.3.13.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index 389c81d..c6f87b2 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-logger-0.3.7.1.tar.gz) = 31c1f7769652e40f0688b965a7fd399df97762a426921c924aa1bacbde0ab946
-SIZE (cabal/monad-logger-0.3.7.1.tar.gz) = 6185
+SHA256 (cabal/monad-logger-0.3.13.2.tar.gz) = c1383c4d32e1f276e3437db39418d5a4c3c3670c25c416b4f6c3fe5ad4b5e2b2
+SIZE (cabal/monad-logger-0.3.13.2.tar.gz) = 7402
diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile
index f4425f1..b78cafd 100644
--- a/devel/hs-monad-loops/Makefile
+++ b/devel/hs-monad-loops/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-loops
-PORTVERSION= 0.4.2.1
-PORTREVISION= 1
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-loops/distinfo b/devel/hs-monad-loops/distinfo
index 5016f33..49ee634 100644
--- a/devel/hs-monad-loops/distinfo
+++ b/devel/hs-monad-loops/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-loops-0.4.2.1.tar.gz) = a6e888a462aff46297527e90a7bf0171bc2cff4cab073973bdbf2fc09ae5f9b6
-SIZE (cabal/monad-loops-0.4.2.1.tar.gz) = 4515
+SHA256 (cabal/monad-loops-0.4.3.tar.gz) = 7eaaaf6bc43661e9e86e310ff8c56fbea16eb6bf13c31a2e28103138ac164c18
+SIZE (cabal/monad-loops-0.4.3.tar.gz) = 4996
diff --git a/devel/hs-monad-par-extras/Makefile b/devel/hs-monad-par-extras/Makefile
index 4911fbe..bd3a91d 100644
--- a/devel/hs-monad-par-extras/Makefile
+++ b/devel/hs-monad-par-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monad-par-extras
PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 21669ee..13f3ff3 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monad-par
-PORTVERSION= 0.3.4.6
-PORTREVISION= 1
+PORTVERSION= 0.3.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,5 +12,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= abstract-deque>=0.1.4 abstract-par monad-par-extras>=0.3 \
mtl>=2.0.1.0 mwc-random>=0.11 parallel>=3.1
+FLAGS_DISABLE= chaselev newgeneric
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-monad-par/distinfo b/devel/hs-monad-par/distinfo
index 863fa2c..c437a95 100644
--- a/devel/hs-monad-par/distinfo
+++ b/devel/hs-monad-par/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/monad-par-0.3.4.6.tar.gz) = fe9b0955a83e45b58f29f91573e96ea85ba6f90057a1e976054f8681af2b64cc
-SIZE (cabal/monad-par-0.3.4.6.tar.gz) = 30200
+SHA256 (cabal/monad-par-0.3.4.7.tar.gz) = 23b8a68719b4c5848ce9a3381ce9efdc1c96677ba043a3ee74d99223343cc28a
+SIZE (cabal/monad-par-0.3.4.7.tar.gz) = 30411
diff --git a/devel/hs-monad-par/pkg-descr b/devel/hs-monad-par/pkg-descr
index 0c9cedb..5224858 100644
--- a/devel/hs-monad-par/pkg-descr
+++ b/devel/hs-monad-par/pkg-descr
@@ -1,5 +1,7 @@
The Par monad offers a simple API for parallel programming. The library
works for parallelising both pure and IO computations, although only the
-pure version is deterministic.
+pure version is deterministic. The default implementation provides a
+work-stealing scheduler and supports forking tasks that are much lighter
+weight than IO-threads.
WWW: http://github.com/simonmar/monad-par
diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile
index 77939b2..1f45127 100644
--- a/devel/hs-monads-tf/Makefile
+++ b/devel/hs-monads-tf/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monads-tf
PORTVERSION= 0.1.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile
index ed40fa8..fbc0fd9 100644
--- a/devel/hs-mono-traversable/Makefile
+++ b/devel/hs-mono-traversable/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mono-traversable
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.9.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Type classes for mapping, folding, and traversing monomorphic container
LICENSE= MIT
-USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances hashable \
+USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances>=0.1 hashable \
semigroupoids>=3.0 semigroups>=0.10 text>=0.11 \
unordered-containers>=0.2 vector>=0.10 vector-algorithms>=0.6 \
vector-instances
diff --git a/devel/hs-mono-traversable/distinfo b/devel/hs-mono-traversable/distinfo
index 5ef69f0..d8a1f0b 100644
--- a/devel/hs-mono-traversable/distinfo
+++ b/devel/hs-mono-traversable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mono-traversable-0.6.1.tar.gz) = ae4c578f73bb46aefcd2db27b510bdcff92a47d0f90f3f1e3419b4299d73de18
-SIZE (cabal/mono-traversable-0.6.1.tar.gz) = 23230
+SHA256 (cabal/mono-traversable-0.9.2.1.tar.gz) = 34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef
+SIZE (cabal/mono-traversable-0.9.2.1.tar.gz) = 36866
diff --git a/devel/hs-mono-traversable/pkg-descr b/devel/hs-mono-traversable/pkg-descr
index 8b4e27a..9784c3e 100644
--- a/devel/hs-mono-traversable/pkg-descr
+++ b/devel/hs-mono-traversable/pkg-descr
@@ -1,5 +1,4 @@
Monomorphic variants of the Functor, Foldable, and Traversable
-typeclasses. Contains even more experimental code for abstracting
-containers and sequences.
+typeclasses.
WWW: https://github.com/snoyberg/mono-traversable
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index c6673ec..def4bfd 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mtl
-PORTVERSION= 2.1.3.1
-PORTREVISION= 1
+PORTVERSION= 2.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mtl/distinfo b/devel/hs-mtl/distinfo
index 902fb2a..92566c3 100644
--- a/devel/hs-mtl/distinfo
+++ b/devel/hs-mtl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mtl-2.1.3.1.tar.gz) = 77af766957fb49361fe63446f272a698bddb13398669edc363022e5c2517f6f6
-SIZE (cabal/mtl-2.1.3.1.tar.gz) = 13955
+SHA256 (cabal/mtl-2.2.1.tar.gz) = cae59d79f3a16f8e9f3c9adc1010c7c6cdddc73e8a97ff4305f6439d855c8dc5
+SIZE (cabal/mtl-2.2.1.tar.gz) = 15391
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 9c05e13..3c39393 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mueval
-PORTVERSION= 0.9.1.1
-PORTREVISION= 1
+PORTVERSION= 0.9.1.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Safely evaluate pure Haskell expressions
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions hint>=0.3.1 mtl>2 show>=0.3 \
+USE_CABAL= extensible-exceptions hint>=0.3.1 mtl>2 QuickCheck show>=0.3 \
simple-reflect utf8-string
EXECUTABLE= mueval mueval-core
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index 003ebf5..652c106 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mueval-0.9.1.1.tar.gz) = ff8a460a09e3371cedb9e4393fb84b2bcb65b6b164257af1413eb0b12872385d
-SIZE (cabal/mueval-0.9.1.1.tar.gz) = 15346
+SHA256 (cabal/mueval-0.9.1.1.2.tar.gz) = e04c3b754695cc8f71c072c6398b8a567c112c69d48355b5bca9bfbb1c050ac1
+SIZE (cabal/mueval-0.9.1.1.2.tar.gz) = 15746
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index a1cb0b5..2d6bac5 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= murmur-hash
-PORTVERSION= 0.1.0.7
-PORTREVISION= 1
+PORTVERSION= 0.1.0.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/distinfo b/devel/hs-murmur-hash/distinfo
index 7eecfe6..62562b5 100644
--- a/devel/hs-murmur-hash/distinfo
+++ b/devel/hs-murmur-hash/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/murmur-hash-0.1.0.7.tar.gz) = 775ef5836344f30c37a9f07b70553ade9bf4f33524fad03eaac2a21daf27bb88
-SIZE (cabal/murmur-hash-0.1.0.7.tar.gz) = 4073
+SHA256 (cabal/murmur-hash-0.1.0.8.tar.gz) = 6cb9f4dc4a7d5b35e843bb8767d2e2c9745bcfbdacb5daf4fce5f4e05f983a06
+SIZE (cabal/murmur-hash-0.1.0.8.tar.gz) = 4072
diff --git a/devel/hs-mutable-containers/Makefile b/devel/hs-mutable-containers/Makefile
new file mode 100644
index 0000000..32a465b
--- /dev/null
+++ b/devel/hs-mutable-containers/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= mutable-containers
+PORTVERSION= 0.3.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Abstactions and concrete implementations of mutable containers
+
+LICENSE= MIT
+
+USE_CABAL= mono-traversable primitive>=0.5.2.1 vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-mutable-containers/distinfo b/devel/hs-mutable-containers/distinfo
new file mode 100644
index 0000000..aaa27aa
--- /dev/null
+++ b/devel/hs-mutable-containers/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/mutable-containers-0.3.2.tar.gz) = 781388cf52faa5f9c4c8a825eef11bec430e323c6913d25b5f4e63d8ce02017e
+SIZE (cabal/mutable-containers-0.3.2.tar.gz) = 11969
diff --git a/devel/hs-mutable-containers/pkg-descr b/devel/hs-mutable-containers/pkg-descr
new file mode 100644
index 0000000..a204e34
--- /dev/null
+++ b/devel/hs-mutable-containers/pkg-descr
@@ -0,0 +1,10 @@
+One of Haskell's strengths is immutable data structures. These
+structures make it easier to reason about code, simplify concurrency and
+parallelism, and in some cases can improve performance by allowing
+sharing. However, there are still classes of problems where mutable
+data structures can both be more convenient, and provide a performance
+boost. This library is meant to provide such structures in a
+performant, well tested way. It also provides a simple abstraction over
+such data structures via typeclasses.
+
+WWW: https://github.com/fpco/mutable-containers
diff --git a/devel/hs-newtype/Makefile b/devel/hs-newtype/Makefile
new file mode 100644
index 0000000..a914fee
--- /dev/null
+++ b/devel/hs-newtype/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= newtype
+PORTVERSION= 0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Typeclass and set of functions for working with newtypes
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-newtype/distinfo b/devel/hs-newtype/distinfo
new file mode 100644
index 0000000..4e4d183
--- /dev/null
+++ b/devel/hs-newtype/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/newtype-0.2.tar.gz) = b714033abd9a8b0903bcef0d36d0913de2a5003c852f43f97fa688717289e459
+SIZE (cabal/newtype-0.2.tar.gz) = 3476
diff --git a/devel/hs-newtype/pkg-descr b/devel/hs-newtype/pkg-descr
new file mode 100644
index 0000000..7138e74
--- /dev/null
+++ b/devel/hs-newtype/pkg-descr
@@ -0,0 +1,5 @@
+Per Conor McBride, the Newtype typeclass represents the packing and
+unpacking of a newtype, and allows you to operatate under that newtype
+with functions such as ala.
+
+WWW: http://hackage.haskell.org/package/newtype
diff --git a/devel/hs-old-locale/Makefile b/devel/hs-old-locale/Makefile
new file mode 100644
index 0000000..5f8ee8f
--- /dev/null
+++ b/devel/hs-old-locale/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= old-locale
+PORTVERSION= 1.0.0.7
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Locale library
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-old-locale/distinfo b/devel/hs-old-locale/distinfo
new file mode 100644
index 0000000..538cc27
--- /dev/null
+++ b/devel/hs-old-locale/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/old-locale-1.0.0.7.tar.gz) = dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50
+SIZE (cabal/old-locale-1.0.0.7.tar.gz) = 3384
diff --git a/devel/hs-old-locale/pkg-descr b/devel/hs-old-locale/pkg-descr
new file mode 100644
index 0000000..a22d748
--- /dev/null
+++ b/devel/hs-old-locale/pkg-descr
@@ -0,0 +1,4 @@
+This package provides the ability to adapt to locale conventions such as
+date and time formats.
+
+WWW: http://hackage.haskell.org/package/old-locale
diff --git a/devel/hs-old-time/Makefile b/devel/hs-old-time/Makefile
new file mode 100644
index 0000000..4fa6296
--- /dev/null
+++ b/devel/hs-old-time/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= old-time
+PORTVERSION= 1.1.0.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Time library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= old-locale>=1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-old-time/distinfo b/devel/hs-old-time/distinfo
new file mode 100644
index 0000000..8713910
--- /dev/null
+++ b/devel/hs-old-time/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/old-time-1.1.0.3.tar.gz) = 1ccb158b0f7851715d36b757c523b026ca1541e2030d02239802ba39b4112bc1
+SIZE (cabal/old-time-1.1.0.3.tar.gz) = 74219
diff --git a/devel/hs-old-time/pkg-descr b/devel/hs-old-time/pkg-descr
new file mode 100644
index 0000000..33a9f27
--- /dev/null
+++ b/devel/hs-old-time/pkg-descr
@@ -0,0 +1,3 @@
+This package provides the old time library.
+
+WWW: http://hackage.haskell.org/package/old-time
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index 26983edd..5359e2f 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= optparse-applicative
-PORTVERSION= 0.9.1.1
-PORTREVISION= 1
+PORTVERSION= 0.11.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Utilities and combinators for parsing command line options
LICENSE= BSD3CLAUSE
-USE_CABAL= ansi-wl-pprint>=0.6 transformers-compat
+USE_CABAL= ansi-wl-pprint>=0.6 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-optparse-applicative/distinfo b/devel/hs-optparse-applicative/distinfo
index c7b28de..a00ea9d 100644
--- a/devel/hs-optparse-applicative/distinfo
+++ b/devel/hs-optparse-applicative/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/optparse-applicative-0.9.1.1.tar.gz) = e6093c36f9b996f8431f588c1b95439fe151278e72a9236f51e2b5e4d340c8bb
-SIZE (cabal/optparse-applicative-0.9.1.1.tar.gz) = 32757
+SHA256 (cabal/optparse-applicative-0.11.0.2.tar.gz) = 31c6923c01cfd6dce0cf83f3430c17d164169f0db6ff2de9b3b294926214255a
+SIZE (cabal/optparse-applicative-0.11.0.2.tar.gz) = 30425
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index d00a1bb..0efe30d 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= parallel
-PORTVERSION= 3.2.0.4
-PORTREVISION= 1
+PORTVERSION= 3.2.0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/distinfo b/devel/hs-parallel/distinfo
index 7e67f42..cce1d45 100644
--- a/devel/hs-parallel/distinfo
+++ b/devel/hs-parallel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parallel-3.2.0.4.tar.gz) = 8cdb637fc04e4dd62f9deb0fe3c191b8068526009960f297f54dc9cf5616146d
-SIZE (cabal/parallel-3.2.0.4.tar.gz) = 12842
+SHA256 (cabal/parallel-3.2.0.6.tar.gz) = b928d3fbd0b7b247bfb7072796c6950f3a5b61ec051449cddf86ebfe89dbe642
+SIZE (cabal/parallel-3.2.0.6.tar.gz) = 12990
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 674d517..10c0a3c 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pcre-light
-PORTVERSION= 0.4.0.2
-PORTREVISION= 1
+PORTVERSION= 0.4.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-pcre-light/distinfo b/devel/hs-pcre-light/distinfo
index c153f1d..a670ce2 100644
--- a/devel/hs-pcre-light/distinfo
+++ b/devel/hs-pcre-light/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pcre-light-0.4.0.2.tar.gz) = ddda356c3dc0075d7fa2740a56845a68360baf896e3e9420ace68c399a21582d
-SIZE (cabal/pcre-light-0.4.0.2.tar.gz) = 15355
+SHA256 (cabal/pcre-light-0.4.0.3.tar.gz) = 6e6309fe0f759fe685c8c58a14dd204f7691675b15adbd88208ee332b5702d50
+SIZE (cabal/pcre-light-0.4.0.3.tar.gz) = 16574
diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile
index dd3f42b..b93e89f 100644
--- a/devel/hs-prelude-extras/Makefile
+++ b/devel/hs-prelude-extras/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prelude-extras
PORTVERSION= 0.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile
new file mode 100644
index 0000000..a158db5
--- /dev/null
+++ b/devel/hs-preprocessor-tools/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= preprocessor-tools
+PORTVERSION= 1.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Framework for extending Haskell's syntax via quick-and-dirty preprocessors
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= mtl>=1 parsec>=3 syb>=0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-preprocessor-tools/distinfo b/devel/hs-preprocessor-tools/distinfo
new file mode 100644
index 0000000..3a00f57
--- /dev/null
+++ b/devel/hs-preprocessor-tools/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/preprocessor-tools-1.0.1.tar.gz) = c946c99fe8c9effba27946cd2c26173d2346340528d800a228796d68f8aeee59
+SIZE (cabal/preprocessor-tools-1.0.1.tar.gz) = 9895
diff --git a/devel/hs-preprocessor-tools/pkg-descr b/devel/hs-preprocessor-tools/pkg-descr
new file mode 100644
index 0000000..6e05c41
--- /dev/null
+++ b/devel/hs-preprocessor-tools/pkg-descr
@@ -0,0 +1,6 @@
+This library provides a quick-and-dirty (but often effective) method for
+extending Haskell's syntax using a custom preprocessor. It parses
+Haskell into a bare-bones AST with just enough knowledge of the syntax
+to preserve nesting, and then allows transformations on the AST.
+
+WWW: http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/
diff --git a/devel/hs-prettyclass/Makefile b/devel/hs-prettyclass/Makefile
index cbdddd1..48c4e2d 100644
--- a/devel/hs-prettyclass/Makefile
+++ b/devel/hs-prettyclass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prettyclass
PORTVERSION= 1.0.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index 7f6d885..c3674d0 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= primitive
-PORTVERSION= 0.5.2.1
-PORTREVISION= 1
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 1cb1df2..91392bd 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/primitive-0.5.2.1.tar.gz) = 0e516b81c2ef2c96d47dc40561663cc2cbfece0f135948e77e9b53025ff1c3ee
-SIZE (cabal/primitive-0.5.2.1.tar.gz) = 10923
+SHA256 (cabal/primitive-0.6.tar.gz) = 34a5f39213c68369e7edc2a3ea175d3f4edbf89e9f0777784710eff6f2d69722
+SIZE (cabal/primitive-0.6.tar.gz) = 12677
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index 1e1e6b0..671a6c8 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 4.2.0.1
-PORTREVISION= 1
+PORTVERSION= 5.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,7 @@ COMMENT= Profunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 distributive>=0.4.4 semigroupoids>=4 \
- tagged>=0.4.4
+USE_CABAL= comonad>=4 distributive>=0.4.4 tagged>=0.4.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
index d90d35d..136ffac 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/profunctors-4.2.0.1.tar.gz) = 0cdb27e871e167e24935caee6435c08701227a116a8c526dea32ca3f54cc8e01
-SIZE (cabal/profunctors-4.2.0.1.tar.gz) = 15005
+SHA256 (cabal/profunctors-5.1.1.tar.gz) = 873f4478cdadd574c070c00fa790e4b0d8fb6f00577f142bf6e9dacbd48d8253
+SIZE (cabal/profunctors-5.1.1.tar.gz) = 17866
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index f7c0aa7..71e0917 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= project-template
-PORTVERSION= 0.1.4.1
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,7 @@ COMMENT= Specify Haskell project templates and generate files
LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring conduit>=1.0 conduit-extra mtl>=2.0 \
- resourcet>=0.4.3 system-fileio>=0.3 system-filepath>=0.4 \
- text>=0.11
+ resourcet>=0.4.3 text>=0.11
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo
index 52888d7..24f8fe5 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/project-template-0.1.4.1.tar.gz) = 8b16b378f3852d9ba8f2531a8c97515a2a2bc6e762c1437c5b9cb53f89425def
-SIZE (cabal/project-template-0.1.4.1.tar.gz) = 4483
+SHA256 (cabal/project-template-0.2.0.tar.gz) = aeabd7d1785b31abaffc78f02d9dda67d57d01822755f09614bfc65e99506310
+SIZE (cabal/project-template-0.2.0.tar.gz) = 8251
diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
index 12e6fb4..4ecbbef 100644
--- a/devel/hs-quickcheck-io/Makefile
+++ b/devel/hs-quickcheck-io/Makefile
@@ -2,7 +2,7 @@
PORTNAME= quickcheck-io
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index c154082..c0322ce 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= random
-PORTVERSION= 1.0.1.1
-PORTREVISION= 10
+PORTVERSION= 1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/distinfo b/devel/hs-random/distinfo
index 7ebef9e..aac052b 100644
--- a/devel/hs-random/distinfo
+++ b/devel/hs-random/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/random-1.0.1.1.tar.gz) = df7c3b405de0ac27a2ee8fdc8dad87cb42e8eac01fef53861e43bc47c8111559
-SIZE (cabal/random-1.0.1.1.tar.gz) = 8699
+SHA256 (cabal/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
+SIZE (cabal/random-1.1.tar.gz) = 10870
diff --git a/devel/hs-ranges/distinfo b/devel/hs-ranges/distinfo
deleted file mode 100644
index 569c639..0000000
--- a/devel/hs-ranges/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/ranges-0.2.4.tar.gz) = dbbba083fccdd7f27454db3f29d0f9f13e927cb1e985641e5dbdcdbfddaebbfa
-SIZE (cabal/ranges-0.2.4.tar.gz) = 2244
diff --git a/devel/hs-ranges/pkg-descr b/devel/hs-ranges/pkg-descr
deleted file mode 100644
index 80a7432..0000000
--- a/devel/hs-ranges/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Ranges and some functions allowing things like fast membership lookup on
-ranges with holes in them and so on.
-
-WWW: http://hackage.haskell.org/package/ranges
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 65a28e8..3e2e695 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index 534c7ed..b607c9c 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 1.5.1
-PORTREVISION= 1
+PORTVERSION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index 7a21bf3..e025aa7 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/reflection-1.5.1.tar.gz) = 9d4ad85c11a4986c904629c226c2be56f129f7691ddefe9373b2e87ca4a151a1
-SIZE (cabal/reflection-1.5.1.tar.gz) = 9436
+SHA256 (cabal/reflection-2.tar.gz) = ee199e899e3810c3c8fd27dbda5cc3d1730f69e4a75f7494482863cf4d9499c2
+SIZE (cabal/reflection-2.tar.gz) = 13194
diff --git a/devel/hs-reflection/pkg-descr b/devel/hs-reflection/pkg-descr
index b07f7d5..1bc2f47 100644
--- a/devel/hs-reflection/pkg-descr
+++ b/devel/hs-reflection/pkg-descr
@@ -1,5 +1,11 @@
-This package provides an implementation of the ideas presented in the
-paper "Functional Pearl: Implicit Configurations" by Oleg Kiselyov and
-Chung-chieh Shan.
+This package addresses the configuration problem which is propogating
+configurations that are available at run-time, allowing multible
+configurations to coexist without resorting to mutable global variables
+or System.IO.Unsafe.unsafePerformIO.
+
+That package is an implementation of the ideas presented in the paper
+"Functional Pearl: Implicit Configurations" by Oleg Kiselyov and
+Chung-chieh Shan (original paper). However, the API has been
+streamlined to improve performance.
WWW: http://github.com/ekmett/reflection
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index 89e641a..2e85422 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= resource-pool
-PORTVERSION= 0.2.3.0
-PORTREVISION= 1
+PORTVERSION= 0.2.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= High-performance striped resource pooling implementation
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable monad-control>=0.2.0.1 stm transformers-base>=0.4 \
- vector>=0.7
+USE_CABAL= hashable monad-control>=0.2.0.1 stm>=2.3 \
+ transformers-base>=0.4 vector>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resource-pool/distinfo b/devel/hs-resource-pool/distinfo
index 001e24e..6f889e5 100644
--- a/devel/hs-resource-pool/distinfo
+++ b/devel/hs-resource-pool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resource-pool-0.2.3.0.tar.gz) = b086b50dea777db4ab2eea3f5e4b98c72b60a27f560e0ac60c2f1a8ded5e2f96
-SIZE (cabal/resource-pool-0.2.3.0.tar.gz) = 6500
+SHA256 (cabal/resource-pool-0.2.3.2.tar.gz) = 8627eea2bea8824af2723646e74e2af0c73f583dd0c496c9fd242cd9d242bc12
+SIZE (cabal/resource-pool-0.2.3.2.tar.gz) = 6527
diff --git a/devel/hs-resourcet/Makefile b/devel/hs-resourcet/Makefile
index b85e83c..aa6659e 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 1.1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Deterministic allocation and freeing of scarce resources
LICENSE= BSD3CLAUSE
USE_CABAL= exceptions>=0.5 lifted-base>=0.1 mmorph monad-control>=0.3.1 \
- mtl>=2.0 transformers-base>=0.4.1
+ mtl>=2.0 transformers-base>=0.4.1 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index af2a3d0..12e5783 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/resourcet-1.1.2.3.tar.gz) = 351e9451b5d9001078084916385f403774ba6ba28ed53c1be6e35134070e3fd8
-SIZE (cabal/resourcet-1.1.2.3.tar.gz) = 10745
+SHA256 (cabal/resourcet-1.1.6.tar.gz) = 3e10ea62fd97334a5fd6aa3410e6cf50d46b914aa1c028b7393e234b94521a7e
+SIZE (cabal/resourcet-1.1.6.tar.gz) = 11627
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index 264103e..d7cceee 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= safe
-PORTVERSION= 0.3.7
-PORTREVISION= 1
+PORTVERSION= 0.3.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe/distinfo b/devel/hs-safe/distinfo
index 839ff0d..1fa4b9d 100644
--- a/devel/hs-safe/distinfo
+++ b/devel/hs-safe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/safe-0.3.7.tar.gz) = c114c41e1403441e3f873c9c9943368bda7069ff007fe60ce3f9509e95ac8867
-SIZE (cabal/safe-0.3.7.tar.gz) = 6294
+SHA256 (cabal/safe-0.3.9.tar.gz) = d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9
+SIZE (cabal/safe-0.3.9.tar.gz) = 6931
diff --git a/devel/hs-safe/pkg-descr b/devel/hs-safe/pkg-descr
index 8e6aa56..7fdc399 100644
--- a/devel/hs-safe/pkg-descr
+++ b/devel/hs-safe/pkg-descr
@@ -1,6 +1,12 @@
-Partial functions from the Haskell base library, such as head and !!, modified
-to return more descriptive error messages, programmer defined error messages,
-Maybe wrapped results and default values. These functions can be used to
-reduce the number of unsafe pattern matches in your code.
+A library wrapping Prelude/Data.List functions that can throw exceptions,
+such as head and !!.
-WWW: http://community.haskell.org/~ndm/safe/
+This package is divided into three modules:
+
+ * Safe contains safe variants of Prelude and Data.List functions.
+ * Safe.Foldable contains safe variants of Foldable functions.
+ * Safe.Exact creates crashing versions of functions like zip (errors if the
+ lists are not equal) and take (errors if there are not enough elements),
+ then wraps them to provide safe variants.
+
+WWW: https://github.com/ndmitchell/safe#readme
diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile
index c813c42..6f48878 100644
--- a/devel/hs-scientific/Makefile
+++ b/devel/hs-scientific/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= scientific
-PORTVERSION= 0.3.3.0
-PORTREVISION= 1
+PORTVERSION= 0.3.3.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-scientific/distinfo b/devel/hs-scientific/distinfo
index 23832d6..f91c9de 100644
--- a/devel/hs-scientific/distinfo
+++ b/devel/hs-scientific/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/scientific-0.3.3.0.tar.gz) = 3bab5bc2df22feac6b2e461daf3ececae2e5083569e09bb463a78e82574c44ce
-SIZE (cabal/scientific-0.3.3.0.tar.gz) = 17182
+SHA256 (cabal/scientific-0.3.3.8.tar.gz) = e30cde2a44a7beded15afd56606c562b76e457835e7de2942815f22bc74bce4c
+SIZE (cabal/scientific-0.3.3.8.tar.gz) = 18543
diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile
index 17129e8..b1a5d52 100644
--- a/devel/hs-securemem/Makefile
+++ b/devel/hs-securemem/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= securemem
-PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTVERSION= 0.1.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Abstraction to an auto scrubbing and const time eq, memory chunk
LICENSE= BSD3CLAUSE
-USE_CABAL= byteable>=0.1.1
+USE_CABAL= byteable>=0.1.1 memory>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-securemem/distinfo b/devel/hs-securemem/distinfo
index c826a19..ab0b798 100644
--- a/devel/hs-securemem/distinfo
+++ b/devel/hs-securemem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/securemem-0.1.3.tar.gz) = 12a42caa7b09076197f14eb8511ec98969becdd81596617fe71cc13dcebccccf
-SIZE (cabal/securemem-0.1.3.tar.gz) = 4585
+SHA256 (cabal/securemem-0.1.9.tar.gz) = feb60dc542ea3ce9cdb449093b85dc69e43df310aab4fd161e4cdaa3ba847036
+SIZE (cabal/securemem-0.1.9.tar.gz) = 4180
diff --git a/devel/hs-setenv/Makefile b/devel/hs-setenv/Makefile
index cb44647..97cf3c6 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= setenv
-PORTVERSION= 0.1.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/distinfo b/devel/hs-setenv/distinfo
index c0147ff..dded823 100644
--- a/devel/hs-setenv/distinfo
+++ b/devel/hs-setenv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/setenv-0.1.1.1.tar.gz) = 230d87b0d04b2b05460ddf5a31569250ee1c3df6f91762733a29c434b7def32b
-SIZE (cabal/setenv-0.1.1.1.tar.gz) = 3019
+SHA256 (cabal/setenv-0.1.1.3.tar.gz) = e358df39afc03d5a39e2ec650652d845c85c80cc98fe331654deafb4767ecb32
+SIZE (cabal/setenv-0.1.1.3.tar.gz) = 2710
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
index b141468..af2c6d8 100644
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shake
-PORTVERSION= 0.13.2
-PORTREVISION= 1
+PORTVERSION= 0.15.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Build system library, like Make, but more accurate dependencies
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1.2.3 random unordered-containers>=0.2.1 \
- utf8-string>=0.3
+USE_CABAL= extra>=1.3 hashable>=1.1.2.3 js-flot js-jquery old-time \
+ random unordered-containers>=0.2.1 utf8-string>=0.3
EXECUTABLE= shake
diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo
index b151993..66d22f9 100644
--- a/devel/hs-shake/distinfo
+++ b/devel/hs-shake/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shake-0.13.2.tar.gz) = cafa769e1b04f989ab5bc87d9f8fac38d7421774b2aacd1e7750f5de80077845
-SIZE (cabal/shake-0.13.2.tar.gz) = 1235826
+SHA256 (cabal/shake-0.15.5.tar.gz) = 2c806824c9e8a619f364c3ec6bb910d7b1d0b0d3ba39ab472bffb60311f373a3
+SIZE (cabal/shake-0.15.5.tar.gz) = 507883
diff --git a/devel/hs-shake/pkg-descr b/devel/hs-shake/pkg-descr
index 1c1dd5c..13ba332 100644
--- a/devel/hs-shake/pkg-descr
+++ b/devel/hs-shake/pkg-descr
@@ -11,4 +11,4 @@ provides highly accurate dependency tracking, including seamless support
for generated files, and dependencies on system information (e.g. compiler
version).
-WWW: https://github.com/ndmitchell/shake
+WWW: http://shakebuild.com/
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index 3e2e1c6..aec1d07 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.6
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index e863c90..3306d81 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= silently
-PORTVERSION= 1.2.4.1
-PORTREVISION= 7
+PORTVERSION= 1.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/distinfo b/devel/hs-silently/distinfo
index e80b076..c9b6aed 100644
--- a/devel/hs-silently/distinfo
+++ b/devel/hs-silently/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/silently-1.2.4.1.tar.gz) = a2b8f53e7e7bc0272852852c49d8b27ff250accc73e25cbe9f1e20f3fee0ad0c
-SIZE (cabal/silently-1.2.4.1.tar.gz) = 3199
+SHA256 (cabal/silently-1.2.5.tar.gz) = cef625635053a46032ca53b43d311921875a437910b6568ded17027fdca83839
+SIZE (cabal/silently-1.2.5.tar.gz) = 3364
diff --git a/devel/hs-silently/pkg-descr b/devel/hs-silently/pkg-descr
index de5c206..d6c68b6 100644
--- a/devel/hs-silently/pkg-descr
+++ b/devel/hs-silently/pkg-descr
@@ -1,3 +1,3 @@
Prevent or capture writing to stdout and other handles.
-WWW: https://github.com/trystan/silently
+WWW: https://github.com/hspec/silently
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index 601e95a..48ba1ad 100644
--- a/devel/hs-simple-reflect/Makefile
+++ b/devel/hs-simple-reflect/Makefile
@@ -2,7 +2,7 @@
PORTNAME= simple-reflect
PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index d69a03f..c3aec7b 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smallcheck
PORTVERSION= 1.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index bc53c92..e3ba211 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -3,7 +3,7 @@
PORTNAME= split
PORTVERSION= 0.2.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/files/patch-split.cabal b/devel/hs-split/files/patch-split.cabal
new file mode 100644
index 0000000..be8fe22
--- /dev/null
+++ b/devel/hs-split/files/patch-split.cabal
@@ -0,0 +1,11 @@
+--- split.cabal.orig 2013-04-14 18:47:17 UTC
++++ split.cabal
+@@ -51,7 +51,7 @@ Source-repository head
+
+ Library
+ ghc-options: -Wall
+- build-depends: base <4.8
++ build-depends: base <4.9
+ exposed-modules: Data.List.Split, Data.List.Split.Internals
+ default-language: Haskell2010
+ Hs-source-dirs: src
diff --git a/devel/hs-stm-chans/Makefile b/devel/hs-stm-chans/Makefile
index c81c93f..6be17fe 100644
--- a/devel/hs-stm-chans/Makefile
+++ b/devel/hs-stm-chans/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= stm-chans
-PORTVERSION= 3.0.0.2
-PORTREVISION= 1
+PORTVERSION= 3.0.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm-chans/distinfo b/devel/hs-stm-chans/distinfo
index 48eb7bb..e0fa2ef 100644
--- a/devel/hs-stm-chans/distinfo
+++ b/devel/hs-stm-chans/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stm-chans-3.0.0.2.tar.gz) = d07abf7a8bf9689b92f69bb73e9c1b71dc785d7b0a7b512dc24d77e945024aff
-SIZE (cabal/stm-chans-3.0.0.2.tar.gz) = 9401
+SHA256 (cabal/stm-chans-3.0.0.4.tar.gz) = 2344fc5bfa33d565bad7b009fc0e2c5a7a595060ba149c661f44419fc0d54738
+SIZE (cabal/stm-chans-3.0.0.4.tar.gz) = 9673
diff --git a/devel/hs-stm/Makefile b/devel/hs-stm/Makefile
index 6118a68..e026222 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= stm
-PORTVERSION= 2.4.2
-PORTREVISION= 6
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo
index 6216a14..314276a 100644
--- a/devel/hs-stm/distinfo
+++ b/devel/hs-stm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stm-2.4.2.tar.gz) = c8ee3cd64c266133902619cfff2d04e5f66206f91dbce8dd1182037fbe4858db
-SIZE (cabal/stm-2.4.2.tar.gz) = 9635
+SHA256 (cabal/stm-2.4.4.tar.gz) = 5dfb588a01b46f427b16a92d6b7843ac81489639bbdfd962e5795c19dbfe883d
+SIZE (cabal/stm-2.4.4.tar.gz) = 10349
diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile
index 389166a..e7c7f80 100644
--- a/devel/hs-streaming-commons/Makefile
+++ b/devel/hs-streaming-commons/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= streaming-commons
-PORTVERSION= 0.1.4.1
-PORTREVISION= 1
+PORTVERSION= 0.1.12.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-streaming-commons/distinfo b/devel/hs-streaming-commons/distinfo
index 7cc5d80..53346af 100644
--- a/devel/hs-streaming-commons/distinfo
+++ b/devel/hs-streaming-commons/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/streaming-commons-0.1.4.1.tar.gz) = 8caada6a54ec1e469510701426748af60e3633835679e05d5c107c58a4a8bd58
-SIZE (cabal/streaming-commons-0.1.4.1.tar.gz) = 77980
+SHA256 (cabal/streaming-commons-0.1.12.1.tar.gz) = d5bd8dd0b11a13d1d128d15dce31b3f2f4625c7f72d4420e749d85bf170a4fd7
+SIZE (cabal/streaming-commons-0.1.12.1.tar.gz) = 86864
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 39b4ee7..0a03a25 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
index ac8e95e..404b776 100644
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ b/devel/hs-syb-with-class-instances-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= syb-with-class-instances-text
PORTVERSION= 0.0.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index e4aa338..7189fde 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= syb-with-class
-PORTVERSION= 0.6.1.5
-PORTREVISION= 1
+PORTVERSION= 0.6.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 0c6d837..4146278 100644
--- a/devel/hs-syb-with-class/distinfo
+++ b/devel/hs-syb-with-class/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/syb-with-class-0.6.1.5.tar.gz) = f617ee2dc6f2b0ad35e130c50500a2f67fe76b94df86b7ce5cfb2d2545bac4be
-SIZE (cabal/syb-with-class-0.6.1.5.tar.gz) = 12443
+SHA256 (cabal/syb-with-class-0.6.1.6.tar.gz) = 565c909dcf39c30c7fa2b5721e5d1049dbc9cdcd23e63645f69d8e245e84c1b0
+SIZE (cabal/syb-with-class-0.6.1.6.tar.gz) = 12515
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index 6aaed66..fbe3ba5 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= syb
-PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTVERSION= 0.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb/distinfo b/devel/hs-syb/distinfo
index 3190993..fa8be9c 100644
--- a/devel/hs-syb/distinfo
+++ b/devel/hs-syb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/syb-0.4.1.tar.gz) = aa32cb3d9a0cbcfb24ac1c5d567886e8908dd017fd009ffd446bff86732670d2
-SIZE (cabal/syb-0.4.1.tar.gz) = 38699
+SHA256 (cabal/syb-0.5.1.tar.gz) = 81b05f0e78d03e1cabe9610a6045a5ae74d88eaed7e79464d436ccaa6af93846
+SIZE (cabal/syb-0.5.1.tar.gz) = 39469
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index 9b1db5d..c94909f 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= system-fileio
-PORTVERSION= 0.3.14
-PORTREVISION= 1
+PORTVERSION= 0.3.16.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/distinfo b/devel/hs-system-fileio/distinfo
index df65aaa..88c5f33 100644
--- a/devel/hs-system-fileio/distinfo
+++ b/devel/hs-system-fileio/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-fileio-0.3.14.tar.gz) = 49c03f08ec03a0647392738e9d445048ac3734c22392a6dae63c58d159ccacf4
-SIZE (cabal/system-fileio-0.3.14.tar.gz) = 15390
+SHA256 (cabal/system-fileio-0.3.16.3.tar.gz) = 3175707cb322c65760fa2eb2ab17327f251c8294ad688efc6258e82328830491
+SIZE (cabal/system-fileio-0.3.16.3.tar.gz) = 15296
diff --git a/devel/hs-system-filepath/Makefile b/devel/hs-system-filepath/Makefile
index c2e3dc6..4ac83df 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= system-filepath
-PORTVERSION= 0.4.12
-PORTREVISION= 1
+PORTVERSION= 0.4.13.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= High-level, byte-based file and directory path manipulations
LICENSE= MIT
-USE_CABAL= text>=0.7.1
+USE_CABAL= text>=0.11.0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo
index e7181fb..10b75e6 100644
--- a/devel/hs-system-filepath/distinfo
+++ b/devel/hs-system-filepath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/system-filepath-0.4.12.tar.gz) = a2714835ac25263b64c340a497e4d9409b8475181b885bb1836995f63855d969
-SIZE (cabal/system-filepath-0.4.12.tar.gz) = 15860
+SHA256 (cabal/system-filepath-0.4.13.4.tar.gz) = 345d7dec968b74ab1b8c0e7bb78c2ef1e5be7be6b7bac455340fd658abfec5fb
+SIZE (cabal/system-filepath-0.4.13.4.tar.gz) = 16590
diff --git a/devel/hs-system-filepath/pkg-descr b/devel/hs-system-filepath/pkg-descr
index c57f561..059dae3 100644
--- a/devel/hs-system-filepath/pkg-descr
+++ b/devel/hs-system-filepath/pkg-descr
@@ -1,3 +1,3 @@
High-level, byte-based file and directory path manipulations.
-WWW: https://john-millikin.com/software/haskell-filesystem/
+WWW: https://github.com/fpco/haskell-filesystem
diff --git a/devel/hs-tagged/Makefile b/devel/hs-tagged/Makefile
index 541ffe0..38be9ae 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tagged
-PORTVERSION= 0.7.2
-PORTREVISION= 1
+PORTVERSION= 0.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tagged/distinfo b/devel/hs-tagged/distinfo
index 3fac855..14ddc6e 100644
--- a/devel/hs-tagged/distinfo
+++ b/devel/hs-tagged/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagged-0.7.2.tar.gz) = 055b2d9f7124176197f3564bcdbbb62374090c9e103819bff0d4e22db47e871b
-SIZE (cabal/tagged-0.7.2.tar.gz) = 5534
+SHA256 (cabal/tagged-0.8.1.tar.gz) = 5bdd98389fcca3aa9c9902d1fb209fd431685ba6530f3051ebe1960fe1c782c1
+SIZE (cabal/tagged-0.8.1.tar.gz) = 8088
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index ba117b0..eb5fd35 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -2,7 +2,7 @@
PORTNAME= temporary
PORTVERSION= 1.2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 3386cc4..28ee940 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-hunit
PORTVERSION= 0.3.0.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index 0d0e239..bf848b7 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -2,7 +2,7 @@
PORTNAME= test-framework-quickcheck2
PORTVERSION= 0.3.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal b/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
new file mode 100644
index 0000000..64f0f4a
--- /dev/null
+++ b/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
@@ -0,0 +1,11 @@
+--- test-framework-quickcheck2.cabal.orig 2014-04-11 10:23:46 UTC
++++ test-framework-quickcheck2.cabal
+@@ -25,7 +25,7 @@ Library
+ Exposed-Modules: Test.Framework.Providers.QuickCheck2
+
+ Build-Depends: test-framework >= 0.7.1,
+- QuickCheck >= 2.4 && < 2.8,
++ QuickCheck >= 2.4 && < 2.9,
+ extensible-exceptions >= 0.1.1 && < 0.2.0
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4, random >= 1
diff --git a/devel/hs-test-framework/Makefile b/devel/hs-test-framework/Makefile
index 931fb55..8518670 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= test-framework
-PORTVERSION= 0.8.0.3
-PORTREVISION= 1
+PORTVERSION= 0.8.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Framework for running and organising tests, with HUnit and QuickCheck s
LICENSE= BSD3CLAUSE
USE_CABAL= ansi-terminal>=0.4.0 ansi-wl-pprint>=0.5.1 hostname>=1.0 \
- random>=1.0 regex-posix>=0.72 xml>=1.3.5
+ old-locale>=1.0 random>=1.0 regex-posix>=0.72 xml>=1.3.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo
index 4002874..ac25d81 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/test-framework-0.8.0.3.tar.gz) = 5915bebf20a36f524241d1b85c45be2f767a9f9caeddc06d96e3ebab5ae1d68c
-SIZE (cabal/test-framework-0.8.0.3.tar.gz) = 20777
+SHA256 (cabal/test-framework-0.8.1.1.tar.gz) = 7883626a5aebb1df327bf26dbd382208946250a79f9cc3bf9a9eb0b0767bb273
+SIZE (cabal/test-framework-0.8.1.1.tar.gz) = 20900
diff --git a/devel/hs-test-framework/pkg-descr b/devel/hs-test-framework/pkg-descr
index fed5157..302c3ac 100644
--- a/devel/hs-test-framework/pkg-descr
+++ b/devel/hs-test-framework/pkg-descr
@@ -4,4 +4,4 @@ order, to aid diff interpretation) and filtered and controlled by command
line options. All of this comes with colored test output, progress reporting
and test statistics output.
-WWW: http://batterseapower.github.com/test-framework/
+WWW: http://batterseapower.github.io/test-framework/
diff --git a/devel/hs-testpack/Makefile b/devel/hs-testpack/Makefile
deleted file mode 100644
index d0535fb..0000000
--- a/devel/hs-testpack/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= testpack
-PORTVERSION= 2.1.2.1
-PORTREVISION= 7
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Test Utility Pack for HUnit and QuickCheck
-
-LICENSE= LGPL21
-
-USE_CABAL= HUnit mtl QuickCheck>=2.1.0.3 random
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-testpack/distinfo b/devel/hs-testpack/distinfo
deleted file mode 100644
index 6261b2a..0000000
--- a/devel/hs-testpack/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/testpack-2.1.2.1.tar.gz) = 4096465f44f1add5a24134bebdcef5259bff31661680cc1061900bbd936fa4ba
-SIZE (cabal/testpack-2.1.2.1.tar.gz) = 14795
diff --git a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs b/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
deleted file mode 100644
index c0bab41..0000000
--- a/devel/hs-testpack/files/patch-src__Test__HUnit__Tools.hs
+++ /dev/null
@@ -1,74 +0,0 @@
---- ./src/Test/HUnit/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./src/Test/HUnit/Tools.hs 2013-05-04 00:47:19.298796917 +0200
-@@ -22,7 +22,11 @@
- import Test.QuickCheck.Gen
- import Test.QuickCheck.State
- import qualified Test.QuickCheck.Property as P
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+import Test.QuickCheck.Property hiding (Result(reason), interrupted)
-+#else
- import Test.QuickCheck.Property hiding (Result(reason))
-+#endif
- import qualified Control.Exception
- import qualified Test.HUnit as HU
- import System.Random
-@@ -128,7 +132,11 @@
- > q "Integer -> Int (safe bounds)" prop_integer_to_int_pass]
- -}
- qc2hu :: QC.Testable a => Int -> String -> a -> HU.Test
-+#if MIN_VERSION_QuickCheck(2,5,0)
-+qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscardRatio = 1000})
-+#else
- qc2hu maxTest = qccheck (stdArgs {maxSuccess = maxTest, maxDiscard = 20000})
-+#endif
-
- {- | Run verbose tests. Example:
-
-@@ -163,18 +171,26 @@
- -- | Tests a property, using test arguments, produces a test result, and prints the results to 'stdout'.
- localquickCheckWithResult :: Testable prop => Args -> prop -> IO Result
- localquickCheckWithResult args p =
-- do
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+ (if chatty args then withStdioTerminal else withNullTerminal) $ \tm -> do
-+#else
-+ do
- #if MIN_VERSION_QuickCheck(2,3,0)
- tm <- if chatty args then newStdioTerminal else newNullTerminal
- #else
- tm <- newTerminal
- #endif
-+#endif
- rnd <- case replay args of
- Nothing -> newStdGen
- Just (rnd,_) -> return rnd
- test MkState{ terminal = tm
- , maxSuccessTests = maxSuccess args
-+#if MIN_VERSION_QuickCheck(2,5,0)
-+ , maxDiscardedTests = maxDiscardRatio args
-+#else
- , maxDiscardedTests = maxDiscard args
-+#endif
- , computeSize = case replay args of
- Nothing -> \n d -> (n * maxSize args)
- `div` maxSuccess args
-@@ -190,6 +206,10 @@
- #endif
- , numSuccessShrinks = 0
- , numTryShrinks = 0
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+ , numRecentlyDiscardedTests = 0
-+ , numTotTryShrinks = 0
-+#endif
- } (unGen (property p))
- where
- --------------------------------------------------------------------------
-@@ -288,5 +308,8 @@
- , numShrinks = numShrinks
- , output = theOutput
- #endif
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+ , interrupted = False
-+#endif
- }
- where (rnd1,rnd2) = split (randomSeed st)
diff --git a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs b/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
deleted file mode 100644
index 446d7df..0000000
--- a/devel/hs-testpack/files/patch-src__Test__QuickCheck__Tools.hs
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/Test/QuickCheck/Tools.hs.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./src/Test/QuickCheck/Tools.hs 2013-05-04 00:42:02.274698941 +0200
-@@ -23,14 +23,18 @@
-
- )
- where
-+#if MIN_VERSION_QuickCheck(2,6,0)
-+import Test.QuickCheck hiding (Result, reason, interrupted)
-+#else
- import Test.QuickCheck hiding (Result, reason)
-+#endif
- import Test.QuickCheck.Property
-
- {- | Compare two values. If same, the test passes. If different, the result indicates
- what was expected and what was received as part of the error. -}
- (@=?) :: (Eq a, Show a) => a -> a -> Result
- expected @=? actual =
-- MkResult {ok = Just (expected == actual),
-+ result { ok = Just (expected == actual),
- expect = True, interrupted = False,
- reason = "Result: expected " ++ show expected ++ ", got " ++ show actual,
- stamp = [], callbacks = []}
diff --git a/devel/hs-testpack/files/patch-testpack.cabal b/devel/hs-testpack/files/patch-testpack.cabal
deleted file mode 100644
index ad3736a..0000000
--- a/devel/hs-testpack/files/patch-testpack.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./testpack.cabal.orig 2013-02-25 16:03:46.000000000 +0100
-+++ ./testpack.cabal 2013-05-04 00:08:00.417315359 +0200
-@@ -39,7 +39,7 @@
-
- Build-Depends: base >= 3 && < 5,
- mtl, HUnit,
-- QuickCheck >= 2.1.0.3 && < 2.5
-+ QuickCheck >= 2.1.0.3 && < 2.7
-
- If flag(splitBase)
- Build-Depends: base >= 3 && < 5, containers, random
diff --git a/devel/hs-testpack/pkg-descr b/devel/hs-testpack/pkg-descr
deleted file mode 100644
index b110688..0000000
--- a/devel/hs-testpack/pkg-descr
+++ /dev/null
@@ -1,9 +0,0 @@
-Haskell Test Utility Pack for HUnit and QuickCheck testpack provides
-utilities for both HUnit and QuickCheck. These include tools for running
-QuickCheck properties as HUnit test cases, allowing you to combine both
-approaches in a single program. It also includes tools for more helpful
-displays of running progress in both HUnit and QuickCheck, additional
-generators for other types for QuickCheck, and shortcuts for quickly
-defining new test cases.
-
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/testpack
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 3059400..1fd6fa8 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= text-icu
-PORTVERSION= 0.6.3.7
-PORTREVISION= 2
+PORTVERSION= 0.7.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text-icu/distinfo b/devel/hs-text-icu/distinfo
index 5a68d6e..df0f0b1 100644
--- a/devel/hs-text-icu/distinfo
+++ b/devel/hs-text-icu/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/text-icu-0.6.3.7.tar.gz) = c4c13df96bb5c7fcd32f7ba08543ac6ffe0f121a9cb7c77b6a34bbceaa92ff57
-SIZE (cabal/text-icu-0.6.3.7.tar.gz) = 44748
+SHA256 (cabal/text-icu-0.7.0.1.tar.gz) = e2764c2749033706eed5b9fb3cda11177ad15cdf11912028f551eca39a2c7f78
+SIZE (cabal/text-icu-0.7.0.1.tar.gz) = 45533
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index 275e4c7..8cb68ca 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= text
-PORTVERSION= 1.1.0.0
-PORTREVISION= 1
+PORTVERSION= 1.2.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
index 87f24e1..21a9b69 100644
--- a/devel/hs-text/distinfo
+++ b/devel/hs-text/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/text-1.1.0.0.tar.gz) = 80f1ada824f0e3886bb49dc7fd128707ca1a34e06bbf4419873b1677c4d7ba92
-SIZE (cabal/text-1.1.0.0.tar.gz) = 136463
+SHA256 (cabal/text-1.2.1.3.tar.gz) = 98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f
+SIZE (cabal/text-1.2.1.3.tar.gz) = 145946
diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile
index 0d1aaab..9e85e89 100644
--- a/devel/hs-tf-random/Makefile
+++ b/devel/hs-tf-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tf-random
PORTVERSION= 0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index 893ed8f..dbd3339 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= threads
-PORTVERSION= 0.5.1.2
-PORTREVISION= 1
+PORTVERSION= 0.5.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Fork threads and wait for their result
LICENSE= BSD3CLAUSE
-USE_CABAL= base-unicode-symbols>=0.1.1 stm>=2.1
+USE_CABAL= stm>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo
index 3949eaa..db08e1a 100644
--- a/devel/hs-threads/distinfo
+++ b/devel/hs-threads/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threads-0.5.1.2.tar.gz) = 49a4d776b9c8c8d11467a95bab500cca8a3921251db977dffca42a6dd45702af
-SIZE (cabal/threads-0.5.1.2.tar.gz) = 7418
+SHA256 (cabal/threads-0.5.1.3.tar.gz) = 02bd4c7597f77d0d5064db4031547cd7b4989f453c77d520223ba2b1b9846411
+SIZE (cabal/threads-0.5.1.3.tar.gz) = 7239
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index b6bfeb6..5fdd479 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= threadscope
-PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTVERSION= 0.2.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Graphical tool for profiling parallel Haskell programs
LICENSE= BSD3CLAUSE
USE_CABAL= cairo ghc-events>=0.4.2 glib gtk>=0.12 gtk2hs-buildtools mtl \
- pango
+ pango text
EXECUTABLE= threadscope
diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo
index 565e556..a93d17e 100644
--- a/devel/hs-threadscope/distinfo
+++ b/devel/hs-threadscope/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/threadscope-0.2.4.tar.gz) = 2915c8ba9a5bb249cc915860fe56402140e2cb9441664bd8b36dc80dd07d0888
-SIZE (cabal/threadscope-0.2.4.tar.gz) = 79582
+SHA256 (cabal/threadscope-0.2.7.tar.gz) = cc5653831252d55b3ba7506ea648e770b2c4489cdf4d78828f07dc24ea7ffdb6
+SIZE (cabal/threadscope-0.2.7.tar.gz) = 79966
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 9c181de..50cabf4 100644
--- a/devel/hs-time-compat/Makefile
+++ b/devel/hs-time-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= time-compat
PORTVERSION= 0.1.0.3
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +10,7 @@ COMMENT= Compatibility with old-time for the time package
LICENSE= BSD3CLAUSE
+USE_CABAL= old-time
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-time-locale-compat/Makefile b/devel/hs-time-locale-compat/Makefile
new file mode 100644
index 0000000..efae2d3
--- /dev/null
+++ b/devel/hs-time-locale-compat/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= time-locale-compat
+PORTVERSION= 0.1.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Compatibility of TimeLocale between old-locale and time-1.5
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-time-locale-compat/distinfo b/devel/hs-time-locale-compat/distinfo
new file mode 100644
index 0000000..254aff6
--- /dev/null
+++ b/devel/hs-time-locale-compat/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/time-locale-compat-0.1.1.0.tar.gz) = 25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455
+SIZE (cabal/time-locale-compat-0.1.1.0.tar.gz) = 1933
diff --git a/devel/hs-time-locale-compat/pkg-descr b/devel/hs-time-locale-compat/pkg-descr
new file mode 100644
index 0000000..5228228
--- /dev/null
+++ b/devel/hs-time-locale-compat/pkg-descr
@@ -0,0 +1,3 @@
+This package contains wrapped name module for TimeLocale.
+
+WWW: http://twitter.com/khibino/
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index d01ea0c..05ca18b 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-olson
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.1.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo
index 5b49e51..755daf3 100644
--- a/devel/hs-timezone-olson/distinfo
+++ b/devel/hs-timezone-olson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/timezone-olson-0.1.4.tar.gz) = b38853e003bb8d8db927ba393a0d1c0aa64ffc1a7b1feba23e9dee14f133b2d0
-SIZE (cabal/timezone-olson-0.1.4.tar.gz) = 11639
+SHA256 (cabal/timezone-olson-0.1.7.tar.gz) = 232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa
+SIZE (cabal/timezone-olson-0.1.7.tar.gz) = 11313
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index 10c64be..f7b71b9 100644
--- a/devel/hs-timezone-series/Makefile
+++ b/devel/hs-timezone-series/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-series
-PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTVERSION= 0.1.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-series/distinfo b/devel/hs-timezone-series/distinfo
index 1ead3af..8996106 100644
--- a/devel/hs-timezone-series/distinfo
+++ b/devel/hs-timezone-series/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/timezone-series-0.1.3.tar.gz) = e37034f21c309b700fcb1a50527f325c25e47969e3faf954a0ee659e4452232c
-SIZE (cabal/timezone-series-0.1.3.tar.gz) = 5416
+SHA256 (cabal/timezone-series-0.1.5.1.tar.gz) = d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56
+SIZE (cabal/timezone-series-0.1.5.1.tar.gz) = 5330
diff --git a/devel/hs-timezone-series/pkg-descr b/devel/hs-timezone-series/pkg-descr
index e5828ef..75626f9 100644
--- a/devel/hs-timezone-series/pkg-descr
+++ b/devel/hs-timezone-series/pkg-descr
@@ -1,5 +1,4 @@
This package endows Data.Time, from the time package, with several data
-types and functions for enhanced processing of timezones. For one way to
-create timezone series, see the timezone-olson package.
+types and functions for enhanced processing of timezones.
WWW: http://projects.haskell.org/time-ng/
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index 3c25eea..a0887be 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= transformers-base
-PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTVERSION= 0.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= Lift computations from the bottom of a transformer stack
LICENSE= BSD3CLAUSE
+USE_CABAL= stm>=2.3 transformers-compat>=0.2
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-transformers-base/distinfo b/devel/hs-transformers-base/distinfo
index 81b1d7d..966b08c 100644
--- a/devel/hs-transformers-base/distinfo
+++ b/devel/hs-transformers-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/transformers-base-0.4.2.tar.gz) = 35258378843a77ab786119ded355b8916f8ed31106e767fe3955ad04c42d1c0c
-SIZE (cabal/transformers-base-0.4.2.tar.gz) = 2538
+SHA256 (cabal/transformers-base-0.4.4.tar.gz) = 6aa3494fc70659342fbbb163035d5827ecfd8079e3c929e2372adf771fd52387
+SIZE (cabal/transformers-base-0.4.4.tar.gz) = 2550
diff --git a/devel/hs-transformers-compat/Makefile b/devel/hs-transformers-compat/Makefile
index 43aca6d..eb5636f 100644
--- a/devel/hs-transformers-compat/Makefile
+++ b/devel/hs-transformers-compat/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= transformers-compat
-PORTVERSION= 0.3.3.4
-PORTREVISION= 1
+PORTVERSION= 0.4.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Compatibility shim exposing the new types from transformers 0.3 and 0.4
LICENSE= BSD3CLAUSE
-FLAGS_ENABLE= three
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-transformers-compat/distinfo b/devel/hs-transformers-compat/distinfo
index 79201bc..14290a2 100644
--- a/devel/hs-transformers-compat/distinfo
+++ b/devel/hs-transformers-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/transformers-compat-0.3.3.4.tar.gz) = 257712be0c2d5eedc6c835421751fce8daf45cf2687f2d6c27b92bff5e204bc1
-SIZE (cabal/transformers-compat-0.3.3.4.tar.gz) = 11143
+SHA256 (cabal/transformers-compat-0.4.0.4.tar.gz) = d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52
+SIZE (cabal/transformers-compat-0.4.0.4.tar.gz) = 12048
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index f6990a2..3af42e6 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index c966fde..68d8c6f 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index bb49980..c61b669 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= unix-compat
-PORTVERSION= 0.4.1.3
-PORTREVISION= 1
+PORTVERSION= 0.4.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index 63f8be2..b02b126 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-compat-0.4.1.3.tar.gz) = ab930a71d3cd9884a6c2bf58f330fa13c68cecb26d5cff20d435cdf69d1bdced
-SIZE (cabal/unix-compat-0.4.1.3.tar.gz) = 12823
+SHA256 (cabal/unix-compat-0.4.1.4.tar.gz) = fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b
+SIZE (cabal/unix-compat-0.4.1.4.tar.gz) = 12830
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index ae43323..d4cbd47 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTVERSION= 0.3.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +9,7 @@ COMMENT= Unix time parser/formatter and utilities
LICENSE= BSD3CLAUSE
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-
-.if ${OSVERSION} >= 901000 && ${OSVERSION} < 902001 && ${ARCH} == i386
-EXTRA_PATCHES+= ${PATCHDIR}/nopatch-unix-time.cabal
-.endif
+USE_CABAL= old-time
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index 35c54c6..a028d8a 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unix-time-0.3.3.tar.gz) = 1dc532d337484e957777b462804ed0fcec00b126c69c24bd465b4ed14abe1c05
-SIZE (cabal/unix-time-0.3.3.tar.gz) = 39845
+SHA256 (cabal/unix-time-0.3.5.tar.gz) = 7f1c58cd0328bbcb1d050af05670bc6f44dea3ee0894f30c6f87ee4a0d01675e
+SIZE (cabal/unix-time-0.3.5.tar.gz) = 40201
diff --git a/devel/hs-unix-time/files/nopatch-unix-time.cabal b/devel/hs-unix-time/files/nopatch-unix-time.cabal
deleted file mode 100644
index 5b96f7a..0000000
--- a/devel/hs-unix-time/files/nopatch-unix-time.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./unix-time.cabal.orig 2014-07-16 02:47:31.000000000 +0200
-+++ ./unix-time.cabal 2014-07-20 22:50:57.000000000 +0200
-@@ -15,8 +15,6 @@
- Library
- Default-Language: Haskell2010
- GHC-Options: -Wall
-- if impl(ghc >= 7.8)
-- CC-Options: -fPIC
- Exposed-Modules: Data.UnixTime
- Other-Modules: Data.UnixTime.Conv
- Data.UnixTime.Diff
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index 99d0275..c8e0182 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.4.0
-PORTREVISION= 1
+PORTVERSION= 0.2.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index 4965f5c..dca2a23 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unordered-containers-0.2.4.0.tar.gz) = 34eaeb0c96d84169aca7085cf21f89bedb4bdb4de2ac78358a087faeea93cdf4
-SIZE (cabal/unordered-containers-0.2.4.0.tar.gz) = 25638
+SHA256 (cabal/unordered-containers-0.2.5.1.tar.gz) = 6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a
+SIZE (cabal/unordered-containers-0.2.5.1.tar.gz) = 26093
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index 7fc6518..d974f5b 100644
--- a/devel/hs-utf8-light/Makefile
+++ b/devel/hs-utf8-light/Makefile
@@ -2,7 +2,7 @@
PORTNAME= utf8-light
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index d2f5c63..4f34953 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= utf8-string
-PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTVERSION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Support for reading/writing UTF-8 strings for Haskell programs
+COMMENT= Support for reading and writing UTF-8 strings
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo
index dba40c8..34d3582 100644
--- a/devel/hs-utf8-string/distinfo
+++ b/devel/hs-utf8-string/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/utf8-string-0.3.8.tar.gz) = 80757cbc00197ff71311dc8c1ca00284537442c2dc93f06685d369a6816d49c0
-SIZE (cabal/utf8-string-0.3.8.tar.gz) = 9129
+SHA256 (cabal/utf8-string-1.tar.gz) = 79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08
+SIZE (cabal/utf8-string-1.tar.gz) = 7707
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index affbe50..1d8b3e5 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -3,7 +3,7 @@
PORTNAME= utility-ht
PORTVERSION= 0.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 5a2d211..5ba6a77 100644
--- a/devel/hs-uuagc-bootstrap/Makefile
+++ b/devel/hs-uuagc-bootstrap/Makefile
@@ -2,7 +2,7 @@
PORTNAME= uuagc-bootstrap
PORTVERSION= 0.9.40.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 1666d89..8cb9ec8 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uuagc-cabal
-PORTVERSION= 1.0.5.0
-PORTREVISION= 1
+PORTVERSION= 1.0.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo
index 463c651..de780e5 100644
--- a/devel/hs-uuagc-cabal/distinfo
+++ b/devel/hs-uuagc-cabal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-cabal-1.0.5.0.tar.gz) = 45f6c6038bc3f0d35e35ae6591fab58dd7268dac107cfc3fe7c2b4af5f60795c
-SIZE (cabal/uuagc-cabal-1.0.5.0.tar.gz) = 14689
+SHA256 (cabal/uuagc-cabal-1.0.6.0.tar.gz) = dcc87f9e738cbd5228e91f433b69ac540ab1f109c522da290539c2f33791b80b
+SIZE (cabal/uuagc-cabal-1.0.6.0.tar.gz) = 14781
diff --git a/devel/hs-uuagc/Makefile b/devel/hs-uuagc/Makefile
index b0ff66c..56896be 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= uuagc
-PORTVERSION= 0.9.51
-PORTREVISION= 1
+PORTVERSION= 0.9.52.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,5 +15,7 @@ USE_CABAL= haskell-src-exts>=1.11.1 mtl>=1.1.1.1 uuagc-cabal>=1.0.2.0 \
EXECUTABLE= uuagc
+FLAGS_DISABLE= with-loag
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index 30552b8..0fb591a9 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuagc-0.9.51.tar.gz) = 5c084940d3246dfc5ed4ca818dea2cdf070852b2a091442ff281f422caabde1e
-SIZE (cabal/uuagc-0.9.51.tar.gz) = 791376
+SHA256 (cabal/uuagc-0.9.52.1.tar.gz) = 98092b13cb32e4493e877c3752deed471db762f04e7d979be4e6e89065502185
+SIZE (cabal/uuagc-0.9.52.1.tar.gz) = 795294
diff --git a/devel/hs-uuid-types/Makefile b/devel/hs-uuid-types/Makefile
new file mode 100644
index 0000000..170a0bb
--- /dev/null
+++ b/devel/hs-uuid-types/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= uuid-types
+PORTVERSION= 1.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Type definitions for Universally Unique Identifiers
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable>=1.1.1.0 random>=1.0.1 text>=1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-uuid-types/distinfo b/devel/hs-uuid-types/distinfo
new file mode 100644
index 0000000..576c526
--- /dev/null
+++ b/devel/hs-uuid-types/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/uuid-types-1.0.2.tar.gz) = 56c6e9d6c05f30461419d2c3b90ef7e5f2fb8dd51c09846b5f4ce12d034f2e05
+SIZE (cabal/uuid-types-1.0.2.tar.gz) = 12142
diff --git a/devel/hs-uuid-types/pkg-descr b/devel/hs-uuid-types/pkg-descr
new file mode 100644
index 0000000..144eda1
--- /dev/null
+++ b/devel/hs-uuid-types/pkg-descr
@@ -0,0 +1,4 @@
+This library contains type definitions for Universally Unique Identifiers
+and basic conversion functions.
+
+WWW: https://github.com/aslatter/uuid
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 614cd64..12dc1ca 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uuid
-PORTVERSION= 1.3.3
-PORTREVISION= 1
+PORTVERSION= 1.3.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Creating, comparing, parsing and printing Universally Unique Identifier
LICENSE= BSD3CLAUSE
-USE_CABAL= cryptohash>=0.7 hashable network-info random>=1.0.1
+USE_CABAL= cryptohash>=0.7 network-info>=0.2 random>=1.0.1 text>=1 \
+ uuid-types>=1.0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuid/distinfo b/devel/hs-uuid/distinfo
index 16d261a..ad2711d 100644
--- a/devel/hs-uuid/distinfo
+++ b/devel/hs-uuid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uuid-1.3.3.tar.gz) = 15204a7399ce8d06743c9e20a554f0dbad36e70d848fcd34e70b5f9bebd54e8b
-SIZE (cabal/uuid-1.3.3.tar.gz) = 17303
+SHA256 (cabal/uuid-1.3.11.tar.gz) = 671876d2f848c9155bfe661eb138d585897ab5b0a2f2e143ef85114d459814d5
+SIZE (cabal/uuid-1.3.11.tar.gz) = 8578
diff --git a/devel/hs-uuid/pkg-descr b/devel/hs-uuid/pkg-descr
index c30322f..c84a33a 100644
--- a/devel/hs-uuid/pkg-descr
+++ b/devel/hs-uuid/pkg-descr
@@ -1,4 +1,4 @@
This library is useful for creating, comparing, parsing and printing
Universally Unique Identifiers.
-WWW: http://projects.haskell.org/uuid/
+WWW: https://github.com/aslatter/uuid
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index b38673f..64012ef 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= uulib
-PORTVERSION= 0.9.16
-PORTREVISION= 1
+PORTVERSION= 0.9.20
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index 0d295c3..9b33d6d 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uulib-0.9.16.tar.gz) = 834a75fb88ce508350ae974fd5b66bb0c60e56f2bbb77ca430b25327c289a919
-SIZE (cabal/uulib-0.9.16.tar.gz) = 44333
+SHA256 (cabal/uulib-0.9.20.tar.gz) = e2bb4d7b2aa0d3e987748185589d7d25b453d3ee448a468aab8971df651ee7e3
+SIZE (cabal/uulib-0.9.20.tar.gz) = 45120
diff --git a/devel/hs-uulib/pkg-descr b/devel/hs-uulib/pkg-descr
index 85f1434..6133523 100644
--- a/devel/hs-uulib/pkg-descr
+++ b/devel/hs-uulib/pkg-descr
@@ -1,3 +1,4 @@
Fast Parser Combinators and Pretty Printing Combinators.
-WWW: http://www.cs.uu.nl/wiki/HUT/WebHome
+WWW: https://github.com/UU-ComputerScience/uulib
+
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 9e2e592..528af8e 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.3.0.3
-PORTREVISION= 1
+PORTVERSION= 0.3.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index 6bfd66f..d98e273 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vault-0.3.0.3.tar.gz) = 056ad8ffe6059d005b12159cdf781cccd14193bb0b30e960509b3dbee438f272
-SIZE (cabal/vault-0.3.0.3.tar.gz) = 4906
+SHA256 (cabal/vault-0.3.0.4.tar.gz) = 561ef32877935067e458333a44a37f15b4063559c4cb4ddc412ccf705ec6062a
+SIZE (cabal/vault-0.3.0.4.tar.gz) = 5009
diff --git a/devel/hs-vault/pkg-descr b/devel/hs-vault/pkg-descr
index 98063be..788711c 100644
--- a/devel/hs-vault/pkg-descr
+++ b/devel/hs-vault/pkg-descr
@@ -1,7 +1,7 @@
-A "vault" is a typed, persistent store for values of arbitrary types. It's
-like having first-class access to the storage space behind IORefs. The
-data structure is analogous to a bank vault, where you can access different
-bank boxes with different keys; hence the name. Also provided is a "locker"
-type, representing a store for a single element.
+A vault is a persistent store for values of arbitrary types. It's like
+having first-class access to the storage space behind IORefs. The data
+structure is analogous to a bank vault, where you can access different
+bank boxes with different keys; hence the name. Also provided is a
+locker type, representing a store for a single element.
WWW: https://github.com/HeinrichApfelmus/vault
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index 827dc5b..dcb27f8 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-algorithms
-PORTVERSION= 0.6.0.3
-PORTREVISION= 1
+PORTVERSION= 0.7.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-algorithms/distinfo b/devel/hs-vector-algorithms/distinfo
index b7feb69..a5c442d 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-algorithms-0.6.0.3.tar.gz) = c42eaddf416b37c7c281eadb3ce845aa628a5853e381beaa698aebe30359e4cf
-SIZE (cabal/vector-algorithms-0.6.0.3.tar.gz) = 20273
+SHA256 (cabal/vector-algorithms-0.7.0.1.tar.gz) = ed460a41ca068f568bc2027579ab14185fbb72c7ac469b5179ae5f8a52719070
+SIZE (cabal/vector-algorithms-0.7.0.1.tar.gz) = 25435
diff --git a/devel/hs-vector-binary-instances/Makefile b/devel/hs-vector-binary-instances/Makefile
index f75fbc3..8c78d23 100644
--- a/devel/hs-vector-binary-instances/Makefile
+++ b/devel/hs-vector-binary-instances/Makefile
@@ -2,7 +2,7 @@
PORTNAME= vector-binary-instances
PORTVERSION= 0.2.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile
index 86aa972..6d3f152 100644
--- a/devel/hs-vector-instances/Makefile
+++ b/devel/hs-vector-instances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-instances
-PORTVERSION= 3.3
-PORTREVISION= 1
+PORTVERSION= 3.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-instances/distinfo b/devel/hs-vector-instances/distinfo
index 8b3e7d1..3cd2700 100644
--- a/devel/hs-vector-instances/distinfo
+++ b/devel/hs-vector-instances/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-instances-3.3.tar.gz) = bee0ea0636363ddd20324deb9929e3edc5058df5c4b71d10d4aeb11dc54d3c46
-SIZE (cabal/vector-instances-3.3.tar.gz) = 3596
+SHA256 (cabal/vector-instances-3.3.1.tar.gz) = 68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59
+SIZE (cabal/vector-instances-3.3.1.tar.gz) = 3726
diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile
index 65d4b14..e578fee 100644
--- a/devel/hs-vector-th-unbox/Makefile
+++ b/devel/hs-vector-th-unbox/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-th-unbox
-PORTVERSION= 0.2.1.0
-PORTREVISION= 1
+PORTVERSION= 0.2.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-th-unbox/distinfo b/devel/hs-vector-th-unbox/distinfo
index 5398d73..6521be6 100644
--- a/devel/hs-vector-th-unbox/distinfo
+++ b/devel/hs-vector-th-unbox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-th-unbox-0.2.1.0.tar.gz) = 30dfe03ef275d327006396c2de14a625acb067596156e48748756e388cec1e65
-SIZE (cabal/vector-th-unbox-0.2.1.0.tar.gz) = 4362
+SHA256 (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05
+SIZE (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 4536
diff --git a/devel/hs-vector-th-unbox/pkg-descr b/devel/hs-vector-th-unbox/pkg-descr
index f94930e..2f2917c 100644
--- a/devel/hs-vector-th-unbox/pkg-descr
+++ b/devel/hs-vector-th-unbox/pkg-descr
@@ -1,5 +1,4 @@
A Template Haskell deriver for unboxed vectors, given a pair of coercion
-functions to and from some existing type with an Unbox instance. Refer
-to "Data.Vector.Unboxed.Deriving" for documentation and examples.
+functions to and from some existing type with an Unbox instance.
WWW: http://hackage.haskell.org/package/vector-th-unbox
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 71bd8f5..855b23e 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector
-PORTVERSION= 0.10.9.1
-PORTREVISION= 1
+PORTVERSION= 0.10.12.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo
index e009261..7ef33ea 100644
--- a/devel/hs-vector/distinfo
+++ b/devel/hs-vector/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-0.10.9.1.tar.gz) = 205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5
-SIZE (cabal/vector-0.10.9.1.tar.gz) = 101693
+SHA256 (cabal/vector-0.10.12.3.tar.gz) = 0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a
+SIZE (cabal/vector-0.10.12.3.tar.gz) = 103617
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 46b688f..7c61028 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= void
-PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTVERSION= 0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index 8026447..daedb86 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/void-0.6.1.tar.gz) = 82ec2a7edf3fa52eba2ed4821306859a75186e6df2a564943e9f9d758205ea26
-SIZE (cabal/void-0.6.1.tar.gz) = 3807
+SHA256 (cabal/void-0.7.tar.gz) = 981b85d19bb51c1ac60103b184b86061621e0b016d4db24dd965751b2bc96f47
+SIZE (cabal/void-0.7.tar.gz) = 3900
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index 84815a4..5a6a632 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= word8
-PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTVERSION= 0.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-word8/distinfo b/devel/hs-word8/distinfo
index 85a7f7b..5f31432 100644
--- a/devel/hs-word8/distinfo
+++ b/devel/hs-word8/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/word8-0.1.1.tar.gz) = 398d201b9bfb839d55bbb72afc8b73e34dcbda2e76f4f13a5db946a61404eaf6
-SIZE (cabal/word8-0.1.1.tar.gz) = 5891
+SHA256 (cabal/word8-0.1.2.tar.gz) = 3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd
+SIZE (cabal/word8-0.1.2.tar.gz) = 6218
diff --git a/dns/hs-dns/Makefile b/dns/hs-dns/Makefile
index adc3033..9189741 100644
--- a/dns/hs-dns/Makefile
+++ b/dns/hs-dns/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= dns
-PORTVERSION= 1.4.2
-PORTREVISION= 1
+PORTVERSION= 2.0.0
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/dns/hs-dns/distinfo b/dns/hs-dns/distinfo
index fb7959c..141cc9a 100644
--- a/dns/hs-dns/distinfo
+++ b/dns/hs-dns/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dns-1.4.2.tar.gz) = 1992c34b8c7cba12efb5c84cb69f274e4404cb3cc4c933be584ee1585561dbf5
-SIZE (cabal/dns-1.4.2.tar.gz) = 19623
+SHA256 (cabal/dns-2.0.0.tar.gz) = 5ec9e58f71022bbc50888ec8b34be3be6f9e8d1566647b59b6e9bf169b1401cb
+SIZE (cabal/dns-2.0.0.tar.gz) = 20570
diff --git a/dns/hs-gnuidn/Makefile b/dns/hs-gnuidn/Makefile
index 8af4eeb..632d48a 100644
--- a/dns/hs-gnuidn/Makefile
+++ b/dns/hs-gnuidn/Makefile
@@ -2,7 +2,7 @@
PORTNAME= gnuidn
PORTVERSION= 0.2.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= dns haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ftp/hs-curl/Makefile b/ftp/hs-curl/Makefile
index 1ae95ed..1bddf2f 100644
--- a/ftp/hs-curl/Makefile
+++ b/ftp/hs-curl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= curl
PORTVERSION= 1.3.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= ftp haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/games/hedgewars/Makefile b/games/hedgewars/Makefile
index 35a2f38..08266a3 100644
--- a/games/hedgewars/Makefile
+++ b/games/hedgewars/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hedgewars
PORTVERSION= 0.9.21.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= http://download.gna.org/hedgewars/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/games/hedgewars/files/patch-gameServer_CoreTypes.hs b/games/hedgewars/files/patch-gameServer_CoreTypes.hs
new file mode 100644
index 0000000..5c58bcb
--- /dev/null
+++ b/games/hedgewars/files/patch-gameServer_CoreTypes.hs
@@ -0,0 +1,11 @@
+--- gameServer/CoreTypes.hs.orig 2015-01-06 20:55:59 UTC
++++ gameServer/CoreTypes.hs
+@@ -38,7 +38,7 @@ import RoomsAndClients
+ instance NFData B.ByteString
+ #endif
+
+-instance NFData (Chan a)
++instance NFData (Chan a) where rnf a = a `seq` ()
+
+ instance NFData Action where
+ rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
diff --git a/graphics/Makefile b/graphics/Makefile
index 9d74a83..e4f6cab 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -335,7 +335,6 @@
SUBDIR += hs-cairo
SUBDIR += hs-dia-base
SUBDIR += hs-dia-functions
- SUBDIR += hs-soegtk
SUBDIR += hs-svgcairo
SUBDIR += hsetroot
SUBDIR += hugin
diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile
index 12ab90a..f1132bd 100644
--- a/graphics/hs-HGL/Makefile
+++ b/graphics/hs-HGL/Makefile
@@ -3,7 +3,7 @@
PORTNAME= HGL
PORTVERSION= 3.2.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs b/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs
new file mode 100644
index 0000000..c491027
--- /dev/null
+++ b/graphics/hs-HGL/files/patch-Graphics_HGL_Internals_Draw.hs
@@ -0,0 +1,22 @@
+--- Graphics/HGL/Internals/Draw.hs.orig 1991-05-09 14:40:52 UTC
++++ Graphics/HGL/Internals/Draw.hs
+@@ -31,7 +31,7 @@ import Graphics.HGL.X11.Types(DC)
+ import Graphics.HGL.Win32.Types(DC)
+ #endif
+ import qualified Graphics.HGL.Internals.Utilities as Utils (bracket, bracket_)
+-import Control.Monad (liftM)
++import Control.Monad (liftM, ap)
+
+ ----------------------------------------------------------------
+ -- Graphics
+@@ -61,6 +61,10 @@ instance Monad Draw where
+
+ instance Functor Draw where fmap = liftM
+
++instance Applicative Draw where
++ pure = return
++ (<*>) = ap
++
+ -- | Wrap a drawing action in initialization and finalization actions.
+ bracket
+ :: Draw a -- ^ a pre-operation, whose value is passed to the
diff --git a/graphics/hs-JuicyPixels/Makefile b/graphics/hs-JuicyPixels/Makefile
index da209ff..11a2fd9 100644
--- a/graphics/hs-JuicyPixels/Makefile
+++ b/graphics/hs-JuicyPixels/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= JuicyPixels
-PORTVERSION= 3.1.6.1
-PORTREVISION= 1
+PORTVERSION= 3.2.6
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-JuicyPixels/distinfo b/graphics/hs-JuicyPixels/distinfo
index 2525f29..be87ade 100644
--- a/graphics/hs-JuicyPixels/distinfo
+++ b/graphics/hs-JuicyPixels/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/JuicyPixels-3.1.6.1.tar.gz) = ac9484aad8e08ef6ff7bfff50344449133fa8d14eb7dc4efb2fffe408107a6ec
-SIZE (cabal/JuicyPixels-3.1.6.1.tar.gz) = 95511
+SHA256 (cabal/JuicyPixels-3.2.6.tar.gz) = f99e82c84d8eeff23ba57332ed4b89530bc1a739c3a8f4b670b07ac33bfc9a46
+SIZE (cabal/JuicyPixels-3.2.6.tar.gz) = 116169
diff --git a/graphics/hs-cairo/Makefile b/graphics/hs-cairo/Makefile
index 9a612c8..b10a36b 100644
--- a/graphics/hs-cairo/Makefile
+++ b/graphics/hs-cairo/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cairo
-PORTVERSION= 0.12.5.3
-PORTREVISION= 1
+PORTVERSION= 0.13.1.0
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the Cairo library
LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= gtk2hs-buildtools mtl utf8-string>=0.2
+USE_CABAL= gtk2hs-buildtools mtl text>=1.0.0.0 utf8-string>=0.2
BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/cairo-pdf.pc:${PORTSDIR}/graphics/cairo
diff --git a/graphics/hs-cairo/distinfo b/graphics/hs-cairo/distinfo
index db93abd..6fa8fa9 100644
--- a/graphics/hs-cairo/distinfo
+++ b/graphics/hs-cairo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cairo-0.12.5.3.tar.gz) = e7edb538745a6f0aa1c0c1574b6549a799240912f9c5047c3d8ca1ffdbb1bcbc
-SIZE (cabal/cairo-0.12.5.3.tar.gz) = 53447
+SHA256 (cabal/cairo-0.13.1.0.tar.gz) = 6b8e3fca37104022c53442c62bcb41c18d3e2fed4df372c1de56c41f3f7d276e
+SIZE (cabal/cairo-0.13.1.0.tar.gz) = 54143
diff --git a/graphics/hs-dia-base/Makefile b/graphics/hs-dia-base/Makefile
index 8cc8f48..0e9e2b5 100644
--- a/graphics/hs-dia-base/Makefile
+++ b/graphics/hs-dia-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= dia-base
-PORTVERSION= 0.1.1.2
-PORTREVISION= 8
+PORTVERSION= 0.1.1.3
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-base/distinfo b/graphics/hs-dia-base/distinfo
index 12f7c8f..bad39752 100644
--- a/graphics/hs-dia-base/distinfo
+++ b/graphics/hs-dia-base/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dia-base-0.1.1.2.tar.gz) = 8525de0e876a012fd39c25db34d7cc7d2a4e2434fc20a461abe8aedc9f2b4622
-SIZE (cabal/dia-base-0.1.1.2.tar.gz) = 3779
+SHA256 (cabal/dia-base-0.1.1.3.tar.gz) = e5ac6200e802e81b9d40b497b117cb1b29086170ec9fbff6c574baa53e6ba7cf
+SIZE (cabal/dia-base-0.1.1.3.tar.gz) = 3785
diff --git a/graphics/hs-dia-base/files/patch-dia-base.cabal b/graphics/hs-dia-base/files/patch-dia-base.cabal
deleted file mode 100644
index dc90e48..0000000
--- a/graphics/hs-dia-base/files/patch-dia-base.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./dia-base.cabal.orig 2012-09-11 09:44:42.000000000 +0200
-+++ ./dia-base.cabal 2014-07-12 22:27:19.000000000 +0200
-@@ -27,7 +27,7 @@
- Graphics.Diagrams
-
- Build-Depends:
-- base >= 4.0 && < 4.7,
-+ base >= 4.0 && < 4.8,
- deepseq >= 1.1 && < 1.4
-
-
diff --git a/graphics/hs-dia-functions/Makefile b/graphics/hs-dia-functions/Makefile
index 71ba2cc..deb1795 100644
--- a/graphics/hs-dia-functions/Makefile
+++ b/graphics/hs-dia-functions/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= dia-functions
-PORTVERSION= 0.2.1.3
-PORTREVISION= 8
+PORTVERSION= 0.2.1.4
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/graphics/hs-dia-functions/distinfo b/graphics/hs-dia-functions/distinfo
index 69b7584..78e9f27 100644
--- a/graphics/hs-dia-functions/distinfo
+++ b/graphics/hs-dia-functions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/dia-functions-0.2.1.3.tar.gz) = 3460652c5b6562bbfcf82c6edbc64a0d1682d05ee825145339a1e50a89195e7d
-SIZE (cabal/dia-functions-0.2.1.3.tar.gz) = 8137
+SHA256 (cabal/dia-functions-0.2.1.4.tar.gz) = 4730fbef211f42b4567f4a034dc27bd82f2770adac55b3d04b555067dd550e92
+SIZE (cabal/dia-functions-0.2.1.4.tar.gz) = 8126
diff --git a/graphics/hs-dia-functions/files/patch-dia-functions.cabal b/graphics/hs-dia-functions/files/patch-dia-functions.cabal
deleted file mode 100644
index 6d134c1..0000000
--- a/graphics/hs-dia-functions/files/patch-dia-functions.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./dia-functions.cabal.orig 2012-09-11 09:47:34.000000000 +0200
-+++ ./dia-functions.cabal 2014-07-13 01:36:21.000000000 +0200
-@@ -30,7 +30,7 @@
- Build-Depends:
- data-pprint >= 0.2 && < 0.3,
- dia-base >= 0.1 && < 0.2,
-- base >= 4.0 && < 4.7,
-+ base >= 4.0 && < 4.8,
- containers >= 0.4 && < 0.6,
- xhtml >= 3000.2 && < 3000.3,
- mtl >= 2.0 && < 2.2,
diff --git a/graphics/hs-soegtk/Makefile b/graphics/hs-soegtk/Makefile
deleted file mode 100644
index fc5ef93..0000000
--- a/graphics/hs-soegtk/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= soegtk
-PORTVERSION= 0.12.1
-PORTREVISION= 12
-CATEGORIES= graphics haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= GUI functions as used in the book "The Haskell School of Expression"
-
-LICENSE= LGPL21
-
-USE_CABAL= cairo>=0.12 gtk>=0.11 mtl stm>=2
-USE_GNOME= gtk20
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/graphics/hs-soegtk/distinfo b/graphics/hs-soegtk/distinfo
deleted file mode 100644
index 5dfd76f..0000000
--- a/graphics/hs-soegtk/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/soegtk-0.12.1.tar.gz) = 594591337ba8244c7387afb6f68fd063551a20edadd9f7792c0816d6394cc405
-SIZE (cabal/soegtk-0.12.1.tar.gz) = 17392
diff --git a/graphics/hs-soegtk/pkg-descr b/graphics/hs-soegtk/pkg-descr
deleted file mode 100644
index c9e0622..0000000
--- a/graphics/hs-soegtk/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-An alternative implementation of the graphics library used in the book The
-Haskell School of Expression, by Paul Hudak, <http://www.haskell.org/soe/>
-This library builds on top of Gtk+.
-
-WWW: http://www.haskell.org/gtk2hs/
diff --git a/graphics/hs-svgcairo/Makefile b/graphics/hs-svgcairo/Makefile
index cd0d26a..76321bb 100644
--- a/graphics/hs-svgcairo/Makefile
+++ b/graphics/hs-svgcairo/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= svgcairo
-PORTVERSION= 0.12.5.2
-PORTREVISION= 1
+PORTVERSION= 0.13.0.3
CATEGORIES= graphics haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the libsvg-cairo library
LICENSE= BSD3CLAUSE
USES= pkgconfig
-USE_CABAL= cairo>=0.12.5.0 glib>=0.12.5.0 mtl
+USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl text
USE_GNOME= librsvg2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/graphics/hs-svgcairo/distinfo b/graphics/hs-svgcairo/distinfo
index 6a00676..ceb1c30 100644
--- a/graphics/hs-svgcairo/distinfo
+++ b/graphics/hs-svgcairo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/svgcairo-0.12.5.2.tar.gz) = 94a428cae854e8d99c16d76838c602298beafd36bd36d92b4ff396f6dd006950
-SIZE (cabal/svgcairo-0.12.5.2.tar.gz) = 13759
+SHA256 (cabal/svgcairo-0.13.0.3.tar.gz) = 9fd94d9aad09a26c4b6d4abf979d68d12b7265fbc8171093db448c620df96c49
+SIZE (cabal/svgcairo-0.13.0.3.tar.gz) = 14349
diff --git a/lang/Makefile b/lang/Makefile
index a511cdee..b69fab9 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -115,7 +115,6 @@
SUBDIR += hla
SUBDIR += hope
SUBDIR += hs-brainfuck
- SUBDIR += hs-epic
SUBDIR += hs-unlambda
SUBDIR += huc
SUBDIR += hugs
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 9e763ff..95106dc 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= ghc
-PORTVERSION= 7.8.3
-PORTREVISION= 1
+PORTVERSION= 7.10.2
CATEGORIES= lang haskell
MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
LOCAL/pgj/:boot
@@ -20,22 +19,23 @@ ONLY_FOR_ARCHS= i386 amd64
MAKE_JOBS_NUMBER_LIMIT= 4
GHC_VERSION= ${PORTVERSION}
-HSCOLOUR_VERSION= 1.20.3
+HSCOLOUR_VERSION= 1.23
+LLVM_VERSION= 35
DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION}
EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION}
-CONFLICTS= ghc-6.* ghc-7.0.* ghc-7.2.* ghc-7.4.* ghc-7.6.* ghc-7.7.*
+CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.*
LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp
USE_AUTOTOOLS= autoconf autoheader
USE_PERL5= build
-USES= gmake iconv:translit ncurses perl5 tar:bzip2
-USE_BINUTILS= yes
-USE_GCC= yes
+USES= gmake iconv:translit ncurses perl5 tar:xz
-MAKE_ENV= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
+MAKE_ENV+= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
+# This is needed on FreeBSD 9.x due to the bootstrap tarball.
+TAR= env LC_ALL=en_US.UTF-8 /usr/bin/tar
# The configure process accepts,filters and canonicalises
# the CONFIGURE_TARGET variable. You can read the files
@@ -44,11 +44,17 @@ MAKE_ENV= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8
# You can view below.
GNU_CONFIGURE= yes
-OPTIONS_DEFINE= PROFILE DYNAMIC LLVM DOCS
-OPTIONS_DEFAULT= PROFILE DYNAMIC DOCS
+OPTIONS_DEFINE= PROFILE DYNAMIC LLVM DOCS
+OPTIONS_SINGLE= C_Compiler
+OPTIONS_SINGLE_C_Compiler= GCC PCLANG BCLANG
+
+OPTIONS_DEFAULT= PROFILE DYNAMIC DOCS GCC
BOOT_DESC= Use installed GHC for bootstrapping
BOOTH_DESC= Use installed HsColour for bootstrapping
+GCC_DESC= Build with GCC (from ports)
+PCLANG_DESC= Build with Clang from ports
+BCLANG_DESC= Build with Clang from base
PROFILE_DESC= Add support for performance profiling
DYNAMIC_DESC= Add support for dynamic linking
LLVM_DESC= Add support for generating code via LLVM
@@ -73,32 +79,39 @@ LIB_DEPENDS+= libffi.so.6:${PORTSDIR}/devel/libffi
.if empty(PORT_OPTIONS:MBOOT)
-BOOT_GHC_VERSION= 7.6.3
+BOOT_GHC_VERSION= 7.10.2
+DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot
+LIB_DEPENDS+= libutil.so.9:${PORTSDIR}/misc/compat9x
-.if ${ARCH} == "i386"
+.endif # MBOOT
-.if ${OSVERSION} >= 1000043
-DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot
-.elif ${OSVERSION} >= 900000
-DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot
-.else
-DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot
+.if ${PORT_OPTIONS:MPCLANG}
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
+RUN_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
+CC= ${LOCALBASE}/bin/clang${LLVM_VERSION}
+CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION}
+CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
+LDFLAGS+= -B${LOCALBASE}/bin
+CFLAGS+= -Qunused-arguments
+CONFIGURE_ARGS+= --with-clang=${CC} --with-gcc=${CC}
+USE_BINUTILS= yes
+.if empty(PORT_OPTIONS:MBOOT)
+CONFIGURE_ARGS_BOOT+= --with-clang=${CC} --with-gcc=${CC}
.endif
-
-.elif ${ARCH} == "amd64"
-
-.if ${OSVERSION} >= 1000043
-DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd10-boot${EXTRACT_SUFX}:boot
-.elif ${OSVERSION} >= 900000
-DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot
-.else
-DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot
+.elif ${PORT_OPTIONS:MBCLANG}
+CC= /usr/bin/clang
+CXX= /usr/bin/clang++
+CPP= /usr/bin/clang-cpp
+CFLAGS+= -Qunused-arguments
+CONFIGURE_ARGS+= --with-clang=${CC} --with-gcc=${CC}
+.else # GCC
+USE_GCC= yes
+CONFIGURE_ARGS+= --with-gcc=${CC}
+.if empty(PORT_OPTIONS:MBOOT)
+CONFIGURE_ARGS_BOOT+= --with-gcc=${CC}
.endif
-
.endif
-.endif # MBOOT
-
DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION}
GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION}
@@ -107,8 +120,7 @@ PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL}
HACKAGE_SITE?= http://hackage.haskell.org/package/
-CONFIGURE_ARGS= --with-gcc=${CC} \
- --with-ld=${LD} \
+CONFIGURE_ARGS+= --with-ld=${LD} \
--with-gmp-includes=${LOCALBASE}/include \
--with-gmp-libraries=${LOCALBASE}/lib
@@ -122,11 +134,11 @@ CONFIGURE_ARGS+= --with-system-libffi \
.endif
.if ${PORT_OPTIONS:MLLVM}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
-RUN_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
+BUILD_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
+RUN_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
-CONFIGURE_ARGS+= --with-opt=${LOCALBASE}/bin/opt34 \
- --with-llc=${LOCALBASE}/bin/llc34
+CONFIGURE_ARGS+= --with-opt=${LOCALBASE}/bin/opt${LLVM_VERSION} \
+ --with-llc=${LOCALBASE}/bin/llc${LLVM_VERSION}
.endif
.if empty(PORT_OPTIONS:MBOOT)
@@ -138,7 +150,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs
SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH}
-CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} --with-gcc=${CC} --with-ld=${LD}
+CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} --with-ld=${LD}
CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC}
.else # MBOOT
@@ -156,7 +168,6 @@ CFLAGS+= -I${LOCALBASE}/include
# override TMPDIR because /tmp often doesn't have enough space
# to build some of the larger libraries.
TMPDIR= ${WRKSRC}/tmp
-MAKE_ENV+= TMPDIR=${TMPDIR}
# Defining with documentation:
# An in place installation and registration of hscolour will be
@@ -181,7 +192,6 @@ SLAVES_PREFIX= ${WRKDIR}/slaves_prefix
SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix
MAKE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH}
-MAKE_ENV+= LC_ALL=en_US.UTF-8
CONFIGURE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH}
.endif # MBOOTH
@@ -217,6 +227,9 @@ post-extract:
@${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}"
.endif
@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+.if ${PORT_OPTIONS:MPCLANG}
+ @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -optl=-B${LOCALBASE}/bin"
+.endif
@${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}"
@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib"
@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_LD_OPTS += -L${LOCALBASE}/lib"
@@ -224,6 +237,12 @@ post-extract:
@${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib"
@${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=${NCURSESINC} --configure-option=--with-curses-libraries=${NCURSESLIB}"
@${ECHO} >> ${WRKSRC}/mk/build.mk "V = 0"
+.if ${PORT_OPTIONS:MBCLANG} || ${PORT_OPTIONS:MPCLANG}
+ @${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${WRKSRC}/settings.in
+.if empty(PORT_OPTIONS:MBOOT)
+ @${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${BOOT_DIR}/settings.in
+.endif
+.endif
post-install-script:
@${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \
@@ -249,7 +268,6 @@ post-install-script:
post-patch:
@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \
s|%%AR%%|${AR}|; \
- s|%%RANLIB%%|${RANLIB}|; \
s|%%LD%%|${LD}|' \
${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
@@ -260,9 +278,6 @@ pre-configure:
@(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install)
.endif
-# Defining with documentation:
-# Defining "SLAVE" in devel/hs-haddock and print/hs-hscolour flips the building process
-# functionally to this port.
.if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH)
@${ECHO_MSG} -e "\a"
@${ECHO_MSG} "======================================================================"
@@ -290,7 +305,7 @@ post-install:
.if ${PORT_OPTIONS:MDOCS}
@${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock
.endif
- @(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit ${GHC_LIBDIR}/mkGmpDerivedConstants \
+ @(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit \
$$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so'); do \
${STRIP_CMD} $$f; done)
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk
index 7b91884..fae7bb7 100644
--- a/lang/ghc/bsd.cabal.mk
+++ b/lang/ghc/bsd.cabal.mk
@@ -10,8 +10,10 @@
#
.if !defined(METAPORT)
-MASTER_SITES?= http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES?= http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/:hackage
+DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:hackage
DIST_SUBDIR?= cabal
+EXTRACT_ONLY?= ${DISTNAME}${EXTRACT_SUFX}
.else
USES+= metaport
.endif # !METAPORT
@@ -74,18 +76,34 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc
.endif
+
+.if ${PORT_OPTIONS:MPCLANG}
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
+RUN_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION}
+CC= ${LOCALBASE}/bin/clang${LLVM_VERSION}
+CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION}
+CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_VERSION}
+CFLAGS+= -Qunused-arguments
+LDFLAGS+= -B${LOCALBASE}/bin
+CONFIGURE_ARGS+= --ghc-option=-optl=-B${LOCALBASE}/bin
USE_BINUTILS= yes
+.elif ${PORT_OPTIONS:MBCLANG}
+CC= /usr/bin/clang
+CXX= /usr/bin/clang++
+CPP= /usr/bin/clang-cpp
+CFLAGS+= -Qunused-arguments
+.else # GCC
USE_GCC= yes
+.endif
-CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \
- --with-ranlib=${RANLIB}
+CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR}
.if ${PORT_OPTIONS:MLLVM}
CONFIGURE_ARGS+= --ghc-option=-fllvm \
- --ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt34 \
- --ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc34
+ --ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt${LLVM_VERSION} \
+ --ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc${LLVM_VERSION}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34
+BUILD_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION}
.endif
.if defined(USE_ALEX)
@@ -154,7 +172,7 @@ HADDOCK_OPTS= # empty
.if ${PORT_OPTIONS:MHSCOLOUR}
BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
-HSCOLOUR_VERSION= 1.20.3
+HSCOLOUR_VERSION= 1.23
HSCOLOUR_DATADIR= ${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION}
HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
.endif # HSCOLOUR
@@ -180,7 +198,6 @@ CONFIGURE_ARGS+= --haddock-options=-w --with-haddock=${HADDOCK_CMD}
.if ${PORT_OPTIONS:MDYNAMIC}
CONFIGURE_ARGS+= --enable-shared --enable-executable-dynamic
-CONFIGURE_ARGS+= "--ghc-option=-optl -rpath" "--ghc-option=-optl ${CABAL_LIBDIR}/${DISTNAME}"
.else
CONFIGURE_ARGS+= --disable-shared --disable-executable-dynamic
.endif
@@ -260,6 +277,7 @@ do-install:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} copy --destdir=${STAGEDIR}
.if !defined(STANDALONE)
+ @${MKDIR} ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}
cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh
.endif
diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk
index ca06b79..ae70ad7 100644
--- a/lang/ghc/bsd.cabal.options.mk
+++ b/lang/ghc/bsd.cabal.options.mk
@@ -18,19 +18,27 @@ GHC_CMD?= ${LOCALBASE}/bin/ghc
HADDOCK_CMD?= ${LOCALBASE}/bin/haddock
HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour
-GHC_VERSION?= 7.8.3
+GHC_VERSION?= 7.10.2
+LLVM_VERSION= 35
HSCOLOUR_DESC?= Colorize generated documentation by HsColour
DYNAMIC_DESC?= Add support for dynamic linking
PROFILE_DESC?= Add support for profiling
LLVM_DESC?= Use the LLVM backend for code generation
+GCC_DESC= Build with GCC (from ports)
+PCLANG_DESC= Build with Clang from ports
+BCLANG_DESC= Build with Clang from base
-.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi)) && !defined(IGNORE_DYNAMIC)
+OPTIONS_SINGLE+= C_Compiler
+OPTIONS_SINGLE_C_Compiler= GCC PCLANG BCLANG
+OPTIONS_DEFAULT+= GCC
+
+.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts-ghc${GHC_VERSION}.so)) && !defined(IGNORE_DYNAMIC)
OPTIONS_DEFINE+= DYNAMIC
OPTIONS_DEFAULT+= DYNAMIC
.endif
-.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.p_hi)) && !defined(IGNORE_PROFILE)
+.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts_p.a)) && !defined(IGNORE_PROFILE)
OPTIONS_DEFINE+= PROFILE
.endif
diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk
index 01617fc..72fbdd5 100644
--- a/lang/ghc/bsd.hackage.mk
+++ b/lang/ghc/bsd.hackage.mk
@@ -15,7 +15,9 @@ abstract-deque_port= devel/hs-abstract-deque
abstract-par_port= devel/hs-abstract-par
activehs_port= www/hs-activehs # executable
activehs-base_port= devel/hs-activehs-base
+adjunctions_port= math/hs-adjunctions
aeson_port= converters/hs-aeson
+aeson-pretty_port= converters/hs-aeson-pretty # executable
Agda_port= math/hs-Agda # executable
alex_port= devel/hs-alex # executable
ALUT_port= audio/hs-ALUT
@@ -34,10 +36,13 @@ attoparsec_port= textproc/hs-attoparsec
attoparsec-enumerator_port= textproc/hs-attoparsec-enumerator
authenticate_port= www/hs-authenticate
auto-update_port= devel/hs-auto-update
+aws_port= net/hs-aws
+base-orphans_port= devel/hs-base-orphans
base-unicode-symbols_port= devel/hs-base-unicode-symbols
base16-bytestring_port= devel/hs-base16-bytestring
base64-bytestring_port= devel/hs-base64-bytestring
basic-prelude_port= devel/hs-basic-prelude
+bencode_port= textproc/hs-bencode
bifunctors_port= devel/hs-bifunctors
bio_port= science/hs-bio # executable
bits-atomic_port= devel/hs-bits-atomic
@@ -57,12 +62,14 @@ byteable_port= devel/hs-byteable
byteorder_port= devel/hs-byteorder
bytestring-csv_port= textproc/hs-bytestring-csv
bytestring-lexing_port= devel/hs-bytestring-lexing
+bytestring-mmap_port= devel/hs-bytestring-mmap
bytestring-nums_port= devel/hs-bytestring-nums # executable
bytestring-show_port= devel/hs-bytestring-show
c2hs_port= devel/hs-c2hs # executable
cabal-install_port= devel/hs-cabal-install # executable
cairo_port= graphics/hs-cairo
case-insensitive_port= textproc/hs-case-insensitive
+cassava_port= textproc/hs-cassava
categories_port= math/hs-categories
cereal_port= devel/hs-cereal
certificate_port= security/hs-certificate
@@ -79,6 +86,7 @@ citeproc-hs_port= textproc/hs-citeproc-hs
classy-prelude_port= devel/hs-classy-prelude
classy-prelude-conduit_port= devel/hs-classy-prelude-conduit
clientsession_port= security/hs-clientsession
+cmark_port= textproc/hs-cmark
cmdargs_port= devel/hs-cmdargs
comonad_port= math/hs-comonad
conduit_port= devel/hs-conduit
@@ -87,6 +95,7 @@ conduit-extra_port= devel/hs-conduit-extra
ConfigFile_port= devel/hs-ConfigFile
configurator_port= devel/hs-configurator
connection_port= net/hs-connection
+constraints_port= devel/hs-constraints
contravariant_port= math/hs-contravariant
convertible_port= devel/hs-convertible
cookie_port= www/hs-cookie
@@ -107,6 +116,7 @@ cryptocipher_port= security/hs-cryptocipher
cryptohash_port= security/hs-cryptohash
cryptohash-conduit_port= security/hs-cryptohash-conduit
cryptohash-cryptoapi_port= security/hs-cryptohash-cryptoapi
+cryptonite_port= security/hs-cryptonite
css-text_port= www/hs-css-text
csv_port= textproc/hs-csv
curl_port= ftp/hs-curl # lib_depends
@@ -120,6 +130,7 @@ data-default-instances-old-locale_port= devel/hs-data-default-instances-
data-hash_port= devel/hs-data-hash
data-lens_port= math/hs-data-lens
data-lens-template_port= math/hs-data-lens-template
+data-ordlist_port= devel/hs-data-ordlist
data-pprint_port= devel/hs-data-pprint
dataenc_port= converters/hs-dataenc
date-cache_port= devel/hs-date-cache
@@ -137,21 +148,23 @@ dlist-instances_port= devel/hs-dlist-instances
dns_port= dns/hs-dns
double-conversion_port= textproc/hs-double-conversion
DRBG_port= security/hs-DRBG
+easy-file_port= devel/hs-easy-file
edit-distance_port= devel/hs-edit-distance
either_port= devel/hs-either
ekg_port= sysutils/hs-ekg
ekg-core_port= sysutils/hs-ekg-core
+ekg-json_port= sysutils/hs-ekg-json
email-validate_port= mail/hs-email-validate
enclosed-exceptions_port= devel/hs-enclosed-exceptions
entropy_port= security/hs-entropy
enumerator_port= devel/hs-enumerator
-epic_port= lang/hs-epic # executable
equivalence_port= devel/hs-equivalence
erf_port= math/hs-erf
errors_port= devel/hs-errors
esqueleto_port= databases/hs-esqueleto
exceptions_port= devel/hs-exceptions
extensible-exceptions_port= devel/hs-extensible-exceptions
+extra_port= devel/hs-extra
fast-logger_port= devel/hs-fast-logger
fastcgi_port= www/hs-fastcgi # lib_depends
feed_port= textproc/hs-feed
@@ -163,14 +176,13 @@ free_port= devel/hs-free
fsnotify_port= devel/hs-fsnotify
gconf_port= devel/hs-gconf
generic-deriving_port= devel/hs-generic-deriving
-geniplate_port= devel/hs-geniplate
+geniplate-mirror_port= devel/hs-geniplate-mirror
ghc-events_port= devel/hs-ghc-events # executable
ghc-mtl_port= devel/hs-ghc-mtl
ghc-paths_port= devel/hs-ghc-paths
gio_port= devel/hs-gio
git-annex_port= devel/hs-git-annex # executable
gitit_port= www/hs-gitit # executable
-glade_port= devel/hs-glade
glib_port= devel/hs-glib
Glob_port= devel/hs-Glob
GLURaw_port= x11-toolkits/hs-GLURaw
@@ -178,13 +190,12 @@ GLUT_port= x11-toolkits/hs-GLUT
gnuidn_port= dns/hs-gnuidn # lib_depends
gnutls_port= security/hs-gnutls # lib_depends
gsasl_port= net/hs-gsasl # lib_depends
-gstreamer_port= multimedia/hs-gstreamer # lib_depends
gtk_port= x11-toolkits/hs-gtk
gtk2hs_port= x11-toolkits/hs-gtk2hs # metaport
gtk2hs-buildtools_port= devel/hs-gtk2hs-buildtools # executable
-gtkglext_port= x11-toolkits/hs-gtkglext # lib_depends
gtksourceview2_port= x11-toolkits/hs-gtksourceview2
haddock_port= devel/hs-haddock # executable
+haddock-api_port= devel/hs-haddock-api
haddock-library_port= devel/hs-haddock-library
happstack_port= www/hs-happstack # executable
happstack-server_port= www/hs-happstack-server
@@ -192,14 +203,15 @@ happy_port= devel/hs-happy
hashable_port= devel/hs-hashable
hashed-storage_port= devel/hs-hashed-storage
hashtables_port= devel/hs-hashtables
-haskell-platform_port= devel/hs-haskell-platform # metaport
haskell-src_port= devel/hs-haskell-src
haskell-src-exts_port= devel/hs-haskell-src-exts
+haskell-xmpp_port= net-im/hs-haskell-xmpp
hasktags_port= devel/hs-hasktags # executable
hastache_port= devel/hs-hastache
HaXml_port= textproc/hs-HaXml # executable
hedis_port= databases/hs-hedis
heist_port= www/hs-heist
+hex_port= devel/hs-hex
hexpat_port= textproc/hs-hexpat
HGL_port= graphics/hs-HGL
highlighting-kate_port= textproc/hs-highlighting-kate
@@ -211,13 +223,17 @@ hlint_port= devel/hs-hlint
hoauth2_port= net/hs-hoauth2
hoogle_port= devel/hs-hoogle # executable
hostname_port= net/hs-hostname
+hourglass_port= devel/hs-hourglass
hs-bibutils_port= textproc/hs-hs-bibutils
hS3_port= www/hs-hS3 # executable
+hsb2hs_port= devel/hs-hsb2hs
hscolour_port= print/hs-hscolour # executable
hslogger_port= devel/hs-hslogger
hslua_port= devel/hs-hslua
HsOpenSSL_port= security/hs-HsOpenSSL
hspec_port= devel/hs-hspec # executable
+hspec-core_port= devel/hs-hspec-core
+hspec-discover_port= devel/hs-hspec-discover # executable
hspec-expectations_port= devel/hs-hspec-expectations
HStringTemplate_port= textproc/hs-HStringTemplate
html_port= textproc/hs-html
@@ -230,6 +246,7 @@ http-date_port= www/hs-http-date
http-reverse-proxy_port= www/hs-http-reverse-proxy
http-server_port= www/hs-http-server
http-types_port= www/hs-http-types
+http2_port= www/hs-http2
HUnit_port= devel/hs-HUnit
hxt_port= textproc/hs-hxt
hxt-charproperties_port= textproc/hs-hxt-charproperties
@@ -238,8 +255,11 @@ hxt-unicode_port= textproc/hs-hxt-unicode
ieee754_port= math/hs-ieee754
IfElse_port= devel/hs-IfElse
iproute_port= net/hs-iproute
+js-flot_port= devel/hs-js-flot
+js-jquery_port= devel/hs-js-jquery
json_port= converters/hs-json
JuicyPixels_port= graphics/hs-JuicyPixels
+kan-extensions_port= math/hs-kan-extensions
keys_port= devel/hs-keys
kqueue_port= devel/hs-kqueue
language-c_port= devel/hs-language-c
@@ -251,12 +271,14 @@ lhs2tex_port= textproc/hs-lhs2tex
libmpd_port= audio/hs-libmpd
libxml_port= textproc/hs-libxml
libxml-sax_port= textproc/hs-libxml-sax # lib_depends
+lifted-async_port= devel/hs-lifted-async
lifted-base_port= devel/hs-lifted-base
List_port= devel/hs-List
logict_port= devel/hs-logict
maccatcher_port= net/hs-maccatcher
+map-syntax_port= devel/hs-map-syntax
math-functions_port= math/hs-math-functions
-MaybeT_port= devel/hs-MaybeT
+memory_port= devel/hs-memory
MemoTrie_port= devel/hs-MemoTrie
mime_port= mail/hs-mime
mime-mail_port= mail/hs-mime-mail
@@ -277,22 +299,29 @@ monads-tf_port= devel/hs-monads-tf
mono-traversable_port= devel/hs-mono-traversable
mtl_port= devel/hs-mtl
mueval_port= devel/hs-mueval # executable
+multipart_port= www/hs-multipart
murmur-hash_port= devel/hs-murmur-hash
+mutable-containers_port= devel/hs-mutable-containers
mwc-random_port= math/hs-mwc-random
mysql_port= databases/hs-mysql
-nats_port= math/hs-nats
network_port= net/hs-network
network-info_port= net/hs-network-info
network-multicast_port= net/hs-network-multicast
network-protocol-xmpp_port= net/hs-network-protocol-xmpp
+network-uri_port= net/hs-network-uri
+newtype_port= devel/hs-newtype
+nonce_port= security/hs-nonce
NumInstances_port= math/hs-NumInstances
ObjectName_port= devel/hs-ObjectName
oeis_port= www/hs-oeis
+old-locale_port= devel/hs-old-locale
+old-time_port= devel/hs-old-time
OpenAL_port= audio/hs-OpenAL
OpenGL_port= x11-toolkits/hs-OpenGL
OpenGLRaw_port= x11-toolkits/hs-OpenGLRaw
optparse-applicative_port= devel/hs-optparse-applicative
pandoc_port= textproc/hs-pandoc # executable
+pandoc-citeproc_port= textproc/hs-pandoc-citeproc # executable
pandoc-types_port= textproc/hs-pandoc-types
pango_port= x11-toolkits/hs-pango
parallel_port= devel/hs-parallel
@@ -308,6 +337,7 @@ pointed_port= math/hs-pointed
polyparse_port= textproc/hs-polyparse
porte_port= ports-mgmt/hs-porte # executable
prelude-extras_port= devel/hs-prelude-extras
+preprocessor-tools_port= devel/hs-preprocessor-tools
prettyclass_port= devel/hs-prettyclass
primitive_port= devel/hs-primitive
probability_port= math/hs-probability
@@ -320,22 +350,24 @@ pwstore-fast_port= security/hs-pwstore-fast
QuickCheck_port= devel/hs-QuickCheck
quickcheck-io_port= devel/hs-quickcheck-io
random_port= devel/hs-random
-ranges_port= devel/hs-ranges
ReadArgs_port= devel/hs-ReadArgs # executable
readline_port= devel/hs-readline
recaptcha_port= www/hs-recaptcha
reflection_port= devel/hs-reflection
+regex-applicative_port= textproc/hs-regex-applicative
regex-base_port= textproc/hs-regex-base
regex-compat_port= textproc/hs-regex-compat
+regex-compat-tdfa_port= textproc/hs-regex-compat-tdfa
regex-pcre-builtin_port= textproc/hs-regex-pcre-builtin # lib_depends
regex-posix_port= textproc/hs-regex-posix
regex-tdfa_port= textproc/hs-regex-tdfa
resource-pool_port= devel/hs-resource-pool
resourcet_port= devel/hs-resourcet
+rfc5051_port= textproc/hs-rfc5051
RSA_port= security/hs-RSA
safe_port= devel/hs-safe
SafeSemaphore_port= devel/hs-SafeSemaphore
-scgi_port= www/hs-scgi
+sandi_port= converters/hs-sandi
scientific_port= devel/hs-scientific
securemem_port= devel/hs-securemem
semigroupoids_port= math/hs-semigroupoids
@@ -346,6 +378,7 @@ SHA_port= security/hs-SHA
shake_port= devel/hs-shake # executable
shakespeare_port= www/hs-shakespeare
ShellCheck_port= devel/hs-ShellCheck # executable
+shelly_port= shells/hs-shelly
show_port= devel/hs-show
silently_port= devel/hs-silently
simple-reflect_port= devel/hs-simple-reflect
@@ -356,8 +389,8 @@ snap_port= www/hs-snap
snap-core_port= www/hs-snap-core
snap-server_port= www/hs-snap-server # lib_depends
socks_port= net/hs-socks
-soegtk_port= graphics/hs-soegtk
split_port= devel/hs-split
+StateVar_port= devel/hs-StateVar
statistics_port= math/hs-statistics
stm_port= devel/hs-stm
stm-chans_port= devel/hs-stm-chans
@@ -380,7 +413,6 @@ temporary_port= devel/hs-temporary
test-framework_port= devel/hs-test-framework
test-framework-hunit_port= devel/hs-test-framework-hunit
test-framework-quickcheck2_port= devel/hs-test-framework-quickcheck2
-testpack_port= devel/hs-testpack
texmath_port= textproc/hs-texmath # executable
text_port= devel/hs-text
text-icu_port= devel/hs-text-icu # lib_depends
@@ -388,9 +420,11 @@ tf-random_port= devel/hs-tf-random
threads_port= devel/hs-threads
threadscope_port= devel/hs-threadscope # executable
time-compat_port= devel/hs-time-compat
+time-locale-compat_port= devel/hs-time-locale-compat
timezone-olson_port= devel/hs-timezone-olson
timezone-series_port= devel/hs-timezone-series
tls_port= security/hs-tls
+torrent_port= net-p2p/hs-torrent
transformers-base_port= devel/hs-transformers-base
transformers-compat_port= devel/hs-transformers-compat
TypeCompose_port= devel/hs-TypeCompose
@@ -409,6 +443,7 @@ uuagc_port= devel/hs-uuagc
uuagc-bootstrap_port= devel/hs-uuagc-bootstrap # executable
uuagc-cabal_port= devel/hs-uuagc-cabal
uuid_port= devel/hs-uuid
+uuid-types_port= devel/hs-uuid-types
uulib_port= devel/hs-uulib
vault_port= devel/hs-vault
vector_port= devel/hs-vector
@@ -454,8 +489,6 @@ yesod-bin_port= www/hs-yesod-bin
yesod-core_port= www/hs-yesod-core
yesod-form_port= www/hs-yesod-form
yesod-persistent_port= www/hs-yesod-persistent
-yesod-platform_port= www/hs-yesod-platform
-yesod-routes_port= www/hs-yesod-routes
yesod-static_port= www/hs-yesod-static
yesod-test_port= www/hs-yesod-test
zip-archive_port= archivers/hs-zip-archive
diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo
index 4302020..04c2eab 100644
--- a/lang/ghc/distinfo
+++ b/lang/ghc/distinfo
@@ -1,16 +1,8 @@
-SHA256 (ghc-7.8.3-src.tar.bz2) = 2358826f8424bf571dcc313bd882422fe108a340d6e37db4339ff6d5d6ac3f37
-SIZE (ghc-7.8.3-src.tar.bz2) = 10696541
-SHA256 (hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96
-SIZE (hscolour-1.20.3.tar.gz) = 25810
-SHA256 (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = efdb68255cdcdeabbec1031a44f631cf8d0a619f9687b09d5a00230d3b871148
-SIZE (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = 55495926
-SHA256 (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 15ab9262d0f7ba213431b73e1a21318d5a420fb298b3f7cb28da1c8562241dcd
-SIZE (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 55410502
-SHA256 (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 2a10cc8aa24282612c1ba9a8dd2234192bef2f307fd70fa209b32bb97a1d73a2
-SIZE (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 55500650
-SHA256 (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = a0e21b166c94994a22005d0bb15822d16c10e79856f57b500466e23d8f5c13a6
-SIZE (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = 55418614
-SHA256 (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 4ab59ac9642641d612fdb636e544248ee2e74834bafe1d29ef556215ea097409
-SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004
-SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad
-SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435
+SHA256 (ghc-7.10.2-src.tar.xz) = 54cd73755b784d78e2f13d5eb161bfa38d3efee9e8a56f7eb6cd9f2d6e2615f5
+SIZE (ghc-7.10.2-src.tar.xz) = 11113204
+SHA256 (hscolour-1.23.tar.gz) = 97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0
+SIZE (hscolour-1.23.tar.gz) = 26027
+SHA256 (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 5cadd55316fe6c1bf275d0f44f10b46342096922a15ecb9fb78c80fc293f901a
+SIZE (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 39858716
+SHA256 (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 4af0ee0795537baa11a96fba23477f8390ccb5f45910cda119d0a16bdebaedc8
+SIZE (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 49833224
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4
index e472723..550ec1a 100644
--- a/lang/ghc/files/patch-aclocal.m4
+++ b/lang/ghc/files/patch-aclocal.m4
@@ -1,20 +1,39 @@
---- ./aclocal.m4.orig 2014-07-10 06:27:16.000000000 +0200
-+++ ./aclocal.m4 2014-07-11 11:23:41.000000000 +0200
-@@ -47,6 +47,8 @@
- # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET}
- # so this justs uses $bootstrap_target.
+--- aclocal.m4.orig 2015-07-21 13:52:50 UTC
++++ aclocal.m4
+@@ -1718,36 +1718,6 @@ int main(int argc, char *argv[])
+ }
+ alarm(1);
-+ bootstrap_target=`echo "$bootstrap_target" | sed -e 's/-unknown-/-portbld-/g'`
-+
- if test "$build_alias" = ""
- then
- if test "$bootstrap_target" != ""
-@@ -1817,7 +1819,7 @@
- dnl If special linker flags are needed to build things, then allow
- dnl the user to pass them in via LDFLAGS.
- changequote(, )dnl
-- GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'`
-+ GHC_LDFLAGS=`echo $LDFLAGS | sed -r 's/(^| )([^ ])/\1-optl\2/g'`
- changequote([, ])dnl
- if ! "$WithGhc" $GHC_LDFLAGS -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
- then
+- if (timer_create(CLOCK_PROCESS_CPUTIME_ID, &ev, &timer) != 0) {
+- fprintf(stderr,"No CLOCK_PROCESS_CPUTIME_ID timer\n");
+- exit(1);
+- }
+-
+- it.it_value.tv_sec = 0;
+- it.it_value.tv_nsec = 1;
+- it.it_interval = it.it_value;
+- if (timer_settime(timer, 0, &it, NULL) != 0) {
+- fprintf(stderr,"settime problem\n");
+- exit(4);
+- }
+-
+- tock = 0;
+-
+- for(n = 3; n < 20000; n++){
+- for(m = 2; m <= n/2; m++){
+- if (!(n%m)) count++;
+- if (tock) goto out;
+- }
+- }
+-out:
+-
+- if (!tock) {
+- fprintf(stderr,"no CLOCK_PROCESS_CPUTIME_ID signal\n");
+- exit(5);
+- }
+-
+- timer_delete(timer);
+-
+ if (timer_create(CLOCK_REALTIME, &ev, &timer) != 0) {
+ fprintf(stderr,"No CLOCK_REALTIME timer\n");
+ exit(2);
diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac
index 7f1323c..ddffa16 100644
--- a/lang/ghc/files/patch-configure.ac
+++ b/lang/ghc/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- ./configure.ac.orig 2014-07-10 07:04:42.000000000 +0200
-+++ ./configure.ac 2014-07-11 10:27:40.000000000 +0200
-@@ -435,6 +435,9 @@
+--- configure.ac.orig 2015-07-21 19:50:11 UTC
++++ configure.ac
+@@ -383,6 +383,9 @@ AC_SUBST([SplitObjsBroken])
dnl ** Building a cross compiler?
dnl --------------------------------------------------------------
CrossCompiling=NO
@@ -10,11 +10,3 @@
# If 'host' and 'target' differ, then this means we are building a cross-compiler.
if test "$target" != "$host" ; then
CrossCompiling=YES
-@@ -914,7 +917,6 @@
- FP_VISIBILITY_HIDDEN
-
- dnl ** check for librt
--AC_CHECK_LIB(rt, clock_gettime)
- AC_CHECK_FUNCS(clock_gettime timer_settime)
- FP_CHECK_TIMER_CREATE
-
diff --git a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
new file mode 100644
index 0000000..53cf700
--- /dev/null
+++ b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs
@@ -0,0 +1,11 @@
+--- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig 2015-04-01 00:24:45 UTC
++++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs
+@@ -875,7 +875,7 @@ getRPaths lbi clbi | supportRPaths hostO
+ supportRPaths Linux   = True
+ supportRPaths Windows = False
+ supportRPaths OSX   = True
+- supportRPaths FreeBSD   = False
++ supportRPaths FreeBSD   = True
+ supportRPaths OpenBSD   = False
+ supportRPaths NetBSD   = False
+ supportRPaths DragonFly = False
diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
index 029e587..7a44257 100644
--- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
+++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs
@@ -1,18 +1,12 @@
---- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2014-07-10 06:34:21.000000000 +0200
-+++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs 2014-07-26 23:57:20.869626927 +0200
-@@ -198,13 +198,18 @@
+--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2015-06-19 10:36:50 UTC
++++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs
+@@ -261,10 +261,13 @@ alexProgram = (simpleProgram "alex") {
gccProgram :: Program
gccProgram = (simpleProgram "gcc") {
programFindVersion = findProgramVersion "-dumpversion" id
+ , programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%"
}
- ranlibProgram :: Program
--ranlibProgram = simpleProgram "ranlib"
-+ranlibProgram = (simpleProgram "ranlib") {
-+ programFindLocation = \_v _p -> return (Just "%%RANLIB%%")
-+ }
-
arProgram :: Program
-arProgram = simpleProgram "ar"
+arProgram = (simpleProgram "ar") {
@@ -20,8 +14,8 @@
+ }
stripProgram :: Program
- stripProgram = simpleProgram "strip"
-@@ -257,7 +262,9 @@
+ stripProgram = (simpleProgram "strip") {
+@@ -336,7 +339,9 @@ greencardProgram :: Program
greencardProgram = simpleProgram "greencard"
ldProgram :: Program
@@ -31,4 +25,4 @@
+ }
tarProgram :: Program
- tarProgram = simpleProgram "tar"
+ tarProgram = (simpleProgram "tar") {
diff --git a/lang/hs-brainfuck/Makefile b/lang/hs-brainfuck/Makefile
index 22aaeee..e8dbdfd 100644
--- a/lang/hs-brainfuck/Makefile
+++ b/lang/hs-brainfuck/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= brainfuck
-PORTVERSION= 0.1
-PORTREVISION= 15
+PORTVERSION= 0.1.0.2
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Brainfuck interpreter written in Haskell
+COMMENT= Brainfuck interpreter
LICENSE= GPLv2
diff --git a/lang/hs-brainfuck/distinfo b/lang/hs-brainfuck/distinfo
index a7fcb7c..91ac64b 100644
--- a/lang/hs-brainfuck/distinfo
+++ b/lang/hs-brainfuck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/brainfuck-0.1.tar.gz) = e3a382b42cb4f431574a6401ab7d45a8e18aae21aee9a6a46c11e5489e305c53
-SIZE (cabal/brainfuck-0.1.tar.gz) = 12110
+SHA256 (cabal/brainfuck-0.1.0.2.tar.gz) = e9ff5626ceaca4913506a6b854f7d1375a5642e0fd33984d3fc30a58e906b7a3
+SIZE (cabal/brainfuck-0.1.0.2.tar.gz) = 11886
diff --git a/lang/hs-brainfuck/pkg-descr b/lang/hs-brainfuck/pkg-descr
index cc6ba3a..eb327b8 100644
--- a/lang/hs-brainfuck/pkg-descr
+++ b/lang/hs-brainfuck/pkg-descr
@@ -1,4 +1,4 @@
-This is an interpreter of the brainf*ck language,
-written in the pure, lazy, functional language Haskell.
+This is an interpreter of the brainf*ck language, written in the pure,
+lazy, functional language Haskell.
WWW: http://hackage.haskell.org/package/brainfuck
diff --git a/lang/hs-epic/Makefile b/lang/hs-epic/Makefile
deleted file mode 100644
index 3785fca..0000000
--- a/lang/hs-epic/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= epic
-PORTVERSION= 0.9.3
-PORTREVISION= 10
-CATEGORIES= lang haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Compiler for a simple functional language
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= mtl
-USE_HAPPY= yes
-
-BUILD_DEPENDS+= boehm-gc>=7.1:${PORTSDIR}/devel/boehm-gc \
- gmp>=5.0.2:${PORTSDIR}/math/gmp
-RUN_DEPENDS+= boehm-gc>=7.1:${PORTSDIR}/devel/boehm-gc \
- gmp>=5.0.2:${PORTSDIR}/math/gmp
-
-EXECUTABLE= epic
-
-# Force regeneration of the parser.
-post-patch::
- @${RM} -rf ${WRKSRC}/dist
- @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/evm/Makefile
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/lang/hs-epic/distinfo b/lang/hs-epic/distinfo
deleted file mode 100644
index ac74c77..0000000
--- a/lang/hs-epic/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/epic-0.9.3.tar.gz) = 6708a21cdf226f0a9344afaf1ee25900b74462d94ed681f815252305251d1ef5
-SIZE (cabal/epic-0.9.3.tar.gz) = 86632
diff --git a/lang/hs-epic/files/patch-Epic__Language.lhs b/lang/hs-epic/files/patch-Epic__Language.lhs
deleted file mode 100644
index cb047e5..0000000
--- a/lang/hs-epic/files/patch-Epic__Language.lhs
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./Epic/Language.lhs.orig 2012-02-28 00:44:29.000000000 +0100
-+++ ./Epic/Language.lhs 2013-05-01 00:03:23.000000000 +0200
-@@ -5,6 +5,7 @@
-
- > import Control.Monad
- > import System.IO
-+> import System.IO.Error
- > import System.Directory
- > import System.Environment
-
-@@ -377,9 +378,9 @@
- > openTempFile dir "esc"
-
- > environment :: String -> IO (Maybe String)
--> environment x = catch (do e <- getEnv x
--> return (Just e))
--> (\_ -> return Nothing)
-+> environment x = catchIOError (do e <- getEnv x
-+> return (Just e))
-+> (\_ -> return Nothing)
-
- Some tests
-
diff --git a/lang/hs-epic/files/patch-Setup.hs b/lang/hs-epic/files/patch-Setup.hs
deleted file mode 100644
index 9e14cf1..0000000
--- a/lang/hs-epic/files/patch-Setup.hs
+++ /dev/null
@@ -1,32 +0,0 @@
---- Setup.hs.orig 2012-02-27 23:44:30.000000000 +0000
-+++ Setup.hs 2013-12-08 15:39:13.067013368 +0000
-@@ -1,10 +1,12 @@
- import Distribution.Simple
- import Distribution.Simple.InstallDirs
- import Distribution.Simple.LocalBuildInfo
--import Distribution.PackageDescription
-+import Distribution.Simple.Setup
-+import Distribution.PackageDescription hiding (Flag)
-
- import System.Exit
- import System.Process
-+import System.FilePath.Posix
-
- -- After Epic is built, we need a run time system.
-
-@@ -33,7 +35,14 @@
- = do let pfx = prefix (installDirTemplates local)
- system' $ "make -C evm install PREFIX=" ++ show pfx
-
-+postCopyLib args flags desc local = do
-+ let pfix = prefix (installDirTemplates local)
-+ let (Flag (CopyTo destDir)) = copyDest flags
-+ putStrLn $ "PREFIX=" ++ (show destDir </> show pfix)
-+ system' $ "make -C evm install PREFIX=" ++ (destDir </> show pfix)
-+
- main = defaultMainWithHooks (simpleUserHooks { postBuild = buildLib,
- postConf = postConfLib,
-- postInst = postInstLib })
-+ postInst = postInstLib,
-+ postCopy = postCopyLib })
-
diff --git a/lang/hs-epic/files/patch-evm__Makefile b/lang/hs-epic/files/patch-evm__Makefile
deleted file mode 100644
index 0645c14..0000000
--- a/lang/hs-epic/files/patch-evm__Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./evm/Makefile.orig 2012-02-28 00:44:29.000000000 +0100
-+++ ./evm/Makefile 2012-04-08 10:41:14.000000000 +0200
-@@ -1,6 +1,4 @@
--CC = gcc
--#CFLAGS = -Wall -g -DUSE_BOEHM
--CFLAGS = -Wall -O3 -DUSE_BOEHM
-+CFLAGS+= -Wall -DUSE_BOEHM -I%%LOCALBASE%%/include -L%%LOCALBASE%%/lib
- OBJS = closure.o stdfuns.o emalloc.o sparks.o
- INSTALLDIR = ${PREFIX}/lib/evm
-
diff --git a/lang/hs-epic/pkg-descr b/lang/hs-epic/pkg-descr
deleted file mode 100644
index a87859a..0000000
--- a/lang/hs-epic/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Epic is a simple functional language which compiles to reasonably efficient C code,
-using the Boehm-Demers-Weiser garbage collector [1]. It is intended as a compiler
-back-end, and is currently used as a back end for Epigram [2] and Idris [3]. It
-can be invoked either as a library or an application.
-
-[1] http://www.hpl.hp.com/personal/Hans_Boehm/gc/
-[2] http://www.e-pig.org/
-[3] http://idris-lang.org/
-
-WWW: http://www.dcs.st-and.ac.uk/~eb/epic.php
diff --git a/lang/hs-epic/pkg-plist b/lang/hs-epic/pkg-plist
deleted file mode 100644
index 15d69d1..0000000
--- a/lang/hs-epic/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-lib/evm/closure.h
-lib/evm/libevm.a
-lib/evm/mainprog.c
-lib/evm/sparks.h
-lib/evm/stdfuns.h
diff --git a/lang/hs-unlambda/Makefile b/lang/hs-unlambda/Makefile
index 9fe2010..fc58a53 100644
--- a/lang/hs-unlambda/Makefile
+++ b/lang/hs-unlambda/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= unlambda
-PORTVERSION= 0.1.3
-PORTREVISION= 8
+PORTVERSION= 0.1.4.1
CATEGORIES= lang haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/lang/hs-unlambda/distinfo b/lang/hs-unlambda/distinfo
index 046bf68..9d453c8 100644
--- a/lang/hs-unlambda/distinfo
+++ b/lang/hs-unlambda/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/unlambda-0.1.3.tar.gz) = 09c1a0aa5ff464bc81dba3be4c6cabe25d89b8a057ca2c8eaa470df1e0bc8c32
-SIZE (cabal/unlambda-0.1.3.tar.gz) = 9549
+SHA256 (cabal/unlambda-0.1.4.1.tar.gz) = 07a5525d1333264e6909732d3c0872a9b2b6d7612f61d387448c3f400a656007
+SIZE (cabal/unlambda-0.1.4.1.tar.gz) = 9631
diff --git a/mail/hs-email-validate/Makefile b/mail/hs-email-validate/Makefile
index 9f2f8ea..ebdd78b 100644
--- a/mail/hs-email-validate/Makefile
+++ b/mail/hs-email-validate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= email-validate
-PORTVERSION= 2.0.1
-PORTREVISION= 1
+PORTVERSION= 2.1.3
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-email-validate/distinfo b/mail/hs-email-validate/distinfo
index 88715bb..efb687c 100644
--- a/mail/hs-email-validate/distinfo
+++ b/mail/hs-email-validate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/email-validate-2.0.1.tar.gz) = f2d363c06c09d9e1d348d10314831998eb6e516588c56fd503e5fbd85165bbe3
-SIZE (cabal/email-validate-2.0.1.tar.gz) = 7462
+SHA256 (cabal/email-validate-2.1.3.tar.gz) = 5b967999717a8216639b39de1583a87e8c8ec471c416386229215c233d2c81cb
+SIZE (cabal/email-validate-2.1.3.tar.gz) = 7784
diff --git a/mail/hs-mime-mail/Makefile b/mail/hs-mime-mail/Makefile
index 143d40d..8764d80 100644
--- a/mail/hs-mime-mail/Makefile
+++ b/mail/hs-mime-mail/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= mime-mail
-PORTVERSION= 0.4.5.2
-PORTREVISION= 1
+PORTVERSION= 0.4.9
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Compose MIME email messages
-LICENSE= BSD3CLAUSE
+LICENSE= MIT
USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1 random>=1.0 \
text>=0.7
diff --git a/mail/hs-mime-mail/distinfo b/mail/hs-mime-mail/distinfo
index cfa215c..9da4480 100644
--- a/mail/hs-mime-mail/distinfo
+++ b/mail/hs-mime-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-mail-0.4.5.2.tar.gz) = ee13c0120787f2867fd3d7888de13e34bf3b4c545b5f5c838582d1618190ae68
-SIZE (cabal/mime-mail-0.4.5.2.tar.gz) = 7072
+SHA256 (cabal/mime-mail-0.4.9.tar.gz) = 641420aa8b1d2c7f8ebf82fdb0e6000443ffba89a420f4ea11828474b244c3d0
+SIZE (cabal/mime-mail-0.4.9.tar.gz) = 7815
diff --git a/mail/hs-mime-types/Makefile b/mail/hs-mime-types/Makefile
index 8465fa9..1d123a3 100644
--- a/mail/hs-mime-types/Makefile
+++ b/mail/hs-mime-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= mime-types
-PORTVERSION= 0.1.0.4
-PORTREVISION= 1
+PORTVERSION= 0.1.0.6
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime-types/distinfo b/mail/hs-mime-types/distinfo
index 0c89bd4..0185312 100644
--- a/mail/hs-mime-types/distinfo
+++ b/mail/hs-mime-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-types-0.1.0.4.tar.gz) = 5dc87de5461d217f003259fe5b3260179449ea2fecaeab6779b09e8b3e9fb02f
-SIZE (cabal/mime-types-0.1.0.4.tar.gz) = 10945
+SHA256 (cabal/mime-types-0.1.0.6.tar.gz) = fc8a933f75970dc90d4623f834f35d028a994178481b66ab1a4420916e1b1f24
+SIZE (cabal/mime-types-0.1.0.6.tar.gz) = 11135
diff --git a/mail/hs-mime/Makefile b/mail/hs-mime/Makefile
index aecff71..82bba77 100644
--- a/mail/hs-mime/Makefile
+++ b/mail/hs-mime/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mime
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.4.0.2
CATEGORIES= mail haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/mail/hs-mime/distinfo b/mail/hs-mime/distinfo
index 3538d0f..d9c37ba 100644
--- a/mail/hs-mime/distinfo
+++ b/mail/hs-mime/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mime-0.4.0.1.tar.gz) = e0e65ac0f0c06dc5a750950da4cd0f074e996d156320f3f4c2a4686bb13e28d5
-SIZE (cabal/mime-0.4.0.1.tar.gz) = 9420
+SHA256 (cabal/mime-0.4.0.2.tar.gz) = e7fa283e5caa6371d5b3978e152412a2dd2489eec43aee722caca9dc14ea3875
+SIZE (cabal/mime-0.4.0.2.tar.gz) = 9438
diff --git a/math/Makefile b/math/Makefile
index dce6fc9..7fa59e9 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -172,6 +172,7 @@
SUBDIR += hfst
SUBDIR += hs-Agda
SUBDIR += hs-NumInstances
+ SUBDIR += hs-adjunctions
SUBDIR += hs-categories
SUBDIR += hs-comonad
SUBDIR += hs-contravariant
@@ -180,9 +181,9 @@
SUBDIR += hs-distributive
SUBDIR += hs-erf
SUBDIR += hs-ieee754
+ SUBDIR += hs-kan-extensions
SUBDIR += hs-math-functions
SUBDIR += hs-mwc-random
- SUBDIR += hs-nats
SUBDIR += hs-pointed
SUBDIR += hs-probability
SUBDIR += hs-semigroupoids
diff --git a/math/hs-Agda-stdlib/Makefile b/math/hs-Agda-stdlib/Makefile
new file mode 100644
index 0000000..d6c852d
--- /dev/null
+++ b/math/hs-Agda-stdlib/Makefile
@@ -0,0 +1,45 @@
+# $FreeBSD$
+
+PORTNAME= Agda-stdlib
+PORTVERSION= 0.9
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Agda standard library
+
+LICENSE= MIT
+
+USE_GITHUB= yes
+
+GH_ACCOUNT= agda
+GH_PROJECT= agda-stdlib
+GH_TAGNAME= v0.9
+
+USE_CABAL= Agda filemanip>=0.3
+
+STANDALONE= yes
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
+
+do-build:
+ cd ${WRKSRC} && ( \
+ ${SETENV} ${MAKE_ENV} ${SETUP_CMD} build; \
+ dist/build/GenerateEverything/GenerateEverything; \
+ agda -i. -isrc README.agda \
+ )
+.if ${PORT_OPTIONS:MDOCS}
+ cd ${WRKSRC} && agda -i. -isrc --html README.agda -v0
+.endif
+
+do-install:
+ cd ${WRKSRC} && ( \
+ ${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}; \
+ ${INSTALL_DATA} LICENCE ${STAGEDIR}${DOCSDIR}; \
+ cd src && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR} \
+ )
+.if ${PORT_OPTIONS:MDOCS}
+ cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
+.endif
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-Agda-stdlib/distinfo b/math/hs-Agda-stdlib/distinfo
new file mode 100644
index 0000000..40cc10e
--- /dev/null
+++ b/math/hs-Agda-stdlib/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/agda-agda-stdlib-0.9-v0.9_GH0.tar.gz) = 923b487876235863e4f778aa40c508984b26636d50d531f0f31ca9dc45ab3717
+SIZE (cabal/agda-agda-stdlib-0.9-v0.9_GH0.tar.gz) = 248895
diff --git a/math/hs-Agda-stdlib/files/patch-lib.cabal b/math/hs-Agda-stdlib/files/patch-lib.cabal
new file mode 100644
index 0000000..b2ee3bb
--- /dev/null
+++ b/math/hs-Agda-stdlib/files/patch-lib.cabal
@@ -0,0 +1,18 @@
+--- lib.cabal.orig 2014-11-14 23:18:11 UTC
++++ lib.cabal
+@@ -7,12 +7,12 @@ description: Helper programs.
+ executable GenerateEverything
+ hs-source-dirs: .
+ main-is: GenerateEverything.hs
+- build-depends: base >= 4.2 && < 4.8,
++ build-depends: base >= 4.2 && < 4.9,
+ filemanip == 0.3.*,
+- filepath >= 1.1 && < 1.4
++ filepath >= 1.1 && < 1.5
+
+ executable AllNonAsciiChars
+ hs-source-dirs: .
+ main-is: AllNonAsciiChars.hs
+- build-depends: base >= 4.2 && < 4.8,
++ build-depends: base >= 4.2 && < 4.9,
+ filemanip == 0.3.*
diff --git a/math/hs-Agda-stdlib/files/patch-src_Size.agda b/math/hs-Agda-stdlib/files/patch-src_Size.agda
new file mode 100644
index 0000000..7b141b5
--- /dev/null
+++ b/math/hs-Agda-stdlib/files/patch-src_Size.agda
@@ -0,0 +1,21 @@
+--- src/Size.agda.orig 2014-11-14 23:18:11 UTC
++++ src/Size.agda
+@@ -6,13 +6,8 @@
+
+ module Size where
+
+-postulate
+- Size : Set
+- Size<_ : Size → Set
+- ↑_ : Size → Size
+- ∞ : Size
+-
+-{-# BUILTIN SIZE Size #-}
+-{-# BUILTIN SIZELT Size<_ #-}
+-{-# BUILTIN SIZESUC ↑_ #-}
+-{-# BUILTIN SIZEINF ∞ #-}
++{-# BUILTIN SIZEUNIV SizeUniv #-} -- sort SizeUniv
++{-# BUILTIN SIZE Size #-} -- Size : SizeUniv
++{-# BUILTIN SIZELT Size<_ #-} -- Size<_ : Size → SizeUniv
++{-# BUILTIN SIZESUC ↑_ #-} -- ↑_ : Size → Size
++{-# BUILTIN SIZEINF ∞ #-} -- ∞ : Size
diff --git a/math/hs-Agda-stdlib/pkg-descr b/math/hs-Agda-stdlib/pkg-descr
new file mode 100644
index 0000000..287c3e8
--- /dev/null
+++ b/math/hs-Agda-stdlib/pkg-descr
@@ -0,0 +1,3 @@
+The Agda standard library.
+
+WWW: https://agda.github.io/agda-stdlib/
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 752cb0f..c6ac1f1 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -2,31 +2,36 @@
# $FreeBSD$
PORTNAME= Agda
-PORTVERSION= 2.4.0.2
-PORTREVISION= 1
+PORTVERSION= 2.4.2.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Dependently typed functional programming language and proof assistant
-USE_CABAL= boxes>=0.1.3 data-hash>=0.2.0.0 equivalence>=0.2.4 \
- geniplate>=0.6.0.3 hashable hashtables>=1.0 \
- haskell-src-exts>=1.9.6 mtl>=2.1.1 parallel QuickCheck>=2.6 \
- STMonadTrans>=0.3.2 strict>=0.3.2 text>=0.11 \
+USE_CABAL= base-orphans>=0.3.1 boxes>=0.1.3 cpphs data-hash>=0.2.0.0 \
+ edit-distance>=0.2.1.2 equivalence>=0.2.5 \
+ geniplate-mirror>=0.6.0.6 hashable>=1.1.2.3 hashtables>=1.0 \
+ haskell-src-exts>=1.16.0.1 mtl>=2.1.1 parallel QuickCheck>=2.8 \
+ strict>=0.3.2 text>=0.11 transformers-compat>=0.3.3.2 \
unordered-containers>=0.2 zlib>=0.4.0.1
+
USE_ALEX= yes
USE_HAPPY= yes
USES= iconv:translit
EXECUTABLE= agda-mode agda
-INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR}
+_PRIMITIVE= Primitive.agdai
-FLAGS_DEFINE= EPIC
+INSTALL_PORTDATA= ${INSTALL_DATA} \
+ ${DISTDIR}/${DIST_SUBDIR}/${_PRIMITIVE}.${PORTVERSION} \
+ ${STAGEDIR}${DATADIR}/lib/prim/Agda/${_PRIMITIVE}
-EPIC_DESC= Install the Epic compiler
-EPIC_FLAG_ENABLE= epic
-EPIC_FLAG_CABAL= epic>=0.1.13
+FLAGS_ENABLE= cpphs
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+
+MASTER_SITES+= LOCAL/pgj:primitive
+DISTFILES+= ${_PRIMITIVE}.${PORTVERSION}:primitive
+
.include <bsd.port.mk>
diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo
index be99d67..35fced2 100644
--- a/math/hs-Agda/distinfo
+++ b/math/hs-Agda/distinfo
@@ -1,2 +1,4 @@
-SHA256 (cabal/Agda-2.4.0.2.tar.gz) = 0b41cf9f841fd78b60490c66a4f08c9f57316e96ca8f3449dacb52cbf48d848d
-SIZE (cabal/Agda-2.4.0.2.tar.gz) = 910389
+SHA256 (cabal/Agda-2.4.2.3.tar.gz) = bc6def45e32498f51863d67acfbe048c039d630c6a36761ed27e99a5f68d7b27
+SIZE (cabal/Agda-2.4.2.3.tar.gz) = 990268
+SHA256 (cabal/Primitive.agdai.2.4.2.3) = a5b2353a50256f24c87f20b7892faabc99b9bad8f9b5cc68c24343707c1accf8
+SIZE (cabal/Primitive.agdai.2.4.2.3) = 2627
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index ae803d3..f6be142 100644
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ b/math/hs-Agda/files/patch-Agda.cabal
@@ -1,11 +1,17 @@
---- ./Agda.cabal.orig 2014-06-16 12:42:15.000000000 +0200
-+++ ./Agda.cabal 2014-07-13 13:20:32.000000000 +0200
-@@ -76,7 +76,7 @@
- transformers == 0.3.*,
- -- mtl-2.1 contains a severe bug
- mtl >= 2.1.1 && < 2.2,
-- QuickCheck >= 2.7.5 && < 2.8,
-+ QuickCheck >= 2.6 && < 2.7,
- haskell-src-exts >= 1.9.6 && < 1.16,
- containers >= 0.1 && < 0.6,
- unordered-containers == 0.2.*,
+--- Agda.cabal.orig 2015-05-25 16:22:38 UTC
++++ Agda.cabal
+@@ -85,12 +85,12 @@ library
+ -- even though it builds with older GHCs.
+ , bytestring >= 0.9.2.1 && < 0.11
+ , containers >= 0.4.2.1 && < 0.6
+- , data-hash == 0.2.0.0
++ , data-hash == 0.2.0.*
+ , deepseq >= 1.3.0.0 && < 1.5
+ , edit-distance >= 0.2.1.2 && < 0.3
+ , equivalence >= 0.2.5 && < 0.4
+ , filepath >= 1.3.0.0 && < 1.5
+- , geniplate-mirror >= 0.6.0.6 && < 0.7
++ , geniplate-mirror >= 0.6.0.6 && < 0.8
+ -- hashable 1.2.0.10 makes library-test 10x slower. The issue was
+ -- fixed in hashable 1.2.1.0.
+ -- https://github.com/tibbe/hashable/issues/57.
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs b/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs
deleted file mode 100644
index ef4b917..0000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/full/Agda/Interaction/Highlighting/Precise.hs.orig 2014-07-29 19:41:41.000000000 +0100
-+++ ./src/full/Agda/Interaction/Highlighting/Precise.hs 2014-08-10 11:30:01.000000000 +0100
-@@ -40,7 +40,7 @@
- import Data.Monoid
- import Control.Applicative ((<$>), (<*>))
- import Control.Monad
--import Agda.Utils.QuickCheck
-+import Agda.Utils.QuickCheck hiding (ranges)
- import Data.Map (Map)
- import qualified Data.Map as Map
- import Data.Typeable (Typeable)
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index 19f2efe..dc82288 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= NumInstances
-PORTVERSION= 1.3
-PORTREVISION= 6
+PORTVERSION= 1.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-NumInstances/distinfo b/math/hs-NumInstances/distinfo
index 60e673d..95affd4 100644
--- a/math/hs-NumInstances/distinfo
+++ b/math/hs-NumInstances/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/NumInstances-1.3.tar.gz) = 50a3f3492304a3272f3c4cfe9e852f296888f2c31d84b2012be9e9af8aa63070
-SIZE (cabal/NumInstances-1.3.tar.gz) = 4051
+SHA256 (cabal/NumInstances-1.4.tar.gz) = cbdb2a49346f59ceb5ab38592d7bc52e5205580d431d0ac6d852fd9880e59679
+SIZE (cabal/NumInstances-1.4.tar.gz) = 4749
diff --git a/math/hs-adjunctions/Makefile b/math/hs-adjunctions/Makefile
new file mode 100644
index 0000000..571e5dd
--- /dev/null
+++ b/math/hs-adjunctions/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= adjunctions
+PORTVERSION= 4.2.1
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Adjunctions and representable functors
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= comonad>=4 contravariant>=1.0 distributive>=0.4 free>=4.0 \
+ mtl>=2.0.1 profunctors>=4 semigroupoids>=4 semigroups>=0.11 \
+ tagged>=0.7 void>=0.5.5.1
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-adjunctions/distinfo b/math/hs-adjunctions/distinfo
new file mode 100644
index 0000000..1f9a024
--- /dev/null
+++ b/math/hs-adjunctions/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/adjunctions-4.2.1.tar.gz) = 65a64cd42dcf356c2b44fffc4360f8cbf494702f7574b5a1e57e1864b0f8f46f
+SIZE (cabal/adjunctions-4.2.1.tar.gz) = 14314
diff --git a/math/hs-adjunctions/pkg-descr b/math/hs-adjunctions/pkg-descr
new file mode 100644
index 0000000..daa2d8b
--- /dev/null
+++ b/math/hs-adjunctions/pkg-descr
@@ -0,0 +1,3 @@
+Adjunctions and representable functors.
+
+WWW: http://github.com/ekmett/adjunctions/
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index c42ccc7..5e4a770 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= categories
-PORTVERSION= 1.0.6
-PORTREVISION= 1
+PORTVERSION= 1.0.7
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-categories/distinfo b/math/hs-categories/distinfo
index 30e3635..1751ffd 100644
--- a/math/hs-categories/distinfo
+++ b/math/hs-categories/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/categories-1.0.6.tar.gz) = 9e159abff9a4e0652a46c4206c94e46ecb7c0fa8822fbea921af480c57cfb544
-SIZE (cabal/categories-1.0.6.tar.gz) = 9061
+SHA256 (cabal/categories-1.0.7.tar.gz) = c29dcec070073f3fdb13f0265e2efc4f2f88522292189690351a70f24cd830a2
+SIZE (cabal/categories-1.0.7.tar.gz) = 9211
diff --git a/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs b/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs
deleted file mode 100644
index 5f73258..0000000
--- a/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs
+++ /dev/null
@@ -1,101 +0,0 @@
---- ./src/Control/Categorical/Functor.hs.orig 2013-06-20 22:09:11.000000000 +0200
-+++ ./src/Control/Categorical/Functor.hs 2014-07-13 17:57:00.000000000 +0200
-@@ -2,7 +2,7 @@
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
- {-# LANGUAGE Trustworthy #-}
- #endif
--{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts, UndecidableInstances, FlexibleInstances #-}
-+{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts, UndecidableInstances, FlexibleInstances, DeriveDataTypeable #-}
- -------------------------------------------------------------------------------------------
- -- |
- -- Module : Control.Categorical.Functor
-@@ -29,86 +29,12 @@
- import Control.Category
- import Prelude hiding (id, (.), Functor(..))
- import qualified Prelude
--#ifdef __GLASGOW_HASKELL__
--import Data.Data (Data(..), mkDataType, DataType, mkConstr, Constr, constrIndex, Fixity(..))
--#if MIN_VERSION_base(4,4,0)
--import Data.Typeable (Typeable1(..), TyCon, mkTyCon3, mkTyConApp, gcast1)
--#else
--import Data.Typeable (Typeable1(..), TyCon, mkTyCon, mkTyConApp, gcast1)
--#endif
--#endif
-+import Data.Typeable
-
- -- TODO Data, Typeable
--newtype LiftedFunctor f a = LiftedFunctor (f a) deriving (Show, Read)
--
--#ifdef __GLASGOW_HASKELL__
--
--liftedTyCon :: TyCon
--#if MIN_VERSION_base(4,4,0)
--liftedTyCon = mkTyCon3 "categories" "Control.Categorical.Functor" "LiftedFunctor"
--#else
--liftedTyCon = mkTyCon "Control.Categorical.Functor.LiftedFunctor"
--#endif
--{-# NOINLINE liftedTyCon #-}
--
--liftedConstr :: Constr
--liftedConstr = mkConstr liftedDataType "LiftedFunctor" [] Prefix
--{-# NOINLINE liftedConstr #-}
--
--liftedDataType :: DataType
--liftedDataType = mkDataType "Control.Categorical.Fucntor.LiftedFunctor" [liftedConstr]
--{-# NOINLINE liftedDataType #-}
--
--instance Typeable1 f => Typeable1 (LiftedFunctor f) where
-- typeOf1 tfa = mkTyConApp liftedTyCon [typeOf1 (undefined `asArgsType` tfa)]
-- where asArgsType :: f a -> t f a -> f a
-- asArgsType = const
--
--instance (Typeable1 f, Data (f a), Data a) => Data (LiftedFunctor f a) where
-- gfoldl f z (LiftedFunctor a) = z LiftedFunctor `f` a
-- toConstr _ = liftedConstr
-- gunfold k z c = case constrIndex c of
-- 1 -> k (z LiftedFunctor)
-- _ -> error "gunfold"
-- dataTypeOf _ = liftedDataType
-- dataCast1 f = gcast1 f
--#endif
--
--newtype LoweredFunctor f a = LoweredFunctor (f a) deriving (Show, Read)
--
--#ifdef __GLASGOW_HASKELL__
--
--loweredTyCon :: TyCon
--#if MIN_VERSION_base(4,4,0)
--loweredTyCon = mkTyCon3 "categories" "Control.Categorical.Functor" "LoweredFunctor"
--#else
--loweredTyCon = mkTyCon "Control.Categorical.Functor.LoweredFunctor"
--#endif
--{-# NOINLINE loweredTyCon #-}
--
--loweredConstr :: Constr
--loweredConstr = mkConstr loweredDataType "LoweredFunctor" [] Prefix
--{-# NOINLINE loweredConstr #-}
--
--loweredDataType :: DataType
--loweredDataType = mkDataType "Control.Categorical.Fucntor.LoweredFunctor" [loweredConstr]
--{-# NOINLINE loweredDataType #-}
--
--instance Typeable1 f => Typeable1 (LoweredFunctor f) where
-- typeOf1 tfa = mkTyConApp loweredTyCon [typeOf1 (undefined `asArgsType` tfa)]
-- where asArgsType :: f a -> t f a -> f a
-- asArgsType = const
--
--instance (Typeable1 f, Data (f a), Data a) => Data (LoweredFunctor f a) where
-- gfoldl f z (LoweredFunctor a) = z LoweredFunctor `f` a
-- toConstr _ = loweredConstr
-- gunfold k z c = case constrIndex c of
-- 1 -> k (z LoweredFunctor)
-- _ -> error "gunfold"
-- dataTypeOf _ = loweredDataType
-- dataCast1 f = gcast1 f
-+newtype LiftedFunctor f a = LiftedFunctor (f a) deriving (Show, Read, Typeable)
-
--#endif
-+newtype LoweredFunctor f a = LoweredFunctor (f a) deriving (Show, Read, Typeable)
-
- class (Category r, Category t) => Functor f r t | f r -> t, f t -> r where
- fmap :: r a b -> t (f a) (f b)
diff --git a/math/hs-categories/files/patch-src__Control__Category__Dual.hs b/math/hs-categories/files/patch-src__Control__Category__Dual.hs
deleted file mode 100644
index 58f5995..0000000
--- a/math/hs-categories/files/patch-src__Control__Category__Dual.hs
+++ /dev/null
@@ -1,61 +0,0 @@
---- ./src/Control/Category/Dual.hs.orig 2013-06-20 22:09:11.000000000 +0200
-+++ ./src/Control/Category/Dual.hs 2014-07-13 17:56:00.000000000 +0200
-@@ -1,4 +1,4 @@
--{-# LANGUAGE TypeOperators, FlexibleContexts #-}
-+{-# LANGUAGE TypeOperators, FlexibleContexts, DeriveDataTypeable #-}
- {-# LANGUAGE CPP #-}
- #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
- {-# LANGUAGE Trustworthy #-}
-@@ -24,50 +24,11 @@
-
- import Prelude (undefined,const,error)
- import Control.Category
--
--#ifdef __GLASGOW_HASKELL__
--import Data.Data (Data(..), mkDataType, DataType, mkConstr, Constr, constrIndex, Fixity(..))
--#if MIN_VERSION_base(4,4,0)
--import Data.Typeable (Typeable2(..), TyCon, mkTyCon3, mkTyConApp, gcast1)
--#else
--import Data.Typeable (Typeable2(..), TyCon, mkTyCon, mkTyConApp, gcast1)
--#endif
--#endif
-+import Data.Typeable
-
- data Dual k a b = Dual { runDual :: k b a }
-+ deriving Typeable
-
- instance Category k => Category (Dual k) where
- id = Dual id
- Dual f . Dual g = Dual (g . f)
--
--#ifdef __GLASGOW_HASKELL__
--instance Typeable2 k => Typeable2 (Dual k) where
-- typeOf2 tfab = mkTyConApp dataTyCon [typeOf2 (undefined `asDualArgsType` tfab)]
-- where asDualArgsType :: f b a -> t f a b -> f b a
-- asDualArgsType = const
--
--dataTyCon :: TyCon
--#if MIN_VERSION_base(4,4,0)
--dataTyCon = mkTyCon3 "categories" "Control.Category.Dual" "Dual"
--#else
--dataTyCon = mkTyCon "Control.Category.Dual.Dual"
--#endif
--{-# NOINLINE dataTyCon #-}
--
--dualConstr :: Constr
--dualConstr = mkConstr dataDataType "Dual" [] Prefix
--{-# NOINLINE dualConstr #-}
--
--dataDataType :: DataType
--dataDataType = mkDataType "Control.Category.Dual.Dual" [dualConstr]
--{-# NOINLINE dataDataType #-}
--
--instance (Typeable2 k, Data a, Data b, Data (k b a)) => Data (Dual k a b) where
-- gfoldl f z (Dual a) = z Dual `f` a
-- toConstr _ = dualConstr
-- gunfold k z c = case constrIndex c of
-- 1 -> k (z Dual)
-- _ -> error "gunfold"
-- dataTypeOf _ = dataDataType
-- dataCast1 f = gcast1 f
--#endif
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 364e399..5c5c2df 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 4.2.2
-PORTREVISION= 1
+PORTVERSION= 4.2.7.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Comonads
LICENSE= BSD3CLAUSE
USE_CABAL= contravariant>=0.2.0.1 distributive>=0.2.2 semigroups>=0.8.3.1 \
- tagged>=0.1 transformers-compat>=0.3
+ tagged>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index f93c8be..bba10c9 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-4.2.2.tar.gz) = 4822281f025267480e03da26f9dcfeebffeb85e759861596b44d731981674e08
-SIZE (cabal/comonad-4.2.2.tar.gz) = 15726
+SHA256 (cabal/comonad-4.2.7.2.tar.gz) = b762261ef545a16881b66409398752e249a8e654a34088c66d9fabf9ba5a3b2b
+SIZE (cabal/comonad-4.2.7.2.tar.gz) = 16430
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index c6dfedf..9ab88f1 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= contravariant
-PORTVERSION= 1.1
-PORTREVISION= 1
+PORTVERSION= 1.3.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,8 @@ COMMENT= Contravariant functors
LICENSE= BSD3CLAUSE
-USE_CABAL= semigroups>=0.15.2 transformers-compat>=0.3
+USE_CABAL= semigroups>=0.15.2 StateVar>=1.1 tagged>=0.4.4 \
+ transformers-compat>=0.3 void>=0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-contravariant/distinfo b/math/hs-contravariant/distinfo
index 689f100..49fac5f 100644
--- a/math/hs-contravariant/distinfo
+++ b/math/hs-contravariant/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/contravariant-1.1.tar.gz) = 10da1f37d9342b61d5b75bc95f6caa873ab266ff1f8b8ca59d4f2297e8335848
-SIZE (cabal/contravariant-1.1.tar.gz) = 4845
+SHA256 (cabal/contravariant-1.3.2.tar.gz) = 52baae0676d6d5bcf7d891e6cda4580e58646c747d570bdde69b0023c2576639
+SIZE (cabal/contravariant-1.3.2.tar.gz) = 9442
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index ecc7765..c959706 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-lens-template
-PORTVERSION= 2.1.8
-PORTREVISION= 1
+PORTVERSION= 2.1.9
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens-template/distinfo b/math/hs-data-lens-template/distinfo
index 421fae8b..eb198e8 100644
--- a/math/hs-data-lens-template/distinfo
+++ b/math/hs-data-lens-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-template-2.1.8.tar.gz) = 18281e49e5e7e8540e956f14d643834931a0d39acfe1450e061fa536ec2f1d71
-SIZE (cabal/data-lens-template-2.1.8.tar.gz) = 3405
+SHA256 (cabal/data-lens-template-2.1.9.tar.gz) = cf94f5d81569ad8f0ce4194649f5920226adf990d4012728958516d9821af236
+SIZE (cabal/data-lens-template-2.1.9.tar.gz) = 3341
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index edf3603..ba6d40b 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-lens
-PORTVERSION= 2.10.5
-PORTREVISION= 1
+PORTVERSION= 2.10.7
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-data-lens/distinfo b/math/hs-data-lens/distinfo
index 656f99f..9f662c9 100644
--- a/math/hs-data-lens/distinfo
+++ b/math/hs-data-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-2.10.5.tar.gz) = 20456098f36cfb436cd84dcdd98a58160cc25ce6d202d00e9a3002073a27ca86
-SIZE (cabal/data-lens-2.10.5.tar.gz) = 6063
+SHA256 (cabal/data-lens-2.10.7.tar.gz) = 3b198a84158d757d074b6cf71fe16c8ad900e24991d9813d0b6361a1fd97e050
+SIZE (cabal/data-lens-2.10.7.tar.gz) = 6078
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index bedd79f..50fbd22 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -2,7 +2,7 @@
PORTNAME= distributive
PORTVERSION= 0.4.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 32c2cd2..5bf4b52 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index c860fcc..3b3b7e2 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ieee754
-PORTVERSION= 0.7.3
-PORTREVISION= 10
+PORTVERSION= 0.7.6
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-ieee754/distinfo b/math/hs-ieee754/distinfo
index 99a76e2..28edfb0 100644
--- a/math/hs-ieee754/distinfo
+++ b/math/hs-ieee754/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ieee754-0.7.3.tar.gz) = 603fc8470330abd25b4c46d63536cca75ca4d282acfefa565fddc612e021073f
-SIZE (cabal/ieee754-0.7.3.tar.gz) = 16219
+SHA256 (cabal/ieee754-0.7.6.tar.gz) = 5840644e8adbb243adc63d112c8bec3c3996af21a6c1262ce30c1e2b1034450f
+SIZE (cabal/ieee754-0.7.6.tar.gz) = 16787
diff --git a/math/hs-kan-extensions/Makefile b/math/hs-kan-extensions/Makefile
new file mode 100644
index 0000000..796ea11
--- /dev/null
+++ b/math/hs-kan-extensions/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= kan-extensions
+PORTVERSION= 4.2.2
+CATEGORIES= math haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= adjunctions>=4.2 comonad>=4 contravariant>=1 \
+ distributive>=0.2.2 free>=4 mtl>=2.0.1 semigroupoids>=4 \
+ tagged>=0.7.2
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/math/hs-kan-extensions/distinfo b/math/hs-kan-extensions/distinfo
new file mode 100644
index 0000000..57d2147
--- /dev/null
+++ b/math/hs-kan-extensions/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/kan-extensions-4.2.2.tar.gz) = e51d6dd583045b22bcffe5d0054616f2da5880187e4d7261890d7d987fa61837
+SIZE (cabal/kan-extensions-4.2.2.tar.gz) = 19235
diff --git a/math/hs-kan-extensions/pkg-descr b/math/hs-kan-extensions/pkg-descr
new file mode 100644
index 0000000..df1814f
--- /dev/null
+++ b/math/hs-kan-extensions/pkg-descr
@@ -0,0 +1,4 @@
+Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density
+(co)monads.
+
+WWW: http://github.com/ekmett/kan-extensions/
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index da9d789..4363f1d 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -3,7 +3,7 @@
PORTNAME= math-functions
PORTVERSION= 0.1.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index b38ba27..1795dae 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mwc-random
-PORTVERSION= 0.13.1.2
-PORTREVISION= 1
+PORTVERSION= 0.13.3.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-mwc-random/distinfo b/math/hs-mwc-random/distinfo
index fab61f5..8bf4263 100644
--- a/math/hs-mwc-random/distinfo
+++ b/math/hs-mwc-random/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mwc-random-0.13.1.2.tar.gz) = 113f1ff03412e49f1f87815c99c007f063d5aef3be3039de57a09c6dd3ad0a2c
-SIZE (cabal/mwc-random-0.13.1.2.tar.gz) = 20831
+SHA256 (cabal/mwc-random-0.13.3.2.tar.gz) = 2cb1e354ec8b31400d14716920f38eedd5161003249deedfd49cda290aae5806
+SIZE (cabal/mwc-random-0.13.3.2.tar.gz) = 22290
diff --git a/math/hs-nats/distinfo b/math/hs-nats/distinfo
deleted file mode 100644
index 2b3a2fa..0000000
--- a/math/hs-nats/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/nats-0.2.tar.gz) = e364218c0cad3602b14d3bc3866b9a8958c075dd1346d935e5362fa88ac65317
-SIZE (cabal/nats-0.2.tar.gz) = 4740
diff --git a/math/hs-nats/pkg-descr b/math/hs-nats/pkg-descr
deleted file mode 100644
index ae9b740..0000000
--- a/math/hs-nats/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Natural numbers.
-
-WWW: http://github.com/ekmett/nats/
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index ff40b42..8e04865 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pointed
-PORTVERSION= 4.1
-PORTREVISION= 1
+PORTVERSION= 4.2.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Pointed and copointed data
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 data-default-class>=0.0.1 semigroupoids>=4 \
- semigroups>=0.8.3.1 stm>=2.1.2.1 tagged>=0.5
+USE_CABAL= comonad>=4.0 data-default-class>=0.0.1 hashable>=1.1 \
+ kan-extensions>=4.2 semigroupoids>=4 semigroups>=0.8.3.1 \
+ stm>=2.1.2.1 tagged>=0.5 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-pointed/distinfo b/math/hs-pointed/distinfo
index 8ca86b1..218f937 100644
--- a/math/hs-pointed/distinfo
+++ b/math/hs-pointed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pointed-4.1.tar.gz) = cf4cb662ea5d3ebdcc42ab953b92dcfb4571a579e0ec193e5ed084ae03b580d0
-SIZE (cabal/pointed-4.1.tar.gz) = 3232
+SHA256 (cabal/pointed-4.2.0.2.tar.gz) = 4b8a8a5ad5a54715f6a58090d820657a2f2de4176d899ad736ebd0e54de7da7a
+SIZE (cabal/pointed-4.2.0.2.tar.gz) = 4333
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 80f402b..c72b5c1 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -3,7 +3,7 @@
PORTNAME= probability
PORTVERSION= 0.2.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-probability/files/patch-probability.cabal b/math/hs-probability/files/patch-probability.cabal
new file mode 100644
index 0000000..944d926
--- /dev/null
+++ b/math/hs-probability/files/patch-probability.cabal
@@ -0,0 +1,11 @@
+--- probability.cabal.orig 2014-05-29 07:12:14 UTC
++++ probability.cabal
+@@ -37,7 +37,7 @@ Flag splitBase
+ Library
+ Build-Depends:
+ utility-ht >=0.0.6 && <0.1,
+- transformers >=0.0.1 && <0.4
++ transformers >=0.0.1 && <0.5
+ If flag(splitBase)
+ Build-Depends:
+ containers >=0.1 && <0.6,
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index 92478cf..d8f91de 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= semigroupoids
-PORTVERSION= 4.0.4
-PORTREVISION= 1
+PORTVERSION= 5.0.0.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,12 @@ COMMENT= Semigroupoids: Category sans id
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 contravariant>=0.2.0.1 distributive>=0.2.2 \
- semigroups>=0.8.3.1
+USE_CABAL= base-orphans>=0.3 bifunctors>=5.0 comonad>=4.2.6 \
+ contravariant>=0.2.0.1 distributive>=0.2.2 \
+ semigroups>=0.8.3.1 tagged>=0.7.3 transformers-compat>=0.3
+
+FLAGS_ENABLE= containers contravariant distributive comonad tagged
+FLAGS_DISABLE= doctests
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index b649ac8..411ca97 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroupoids-4.0.4.tar.gz) = 198dec1ba80a37c00691f9c1f10f076beb7e2f4de3501be565962eb9ae19657a
-SIZE (cabal/semigroupoids-4.0.4.tar.gz) = 16194
+SHA256 (cabal/semigroupoids-5.0.0.3.tar.gz) = 17dc07085806c6b8c79863f489f0ad534713578a529935b081691830bab4d292
+SIZE (cabal/semigroupoids-5.0.0.3.tar.gz) = 20789
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index b107109..b0a88a6 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= semigroups
-PORTVERSION= 0.15.2
-PORTREVISION= 1
+PORTVERSION= 0.16.2.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Anything that associates
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1 nats>=0.1 text>=0.10 unordered-containers>=0.2
+USE_CABAL= hashable>=1.1 text>=0.10 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo
index dd868ca..87eede0 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroups-0.15.2.tar.gz) = 7716062afb636193fed5f544cbed96fe329c461db90cf3a45b7f475e413300d2
-SIZE (cabal/semigroups-0.15.2.tar.gz) = 11723
+SHA256 (cabal/semigroups-0.16.2.2.tar.gz) = d17e3e42c8e2457286d5c583dad5d0df57678ce4dcf12acc8a7667e80bd8ed57
+SIZE (cabal/semigroups-0.16.2.2.tar.gz) = 15159
diff --git a/math/hs-semigroups/files/patch-semigroups.cabal b/math/hs-semigroups/files/patch-semigroups.cabal
new file mode 100644
index 0000000..4c1bf04
--- /dev/null
+++ b/math/hs-semigroups/files/patch-semigroups.cabal
@@ -0,0 +1,12 @@
+--- semigroups.cabal.orig 2015-03-07 07:26:45 UTC
++++ semigroups.cabal
+@@ -86,8 +86,7 @@ library
+ Data.Semigroup.Generic
+
+ build-depends:
+- base >= 2 && < 5,
+- nats >= 0.1 && < 2
++ base >= 2 && < 5
+
+ if impl(ghc >= 7.4 && < 7.5)
+ build-depends: ghc-prim
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index 904291b..d948006 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= statistics
-PORTVERSION= 0.13.2.1
-PORTREVISION= 1
+PORTVERSION= 0.13.2.3
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-statistics/distinfo b/math/hs-statistics/distinfo
index 3c77fba..9f46f5e 100644
--- a/math/hs-statistics/distinfo
+++ b/math/hs-statistics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/statistics-0.13.2.1.tar.gz) = 6aef1be73b9f3b2df0f4938d5981e6e343d73b9b11658dfb86b659692f5e313e
-SIZE (cabal/statistics-0.13.2.1.tar.gz) = 79625
+SHA256 (cabal/statistics-0.13.2.3.tar.gz) = d624b1494959d3c64cfd068c9566778a799d3e3f5d6b22ec3e353ba6d6876fbd
+SIZE (cabal/statistics-0.13.2.3.tar.gz) = 79522
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index f4315b7..980f77e 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= vector-space
-PORTVERSION= 0.8.7
-PORTREVISION= 1
+PORTVERSION= 0.10.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo
index ad975ed..07fa71d 100644
--- a/math/hs-vector-space/distinfo
+++ b/math/hs-vector-space/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-space-0.8.7.tar.gz) = 75076924a56c58cd44ca1e07286a6b32f0e8d0558d42ba08af7a3e3b16196cc4
-SIZE (cabal/vector-space-0.8.7.tar.gz) = 13882
+SHA256 (cabal/vector-space-0.10.2.tar.gz) = 507dc397e48da9f889d06a314355a82aa31fb0dd785aad278dec1a2e8778e858
+SIZE (cabal/vector-space-0.10.2.tar.gz) = 14002
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 0832edd..f1d5f77 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -147,7 +147,6 @@
SUBDIR += gtk-youtube-viewer
SUBDIR += gxine
SUBDIR += handbrake
- SUBDIR += hs-gstreamer
SUBDIR += imagination
SUBDIR += iriverter
SUBDIR += iso2mkv
diff --git a/multimedia/hs-gstreamer/Makefile b/multimedia/hs-gstreamer/Makefile
deleted file mode 100644
index 262317c..0000000
--- a/multimedia/hs-gstreamer/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= gstreamer
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
-CATEGORIES= multimedia haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Binding to the GStreamer open source multimedia framework
-
-LIB_DEPENDS= libgstreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer
-
-LICENSE= LGPL21
-
-USES= pkgconfig
-USE_CABAL= glib>=0.12.5.0 mtl
-
-BUILD_DEPENDS+= gstreamer-plugins>=0.10:${PORTSDIR}/multimedia/gstreamer-plugins
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/multimedia/hs-gstreamer/distinfo b/multimedia/hs-gstreamer/distinfo
deleted file mode 100644
index 4f9967f..0000000
--- a/multimedia/hs-gstreamer/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/gstreamer-0.12.5.0.tar.gz) = c633b67d1a687ce781775cea8bf4a250e823473b7cfae145bdceb7ad39102f3f
-SIZE (cabal/gstreamer-0.12.5.0.tar.gz) = 94654
diff --git a/multimedia/hs-gstreamer/pkg-descr b/multimedia/hs-gstreamer/pkg-descr
deleted file mode 100644
index 44535f8..0000000
--- a/multimedia/hs-gstreamer/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This package provides a wrapper around the GStreamer C library. GStreamer is a
-library for constructing graphs of media-handling components. The applications
-it supports range from simple Ogg/Vorbis playback, audio/video streaming to
-complex audio (mixing) and video (non-linear editing) processing.
-
-WWW: http://projects.haskell.org/gtk2hs/
diff --git a/net-im/Makefile b/net-im/Makefile
index 976ab12..389dbc1 100644
--- a/net-im/Makefile
+++ b/net-im/Makefile
@@ -29,6 +29,7 @@
SUBDIR += gale
SUBDIR += gloox
SUBDIR += hotot
+ SUBDIR += hs-haskell-xmpp
SUBDIR += icb
SUBDIR += icmpchat
SUBDIR += icqlib
diff --git a/net-im/hs-haskell-xmpp/Makefile b/net-im/hs-haskell-xmpp/Makefile
new file mode 100644
index 0000000..afd534c
--- /dev/null
+++ b/net-im/hs-haskell-xmpp/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= haskell-xmpp
+PORTVERSION= 1.0.2
+PORTREVISION= 1
+CATEGORIES= net-im haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell XMPP library based on HaXml & STM
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= HaXml>=1.23.3 html mtl>=1.0 network \
+ polyparse random regex-compat stm utf8-string
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net-im/hs-haskell-xmpp/distinfo b/net-im/hs-haskell-xmpp/distinfo
new file mode 100644
index 0000000..a7a8165
--- /dev/null
+++ b/net-im/hs-haskell-xmpp/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/haskell-xmpp-1.0.2.tar.gz) = a9345eb03a7ea0dc4a50af3a916ad2c455fb2232c6d36830afc8e70d6c259dfc
+SIZE (cabal/haskell-xmpp-1.0.2.tar.gz) = 24931
diff --git a/net-im/hs-haskell-xmpp/files/patch-src_Network_XMPP_Stream.hs b/net-im/hs-haskell-xmpp/files/patch-src_Network_XMPP_Stream.hs
new file mode 100644
index 0000000..0ec10f5
--- /dev/null
+++ b/net-im/hs-haskell-xmpp/files/patch-src_Network_XMPP_Stream.hs
@@ -0,0 +1,7 @@
+--- src/Network/XMPP/Stream.hs.orig 2012-08-30 21:44:36 UTC
++++ src/Network/XMPP/Stream.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Network.XMPP.Stream
diff --git a/net-im/hs-haskell-xmpp/files/patch-src__Network__XMPP__Types.hs b/net-im/hs-haskell-xmpp/files/patch-src__Network__XMPP__Types.hs
new file mode 100644
index 0000000..c92ed1a
--- /dev/null
+++ b/net-im/hs-haskell-xmpp/files/patch-src__Network__XMPP__Types.hs
@@ -0,0 +1,12 @@
+--- ./src/Network/XMPP/Types.hs.orig 2013-07-05 10:53:16.000000000 +0800
++++ ./src/Network/XMPP/Types.hs 2013-07-05 10:53:56.000000000 +0800
+@@ -139,9 +139,6 @@
+
+ data ShowType = Available | Away | FreeChat | DND | XAway deriving Eq
+
+-instance Show (Content a) where
+- show = render . P.content
+-
+ instance Show MessageType where
+ show Chat = "chat"
+ show GroupChat = "groupchat"
diff --git a/net-im/hs-haskell-xmpp/pkg-descr b/net-im/hs-haskell-xmpp/pkg-descr
new file mode 100644
index 0000000..3ab97f7
--- /dev/null
+++ b/net-im/hs-haskell-xmpp/pkg-descr
@@ -0,0 +1,10 @@
+Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library
+
+Unlike package network-protocol-xmpp, which uses libxml-sax, this library
+uses HaXml and supports MUC. However, MUC support of the moment is worse
+than that in package XMPP.
+
+This library make extensive use of STM and threads to simplify writing
+message-handling code.
+
+WWW: http://patch-tag.com/r/adept/haskell-xmpp/home
diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 7c339a7..7fc6824 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -36,6 +36,7 @@
SUBDIR += gnunet-gtk
SUBDIR += gtk-gnutella
SUBDIR += gtorrentviewer
+ SUBDIR += hs-torrent
SUBDIR += jigdo
SUBDIR += ktorrent
SUBDIR += libbt
diff --git a/net-p2p/hs-torrent/Makefile b/net-p2p/hs-torrent/Makefile
new file mode 100644
index 0000000..a8da225
--- /dev/null
+++ b/net-p2p/hs-torrent/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= torrent
+PORTVERSION= 10000.0.0
+CATEGORIES= net-p2p haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= BitTorrent file parser and generater
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= bencode>=0.2 syb
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net-p2p/hs-torrent/distinfo b/net-p2p/hs-torrent/distinfo
new file mode 100644
index 0000000..24faf2e
--- /dev/null
+++ b/net-p2p/hs-torrent/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/torrent-10000.0.0.tar.gz) = 5914bc8b4c32c10dc82bfe373ba73745e1e785424a052b0ede5352802aa1140c
+SIZE (cabal/torrent-10000.0.0.tar.gz) = 3549
diff --git a/net-p2p/hs-torrent/pkg-descr b/net-p2p/hs-torrent/pkg-descr
new file mode 100644
index 0000000..ea61719
--- /dev/null
+++ b/net-p2p/hs-torrent/pkg-descr
@@ -0,0 +1,3 @@
+BitTorrent file parser and generater.
+
+WWW: http://hackage.haskell.org/package/torrent
diff --git a/net/Makefile b/net/Makefile
index 9c12bdc..f4a6270 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -204,6 +204,7 @@
SUBDIR += howl
SUBDIR += hping
SUBDIR += hping-devel
+ SUBDIR += hs-aws
SUBDIR += hs-connection
SUBDIR += hs-gsasl
SUBDIR += hs-hoauth2
@@ -214,6 +215,7 @@
SUBDIR += hs-network-info
SUBDIR += hs-network-multicast
SUBDIR += hs-network-protocol-xmpp
+ SUBDIR += hs-network-uri
SUBDIR += hs-pcap
SUBDIR += hs-publicsuffixlist
SUBDIR += hs-sendfile
diff --git a/net/hs-aws/Makefile b/net/hs-aws/Makefile
new file mode 100644
index 0000000..71f44d3
--- /dev/null
+++ b/net/hs-aws/Makefile
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+PORTNAME= aws
+PORTVERSION= 0.12.1
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Amazon Web Services (AWS) for Haskell
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson>=0.6 attoparsec>=0.11 base16-bytestring \
+ base64-bytestring blaze-builder>=0.2.1.4 byteable \
+ case-insensitive>=0.2 cereal>=0.3 conduit>=1.1 \
+ conduit-extra>=1.1 cryptohash>=0.11 data-default>=0.5.3 \
+ http-conduit>=2.1 http-types>=0.7 lifted-base>=0.1 \
+ monad-control>=0.3 mtl network resourcet>=1.1 safe>=0.3 \
+ scientific>=0.3 tagged>=0.7 text>=0.11 unordered-containers>=0.2 \
+ utf8-string>=0.3 vector>=0.10 xml-conduit>=1.2
+
+FLAGS_DISABLE= examples
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-aws/distinfo b/net/hs-aws/distinfo
new file mode 100644
index 0000000..92504fa
--- /dev/null
+++ b/net/hs-aws/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/aws-0.12.1.tar.gz) = 6c85bac359ea94d78f287b45c6e7e981dc260a1c029a7888ed752a1c0e64d32b
+SIZE (cabal/aws-0.12.1.tar.gz) = 90763
diff --git a/net/hs-aws/pkg-descr b/net/hs-aws/pkg-descr
new file mode 100644
index 0000000..6611a71
--- /dev/null
+++ b/net/hs-aws/pkg-descr
@@ -0,0 +1,4 @@
+Bindings for Amazon Web Services (AWS), with the aim of supporting all
+AWS services.
+
+WWW: http://github.com/aristidb/aws
diff --git a/net/hs-connection/Makefile b/net/hs-connection/Makefile
index 4d09135..55510b9 100644
--- a/net/hs-connection/Makefile
+++ b/net/hs-connection/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= connection
-PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTVERSION= 0.2.5
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Simple and easy network connections API
LICENSE= BSD3CLAUSE
-USE_CABAL= cprng-aes data-default-class network>=2.3 socks>=0.4 \
- tls>=1.2 x509>=1.4 x509-store>=1.4 x509-system>=1.4 \
+USE_CABAL= byteable data-default-class network>=2.3 socks>=0.4 \
+ tls>=1.3 x509>=1.5 x509-store>=1.5 x509-system>=1.5 \
x509-validation>=1.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/net/hs-connection/distinfo b/net/hs-connection/distinfo
index b8a65f4..6c7a00b 100644
--- a/net/hs-connection/distinfo
+++ b/net/hs-connection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/connection-0.2.3.tar.gz) = 4b6f62d66bebc38052e98f2b6798acdb79c9171b170d2e059aaa697d53b0b80a
-SIZE (cabal/connection-0.2.3.tar.gz) = 7621
+SHA256 (cabal/connection-0.2.5.tar.gz) = 8895d4427985202ac439b884deb4b5675ccba3d9498fce3687f1542b4ba21124
+SIZE (cabal/connection-0.2.5.tar.gz) = 7576
diff --git a/net/hs-gsasl/Makefile b/net/hs-gsasl/Makefile
index cffd993..3e86bf1 100644
--- a/net/hs-gsasl/Makefile
+++ b/net/hs-gsasl/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gsasl
-PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-gsasl/distinfo b/net/hs-gsasl/distinfo
index a131f76..eed538c 100644
--- a/net/hs-gsasl/distinfo
+++ b/net/hs-gsasl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gsasl-0.3.5.tar.gz) = a3aecd149b580e2afc0f3473e806e2245a0b649df6c8359540fa65af8dce279d
-SIZE (cabal/gsasl-0.3.5.tar.gz) = 20117
+SHA256 (cabal/gsasl-0.3.6.tar.gz) = 786036025e5d5649c029c1db23c395e1592c073a58848ae4afe4f2797de1f931
+SIZE (cabal/gsasl-0.3.6.tar.gz) = 20170
diff --git a/net/hs-hoauth2/Makefile b/net/hs-hoauth2/Makefile
index e13775f..b2106bf 100644
--- a/net/hs-hoauth2/Makefile
+++ b/net/hs-hoauth2/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hoauth2
-PORTVERSION= 0.4.3
+PORTVERSION= 0.4.8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,7 @@ COMMENT= Haskell OAuth2 authentication
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.7 bytestring-show>=0.3.5 http-conduit>=2.0 \
- http-types>=0.8 monad-control>=0.3 mtl>=1 random text>=0.11
+USE_CABAL= aeson>=0.7 http-conduit>=2.0 http-types>=0.8 text>=0.11
FLAGS_DISABLE= test
diff --git a/net/hs-hoauth2/distinfo b/net/hs-hoauth2/distinfo
index 6814cec..ca1820d 100644
--- a/net/hs-hoauth2/distinfo
+++ b/net/hs-hoauth2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hoauth2-0.4.3.tar.gz) = 6f531f635c62cc7c42fb3e33193833adfdf789aafa2d2c754be2f23c609ab0e2
-SIZE (cabal/hoauth2-0.4.3.tar.gz) = 8480
+SHA256 (cabal/hoauth2-0.4.8.tar.gz) = 6e489820dee16b926225e58555032e32d345b234b5a798db6e5a1d63d2843093
+SIZE (cabal/hoauth2-0.4.8.tar.gz) = 8599
diff --git a/net/hs-hostname/Makefile b/net/hs-hostname/Makefile
index eac7de5..55bc6f9 100644
--- a/net/hs-hostname/Makefile
+++ b/net/hs-hostname/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hostname
PORTVERSION= 1.0
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-iproute/Makefile b/net/hs-iproute/Makefile
index 8c7b112..d276318 100644
--- a/net/hs-iproute/Makefile
+++ b/net/hs-iproute/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= iproute
-PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTVERSION= 1.5.0
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-iproute/distinfo b/net/hs-iproute/distinfo
index 0d63cbc..1515478 100644
--- a/net/hs-iproute/distinfo
+++ b/net/hs-iproute/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/iproute-1.3.1.tar.gz) = b73104d337f14e63e1ca84dd37405df28e7a7f7e714e83efd63cca80d1d66ad0
-SIZE (cabal/iproute-1.3.1.tar.gz) = 9897
+SHA256 (cabal/iproute-1.5.0.tar.gz) = e33b233c681be367162c342ebf3843ec2d858db49716ef52d96546bd3f6f2557
+SIZE (cabal/iproute-1.5.0.tar.gz) = 11570
diff --git a/net/hs-maccatcher/Makefile b/net/hs-maccatcher/Makefile
index 15d1b91..971217b 100644
--- a/net/hs-maccatcher/Makefile
+++ b/net/hs-maccatcher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= maccatcher
PORTVERSION= 2.1.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-info/Makefile b/net/hs-network-info/Makefile
index 8d469c3..4797f13 100644
--- a/net/hs-network-info/Makefile
+++ b/net/hs-network-info/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= network-info
-PORTVERSION= 0.2.0.5
-PORTREVISION= 1
+PORTVERSION= 0.2.0.7
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-info/distinfo b/net/hs-network-info/distinfo
index f0291a2..6f30b63 100644
--- a/net/hs-network-info/distinfo
+++ b/net/hs-network-info/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-info-0.2.0.5.tar.gz) = 8ee37b7e3219d18395a3c9020a9be8cfa7c5390f2c4b0e54b5feea35e5b4fd3d
-SIZE (cabal/network-info-0.2.0.5.tar.gz) = 5988
+SHA256 (cabal/network-info-0.2.0.7.tar.gz) = ef36e2c3d60d120c91d07dfe1081c87b73d0917cee858fba42598f284301405d
+SIZE (cabal/network-info-0.2.0.7.tar.gz) = 6023
diff --git a/net/hs-network-info/pkg-descr b/net/hs-network-info/pkg-descr
index f1952a4..e2a6a97 100644
--- a/net/hs-network-info/pkg-descr
+++ b/net/hs-network-info/pkg-descr
@@ -1,8 +1,6 @@
This library provides simple read-only access to the local computer's
networking configuration. It is currently capable of getting a list of
all the network interfaces and their respective IPv4, IPv6 and MAC
-addresses. network-info has been tested and is known to work on Ubuntu
-10.10, FreeBSD 9.0, Mac OS X 10.6.4 and Windows XP/7. It probably works
-on other flavours of Linux, OS X, FreeBSD and Windows as well.
+addresses.
WWW: http://github.com/jystic/network-info
diff --git a/net/hs-network-multicast/Makefile b/net/hs-network-multicast/Makefile
index da7b76d..bce66f5 100644
--- a/net/hs-network-multicast/Makefile
+++ b/net/hs-network-multicast/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= network-multicast
-PORTVERSION= 0.0.11
-PORTREVISION= 1
+PORTVERSION= 0.1.0
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-multicast/distinfo b/net/hs-network-multicast/distinfo
index 1c8fabe..7d9dd5e 100644
--- a/net/hs-network-multicast/distinfo
+++ b/net/hs-network-multicast/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-multicast-0.0.11.tar.gz) = 65842175e53bb72164b7b1a448a3cc4bdf42df8d64089853ea54ccccd266fa39
-SIZE (cabal/network-multicast-0.0.11.tar.gz) = 2970
+SHA256 (cabal/network-multicast-0.1.0.tar.gz) = 18c2db0f8db5b9f4d3b65dbaa19ed77f4ebcf9c97e2d85657b6777f2b0e47a8a
+SIZE (cabal/network-multicast-0.1.0.tar.gz) = 3023
diff --git a/net/hs-network-protocol-xmpp/Makefile b/net/hs-network-protocol-xmpp/Makefile
index 5fad8f0..5de0c54 100644
--- a/net/hs-network-protocol-xmpp/Makefile
+++ b/net/hs-network-protocol-xmpp/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= network-protocol-xmpp
-PORTVERSION= 0.4.6
-PORTREVISION= 2
+PORTVERSION= 0.4.8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-network-protocol-xmpp/distinfo b/net/hs-network-protocol-xmpp/distinfo
index 60fb116..5b933ef 100644
--- a/net/hs-network-protocol-xmpp/distinfo
+++ b/net/hs-network-protocol-xmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-protocol-xmpp-0.4.6.tar.gz) = d6ec010deff24503e8f8fdb67cfd10ba84f19907c95bf1fca24dec10be74aa76
-SIZE (cabal/network-protocol-xmpp-0.4.6.tar.gz) = 24100
+SHA256 (cabal/network-protocol-xmpp-0.4.8.tar.gz) = ea7729e00452da11ed489a71f482e0aa082b0fb872eedca2e3722a05fd421e1e
+SIZE (cabal/network-protocol-xmpp-0.4.8.tar.gz) = 24289
diff --git a/net/hs-network-uri/Makefile b/net/hs-network-uri/Makefile
new file mode 100644
index 0000000..d332dc2
--- /dev/null
+++ b/net/hs-network-uri/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= network-uri
+PORTVERSION= 2.6.0.3
+CATEGORIES= net haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= URI manipulation
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec>=3.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/net/hs-network-uri/distinfo b/net/hs-network-uri/distinfo
new file mode 100644
index 0000000..17a6a11
--- /dev/null
+++ b/net/hs-network-uri/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/network-uri-2.6.0.3.tar.gz) = 0fc2cdff47ca77d826ebeb5cabe6ddac2333ca1504b2b629dd369399c5c28bdf
+SIZE (cabal/network-uri-2.6.0.3.tar.gz) = 26639
diff --git a/net/hs-network-uri/pkg-descr b/net/hs-network-uri/pkg-descr
new file mode 100644
index 0000000..887de7f
--- /dev/null
+++ b/net/hs-network-uri/pkg-descr
@@ -0,0 +1,3 @@
+This package provides an URI manipulation inteface.
+
+WWW: https://github.com/haskell/network-uri
diff --git a/net/hs-network/Makefile b/net/hs-network/Makefile
index 95de119..9488f8b5 100644
--- a/net/hs-network/Makefile
+++ b/net/hs-network/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= network
-PORTVERSION= 2.4.2.3
-PORTREVISION= 1
+PORTVERSION= 2.6.2.1
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,5 @@ COMMENT= Low-level networking interface
LICENSE= BSD3CLAUSE
-USE_CABAL= parsec>=3.0
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-network/distinfo b/net/hs-network/distinfo
index f534011..06580ff 100644
--- a/net/hs-network/distinfo
+++ b/net/hs-network/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/network-2.4.2.3.tar.gz) = 801b9c652dae626bf4a96175162b1290e7fe7ff20d802d62434d5ae1d363c16d
-SIZE (cabal/network-2.4.2.3.tar.gz) = 141749
+SHA256 (cabal/network-2.6.2.1.tar.gz) = a3fda15c9bbe2c7274d97f40398c6cf8d1d3a9fe896fbf6531e1bfc849bb1bfa
+SIZE (cabal/network-2.6.2.1.tar.gz) = 118092
diff --git a/net/hs-pcap/Makefile b/net/hs-pcap/Makefile
index dd45e7a..fcf980b 100644
--- a/net/hs-pcap/Makefile
+++ b/net/hs-pcap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pcap
PORTVERSION= 0.4.5.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-publicsuffixlist/Makefile b/net/hs-publicsuffixlist/Makefile
index 27d50f9..e59804c 100644
--- a/net/hs-publicsuffixlist/Makefile
+++ b/net/hs-publicsuffixlist/Makefile
@@ -2,7 +2,7 @@
PORTNAME= publicsuffixlist
PORTVERSION= 0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-sendfile/Makefile b/net/hs-sendfile/Makefile
index 02b58e2..cfc4cd4 100644
--- a/net/hs-sendfile/Makefile
+++ b/net/hs-sendfile/Makefile
@@ -2,7 +2,7 @@
PORTNAME= sendfile
PORTVERSION= 0.7.9
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/net/hs-simple-sendfile/Makefile b/net/hs-simple-sendfile/Makefile
index 1e50b24..90a2d0c 100644
--- a/net/hs-simple-sendfile/Makefile
+++ b/net/hs-simple-sendfile/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= simple-sendfile
-PORTVERSION= 0.2.15
-PORTREVISION= 1
+PORTVERSION= 0.2.21
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Cross-platform library for the sendfile() system call
LICENSE= BSD3CLAUSE
-USE_CABAL= network resourcet
+USE_CABAL= conduit>=1.0 conduit-extra>=1.0 network resourcet
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/net/hs-simple-sendfile/distinfo b/net/hs-simple-sendfile/distinfo
index cc996f4..f495e11 100644
--- a/net/hs-simple-sendfile/distinfo
+++ b/net/hs-simple-sendfile/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/simple-sendfile-0.2.15.tar.gz) = 49fa29f71239f59ee9a141f9c9ca0d3e2f3428b416a822cb6abc6ff6050442b9
-SIZE (cabal/simple-sendfile-0.2.15.tar.gz) = 7321
+SHA256 (cabal/simple-sendfile-0.2.21.tar.gz) = 61239d6c5e94ec76067d88d8a09589b53ca0a5d1806fd9f3e042d007cc67fd77
+SIZE (cabal/simple-sendfile-0.2.21.tar.gz) = 7469
diff --git a/net/hs-socks/Makefile b/net/hs-socks/Makefile
index 94eb21c..4b0b02d 100644
--- a/net/hs-socks/Makefile
+++ b/net/hs-socks/Makefile
@@ -2,7 +2,7 @@
PORTNAME= socks
PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/ports-mgmt/hs-porte/Makefile b/ports-mgmt/hs-porte/Makefile
index 79e9d3c..9a05fbc 100644
--- a/ports-mgmt/hs-porte/Makefile
+++ b/ports-mgmt/hs-porte/Makefile
@@ -3,7 +3,7 @@
PORTNAME= porte
PORTVERSION= 0.0.4
-PORTREVISION= 14
+PORTREVISION= 15
CATEGORIES= ports-mgmt haskell
MAINTAINER= sbahra@repnop.org
diff --git a/ports-mgmt/hs-porte/files/patch-Porte_Tool.hs b/ports-mgmt/hs-porte/files/patch-Porte_Tool.hs
new file mode 100644
index 0000000..14d044a
--- /dev/null
+++ b/ports-mgmt/hs-porte/files/patch-Porte_Tool.hs
@@ -0,0 +1,10 @@
+--- Porte/Tool.hs.orig 2010-08-29 16:18:36 UTC
++++ Porte/Tool.hs
+@@ -1,6 +1,6 @@
+ module Porte.Tool(toolMain) where
+ import System.Environment
+-import System.Exit
++import System.Exit hiding (die)
+ import Control.Monad
+ import qualified Data.ByteString.Lazy.Char8 as B
+ import qualified Porte.Ports as P
diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index ce4f0ca..b8a4439 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= hscolour
-PORTVERSION= 1.20.3
-PORTREVISION= 8
+PORTVERSION= 1.23
PORTEPOCH= 1
CATEGORIES= print haskell
diff --git a/print/hs-hscolour/distinfo b/print/hs-hscolour/distinfo
index 156c5fd..4edf475 100644
--- a/print/hs-hscolour/distinfo
+++ b/print/hs-hscolour/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96
-SIZE (cabal/hscolour-1.20.3.tar.gz) = 25810
+SHA256 (cabal/hscolour-1.23.tar.gz) = 97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0
+SIZE (cabal/hscolour-1.23.tar.gz) = 26027
diff --git a/print/hs-hscolour/pkg-descr b/print/hs-hscolour/pkg-descr
index af34f30..1cf64a9 100644
--- a/print/hs-hscolour/pkg-descr
+++ b/print/hs-hscolour/pkg-descr
@@ -1,11 +1,7 @@
-hscolour is a small Haskell script to colourise Haskell code.
-It currently has six output formats:
-
- - ANSI terminal codes,
- - HTML 3.2 with <font> tags,
- - HTML 4.01 with CSS,
- - XHTML 1.0 with inline CSS styling,
- - LaTeX,
- - and mIRC chat codes.
+hscolour is a small Haskell script to colourise Haskell code. It
+currently has six output formats: ANSI terminal codes (optionally
+XTerm-256colour codes), HTML 3.2 with font tags, HTML 4.01 with CSS,
+HTML 4.01 with CSS and mouseover annotations, XHTML 1.0 with inline CSS
+styling, LaTeX, and mIRC chat codes.
WWW: http://code.haskell.org/~malcolm/hscolour/
diff --git a/science/hs-bio/Makefile b/science/hs-bio/Makefile
index 9910dc6..d978ddb 100644
--- a/science/hs-bio/Makefile
+++ b/science/hs-bio/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bio
PORTVERSION= 0.5.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,7 @@ COMMENT= Bioinformatics library
LICENSE= LGPL21
-USE_CABAL= mtl parallel parsec QuickCheck>=2 random tagsoup>=0.8
+USE_CABAL= mtl old-time parallel parsec QuickCheck>=2 random tagsoup>=0.8
EXECUTABLE= fastout flowclip flx frecover frename orf rselect-pe
diff --git a/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs b/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs
new file mode 100644
index 0000000..f7ba130
--- /dev/null
+++ b/science/hs-bio/files/patch-Bio_Alignment_Bowtie.hs
@@ -0,0 +1,7 @@
+--- Bio/Alignment/Bowtie.hs.orig 2013-07-20 07:25:31 UTC
++++ Bio/Alignment/Bowtie.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE FlexibleContexts #-}
+ {-| This module provides a data type to represent an alignment
+ produced by the Bowtie short-read alignment tool (see
+ <http://bowtie-bio.sourceforge.net/index.shtml>).
diff --git a/science/hs-bio/files/patch-examples__RSelectPE.hs b/science/hs-bio/files/patch-examples__RSelectPE.hs
deleted file mode 100644
index 6ca244b..0000000
--- a/science/hs-bio/files/patch-examples__RSelectPE.hs
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./examples/RSelectPE.hs.orig 2011-12-15 12:56:28.000000000 +0100
-+++ ./examples/RSelectPE.hs 2011-12-17 11:46:58.000000000 +0100
-@@ -1,5 +1,3 @@
--{- | Randomly select paired end (illumina) reads -}
--
- import System.Environment (getArgs)
- import Data.List (isSuffixOf)
- import System.Random
diff --git a/security/Makefile b/security/Makefile
index 7723d86..5e052b0 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -207,10 +207,12 @@
SUBDIR += hs-cryptohash
SUBDIR += hs-cryptohash-conduit
SUBDIR += hs-cryptohash-cryptoapi
+ SUBDIR += hs-cryptonite
SUBDIR += hs-digest
SUBDIR += hs-entropy
SUBDIR += hs-gnutls
SUBDIR += hs-monadcryptorandom
+ SUBDIR += hs-nonce
SUBDIR += hs-pem
SUBDIR += hs-pureMD5
SUBDIR += hs-pwstore-fast
diff --git a/security/hs-Crypto/Makefile b/security/hs-Crypto/Makefile
index 30a0c97..3f421c2 100644
--- a/security/hs-Crypto/Makefile
+++ b/security/hs-Crypto/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Crypto
PORTVERSION= 4.2.5.1
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-DRBG/Makefile b/security/hs-DRBG/Makefile
index a9349a9..fdf9d32 100644
--- a/security/hs-DRBG/Makefile
+++ b/security/hs-DRBG/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= DRBG
-PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTVERSION= 0.5.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-DRBG/distinfo b/security/hs-DRBG/distinfo
index b8f4737..85127d8 100644
--- a/security/hs-DRBG/distinfo
+++ b/security/hs-DRBG/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/DRBG-0.5.2.tar.gz) = 516396e0b1b421bb5192ea20eb1938e9feaa834a388861e45662de5e05441c31
-SIZE (cabal/DRBG-0.5.2.tar.gz) = 1547807
+SHA256 (cabal/DRBG-0.5.4.tar.gz) = bd617d0b0458acb810f20343d56ca88a0fc50c12c169a5895e6648356566d30e
+SIZE (cabal/DRBG-0.5.4.tar.gz) = 1548154
diff --git a/security/hs-HsOpenSSL/Makefile b/security/hs-HsOpenSSL/Makefile
index e9def50c..5548a23 100644
--- a/security/hs-HsOpenSSL/Makefile
+++ b/security/hs-HsOpenSSL/Makefile
@@ -1,14 +1,14 @@
# $FreeBSD$
PORTNAME= HsOpenSSL
-PORTVERSION= 0.11
-PORTREVISION= 2
+PORTVERSION= 0.11.1.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Partial OpenSSL binding for Haskell
-USE_CABAL= network>=2.1.0.0
+USE_CABAL= network>=2.1 old-locale>=1.0
+
USE_OPENSSL= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-HsOpenSSL/distinfo b/security/hs-HsOpenSSL/distinfo
index 230220c..6510690 100644
--- a/security/hs-HsOpenSSL/distinfo
+++ b/security/hs-HsOpenSSL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HsOpenSSL-0.11.tar.gz) = d9fba90fee57d13c78f5b940ebb79846b5809992024231f8fe34389f50090c00
-SIZE (cabal/HsOpenSSL-0.11.tar.gz) = 68086
+SHA256 (cabal/HsOpenSSL-0.11.1.1.tar.gz) = 4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1
+SIZE (cabal/HsOpenSSL-0.11.1.1.tar.gz) = 72297
diff --git a/security/hs-RSA/Makefile b/security/hs-RSA/Makefile
index 3ed4440..903f45f 100644
--- a/security/hs-RSA/Makefile
+++ b/security/hs-RSA/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= RSA
-PORTVERSION= 2.0.0
-PORTREVISION= 1
+PORTVERSION= 2.1.0.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +9,8 @@ COMMENT= Implementation of RSA, using the padding schemes of PKCS#1 v2.1
LICENSE= BSD3CLAUSE
-USE_CABAL= crypto-api>=0.10 crypto-pubkey-types>=0.2 DRBG>=0.5.2 \
- monadcryptorandom>0 pureMD5>0 QuickCheck>=2.5 SHA>0 \
- tagged>=0.2 test-framework>=0.8.0.3 \
- test-framework-quickcheck2>=0.3.0.2
-
-FLAGS_DISABLE= BuildTestExecutable
+USE_CABAL= crypto-api>=0.10 crypto-pubkey-types>=0.2 pureMD5>=2.1 \
+ SHA>0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-RSA/distinfo b/security/hs-RSA/distinfo
index 5f747b7..458cf74 100644
--- a/security/hs-RSA/distinfo
+++ b/security/hs-RSA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/RSA-2.0.0.tar.gz) = 985f235d34d330a569db692423fd293edc713f2ed58fdc70ac14647cbb364dec
-SIZE (cabal/RSA-2.0.0.tar.gz) = 14498
+SHA256 (cabal/RSA-2.1.0.1.tar.gz) = 1b02096acd61e7fa477ca062773d47b7872e110cab594372699f8cba0632e454
+SIZE (cabal/RSA-2.1.0.1.tar.gz) = 14390
diff --git a/security/hs-SHA/Makefile b/security/hs-SHA/Makefile
index 39670f24..781af35 100644
--- a/security/hs-SHA/Makefile
+++ b/security/hs-SHA/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= SHA
-PORTVERSION= 1.6.4.1
-PORTREVISION= 1
+PORTVERSION= 1.6.4.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,11 +11,9 @@ LICENSE= BSD3CLAUSE
FLAGS_DEFINE= EXE
-EXE_DESC= Build a SHA2-384 executable similar to 'md5sum'
+EXE_DESC= Build executables similar to 'md5sum'
EXE_FLAG_ENABLE= exe
-EXE_FLAG_EXECUTABLE= sha1 sha384
-
-FLAGS_DISABLE= Test
+EXE_FLAG_EXECUTABLE= sha512 sha384 sha256 sha224 sha1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-SHA/distinfo b/security/hs-SHA/distinfo
index dec23a9..282b352 100644
--- a/security/hs-SHA/distinfo
+++ b/security/hs-SHA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/SHA-1.6.4.1.tar.gz) = 743bc6d7dd3e74a44bfca8920f0f0ba5855722a62f6cc44f0a38d10c11bddc0d
-SIZE (cabal/SHA-1.6.4.1.tar.gz) = 2715446
+SHA256 (cabal/SHA-1.6.4.2.tar.gz) = c470176f63cbe49fd0502a1b32ef22bc01b1af42385583b8be94547750958a8c
+SIZE (cabal/SHA-1.6.4.2.tar.gz) = 2715266
diff --git a/security/hs-certificate/Makefile b/security/hs-certificate/Makefile
index 6a136d2..d5921d0 100644
--- a/security/hs-certificate/Makefile
+++ b/security/hs-certificate/Makefile
@@ -2,7 +2,7 @@
PORTNAME= certificate
PORTVERSION= 1.3.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-certificate/files/patch-Data_Certificate_X509_Cert.hs b/security/hs-certificate/files/patch-Data_Certificate_X509_Cert.hs
new file mode 100644
index 0000000..7e68570d
--- /dev/null
+++ b/security/hs-certificate/files/patch-Data_Certificate_X509_Cert.hs
@@ -0,0 +1,7 @@
+--- Data/Certificate/X509/Cert.hs.orig 2013-10-07 02:22:00 UTC
++++ Data/Certificate/X509/Cert.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE FlexibleContexts #-}
+ module Data.Certificate.X509.Cert
+ (
+ -- * Data Structure
diff --git a/security/hs-certificate/files/patch-Data_Certificate_X509_Ext.hs b/security/hs-certificate/files/patch-Data_Certificate_X509_Ext.hs
new file mode 100644
index 0000000..fcdd78e
--- /dev/null
+++ b/security/hs-certificate/files/patch-Data_Certificate_X509_Ext.hs
@@ -0,0 +1,7 @@
+--- Data/Certificate/X509/Ext.hs.orig 2013-10-07 02:22:00 UTC
++++ Data/Certificate/X509/Ext.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE FlexibleContexts #-}
+ -- |
+ -- Module : Data.Certificate.X509.Ext
+ -- License : BSD-style
diff --git a/security/hs-cipher-aes/Makefile b/security/hs-cipher-aes/Makefile
index 4133adc..f834022 100644
--- a/security/hs-cipher-aes/Makefile
+++ b/security/hs-cipher-aes/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cipher-aes
-PORTVERSION= 0.2.8
-PORTREVISION= 1
+PORTVERSION= 0.2.11
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-aes/distinfo b/security/hs-cipher-aes/distinfo
index 487400d..c0ad9ab 100644
--- a/security/hs-cipher-aes/distinfo
+++ b/security/hs-cipher-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cipher-aes-0.2.8.tar.gz) = 3f983ffa2e01abf1973871206add91336cb7618524dc294eb4151e0dfb430f8e
-SIZE (cabal/cipher-aes-0.2.8.tar.gz) = 32542
+SHA256 (cabal/cipher-aes-0.2.11.tar.gz) = d3b171895698c73da24d7ce97543f725d26637f038de670c0fd4012ca7f95015
+SIZE (cabal/cipher-aes-0.2.11.tar.gz) = 33939
diff --git a/security/hs-cipher-aes128/Makefile b/security/hs-cipher-aes128/Makefile
index a296e52..f5fcb29 100644
--- a/security/hs-cipher-aes128/Makefile
+++ b/security/hs-cipher-aes128/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cipher-aes128
-PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTVERSION= 0.7.0.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,5 +11,7 @@ LICENSE= BSD3CLAUSE
USE_CABAL= cereal crypto-api>=0.13 tagged
+FLAGS_DISABLE= test halvm
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cipher-aes128/distinfo b/security/hs-cipher-aes128/distinfo
index 5f4d8f9..9e20590 100644
--- a/security/hs-cipher-aes128/distinfo
+++ b/security/hs-cipher-aes128/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cipher-aes128-0.6.4.tar.gz) = 4a95c3f572aacbe3b0d68c593f45c16014ef96b5e38dd32a8fb6466e10bf7f24
-SIZE (cabal/cipher-aes128-0.6.4.tar.gz) = 23445
+SHA256 (cabal/cipher-aes128-0.7.0.1.tar.gz) = 18aecff826ca46e188062b972dfbda7360f6f73e2ffe45aa15bdc676debb7662
+SIZE (cabal/cipher-aes128-0.7.0.1.tar.gz) = 25450
diff --git a/security/hs-cipher-aes128/pkg-descr b/security/hs-cipher-aes128/pkg-descr
index 1f8ede6..33342f5 100644
--- a/security/hs-cipher-aes128/pkg-descr
+++ b/security/hs-cipher-aes128/pkg-descr
@@ -1,3 +1,9 @@
Cipher-aes128 is an implementation of AES and common modes of operation.
+It borrows Hanquez's C AES code (see 'cipher-aes') but is unique due to
+including compile-time detection of NI compiler support, a slightly more
+functional interface for GCM operations, exposure of 'Ptr' based
+operations via the .Internal module, and build-in crypto-api support.
+Cipher-aes128 was originally developed as "'cipher-aes' plus
+trampolines", which has since been adopted into cipher-aes.
WWW: https://github.com/TomMD/cipher-aes128
diff --git a/security/hs-cipher-blowfish/Makefile b/security/hs-cipher-blowfish/Makefile
index 6ff54ea..449626d 100644
--- a/security/hs-cipher-blowfish/Makefile
+++ b/security/hs-cipher-blowfish/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-blowfish
PORTVERSION= 0.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-camellia/Makefile b/security/hs-cipher-camellia/Makefile
index a39d66a..2b770ef 100644
--- a/security/hs-cipher-camellia/Makefile
+++ b/security/hs-cipher-camellia/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-camellia
PORTVERSION= 0.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-des/Makefile b/security/hs-cipher-des/Makefile
index 6dace52..948e811 100644
--- a/security/hs-cipher-des/Makefile
+++ b/security/hs-cipher-des/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-des
PORTVERSION= 0.0.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cipher-rc4/Makefile b/security/hs-cipher-rc4/Makefile
index e44f4a0..8db20f3 100644
--- a/security/hs-cipher-rc4/Makefile
+++ b/security/hs-cipher-rc4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cipher-rc4
PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-clientsession/Makefile b/security/hs-clientsession/Makefile
index 00d3ff9..db70b04 100644
--- a/security/hs-clientsession/Makefile
+++ b/security/hs-clientsession/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= clientsession
-PORTVERSION= 0.9.0.3
-PORTREVISION= 1
+PORTVERSION= 0.9.1.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +11,9 @@ LICENSE= BSD3CLAUSE
USE_CABAL= base64-bytestring>=0.1.1.1 cereal>=0.3 cipher-aes>=0.1.7 \
cprng-aes>=0.2 crypto-api>=0.8 crypto-random entropy>=0.2.1 \
- skein tagged>=0.1
+ setenv skein>=1.0.0 tagged>=0.1
+
+EXECUTABLE= clientsession-generate
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-clientsession/distinfo b/security/hs-clientsession/distinfo
index 782da64..c68725e 100644
--- a/security/hs-clientsession/distinfo
+++ b/security/hs-clientsession/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/clientsession-0.9.0.3.tar.gz) = 6125864915adb324af897eb92245dd249002283d365fccaa69a53fd4b29ff570
-SIZE (cabal/clientsession-0.9.0.3.tar.gz) = 7056
+SHA256 (cabal/clientsession-0.9.1.1.tar.gz) = c9563c0bcda1a02cfea2fd39aecec5b9f419901587287f05afdec1e683210022
+SIZE (cabal/clientsession-0.9.1.1.tar.gz) = 7928
diff --git a/security/hs-cprng-aes/Makefile b/security/hs-cprng-aes/Makefile
index a7b1bce..d39ce6b 100644
--- a/security/hs-cprng-aes/Makefile
+++ b/security/hs-cprng-aes/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= cprng-aes
-PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTVERSION= 0.6.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Crypto Pseudo Random Number Generator using AES
+COMMENT= Crypto Pseudo Random Number Generator using AES in counter mode
LICENSE= BSD3CLAUSE
-USE_CABAL= byteable cipher-aes>=0.2 crypto-random>=0.0.7 random
+USE_CABAL= byteable cipher-aes>=0.2.9 crypto-random>=0.0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-cprng-aes/distinfo b/security/hs-cprng-aes/distinfo
index 7bda1cd..0b44f7a 100644
--- a/security/hs-cprng-aes/distinfo
+++ b/security/hs-cprng-aes/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cprng-aes-0.5.2.tar.gz) = ee0a5c27396c0257af5ebb4882b31e3ab14d8b160e916dbdc031733f506bc8d9
-SIZE (cabal/cprng-aes-0.5.2.tar.gz) = 4903
+SHA256 (cabal/cprng-aes-0.6.1.tar.gz) = 64592a01de8c6683c5e29f538dceee918887ffe211d87214a2e38559d72c21f3
+SIZE (cabal/cprng-aes-0.6.1.tar.gz) = 4396
diff --git a/security/hs-crypto-api/Makefile b/security/hs-crypto-api/Makefile
index 1f640c5..85e7691 100644
--- a/security/hs-crypto-api/Makefile
+++ b/security/hs-crypto-api/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-api
-PORTVERSION= 0.13
-PORTREVISION= 1
+PORTVERSION= 0.13.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-api/distinfo b/security/hs-crypto-api/distinfo
index abd0818..8e7208b 100644
--- a/security/hs-crypto-api/distinfo
+++ b/security/hs-crypto-api/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-api-0.13.tar.gz) = 62f9eda6a2dc4a086eeefbb6f7b008d3f6e36bdd325f72858f4d43593d4bfc03
-SIZE (cabal/crypto-api-0.13.tar.gz) = 47884
+SHA256 (cabal/crypto-api-0.13.2.tar.gz) = 5331d511a9761d5073e6661148234228d88f8ace14e2994171f0bcf5183e82ed
+SIZE (cabal/crypto-api-0.13.2.tar.gz) = 47877
diff --git a/security/hs-crypto-cipher-types/Makefile b/security/hs-crypto-cipher-types/Makefile
index be3220c..75f6ae8 100644
--- a/security/hs-crypto-cipher-types/Makefile
+++ b/security/hs-crypto-cipher-types/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-cipher-types
PORTVERSION= 0.0.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-conduit/Makefile b/security/hs-crypto-conduit/Makefile
index 5e16885..b4b3cee 100644
--- a/security/hs-crypto-conduit/Makefile
+++ b/security/hs-crypto-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-conduit
-PORTVERSION= 0.5.4
-PORTREVISION= 1
+PORTVERSION= 0.5.5
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Conduit interface for cryptographic operations (from crypto-api)
LICENSE= BSD3CLAUSE
-USE_CABAL= cereal>=0.3 conduit>=1.0 conduit-extra>=1.1 crypto-api>=0.9 \
+USE_CABAL= cereal>=0.3 conduit>=1.0 conduit-extra>=1.1 crypto-api>=0.8 \
resourcet
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/security/hs-crypto-conduit/distinfo b/security/hs-crypto-conduit/distinfo
index a7ebcbb7..61ead6c 100644
--- a/security/hs-crypto-conduit/distinfo
+++ b/security/hs-crypto-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-conduit-0.5.4.tar.gz) = 36d0511efb4cc191e86ec28e6b167228fd0c8e61815cd3eed1a0384de443c2fc
-SIZE (cabal/crypto-conduit-0.5.4.tar.gz) = 6884
+SHA256 (cabal/crypto-conduit-0.5.5.tar.gz) = ced360b56aba0d669e11af90fa603e68911e802f0e7d44750d5dcc3c64d5a47d
+SIZE (cabal/crypto-conduit-0.5.5.tar.gz) = 6883
diff --git a/security/hs-crypto-numbers/Makefile b/security/hs-crypto-numbers/Makefile
index 62f1348..903357c 100644
--- a/security/hs-crypto-numbers/Makefile
+++ b/security/hs-crypto-numbers/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-numbers
-PORTVERSION= 0.2.3
-PORTREVISION= 1
+PORTVERSION= 0.2.7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Cryptographic numbers: functions and algorithms
LICENSE= BSD3CLAUSE
-USE_CABAL= crypto-random>=0.0 vector
+USE_CABAL= crypto-random>=0.0.0 vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-numbers/distinfo b/security/hs-crypto-numbers/distinfo
index 2adc715..f8b2218 100644
--- a/security/hs-crypto-numbers/distinfo
+++ b/security/hs-crypto-numbers/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-numbers-0.2.3.tar.gz) = f77dabd4dd6aa6343ba351b2ae1c55e4b9ef85c7911eadf6914704401cada25b
-SIZE (cabal/crypto-numbers-0.2.3.tar.gz) = 15714
+SHA256 (cabal/crypto-numbers-0.2.7.tar.gz) = 420aeb17e9cdcfdf8c950c6c6f10c54503c5524d36f611aa7238e3fd65f189a6
+SIZE (cabal/crypto-numbers-0.2.7.tar.gz) = 16064
diff --git a/security/hs-crypto-pubkey-types/Makefile b/security/hs-crypto-pubkey-types/Makefile
index b55cb70..1c0a6fb 100644
--- a/security/hs-crypto-pubkey-types/Makefile
+++ b/security/hs-crypto-pubkey-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-pubkey-types
-PORTVERSION= 0.4.2.2
-PORTREVISION= 1
+PORTVERSION= 0.4.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Generic cryptography Public keys algorithm types
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-types>=0.1
+USE_CABAL= asn1-encoding asn1-types>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-pubkey-types/distinfo b/security/hs-crypto-pubkey-types/distinfo
index a1f08b4..3c6dcb9 100644
--- a/security/hs-crypto-pubkey-types/distinfo
+++ b/security/hs-crypto-pubkey-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-types-0.4.2.2.tar.gz) = 0522962afd68cce3e53f048bcc345f26734b4c2d2754a43c0006cb2ea075e1a3
-SIZE (cabal/crypto-pubkey-types-0.4.2.2.tar.gz) = 11235
+SHA256 (cabal/crypto-pubkey-types-0.4.3.tar.gz) = 7ed9f52281ec4e34021a91818fe45288e33d65bff937f60334a3f45be5a71c60
+SIZE (cabal/crypto-pubkey-types-0.4.3.tar.gz) = 11234
diff --git a/security/hs-crypto-pubkey/Makefile b/security/hs-crypto-pubkey/Makefile
index 722969d..eb44ddf 100644
--- a/security/hs-crypto-pubkey/Makefile
+++ b/security/hs-crypto-pubkey/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-pubkey
-PORTVERSION= 0.2.4
-PORTREVISION= 1
+PORTVERSION= 0.2.8
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Public Key cryptography
LICENSE= BSD3CLAUSE
USE_CABAL= byteable crypto-numbers>=0.2.2 crypto-pubkey-types>=0.4.1 \
- crypto-random>=0.0 cryptohash>=0.9.1
+ crypto-random>=0.0.0 cryptohash>=0.9.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-crypto-pubkey/distinfo b/security/hs-crypto-pubkey/distinfo
index 6675aa1..81d7fa2 100644
--- a/security/hs-crypto-pubkey/distinfo
+++ b/security/hs-crypto-pubkey/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-pubkey-0.2.4.tar.gz) = 04c2b49a9d82fc4ba2305a9f9dbfd1718de3f81277459cbec8070b55bfc9b255
-SIZE (cabal/crypto-pubkey-0.2.4.tar.gz) = 42386
+SHA256 (cabal/crypto-pubkey-0.2.8.tar.gz) = c0ccf2f5c38517de1f1626cb0a2542f35aefad8842f8ad5c1fac0b8c9de8b56e
+SIZE (cabal/crypto-pubkey-0.2.8.tar.gz) = 46405
diff --git a/security/hs-crypto-random-api/Makefile b/security/hs-crypto-random-api/Makefile
index 23a7b69..35ac518 100644
--- a/security/hs-crypto-random-api/Makefile
+++ b/security/hs-crypto-random-api/Makefile
@@ -2,7 +2,7 @@
PORTNAME= crypto-random-api
PORTVERSION= 0.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random/Makefile b/security/hs-crypto-random/Makefile
index ca20a8a..fa6c582 100644
--- a/security/hs-crypto-random/Makefile
+++ b/security/hs-crypto-random/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= crypto-random
-PORTVERSION= 0.0.7
-PORTREVISION= 1
+PORTVERSION= 0.0.9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-crypto-random/distinfo b/security/hs-crypto-random/distinfo
index f91f369..85b0cb6 100644
--- a/security/hs-crypto-random/distinfo
+++ b/security/hs-crypto-random/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/crypto-random-0.0.7.tar.gz) = bccb1fda2d29a3af9e476ed019231a4d2a53fef4f048c4dde9c10d5a901f46b6
-SIZE (cabal/crypto-random-0.0.7.tar.gz) = 8999
+SHA256 (cabal/crypto-random-0.0.9.tar.gz) = 170a7a18441379c2d1c19b502ee5919026a19adc6e78641cd4fb40b1d69a6904
+SIZE (cabal/crypto-random-0.0.9.tar.gz) = 9256
diff --git a/security/hs-cryptocipher/Makefile b/security/hs-cryptocipher/Makefile
index 6ab67f9..4a19938 100644
--- a/security/hs-cryptocipher/Makefile
+++ b/security/hs-cryptocipher/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptocipher
PORTVERSION= 0.6.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-conduit/Makefile b/security/hs-cryptohash-conduit/Makefile
index b8c2cdf..5b0610c 100644
--- a/security/hs-cryptohash-conduit/Makefile
+++ b/security/hs-cryptohash-conduit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-conduit
PORTVERSION= 0.1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash-cryptoapi/Makefile b/security/hs-cryptohash-cryptoapi/Makefile
index a3dbbb8..f511eae 100644
--- a/security/hs-cryptohash-cryptoapi/Makefile
+++ b/security/hs-cryptohash-cryptoapi/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash-cryptoapi
PORTVERSION= 0.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptohash/Makefile b/security/hs-cryptohash/Makefile
index 6240d7d..a72f7fc 100644
--- a/security/hs-cryptohash/Makefile
+++ b/security/hs-cryptohash/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cryptohash
PORTVERSION= 0.11.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-cryptonite/Makefile b/security/hs-cryptonite/Makefile
new file mode 100644
index 0000000..294bb15
--- /dev/null
+++ b/security/hs-cryptonite/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= cryptonite
+PORTVERSION= 0.6
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Cryptography Primitives sink
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= memory>=0.2
+
+FLAGS_ENABLE= support_aesni support_rdrand integer-gmp support_deepseq
+FLAGS_DISABLE= support_pclmuldq
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-cryptonite/distinfo b/security/hs-cryptonite/distinfo
new file mode 100644
index 0000000..09f76b3
--- /dev/null
+++ b/security/hs-cryptonite/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cryptonite-0.6.tar.gz) = a016ccaa38579beb4517807a8917801baf6e6ddb830a74af91fc064c35acf853
+SIZE (cabal/cryptonite-0.6.tar.gz) = 319290
diff --git a/security/hs-cryptonite/pkg-descr b/security/hs-cryptonite/pkg-descr
new file mode 100644
index 0000000..315c9e1
--- /dev/null
+++ b/security/hs-cryptonite/pkg-descr
@@ -0,0 +1,19 @@
+A repository of cryptographic primitives.
+
+ * Symmetric ciphers: AES, DES, 3DES, Blowfish, Camellia, RC4, Salsa, ChaCha.
+ * Hash: SHA1, SHA2, SHA3, MD2, MD4, MD5, Kekkak, Skein, Ripemd, Tiger,
+ Whirlpool
+ * MAC: HMAC, Poly1305
+ * Assymmetric crypto: DSA, RSA, DH, ECDH, ECDSA, ECC, Curve25519, Ed25519
+ * Key Derivation Function: PBKDF2, Scrypt
+ * Cryptographic Random generation: System Entropy, Deterministic Random
+ Generator
+ * Data related: Anti-Forensic
+
+Information Splitter (AFIS) If anything cryptographic related is missing
+from here, submit a pull request to have it added. This package strive
+to be a cryptographic kitchen sink that provides cryptography for
+everyone. Evaluate the security related to your requirements before
+using.
+
+WWW: https://github.com/vincenthz/cryptonite
diff --git a/security/hs-digest/Makefile b/security/hs-digest/Makefile
index c39f35e..decfb08 100644
--- a/security/hs-digest/Makefile
+++ b/security/hs-digest/Makefile
@@ -2,7 +2,7 @@
PORTNAME= digest
PORTVERSION= 0.0.1.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/Makefile b/security/hs-entropy/Makefile
index 7b0717a..1f611e1 100644
--- a/security/hs-entropy/Makefile
+++ b/security/hs-entropy/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= entropy
-PORTVERSION= 0.3.2
-PORTREVISION= 1
+PORTVERSION= 0.3.7
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-entropy/distinfo b/security/hs-entropy/distinfo
index 03299dc..fb2160e 100644
--- a/security/hs-entropy/distinfo
+++ b/security/hs-entropy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/entropy-0.3.2.tar.gz) = 3db9529ff96374810d97e61a7b71df703b31fece29c6f52fe09a61575ddd60ce
-SIZE (cabal/entropy-0.3.2.tar.gz) = 5767
+SHA256 (cabal/entropy-0.3.7.tar.gz) = 1ff020eba2edbb93c4b23297470f8c11d69d0ff1e1642d17cbab9d54a24befef
+SIZE (cabal/entropy-0.3.7.tar.gz) = 6498
diff --git a/security/hs-gnutls/Makefile b/security/hs-gnutls/Makefile
index 91983f8..32f0f72 100644
--- a/security/hs-gnutls/Makefile
+++ b/security/hs-gnutls/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gnutls
-PORTVERSION= 0.1.5
-PORTREVISION= 1
+PORTVERSION= 0.2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Bindings for GNU libgnutls
LICENSE= GPLv3
-USE_CABAL= monads-tf>=0.1
+USE_CABAL= monads-tf>=0.1.0
USES= pkgconfig
LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
diff --git a/security/hs-gnutls/distinfo b/security/hs-gnutls/distinfo
index 6eea143..2f40ad7 100644
--- a/security/hs-gnutls/distinfo
+++ b/security/hs-gnutls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gnutls-0.1.5.tar.gz) = 9723fd4c65b1e071d2d5febd41d80ff5d353a6e27c132c7f966172091e59c6e9
-SIZE (cabal/gnutls-0.1.5.tar.gz) = 17358
+SHA256 (cabal/gnutls-0.2.tar.gz) = c0e6fddf92d48d1e6ab0d93af8104cc83d250eab7b3d369780ef72801aa8b7b0
+SIZE (cabal/gnutls-0.2.tar.gz) = 17272
diff --git a/security/hs-monadcryptorandom/Makefile b/security/hs-monadcryptorandom/Makefile
index e479921..1acc7bd 100644
--- a/security/hs-monadcryptorandom/Makefile
+++ b/security/hs-monadcryptorandom/Makefile
@@ -2,7 +2,7 @@
PORTNAME= monadcryptorandom
PORTVERSION= 0.6.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-nonce/Makefile b/security/hs-nonce/Makefile
new file mode 100644
index 0000000..f3896b1
--- /dev/null
+++ b/security/hs-nonce/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= nonce
+PORTVERSION= 1.0.2
+CATEGORIES= security haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Generate cryptographic nonces
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= base64-bytestring cprng-aes>=0.5 crypto-random text>=0.9
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/security/hs-nonce/distinfo b/security/hs-nonce/distinfo
new file mode 100644
index 0000000..53abf7a
--- /dev/null
+++ b/security/hs-nonce/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/nonce-1.0.2.tar.gz) = 1004184996ea797b43189a0e73eab0b939f129cafc776341ca82289edb329cd0
+SIZE (cabal/nonce-1.0.2.tar.gz) = 2872
diff --git a/security/hs-nonce/pkg-descr b/security/hs-nonce/pkg-descr
new file mode 100644
index 0000000..6aa2a66
--- /dev/null
+++ b/security/hs-nonce/pkg-descr
@@ -0,0 +1,8 @@
+According to the Wikipedia, a nonce is an arbitrary number used only
+once in a cryptographic communication. This package contain helper
+functions for generating nonces. There are many kinds of nonces used in
+different situations. It's not guaranteed that by using the nonces from
+this package you won't have any security issues. Please make sure that
+the nonces generated via this package are usable on your design.
+
+WWW: https://github.com/prowdsponsor/nonce
diff --git a/security/hs-pem/Makefile b/security/hs-pem/Makefile
index a258935..7e684c7 100644
--- a/security/hs-pem/Makefile
+++ b/security/hs-pem/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pem
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pureMD5/Makefile b/security/hs-pureMD5/Makefile
index a990ba3..e38d367 100644
--- a/security/hs-pureMD5/Makefile
+++ b/security/hs-pureMD5/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pureMD5
PORTVERSION= 2.1.2.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-pwstore-fast/Makefile b/security/hs-pwstore-fast/Makefile
index 6bde41c..f732013 100644
--- a/security/hs-pwstore-fast/Makefile
+++ b/security/hs-pwstore-fast/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pwstore-fast
-PORTVERSION= 2.4.1
-PORTREVISION= 1
+PORTVERSION= 2.4.4
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Secure password storage
LICENSE= BSD3CLAUSE
-USE_CABAL= base64-bytestring>=0.1 cryptohash>=0.6 random>=1 SHA>=1.6.1
+USE_CABAL= base64-bytestring>=0.1 byteable>=0.1 cryptohash>=0.6 random>=1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-pwstore-fast/distinfo b/security/hs-pwstore-fast/distinfo
index b73ed1a..a37818b 100644
--- a/security/hs-pwstore-fast/distinfo
+++ b/security/hs-pwstore-fast/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pwstore-fast-2.4.1.tar.gz) = 84dbb989ec889ba88ca4628502e905d65ca62f6a688ee21dea12342a745828cd
-SIZE (cabal/pwstore-fast-2.4.1.tar.gz) = 8756
+SHA256 (cabal/pwstore-fast-2.4.4.tar.gz) = 7219af66b6f762d9dd5376b3b25393d4d6626e390e9d9c9f87f6e3f13ea7fbb2
+SIZE (cabal/pwstore-fast-2.4.4.tar.gz) = 8901
diff --git a/security/hs-skein/Makefile b/security/hs-skein/Makefile
index 62073f6..70c0c78 100644
--- a/security/hs-skein/Makefile
+++ b/security/hs-skein/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= skein
-PORTVERSION= 1.0.9
-PORTREVISION= 1
+PORTVERSION= 1.0.9.3
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/security/hs-skein/distinfo b/security/hs-skein/distinfo
index bc9ee46..bcda6d0 100644
--- a/security/hs-skein/distinfo
+++ b/security/hs-skein/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/skein-1.0.9.tar.gz) = 6bb1706b5f5bf3ff0f5c525675638b84a850766070b3576fa68afe0718201e22
-SIZE (cabal/skein-1.0.9.tar.gz) = 117873
+SHA256 (cabal/skein-1.0.9.3.tar.gz) = c7bab12dbad3af29fd8d3b10f418198fe22315e8f849539bf9d7efe9495df14c
+SIZE (cabal/skein-1.0.9.3.tar.gz) = 119484
diff --git a/security/hs-skein/pkg-descr b/security/hs-skein/pkg-descr
index 5229e86..46cc83c 100644
--- a/security/hs-skein/pkg-descr
+++ b/security/hs-skein/pkg-descr
@@ -1,11 +1,11 @@
-Skein [1] is a family of fast secure cryptographic hash functions. This
-package uses bindings to the optimized C implementation of Skein. There
-is a high-level interface provided to some of the Skein use cases, and a
-low-level interface when Skein has to be used in a different way.
-
-Currently Skein is supported as cryptographic hash function as Skein as
-a message authentication code (Skein-MAC).
-
-[1] http://www.skein-hash.info/
+Skein is a family of fast secure cryptographic hash functions designed
+by Niels Ferguson, Stefan Lucks, Bruce Schneier, Doug Whiting, Mihir
+Bellare, Tadayoshi Kohno, Jon Callas and Jesse Walker. This package
+uses bindings to the optimized C implementation of Skein. We provide a
+high-level interface (see module Crypto.Skein) to some of the Skein use
+cases. We also provide a low-level interface (see module
+Crypto.Skein.Internal) should you need to use Skein in a different way.
+Currently we have support for Skein as cryptographic hash function as
+Skein as a message authentication code (Skein-MAC).
WWW: https://github.com/meteficha/skein
diff --git a/security/hs-tls/Makefile b/security/hs-tls/Makefile
index 6c306f0..799d809 100644
--- a/security/hs-tls/Makefile
+++ b/security/hs-tls/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tls
-PORTVERSION= 1.2.8
-PORTREVISION= 1
+PORTVERSION= 1.3.1
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +9,9 @@ COMMENT= TLS/SSL protocol native implementation (Server and Client)
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-encoding asn1-types>=0.2.0 byteable cereal>=0.4 \
- cipher-aes>=0.2 cipher-des cipher-rc4 crypto-cipher-types>=0.0.8 \
- crypto-numbers crypto-pubkey>=0.2.4 crypto-pubkey-types>=0.4 \
- crypto-random>=0.0 cryptohash>=0.6 data-default-class \
- mtl network x509>=1.4.3 x509-store>=1.4.4 x509-validation>=1.5.0
+USE_CABAL= asn1-encoding asn1-types>=0.2.0 async byteable cereal>=0.4 \
+ cryptonite>=0.3 data-default-class memory mtl network \
+ x509>=1.6 x509-store>=1.6 x509-validation>=1.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-tls/distinfo b/security/hs-tls/distinfo
index 1c52048..be06dfa 100644
--- a/security/hs-tls/distinfo
+++ b/security/hs-tls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tls-1.2.8.tar.gz) = 0a160cdc57d55cfbb6828eb448b1b6ca5e0626d98536c58d7523662fac34a33a
-SIZE (cabal/tls-1.2.8.tar.gz) = 65498
+SHA256 (cabal/tls-1.3.1.tar.gz) = 747f840677115d077ef548b4da54acb479253ce3cb58ad3a03275fe2b452d5d0
+SIZE (cabal/tls-1.3.1.tar.gz) = 74668
diff --git a/security/hs-tls/pkg-descr b/security/hs-tls/pkg-descr
index b7cd3db..7b2478c 100644
--- a/security/hs-tls/pkg-descr
+++ b/security/hs-tls/pkg-descr
@@ -1,8 +1,9 @@
Native Haskell TLS and SSL protocol implementation for server and
-client. This provides a high-level implementation of a sensitive
+client. This provides a high-level implementation of a sensitive
security protocol, eliminating a common set of security issues through
the use of the advanced type system, high level constructions and common
-Haskell features. Currently implement the SSL3.0, TLS1.0, TLS1.1 and
-TLS1.2 protocol, with only RSA supported for Key Exchange.
+Haskell features. Currently implement the SSL3.0, TLS1.0, TLS1.1 and
+TLS1.2 protocol, and support RSA and Ephemeral (Elliptic curve and
+regular) Diffie Hellman key exchanges, and many extensions.
WWW: http://github.com/vincenthz/hs-tls
diff --git a/security/hs-x509-store/Makefile b/security/hs-x509-store/Makefile
index a4413b8..82af2ef 100644
--- a/security/hs-x509-store/Makefile
+++ b/security/hs-x509-store/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509-store
-PORTVERSION= 1.4.4
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= X.509 collection accessing and storing methods
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-encoding>=0.8 asn1-types>=0.2 crypto-pubkey-types>=0.3 \
- mtl pem>=0.1 x509>=1.4.3
+USE_CABAL= asn1-encoding>=0.9 asn1-types>=0.3 cryptonite mtl pem>=0.1 \
+ x509>=1.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-x509-store/distinfo b/security/hs-x509-store/distinfo
index 4375898..63fc08a 100644
--- a/security/hs-x509-store/distinfo
+++ b/security/hs-x509-store/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/x509-store-1.4.4.tar.gz) = 882fc144a6819dd9182e14297f3af9087c45840cca1c550e759783dc5a767044
-SIZE (cabal/x509-store-1.4.4.tar.gz) = 2992
+SHA256 (cabal/x509-store-1.6.0.tar.gz) = d5b347a80d66b0424b92d5a340108d6c674246ddbdd21c223b586be19f582e22
+SIZE (cabal/x509-store-1.6.0.tar.gz) = 3556
diff --git a/security/hs-x509-system/Makefile b/security/hs-x509-system/Makefile
index 1f5490e..73edb4e 100644
--- a/security/hs-x509-system/Makefile
+++ b/security/hs-x509-system/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509-system
-PORTVERSION= 1.4.5
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Handle per-operating-system X.509 accessors and storage
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl pem>=0.1 x509>=1.4 x509-store>=1.4
+USE_CABAL= mtl pem>=0.1 x509>=1.6 x509-store>=1.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-x509-system/distinfo b/security/hs-x509-system/distinfo
index c183148..c58d9ea 100644
--- a/security/hs-x509-system/distinfo
+++ b/security/hs-x509-system/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/x509-system-1.4.5.tar.gz) = 1d098a4df1a71ac7cb371f43794c402c8b20a6e8095cc1737a4f39638930965f
-SIZE (cabal/x509-system-1.4.5.tar.gz) = 3596
+SHA256 (cabal/x509-system-1.6.0.tar.gz) = 50f9c24513aba2677d71a1c09cbd4f4d6cb82b5e0bad1ecfdfb407f6f5be1735
+SIZE (cabal/x509-system-1.6.0.tar.gz) = 3833
diff --git a/security/hs-x509-validation/Makefile b/security/hs-x509-validation/Makefile
index 260c6c5..ece75bc 100644
--- a/security/hs-x509-validation/Makefile
+++ b/security/hs-x509-validation/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509-validation
-PORTVERSION= 1.5.0
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT= X.509 Certificate and CRL validation
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-encoding>=0.8 asn1-types>=0.2 byteable crypto-pubkey>=0.1.4 \
- crypto-pubkey-types>=0.4 cryptohash>=0.9 data-default-class \
- mtl network pem>=0.1 x509>=1.4.7 x509-store>=1.4
+USE_CABAL= asn1-encoding>=0.9 asn1-types>=0.3 byteable cryptonite>=0.3 \
+ data-default-class hourglass memory mtl network pem>=0.1 \
+ x509>=1.6 x509-store>=1.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-x509-validation/distinfo b/security/hs-x509-validation/distinfo
index c3955c7..d344e01 100644
--- a/security/hs-x509-validation/distinfo
+++ b/security/hs-x509-validation/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/x509-validation-1.5.0.tar.gz) = 36e3ce3644452d72a947b3132781a445b40e14be54fae229e4e7c41b01b059f5
-SIZE (cabal/x509-validation-1.5.0.tar.gz) = 9626
+SHA256 (cabal/x509-validation-1.6.0.tar.gz) = cc07c92402e685fafc31f1fc9d825d6e2775a7f5a423fb0b9b3453ede8349f1e
+SIZE (cabal/x509-validation-1.6.0.tar.gz) = 9691
diff --git a/security/hs-x509/Makefile b/security/hs-x509/Makefile
index 806ed09..e5502c2 100644
--- a/security/hs-x509/Makefile
+++ b/security/hs-x509/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= x509
-PORTVERSION= 1.4.11
-PORTREVISION= 1
+PORTVERSION= 1.6.0
CATEGORIES= security haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= X509 reader and writer
LICENSE= BSD3CLAUSE
-USE_CABAL= asn1-encoding>=0.8 asn1-parse>=0.8 asn1-types>=0.2.3 \
- crypto-pubkey-types>=0.4.2.1 cryptohash>=0.9 mtl pem>=0.1
+USE_CABAL= asn1-encoding>=0.9 asn1-parse>=0.9 asn1-types>=0.3.0 \
+ cryptonite hourglass memory mtl pem>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/security/hs-x509/distinfo b/security/hs-x509/distinfo
index 862d44b..f877126 100644
--- a/security/hs-x509/distinfo
+++ b/security/hs-x509/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/x509-1.4.11.tar.gz) = ea25f2efb6700d2dfc8950bcc9274320f55dce241e01cf75900c10a3af34a5ab
-SIZE (cabal/x509-1.4.11.tar.gz) = 13976
+SHA256 (cabal/x509-1.6.0.tar.gz) = 939eec164a1dd764d610920d8896c7715c86f9b437c2d44b27119b3fb197c23b
+SIZE (cabal/x509-1.6.0.tar.gz) = 15606
diff --git a/shells/Makefile b/shells/Makefile
index 0b9a9b5..fc5197e 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -17,6 +17,7 @@
SUBDIR += fish
SUBDIR += flash
SUBDIR += heirloom-sh
+ SUBDIR += hs-shelly
SUBDIR += ibsh
SUBDIR += jailkit
SUBDIR += ksh93
diff --git a/shells/hs-shelly/Makefile b/shells/hs-shelly/Makefile
new file mode 100644
index 0000000..0842c9f
--- /dev/null
+++ b/shells/hs-shelly/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= shelly
+PORTVERSION= 1.6.3.3
+CATEGORIES= shells haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Shell-like (systems) programming in Haskell
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= async enclosed-exceptions exceptions>=0.6 lifted-async \
+ lifted-base monad-control>=0.3.2 mtl>=2 system-fileio \
+ system-filepath>=0.4.7 text transformers-base unix-compat
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/shells/hs-shelly/distinfo b/shells/hs-shelly/distinfo
new file mode 100644
index 0000000..f56fe9a
--- /dev/null
+++ b/shells/hs-shelly/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/shelly-1.6.3.3.tar.gz) = 1a6624db16198b7af4d06d2b79f46346c1c459bcccbdf2958533b396dcf56a9c
+SIZE (cabal/shelly-1.6.3.3.tar.gz) = 70187
diff --git a/shells/hs-shelly/pkg-descr b/shells/hs-shelly/pkg-descr
new file mode 100644
index 0000000..3437056
--- /dev/null
+++ b/shells/hs-shelly/pkg-descr
@@ -0,0 +1,13 @@
+Shelly provides convenient systems programming in Haskell, similar in
+spirit to POSIX shells. Shelly:
+
+ * is aimed at convenience and getting things done rather than being a
+ demonstration of elegance.
+ * has detailed and useful error messages.
+ * maintains its own environment, making it thread-safe.
+ * is modern, using Text and system-filepath/system-fileio.
+
+Shelly is originally forked from the Shellish package. See the shelly-extra
+package for additional functionality.
+
+WWW: https://github.com/yesodweb/Shelly.hs
diff --git a/sysutils/Makefile b/sysutils/Makefile
index fe05d7f..5ed8e9f 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -401,6 +401,7 @@
SUBDIR += hs-cpu
SUBDIR += hs-ekg
SUBDIR += hs-ekg-core
+ SUBDIR += hs-ekg-json
SUBDIR += htop
SUBDIR += httplog
SUBDIR += hwstat
diff --git a/sysutils/hs-angel/Makefile b/sysutils/hs-angel/Makefile
index 3feaaf8..9cce74e 100644
--- a/sysutils/hs-angel/Makefile
+++ b/sysutils/hs-angel/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= angel
-PORTVERSION= 0.5.0
-PORTREVISION= 1
+PORTVERSION= 0.6.2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Process management and supervision daemon
LICENSE= BSD3CLAUSE
-USE_CABAL= configurator>=0.1 mtl stm>=2.0 text>=0.11 \
- unordered-containers>=0.1.4
+USE_CABAL= configurator>=0.1 mtl old-locale optparse-applicative \
+ stm>=2.0 text>=0.11 unordered-containers>=0.1.4
EXECUTABLE= angel
diff --git a/sysutils/hs-angel/distinfo b/sysutils/hs-angel/distinfo
index d74a5fe..d36c1ad 100644
--- a/sysutils/hs-angel/distinfo
+++ b/sysutils/hs-angel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/angel-0.5.0.tar.gz) = c824c77614c7af36031303c7fcdf53d769ab24fd89ec66dd28a49af83b0b0795
-SIZE (cabal/angel-0.5.0.tar.gz) = 14444
+SHA256 (cabal/angel-0.6.2.tar.gz) = caff0b06481dc3858b059e2faa12afdad66152c0341020dc53cceacf28e2e358
+SIZE (cabal/angel-0.6.2.tar.gz) = 20745
diff --git a/sysutils/hs-cpu/Makefile b/sysutils/hs-cpu/Makefile
index d5f0b85..0d8c071 100644
--- a/sysutils/hs-cpu/Makefile
+++ b/sysutils/hs-cpu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cpu
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-ekg-core/Makefile b/sysutils/hs-ekg-core/Makefile
index db05b86..1035e92 100644
--- a/sysutils/hs-ekg-core/Makefile
+++ b/sysutils/hs-ekg-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ekg-core
-PORTVERSION= 0.1.0.1
-PORTREVISION= 1
+PORTVERSION= 0.1.1.0
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/sysutils/hs-ekg-core/distinfo b/sysutils/hs-ekg-core/distinfo
index 0507539..ecd1252 100644
--- a/sysutils/hs-ekg-core/distinfo
+++ b/sysutils/hs-ekg-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ekg-core-0.1.0.1.tar.gz) = 4a4adfb96dc330e30e878d260c3045f13bee1272351d2d046f9d2a3b484e0afe
-SIZE (cabal/ekg-core-0.1.0.1.tar.gz) = 12014
+SHA256 (cabal/ekg-core-0.1.1.0.tar.gz) = 7ba11eb73ad3b906610cc1ae3889543547c48d1b2f4ca68c288bb3f022a7061e
+SIZE (cabal/ekg-core-0.1.1.0.tar.gz) = 12376
diff --git a/sysutils/hs-ekg-json/Makefile b/sysutils/hs-ekg-json/Makefile
new file mode 100644
index 0000000..fc201e5
--- /dev/null
+++ b/sysutils/hs-ekg-json/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= ekg-json
+PORTVERSION= 0.1.0.0
+CATEGORIES= sysutils haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= JSON encoding of ekg metrics
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson ekg-core>=0.1 text unordered-containers
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/sysutils/hs-ekg-json/distinfo b/sysutils/hs-ekg-json/distinfo
new file mode 100644
index 0000000..075e576
--- /dev/null
+++ b/sysutils/hs-ekg-json/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/ekg-json-0.1.0.0.tar.gz) = 52c455ee7d1b54f530ba9243027e5bb332925589d9209dcdfc24bd16a5a218da
+SIZE (cabal/ekg-json-0.1.0.0.tar.gz) = 2969
diff --git a/sysutils/hs-ekg-json/pkg-descr b/sysutils/hs-ekg-json/pkg-descr
new file mode 100644
index 0000000..7f629dd
--- /dev/null
+++ b/sysutils/hs-ekg-json/pkg-descr
@@ -0,0 +1,5 @@
+Encodes ekg metrics as JSON, using the same encoding as used by the ekg
+package, thus allowing ekg metrics to be served by other HTTP servers than
+the one used by the ekg package.
+
+WWW: https://github.com/tibbe/ekg-json
diff --git a/sysutils/hs-ekg/Makefile b/sysutils/hs-ekg/Makefile
index 8bae2b0..e512e06 100644
--- a/sysutils/hs-ekg/Makefile
+++ b/sysutils/hs-ekg/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= ekg
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.4.0.8
CATEGORIES= sysutils haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Remote monitoring of processes
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson ekg-core>=0.1 network snap-core snap-server text \
- unordered-containers
+USE_CABAL= aeson ekg-core>=0.1 ekg-json>=0.1 network snap-core \
+ snap-server text unordered-containers
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/sysutils/hs-ekg/distinfo b/sysutils/hs-ekg/distinfo
index bf3e124..e44d53d 100644
--- a/sysutils/hs-ekg/distinfo
+++ b/sysutils/hs-ekg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/ekg-0.4.0.1.tar.gz) = dddb476745741b14513a0aa45702c96cef1dcd58d399b161833ca42c53d3f226
-SIZE (cabal/ekg-0.4.0.1.tar.gz) = 160732
+SHA256 (cabal/ekg-0.4.0.8.tar.gz) = 5b0488bab3b3b6309d28f3c73fbde65b9b238f0560c58f4d937711b7ca42e832
+SIZE (cabal/ekg-0.4.0.8.tar.gz) = 169806
diff --git a/textproc/Makefile b/textproc/Makefile
index 7ec90ec..de0de9b 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -242,11 +242,14 @@
SUBDIR += hs-appar
SUBDIR += hs-attoparsec
SUBDIR += hs-attoparsec-enumerator
+ SUBDIR += hs-bencode
SUBDIR += hs-blaze-html
SUBDIR += hs-blaze-markup
SUBDIR += hs-bytestring-csv
SUBDIR += hs-case-insensitive
+ SUBDIR += hs-cassava
SUBDIR += hs-citeproc-hs
+ SUBDIR += hs-cmark
SUBDIR += hs-csv
SUBDIR += hs-double-conversion
SUBDIR += hs-feed
@@ -263,14 +266,18 @@
SUBDIR += hs-libxml
SUBDIR += hs-libxml-sax
SUBDIR += hs-pandoc
+ SUBDIR += hs-pandoc-citeproc
SUBDIR += hs-pandoc-types
SUBDIR += hs-parsec
SUBDIR += hs-polyparse
+ SUBDIR += hs-regex-applicative
SUBDIR += hs-regex-base
SUBDIR += hs-regex-compat
+ SUBDIR += hs-regex-compat-tdfa
SUBDIR += hs-regex-pcre-builtin
SUBDIR += hs-regex-posix
SUBDIR += hs-regex-tdfa
+ SUBDIR += hs-rfc5051
SUBDIR += hs-stringsearch
SUBDIR += hs-tagsoup
SUBDIR += hs-tagstream-conduit
diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile
index 02b20b7..ba7b555 100644
--- a/textproc/hs-Diff/Makefile
+++ b/textproc/hs-Diff/Makefile
@@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= Diff
-PORTVERSION= 0.3.0
-PORTREVISION= 1
+PORTVERSION= 0.3.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= O(ND) diff algorithm in haskell
+COMMENT= O(ND) diff algorithm in Haskell
LICENSE= BSD3CLAUSE
diff --git a/textproc/hs-Diff/distinfo b/textproc/hs-Diff/distinfo
index 55cb6d8..2ccdc93 100644
--- a/textproc/hs-Diff/distinfo
+++ b/textproc/hs-Diff/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Diff-0.3.0.tar.gz) = 28f96d7f4bb0f88a13fa0b59e89cc8b93fa901c6cbe6ca82e84540cb2291ee4c
-SIZE (cabal/Diff-0.3.0.tar.gz) = 4128
+SHA256 (cabal/Diff-0.3.2.tar.gz) = 7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e
+SIZE (cabal/Diff-0.3.2.tar.gz) = 5024
diff --git a/textproc/hs-Diff/pkg-descr b/textproc/hs-Diff/pkg-descr
index 07b3f5b..b96554a 100644
--- a/textproc/hs-Diff/pkg-descr
+++ b/textproc/hs-Diff/pkg-descr
@@ -1,3 +1,4 @@
-Basic implementation of the standard diff algorithm in Haskell.
+Implementation of the standard diff algorithm, and utilities for pretty
+printing.
WWW: http://hackage.haskell.org/package/Diff
diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile
index 52e29f9..ace511b 100644
--- a/textproc/hs-HStringTemplate/Makefile
+++ b/textproc/hs-HStringTemplate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HStringTemplate
-PORTVERSION= 0.7.3
-PORTREVISION= 1
+PORTVERSION= 0.8.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder mtl parsec syb text utf8-string void
+USE_CABAL= blaze-builder mtl old-locale parsec syb text void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo
index 78d260f..0eb54aa 100644
--- a/textproc/hs-HStringTemplate/distinfo
+++ b/textproc/hs-HStringTemplate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HStringTemplate-0.7.3.tar.gz) = 883fbfd35c14ab46cd1545a8643da700094297f0cb74462f460781694dd884bf
-SIZE (cabal/HStringTemplate-0.7.3.tar.gz) = 15961
+SHA256 (cabal/HStringTemplate-0.8.3.tar.gz) = 63d6b1c993f5612ef370b92bb8fab05323657ec34a0f35110b967eb853239d18
+SIZE (cabal/HStringTemplate-0.8.3.tar.gz) = 16023
diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 72a4d35..045d819 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= HaXml
-PORTVERSION= 1.24.1
-PORTREVISION= 1
+PORTVERSION= 1.25.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Utilities for manipulating XML documents
LICENSE= LGPL21
-USE_CABAL= polyparse>=1.9 random
+USE_CABAL= polyparse>=1.10 random
EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \
MkOneOf Validate XsdToHaskell Xtract
diff --git a/textproc/hs-HaXml/distinfo b/textproc/hs-HaXml/distinfo
index 31395f6..73216a1 100644
--- a/textproc/hs-HaXml/distinfo
+++ b/textproc/hs-HaXml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HaXml-1.24.1.tar.gz) = 5f258c7c6291ad54bb9a65280dd30efcbca3fc79a499d5b6575a753d3f7b78df
-SIZE (cabal/HaXml-1.24.1.tar.gz) = 142739
+SHA256 (cabal/HaXml-1.25.3.tar.gz) = 6448a7ee1c26159c6c10db93757ed9248f647b1c0c431e7aead6aadd6d2307c7
+SIZE (cabal/HaXml-1.25.3.tar.gz) = 144189
diff --git a/textproc/hs-HaXml/pkg-descr b/textproc/hs-HaXml/pkg-descr
index 35a25ac..3eebed9 100644
--- a/textproc/hs-HaXml/pkg-descr
+++ b/textproc/hs-HaXml/pkg-descr
@@ -1,4 +1,4 @@
Haskell utilities for parsing, filtering, transforming and generating XML
documents.
-WWW: http://www.cs.york.ac.uk/fp/HaXml/
+WWW: http://projects.haskell.org/HaXml/
diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile
index c02b37d..8d38191 100644
--- a/textproc/hs-appar/Makefile
+++ b/textproc/hs-appar/Makefile
@@ -2,7 +2,7 @@
PORTNAME= appar
PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile
index 4faf4a6..611794d 100644
--- a/textproc/hs-attoparsec-enumerator/Makefile
+++ b/textproc/hs-attoparsec-enumerator/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= attoparsec-enumerator
-PORTVERSION= 0.3.3
-PORTREVISION= 1
+PORTVERSION= 0.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-attoparsec-enumerator/distinfo b/textproc/hs-attoparsec-enumerator/distinfo
index 98dde5c..6708037 100644
--- a/textproc/hs-attoparsec-enumerator/distinfo
+++ b/textproc/hs-attoparsec-enumerator/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 3cf105cdc29120a5c21487708783155a35fd9d4df29f72e56c22ed93f85aa77c
-SIZE (cabal/attoparsec-enumerator-0.3.3.tar.gz) = 2484
+SHA256 (cabal/attoparsec-enumerator-0.3.4.tar.gz) = be95a763ebbec5529f486e62e49ce6709f14e688138fc36cff5590613690f588
+SIZE (cabal/attoparsec-enumerator-0.3.4.tar.gz) = 2485
diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile
index 12dc7a7..bbe0cf0 100644
--- a/textproc/hs-attoparsec/Makefile
+++ b/textproc/hs-attoparsec/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= attoparsec
-PORTVERSION= 0.10.4.0
-PORTREVISION= 7
+PORTVERSION= 0.12.1.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Fast combinator parsing for bytestrings
+COMMENT= Fast combinator parsing for bytestrings and text
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.11.1.5
+USE_CABAL= scientific>=0.3.1 text>=1.1.1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo
index f7172f9..6ea7286 100644
--- a/textproc/hs-attoparsec/distinfo
+++ b/textproc/hs-attoparsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/attoparsec-0.10.4.0.tar.gz) = b6b84e0dbd1c3beec1dedea578ac2f4d62afbe66b383582b7b3349406866d346
-SIZE (cabal/attoparsec-0.10.4.0.tar.gz) = 36268
+SHA256 (cabal/attoparsec-0.12.1.6.tar.gz) = ce0bb68c3a232dc981412b44211395ee04b0c18075777c30493d4e0f1edc06a8
+SIZE (cabal/attoparsec-0.12.1.6.tar.gz) = 65300
diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile
new file mode 100644
index 0000000..d38d920
--- /dev/null
+++ b/textproc/hs-bencode/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= bencode
+PORTVERSION= 0.6.0.0
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Parser and printer for bencoded data
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-bencode/distinfo b/textproc/hs-bencode/distinfo
new file mode 100644
index 0000000..0b636d3
--- /dev/null
+++ b/textproc/hs-bencode/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/bencode-0.6.0.0.tar.gz) = 3b8efdfecee9bc486d9bcdbb633b7128ca235360f102478a7e0f8c895281f68a
+SIZE (cabal/bencode-0.6.0.0.tar.gz) = 4622
diff --git a/textproc/hs-bencode/pkg-descr b/textproc/hs-bencode/pkg-descr
new file mode 100644
index 0000000..70beec5
--- /dev/null
+++ b/textproc/hs-bencode/pkg-descr
@@ -0,0 +1,5 @@
+Parser and printer for bencoded data. Bencode (pronounced like B encode)
+is the encoding used by the peer-to-peer file sharing system BitTorrent
+for storing and transmitting loosely structured data.
+
+WWW: http://hackage.haskell.org/package/bencode
diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile
index 015ac12..a351c30 100644
--- a/textproc/hs-blaze-html/Makefile
+++ b/textproc/hs-blaze-html/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-html
-PORTVERSION= 0.7.0.2
-PORTREVISION= 1
+PORTVERSION= 0.8.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Blazingly fast HTML combinator library for Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 blaze-markup>=0.6 text>=0.10
+USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-blaze-html/distinfo b/textproc/hs-blaze-html/distinfo
index f6d39a3..167b0ba 100644
--- a/textproc/hs-blaze-html/distinfo
+++ b/textproc/hs-blaze-html/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-html-0.7.0.2.tar.gz) = 5b74f65b9201b1ac81b58f6c7350a2ab493e7777eb429c3ec5a0fb9c6da90f7b
-SIZE (cabal/blaze-html-0.7.0.2.tar.gz) = 75815
+SHA256 (cabal/blaze-html-0.8.1.0.tar.gz) = fb6dc0755b578928538e867ba441525d7169fcfeaabbfc4663f06bc91b6fed31
+SIZE (cabal/blaze-html-0.8.1.0.tar.gz) = 76151
diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile
index 01a227a..c7d3d62 100644
--- a/textproc/hs-blaze-markup/Makefile
+++ b/textproc/hs-blaze-markup/Makefile
@@ -1,12 +1,11 @@
# $FreeBSD$
PORTNAME= blaze-markup
-PORTVERSION= 0.6.1.0
-PORTREVISION= 1
+PORTVERSION= 0.7.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Blazingly fast markup combinator library
+COMMENT= Blazingly fast markup combinator library for Haskell
LICENSE= BSD3CLAUSE
diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo
index d3f24c0..cf064db 100644
--- a/textproc/hs-blaze-markup/distinfo
+++ b/textproc/hs-blaze-markup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/blaze-markup-0.6.1.0.tar.gz) = f45c0a5f3c9d9d91af3b4d0ea6d88293c036d000a71a8e63d37a21193c19b379
-SIZE (cabal/blaze-markup-0.6.1.0.tar.gz) = 12738
+SHA256 (cabal/blaze-markup-0.7.0.2.tar.gz) = e4068a284834d8fe68df5ec63a037b92b7c956a82c0c72d7beca8d670fd5725c
+SIZE (cabal/blaze-markup-0.7.0.2.tar.gz) = 13440
diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile
index 162fcea..79a46ae 100644
--- a/textproc/hs-bytestring-csv/Makefile
+++ b/textproc/hs-bytestring-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bytestring-csv
PORTVERSION= 0.1.2
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile
index 475a493..d27d846 100644
--- a/textproc/hs-case-insensitive/Makefile
+++ b/textproc/hs-case-insensitive/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= case-insensitive
-PORTVERSION= 1.1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.2.0.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo
index cc78d76..d865630 100644
--- a/textproc/hs-case-insensitive/distinfo
+++ b/textproc/hs-case-insensitive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/case-insensitive-1.1.0.3.tar.gz) = 7b255fe63155d53ab84b248ab5ba9306fd4bec47a6198e3275cf9cb41c4d263b
-SIZE (cabal/case-insensitive-1.1.0.3.tar.gz) = 5188
+SHA256 (cabal/case-insensitive-1.2.0.4.tar.gz) = 63830d4b6b8cd51f4e40e492c17b5eaa11ebab5ef28eeb344e57709f3220d51e
+SIZE (cabal/case-insensitive-1.2.0.4.tar.gz) = 53377
diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile
new file mode 100644
index 0000000..5a7f25e
--- /dev/null
+++ b/textproc/hs-cassava/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= cassava
+PORTVERSION= 0.4.3.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= CSV parsing and encoding library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec>=0.10.2 blaze-builder hashable text \
+ unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-cassava/distinfo b/textproc/hs-cassava/distinfo
new file mode 100644
index 0000000..e8bf358
--- /dev/null
+++ b/textproc/hs-cassava/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cassava-0.4.3.1.tar.gz) = e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac
+SIZE (cabal/cassava-0.4.3.1.tar.gz) = 31922
diff --git a/textproc/hs-cassava/pkg-descr b/textproc/hs-cassava/pkg-descr
new file mode 100644
index 0000000..25f6344
--- /dev/null
+++ b/textproc/hs-cassava/pkg-descr
@@ -0,0 +1,4 @@
+A CSV parsing and encoding library optimized for ease of use and high
+performance.
+
+WWW: https://github.com/tibbe/cassava
diff --git a/textproc/hs-citeproc-hs/Makefile b/textproc/hs-citeproc-hs/Makefile
index efd7d12..4aea96d 100644
--- a/textproc/hs-citeproc-hs/Makefile
+++ b/textproc/hs-citeproc-hs/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= citeproc-hs
-PORTVERSION= 0.3.9
-PORTREVISION= 1
+PORTVERSION= 0.3.10
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,20 +11,24 @@ LICENSE= BSD3CLAUSE
USE_CABAL= json mtl pandoc-types>=1.8 parsec syb utf8-string xml
-FLAGS_DEFINE= BIBUTILS HEXPAT NETWORK UNICODE_COLLATION
+FLAGS_DEFINE= BIBUTILS EMBED_DATA HEXPAT NETWORK UNICODE_COLLATION
FLAGS_DEFAULT= BIBUTILS HEXPAT NETWORK
BIBUTILS_DESC= Use Chris Putnam's Bibutils
BIBUTILS_FLAG_ENABLE= bibutils
BIBUTILS_FLAG_CABAL= hs-bibutils>=0.3
+EMBED_DATA_DESC= Embed locale files into the library
+EMBED_DATA_FLAG_ENABLE= embed_data_files
+EMBED_DATA_FLAG_CABAL= file-embed
+
HEXPAT_DESC= Use hexpat to parse XML
HEXPAT_FLAG_ENABLE= hexpat
HEXPAT_FLAG_CABAL= hexpat>=0.20.2
NETWORK_DESC= Use network and HTTP to retrieve CSL file
NETWORK_FLAG_ENABLE= network
-NETWORK_FLAG_CABAL= HTTP>=4000.0.9 network>=2
+NETWORK_FLAG_CABAL= HTTP>=4000.0.9 network>=2.6 network-uri>=2.6
UNICODE_COLLATION_DESC= Use bindings to the ICU libraries
UNICODE_COLLATION_FLAG_ENABLE= unicode_collation
diff --git a/textproc/hs-citeproc-hs/distinfo b/textproc/hs-citeproc-hs/distinfo
index 47a3e03..3af462d 100644
--- a/textproc/hs-citeproc-hs/distinfo
+++ b/textproc/hs-citeproc-hs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/citeproc-hs-0.3.9.tar.gz) = 4f6b7db9b731789f25e4faebce8ec2ea4a19a920aaad6951a5e8b23cd4187438
-SIZE (cabal/citeproc-hs-0.3.9.tar.gz) = 114621
+SHA256 (cabal/citeproc-hs-0.3.10.tar.gz) = 1928db4f4c00f6722281f25171fc58412ec74c5e42adfc901a33a20dd10e65b9
+SIZE (cabal/citeproc-hs-0.3.10.tar.gz) = 115588
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs
new file mode 100644
index 0000000..dc6be7f
--- /dev/null
+++ b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval.hs
@@ -0,0 +1,8 @@
+--- src/Text/CSL/Eval.hs.orig 2015-03-17 10:32:38 UTC
++++ src/Text/CSL/Eval.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE PatternGuards #-}
++{-# LANGUAGE PatternGuards, FlexibleContexts #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Text.CSL.Eval
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs
new file mode 100644
index 0000000..750e976
--- /dev/null
+++ b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Eval_Names.hs
@@ -0,0 +1,8 @@
+--- src/Text/CSL/Eval/Names.hs.orig 2015-03-17 10:32:38 UTC
++++ src/Text/CSL/Eval/Names.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE PatternGuards #-}
++{-# LANGUAGE PatternGuards, FlexibleContexts #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Text.CSL.Eval.Names
diff --git a/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs
new file mode 100644
index 0000000..16eb7ba
--- /dev/null
+++ b/textproc/hs-citeproc-hs/files/patch-src_Text_CSL_Test.hs
@@ -0,0 +1,10 @@
+--- src/Text/CSL/Test.hs.orig 2015-03-17 10:32:38 UTC
++++ src/Text/CSL/Test.hs
+@@ -29,7 +29,6 @@ import Data.List
+ import Data.Maybe (isJust)
+ import Data.Time
+ import System.Directory
+-import System.Locale
+
+ import Text.ParserCombinators.Parsec
+
diff --git a/textproc/hs-citeproc-hs/pkg-descr b/textproc/hs-citeproc-hs/pkg-descr
index f552612..dbdad31 100644
--- a/textproc/hs-citeproc-hs/pkg-descr
+++ b/textproc/hs-citeproc-hs/pkg-descr
@@ -4,4 +4,4 @@ Language (CSL) [1].
[1] http://xbiblio.sourceforge.net/
-WWW: http://gorgias.mine.nu/repos/citeproc-hs/
+WWW: http://istitutocolli.org/repos/citeproc-hs/
diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile
new file mode 100644
index 0000000..63c40db
--- /dev/null
+++ b/textproc/hs-cmark/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= cmark
+PORTVERSION= 0.4.0.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Fast, accurate CommonMark (Markdown) parser and renderer
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text>=1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-cmark/distinfo b/textproc/hs-cmark/distinfo
new file mode 100644
index 0000000..c9f34b6
--- /dev/null
+++ b/textproc/hs-cmark/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/cmark-0.4.0.1.tar.gz) = 638328b59c2bb8bdcd0f3042c4554f2b2b7c6deac7770dbc8bc2813c865a35ce
+SIZE (cabal/cmark-0.4.0.1.tar.gz) = 175936
diff --git a/textproc/hs-cmark/pkg-descr b/textproc/hs-cmark/pkg-descr
new file mode 100644
index 0000000..f7575ea
--- /dev/null
+++ b/textproc/hs-cmark/pkg-descr
@@ -0,0 +1,6 @@
+This package provides Haskell bindings for libcmark, the reference
+parser for CommonMark, a fully specified variant of Markdown. It
+includes sources for libcmark (0.21.0) and does not require prior
+installation of the C library.
+
+WWW: https://github.com/jgm/commonmark-hs
diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile
index 9f55a05..673e8b5 100644
--- a/textproc/hs-csv/Makefile
+++ b/textproc/hs-csv/Makefile
@@ -3,7 +3,7 @@
PORTNAME= csv
PORTVERSION= 0.1.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile
index 6ee6197..d9f7b3a 100644
--- a/textproc/hs-double-conversion/Makefile
+++ b/textproc/hs-double-conversion/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= double-conversion
-PORTVERSION= 0.2.0.6
-PORTREVISION= 7
+PORTVERSION= 2.0.1.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,4 +12,11 @@ LICENSE= BSD3CLAUSE
USE_CABAL= text>=0.11.0.8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+
+.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-double-conversion.cabal
+LIB_DEPENDS+= libcxxrt.so:${PORTSDIR}/devel/libcxxrt
+.endif
+
.include <bsd.port.mk>
+
diff --git a/textproc/hs-double-conversion/distinfo b/textproc/hs-double-conversion/distinfo
index e8d08bc..c50f94d 100644
--- a/textproc/hs-double-conversion/distinfo
+++ b/textproc/hs-double-conversion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/double-conversion-0.2.0.6.tar.gz) = 57428dc3896628d9e5b6aef48104af112a90d992bddd06b723c4e1061ff0d0b0
-SIZE (cabal/double-conversion-0.2.0.6.tar.gz) = 7016270
+SHA256 (cabal/double-conversion-2.0.1.0.tar.gz) = 0072b5b05631081c2eb73cda9dd660e384a7e988d3867b8b05540ef7648a920c
+SIZE (cabal/double-conversion-2.0.1.0.tar.gz) = 7023237
diff --git a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal b/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal
new file mode 100644
index 0000000..f194f16
--- /dev/null
+++ b/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal
@@ -0,0 +1,12 @@
+--- double-conversion.cabal.orig 2014-08-13 18:38:48 UTC
++++ double-conversion.cabal
+@@ -71,7 +71,8 @@ library
+ double-conversion/src/fixed-dtoa.cc
+ double-conversion/src/strtod.cc
+
+- extra-libraries: stdc++
++ cc-options: -std=c++11 -stdlib=libc++
++ extra-libraries: cxxrt gcc_s
+
+ include-dirs:
+ double-conversion/src
diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile
index 775fefe..ea53f03 100644
--- a/textproc/hs-feed/Makefile
+++ b/textproc/hs-feed/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= feed
-PORTVERSION= 0.3.9.2
-PORTREVISION= 1
+PORTVERSION= 0.3.10.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,8 @@ COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds
LICENSE= BSD3CLAUSE
-USE_CABAL= utf8-string xml>=1.2.6
+USE_CABAL= old-locale>=1.0 old-time>=1 time-locale-compat>=0.1 \
+ utf8-string xml>=1.2.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo
index 41fb6a4..97525cf 100644
--- a/textproc/hs-feed/distinfo
+++ b/textproc/hs-feed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/feed-0.3.9.2.tar.gz) = ef1d23d130b766186a0bacd6e4807279cab681712b0fb09d1ed1ee1b3c154f17
-SIZE (cabal/feed-0.3.9.2.tar.gz) = 73353
+SHA256 (cabal/feed-0.3.10.0.tar.gz) = 74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094
+SIZE (cabal/feed-0.3.10.0.tar.gz) = 76124
diff --git a/textproc/hs-feed/pkg-descr b/textproc/hs-feed/pkg-descr
index 2811943..5d4dcc4 100644
--- a/textproc/hs-feed/pkg-descr
+++ b/textproc/hs-feed/pkg-descr
@@ -1,3 +1,3 @@
Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds in Haskell.
-WWW: https://github.com/sof/feed
+WWW: https://github.com/bergmark/feed
diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile
index 326768a..ff2dd46 100644
--- a/textproc/hs-hexpat/Makefile
+++ b/textproc/hs-hexpat/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hexpat
-PORTVERSION= 0.20.6
-PORTREVISION= 1
+PORTVERSION= 0.20.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= XML parser/formatter based on expat
LICENSE= BSD3CLAUSE
-USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string
+USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hexpat/distinfo b/textproc/hs-hexpat/distinfo
index 2334a57..1104bb3 100644
--- a/textproc/hs-hexpat/distinfo
+++ b/textproc/hs-hexpat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hexpat-0.20.6.tar.gz) = 0b98fb2726e0be4c98102edd68025b7731b0dc8aeb9029719e601a091935ba0a
-SIZE (cabal/hexpat-0.20.6.tar.gz) = 133394
+SHA256 (cabal/hexpat-0.20.9.tar.gz) = 5d1c075f1ae00be2e80c0018b522a351b2f4ef73b9baca1113ee80e554449d9d
+SIZE (cabal/hexpat-0.20.9.tar.gz) = 132649
diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile
index 72cb8a6..85b83af 100644
--- a/textproc/hs-highlighting-kate/Makefile
+++ b/textproc/hs-highlighting-kate/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= highlighting-kate
-PORTVERSION= 0.5.11.1
+PORTVERSION= 0.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,9 +14,11 @@ USE_CABAL= blaze-html>=0.4.2 mtl parsec \
FLAGS_DEFINE= EXECUTABLE
-EXECUTABLE_DESC= Build the Highlight executable
+EXECUTABLE_DESC= Build the executable
EXECUTABLE_FLAG_ENABLE= executable
-EXECUTABLE_FLAG_EXECUTABLE= Highlight
+EXECUTABLE_FLAG_EXECUTABLE= highlighting-kate
+
+FLAGS_DISABLE= pcre-light
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-highlighting-kate/distinfo b/textproc/hs-highlighting-kate/distinfo
index 90cabdc..35cc420 100644
--- a/textproc/hs-highlighting-kate/distinfo
+++ b/textproc/hs-highlighting-kate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/highlighting-kate-0.5.11.1.tar.gz) = 7b5af011fb86b0358c186245840c95c4c43ada3d98f7b9060d9ce2a0c2e5c2fc
-SIZE (cabal/highlighting-kate-0.5.11.1.tar.gz) = 862965
+SHA256 (cabal/highlighting-kate-0.6.tar.gz) = b39dc194386eb7613a5e9935023b1173010800c3a9b0b7fe09c0601f97236398
+SIZE (cabal/highlighting-kate-0.6.tar.gz) = 922847
diff --git a/textproc/hs-highlighting-kate/pkg-descr b/textproc/hs-highlighting-kate/pkg-descr
index 0cf8ce4..f09ab38 100644
--- a/textproc/hs-highlighting-kate/pkg-descr
+++ b/textproc/hs-highlighting-kate/pkg-descr
@@ -1,9 +1,7 @@
The highlighting-kate is a syntax highlighting library with support for
nearly one hundred languages. The syntax parsers are automatically
generated from Kate syntax descriptions [1], so any syntax supported by
-Kate can be added. An (optional) command-line program is provided,
-along with a utility for generating new parsers from Kate XML syntax
-descriptions.
+Kate can be added.
[1] http://kate-editor.org/
diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile
index f41f103..0cab1e2 100644
--- a/textproc/hs-hs-bibutils/Makefile
+++ b/textproc/hs-hs-bibutils/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hs-bibutils
-PORTVERSION= 5.0
-PORTREVISION= 6
+PORTVERSION= 5.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo
index 5ee776d..c910169 100644
--- a/textproc/hs-hs-bibutils/distinfo
+++ b/textproc/hs-hs-bibutils/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hs-bibutils-5.0.tar.gz) = 54403646b4530649e9a48b01f0d23818566d62691c651ba4ff9889278c85eca1
-SIZE (cabal/hs-bibutils-5.0.tar.gz) = 428490
+SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d
+SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546
diff --git a/textproc/hs-hs-bibutils/pkg-descr b/textproc/hs-hs-bibutils/pkg-descr
index 1cfc23f..ea63fc0 100644
--- a/textproc/hs-hs-bibutils/pkg-descr
+++ b/textproc/hs-hs-bibutils/pkg-descr
@@ -2,4 +2,4 @@ Haskell bindings to Chris Putnam's bibutils, a library that
interconverts between various bibliography formats using a common
MODS-format XML intermediate.
-WWW: http://gorgias.mine.ru/repos/hs-bibutils/
+WWW: http://istitutocolli.org/repos/hs-bibutils/
diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile
index 7c07288..aca81c2 100644
--- a/textproc/hs-html-conduit/Makefile
+++ b/textproc/hs-html-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= html-conduit
-PORTVERSION= 1.1.0.5
-PORTREVISION= 1
+PORTVERSION= 1.2.0
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Parse HTML documents using xml-conduit datatypes
LICENSE= MIT
-USE_CABAL= conduit>=1.0 conduit-extra resourcet>=0.3 system-filepath>=0.4 \
- tagstream-conduit>=0.4 text xml-conduit>=1.1 xml-types>=0.3
+USE_CABAL= conduit>=1.0 conduit-extra>=1.1.1 resourcet>=0.3 \
+ tagstream-conduit>=0.5.5.3 text xml-conduit>=1.3 xml-types>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo
index 2282ea3..eb8e07c 100644
--- a/textproc/hs-html-conduit/distinfo
+++ b/textproc/hs-html-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/html-conduit-1.1.0.5.tar.gz) = 560bac7c5601554c8958099cc7a0035af270e1c8f93b2d76d40ea4476754bbfb
-SIZE (cabal/html-conduit-1.1.0.5.tar.gz) = 4048
+SHA256 (cabal/html-conduit-1.2.0.tar.gz) = 751096080f961a44ac3c2d93274dfa5fd4e047d215af33734dd325158e16404a
+SIZE (cabal/html-conduit-1.2.0.tar.gz) = 3905
diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile
index 894b06b..6d21a02 100644
--- a/textproc/hs-html/Makefile
+++ b/textproc/hs-html/Makefile
@@ -2,7 +2,7 @@
PORTNAME= html
PORTVERSION= 1.0.1.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile
index 86b817a..dc4788c 100644
--- a/textproc/hs-hxt-charproperties/Makefile
+++ b/textproc/hs-hxt-charproperties/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-charproperties
-PORTVERSION= 9.1.1.1
-PORTREVISION= 1
+PORTVERSION= 9.2.0.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-hxt-charproperties/distinfo b/textproc/hs-hxt-charproperties/distinfo
index c7ee18a..a5398a6 100644
--- a/textproc/hs-hxt-charproperties/distinfo
+++ b/textproc/hs-hxt-charproperties/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-charproperties-9.1.1.1.tar.gz) = e800393a12f3469e37d76cd5449ab22b5eccca565fdf65f075a0698fb9ae0ca9
-SIZE (cabal/hxt-charproperties-9.1.1.1.tar.gz) = 225230
+SHA256 (cabal/hxt-charproperties-9.2.0.1.tar.gz) = e46614d6bf0390b2a6a1aeeb0771e6d366944da40fb21c12c2f8a94d1f47b4d6
+SIZE (cabal/hxt-charproperties-9.2.0.1.tar.gz) = 270767
diff --git a/textproc/hs-hxt-charproperties/pkg-descr b/textproc/hs-hxt-charproperties/pkg-descr
index 4f77104..06efe20 100644
--- a/textproc/hs-hxt-charproperties/pkg-descr
+++ b/textproc/hs-hxt-charproperties/pkg-descr
@@ -1,5 +1,5 @@
Character proprties defined by XML and Unicode standards. These modules contain
predicates for Unicode blocks and char proprties and character predicates
-defined by XML. Supported Unicode version is 5.2.0.
+defined by XML. Supported Unicode version is 7.0.0.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: https://github.com/UweSchmidt/hxt
diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile
index 2c5573a..1f968d4 100644
--- a/textproc/hs-hxt-regex-xmlschema/Makefile
+++ b/textproc/hs-hxt-regex-xmlschema/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-regex-xmlschema
-PORTVERSION= 9.1.0
-PORTREVISION= 7
+PORTVERSION= 9.2.0.2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Regular expression library for W3C XML Schema regular expressions
LICENSE= MIT
-USE_CABAL= hxt-charproperties>=9 parsec>=2.1
+USE_CABAL= hxt-charproperties>=9.0 parsec>=2.1 text>=0.10
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-regex-xmlschema/distinfo b/textproc/hs-hxt-regex-xmlschema/distinfo
index 8e7f39a..d67f450 100644
--- a/textproc/hs-hxt-regex-xmlschema/distinfo
+++ b/textproc/hs-hxt-regex-xmlschema/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 99bf7f8c7e2b0d930c84ce699861549e02408716902f1e5febf51abaf3cc2751
-SIZE (cabal/hxt-regex-xmlschema-9.1.0.tar.gz) = 26675
+SHA256 (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 4744676dde2b29c4bb75a579345145225a1f1b7ba15d46b7f868c37c6e696cc2
+SIZE (cabal/hxt-regex-xmlschema-9.2.0.2.tar.gz) = 35896
diff --git a/textproc/hs-hxt-regex-xmlschema/pkg-descr b/textproc/hs-hxt-regex-xmlschema/pkg-descr
index 3c11bcf..2c7f91c 100644
--- a/textproc/hs-hxt-regex-xmlschema/pkg-descr
+++ b/textproc/hs-hxt-regex-xmlschema/pkg-descr
@@ -1,11 +1,10 @@
-This library supports full W3C XML Schema regular expressions inclusive all
-Unicode character sets and blocks. The complete grammar can be found under
-<http://www.w3.org/TR/xmlschema11-2/#regexs>. It is implemented by the
-technique of derivations of regular expressions. The W3C syntax is extended
-to support not only union of regular sets, but also intersection, set
-difference, exor. Matching of subexpressions is also supported.
-The library can be used for constricting lightweight scanners and tokenizers.
-It is a standalone library, no external regex libraries are used.
-This package is a substitute for the old regex-xmlschema package.
+This library supports full W3C XML Schema regular expressions inclusive
+all Unicode character sets and blocks. It is implemented by the
+technique of derivations of regular expressions. The W3C syntax is
+extended to support not only union of regular sets, but also
+intersection, set difference, exor. Matching of subexpressions is also
+supported. The library can be used for constricting lightweight
+scanners and tokenizers. It is a standalone library, no external regex
+libraries are used.
WWW: http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema
diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile
index 841052e..48f3806 100644
--- a/textproc/hs-hxt-unicode/Makefile
+++ b/textproc/hs-hxt-unicode/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt-unicode
-PORTVERSION= 9.0.2.2
-PORTREVISION= 1
+PORTVERSION= 9.0.2.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Unicode en-/decoding functions for utf8, iso-latin-* and other encoding
LICENSE= MIT
-USE_CABAL= hxt-charproperties>=9
+USE_CABAL= hxt-charproperties>=9.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt-unicode/distinfo b/textproc/hs-hxt-unicode/distinfo
index 69cb83e..ae28ab3 100644
--- a/textproc/hs-hxt-unicode/distinfo
+++ b/textproc/hs-hxt-unicode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-unicode-9.0.2.2.tar.gz) = 193dbe7bb829ef3c9b8d2f5ad71bd603990310dfe02e910a9d9cb4e3ce5c92c6
-SIZE (cabal/hxt-unicode-9.0.2.2.tar.gz) = 13978
+SHA256 (cabal/hxt-unicode-9.0.2.4.tar.gz) = 7b5823f3bd94b57022d9d84ab3555303653c5121eaaef2ee1fd4918f3c434466
+SIZE (cabal/hxt-unicode-9.0.2.4.tar.gz) = 14010
diff --git a/textproc/hs-hxt-unicode/pkg-descr b/textproc/hs-hxt-unicode/pkg-descr
index 4fb7a2f..11ba79d 100644
--- a/textproc/hs-hxt-unicode/pkg-descr
+++ b/textproc/hs-hxt-unicode/pkg-descr
@@ -3,4 +3,4 @@ encodings, used in the Haskell XML Toolbox. ISO Latin 1 - 16, utf8, utf16,
ASCII are supported. Decoding is done with lasy functions, errors may be
detected or ignored.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: https://github.com/UweSchmidt/hxt
diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile
index 3911d2e..d69aaf0 100644
--- a/textproc/hs-hxt/Makefile
+++ b/textproc/hs-hxt/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hxt
-PORTVERSION= 9.3.1.4
-PORTREVISION= 1
+PORTVERSION= 9.3.1.15
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Collection of tools for processing XML with Haskell
LICENSE= MIT
-USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9 \
- hxt-unicode>=9.0.1 mtl>=2 network>=2.4 parsec>=2.1
+USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9.2 \
+ hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 \
+ parsec>=2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo
index c44d75431..1b79cee 100644
--- a/textproc/hs-hxt/distinfo
+++ b/textproc/hs-hxt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hxt-9.3.1.4.tar.gz) = 2e07afe8b81f01f04c586f85c44e1f13710c2565df7e5123bfb0e5822d7b964e
-SIZE (cabal/hxt-9.3.1.4.tar.gz) = 233730
+SHA256 (cabal/hxt-9.3.1.15.tar.gz) = 723e7b3c22f58771087e7763d11702b3ae3aa910158a2beee70e973722966560
+SIZE (cabal/hxt-9.3.1.15.tar.gz) = 235096
diff --git a/textproc/hs-hxt/pkg-descr b/textproc/hs-hxt/pkg-descr
index 780e0f3..4ad5e8c 100644
--- a/textproc/hs-hxt/pkg-descr
+++ b/textproc/hs-hxt/pkg-descr
@@ -1,12 +1,11 @@
The Haskell XML Toolbox bases on the ideas of HaXml and HXML, but
-introduces a more general approach for processing XML with Haskell. The
+introduces a more general approach for processing XML with Haskell. The
Haskell XML Toolbox uses a generic data model for representing XML
documents, including the DTD subset and the document subset, in Haskell.
It contains a validating XML parser, a HTML parser, namespace support,
an XPath expression evaluator, an XSLT library, a RelaxNG schema
validator and funtions for serialization and deserialization of user
-defined data. The library make extensive use of the arrow approach for
-processing XML. Since version 8.5 XPath and XSLT have been moved to
-separate packages hxt-xpath and hxt-xslt.
+defined data. The library makes extensive use of the arrow approach for
+processing XML.
-WWW: http://www.fh-wedel.de/~si/HXmlToolbox/index.html
+WWW: https://github.com/UweSchmidt/hxt
diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile
index e5e42f8..1272528 100644
--- a/textproc/hs-lhs2tex/Makefile
+++ b/textproc/hs-lhs2tex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= lhs2tex
-PORTVERSION= 1.18.1
-PORTREVISION= 8
+PORTVERSION= 1.19
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo
index d894389..e5145ca 100644
--- a/textproc/hs-lhs2tex/distinfo
+++ b/textproc/hs-lhs2tex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/lhs2tex-1.18.1.tar.gz) = dccae22231a1db64cddc38b6f7ac98ac4d5677f03df2f548b2efe9a5e63e9648
-SIZE (cabal/lhs2tex-1.18.1.tar.gz) = 661053
+SHA256 (cabal/lhs2tex-1.19.tar.gz) = 24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e
+SIZE (cabal/lhs2tex-1.19.tar.gz) = 658353
diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile
index b18b905..575a585 100644
--- a/textproc/hs-libxml-sax/Makefile
+++ b/textproc/hs-libxml-sax/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml-sax
PORTVERSION= 0.7.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile
index 8889b3b..e92cd1a 100644
--- a/textproc/hs-libxml/Makefile
+++ b/textproc/hs-libxml/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libxml
PORTVERSION= 0.1.1
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile
new file mode 100644
index 0000000..9e65300
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/Makefile
@@ -0,0 +1,36 @@
+# $FreeBSD$
+
+PORTNAME= pandoc-citeproc
+PORTVERSION= 0.7.3.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Supports using pandoc with citeproc
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson>=0.7 aeson-pretty attoparsec data-default \
+ mtl pandoc>=1.13 pandoc-types>=1.12.3 parsec rfc5051 \
+ setenv>=0.1 split syb tagsoup text vector xml-conduit>=1.2 \
+ yaml>=0.8.8.7
+
+EXECUTABLE= pandoc-citeproc
+
+FLAGS_DEFINE= BIBUTILS EMBED_DATA UNICODE_COLLATION
+FLAGS_DEFAULT= BIBUTILS
+
+BIBUTILS_DESC= Use Chris Putnam's Bibutils
+BIBUTILS_FLAG_ENABLE= bibutils
+BIBUTILS_FLAG_CABAL= hs-bibutils>=0.3
+
+EMBED_DATA_DESC= Embed locale files into the library
+EMBED_DATA_FLAG_ENABLE= embed_data_files
+
+UNICODE_COLLATION_DESC= Use bindings to the Internationl Components for Unicode libraries
+UNICODE_COLLATION_FLAG_ENABLE= unicode_collation
+UNICODE_COLLATION_FLAG_CABAL= text-icu
+
+FLAGS_DISABLE= test_citeproc debug
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo
new file mode 100644
index 0000000..e6a2590
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = b2e9b814603dbb60b845fa14d767a154e43a2115a9a81b218a173e9bc1a319f5
+SIZE (cabal/pandoc-citeproc-0.7.3.1.tar.gz) = 298737
diff --git a/textproc/hs-pandoc-citeproc/pkg-descr b/textproc/hs-pandoc-citeproc/pkg-descr
new file mode 100644
index 0000000..90a03d6
--- /dev/null
+++ b/textproc/hs-pandoc-citeproc/pkg-descr
@@ -0,0 +1,6 @@
+The pandoc-citeproc library exports functions for using the citeproc
+system with pandoc. It relies on citeproc-hs, a library for rendering
+bibliographic reference citations into a variety of styles using a macro
+language called Citation Style Language (CSL).
+
+WWW: http://hackage.haskell.org/package/pandoc-citeproc
diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile
index 7c389ac..fd7fc32 100644
--- a/textproc/hs-pandoc-types/Makefile
+++ b/textproc/hs-pandoc-types/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= pandoc-types
-PORTVERSION= 1.12.4.1
-PORTREVISION= 1
+PORTVERSION= 1.12.4.5
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Types for representing a structured document
-LICENSE= GPLv2
+LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.6.2 deepseq-generics>=0.1 syb>=0.1
diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo
index 1a40430..98ee340 100644
--- a/textproc/hs-pandoc-types/distinfo
+++ b/textproc/hs-pandoc-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-types-1.12.4.1.tar.gz) = 187bda4b12746b9cc460ae98b39d0964adace2bcca2fd0e343b1ea4234a86ff1
-SIZE (cabal/pandoc-types-1.12.4.1.tar.gz) = 18909
+SHA256 (cabal/pandoc-types-1.12.4.5.tar.gz) = 87a1db206be3eccd2e66518363340e90e7592d8e82e2a5f006620cd3e1ac877b
+SIZE (cabal/pandoc-types-1.12.4.5.tar.gz) = 13341
diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index fc8e455..2f8d347 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= pandoc
-PORTVERSION= 1.13.2
+PORTVERSION= 1.15.0.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,16 +10,16 @@ COMMENT= Conversion between markup formats
LICENSE= GPLv2
-USE_CABAL= aeson>=0.7 base64-bytestring>=0.1 blaze-html>=0.5 \
- blaze-markup>=0.5.1 data-default>=0.4 deepseq-generics>=0.1 \
- extensible-exceptions>=0.1 haddock-library>=1.1 \
- highlighting-kate>=0.5.11.1 hslua>=0.3 HTTP>=4000.0.5 \
- JuicyPixels>=3.1.6.1 mtl>=1.1 network>=2 \
- pandoc-types>=1.12.4 parsec>=3.1 random>=1 scientific>=0.2 \
- SHA>=1.6 syb>=0.1 tagsoup>=0.13.1 temporary>=1.1 \
- texmath>=0.8.0.1 text>=0.11 unordered-containers>=0.2 \
- vector>=0.10 xml>=1.3.12 yaml>=0.8.8.2 zip-archive>=0.2.3.4 \
- zlib>=0.5
+USE_CABAL= aeson>=0.7.0.5 base64-bytestring>=0.1 blaze-html>=0.5 \
+ blaze-markup>=0.5.1 cmark>=0.4.0.1 data-default>=0.4 \
+ deepseq-generics>=0.1 extensible-exceptions>=0.1 \
+ filemanip>=0.3 haddock-library>=1.1 highlighting-kate>=0.6 \
+ hslua>=0.3 HTTP>=4000.0.5 JuicyPixels>=3.1.6.1 mtl>=1.1 \
+ network>=2.6 network-uri>=2.6 pandoc-types>=1.12.4 parsec>=3.1 \
+ random>=1 scientific>=0.2 SHA>=1.6 syb>=0.1 tagsoup>=0.13.1 \
+ temporary>=1.1 texmath>=0.8.1 text>=0.11 \
+ unordered-containers>=0.2 vector>=0.10 xml>=1.3.12 \
+ yaml>=0.8.8.2 zip-archive>=0.2.3.4 zlib>=0.5
USE_ALEX= yes
USE_HAPPY= yes
@@ -29,16 +29,15 @@ EXECUTABLE= pandoc
# For PDF generation
USE_TEX= texmf:run
-MAN1SRC= man/man1
-MAN5SRC= man/man5
+MAN1SRC= man
MAN1PAGES= pandoc.1
-MAN5PAGES= pandoc_markdown.5
-FLAGS_DEFINE= EMBED_DATA_FILES HTTPS TRYPANDOC
+FLAGS_DEFINE= EMBED_DATA HTTPS TRYPANDOC
FLAGS_DEFAULT= HTTPS
-EMBED_DATA_FILES_DESC= Embed data files in binary for relocatable executable
-EMBED_DATA_FILES_FLAG_ENABLE= embed_data_files
+EMBED_DATA_DESC= Embed data files in binary for relocatable executable
+EMBED_DATA_FLAG_ENABLE= embed_data_files
+EMBED_DATA_FLAG_CABAL= hsb2hs>=0.3.1
HTTPS_DESC= Enable downloading of resources over HTTPS
HTTPS_FLAG_ENABLE= https
@@ -50,6 +49,7 @@ TRYPANDOC_FLAG_CABAL= aeson highlighting-kate text wai-extra wai>=0.3 \
http-types
TRYPANDOC_FLAG_EXECUTABLE= trypandoc
+FLAGS_ENABLE= network-uri
FLAGS_DISABLE= make-pandoc-man-pages
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index f52429c..d7c721b 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pandoc-1.13.2.tar.gz) = e65c445f4454e9efcf1bc8c28754260d7108803bd8979bc2ff3c34705e386d8a
-SIZE (cabal/pandoc-1.13.2.tar.gz) = 1980729
+SHA256 (cabal/pandoc-1.15.0.6.tar.gz) = d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46
+SIZE (cabal/pandoc-1.15.0.6.tar.gz) = 2049870
diff --git a/textproc/hs-pandoc/pkg-descr b/textproc/hs-pandoc/pkg-descr
index d532d32..5cfd90d 100644
--- a/textproc/hs-pandoc/pkg-descr
+++ b/textproc/hs-pandoc/pkg-descr
@@ -1,15 +1,23 @@
Pandoc is a Haskell library for converting from one markup format to
another, and a command-line tool that uses this library. It can read
markdown and (subsets of) HTML, reStructuredText, LaTeX, DocBook,
-MediaWiki markup, Haddock markup, OPML, Emacs Org-Mode, txt2tags and
-Textile, and it can write markdown, reStructuredText, HTML, LaTeX,
-ConTeXt, Docbook, OPML, OpenDocument, ODT, Word docx, RTF, MediaWiki,
-DokuWiki, Textile, groff man pages, plain text, Emacs Org-Mode,
-AsciiDoc, Haddock markup, EPUB (v2 and v3), FictionBook2, InDesign ICML,
-and several kinds of HTML/javascript slide shows (S5, Slidy, Slideous,
-DZSlides, reveal.js). Pandoc extends standard markdown syntax with
-footnotes, embedded LaTeX, definition lists, tables, and other features.
-A compatibility mode is provided for those who need a drop-in
-replacement for Markdown.pl.
+MediaWiki markup, TWiki markup, Haddock markup, OPML, Emacs Org-Mode,
+txt2tags and Textile, and it can write markdown, reStructuredText,
+XHTML, HTML 5, LaTeX, ConTeXt, DocBook, OPML, OpenDocument, ODT, Word
+docx, RTF, MediaWiki, DokuWiki, Textile, groff man pages, plain text,
+Emacs Org-Mode, AsciiDoc, Haddock markup, EPUB (v2 and v3),
+FictionBook2, InDesign ICML, and several kinds of HTML/javascript slide
+shows (S5, Slidy, Slideous, DZSlides, reveal.js).
-WWW: http://johnmacfarlane.net/pandoc
+Pandoc extends standard markdown syntax with footnotes, embedded LaTeX,
+definition lists, tables, and other features. A compatibility mode is
+provided for those who need a drop-in replacement for Markdown.pl.
+
+In contrast to existing tools for converting markdown to HTML, which use
+regex substitutions, pandoc has a modular design: it consists of a set
+of readers, which parse text in a given format and produce a native
+representation of the document, and a set of writers, which convert this
+native representation into a target format. Thus, adding an input or
+output format requires only adding a reader or writer.
+
+WWW: http://pandoc.org
diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-parsec/Makefile
index 628f0e0..34c98c0 100644
--- a/textproc/hs-parsec/Makefile
+++ b/textproc/hs-parsec/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= parsec
-PORTVERSION= 3.1.5
-PORTREVISION= 1
+PORTVERSION= 3.1.9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo
index 9661ca9..baf11e9 100644
--- a/textproc/hs-parsec/distinfo
+++ b/textproc/hs-parsec/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/parsec-3.1.5.tar.gz) = c572245d72bc3aff3491ce4f89215fcaa1e01c5e7b280d4c105a87db31793cb8
-SIZE (cabal/parsec-3.1.5.tar.gz) = 27894
+SHA256 (cabal/parsec-3.1.9.tar.gz) = 71f711d24c89581a43b8bc2d3ed56a1a802bbf1cd0b083bc34636c232b0342c9
+SIZE (cabal/parsec-3.1.9.tar.gz) = 29668
diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr
index 03d2fd0..cb0f234 100644
--- a/textproc/hs-parsec/pkg-descr
+++ b/textproc/hs-parsec/pkg-descr
@@ -4,4 +4,4 @@ has extensive libraries and good error messages, and is also fast. It
is defined as a monad transformer that can be stacked on arbitrary
monads, and it is also parametric in the input stream type.
-WWW: http://www.cs.uu.nl/~daan/parsec.html
+WWW: https://github.com/aslatter/parsec
diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile
index 0cf66d5..00f4280 100644
--- a/textproc/hs-polyparse/Makefile
+++ b/textproc/hs-polyparse/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= polyparse
-PORTVERSION= 1.9
-PORTREVISION= 6
+PORTVERSION= 1.11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-polyparse/distinfo b/textproc/hs-polyparse/distinfo
index b4c0d24..11bf8d7 100644
--- a/textproc/hs-polyparse/distinfo
+++ b/textproc/hs-polyparse/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/polyparse-1.9.tar.gz) = 9f12d6821594166af881941d6c346a6ad617eae18a0ee8659044ef163694708a
-SIZE (cabal/polyparse-1.9.tar.gz) = 22256
+SHA256 (cabal/polyparse-1.11.tar.gz) = 30ef045a25bd7de0f3507ed1161aab35b5711120d315b15f23558205903b81fc
+SIZE (cabal/polyparse-1.11.tar.gz) = 22978
diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile
new file mode 100644
index 0000000..4389083
--- /dev/null
+++ b/textproc/hs-regex-applicative/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= regex-applicative
+PORTVERSION= 0.3.2.1
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Regex-based parsing with applicative interface
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-applicative/distinfo b/textproc/hs-regex-applicative/distinfo
new file mode 100644
index 0000000..cb736c1
--- /dev/null
+++ b/textproc/hs-regex-applicative/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/regex-applicative-0.3.2.1.tar.gz) = bf4ab2dc765d8083ac08a72b2221712a942a734b90e4ce433baf4b5c8db35ca7
+SIZE (cabal/regex-applicative-0.3.2.1.tar.gz) = 13531
diff --git a/textproc/hs-regex-applicative/pkg-descr b/textproc/hs-regex-applicative/pkg-descr
new file mode 100644
index 0000000..0d953ae
--- /dev/null
+++ b/textproc/hs-regex-applicative/pkg-descr
@@ -0,0 +1,4 @@
+Regex-applicative is a Haskell library for parsing using regular expressions.
+Parsers can be built using Applicative interface.
+
+WWW: https://github.com/feuerbach/regex-applicative
diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile
index 7ab814a..ffadc67 100644
--- a/textproc/hs-regex-base/Makefile
+++ b/textproc/hs-regex-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-base
PORTVERSION= 0.93.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile
new file mode 100644
index 0000000..8b500fa
--- /dev/null
+++ b/textproc/hs-regex-compat-tdfa/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= regex-compat-tdfa
+PORTVERSION= 0.95.1.4
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Unicode Support version of Text.Regex, using regex-tdfa
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= regex-base>=0.93 regex-tdfa>=1.1.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-regex-compat-tdfa/distinfo b/textproc/hs-regex-compat-tdfa/distinfo
new file mode 100644
index 0000000..99cbafe
--- /dev/null
+++ b/textproc/hs-regex-compat-tdfa/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/regex-compat-tdfa-0.95.1.4.tar.gz) = 4fa38ed24ae390eeffe6eef04bbe632d7ecd02b9123729e976e7420f927520dd
+SIZE (cabal/regex-compat-tdfa-0.95.1.4.tar.gz) = 4146
diff --git a/textproc/hs-regex-compat-tdfa/pkg-descr b/textproc/hs-regex-compat-tdfa/pkg-descr
new file mode 100644
index 0000000..e6dae28
--- /dev/null
+++ b/textproc/hs-regex-compat-tdfa/pkg-descr
@@ -0,0 +1,4 @@
+One module layer over regex-tdfa to replace Text.Regex. regex-compat
+can't use Unicode characters correctly because of using regex-posix.
+
+WWW: http://hub.darcs.net/shelarcy/regex-compat-tdfa
diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile
index 3308c7d..4c3e09b 100644
--- a/textproc/hs-regex-compat/Makefile
+++ b/textproc/hs-regex-compat/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-compat
PORTVERSION= 0.95.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile
index 765baa6..fd47ea0 100644
--- a/textproc/hs-regex-pcre-builtin/Makefile
+++ b/textproc/hs-regex-pcre-builtin/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-pcre-builtin
PORTVERSION= 0.94.4.8.8.35
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile
index e2b20f3..964f3b7 100644
--- a/textproc/hs-regex-posix/Makefile
+++ b/textproc/hs-regex-posix/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-posix
PORTVERSION= 0.95.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile
index b8f691f..c277e50 100644
--- a/textproc/hs-regex-tdfa/Makefile
+++ b/textproc/hs-regex-tdfa/Makefile
@@ -2,7 +2,7 @@
PORTNAME= regex-tdfa
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile
new file mode 100644
index 0000000..20b580f
--- /dev/null
+++ b/textproc/hs-rfc5051/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= rfc5051
+PORTVERSION= 0.1.0.3
+CATEGORIES= textproc haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple unicode collation as per RFC5051
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/textproc/hs-rfc5051/distinfo b/textproc/hs-rfc5051/distinfo
new file mode 100644
index 0000000..938c8e0
--- /dev/null
+++ b/textproc/hs-rfc5051/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/rfc5051-0.1.0.3.tar.gz) = e38dab28a5625774be60545c8c99e647b79bbc0ac0bc9c65fe6b2ebef160642b
+SIZE (cabal/rfc5051-0.1.0.3.tar.gz) = 217935
diff --git a/textproc/hs-rfc5051/pkg-descr b/textproc/hs-rfc5051/pkg-descr
new file mode 100644
index 0000000..32cf6d3
--- /dev/null
+++ b/textproc/hs-rfc5051/pkg-descr
@@ -0,0 +1,7 @@
+This library implements i;unicode-casemap, the simple, non
+locale-sensitive unicode collation algorithm described in RFC 5051.
+Proper unicode collation can be done using text-icu, but that is a big
+dependency that depends on a large C library, and rfc5051 might be
+better for some purposes.
+
+WWW: http://hackage.haskell.org/package/rfc5051
diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile
index 489abf1..28d487c 100644
--- a/textproc/hs-stringsearch/Makefile
+++ b/textproc/hs-stringsearch/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= stringsearch
-PORTVERSION= 0.3.6.5
-PORTREVISION= 1
+PORTVERSION= 0.3.6.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-stringsearch/distinfo b/textproc/hs-stringsearch/distinfo
index f6e76a9..6bf8d5b 100644
--- a/textproc/hs-stringsearch/distinfo
+++ b/textproc/hs-stringsearch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/stringsearch-0.3.6.5.tar.gz) = 58d3409a551f71ccc55ded74be3f6f43b23614d74e12bc71d97d3a9271585bd6
-SIZE (cabal/stringsearch-0.3.6.5.tar.gz) = 38994
+SHA256 (cabal/stringsearch-0.3.6.6.tar.gz) = 295f1971920bc52263d8275d7054ad223a7e1aefe75533f9887735c9644ffe4a
+SIZE (cabal/stringsearch-0.3.6.6.tar.gz) = 39679
diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile
index 526ceef..fee650e 100644
--- a/textproc/hs-tagsoup/Makefile
+++ b/textproc/hs-tagsoup/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= tagsoup
-PORTVERSION= 0.13.1
-PORTREVISION= 1
+PORTVERSION= 0.13.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,12 +12,13 @@ LICENSE= BSD3CLAUSE
USE_CABAL= text
-INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/tagsoup.htm ${STAGEDIR}${DATADIR}
-
FLAGS_DEFINE= DOWNLOAD
DOWNLOAD_DESC= Build with Download module
DOWNLOAD_FLAG_ENABLE= download
+DOWNLOAD_FLAG_CABAL= network
+
+FLAGS_DISABLE= testprog
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo
index 0b6a6d8..8a4c501 100644
--- a/textproc/hs-tagsoup/distinfo
+++ b/textproc/hs-tagsoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagsoup-0.13.1.tar.gz) = 1314020e877b8208f42866f4683db40403099595edcd50e556772f31a5e7355c
-SIZE (cabal/tagsoup-0.13.1.tar.gz) = 42756
+SHA256 (cabal/tagsoup-0.13.3.tar.gz) = 32a862118d7836e9beb25fe4b317472fab6e1d41daefa86067231b328cff668d
+SIZE (cabal/tagsoup-0.13.3.tar.gz) = 42279
diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile
index 823a069..0e3d7a5 100644
--- a/textproc/hs-tagstream-conduit/Makefile
+++ b/textproc/hs-tagstream-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= tagstream-conduit
-PORTVERSION= 0.5.5.1
-PORTREVISION= 1
+PORTVERSION= 0.5.5.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Streamlined HTML tag parser
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec blaze-builder case-insensitive conduit>=0.5 \
- conduit-extra data-default>=0.5.0 resourcet text \
+USE_CABAL= attoparsec>=0.10 blaze-builder case-insensitive conduit>=1.2 \
+ conduit-extra>=1.1.0 data-default>=0.5.0 resourcet text \
xml-conduit>=1.1.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-tagstream-conduit/distinfo b/textproc/hs-tagstream-conduit/distinfo
index a0dfbb6..8f1a799 100644
--- a/textproc/hs-tagstream-conduit/distinfo
+++ b/textproc/hs-tagstream-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/tagstream-conduit-0.5.5.1.tar.gz) = c7cad491fb468244bea58329d595a721bffa4b55028ede19b7ee458c3194fd2e
-SIZE (cabal/tagstream-conduit-0.5.5.1.tar.gz) = 9828
+SHA256 (cabal/tagstream-conduit-0.5.5.3.tar.gz) = b296e8f0ba18ae951b5bb3fc2d9d964954666df61ea9363d667f251af17134ab
+SIZE (cabal/tagstream-conduit-0.5.5.3.tar.gz) = 9813
diff --git a/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal b/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
deleted file mode 100644
index 9c8afd3..0000000
--- a/textproc/hs-tagstream-conduit/files/patch-tagstream-conduit.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./tagstream-conduit.cabal.orig 2014-04-01 08:43:35.000000000 +0200
-+++ ./tagstream-conduit.cabal 2014-07-13 00:59:44.000000000 +0200
-@@ -43,8 +43,6 @@
- , resourcet
- , attoparsec
- , blaze-builder
-- , blaze-builder-conduit >= 0.5 && < 1.2
-- , attoparsec-conduit >= 0.5
- , xml-conduit >= 1.1.0.0
- , data-default >= 0.5.0
-
diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile
index 2a47f37..4ff2f90 100644
--- a/textproc/hs-texmath/Makefile
+++ b/textproc/hs-texmath/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= texmath
-PORTVERSION= 0.8.0.1
+PORTVERSION= 0.8.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +10,11 @@ COMMENT= Conversion between formats used to represent mathematics
LICENSE= GPLv2
-USE_CABAL= mtl network pandoc-types>=1.12.3.3 parsec>=3 syb xml
+USE_CABAL= aeson mtl network>=2.6 network-uri>=2.6 \
+ pandoc-types>=1.12.3.3 parsec>=3 syb text xml
-FLAGS_DISABLE= executable network-uri
+FLAGS_ENABLE= network-uri
+FLAGS_DISABLE= executable
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo
index 89cfd93..34e754c 100644
--- a/textproc/hs-texmath/distinfo
+++ b/textproc/hs-texmath/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/texmath-0.8.0.1.tar.gz) = 9625e7106c76199f1228777569a49900bf300e1f4880c69c22986358d5d5c8cc
-SIZE (cabal/texmath-0.8.0.1.tar.gz) = 1595283
+SHA256 (cabal/texmath-0.8.3.tar.gz) = 553d4e8785caf97370aa8d1b626c0e310fe0a1dec15abf2b146dc2ee219e1d34
+SIZE (cabal/texmath-0.8.3.tar.gz) = 1599129
diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile
index c09b017..c2120ab 100644
--- a/textproc/hs-uri/Makefile
+++ b/textproc/hs-uri/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= uri
-PORTVERSION= 0.1.6.2
-PORTREVISION= 1
+PORTVERSION= 0.1.6.3
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-uri/distinfo b/textproc/hs-uri/distinfo
index 8323c3e..1fabe22 100644
--- a/textproc/hs-uri/distinfo
+++ b/textproc/hs-uri/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/uri-0.1.6.2.tar.gz) = 7a4030532dece7990f4940abbed086b6e2ab7b05361a5d11bfa793ca15d25538
-SIZE (cabal/uri-0.1.6.2.tar.gz) = 5296
+SHA256 (cabal/uri-0.1.6.3.tar.gz) = 321165b9897aaab108170ee3b6073ec718150ebf650a3f76042a0e5c89cd15b6
+SIZE (cabal/uri-0.1.6.3.tar.gz) = 5331
diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile
index 2713eac..d6c975e 100644
--- a/textproc/hs-xml-conduit/Makefile
+++ b/textproc/hs-xml-conduit/Makefile
@@ -1,18 +1,17 @@
# $FreeBSD$
PORTNAME= xml-conduit
-PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTVERSION= 1.3.1
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Pure-Haskell utilities for dealing with XML with the conduit package
-LICENSE= BSD3CLAUSE
+LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2 blaze-html>=0.5 \
- blaze-markup>=0.5 conduit>=1.0 conduit-extra data-default \
- monad-control>=0.3 resourcet>=0.3 system-filepath>=0.4 \
+ blaze-markup>=0.5 conduit>=1.0 conduit-extra>=1.1 \
+ data-default monad-control>=0.3 resourcet>=0.3 \
text>=0.7 xml-types>=0.3.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo
index b6e3aa2..c8f65e3 100644
--- a/textproc/hs-xml-conduit/distinfo
+++ b/textproc/hs-xml-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-conduit-1.2.1.tar.gz) = 20f00e72922eecbd6c0e1fa5e6d1ca74a5a2f971372e5f70137d35869d6800ae
-SIZE (cabal/xml-conduit-1.2.1.tar.gz) = 30847
+SHA256 (cabal/xml-conduit-1.3.1.tar.gz) = 19e65bb1753f99c8a9f2011f2088639db3b8c06f72d29fea1464f623879b8f24
+SIZE (cabal/xml-conduit-1.3.1.tar.gz) = 33304
diff --git a/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal b/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
deleted file mode 100644
index 1d5bac0..0000000
--- a/textproc/hs-xml-conduit/files/patch-xml-conduit.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./xml-conduit.cabal.orig 2014-05-23 05:44:22.000000000 +0200
-+++ ./xml-conduit.cabal 2014-07-12 23:46:45.000000000 +0200
-@@ -31,8 +31,6 @@
- , conduit >= 1.0 && < 1.2
- , conduit-extra
- , resourcet >= 0.3 && < 1.2
-- , attoparsec-conduit >= 1.0
-- , blaze-builder-conduit >= 1.0
- , bytestring >= 0.9
- , text >= 0.7
- , containers >= 0.2
diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile
index ecbd7ec..7421258 100644
--- a/textproc/hs-xml-hamlet/Makefile
+++ b/textproc/hs-xml-hamlet/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-hamlet
-PORTVERSION= 0.4.0.9
-PORTREVISION= 1
+PORTVERSION= 0.4.0.11
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo
index ccff49a..9d6e038 100644
--- a/textproc/hs-xml-hamlet/distinfo
+++ b/textproc/hs-xml-hamlet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-hamlet-0.4.0.9.tar.gz) = 02498a736aac8bba3648349b63ba139bdd54c1830f5a1df5186a14273794a46e
-SIZE (cabal/xml-hamlet-0.4.0.9.tar.gz) = 6068
+SHA256 (cabal/xml-hamlet-0.4.0.11.tar.gz) = 3d598ad387e310e76a07f213afe35db06662611840d1bce3bcdf202668bc1e89
+SIZE (cabal/xml-hamlet-0.4.0.11.tar.gz) = 6080
diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile
index 3e1a861..b05032d 100644
--- a/textproc/hs-xml-types/Makefile
+++ b/textproc/hs-xml-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xml-types
-PORTVERSION= 0.3.4
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml-types/distinfo b/textproc/hs-xml-types/distinfo
index 6ccfcf1..1a24c3c 100644
--- a/textproc/hs-xml-types/distinfo
+++ b/textproc/hs-xml-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-types-0.3.4.tar.gz) = 1ee502b032e9a97c43250f476af69f65147667e3a1b4dd3bd404f64eb28c0999
-SIZE (cabal/xml-types-0.3.4.tar.gz) = 3857
+SHA256 (cabal/xml-types-0.3.6.tar.gz) = 9937d440072552c03c6d8ad79f61e61467dc28dcd5adeaad81038b9b94eef8c9
+SIZE (cabal/xml-types-0.3.6.tar.gz) = 4020
diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile
index cdcd289..b47de97 100644
--- a/textproc/hs-xml/Makefile
+++ b/textproc/hs-xml/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xml
-PORTVERSION= 1.3.13
-PORTREVISION= 6
+PORTVERSION= 1.3.14
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xml/distinfo b/textproc/hs-xml/distinfo
index ecabcbb..c1622a7 100644
--- a/textproc/hs-xml/distinfo
+++ b/textproc/hs-xml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xml-1.3.13.tar.gz) = c33607cef8a48d878b0e617e115135fc6f025fe43dcb65c2c7afb8285415b813
-SIZE (cabal/xml-1.3.13.tar.gz) = 12082
+SHA256 (cabal/xml-1.3.14.tar.gz) = 32d1a1a9f21a59176d84697f96ae3a13a0198420e3e4f1c48abbab7d2425013d
+SIZE (cabal/xml-1.3.14.tar.gz) = 12048
diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile
index 1093433..72bf23d 100644
--- a/textproc/hs-xmlhtml/Makefile
+++ b/textproc/hs-xmlhtml/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xmlhtml
-PORTVERSION= 0.2.3.2
-PORTREVISION= 1
+PORTVERSION= 0.2.3.4
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo
index ccd82da..51880d5 100644
--- a/textproc/hs-xmlhtml/distinfo
+++ b/textproc/hs-xmlhtml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmlhtml-0.2.3.2.tar.gz) = 2300b2fcd873644f754b6ec7217b3d1cd8a4989672bd152c88313907414b5cb6
-SIZE (cabal/xmlhtml-0.2.3.2.tar.gz) = 124711
+SHA256 (cabal/xmlhtml-0.2.3.4.tar.gz) = d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533
+SIZE (cabal/xmlhtml-0.2.3.4.tar.gz) = 124760
diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
new file mode 100644
index 0000000..af6d225
--- /dev/null
+++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal
@@ -0,0 +1,15 @@
+--- xmlhtml.cabal.orig 2014-12-24 20:41:19 UTC
++++ xmlhtml.cabal
+@@ -820,9 +820,9 @@ Library
+ Text.XmlHtml.HTML.Render
+
+ Build-depends: base >= 4 && < 5,
+- blaze-builder >= 0.2 && < 0.4,
+- blaze-html >= 0.5 && < 0.8,
+- blaze-markup >= 0.5 && < 0.7,
++ blaze-builder >= 0.2 && < 0.5,
++ blaze-html >= 0.5 && < 0.9,
++ blaze-markup >= 0.5 && < 0.8,
+ bytestring >= 0.9 && < 0.11,
+ containers >= 0.3 && < 0.6,
+ parsec >= 3.1.2 && < 3.2,
diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile
index 7bc6de3..e2d386d 100644
--- a/textproc/hs-yaml/Makefile
+++ b/textproc/hs-yaml/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yaml
-PORTVERSION= 0.8.8.4
-PORTREVISION= 1
+PORTVERSION= 0.8.13
CATEGORIES= textproc haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +9,10 @@ COMMENT= Support for parsing and rendering YAML documents
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson>=0.5 attoparsec conduit>=1.0.11 resourcet>=0.3 \
- scientific text unordered-containers vector
+USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \
+ resourcet>=0.3 scientific text unordered-containers vector
-EXECUTABLE= yaml2json json2yaml
+EXECUTABLE= json2yaml yaml2json
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo
index 7b5bbe3..2cb796d 100644
--- a/textproc/hs-yaml/distinfo
+++ b/textproc/hs-yaml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yaml-0.8.8.4.tar.gz) = eb3066ab9eb3faed4f208a254301f109915443a88c5f634b06736366ccee05d6
-SIZE (cabal/yaml-0.8.8.4.tar.gz) = 71446
+SHA256 (cabal/yaml-0.8.13.tar.gz) = f366bdd6ddbc5f94f3f783b502178dcd27afc257bdf5e8d67fcf9246aeed0f7a
+SIZE (cabal/yaml-0.8.13.tar.gz) = 74369
diff --git a/www/Makefile b/www/Makefile
index ba98338..0f35419 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -292,10 +292,11 @@
SUBDIR += hs-http-reverse-proxy
SUBDIR += hs-http-server
SUBDIR += hs-http-types
+ SUBDIR += hs-http2
+ SUBDIR += hs-multipart
SUBDIR += hs-oeis
SUBDIR += hs-path-pieces
SUBDIR += hs-recaptcha
- SUBDIR += hs-scgi
SUBDIR += hs-shakespeare
SUBDIR += hs-snap
SUBDIR += hs-snap-core
@@ -316,8 +317,6 @@
SUBDIR += hs-yesod-core
SUBDIR += hs-yesod-form
SUBDIR += hs-yesod-persistent
- SUBDIR += hs-yesod-platform
- SUBDIR += hs-yesod-routes
SUBDIR += hs-yesod-static
SUBDIR += hs-yesod-test
SUBDIR += htdigest
diff --git a/www/hs-DAV/Makefile b/www/hs-DAV/Makefile
index bc450ae..868931e 100644
--- a/www/hs-DAV/Makefile
+++ b/www/hs-DAV/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= DAV
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,16 @@ COMMENT= RFC 4918 WebDAV support
LICENSE= GPLv3
-USE_CABAL= case-insensitive>=0.4 data-default either>=4.1 errors \
+USE_CABAL= case-insensitive>=0.4 data-default either>=4.1 \
exceptions http-client>=0.2 http-client-tls>=0.2 \
- http-types>=0.7 lens>=3.0 mtl>=2.1 network>=2.3 \
- optparse-applicative>=0.5.0 transformers-base utf8-string \
- xml-conduit>=1.0 xml-hamlet>=0.4
+ http-types>=0.7 lens>=3.0 mtl>=2.1 network>=2.6 \
+ network-uri>=2.6 optparse-applicative>=0.10.0 \
+ transformers-base utf8-string xml-conduit>=1.0 \
+ xml-hamlet>=0.4
EXECUTABLE= hdav
+FLAGS_ENABLE= network-uri
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo
index d20c964..3589c715 100644
--- a/www/hs-DAV/distinfo
+++ b/www/hs-DAV/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/DAV-1.0.1.tar.gz) = 938cb0beeecc1eaf8a844ba7191e749b7664fdfb0415d5ccae71fa56223c1f49
-SIZE (cabal/DAV-1.0.1.tar.gz) = 20133
+SHA256 (cabal/DAV-1.0.7.tar.gz) = a8a9000b544e872296c8597edd9df10d10ceaa097f981d98bd315c1dfb637c2e
+SIZE (cabal/DAV-1.0.7.tar.gz) = 19768
diff --git a/www/hs-HTTP/Makefile b/www/hs-HTTP/Makefile
index c3c9344..f605ada 100644
--- a/www/hs-HTTP/Makefile
+++ b/www/hs-HTTP/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= HTTP
-PORTVERSION= 4000.2.10
-PORTREVISION= 1
+PORTVERSION= 4000.2.20
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,11 @@ COMMENT= Library for client-side HTTP
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 network parsec
+USE_CABAL= mtl>=2.0 network>=2.6 network-uri>=2.6 old-time>=1.0.0.0 \
+ parsec>=2.0
+
+FLAGS_ENABLE= network-uri
+FLAGS_DISABLE= mtl1 warn-as-error network23 conduit10 warp-tests
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-HTTP/distinfo b/www/hs-HTTP/distinfo
index f208ba4..888d8dc 100644
--- a/www/hs-HTTP/distinfo
+++ b/www/hs-HTTP/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/HTTP-4000.2.10.tar.gz) = efde6d9f2e8cd7b72068579f0a75449703c0fa7aee76dfc0f3af175295a127d1
-SIZE (cabal/HTTP-4000.2.10.tar.gz) = 67912
+SHA256 (cabal/HTTP-4000.2.20.tar.gz) = 4407cc863699720d179b36257baf21b5f1df4be8c30545dcec4d685a726fd85b
+SIZE (cabal/HTTP-4000.2.20.tar.gz) = 71475
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 19c8044..1176f54 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= activehs
PORTVERSION= 0.3.1
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs
index 2cab802..b0d545c 100644
--- a/www/hs-activehs/files/patch-Converter.hs
+++ b/www/hs-activehs/files/patch-Converter.hs
@@ -1,6 +1,6 @@
---- ./Converter.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Converter.hs 2013-12-27 18:34:37.000000000 +0100
-@@ -28,7 +28,7 @@
+--- Converter.hs.orig 2013-02-12 19:23:45 UTC
++++ Converter.hs
+@@ -28,7 +28,7 @@ import System.Directory (getTemporaryDir
import Control.Monad
import Data.List
@@ -9,7 +9,7 @@
----------------------------------
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ preprocessForSlides x = case span (not .
------------------------------------
rawHtml :: String -> Block
@@ -18,7 +18,13 @@
showBlockSimple :: Language -> String -> String -> Int -> String -> [Block]
-@@ -249,8 +249,8 @@
+@@ -244,13 +244,13 @@ mkImport m d
+ , HSyn.importSrc = False
+ , HSyn.importPkg = Nothing
+ , HSyn.importAs = Nothing
+- , HSyn.importSpecs = Just (True, map (HSyn.IVar . mkName) d)
++ , HSyn.importSpecs = Just (True, map (HSyn.IVar HSyn.NoNamespace . mkName) d)
+ }
mkName :: String -> HSyn.Name
mkName n@(c:_)
diff --git a/www/hs-activehs/files/patch-Main.hs b/www/hs-activehs/files/patch-Main.hs
new file mode 100644
index 0000000..dd63e11
--- /dev/null
+++ b/www/hs-activehs/files/patch-Main.hs
@@ -0,0 +1,12 @@
+--- Main.hs.orig 2013-02-12 19:23:46 UTC
++++ Main.hs
+@@ -28,8 +28,7 @@ import System.Directory (doesFileExist)
+ import Control.Concurrent (threadDelay)
+ import Control.Monad (when)
+ import Control.Applicative ((<|>))
+-import System.Locale (defaultTimeLocale)
+-import Data.Time (getCurrentTime, formatTime, diffUTCTime)
++import Data.Time (getCurrentTime, formatTime, diffUTCTime, defaultTimeLocale)
+ import Data.Maybe (listToMaybe)
+ --import Prelude hiding (catch)
+
diff --git a/www/hs-activehs/files/patch-Parse.hs b/www/hs-activehs/files/patch-Parse.hs
new file mode 100644
index 0000000..1ebb809
--- /dev/null
+++ b/www/hs-activehs/files/patch-Parse.hs
@@ -0,0 +1,27 @@
+--- Parse.hs.orig 2013-02-12 19:23:45 UTC
++++ Parse.hs
+@@ -72,12 +72,13 @@ mainParse :: ParseMode -> FilePath -> IO
+ mainParse mode s = do
+ c <- readFile s
+ case readMarkdown pState . unlines . concatMap preprocess . lines $ c of
+- Pandoc meta (CodeBlock ("",["sourceCode","literate","haskell"],[]) h: blocks) -> do
++ Right (Pandoc meta (CodeBlock ("",["sourceCode","literate","haskell"],[]) h: blocks)) -> do
+ header <- parseModule mode $ h
+ fmap (Doc meta header) $ collectTests mode $ map ({-highlight . -}interpreter . Text) blocks
+- Pandoc meta blocks -> do
++ Right (Pandoc meta blocks) -> do
+ header <- parseModule mode $ "module Unknown where"
+ fmap (Doc meta header) $ collectTests mode $ map ({-highlight . -}interpreter . Text) blocks
++ Left err -> fail $ "readMarkdown: " ++ show err
+ where
+ parseModule :: ParseMode -> String -> IO Module
+ parseModule HaskellMode m = case HPar.parseModuleWithMode HPar.defaultParseMode m of
+@@ -137,7 +138,7 @@ processHaskellLines isExercise l_ = retu
+
+ getFName (HPar.ParseOk x) = case x of
+ HSyn.TypeSig _ a _ -> map printName a
+- HSyn.PatBind _ (HSyn.PVar a) _ _ _ -> [printName a]
++ HSyn.PatBind _ (HSyn.PVar a) _ _ -> [printName a]
+ HSyn.FunBind (HSyn.Match _ a _ _ _ _ :_) -> [printName a]
+ HSyn.TypeDecl _ a _ _ -> [printName a]
+ HSyn.DataDecl _ _ _ a _ x _ -> printName a: [printName n | HSyn.QualConDecl _ _ _ y<-x, n <- getN y]
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 170b056..01f9fac 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,44 +1,58 @@
---- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./activehs.cabal 2014-07-14 02:37:00.000000000 +0200
-@@ -62,29 +62,31 @@
+--- activehs.cabal.orig 2013-02-12 19:23:46 UTC
++++ activehs.cabal
+@@ -56,37 +56,39 @@ Executable activehs
+ Special
+
+ Build-Depends:
+- highlighting-kate >= 0.5 && < 0.6,
++ highlighting-kate >= 0.5 && < 0.7,
+ hoogle >= 4.2.11 && < 4.3,
+ dia-base >= 0.1 && < 0.2,
dia-functions >= 0.2.1.1 && < 0.3,
activehs-base >= 0.2 && < 0.4,
data-pprint >= 0.2 && < 0.3,
- base >= 4.0 && < 4.7,
- QuickCheck >= 2.4 && < 2.6,
- array >= 0.3 && < 0.5,
-+ base >= 4.0 && < 4.8,
-+ QuickCheck >= 2.4 && < 2.7,
++ base >= 4.0 && < 4.9,
++ QuickCheck >= 2.4 && < 2.9,
+ array >= 0.3 && < 0.6,
directory >= 1.1 && < 1.3,
containers >= 0.4 && < 0.6,
- filepath >= 1.2 && < 1.4,
+- filepath >= 1.2 && < 1.4,
- text >= 0.11 && < 0.12,
-+ text >= 1.1 && < 1.2,
++ filepath >= 1.2 && < 1.5,
++ text >= 1.1 && < 1.3,
snap-core >= 0.6 && < 0.10,
snap-server >= 0.6 && < 0.10,
- syb >= 0.2 && < 0.4,
- haskell-src-exts >= 1.12 && < 1.14,
-+ syb >= 0.2 && < 0.5,
-+ haskell-src-exts >= 1.15 && < 1.16,
++ syb >= 0.2 && < 0.6,
++ haskell-src-exts >= 1.16 && < 1.17,
bytestring >= 0.9 && < 0.11,
- utf8-string >= 0.3 && < 0.4,
+- utf8-string >= 0.3 && < 0.4,
++ utf8-string >= 0.3 && < 1.1,
xhtml >= 3000.2 && < 3000.3,
- blaze-html >= 0.4 && < 0.6,
-+ blaze-html >= 0.4 && < 0.8,
-+ blaze-markup >= 0.6 && < 0.7,
++ blaze-html >= 0.4 && < 0.9,
++ blaze-markup >= 0.6 && < 0.8,
pureMD5 >= 2.1 && < 2.2,
- deepseq >= 1.1 && < 1.4,
-+ exceptions >= 0.6 && < 0.7,
+- deepseq >= 1.1 && < 1.4,
++ deepseq >= 1.1 && < 1.5,
++ exceptions >= 0.6 && < 0.9,
split >= 0.1 && < 0.3,
- pandoc >= 1.10 && < 1.11,
-+ pandoc >= 1.10 && < 1.14,
- time >= 1.2 && < 1.5,
+- time >= 1.2 && < 1.5,
++ pandoc >= 1.10 && < 1.16,
++ time >= 1.2 && < 1.6,
old-time >= 1.0 && < 1.2,
- process >= 1.0 && < 1.2,
- hint >= 0.3.3.2 && < 0.4,
+ process >= 1.0 && < 1.3,
+ hint >= 0.4 && < 0.5,
simple-reflect >= 0.2 && < 0.4,
- mtl >= 2.0 && < 2.2,
+- mtl >= 2.0 && < 2.2,
++ mtl >= 2.0 && < 2.3,
old-locale >= 1.0 && < 1.1,
+ cmdargs >= 0.7 && < 0.11
+
diff --git a/www/hs-authenticate/Makefile b/www/hs-authenticate/Makefile
index 74ce2ba..60c8651 100644
--- a/www/hs-authenticate/Makefile
+++ b/www/hs-authenticate/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= authenticate
-PORTVERSION= 1.3.2.9
-PORTREVISION= 1
+PORTVERSION= 1.3.2.11
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,8 +11,11 @@ LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.5 attoparsec blaze-builder case-insensitive>=0.2 \
conduit>=0.5 http-conduit>=1.5 http-types>=0.6 monad-control \
- network resourcet tagstream-conduit>=0.5.5 text \
- unordered-containers xml-conduit>=1.0
+ network>=2.6 network-uri>=2.6 resourcet \
+ tagstream-conduit>=0.5.5 text unordered-containers \
+ xml-conduit>=1.0
+
+FLAGS_ENABLE= network-uri
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-authenticate/distinfo b/www/hs-authenticate/distinfo
index b52343f..537b9cd 100644
--- a/www/hs-authenticate/distinfo
+++ b/www/hs-authenticate/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/authenticate-1.3.2.9.tar.gz) = b93d342b23ce9bea970b7251ae0df0026759986c05c5270f36a60ca8453d6f27
-SIZE (cabal/authenticate-1.3.2.9.tar.gz) = 8517
+SHA256 (cabal/authenticate-1.3.2.11.tar.gz) = 049388bf2ebf9017f3854462e1e2af57366959528e815017651e8da112577ff6
+SIZE (cabal/authenticate-1.3.2.11.tar.gz) = 8728
diff --git a/www/hs-cgi/Makefile b/www/hs-cgi/Makefile
index 9ab4af0..7558b3d 100644
--- a/www/hs-cgi/Makefile
+++ b/www/hs-cgi/Makefile
@@ -2,17 +2,20 @@
# $FreeBSD$
PORTNAME= cgi
-PORTVERSION= 3001.1.8.5
-PORTREVISION= 1
+PORTVERSION= 3001.2.2.2
PORTEPOCH= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell library for writing CGI programs
+COMMENT= Library for writing CGI programs
LICENSE= BSD3CLAUSE
-USE_CABAL= MonadCatchIO-mtl mtl>=1.0 network>=2.0 parsec>=2.0
+USE_CABAL= exceptions mtl>=2.2.1 multipart>=0.1.2 network>=2.6 \
+ network-uri>=2.6 old-locale old-time parsec>=2.0
+
+FLAGS_ENABLE= network-uri
+FLAGS_DISABLE= old-mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cgi/distinfo b/www/hs-cgi/distinfo
index dfdc79e..64262ab 100644
--- a/www/hs-cgi/distinfo
+++ b/www/hs-cgi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cgi-3001.1.8.5.tar.gz) = 46cfb262f95348e88629fe30a9a8319aec510601be3a550cfb02fb1267b2db39
-SIZE (cabal/cgi-3001.1.8.5.tar.gz) = 21423
+SHA256 (cabal/cgi-3001.2.2.2.tar.gz) = 23850f29cd80a5ac671c5663b8b3b3aae45e269c8db5a8216082c487d4ed3760
+SIZE (cabal/cgi-3001.2.2.2.tar.gz) = 17270
diff --git a/www/hs-cgi/files/patch-Network__CGI__Monad.hs b/www/hs-cgi/files/patch-Network__CGI__Monad.hs
deleted file mode 100644
index 8956c1e..0000000
--- a/www/hs-cgi/files/patch-Network__CGI__Monad.hs
+++ /dev/null
@@ -1,30 +0,0 @@
---- ./Network/CGI/Monad.hs.orig 2014-02-04 09:00:24.000000000 +0100
-+++ ./Network/CGI/Monad.hs 2014-07-13 18:20:00.000000000 +0200
-@@ -1,4 +1,4 @@
--{-# OPTIONS_GHC -fglasgow-exts #-}
-+{-# LANGUAGE DeriveDataTypeable #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Network.CGI.Monad
-@@ -40,8 +40,7 @@
- import Control.Monad.Reader (ReaderT(..), asks)
- import Control.Monad.Writer (WriterT(..), tell)
- import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift)
--import Data.Typeable (Typeable(..), Typeable1(..),
-- mkTyConApp, mkTyCon)
-+import Data.Typeable
-
- import Network.CGI.Protocol
-
-@@ -55,10 +54,7 @@
-
- -- | The CGIT monad transformer.
- newtype CGIT m a = CGIT { unCGIT :: ReaderT CGIRequest (WriterT Headers m) a }
--
--instance (Typeable1 m, Typeable a) => Typeable (CGIT m a) where
-- typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Monad.CGIT")
-- [typeOf1 (undefined :: m a), typeOf (undefined :: a)]
-+ deriving Typeable
-
- instance (Functor m, Monad m) => Functor (CGIT m) where
- fmap f c = CGIT (fmap f (unCGIT c))
diff --git a/www/hs-cgi/files/patch-Network__CGI__Protocol.hs b/www/hs-cgi/files/patch-Network__CGI__Protocol.hs
deleted file mode 100644
index ab1e0cb..0000000
--- a/www/hs-cgi/files/patch-Network__CGI__Protocol.hs
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./Network/CGI/Protocol.hs.orig 2014-02-04 09:00:24.000000000 +0100
-+++ ./Network/CGI/Protocol.hs 2014-07-13 18:20:00.000000000 +0200
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE DeriveDataTypeable #-}
- -----------------------------------------------------------------------------
- -- |
- -- Module : Network.CGI.Protocol
-@@ -44,7 +45,7 @@
- import qualified Data.ByteString.Lazy.Char8 as BS
- import Data.ByteString.Lazy.Char8 (ByteString)
-
--import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
-+import Data.Typeable
-
- import Network.CGI.Header
- import Network.CGI.Multipart
-@@ -72,9 +73,6 @@
- }
- deriving (Show)
-
--instance Typeable CGIResult where
-- typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Protocol.CGIResult") []
--
- -- | The value of an input parameter, and some metadata.
- data Input = Input {
- inputValue :: ByteString,
-@@ -90,7 +88,7 @@
- -- | The result of a CGI program.
- data CGIResult = CGIOutput ByteString
- | CGINothing
-- deriving (Show, Read, Eq, Ord)
-+ deriving (Show, Read, Eq, Ord, Typeable)
-
- --
- -- * Running CGI actions
diff --git a/www/hs-cgi/pkg-descr b/www/hs-cgi/pkg-descr
index 5176812..4d364c7 100644
--- a/www/hs-cgi/pkg-descr
+++ b/www/hs-cgi/pkg-descr
@@ -1,3 +1,3 @@
This is a Haskell library for writing CGI programs.
-WWW: http://andersk.mit.edu/haskell/cgi/
+WWW: https://github.com/cheecheeo/haskell-cgi
diff --git a/www/hs-cookie/Makefile b/www/hs-cookie/Makefile
index 48cb114..727f86d 100644
--- a/www/hs-cookie/Makefile
+++ b/www/hs-cookie/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= cookie
-PORTVERSION= 0.4.1.2
-PORTREVISION= 1
+PORTVERSION= 0.4.1.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= HTTP cookie parsing and rendering
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2.1 data-default text>=0.7
+USE_CABAL= blaze-builder>=0.2.1 data-default-class old-locale>=1 text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-cookie/distinfo b/www/hs-cookie/distinfo
index 06b7889..87f08e7 100644
--- a/www/hs-cookie/distinfo
+++ b/www/hs-cookie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/cookie-0.4.1.2.tar.gz) = 716006fb3934f10479252c253e729fc0cd3096cf882c68ad1aea57524d51afb7
-SIZE (cabal/cookie-0.4.1.2.tar.gz) = 4577
+SHA256 (cabal/cookie-0.4.1.6.tar.gz) = 3a2da4db7478ae45f848ebd5fcd40c23c84ecd00be79dec857e526619da9de2c
+SIZE (cabal/cookie-0.4.1.6.tar.gz) = 5319
diff --git a/www/hs-css-text/Makefile b/www/hs-css-text/Makefile
index 7d0fd58..af0dffa 100644
--- a/www/hs-css-text/Makefile
+++ b/www/hs-css-text/Makefile
@@ -2,7 +2,7 @@
PORTNAME= css-text
PORTVERSION= 0.1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-fastcgi/Makefile b/www/hs-fastcgi/Makefile
index 1311487..117feee 100644
--- a/www/hs-fastcgi/Makefile
+++ b/www/hs-fastcgi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= fastcgi
PORTVERSION= 3001.0.2.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index 700fcb4..59c00e0 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gitit
-PORTVERSION= 0.10.6.1
-PORTREVISION= 1
+PORTVERSION= 0.11.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,12 +12,13 @@ LICENSE= GPLv2
USE_CABAL= aeson>=0.7 base64-bytestring>=0.1 blaze-html>=0.4 \
ConfigFile>=1 feed>=0.3.6 filestore>=0.6 \
happstack-server>=7.0 highlighting-kate>=0.5.0.1 \
- hoauth2>=0.4.1 hslogger>=1 HStringTemplate>=0.6 HTTP>=4000.0 \
+ hoauth2>=0.4.2 hslogger>=1 HStringTemplate>=0.6 HTTP>=4000.0 \
http-client-tls>=0.2.2 http-conduit>=2.1.4 json>=0.4 mtl \
- network>=2 pandoc>=1.12.4 pandoc-types>=1.12.3 parsec random \
- recaptcha>=0.1 safe SHA>1 split syb tagsoup>=0.13 text \
- uri>=0.1 url>=2.1 utf8-string>=0.3 uuid>=1.3 xml>=1.3.5 \
- xss-sanitize>=0.3 zlib>=0.5
+ network>=2.6 network-uri>=2.6 pandoc>=1.12.4 \
+ pandoc-types>=1.12.3 parsec random recaptcha>=0.1 safe SHA>1 \
+ split syb tagsoup>=0.13 text uri>=0.1 url>=2.1 \
+ utf8-string>=0.3 uuid>=1.3 xml>=1.3.5 xss-sanitize>=0.3 \
+ zlib>=0.5
EXECUTABLE= expireGititCache gitit
@@ -29,7 +29,7 @@ PLUGINS_DESC= Enable support for plugins
PLUGINS_FLAG_ENABLE= plugins
PLUGINS_FLAG_CABAL= ghc-paths
-FLAGS_DISABLE= network-uri
+FLAGS_ENABLE= network-uri
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-gitit/distinfo b/www/hs-gitit/distinfo
index 8fcfa88..f352d87 100644
--- a/www/hs-gitit/distinfo
+++ b/www/hs-gitit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gitit-0.10.6.1.tar.gz) = c0ceb611e3e61f37af9e1fd1330a493ffbd07c59455cba988f35f3e881cadfd0
-SIZE (cabal/gitit-0.10.6.1.tar.gz) = 265716
+SHA256 (cabal/gitit-0.11.1.tar.gz) = 29bbb782e2066bf831ad1aff471208e928310fc9ab6bfb32a775cd7521f19d1b
+SIZE (cabal/gitit-0.11.1.tar.gz) = 275587
diff --git a/www/hs-hS3/Makefile b/www/hs-hS3/Makefile
index f5d95a6..ca9bb94 100644
--- a/www/hs-hS3/Makefile
+++ b/www/hs-hS3/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hS3
-PORTVERSION= 0.5.8
-PORTREVISION= 1
+PORTVERSION= 0.5.9
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,9 +10,12 @@ COMMENT= Interface to Amazon's Simple Storage Service (S3)
LICENSE= BSD3CLAUSE
USE_CABAL= Crypto>=4.1.0 dataenc HTTP>=4000.0.0 hxt>=9.0.0 \
- MissingH>=0.18.6 network random regex-compat utf8-string
+ MissingH>=0.18.6 network>=2.6 network-uri>=2.6 random \
+ regex-compat utf8-string
EXECUTABLE= hs3
+FLAGS_ENABLE= network-uri
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-hS3/distinfo b/www/hs-hS3/distinfo
index ec932c8..1a2bf96 100644
--- a/www/hs-hS3/distinfo
+++ b/www/hs-hS3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hS3-0.5.8.tar.gz) = 759d37a56f0f3b2f1177c03da75410f8ee2b6f41c3f648cbc99062f269cdb9f2
-SIZE (cabal/hS3-0.5.8.tar.gz) = 19878
+SHA256 (cabal/hS3-0.5.9.tar.gz) = 7ee0ba24b01cdefc02f683aef16d33ac146928ae75a00e566673be12960cc759
+SIZE (cabal/hS3-0.5.9.tar.gz) = 19981
diff --git a/www/hs-happstack-server/Makefile b/www/hs-happstack-server/Makefile
index a4c58c2..c15ccd0 100644
--- a/www/hs-happstack-server/Makefile
+++ b/www/hs-happstack-server/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= happstack-server
-PORTVERSION= 7.3.7
-PORTREVISION= 1
+PORTVERSION= 7.4.4
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +9,13 @@ COMMENT= Web-related tools and services
LICENSE= BSD3CLAUSE
-USE_CABAL= base64-bytestring blaze-html>=0.5 extensible-exceptions \
- hslogger>=1.0.2 html monad-control>=0.3 mtl>=2 network>=2.2.3 \
- parsec sendfile>=0.7.1 syb system-filepath>=0.3.1 \
- text>=0.10 threads>=0.5 time-compat transformers-base>=0.4 \
- utf8-string>=0.3.4 zlib
+USE_CABAL= base64-bytestring>=1.0 blaze-html>=0.5 exceptions \
+ extensible-exceptions hslogger>=1.0.2 html monad-control>=0.3 \
+ mtl>=2 network>=2.6 network-uri>=2.6 parsec sendfile>=0.7.1 \
+ syb system-filepath>=0.3.1 text>=0.10 threads>=0.5 \
+ time-compat transformers-base>=0.4 utf8-string>=0.3.4 zlib
+
+FLAGS_ENABLE= network-uri template_haskell
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-happstack-server/distinfo b/www/hs-happstack-server/distinfo
index e9802be..62978d1 100644
--- a/www/hs-happstack-server/distinfo
+++ b/www/hs-happstack-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/happstack-server-7.3.7.tar.gz) = 013ee7be9884dd54c825a6b4a72dd40fbd5cb5e41384cdc7568dd1692f1c1cde
-SIZE (cabal/happstack-server-7.3.7.tar.gz) = 79407
+SHA256 (cabal/happstack-server-7.4.4.tar.gz) = 4e5a650554e6c04f2db7ffbed4e0c1af9163d14848bb80464d3d2db2b2d91ef2
+SIZE (cabal/happstack-server-7.4.4.tar.gz) = 79920
diff --git a/www/hs-happstack/Makefile b/www/hs-happstack/Makefile
index 84841c7..a59f947 100644
--- a/www/hs-happstack/Makefile
+++ b/www/hs-happstack/Makefile
@@ -2,7 +2,7 @@
PORTNAME= happstack
PORTVERSION= 7.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-happstack/files/patch-happstack.cabal b/www/hs-happstack/files/patch-happstack.cabal
new file mode 100644
index 0000000..6a12463
--- /dev/null
+++ b/www/hs-happstack/files/patch-happstack.cabal
@@ -0,0 +1,11 @@
+--- happstack.cabal.orig 2014-06-26 00:31:28 UTC
++++ happstack.cabal
+@@ -29,7 +29,7 @@ Library
+ other-modules: Paths_happstack
+
+ build-depends: base >= 3 && <5,
+- happstack-server >= 7.0 && < 7.4
++ happstack-server >= 7.0 && < 7.5
+
+ if flag(tests)
+ hs-source-dirs: tests
diff --git a/www/hs-heist/Makefile b/www/hs-heist/Makefile
index 0d99770..1de77f2 100644
--- a/www/hs-heist/Makefile
+++ b/www/hs-heist/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= heist
-PORTVERSION= 0.13.1.2
-PORTREVISION= 1
+PORTVERSION= 0.14.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,11 @@ COMMENT= Haskell template system supporting both HTML5 and XML
LICENSE= BSD3CLAUSE
USE_CABAL= aeson>=0.6 attoparsec>=0.10 blaze-builder>=0.2 \
- blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 errors>=1.4 \
- hashable>=1.1 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \
- random>=1.0.1.0 text>=0.10 unordered-containers>=0.1.4 \
- vector>=0.9 xmlhtml>=0.2.3
+ blaze-html>=0.4 directory-tree>=0.10 dlist>=0.5 either>=3.1 \
+ hashable>=1.1 map-syntax>=0.2 \
+ MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1.0.1.0 \
+ text>=0.10 unordered-containers>=0.1.4 vector>=0.9 \
+ xmlhtml>=0.2.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-heist/distinfo b/www/hs-heist/distinfo
index 4472359..6832208 100644
--- a/www/hs-heist/distinfo
+++ b/www/hs-heist/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/heist-0.13.1.2.tar.gz) = 45a7d2180f6fc257ca51aab96dfb6e343e12ba5cc15cc26b293b0e0b80a30031
-SIZE (cabal/heist-0.13.1.2.tar.gz) = 63167
+SHA256 (cabal/heist-0.14.1.1.tar.gz) = 2934ece5e58b4a180a6975c0404a2a48e46b85693822aa6ab18f700a44438e43
+SIZE (cabal/heist-0.14.1.1.tar.gz) = 65797
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 32fa11b..dcf2585 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= hjsmin
-PORTVERSION= 0.1.4.7
-PORTREVISION= 1
+PORTVERSION= 0.1.5.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Haskell implementation of a javascript minifier
LICENSE= BSD3CLAUSE
-USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.1 \
+USE_CABAL= blaze-builder>=0.2 language-javascript>=0.5.14 \
optparse-applicative>=0.7 text>=0.8
EXECUTABLE= hjsmin
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index db2b1ba..750efc9 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/hjsmin-0.1.4.7.tar.gz) = 0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf
-SIZE (cabal/hjsmin-0.1.4.7.tar.gz) = 110718
+SHA256 (cabal/hjsmin-0.1.5.0.tar.gz) = f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7
+SIZE (cabal/hjsmin-0.1.5.0.tar.gz) = 117050
diff --git a/www/hs-hjsmin/pkg-descr b/www/hs-hjsmin/pkg-descr
index a71a0e0..37e4e3b 100644
--- a/www/hs-hjsmin/pkg-descr
+++ b/www/hs-hjsmin/pkg-descr
@@ -1,4 +1,4 @@
Reduces size of javascript files by stripping out extraneous whitespace
and other syntactic elements, without changing the semantics.
-WWW: http://github.com/alanz/hjsmin
+WWW: http://github.com/erikd/hjsmin
diff --git a/www/hs-http-client-tls/Makefile b/www/hs-http-client-tls/Makefile
index a60a863..77457f2 100644
--- a/www/hs-http-client-tls/Makefile
+++ b/www/hs-http-client-tls/Makefile
@@ -2,7 +2,7 @@
PORTNAME= http-client-tls
PORTVERSION= 0.2.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-client/Makefile b/www/hs-http-client/Makefile
index aae3287..6c9df9b 100644
--- a/www/hs-http-client/Makefile
+++ b/www/hs-http-client/Makefile
@@ -1,19 +1,20 @@
# $FreeBSD$
PORTNAME= http-client
-PORTVERSION= 0.3.6.1
-PORTREVISION= 1
+PORTVERSION= 0.4.20
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= HTTP client engine
+COMMENT= HTTP client engine, intended as a base layer for more user-friendly packages
LICENSE= MIT
USE_CABAL= base64-bytestring>=1.0 blaze-builder>=0.3 case-insensitive>=1.0 \
cookie data-default-class exceptions>=0.4 http-types>=0.8 \
- mime-types network>=2.3 publicsuffixlist random \
+ mime-types network>=2.6 network-uri>=2.6 random \
streaming-commons>=0.1.0.2 text>=0.11
+FLAGS_ENABLE= network-uri
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-http-client/distinfo b/www/hs-http-client/distinfo
index 27bd849..68b01b9 100644
--- a/www/hs-http-client/distinfo
+++ b/www/hs-http-client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-client-0.3.6.1.tar.gz) = 306d9073b8e8dd0f38c70fcaf532ba10a4054262116dce20837a7b277ab35555
-SIZE (cabal/http-client-0.3.6.1.tar.gz) = 33929
+SHA256 (cabal/http-client-0.4.20.tar.gz) = 8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24
+SIZE (cabal/http-client-0.4.20.tar.gz) = 75960
diff --git a/www/hs-http-conduit/Makefile b/www/hs-http-conduit/Makefile
index 0694b53..4a6b8dd 100644
--- a/www/hs-http-conduit/Makefile
+++ b/www/hs-http-conduit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-conduit
-PORTVERSION= 2.1.4
-PORTREVISION= 1
+PORTVERSION= 2.1.8
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= HTTP client package with conduit interface and HTTPS support
LICENSE= BSD3CLAUSE
-USE_CABAL= conduit>=0.5.5 http-client>=0.3.6 http-client-tls>=0.2.2 \
+USE_CABAL= conduit>=0.5.5 http-client>=0.4.19 http-client-tls>=0.2.2 \
http-types>=0.7 lifted-base>=0.1 monad-control mtl \
resourcet>=1.1
diff --git a/www/hs-http-conduit/distinfo b/www/hs-http-conduit/distinfo
index bd6f3d1..0f939df 100644
--- a/www/hs-http-conduit/distinfo
+++ b/www/hs-http-conduit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-conduit-2.1.4.tar.gz) = 4b4693a994d81d916f998218c3c89ff0fb0763b40ea6dece8354e4e38b68ae93
-SIZE (cabal/http-conduit-2.1.4.tar.gz) = 22819
+SHA256 (cabal/http-conduit-2.1.8.tar.gz) = 550d86ea9ee6dd90994a460c5c85ddc861fb5c0f007304dc4a2e2035f980ea3d
+SIZE (cabal/http-conduit-2.1.8.tar.gz) = 23331
diff --git a/www/hs-http-date/Makefile b/www/hs-http-date/Makefile
index 620864c..fa7de21 100644
--- a/www/hs-http-date/Makefile
+++ b/www/hs-http-date/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-date
-PORTVERSION= 0.0.4
-PORTREVISION= 8
+PORTVERSION= 0.0.6.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-date/distinfo b/www/hs-http-date/distinfo
index df9dd85..8118038 100644
--- a/www/hs-http-date/distinfo
+++ b/www/hs-http-date/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-date-0.0.4.tar.gz) = 25228b2456b319c7c777ea3673f441ddf68881da176b37c51feab2108d0175dd
-SIZE (cabal/http-date-0.0.4.tar.gz) = 4865
+SHA256 (cabal/http-date-0.0.6.1.tar.gz) = f2e106603e2b3f710f1189e478f6c20067d9a9d21a20a633fe362b3f91807636
+SIZE (cabal/http-date-0.0.6.1.tar.gz) = 4989
diff --git a/www/hs-http-reverse-proxy/Makefile b/www/hs-http-reverse-proxy/Makefile
index 30a919b..b61b236 100644
--- a/www/hs-http-reverse-proxy/Makefile
+++ b/www/hs-http-reverse-proxy/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-reverse-proxy
-PORTVERSION= 0.4.0.1
-PORTREVISION= 1
+PORTVERSION= 0.4.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-reverse-proxy/distinfo b/www/hs-http-reverse-proxy/distinfo
index 4ea7d8e..c945e1f 100644
--- a/www/hs-http-reverse-proxy/distinfo
+++ b/www/hs-http-reverse-proxy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 30fc8eadde6efb2dd0548087d55f5baae63558d1442c5efbd0d978dda7afcf3f
-SIZE (cabal/http-reverse-proxy-0.4.0.1.tar.gz) = 8839
+SHA256 (cabal/http-reverse-proxy-0.4.2.tar.gz) = 3118eae07425ee5e44fb309f6a99f09d6a4fccb4965cc6af2ce5ba6003348d81
+SIZE (cabal/http-reverse-proxy-0.4.2.tar.gz) = 9641
diff --git a/www/hs-http-server/Makefile b/www/hs-http-server/Makefile
index 1b1fa46..ed4a37a 100644
--- a/www/hs-http-server/Makefile
+++ b/www/hs-http-server/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= http-server
-PORTVERSION= 1.0.4
-PORTREVISION= 1
+PORTVERSION= 1.0.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Library for writing Haskell web servers
LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.4.0.0 text>=1.0 url>=2 \
- utf8-string>=0.3.4
+USE_CABAL= HTTP>=4000.2.0 mime>=0.3 network>=2.6 network-uri>=2.6 \
+ text>=1.0 url>=2.0 utf8-string>=0.3.4
INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
@@ -20,6 +19,8 @@ INSTALL_PORTEXAMPLES= cd ${WRKSRC}/example && \
OPTIONS_DEFINE= EXAMPLES
OPTIONS_DEFAULT= EXAMPLES
+FLAGS_ENABLE= network-uri
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
.if ${PORT_OPTIONS:MEXAMPLES}
diff --git a/www/hs-http-server/distinfo b/www/hs-http-server/distinfo
index fdcf4e8..c8e2803 100644
--- a/www/hs-http-server/distinfo
+++ b/www/hs-http-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-server-1.0.4.tar.gz) = 985090c8490a49bbcfafc181ac60473ba49a18eb9464f2f69b54da33aea534ea
-SIZE (cabal/http-server-1.0.4.tar.gz) = 29015
+SHA256 (cabal/http-server-1.0.6.tar.gz) = 5cd44741053aef8ba7bd6b6d8d0a8048a171db42e2b7cb5013a99fcd754143b5
+SIZE (cabal/http-server-1.0.6.tar.gz) = 29071
diff --git a/www/hs-http-server/pkg-descr b/www/hs-http-server/pkg-descr
index 283b504..7badaeb 100644
--- a/www/hs-http-server/pkg-descr
+++ b/www/hs-http-server/pkg-descr
@@ -1,3 +1,3 @@
A library for writing Haskell web servers.
-WWW: http://code.galois.com/
+WWW: https://github.com/GaloisInc/http-server
diff --git a/www/hs-http-types/Makefile b/www/hs-http-types/Makefile
index a51cc68..8ab63f6 100644
--- a/www/hs-http-types/Makefile
+++ b/www/hs-http-types/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= http-types
-PORTVERSION= 0.8.5
-PORTREVISION= 1
+PORTVERSION= 0.8.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-http-types/distinfo b/www/hs-http-types/distinfo
index e19ca6e..d2f13f6 100644
--- a/www/hs-http-types/distinfo
+++ b/www/hs-http-types/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/http-types-0.8.5.tar.gz) = 3cb243486053f2e80af255ab79009c2ef057d314d5710ba7aa65fa3e9c164834
-SIZE (cabal/http-types-0.8.5.tar.gz) = 10781
+SHA256 (cabal/http-types-0.8.6.tar.gz) = b03b1893e0148169087f64ef0b1dedcf2382865352f4306d4fa7219d118a36e0
+SIZE (cabal/http-types-0.8.6.tar.gz) = 10796
diff --git a/www/hs-http2/Makefile b/www/hs-http2/Makefile
new file mode 100644
index 0000000..f62c198
--- /dev/null
+++ b/www/hs-http2/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= http2
+PORTVERSION= 1.0.4
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= HTTP/2.0 library including frames and HPACK
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson aeson-pretty hex mwc-random stm text \
+ unordered-containers vector word8
+
+FLAGS_DISABLE= devel
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-http2/distinfo b/www/hs-http2/distinfo
new file mode 100644
index 0000000..bb0f787
--- /dev/null
+++ b/www/hs-http2/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/http2-1.0.4.tar.gz) = 727fc0d39a62b02b677189f9ef745e3c8fd574334736594139767940dc4647b7
+SIZE (cabal/http2-1.0.4.tar.gz) = 35760
diff --git a/www/hs-http2/files/patch-http2.cabal b/www/hs-http2/files/patch-http2.cabal
new file mode 100644
index 0000000..661339a
--- /dev/null
+++ b/www/hs-http2/files/patch-http2.cabal
@@ -0,0 +1,50 @@
+--- http2.cabal.orig 2015-07-31 05:18:14 UTC
++++ http2.cabal
+@@ -60,7 +60,6 @@ Library
+ Build-Depends: base >= 4.6 && < 5
+ , array
+ , bytestring >= 0.10
+- , bytestring-builder
+ , containers >= 0.5
+ , mwc-random
+ , stm
+@@ -93,7 +92,6 @@ Test-Suite spec
+ Build-Depends: base >= 4 && < 5
+ , array
+ , bytestring
+- , bytestring-builder
+ , containers
+ , hex
+ , hspec >= 1.3
+@@ -116,7 +114,6 @@ Test-Suite hpack
+ , aeson-pretty
+ , array
+ , bytestring
+- , bytestring-builder
+ , containers
+ , directory
+ , filepath
+@@ -165,7 +162,6 @@ Executable hpack-encode
+ , aeson-pretty
+ , array
+ , bytestring
+- , bytestring-builder
+ , containers
+ , hex
+ , text
+@@ -186,7 +182,6 @@ Executable hpack-debug
+ , aeson
+ , array
+ , bytestring
+- , bytestring-builder
+ , containers
+ , hex
+ , text
+@@ -208,7 +203,6 @@ Executable hpack-stat
+ , aeson-pretty
+ , array
+ , bytestring
+- , bytestring-builder
+ , containers
+ , directory
+ , filepath
diff --git a/www/hs-http2/pkg-descr b/www/hs-http2/pkg-descr
new file mode 100644
index 0000000..dde5115
--- /dev/null
+++ b/www/hs-http2/pkg-descr
@@ -0,0 +1,4 @@
+HTTP/2.0 library including frames and HPACK. Currently HTTP/2 16
+framing and HPACK 10 is supported.
+
+WWW: http://hackage.haskell.org/package/http2
diff --git a/www/hs-multipart/Makefile b/www/hs-multipart/Makefile
new file mode 100644
index 0000000..768c9e0
--- /dev/null
+++ b/www/hs-multipart/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= multipart
+PORTVERSION= 0.1.2
+CATEGORIES= www haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= HTTP multipart split out of the cgi package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= parsec>=2.0
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/www/hs-multipart/distinfo b/www/hs-multipart/distinfo
new file mode 100644
index 0000000..a224306
--- /dev/null
+++ b/www/hs-multipart/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/multipart-0.1.2.tar.gz) = e543fb307beb14fc366171d7767a6a18244bacf78db295d8d161c5c03d94043c
+SIZE (cabal/multipart-0.1.2.tar.gz) = 6787
diff --git a/www/hs-multipart/pkg-descr b/www/hs-multipart/pkg-descr
new file mode 100644
index 0000000..8e68e6c
--- /dev/null
+++ b/www/hs-multipart/pkg-descr
@@ -0,0 +1,3 @@
+HTTP multipart split out of the cgi package.
+
+WWW: http://www.github.com/silkapp/multipart
diff --git a/www/hs-oeis/Makefile b/www/hs-oeis/Makefile
index 6f258f3..3346065 100644
--- a/www/hs-oeis/Makefile
+++ b/www/hs-oeis/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= oeis
-PORTVERSION= 0.3.5
-PORTREVISION= 1
+PORTVERSION= 0.3.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,9 @@ COMMENT= Interface to the Online Encyclopedia of Integer Sequences (OEIS)
LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP network
+USE_CABAL= HTTP>=4000.2 network>=2.6 network-uri>=2.6
+
+FLAGS_ENABLE= network-uri
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-oeis/distinfo b/www/hs-oeis/distinfo
index 833d5e7..6eb7298 100644
--- a/www/hs-oeis/distinfo
+++ b/www/hs-oeis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/oeis-0.3.5.tar.gz) = a617e60b1ffd1e7ebc3d30b291687f25651471769fb2f6a1367defed16ae4364
-SIZE (cabal/oeis-0.3.5.tar.gz) = 29204
+SHA256 (cabal/oeis-0.3.6.tar.gz) = 4039b69a7aa0412eb4a37f36be7bf442ea32dd4672fc8765b6b134513fe3fee0
+SIZE (cabal/oeis-0.3.6.tar.gz) = 29275
diff --git a/www/hs-oeis/pkg-descr b/www/hs-oeis/pkg-descr
index fe31ed2..2d2537f 100644
--- a/www/hs-oeis/pkg-descr
+++ b/www/hs-oeis/pkg-descr
@@ -1,3 +1,3 @@
-Haskell interface to the Online Encyclopedia of Integer Sequences.
+Interface to the Online Encyclopedia of Integer Sequences.
-WWW: http://code.haskell.org/oeis
+WWW: http://hackage.haskell.org/package/oeis
diff --git a/www/hs-path-pieces/Makefile b/www/hs-path-pieces/Makefile
index 3ef19f2..162ba50 100644
--- a/www/hs-path-pieces/Makefile
+++ b/www/hs-path-pieces/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= path-pieces
-PORTVERSION= 0.1.4
-PORTREVISION= 1
+PORTVERSION= 0.2.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-path-pieces/distinfo b/www/hs-path-pieces/distinfo
index d2807dd..fd147c1 100644
--- a/www/hs-path-pieces/distinfo
+++ b/www/hs-path-pieces/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/path-pieces-0.1.4.tar.gz) = 5b78f3375dcbac842b7b7bf08e8398255234e8f12ede96c33f75223417b9b0bb
-SIZE (cabal/path-pieces-0.1.4.tar.gz) = 2718
+SHA256 (cabal/path-pieces-0.2.0.tar.gz) = c097672ab0dd1835b8cadbbd9db412893f02e02eca044c5a1690fbefb3e8df84
+SIZE (cabal/path-pieces-0.2.0.tar.gz) = 3267
diff --git a/www/hs-recaptcha/Makefile b/www/hs-recaptcha/Makefile
index ec1184e..14d91e2 100644
--- a/www/hs-recaptcha/Makefile
+++ b/www/hs-recaptcha/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= recaptcha
-PORTVERSION= 0.1.0.2
-PORTREVISION= 1
+PORTVERSION= 0.1.0.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,9 @@ COMMENT= Functions for using the reCAPTCHA service in web applications
LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=3001.1.4 network>=2.2.0.1
+USE_CABAL= HTTP>=3001.1.4 network>=2.6 network-uri>=2.6
+
+FLAGS_ENABLE= network-uri
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-recaptcha/distinfo b/www/hs-recaptcha/distinfo
index 34fd88d..3194b7b 100644
--- a/www/hs-recaptcha/distinfo
+++ b/www/hs-recaptcha/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/recaptcha-0.1.0.2.tar.gz) = 30ae898cc39381b4e54bd984562a3a0e1385a393b1e318fec4a3b1bacc754d13
-SIZE (cabal/recaptcha-0.1.0.2.tar.gz) = 2667
+SHA256 (cabal/recaptcha-0.1.0.3.tar.gz) = 29a898bc7a063be88c05ac3ec0446a23117ed04c501dbd99c83684683fd638a3
+SIZE (cabal/recaptcha-0.1.0.3.tar.gz) = 2742
diff --git a/www/hs-scgi/Makefile b/www/hs-scgi/Makefile
deleted file mode 100644
index 3f2a6b9..0000000
--- a/www/hs-scgi/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-# deprecated: use wai
-
-PORTNAME= scgi
-PORTVERSION= 0.3.3
-PORTREVISION= 13
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell library for writing SCGI programs
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= cgi network>=2.2.3
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-scgi/distinfo b/www/hs-scgi/distinfo
deleted file mode 100644
index c4c58ee..0000000
--- a/www/hs-scgi/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/scgi-0.3.3.tar.gz) = 55b40f48739aefb7f25ac971a1b3f27aaf0a9d0c32afe62dd56877be0b2fb67e
-SIZE (cabal/scgi-0.3.3.tar.gz) = 3235
diff --git a/www/hs-scgi/pkg-descr b/www/hs-scgi/pkg-descr
deleted file mode 100644
index ef95354..0000000
--- a/www/hs-scgi/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This Haskell library lets you write SCGI programs. This package reuses
-the cgi package API, making it very easy to port CGI programs to SCGI.
-
-WWW: http://github.com/esessoms/scgi
diff --git a/www/hs-shakespeare/Makefile b/www/hs-shakespeare/Makefile
index d57440b..3a302a7 100644
--- a/www/hs-shakespeare/Makefile
+++ b/www/hs-shakespeare/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= shakespeare
-PORTVERSION= 2.0.1.1
-PORTREVISION= 1
+PORTVERSION= 2.0.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Toolkit for making compile-time interpolated templates
LICENSE= MIT
USE_CABAL= aeson blaze-html blaze-markup exceptions parsec>=2 \
- system-fileio>=0.3 system-filepath>=0.4 text>=0.7
+ text>=0.7
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-shakespeare/distinfo b/www/hs-shakespeare/distinfo
index d01e3de..6da4edd 100644
--- a/www/hs-shakespeare/distinfo
+++ b/www/hs-shakespeare/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/shakespeare-2.0.1.1.tar.gz) = 3781e221e0a70ea15ae023adb2a7dbd4461b9649a1b195da102305bf3aaaad75
-SIZE (cabal/shakespeare-2.0.1.1.tar.gz) = 58758
+SHA256 (cabal/shakespeare-2.0.5.tar.gz) = f0ff00f9262f874512ce7624c45c0e9f6e90dd1c4bf9e81891f7e34f5faeb549
+SIZE (cabal/shakespeare-2.0.5.tar.gz) = 61636
diff --git a/www/hs-snap-core/Makefile b/www/hs-snap-core/Makefile
index 991dd8c..a09f7a8 100644
--- a/www/hs-snap-core/Makefile
+++ b/www/hs-snap-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap-core
-PORTVERSION= 0.9.6.3
-PORTREVISION= 1
+PORTVERSION= 0.9.7.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,10 +11,12 @@ LICENSE= BSD3CLAUSE
USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2 \
- case-insensitive>=0.3 enumerator>=0.4.15 hashable \
- HUnit>=1.2 MonadCatchIO-transformers>=0.2.1 mtl>=2.0 \
- random>=1 regex-posix>=0.95 text>=0.11 unix-compat>=0.2 \
- unordered-containers>=0.1.4.3 vector>=0.6 zlib-enum>=0.2.1
+ bytestring-mmap>=0.2.2 case-insensitive>=0.3 \
+ enumerator>=0.4.15 hashable>=1.1 HUnit>=1.2 \
+ MonadCatchIO-transformers>=0.2.1 mtl>=2.0 random>=1 \
+ regex-posix>=0.95 text>=0.11 time-locale-compat>=0.1 \
+ unix-compat>=0.2 unordered-containers>=0.1.4.3 \
+ vector>=0.6 zlib-enum>=0.2.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-snap-core/distinfo b/www/hs-snap-core/distinfo
index 6f35255..26986eb 100644
--- a/www/hs-snap-core/distinfo
+++ b/www/hs-snap-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-core-0.9.6.3.tar.gz) = 81b70058ec42b9344b779b3fac0c86086f96e9510d7a88b53954c4df67a06f44
-SIZE (cabal/snap-core-0.9.6.3.tar.gz) = 91549
+SHA256 (cabal/snap-core-0.9.7.2.tar.gz) = 526a8ebb758c8da5e966a37449fdb072af333275c1b7726ab6317ac93875f651
+SIZE (cabal/snap-core-0.9.7.2.tar.gz) = 91604
diff --git a/www/hs-snap-server/Makefile b/www/hs-snap-server/Makefile
index 0962b27..cdbd847 100644
--- a/www/hs-snap-server/Makefile
+++ b/www/hs-snap-server/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap-server
-PORTVERSION= 0.9.4.5
-PORTREVISION= 1
+PORTVERSION= 0.9.5.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +13,7 @@ USE_CABAL= attoparsec>=0.10 attoparsec-enumerator>=0.3 \
blaze-builder>=0.2.1.4 blaze-builder-enumerator>=0.2.0 \
case-insensitive>=0.3 enumerator>=0.4.15 \
MonadCatchIO-transformers>=0.2.1 mtl>=2 network>=2.3 \
- snap-core>=0.9.3 text>=0.11 unix-compat>=0.2
+ old-locale snap-core>=0.9.3 text>=0.11 unix-compat>=0.2
FLAGS_DEFINE= OPENSSL
diff --git a/www/hs-snap-server/distinfo b/www/hs-snap-server/distinfo
index c2019d9..59b0b2c 100644
--- a/www/hs-snap-server/distinfo
+++ b/www/hs-snap-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-server-0.9.4.5.tar.gz) = 37ae3557c43dcecf6938df76af1ee274b575e50a8085d12b8f80c587e94e6924
-SIZE (cabal/snap-server-0.9.4.5.tar.gz) = 58643
+SHA256 (cabal/snap-server-0.9.5.1.tar.gz) = af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3
+SIZE (cabal/snap-server-0.9.5.1.tar.gz) = 59062
diff --git a/www/hs-snap-server/files/patch-snap-server.cabal b/www/hs-snap-server/files/patch-snap-server.cabal
deleted file mode 100644
index 9021030..0000000
--- a/www/hs-snap-server/files/patch-snap-server.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- snap-server.cabal.orig 2014-06-04 16:23:51 UTC
-+++ snap-server.cabal
-@@ -129,7 +129,7 @@ Library
-
- if flag(openssl)
- cpp-options: -DOPENSSL
-- build-depends: HsOpenSSL >= 0.10 && <0.11
-+ build-depends: HsOpenSSL >= 0.10 && <0.12
-
- if os(linux) && !flag(portable)
- cpp-options: -DLINUX -DHAS_SENDFILE
diff --git a/www/hs-snap/Makefile b/www/hs-snap/Makefile
index 2b8355f..4da6be8 100644
--- a/www/hs-snap/Makefile
+++ b/www/hs-snap/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= snap
-PORTVERSION= 0.13.2.8
-PORTREVISION= 1
+PORTVERSION= 0.14.0.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,13 +9,14 @@ COMMENT= Top-level package for the Snap Web Framework
LICENSE= BSD3CLAUSE
-USE_CABAL= aeson attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
+USE_CABAL= aeson>=0.6 attoparsec>=0.10 cereal>=0.3 clientsession>=0.8 \
comonad>=1.1 configurator>=0.1 directory-tree>=0.11 \
- directory-tree>=0.10 dlist>=0.5 errors>=1.4 hashable \
- heist>=0.13 lens>=3.7.6 logict>=0.4.2 MonadCatchIO-transformers>=0.2 \
- mtl>2.0 mwc-random>=0.8 pwstore-fast>=2.2 regex-posix>=0.95 \
- snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 \
- text>=0.11 unordered-containers>=0.1.4 vector>=0.7.1 \
+ directory-tree>=0.10 dlist>=0.5 either>=4.3 hashable>=1.1 \
+ heist>=0.14 lens>=3.7.6 logict>=0.4.2 \
+ MonadCatchIO-transformers>=0.2 mtl>2.0 mwc-random>=0.8 \
+ old-time>=1.0 pwstore-fast>=2.2 regex-posix>=0.95 \
+ snap-core>=0.9 snap-server>=0.9 stm>=2.2 syb>=0.1 text>=0.11 \
+ unordered-containers>=0.1.4 vector>=0.7.1 \
vector-algorithms>=0.4 xmlhtml>=0.1
EXECUTABLE= snap
diff --git a/www/hs-snap/distinfo b/www/hs-snap/distinfo
index c03d580..c861133 100644
--- a/www/hs-snap/distinfo
+++ b/www/hs-snap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/snap-0.13.2.8.tar.gz) = ef2fa6b87e2f4eac56d8c95320575adea7eb7ae1c5914209a0590aae728036cb
-SIZE (cabal/snap-0.13.2.8.tar.gz) = 83938
+SHA256 (cabal/snap-0.14.0.6.tar.gz) = fa9ffc7bf5c6729f7e204daecd50765a220a0ffc2feaf3f6b29977370d8db617
+SIZE (cabal/snap-0.14.0.6.tar.gz) = 84164
diff --git a/www/hs-snap/files/patch-snap.cabal b/www/hs-snap/files/patch-snap.cabal
index 3cdfd46..284efd9 100644
--- a/www/hs-snap/files/patch-snap.cabal
+++ b/www/hs-snap/files/patch-snap.cabal
@@ -1,16 +1,7 @@
---- ./snap.cabal.orig 2014-07-03 21:45:03.000000000 +0200
-+++ ./snap.cabal 2014-07-29 12:40:27.405965571 +0200
-@@ -186,7 +186,7 @@
- else
- build-depends:
- base >= 4.4 && < 5,
-- lens >= 3.7.6 && < 4.2
-+ lens >= 3.7.6 && < 4.4
-
- extensions:
- BangPatterns,
-@@ -236,6 +236,7 @@
- text >= 0.11 && < 1.2
+--- snap.cabal.orig 2015-07-19 02:19:23 UTC
++++ snap.cabal
+@@ -237,6 +237,7 @@ Executable snap
+ text >= 0.11 && < 1.3
extensions:
+ TemplateHaskell
diff --git a/www/hs-url/Makefile b/www/hs-url/Makefile
index 7cbe988..30b576f 100644
--- a/www/hs-url/Makefile
+++ b/www/hs-url/Makefile
@@ -3,7 +3,7 @@
PORTNAME= url
PORTVERSION= 2.1.3
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai-app-static/Makefile b/www/hs-wai-app-static/Makefile
index 6ad395e..b9b7fca 100644
--- a/www/hs-wai-app-static/Makefile
+++ b/www/hs-wai-app-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-app-static
-PORTVERSION= 3.0.0
-PORTREVISION= 1
+PORTVERSION= 3.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,9 +13,8 @@ USE_CABAL= base64-bytestring>=0.1 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 byteable cryptohash>=0.11 \
cryptohash-conduit file-embed>=0.0.3.1 http-date \
http-types>=0.7 mime-types>=0.1 optparse-applicative>=0.7 \
- system-fileio>=0.3 system-filepath>=0.4 text>=0.7 \
- unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \
- wai-extra>=3.0 warp>=3.0 zlib>=0.5
+ text>=0.7 unix-compat>=0.2 unordered-containers>=0.2 wai>=3.0 \
+ wai-extra>=3.0 warp>=3.0.11 zlib>=0.5
EXECUTABLE= warp
diff --git a/www/hs-wai-app-static/distinfo b/www/hs-wai-app-static/distinfo
index 05acd53..c0ab65f 100644
--- a/www/hs-wai-app-static/distinfo
+++ b/www/hs-wai-app-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-app-static-3.0.0.tar.gz) = 631cca083081803a81cf46d1b538f7c2dbe9c8310b94694a88220242f415f984
-SIZE (cabal/wai-app-static-3.0.0.tar.gz) = 20720
+SHA256 (cabal/wai-app-static-3.1.1.tar.gz) = 5b7ed5028584bbefbbf3da6869ad9fe5ed4fe28ad599ca5d9ad715a1cee43e2a
+SIZE (cabal/wai-app-static-3.1.1.tar.gz) = 21781
diff --git a/www/hs-wai-extra/Makefile b/www/hs-wai-extra/Makefile
index 487701e..0755792 100644
--- a/www/hs-wai-extra/Makefile
+++ b/www/hs-wai-extra/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-extra
-PORTVERSION= 3.0.1.2
-PORTREVISION= 1
+PORTVERSION= 3.0.10
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,11 @@ COMMENT= Provides some basic WAI handlers and middleware
LICENSE= MIT
USE_CABAL= ansi-terminal base64-bytestring blaze-builder>=0.2.1.4 \
- case-insensitive>=0.2 data-default-class fast-logger>=2.1 \
- http-types>=0.7 lifted-base>=0.1.2 network>=2.2.1.5 \
- resourcet>=0.4.6 streaming-commons stringsearch>=0.3 \
- text>=0.7 void>=0.5 wai>=3.0 wai-logger>=2.0 word8
+ case-insensitive>=0.2 cookie data-default-class \
+ fast-logger>=2.1 http-types>=0.7 lifted-base>=0.1.2 \
+ network>=2.2.1.5 resourcet>=0.4.6 streaming-commons \
+ stringsearch>=0.3 text>=0.7 unix-compat vault void>=0.5 \
+ wai>=3.0.3.0 wai-logger>=2.0 word8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-extra/distinfo b/www/hs-wai-extra/distinfo
index 9a97926..e3fc952 100644
--- a/www/hs-wai-extra/distinfo
+++ b/www/hs-wai-extra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-extra-3.0.1.2.tar.gz) = 9f042de4a0d48c3415b2aacc8447bd938bf236a725adeeb4f5dbc635cfac6397
-SIZE (cabal/wai-extra-3.0.1.2.tar.gz) = 39555
+SHA256 (cabal/wai-extra-3.0.10.tar.gz) = 503af31217c29d1bcec10a6806ea119aab9d68f29f12a1c1006fe4f931771b37
+SIZE (cabal/wai-extra-3.0.10.tar.gz) = 49846
diff --git a/www/hs-wai-extra/pkg-descr b/www/hs-wai-extra/pkg-descr
index d549df2..1874f4c 100644
--- a/www/hs-wai-extra/pkg-descr
+++ b/www/hs-wai-extra/pkg-descr
@@ -1,3 +1,3 @@
-The goal here is to provide common features without many dependencies.
+Provides basic WAI handler and middleware functionality.
WWW: http://github.com/yesodweb/wai
diff --git a/www/hs-wai-logger/Makefile b/www/hs-wai-logger/Makefile
index f447e53..29fbbfc 100644
--- a/www/hs-wai-logger/Makefile
+++ b/www/hs-wai-logger/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai-logger
-PORTVERSION= 2.2.0
-PORTREVISION= 1
+PORTVERSION= 2.2.4.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Logging system for WAI
LICENSE= BSD3CLAUSE
USE_CABAL= auto-update blaze-builder byteorder case-insensitive \
- fast-logger>=2.2 http-types network unix-time>=0.2.2 \
- wai>=2.0.0
+ easy-file>=0.2 fast-logger>=2.2 http-types network \
+ unix-time>=0.2.2 wai>=2.0.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-wai-logger/distinfo b/www/hs-wai-logger/distinfo
index a0e62eb..8878aca 100644
--- a/www/hs-wai-logger/distinfo
+++ b/www/hs-wai-logger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-logger-2.2.0.tar.gz) = 7e3f92d6be5a87df977fb9cc66e09e3aec5500e1dedc20886b42501f56628436
-SIZE (cabal/wai-logger-2.2.0.tar.gz) = 5963
+SHA256 (cabal/wai-logger-2.2.4.1.tar.gz) = f37d6bb6ea4a5f881ab2c9df571c923c5624cc83882b19640b924436fcdedae8
+SIZE (cabal/wai-logger-2.2.4.1.tar.gz) = 6585
diff --git a/www/hs-wai/Makefile b/www/hs-wai/Makefile
index 970f72b..528957d 100644
--- a/www/hs-wai/Makefile
+++ b/www/hs-wai/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wai
-PORTVERSION= 3.0.1.1
-PORTREVISION= 1
+PORTVERSION= 3.0.3.0
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/www/hs-wai/distinfo b/www/hs-wai/distinfo
index e33c45b..0df0712 100644
--- a/www/hs-wai/distinfo
+++ b/www/hs-wai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wai-3.0.1.1.tar.gz) = 2022773ce7137227c806a473848778e9605ce6c62f55f4eb867f32fc2a50b311
-SIZE (cabal/wai-3.0.1.1.tar.gz) = 7649
+SHA256 (cabal/wai-3.0.3.0.tar.gz) = c47eb435a3320795f21bee8585abc8164aaf3bfde86f7e1e13e98190cb968d10
+SIZE (cabal/wai-3.0.3.0.tar.gz) = 9532
diff --git a/www/hs-warp-tls/Makefile b/www/hs-warp-tls/Makefile
index 8435ca9..fdb77f9 100644
--- a/www/hs-warp-tls/Makefile
+++ b/www/hs-warp-tls/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= warp-tls
-PORTVERSION= 3.0.0
-PORTREVISION= 1
+PORTVERSION= 3.1.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= HTTP over SSL/TLS support for Warp via the TLS package
LICENSE= MIT
USE_CABAL= cprng-aes>=0.5.0 data-default-class>=0.0.1 network>=2.2.1 \
- streaming-commons tls>=1.2.1 wai>=3.0 warp>=3.0
+ streaming-commons tls>=1.2.16 wai>=3.0 warp>=3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-warp-tls/distinfo b/www/hs-warp-tls/distinfo
index fbc9ba6..3f4f70a 100644
--- a/www/hs-warp-tls/distinfo
+++ b/www/hs-warp-tls/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-tls-3.0.0.tar.gz) = dce9d46532440c2429d72f21ee07ded929eb67f26909150f82698780d420f591
-SIZE (cabal/warp-tls-3.0.0.tar.gz) = 3905
+SHA256 (cabal/warp-tls-3.1.1.tar.gz) = 5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd
+SIZE (cabal/warp-tls-3.1.1.tar.gz) = 6426
diff --git a/www/hs-warp/Makefile b/www/hs-warp/Makefile
index 940deae..c2eb11c 100644
--- a/www/hs-warp/Makefile
+++ b/www/hs-warp/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= warp
-PORTVERSION= 3.0.0.5
-PORTREVISION= 1
+PORTVERSION= 3.1.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,10 +9,14 @@ COMMENT= Fast, light-weight web server for WAI applications
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.3.3 case-insensitive>=0.2 hashable \
- http-date http-types>=0.8.5 network>=2.3 \
- simple-sendfile>=0.2.7 streaming-commons>=0.1.2 text \
- unix-compat>=0.2 void wai>=3.0
+USE_CABAL= auto-update>=0.1.1 blaze-builder>=0.4 case-insensitive>=0.2 \
+ hashable http-date http-types>=0.8.5 http2>=1.0.2 \
+ iproute>=1.3.1 network>=2.3 old-locale simple-sendfile>=0.2.7 \
+ stm>=2.3 streaming-commons>=0.1.10 text unix-compat>=0.2 \
+ vault>=0.3 wai>=3.0 word8
+
+FLAGS_ENABLE= allow-sendfilefd
+FLAGS_DISABLE= network-bytestring warp-debug use-bytestring-builder
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-warp/distinfo b/www/hs-warp/distinfo
index 16976d2..567f724 100644
--- a/www/hs-warp/distinfo
+++ b/www/hs-warp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/warp-3.0.0.5.tar.gz) = a525cc131bd85586d5cc2b28d0d75502c794e101cce043e426d796b0ba7dc9c6
-SIZE (cabal/warp-3.0.0.5.tar.gz) = 38894
+SHA256 (cabal/warp-3.1.3.tar.gz) = f65d32e374da0c1c1a44624e9744e4e2b5e325ca1e24a6aeae5719ee48c2b8e3
+SIZE (cabal/warp-3.1.3.tar.gz) = 64154
diff --git a/www/hs-warp/files/patch-warp.cabal b/www/hs-warp/files/patch-warp.cabal
new file mode 100644
index 0000000..bf0c57a
--- /dev/null
+++ b/www/hs-warp/files/patch-warp.cabal
@@ -0,0 +1,18 @@
+--- warp.cabal.orig 2015-08-18 02:00:41 UTC
++++ warp.cabal
+@@ -36,7 +36,6 @@ Library
+ , auto-update >= 0.1.1 && < 0.2
+ , blaze-builder >= 0.4
+ , bytestring >= 0.9.1.4
+- , bytestring-builder
+ , case-insensitive >= 0.2
+ , containers
+ , ghc-prim
+@@ -134,7 +133,6 @@ Test-Suite spec
+ , auto-update
+ , blaze-builder >= 0.4
+ , bytestring >= 0.9.1.4
+- , bytestring-builder
+ , case-insensitive >= 0.2
+ , ghc-prim
+ , HTTP
diff --git a/www/hs-webkit/Makefile b/www/hs-webkit/Makefile
index b9921d1..2a7d0d7 100644
--- a/www/hs-webkit/Makefile
+++ b/www/hs-webkit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= webkit
-PORTVERSION= 0.12.6.1
-PORTREVISION= 1
+PORTVERSION= 0.13.1.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,8 @@ COMMENT= Binding to the Webkit library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.12 glib>=0.12.1 gtk>=0.12.5.0 mtl pango>=0.12
+USE_CABAL= cairo>=0.13.0.0 glib>=0.13.1.0 gtk>=0.13.0.0 mtl \
+ pango>=0.13.0.0 text>=1.0.0.0
LIB_DEPENDS+= libwebkitgtk-1.0.so:${PORTSDIR}/www/webkit-gtk2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-webkit/distinfo b/www/hs-webkit/distinfo
index abea02d..f83ca6f 100644
--- a/www/hs-webkit/distinfo
+++ b/www/hs-webkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/webkit-0.12.6.1.tar.gz) = 6a4e1921775f282f1a6bc912402a602f379937d2c4e754a2ee9d87ab77fd56b6
-SIZE (cabal/webkit-0.12.6.1.tar.gz) = 148047
+SHA256 (cabal/webkit-0.13.1.3.tar.gz) = 068c23b5ceebb725f113d519dadb30deaa5bc747c656264eb32e1bda8b210902
+SIZE (cabal/webkit-0.13.1.3.tar.gz) = 152548
diff --git a/www/hs-webkit/pkg-descr b/www/hs-webkit/pkg-descr
index b55e561..756f41b 100644
--- a/www/hs-webkit/pkg-descr
+++ b/www/hs-webkit/pkg-descr
@@ -1,8 +1,7 @@
WebKit is a web content engine, derived from KHTML and KJS from KDE, and
used primarily in Apple's Safari browser. It is made to be embedded in
-other applications, such as mail readers, or web browsers.
-
-It is able to display content such as HTML, SVG, XML, and others. It also
-supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more.
+other applications, such as mail readers, or web browsers. It is able to
+display content such as HTML, SVG, XML, and others. It also supports DOM,
+XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more.
WWW: http://projects.haskell.org/gtk2hs/
diff --git a/www/hs-xss-sanitize/Makefile b/www/hs-xss-sanitize/Makefile
index 810a23d..97fc0b5 100644
--- a/www/hs-xss-sanitize/Makefile
+++ b/www/hs-xss-sanitize/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xss-sanitize
-PORTVERSION= 0.3.5.2
-PORTREVISION= 1
+PORTVERSION= 0.3.5.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,10 @@ COMMENT= Sanitize untrusted HTML to prevent XSS attacks
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2 \
- tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3
+USE_CABAL= attoparsec>=0.10.0.3 css-text>=0.1.1 network>=2.6 \
+ network-uri>=2.6 tagsoup>=0.12.2 text>=0.11 utf8-string>=0.3
+
+FLAGS_ENABLE= network-uri
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-xss-sanitize/distinfo b/www/hs-xss-sanitize/distinfo
index b5469be..6f71fb5 100644
--- a/www/hs-xss-sanitize/distinfo
+++ b/www/hs-xss-sanitize/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xss-sanitize-0.3.5.2.tar.gz) = cbb4a0df82512ec0ddef8162d8ab26d906a98a292162748039a78367a3e66ad2
-SIZE (cabal/xss-sanitize-0.3.5.2.tar.gz) = 10856
+SHA256 (cabal/xss-sanitize-0.3.5.6.tar.gz) = 008a20e0266f7e4255cb6009336bc25cfe74eda3314dff4f0da0bbd584cd58c8
+SIZE (cabal/xss-sanitize-0.3.5.6.tar.gz) = 10874
diff --git a/www/hs-yesod-auth-hashdb/Makefile b/www/hs-yesod-auth-hashdb/Makefile
index 0b0db22..b70de20 100644
--- a/www/hs-yesod-auth-hashdb/Makefile
+++ b/www/hs-yesod-auth-hashdb/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth-hashdb
-PORTVERSION= 1.3.0.1
-PORTREVISION= 1
+PORTVERSION= 1.4.2.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,9 @@ COMMENT= Authentication plugin for Yesod
LICENSE= MIT
-USE_CABAL= cryptohash>=0.8 pwstore-fast>=2.2 text>=0.7 yesod-auth>=1.3 \
- yesod-core>=1.2 yesod-form>=1.3 yesod-persistent>=1.2
+USE_CABAL= cryptohash>=0.8 persistent>=2.1 pwstore-fast>=2.2 text>=0.7 \
+ yesod-auth>=1.4 yesod-core>=1.4 yesod-form>=1.4 \
+ yesod-persistent>=1.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-auth-hashdb/distinfo b/www/hs-yesod-auth-hashdb/distinfo
index e824253..2edd0c2 100644
--- a/www/hs-yesod-auth-hashdb/distinfo
+++ b/www/hs-yesod-auth-hashdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-hashdb-1.3.0.1.tar.gz) = 984c38923340cd59b87f0862024cb5a9c02a84184093f2d52760999700afe860
-SIZE (cabal/yesod-auth-hashdb-1.3.0.1.tar.gz) = 6772
+SHA256 (cabal/yesod-auth-hashdb-1.4.2.2.tar.gz) = d904933fa5172cc330785591eb92fa61a3cb86599c617ff4bdedf348ecad5868
+SIZE (cabal/yesod-auth-hashdb-1.4.2.2.tar.gz) = 10290
diff --git a/www/hs-yesod-auth-hashdb/pkg-descr b/www/hs-yesod-auth-hashdb/pkg-descr
index 58018f7..184468b 100644
--- a/www/hs-yesod-auth-hashdb/pkg-descr
+++ b/www/hs-yesod-auth-hashdb/pkg-descr
@@ -2,4 +2,14 @@ This package is the Yesod.Auth.HashDB plugin, originally included in
yesod-auth, but now modified to be more secure and placed in a separate
package.
-WWW: http://www.yesodweb.com/
+It provides authentication using hashed passwords stored in a database,
+and works best in situations where an administrator is involved in
+setting up a user with an initial password.
+
+The complete login process, including a default form, is implemented by
+this plugin, but the application developer must design the interfaces
+for setting up users and allowing them to change their own passwords,
+since only the low-level password-setting functions are provided by this
+package.
+
+WWW: https://github.com/paul-rouse/yesod-auth-hashdb
diff --git a/www/hs-yesod-auth/Makefile b/www/hs-yesod-auth/Makefile
index 5b1f936..08d92b2 100644
--- a/www/hs-yesod-auth/Makefile
+++ b/www/hs-yesod-auth/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-auth
-PORTVERSION= 1.3.4
-PORTREVISION= 1
+PORTVERSION= 1.4.6
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,15 +9,17 @@ COMMENT= Authentication for Yesod
LICENSE= MIT
-USE_CABAL= aeson>=0.5 authenticate>=1.3 base16-bytestring \
+USE_CABAL= aeson>=0.7 authenticate>=1.3 base16-bytestring \
base64-bytestring blaze-builder blaze-html>=0.5 \
blaze-markup>=0.5.1 byteable conduit conduit-extra cryptohash \
data-default email-validate>=1.0 file-embed http-client \
http-conduit>=1.5 http-types lifted-base>=0.1 mime-mail>=0.3 \
- network persistent>=1.2 persistent-template>=1.2 \
- random>=1.0.0.2 resourcet safe shakespeare text>=0.7 \
- unordered-containers wai>=1.4 yesod-core>=1.2 yesod-form>=1.3 \
- yesod-persistent>=1.2
+ network>=2.6 network-uri>=2.6 nonce>=1.0.2 persistent>=2.1 \
+ persistent-template>=2.1 random>=1.0.0.2 resourcet safe \
+ shakespeare text>=0.7 unordered-containers wai>=1.4 \
+ yesod-core>=1.4 yesod-form>=1.4 yesod-persistent>=1.4
+
+FLAGS_ENABLE= network-uri
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-auth/distinfo b/www/hs-yesod-auth/distinfo
index 1418abc..ef7e0a9 100644
--- a/www/hs-yesod-auth/distinfo
+++ b/www/hs-yesod-auth/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-auth-1.3.4.tar.gz) = 1ee00d9afefb3fd225e5163f689561ebf8d9a1862eb04a72a2dcb89574b61c8d
-SIZE (cabal/yesod-auth-1.3.4.tar.gz) = 36720
+SHA256 (cabal/yesod-auth-1.4.6.tar.gz) = 5d6c74908daabe5e6d5bdff919d3e8e2bccdf5e599da430135474cbce30d1030
+SIZE (cabal/yesod-auth-1.4.6.tar.gz) = 42895
diff --git a/www/hs-yesod-auth/files/patch-yesod-auth.cabal b/www/hs-yesod-auth/files/patch-yesod-auth.cabal
deleted file mode 100644
index 4a117f7..0000000
--- a/www/hs-yesod-auth/files/patch-yesod-auth.cabal
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./yesod-auth.cabal.orig 2014-06-05 07:12:31.000000000 +0200
-+++ ./yesod-auth.cabal 2014-07-13 02:34:37.000000000 +0200
-@@ -33,10 +33,7 @@
- , text >= 0.7
- , mime-mail >= 0.3
- , yesod-persistent >= 1.2
-- , hamlet >= 1.1
- , shakespeare
-- , shakespeare-css >= 1.0
-- , shakespeare-js >= 1.0.2
- , containers
- , unordered-containers
- , yesod-form >= 1.3 && < 1.4
-@@ -63,7 +60,6 @@
- , blaze-builder
- , conduit
- , conduit-extra
-- , attoparsec-conduit
-
- exposed-modules: Yesod.Auth
- Yesod.Auth.BrowserId
diff --git a/www/hs-yesod-bin/Makefile b/www/hs-yesod-bin/Makefile
index f6e2f46..7097bc5 100644
--- a/www/hs-yesod-bin/Makefile
+++ b/www/hs-yesod-bin/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-bin
-PORTVERSION= 1.2.12.3
-PORTREVISION= 1
+PORTVERSION= 1.4.13.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,18 +9,19 @@ COMMENT= Yesod helper executable
LICENSE= MIT
-USE_CABAL= attoparsec>=0.10 base64-bytestring blaze-builder>=0.2.1.4 \
- conduit>=0.5 conduit-extra data-default-class file-embed \
- fsnotify>=0.0 ghc-paths>=0.1 http-conduit \
- http-reverse-proxy>=0.1.1 http-types>=0.7 lifted-base \
- network optparse-applicative>=0.5 parsec>=2.1 \
- project-template>=0.1.1 resourcet>=0.3 shakespeare>=1.0.2 \
- split>=0.2 streaming-commons system-fileio>=0.3 \
- system-filepath>=0.4 tar>=0.4 text>=0.11 unix-compat>=0.2 \
- unordered-containers wai>=1.4 wai-extra warp>=1.3.7.5 \
- yaml>=0.8 zlib>=0.5
+USE_CABAL= async attoparsec>=0.10 base64-bytestring \
+ blaze-builder>=0.2.1.4 conduit>=1.2 conduit-extra \
+ data-default-class file-embed fsnotify>=0.0 ghc-paths>=0.1 \
+ http-client http-conduit>=2.1.4 http-reverse-proxy>=0.4 \
+ http-types>=0.7 lifted-base network \
+ optparse-applicative>=0.11 parsec>=2.1 \
+ project-template>=0.1.1 resourcet>=0.3 shakespeare>=2.0 \
+ split>=0.2 streaming-commons tar>=0.4 text>=0.11 \
+ transformers-compat unix-compat>=0.2 unordered-containers \
+ wai>=1.4 wai-extra warp>=1.3.7.5 warp-tls>=3.0.1 yaml>=0.8 \
+ zlib>=0.5
-EXECUTABLE= yesod-ghc-wrapper yesod-ld-wrapper yesod-ar-wrapper yesod
+EXECUTABLE= yesod yesod-ar-wrapper yesod-ghc-wrapper yesod-ld-wrapper
STANDALONE= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/www/hs-yesod-bin/distinfo b/www/hs-yesod-bin/distinfo
index 106a58b..2950344 100644
--- a/www/hs-yesod-bin/distinfo
+++ b/www/hs-yesod-bin/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-bin-1.2.12.3.tar.gz) = fdbb49b6300fc933532097e81b1b4bc13aa30f5910ae58a376e414412be7a75e
-SIZE (cabal/yesod-bin-1.2.12.3.tar.gz) = 366916
+SHA256 (cabal/yesod-bin-1.4.13.3.tar.gz) = cc84e0c8f081211c01a6c8d58544b9b7fe5c5c180d8a2edcb30a79edbe198e61
+SIZE (cabal/yesod-bin-1.4.13.3.tar.gz) = 808012
diff --git a/www/hs-yesod-bin/files/patch-yesod-bin.cabal b/www/hs-yesod-bin/files/patch-yesod-bin.cabal
deleted file mode 100644
index 9275385..0000000
--- a/www/hs-yesod-bin/files/patch-yesod-bin.cabal
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./yesod-bin.cabal.orig 2014-06-18 07:02:50.000000000 +0200
-+++ ./yesod-bin.cabal 2014-07-13 02:02:06.000000000 +0200
-@@ -52,10 +52,6 @@
- , parsec >= 2.1 && < 4
- , text >= 0.11
- , shakespeare
-- , shakespeare-text >= 1.0
-- , shakespeare >= 1.0.2 && < 2.1
-- , shakespeare-js >= 1.0.2
-- , shakespeare-css >= 1.0.2
- , bytestring >= 0.9.1.4
- , time >= 1.1.4
- , template-haskell
-@@ -86,7 +82,6 @@
- , http-reverse-proxy >= 0.1.1
- , network
- , http-conduit
-- , network-conduit
- , project-template >= 0.1.1
- , transformers
- , warp >= 1.3.7.5
diff --git a/www/hs-yesod-core/Makefile b/www/hs-yesod-core/Makefile
index 596a435..b7639d6 100644
--- a/www/hs-yesod-core/Makefile
+++ b/www/hs-yesod-core/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-core
-PORTVERSION= 1.2.19
-PORTREVISION= 1
+PORTVERSION= 1.4.13
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,16 +9,16 @@ COMMENT= Creation of type-safe, RESTful web applications
LICENSE= MIT
-USE_CABAL= aeson>=0.5 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
+USE_CABAL= aeson>=0.5 auto-update blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 case-insensitive>=0.2 cereal>=0.3 \
- clientsession>=0.9 conduit>=1.0.11 conduit-extra \
- cookie>=0.4.1 data-default exceptions fast-logger>=0.2 \
- http-types>=0.7 lifted-base>=0.1.2 monad-control>=0.3 \
- monad-logger>=0.3.1 mtl parsec>=2 path-pieces>=0.1.2 \
- random>=1.0.0.2 resourcet>=0.4.9 safe shakespeare>=1.0 \
- text>=0.7 transformers-base>=0.4 unix-compat vector>=0.9 \
- wai>=1.4 wai-extra>=1.3 wai-logger>=0.2 warp>=1.3.8 \
- yesod-routes>=1.2
+ clientsession>=0.9.1 conduit>=1.2 conduit-extra cookie>=0.4.1 \
+ data-default exceptions>=0.6 fast-logger>=2.2 http-types>=0.7 \
+ lifted-base>=0.1.2 monad-control>=0.3 monad-logger>=0.3.1 mtl \
+ mwc-random old-locale>=1.0.0.2 parsec>=2 path-pieces>=0.1.2 \
+ primitive random>=1.0.0.2 resourcet>=0.4.9 safe semigroups \
+ shakespeare>=2.0 text>=0.7 transformers-base>=0.4 unix-compat \
+ unordered-containers>=0.2 vector>=0.9 wai>=3.0 \
+ wai-extra>=3.0.5 wai-logger>=0.2 warp>=3.0.2 word8
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-core/distinfo b/www/hs-yesod-core/distinfo
index bd6bedf..6ea6b64 100644
--- a/www/hs-yesod-core/distinfo
+++ b/www/hs-yesod-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-core-1.2.19.tar.gz) = 3422d2042af60ed5bf71fdb71934b289e69a35d6cbe3adc7561e877c3f7a9b36
-SIZE (cabal/yesod-core-1.2.19.tar.gz) = 62546
+SHA256 (cabal/yesod-core-1.4.13.tar.gz) = 219bf0858977468d9aa74ab5f2d330e46bbbe95d700c989b3565be5d99d319da
+SIZE (cabal/yesod-core-1.4.13.tar.gz) = 81300
diff --git a/www/hs-yesod-core/files/patch-yesod-core.cabal b/www/hs-yesod-core/files/patch-yesod-core.cabal
deleted file mode 100644
index c27fac0..0000000
--- a/www/hs-yesod-core/files/patch-yesod-core.cabal
+++ /dev/null
@@ -1,40 +0,0 @@
---- ./yesod-core.cabal.orig 2014-06-09 09:45:07.000000000 +0200
-+++ ./yesod-core.cabal 2014-07-13 01:09:02.000000000 +0200
-@@ -32,11 +32,7 @@
- , text >= 0.7
- , template-haskell
- , path-pieces >= 0.1.2 && < 0.2
-- , hamlet >= 1.1
- , shakespeare >= 1.0 && < 2.1
-- , shakespeare-js >= 1.0.2
-- , shakespeare-css >= 1.0
-- , shakespeare-i18n >= 1.0
- , blaze-builder >= 0.2.1.4 && < 0.4
- , transformers >= 0.2.2
- , mtl
-@@ -60,7 +56,6 @@
- , conduit >= 1.0.11
- , resourcet >= 0.4.9 && < 1.2
- , lifted-base >= 0.1.2
-- , attoparsec-conduit
- , blaze-html >= 0.5
- , blaze-markup >= 0.5.1
- , data-default
-@@ -111,9 +106,6 @@
- ,wai
- ,yesod-core
- ,bytestring
-- ,hamlet
-- ,shakespeare-css
-- ,shakespeare-js
- ,text
- ,http-types
- , random
-@@ -142,7 +134,6 @@
- , criterion
- , bytestring
- , text
-- , hamlet
- , transformers
- , yesod-core
- , blaze-html
diff --git a/www/hs-yesod-form/Makefile b/www/hs-yesod-form/Makefile
index 1f909b5..cb8280a 100644
--- a/www/hs-yesod-form/Makefile
+++ b/www/hs-yesod-form/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-form
-PORTVERSION= 1.3.14
-PORTREVISION= 1
+PORTVERSION= 1.4.4.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,9 +11,11 @@ LICENSE= MIT
USE_CABAL= aeson attoparsec>=0.10 blaze-builder>=0.2.1.4 blaze-html>=0.5 \
blaze-markup>=0.5.1 byteable data-default email-validate>=1.0 \
- network>=2.2 persistent>=1.2 resourcet shakespeare text>=0.9 \
- wai>=1.3 xss-sanitize>=0.3.0.1 yesod-core>=1.2 \
- yesod-persistent>=1.2
+ network>=2.6 network-uri>=2.6 persistent resourcet semigroups \
+ shakespeare>=2.0 text>=0.9 wai>=1.3 xss-sanitize>=0.3.0.1 \
+ yesod-core>=1.4 yesod-persistent>=1.4
+
+FLAGS_ENABLE= network-uri
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-form/distinfo b/www/hs-yesod-form/distinfo
index 08fdcc5..4f6460a 100644
--- a/www/hs-yesod-form/distinfo
+++ b/www/hs-yesod-form/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-form-1.3.14.tar.gz) = 509f3c230fb33a4ddfab8f00392439248ea1acc413d18a3f221eb863b2a25d28
-SIZE (cabal/yesod-form-1.3.14.tar.gz) = 24300
+SHA256 (cabal/yesod-form-1.4.4.1.tar.gz) = 83aec216b6c5179c373d1b76ab3cca219ebacc98db2e5163400228b632dc6493
+SIZE (cabal/yesod-form-1.4.4.1.tar.gz) = 29487
diff --git a/www/hs-yesod-form/files/patch-yesod-form.cabal b/www/hs-yesod-form/files/patch-yesod-form.cabal
deleted file mode 100644
index 5f7ff91..0000000
--- a/www/hs-yesod-form/files/patch-yesod-form.cabal
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./yesod-form.cabal.orig 2014-06-09 09:46:28.000000000 +0200
-+++ ./yesod-form.cabal 2014-07-13 02:03:44.000000000 +0200
-@@ -17,10 +17,7 @@
- , yesod-core >= 1.2 && < 1.3
- , yesod-persistent >= 1.2 && < 1.3
- , time >= 1.1.4
-- , hamlet >= 1.1.8
- , shakespeare
-- , shakespeare-css >= 1.0
-- , shakespeare-js >= 1.0.2
- , persistent >= 1.2 && < 1.4
- , template-haskell
- , transformers >= 0.2.2
diff --git a/www/hs-yesod-persistent/Makefile b/www/hs-yesod-persistent/Makefile
index bc3a904..d5e1de1 100644
--- a/www/hs-yesod-persistent/Makefile
+++ b/www/hs-yesod-persistent/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-persistent
-PORTVERSION= 1.2.3
-PORTREVISION= 1
+PORTVERSION= 1.4.0.3
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,8 +9,8 @@ COMMENT= Some helpers for using Persistent from Yesod
LICENSE= MIT
-USE_CABAL= blaze-builder conduit persistent>=1.2 persistent-template>=1.2 \
- resource-pool resourcet>=0.4.5 yesod-core>=1.2.2
+USE_CABAL= blaze-builder conduit persistent>=2.1 persistent-template>=2.1 \
+ resource-pool resourcet>=0.4.5 yesod-core>=1.4.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-persistent/distinfo b/www/hs-yesod-persistent/distinfo
index a566e74..3cba6df 100644
--- a/www/hs-yesod-persistent/distinfo
+++ b/www/hs-yesod-persistent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-persistent-1.2.3.tar.gz) = fc3627ff021573cb92403b667e20ebb6194b227f30a189019d288be1cdbfbacd
-SIZE (cabal/yesod-persistent-1.2.3.tar.gz) = 4169
+SHA256 (cabal/yesod-persistent-1.4.0.3.tar.gz) = 6455b79eda028e12caefc9d89808fbc611ece36ef64bab3426f90a26cacf3b5f
+SIZE (cabal/yesod-persistent-1.4.0.3.tar.gz) = 4283
diff --git a/www/hs-yesod-platform/Makefile b/www/hs-yesod-platform/Makefile
deleted file mode 100644
index cef398b..0000000
--- a/www/hs-yesod-platform/Makefile
+++ /dev/null
@@ -1,140 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= yesod-platform
-PORTVERSION= 1.2.13
-# Please note that the port *strictly depends* on certain versions of other
-# ports, so revisit the USE_CABAL line on bumping the portrevision. Thanks!
-PORTREVISION= 1
-
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Meta package for Yesod
-
-LICENSE= MIT
-
-USE_CABAL= ansi-terminal==0.6.1.1_1 \
- ansi-wl-pprint==0.6.7.1_1 \
- asn1-encoding==0.8.1.3_1 \
- asn1-parse==0.8.1_1 \
- asn1-types==0.2.3_1 \
- authenticate==1.3.2.9_1 \
- auto-update==0.1.0.0_1 \
- base16-bytestring==0.1.1.6_1 \
- base64-bytestring==1.0.0.1_7 \
- blaze-builder==0.3.3.2_1 \
- blaze-html==0.7.0.2_1 \
- blaze-markup==0.6.1.0_1 \
- byteable==0.1.1_1 \
- byteorder==1.0.4_6 \
- cereal==0.4.0.1_1 \
- cipher-aes==0.2.8_1 \
- cipher-des==0.0.6_1 \
- cipher-rc4==0.1.4_1 \
- clientsession==0.9.0.3_1 \
- conduit==1.1.7_1 \
- conduit-extra==1.1.3_1 \
- connection==0.2.3_1 \
- cookie==0.4.1.2_1 \
- cprng-aes==0.5.2_1 \
- crypto-api==0.13_1 \
- crypto-cipher-types==0.0.9_1 \
- crypto-numbers==0.2.3_1 \
- crypto-pubkey==0.2.4_1 \
- crypto-pubkey-types==0.4.2.2_1 \
- crypto-random==0.0.7_1 \
- cryptohash==0.11.6_1 \
- cryptohash-conduit==0.1.1_1 \
- css-text==0.1.2.1_1 \
- data-default==0.5.3_6 \
- data-default-class==0.0.1_6 \
- data-default-instances-base==0.0.1_6 \
- data-default-instances-containers==0.0.1_6 \
- data-default-instances-dlist==0.0.1_6 \
- data-default-instances-old-locale==0.0.1_6 \
- dlist==0.7.1_1 \
- email-validate==2.0.1_1 \
- entropy==0.3.2_1 \
- esqueleto==1.4.4_1 \
- exceptions==0.6.1_1 \
- fast-logger==2.2.0_1 \
- file-embed==0.0.7_1 \
- hjsmin==0.1.4.7_1 \
- hspec==1.11.0_1 \
- hspec-expectations==0.6.0.1_1 \
- html-conduit==1.1.0.5_1 \
- http-client==0.3.6.1_1 \
- http-client-tls==0.2.2_1 \
- http-conduit==2.1.4_1 \
- http-date==0.0.4_8 \
- http-reverse-proxy==0.4.0.1_1 \
- http-types==0.8.5_1 \
- language-javascript==0.5.13_1 \
- lifted-base==0.2.3.0_1 \
- mime-mail==0.4.5.2_1 \
- mime-types==0.1.0.4_1 \
- mmorph==1.0.3_1 \
- monad-control==0.3.3.0_1 \
- monad-logger==0.3.7.1_1 \
- monad-loops==0.4.2.1_1 \
- nats==0.2_1 \
- optparse-applicative==0.9.1.1_1 \
- path-pieces==0.1.4_1 \
- pem==0.2.2_1 \
- persistent==1.3.1.1_1 \
- persistent-template==1.3.1.4_1 \
- publicsuffixlist==0.1_6 \
- pwstore-fast==2.4.1_1 \
- quickcheck-io==0.1.1_1 \
- resource-pool==0.2.3.0_1 \
- resourcet==1.1.2.3_1 \
- safe==0.3.7_1 \
- securemem==0.1.3_1 \
- semigroups==0.15.2_1 \
- setenv==0.1.1.1_1 \
- SHA==1.6.4.1_1 \
- shakespeare==2.0.1.1_1 \
- silently==1.2.4.1_7 \
- simple-sendfile==0.2.15_1 \
- skein==1.0.9_1 \
- socks==0.5.4_1 \
- stm-chans==3.0.0.2_1 \
- streaming-commons==0.1.4.1_1 \
- stringsearch==0.3.6.5_1 \
- system-fileio==0.3.14_1 \
- system-filepath==0.4.12_1 \
- tagged==0.7.2_1 \
- tagsoup==0.13.1_1 \
- tagstream-conduit==0.5.5.1_1 \
- tf-random==0.5_1 \
- tls==1.2.8_1 \
- transformers-base==0.4.2_1 \
- utf8-string==0.3.8_1 \
- void==0.6.1_1 \
- wai==3.0.1.1_1 \
- wai-app-static==3.0.0_1 \
- wai-extra==3.0.1.2_1 \
- wai-logger==2.2.0_1 \
- warp==3.0.0.5_1 \
- warp-tls==3.0.0_1 \
- word8==0.1.1_1 \
- x509==1.4.11_1 \
- x509-store==1.4.4_1 \
- x509-system==1.4.5_1 \
- x509-validation==1.5.0_1 \
- xml-conduit==1.2.1_1 \
- xml-types==0.3.4_1 \
- xss-sanitize==0.3.5.2_1 \
- yaml==0.8.8.4_1 \
- yesod==1.2.6.1_1 \
- yesod-auth==1.3.4_1 \
- yesod-auth-hashdb==1.3.0.1_1 \
- yesod-core==1.2.19_1 \
- yesod-form==1.3.14_1 \
- yesod-persistent==1.2.3_1 \
- yesod-routes==1.2.0.7_1 \
- yesod-static==1.2.4_1 \
- yesod-test==1.2.3.2_1 \
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-yesod-platform/distinfo b/www/hs-yesod-platform/distinfo
deleted file mode 100644
index 8d4be86..0000000
--- a/www/hs-yesod-platform/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/yesod-platform-1.2.13.tar.gz) = 547e18f9a4e64ac16ae77ed3975898203cf915c9c280c1c30dcc3a286858e854
-SIZE (cabal/yesod-platform-1.2.13.tar.gz) = 2671
diff --git a/www/hs-yesod-platform/files/patch-yesod-platform.cabal b/www/hs-yesod-platform/files/patch-yesod-platform.cabal
deleted file mode 100644
index 14696b1..0000000
--- a/www/hs-yesod-platform/files/patch-yesod-platform.cabal
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./yesod-platform.cabal.orig 2014-08-05 20:57:15.000000000 +0100
-+++ ./yesod-platform.cabal 2014-08-10 03:02:38.000000000 +0100
-@@ -20,13 +20,11 @@
- , asn1-encoding == 0.8.1.3
- , asn1-parse == 0.8.1
- , asn1-types == 0.2.3
-- , attoparsec-conduit == 1.1.0
- , authenticate == 1.3.2.9
- , auto-update == 0.1.0.0
- , base16-bytestring == 0.1.1.6
- , base64-bytestring == 1.0.0.1
- , blaze-builder == 0.3.3.2
-- , blaze-builder-conduit == 1.1.0
- , blaze-html == 0.7.0.2
- , blaze-markup == 0.6.1.0
- , byteable == 0.1.1
-@@ -63,7 +61,6 @@
- , exceptions == 0.6.1
- , fast-logger == 2.2.0
- , file-embed == 0.0.7
-- , hamlet == 1.2.0
- , hjsmin == 0.1.4.7
- , hspec == 1.11.0
- , hspec-expectations == 0.6.0.1
-@@ -83,7 +80,6 @@
- , monad-logger == 0.3.7.1
- , monad-loops == 0.4.2.1
- , nats == 0.2
-- , network-conduit == 1.1.0
- , optparse-applicative == 0.9.1.1
- , path-pieces == 0.1.4
- , pem == 0.2.2
-@@ -99,10 +95,6 @@
- , semigroups == 0.15.2
- , setenv == 0.1.1.1
- , shakespeare == 2.0.1.1
-- , shakespeare-css == 1.1.0
-- , shakespeare-i18n == 1.1.0
-- , shakespeare-js == 1.3.0
-- , shakespeare-text == 1.1.0
- , silently == 1.2.4.1
- , simple-sendfile == 0.2.15
- , skein == 1.0.9
-@@ -124,7 +116,6 @@
- , wai-app-static == 3.0.0
- , wai-extra == 3.0.1.2
- , wai-logger == 2.2.0
-- , wai-test == 3.0.0
- , warp == 3.0.0.5
- , warp-tls == 3.0.0
- , word8 == 0.1.1
diff --git a/www/hs-yesod-platform/pkg-descr b/www/hs-yesod-platform/pkg-descr
deleted file mode 100644
index c9590d8..0000000
--- a/www/hs-yesod-platform/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Instead of allowing version ranges of dependencies, this package requires
-specific versions to avoid dependency hell.
-
-WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-routes/Makefile b/www/hs-yesod-routes/Makefile
deleted file mode 100644
index a6bc943..0000000
--- a/www/hs-yesod-routes/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= yesod-routes
-PORTVERSION= 1.2.0.7
-PORTREVISION= 1
-CATEGORIES= www haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Efficient routing for Yesod
-
-LICENSE= MIT
-
-USE_CABAL= path-pieces>=0.1 text>=0.5 vector>=0.8
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/www/hs-yesod-routes/distinfo b/www/hs-yesod-routes/distinfo
deleted file mode 100644
index 97861b1..0000000
--- a/www/hs-yesod-routes/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/yesod-routes-1.2.0.7.tar.gz) = d25cd11aef62bb11ea630f758b86f20019dfa1355d36b71bc0b657b8b4b72202
-SIZE (cabal/yesod-routes-1.2.0.7.tar.gz) = 21387
diff --git a/www/hs-yesod-routes/pkg-descr b/www/hs-yesod-routes/pkg-descr
deleted file mode 100644
index 45e5b2d..0000000
--- a/www/hs-yesod-routes/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Provides an efficient routing system, a parser and TH code generation.
-
-WWW: http://www.yesodweb.com/
diff --git a/www/hs-yesod-static/Makefile b/www/hs-yesod-static/Makefile
index 91a8c297..7f74e2e 100644
--- a/www/hs-yesod-static/Makefile
+++ b/www/hs-yesod-static/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-static
-PORTVERSION= 1.2.4
-PORTREVISION= 1
+PORTVERSION= 1.5.0.2
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,10 +13,9 @@ USE_CABAL= async attoparsec>=0.10 base64-bytestring>=0.1.0.1 \
blaze-builder>=0.3 byteable>=0.1 conduit>=0.5 conduit-extra \
cryptohash>=0.11 cryptohash-conduit>=0.1 css-text>=0.1.2 \
data-default file-embed>=0.0.4.1 hashable>=1.1 hjsmin \
- http-types>=0.7 mime-types>=0.1 resourcet>=0.4 \
- shakespeare>=2.0 system-fileio>=0.3 system-filepath>=0.4.6 \
- text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 \
- wai>=1.3 wai-app-static>=1.3.2 yesod-core>=1.2
+ http-types>=0.7 mime-types>=0.1 old-time>=1.0 resourcet>=0.4 \
+ text>=0.9 unix-compat>=0.2 unordered-containers>=0.2 wai>=1.3 \
+ wai-app-static>=3.1 yesod-core>=1.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-static/distinfo b/www/hs-yesod-static/distinfo
index 5d5f582..363c4fd 100644
--- a/www/hs-yesod-static/distinfo
+++ b/www/hs-yesod-static/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-static-1.2.4.tar.gz) = 3f180018dee2e3dd8c306bebdedfd67a8160e8836adc097765a7c95765f8ab64
-SIZE (cabal/yesod-static-1.2.4.tar.gz) = 25099
+SHA256 (cabal/yesod-static-1.5.0.2.tar.gz) = 8aec8fc99df9a9910d7a3f732b669753c01dd3ea4177f9e5a7f8cea936b62ea9
+SIZE (cabal/yesod-static-1.5.0.2.tar.gz) = 25037
diff --git a/www/hs-yesod-static/files/patch-yesod-static.cabal b/www/hs-yesod-static/files/patch-yesod-static.cabal
deleted file mode 100644
index 85d1c2f..0000000
--- a/www/hs-yesod-static/files/patch-yesod-static.cabal
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./yesod-static.cabal.orig 2014-06-09 09:45:32.000000000 +0200
-+++ ./yesod-static.cabal 2014-07-13 02:04:58.000000000 +0200
-@@ -47,7 +47,6 @@
- , system-filepath >= 0.4.6 && < 0.5
- , system-fileio >= 0.3
- , data-default
-- , shakespeare-css >= 1.0.3
- , mime-types >= 0.1
- , hjsmin
- , filepath >= 1.3
-@@ -107,7 +106,6 @@
- , system-filepath
- , system-fileio
- , data-default
-- , shakespeare-css
- , mime-types
- , hjsmin
- , filepath
diff --git a/www/hs-yesod-test/Makefile b/www/hs-yesod-test/Makefile
index db4c958..455e25d 100644
--- a/www/hs-yesod-test/Makefile
+++ b/www/hs-yesod-test/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod-test
-PORTVERSION= 1.2.3.2
-PORTREVISION= 1
+PORTVERSION= 1.4.3.1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,10 @@ COMMENT= Integration testing for WAI/Yesod Applications
LICENSE= MIT
USE_CABAL= attoparsec>=0.10 blaze-builder blaze-html>=0.5 \
- blaze-markup>=0.5.1 case-insensitive>=0.2 cookie hspec>=1.4 \
- html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 monad-control \
- network>=2.2 persistent>=1.0 text wai>=1.3 wai-extra \
- xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.2
+ blaze-markup>=0.5.1 case-insensitive>=0.2 cookie \
+ hspec-core>=2.0 html-conduit>=0.1 http-types>=0.7 HUnit>=1.2 \
+ monad-control network>=2.2 persistent>=1.0 text wai>=3.0 \
+ wai-extra xml-conduit>=1.0 xml-types>=0.3 yesod-core>=1.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod-test/distinfo b/www/hs-yesod-test/distinfo
index 281c8b3..07ab4f7 100644
--- a/www/hs-yesod-test/distinfo
+++ b/www/hs-yesod-test/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-test-1.2.3.2.tar.gz) = a9ebab87f5633bb6979d5714703b8448f1fb6d6278cf37c3d1122d9136a80716
-SIZE (cabal/yesod-test-1.2.3.2.tar.gz) = 13269
+SHA256 (cabal/yesod-test-1.4.3.1.tar.gz) = a29e0173b31aacaa4a0235bfdcc8c7809b8685a9069a1f5b6083f204d1fd1394
+SIZE (cabal/yesod-test-1.4.3.1.tar.gz) = 15284
diff --git a/www/hs-yesod-test/files/patch-yesod-test.cabal b/www/hs-yesod-test/files/patch-yesod-test.cabal
deleted file mode 100644
index 0d0492c..0000000
--- a/www/hs-yesod-test/files/patch-yesod-test.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./yesod-test.cabal.orig 2014-06-09 09:47:25.000000000 +0200
-+++ ./yesod-test.cabal 2014-07-13 02:06:10.000000000 +0200
-@@ -19,7 +19,6 @@
- , persistent >= 1.0
- , transformers >= 0.2.2
- , wai >= 1.3
-- , wai-test >= 1.3
- , wai-extra
- , network >= 2.2
- , http-types >= 0.7
diff --git a/www/hs-yesod/Makefile b/www/hs-yesod/Makefile
index d62b979..0dc663f 100644
--- a/www/hs-yesod/Makefile
+++ b/www/hs-yesod/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= yesod
-PORTVERSION= 1.2.6.1
-PORTREVISION= 1
+PORTVERSION= 1.4.1.5
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,9 +11,10 @@ LICENSE= MIT
USE_CABAL= aeson blaze-html>=0.5 blaze-markup>=0.5.1 conduit-extra \
data-default fast-logger monad-control>=0.3 monad-logger \
- safe shakespeare>=2.0 text unordered-containers wai>=1.3 \
- wai-extra>=1.3 warp>=1.3 yaml yesod-auth>=1.2 \
- yesod-core>=1.2.2 yesod-form>=1.3 yesod-persistent>=1.2
+ safe shakespeare>=2.0 streaming-commons text \
+ unordered-containers wai>=1.3 wai-extra>=1.3 wai-logger \
+ warp>=1.3 yaml yesod-auth>=1.4 yesod-core>=1.4 \
+ yesod-form>=1.3 yesod-persistent>=1.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/www/hs-yesod/distinfo b/www/hs-yesod/distinfo
index 03a4bb5..89afdf1 100644
--- a/www/hs-yesod/distinfo
+++ b/www/hs-yesod/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/yesod-1.2.6.1.tar.gz) = a2c624171e86f4c56f55634d02e72ea911147e1e40d3c322254cc72ed9ba38f6
-SIZE (cabal/yesod-1.2.6.1.tar.gz) = 7846
+SHA256 (cabal/yesod-1.4.1.5.tar.gz) = a1160d366cf2c91502bcd5c8f251041ec8a1bc962729c95d5bc572dbe9f8296b
+SIZE (cabal/yesod-1.4.1.5.tar.gz) = 9570
diff --git a/www/hs-yesod/files/patch-yesod.cabal b/www/hs-yesod/files/patch-yesod.cabal
deleted file mode 100644
index bbd9afd..0000000
--- a/www/hs-yesod/files/patch-yesod.cabal
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./yesod.cabal.orig 2014-06-09 09:48:13.000000000 +0200
-+++ ./yesod.cabal 2014-07-13 03:05:49.000000000 +0200
-@@ -30,16 +30,12 @@
- , transformers >= 0.2.2
- , wai >= 1.3
- , wai-extra >= 1.3
-- , hamlet >= 1.1
-- , shakespeare-js >= 1.0.2
-- , shakespeare-css >= 1.0
- , warp >= 1.3
- , blaze-html >= 0.5
- , blaze-markup >= 0.5.1
- , aeson
- , safe
- , data-default
-- , network-conduit
- , unordered-containers
- , yaml
- , text
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 34c3516..63198c4 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -72,7 +72,6 @@
SUBDIR += hs-OpenGLRaw
SUBDIR += hs-gtk
SUBDIR += hs-gtk2hs
- SUBDIR += hs-gtkglext
SUBDIR += hs-gtksourceview2
SUBDIR += hs-pango
SUBDIR += hs-vte
diff --git a/x11-toolkits/hs-GLURaw/Makefile b/x11-toolkits/hs-GLURaw/Makefile
index e4bc8ef..875fa4f 100644
--- a/x11-toolkits/hs-GLURaw/Makefile
+++ b/x11-toolkits/hs-GLURaw/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= GLURaw
-PORTVERSION= 1.4.0.1
-PORTREVISION= 1
+PORTVERSION= 1.5.0.1
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Raw binding for the OpenGL graphics system
LICENSE= BSD3CLAUSE
-USE_CABAL= OpenGLRaw>=1.3.0.0
+USE_CABAL= OpenGLRaw>=2.4
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-GLURaw/distinfo b/x11-toolkits/hs-GLURaw/distinfo
index 4425dd2..31390a9 100644
--- a/x11-toolkits/hs-GLURaw/distinfo
+++ b/x11-toolkits/hs-GLURaw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/GLURaw-1.4.0.1.tar.gz) = 9655644beb54ff8fac68f2e0fd8a8e9a1e8409272e2e4c963ccce9bcd60e0ecc
-SIZE (cabal/GLURaw-1.4.0.1.tar.gz) = 8445
+SHA256 (cabal/GLURaw-1.5.0.1.tar.gz) = 1b52c2637820c2bea38f40acdd217a68c0dd3849f7ed1308959aa324b6b2c8f1
+SIZE (cabal/GLURaw-1.5.0.1.tar.gz) = 10121
diff --git a/x11-toolkits/hs-GLUT/Makefile b/x11-toolkits/hs-GLUT/Makefile
index a660b1c..ae1e826 100644
--- a/x11-toolkits/hs-GLUT/Makefile
+++ b/x11-toolkits/hs-GLUT/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= GLUT
-PORTVERSION= 2.5.1.1
-PORTREVISION= 1
+PORTVERSION= 2.7.0.1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
@@ -12,7 +11,7 @@ COMMENT= Binding for the OpenGL Utility Toolkit
LICENSE= BSD3CLAUSE
-USE_CABAL= OpenGL>=2.8.0.0 OpenGLRaw>=1.3.0.0
+USE_CABAL= OpenGL>=2.12 OpenGLRaw>=2.3 StateVar>=1.1
USE_GL= glut
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-GLUT/distinfo b/x11-toolkits/hs-GLUT/distinfo
index 802a753..edb9934 100644
--- a/x11-toolkits/hs-GLUT/distinfo
+++ b/x11-toolkits/hs-GLUT/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/GLUT-2.5.1.1.tar.gz) = 4a8177e154ead5a7bcc110f8fe408f9cf720783dde024ac1936cd95b659b2d59
-SIZE (cabal/GLUT-2.5.1.1.tar.gz) = 655292
+SHA256 (cabal/GLUT-2.7.0.1.tar.gz) = fb1ed80beed6dbf1b373839224d11932c20d1c1b571bef81101483099c459c4d
+SIZE (cabal/GLUT-2.7.0.1.tar.gz) = 660437
diff --git a/x11-toolkits/hs-OpenGL/Makefile b/x11-toolkits/hs-OpenGL/Makefile
index dc6f538..2e92500 100644
--- a/x11-toolkits/hs-OpenGL/Makefile
+++ b/x11-toolkits/hs-OpenGL/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= OpenGL
-PORTVERSION= 2.9.2.0
-PORTREVISION= 1
+PORTVERSION= 2.12.0.1
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
@@ -12,7 +11,8 @@ COMMENT= Binding for the OpenGL graphics system
LICENSE= BSD3CLAUSE
-USE_CABAL= GLURaw>=1.3.0.0 OpenGLRaw>=1.4.1.0 text
+USE_CABAL= GLURaw>=1.3 ObjectName>=1.1 OpenGLRaw>=2.1 StateVar>=1.1 \
+ text>=0.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-OpenGL/distinfo b/x11-toolkits/hs-OpenGL/distinfo
index a5b42d4..5966ccc 100644
--- a/x11-toolkits/hs-OpenGL/distinfo
+++ b/x11-toolkits/hs-OpenGL/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenGL-2.9.2.0.tar.gz) = 1758f6cacc9ea8f0d410fd0abc1a19f2a50dffdb62736d66d4e62b20619545e9
-SIZE (cabal/OpenGL-2.9.2.0.tar.gz) = 122514
+SHA256 (cabal/OpenGL-2.12.0.1.tar.gz) = 8b7cfc07cb4cc4a6c45910eeb9fdfe114be1f64090fa0705c3e550794c588ed5
+SIZE (cabal/OpenGL-2.12.0.1.tar.gz) = 125419
diff --git a/x11-toolkits/hs-OpenGL/pkg-descr b/x11-toolkits/hs-OpenGL/pkg-descr
index dfe0057..92ed641 100644
--- a/x11-toolkits/hs-OpenGL/pkg-descr
+++ b/x11-toolkits/hs-OpenGL/pkg-descr
@@ -1,4 +1,4 @@
-A Haskell binding for the OpenGL graphics system (GL, version 3.2) and
+A Haskell binding for the OpenGL graphics system (GL, version 4.5) and
its accompanying utility library (GLU, version 1.3).
OpenGL is the industry's most widely used and supported 2D and 3D
diff --git a/x11-toolkits/hs-OpenGLRaw/Makefile b/x11-toolkits/hs-OpenGLRaw/Makefile
index f7bcc1a..5055ba5 100644
--- a/x11-toolkits/hs-OpenGLRaw/Makefile
+++ b/x11-toolkits/hs-OpenGLRaw/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= OpenGLRaw
-PORTVERSION= 1.5.0.0
-PORTREVISION= 1
+PORTVERSION= 2.5.1.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11-toolkits/hs-OpenGLRaw/distinfo b/x11-toolkits/hs-OpenGLRaw/distinfo
index 071c30d..7bc5fd8 100644
--- a/x11-toolkits/hs-OpenGLRaw/distinfo
+++ b/x11-toolkits/hs-OpenGLRaw/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/OpenGLRaw-1.5.0.0.tar.gz) = 852aa5229722269d70daed3c04b95e9dc7b7013efd62ebc4f2873a81768b9a12
-SIZE (cabal/OpenGLRaw-1.5.0.0.tar.gz) = 102276
+SHA256 (cabal/OpenGLRaw-2.5.1.0.tar.gz) = 33a4100bd89c762658263dc6e5725dd214761d16d5d73907ad42a4d72b11d8cd
+SIZE (cabal/OpenGLRaw-2.5.1.0.tar.gz) = 733570
diff --git a/x11-toolkits/hs-gtk/Makefile b/x11-toolkits/hs-gtk/Makefile
index ef3f24a..cf2bd64 100644
--- a/x11-toolkits/hs-gtk/Makefile
+++ b/x11-toolkits/hs-gtk/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk
-PORTVERSION= 0.12.5.7
-PORTREVISION= 1
+PORTVERSION= 0.13.9
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,8 @@ COMMENT= Binding to the Gtk+ graphical user interface library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.12.5.3 gio>=0.12.5 glib>=0.12.5.4 mtl pango>=0.12.5.3
+USE_CABAL= cairo>=0.13.0.0 gio>=0.13.0 glib>=0.13.0.0 mtl \
+ pango>=0.13.0.0 text>=0.11.0.6
USE_GNOME= gtk20
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-gtk/distinfo b/x11-toolkits/hs-gtk/distinfo
index 9d4f9f3..4cd6fa1 100644
--- a/x11-toolkits/hs-gtk/distinfo
+++ b/x11-toolkits/hs-gtk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtk-0.12.5.7.tar.gz) = 7c1c759dbbd7dec96da17e294d4d91542e731e62e41c9647394394df7a245d41
-SIZE (cabal/gtk-0.12.5.7.tar.gz) = 671695
+SHA256 (cabal/gtk-0.13.9.tar.gz) = 12e0097724002385207b3bb9a0339ad3d7c8d54336bf91d90827193f801ebfd5
+SIZE (cabal/gtk-0.13.9.tar.gz) = 684971
diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 79eaca2..46b9eab 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= gtk2hs
-PORTVERSION= 0.12.5
-PORTREVISION= 1
+PORTVERSION= 0.13
PORTEPOCH= 1
CATEGORIES= x11-toolkits haskell
@@ -13,20 +12,11 @@ COMMENT= GTK2 Binding for Haskell
METAPORT= yes
USE_CABAL= glib gio cairo pango gtk
-FLAGS_DEFINE= GCONF GLADE GSTREAMER GTKGLEXT GTKSOURCEVIEW2 SVGCAIRO VTE WEBKIT SOEGTK
+FLAGS_DEFINE= GCONF GTKSOURCEVIEW2 SVGCAIRO VTE WEBKIT
GCONF_DESC= GConf2 configuration system
GCONF_FLAG_CABAL= gconf
-GLADE_DESC= libglade UI loader
-GLADE_FLAG_CABAL= glade
-
-GSTREAMER_DESC= Media codec library
-GSTREAMER_FLAG_CABAL= gstreamer
-
-GTKGLEXT_DESC= Gtk+ OpenGL extension
-GTKGLEXT_FLAG_CABAL= gtkglext
-
GTKSOURCEVIEW2_DESC= Source code editor
GTKSOURCEVIEW2_FLAG_CABAL= gtksourceview2
@@ -39,8 +29,5 @@ VTE_FLAG_CABAL= vte
WEBKIT_DESC= WebKit rendering engine
WEBKIT_FLAG_CABAL= webkit
-SOEGTK_DESC= Examples for Haskell SoE
-SOEGTK_FLAG_CABAL= soegtk
-
.include "../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-gtk2hs/pkg-descr b/x11-toolkits/hs-gtk2hs/pkg-descr
index 008e26d..f7f0a3b 100644
--- a/x11-toolkits/hs-gtk2hs/pkg-descr
+++ b/x11-toolkits/hs-gtk2hs/pkg-descr
@@ -1,18 +1,17 @@
-Gtk2Hs is a GUI library for Haskell based on Gtk. Gtk is an extensive and
+Gtk2Hs is a GUI library for Haskell based on Gtk+. Gtk+ is an extensive and
mature multi-platform toolkit for creating graphical user interfaces.
Gtk2Hs features:
- * Automatic memory management.
- * Nearly complete coverage of the Gtk+ API.
- * Unicode support.
- * Extensive reference documentation.
- * Support for several related GtK+ and Gnome modules:
- o the cairo vector graphics library.
- o rendering of SVG images using cairo (via librsvg)
- o the Gtk+ OpenGL extension.
- o GConf for storing application preferences.
- o SourceView, an editor widget with syntax highlighting.
- o the Mozilla browser rendering engine in a Gtk+ widget
+ * Automatic memory management.
+ * Nearly complete coverage of the Gtk+ API.
+ * Unicode support.
+ * Extensive reference documentation.
+ * Support for several related GtK+ and Gnome modules:
+ o the cairo vector graphics library.
+ o rendering of SVG images using cairo (via librsvg)
+ o GConf for storing application preferences.
+ o SourceView, an editor widget with syntax highlighting.
+ o the Mozilla browser rendering engine in a Gtk+ widget
WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-gtkglext/Makefile b/x11-toolkits/hs-gtkglext/Makefile
deleted file mode 100644
index 02fbf55..0000000
--- a/x11-toolkits/hs-gtkglext/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= gtkglext
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
-CATEGORIES= x11-toolkits haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Binding to the GTK+ OpenGL Extension
-
-LIB_DEPENDS= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
-
-LICENSE= LGPL21
-
-USES= pkgconfig
-USE_CABAL= glib>=0.12.5.0 gtk>=0.12.5.0 mtl pango>=0.12.5.0
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-gtkglext/distinfo b/x11-toolkits/hs-gtkglext/distinfo
deleted file mode 100644
index 5f00678..0000000
--- a/x11-toolkits/hs-gtkglext/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/gtkglext-0.12.5.0.tar.gz) = 13424d5f80e0ba22f2caf233f5a68a07635f6f77c4f48e6fe3fab28216a30af6
-SIZE (cabal/gtkglext-0.12.5.0.tar.gz) = 31884
diff --git a/x11-toolkits/hs-gtkglext/pkg-descr b/x11-toolkits/hs-gtkglext/pkg-descr
deleted file mode 100644
index 32286f7..0000000
--- a/x11-toolkits/hs-gtkglext/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-GtkGLExt provides the GDK objects to support OpenGL rendering in GTK+, and
-GtkWidget API add-ons to make GTK+ widgets OpenGL-capable.
-
-WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-gtksourceview2/Makefile b/x11-toolkits/hs-gtksourceview2/Makefile
index 5ec5c98..7ad7b7a 100644
--- a/x11-toolkits/hs-gtksourceview2/Makefile
+++ b/x11-toolkits/hs-gtksourceview2/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtksourceview2
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
+PORTVERSION= 0.13.1.3
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the GtkSourceView library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12 gtk>=0.12.5.0 mtl
+USE_CABAL= glib>=0.13 gtk>=0.13.0.0 mtl text
USE_GNOME= gtksourceview2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-gtksourceview2/distinfo b/x11-toolkits/hs-gtksourceview2/distinfo
index 4df78a7..696abc5 100644
--- a/x11-toolkits/hs-gtksourceview2/distinfo
+++ b/x11-toolkits/hs-gtksourceview2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/gtksourceview2-0.12.5.0.tar.gz) = 49bbd6fe74a9a3c9e1439231f9ed244a05ec10507b7455be05465954b2d3b788
-SIZE (cabal/gtksourceview2-0.12.5.0.tar.gz) = 57462
+SHA256 (cabal/gtksourceview2-0.13.1.3.tar.gz) = 0eba5ee51206a8d99d4d4c4e24e0801492731fb2a67e953da15dbe27a7d328ca
+SIZE (cabal/gtksourceview2-0.13.1.3.tar.gz) = 54310
diff --git a/x11-toolkits/hs-pango/Makefile b/x11-toolkits/hs-pango/Makefile
index d942c46..c4e7587 100644
--- a/x11-toolkits/hs-pango/Makefile
+++ b/x11-toolkits/hs-pango/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pango
-PORTVERSION= 0.12.5.3
-PORTREVISION= 1
+PORTVERSION= 0.13.1.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the Pango text rendering engine
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= cairo>=0.12.5.3 glib>=0.12.5.3 mtl
+USE_CABAL= cairo>=0.13.0.0 glib>=0.13.0.0 mtl text>=0.11.0.6
USE_GNOME= pango
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-pango/distinfo b/x11-toolkits/hs-pango/distinfo
index 557bf99..b7cc2f0 100644
--- a/x11-toolkits/hs-pango/distinfo
+++ b/x11-toolkits/hs-pango/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pango-0.12.5.3.tar.gz) = 2a1d6f647298270e816275d5f5c42f16fcd12ddf8afc55e3fe2b6309febdc4d8
-SIZE (cabal/pango-0.12.5.3.tar.gz) = 60968
+SHA256 (cabal/pango-0.13.1.0.tar.gz) = 1612dbe198f8bbbb394bf043eb06c554d5e1c0dc76cdee186ef925fb8a7ac968
+SIZE (cabal/pango-0.13.1.0.tar.gz) = 61656
diff --git a/x11-toolkits/hs-pango/pkg-descr b/x11-toolkits/hs-pango/pkg-descr
index 6f9a3d3..d2356f4 100644
--- a/x11-toolkits/hs-pango/pkg-descr
+++ b/x11-toolkits/hs-pango/pkg-descr
@@ -1,6 +1,6 @@
This package provides a wrapper around the Pango C library that allows
-high-quality rendering of Unicode text. It can be used either with Cairo to
-output text in PDF, PS or other documents or with Gtk+ to display text
-on-screen.
+high-quality rendering of Unicode text. It can be used either with
+Cairo to output text in PDF, PS or other documents or with Gtk+ to
+display text on-screen.
WWW: http://projects.haskell.org/gtk2hs/
diff --git a/x11-toolkits/hs-vte/Makefile b/x11-toolkits/hs-vte/Makefile
index 68b73d6..cfc1f39 100644
--- a/x11-toolkits/hs-vte/Makefile
+++ b/x11-toolkits/hs-vte/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vte
-PORTVERSION= 0.12.5.0
-PORTREVISION= 1
+PORTVERSION= 0.13.0.2
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Binding to the VTE library
LICENSE= LGPL21
USES= pkgconfig
-USE_CABAL= glib>=0.12.5.0 gtk>=0.12.5.0 mtl pango>=0.12.5.0
+USE_CABAL= glib>=0.13.0.0 gtk>=0.13.0.0 mtl pango>=0.13.0.0
USE_GNOME= vte
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-toolkits/hs-vte/distinfo b/x11-toolkits/hs-vte/distinfo
index bda7260..e3eae83 100644
--- a/x11-toolkits/hs-vte/distinfo
+++ b/x11-toolkits/hs-vte/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vte-0.12.5.0.tar.gz) = 7a49dc54b7b69bf920c7269c5e29e34adfe531a4e7dcd37e5f3d4616033cc03e
-SIZE (cabal/vte-0.12.5.0.tar.gz) = 41210
+SHA256 (cabal/vte-0.13.0.2.tar.gz) = 70e8f81e5e44beb9eba66959792af7648ab9238c758ed359bda3f78933427ef0
+SIZE (cabal/vte-0.13.0.2.tar.gz) = 37954
diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index 743434e..5ded32e 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= wx
-PORTVERSION= 0.90.1.0
-PORTREVISION= 1
+PORTVERSION= 0.91.0.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell
-USE_CABAL= stm wxcore>=0.90.1.0
+USE_CABAL= stm wxcore>=0.91
USE_WX= 3.0
WX_COMPS= wx
diff --git a/x11-toolkits/hs-wx/distinfo b/x11-toolkits/hs-wx/distinfo
index 66eb7f0..d9f452e 100644
--- a/x11-toolkits/hs-wx/distinfo
+++ b/x11-toolkits/hs-wx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wx-0.90.1.0.tar.gz) = c94e6ac36aa019e091098d871d4c39eb3f6735f6ef03e6093b7bb0715aaec998
-SIZE (cabal/wx-0.90.1.0.tar.gz) = 48667
+SHA256 (cabal/wx-0.91.0.0.tar.gz) = 5eba8936c4e783bb0d97ea8b8bc4140a0ff13e7529f5a2c2e1be63b707936c8c
+SIZE (cabal/wx-0.91.0.0.tar.gz) = 48926
diff --git a/x11-toolkits/hs-wx/files/patch-src_Graphics_UI_WX_Window.hs b/x11-toolkits/hs-wx/files/patch-src_Graphics_UI_WX_Window.hs
new file mode 100644
index 0000000..74bf20e
--- /dev/null
+++ b/x11-toolkits/hs-wx/files/patch-src_Graphics_UI_WX_Window.hs
@@ -0,0 +1,8 @@
+--- src/Graphics/UI/WX/Window.hs.orig 2014-08-11 14:58:24 UTC
++++ src/Graphics/UI/WX/Window.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
++{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, FlexibleContexts #-}
+ --------------------------------------------------------------------------------
+ {-| Module : Window
+ Copyright : (c) Daan Leijen 2003
diff --git a/x11-toolkits/hs-wxc/Makefile b/x11-toolkits/hs-wxc/Makefile
index 606ad39..22d0e90 100644
--- a/x11-toolkits/hs-wxc/Makefile
+++ b/x11-toolkits/hs-wxc/Makefile
@@ -1,16 +1,13 @@
# $FreeBSD$
PORTNAME= wxc
-PORTVERSION= 0.90.1.1
-PORTREVISION= 1
+PORTVERSION= 0.91.0.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell C++ wrapper
-BROKEN_FreeBSD_9= does not build
-
-USE_CABAL= wxdirect>=0.90.1.0
+USE_CABAL= wxdirect>=0.91
USES= dos2unix
USE_WX= 3.0
@@ -27,10 +24,12 @@ post-patch::
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.if ${OSVERSION} >= 1000000
-EXTRA_PATCHES+= ${PATCHDIR}/nopatch0-wxc.cabal
-.else
-EXTRA_PATCHES+= ${PATCHDIR}/nopatch1-wxc.cabal
+.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG}
+LIB_DEPENDS+= libc++.so.1:${PORTSDIR}/devel/libc++
+
+.if ${OSVERSION} < 1000000
+CONFIGURE_ARGS+= --extra-include-dirs=${LOCALBASE}/include/c++/v1
+.endif
.endif
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-wxc/distinfo b/x11-toolkits/hs-wxc/distinfo
index a8f612b..30e3b46 100644
--- a/x11-toolkits/hs-wxc/distinfo
+++ b/x11-toolkits/hs-wxc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxc-0.90.1.1.tar.gz) = ec71deebafdb69e50742acf1a4307ab2706f3282d24022a8a603eb3d35bc6e33
-SIZE (cabal/wxc-0.90.1.1.tar.gz) = 183992
+SHA256 (cabal/wxc-0.91.0.0.tar.gz) = 4a8fb2ce231222dec30c40b6f6eae2afc14485a0b4376f7fa49e3624a0582a6a
+SIZE (cabal/wxc-0.91.0.0.tar.gz) = 185224
diff --git a/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal b/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal
deleted file mode 100644
index 1e5363f..0000000
--- a/x11-toolkits/hs-wxc/files/nopatch0-wxc.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./wxc.cabal.orig 2014-03-22 21:53:20.000000000 +0100
-+++ ./wxc.cabal 2014-07-20 08:09:51.000000000 +0200
-@@ -161,6 +161,8 @@
- base >= 4 && < 5,
- wxdirect >= 0.90.1.0
-
-+ cc-options: -std=c++11
-+
- x-dll-sources:
- src/cpp/apppath.cpp
- src/cpp/dragimage.cpp
diff --git a/x11-toolkits/hs-wxc/files/patch-Setup.hs b/x11-toolkits/hs-wxc/files/patch-Setup.hs
new file mode 100644
index 0000000..fa20a1a
--- /dev/null
+++ b/x11-toolkits/hs-wxc/files/patch-Setup.hs
@@ -0,0 +1,42 @@
+--- Setup.hs.orig 2014-08-11 14:25:54 UTC
++++ Setup.hs
+@@ -12,7 +12,7 @@ import Distribution.Simple.LocalBuildInf
+ import Distribution.Simple.PackageIndex(SearchResult (..), searchByName )
+ import Distribution.Simple.Program (ConfiguredProgram (..), lookupProgram, runProgram, simpleProgram, locationPath)
+ import Distribution.Simple.Setup ( BuildFlags, ConfigFlags
+- , CopyDest(..), CopyFlags, copyVerbosity
++ , CopyDest(..), CopyFlags, copyVerbosity, copyDest
+ , InstallFlags, installVerbosity
+ , fromFlag
+ )
+@@ -480,16 +480,17 @@ ldconfig path = case buildOS of
+ otherwise -> error "Couldn't execute ldconfig, ensure it is on your path"
+
+ myCopyHook :: PackageDescription -> LocalBuildInfo -> UserHooks -> CopyFlags -> IO ()
+-myCopyHook = hookHelper (fromFlag . copyVerbosity) (copyHook simpleUserHooks)
++myCopyHook = hookHelper (fromFlag . copyVerbosity) (fromFlag . copyDest) (copyHook simpleUserHooks)
+
+ myInstHook :: PackageDescription -> LocalBuildInfo -> UserHooks -> InstallFlags -> IO ()
+-myInstHook = hookHelper (fromFlag . installVerbosity) (instHook simpleUserHooks)
++myInstHook = hookHelper (fromFlag . installVerbosity) (const NoCopyDest) (instHook simpleUserHooks)
+
+ hookHelper ::
+ (a -> Verbosity) ->
++ (a -> CopyDest) ->
+ (PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()) ->
+ PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
+-hookHelper verbosity origHook pkg_descr local_bld_info user_hooks flags =
++hookHelper verbosity copyDest origHook pkg_descr local_bld_info user_hooks flags =
+ do
+ -- Perform simpleUserHooks (copyHook/instHook => to copy installIncludes)
+ origHook pkg_descr local_bld_info user_hooks flags
+@@ -504,8 +505,7 @@ hookHelper verbosity origHook pkg_descr
+ dll_name = fromJust (lookup "x-dll-name" custom_bi)
+ lib_name = sharedLibName ver dll_name
+
+- inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info NoCopyDest
++ inst_lib_dir = libdir $ absoluteInstallDirs pkg_descr local_bld_info (copyDest flags)
+
+ installOrdinaryFile (verbosity flags) (bld_dir </> lib_name) (inst_lib_dir </> lib_name)
+- ldconfig inst_lib_dir
+
diff --git a/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal b/x11-toolkits/hs-wxc/files/patch-wxc.cabal
index dfab6a3..cc04480 100644
--- a/x11-toolkits/hs-wxc/files/nopatch1-wxc.cabal
+++ b/x11-toolkits/hs-wxc/files/patch-wxc.cabal
@@ -1,10 +1,10 @@
---- wxc.cabal.orig 2015-01-16 21:06:43 UTC
+--- wxc.cabal.orig 2014-08-11 14:25:54 UTC
+++ wxc.cabal
@@ -161,6 +161,8 @@ library
base >= 4 && < 5,
- wxdirect >= 0.90.1.0
-
-+ extra-libraries: stdc++
+ wxdirect >= 0.90.1.1
+
++ cc-options: -std=c++11
+
x-dll-sources:
src/cpp/apppath.cpp
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index ac001e8..3732f0d 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= wxcore
-PORTVERSION= 0.90.1.1
-PORTREVISION= 1
+PORTVERSION= 0.91.0.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= wxHaskell core
-USE_CABAL= parsec stm wxc>=0.90.1.0 wxdirect>=0.90.1.0
+USE_CABAL= parsec stm wxc>=0.91 wxdirect>=0.91
USE_WX= 3.0
WX_COMPS= wx
diff --git a/x11-toolkits/hs-wxcore/distinfo b/x11-toolkits/hs-wxcore/distinfo
index a120a76..7f47fdf 100644
--- a/x11-toolkits/hs-wxcore/distinfo
+++ b/x11-toolkits/hs-wxcore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxcore-0.90.1.1.tar.gz) = f7b5a63d0d2fbaef6e8ffb9565ac30b347ece2efd0483dfe1e89ac839cdc46d5
-SIZE (cabal/wxcore-0.90.1.1.tar.gz) = 358007
+SHA256 (cabal/wxcore-0.91.0.0.tar.gz) = 7f52bcb0412f50fa77677a7fe9d45d087a2c9d623b89c03d9d327a18b557fb06
+SIZE (cabal/wxcore-0.91.0.0.tar.gz) = 364439
diff --git a/x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs b/x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs
deleted file mode 100644
index 7bbb713..0000000
--- a/x11-toolkits/hs-wxcore/files/patch-src__haskell__Graphics__UI__WXCore__Events.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/haskell/Graphics/UI/WXCore/Events.hs.orig 2012-07-04 12:29:32.000000000 +0200
-+++ ./src/haskell/Graphics/UI/WXCore/Events.hs 2013-05-04 03:24:48.030431193 +0200
-@@ -239,6 +239,7 @@
-
- import Data.List( intersperse, findIndex )
- import System.Environment( getProgName, getArgs )
-+import Foreign.C.Types ( CInt(..) )
- import Foreign.StablePtr
- import Foreign.Ptr
- import Foreign.C.String
diff --git a/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal b/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal
deleted file mode 100644
index 7916937..0000000
--- a/x11-toolkits/hs-wxcore/files/patch-wxcore.cabal
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./wxcore.cabal.orig 2014-03-22 22:01:18.000000000 +0100
-+++ ./wxcore.cabal 2014-07-14 00:59:34.000000000 +0200
-@@ -78,11 +78,11 @@
-
- if flag(splitBase)
- build-depends:
-- array >= 0.2 && < 0.5,
-+ array >= 0.2 && < 0.6,
- base >= 4 && < 5,
- containers >= 0.2 && < 0.6
- else
- build-depends:
-- array >= 0.1 && < 0.3,
-+ array >= 0.1 && < 0.6,
- base >= 3 && < 4,
- containers >= 0.1 && < 0.3
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index cf7b9ac..5e96abc 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= wxdirect
-PORTVERSION= 0.90.1.1
-PORTREVISION= 1
+PORTVERSION= 0.91.0.0
CATEGORIES= x11-toolkits haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,6 +9,7 @@ COMMENT= Helper tool for building wxHaskell
LICENSE= BSD3CLAUSE
+USES= dos2unix
USE_CABAL= parsec>=2.1.0 strict
EXECUTABLE= wxdirect
diff --git a/x11-toolkits/hs-wxdirect/distinfo b/x11-toolkits/hs-wxdirect/distinfo
index 34d3f2d..9d81076 100644
--- a/x11-toolkits/hs-wxdirect/distinfo
+++ b/x11-toolkits/hs-wxdirect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxdirect-0.90.1.1.tar.gz) = 282968b7fc52ed67f1efaf357cac05ffad58b7f80128062549801b6309ed7045
-SIZE (cabal/wxdirect-0.90.1.1.tar.gz) = 29893
+SHA256 (cabal/wxdirect-0.91.0.0.tar.gz) = 475c9f977576f1ea881461d7ac729caa71c0b5958db8500fab9b3de57ddcb49f
+SIZE (cabal/wxdirect-0.91.0.0.tar.gz) = 30044
diff --git a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
index 153e628..0be7b49 100644
--- a/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
+++ b/x11-toolkits/hs-wxdirect/files/patch-wxdirect.cabal
@@ -1,11 +1,13 @@
---- ./wxdirect.cabal.orig 2014-03-22 15:08:59.000000000 +0100
-+++ ./wxdirect.cabal 2014-07-13 01:10:34.000000000 +0200
-@@ -51,7 +51,7 @@
+--- wxdirect.cabal.orig 2014-08-11 12:05:43 UTC
++++ wxdirect.cabal
+@@ -49,8 +49,8 @@ executable wxdirect
+ directory,
+ parsec >= 2.1.0 && < 4,
strict,
- time >= 1.0 && < 1.5,
- filepath < 1.4,
-- process >= 1.1 && < 1.2
-+ process >= 1.1 && < 1.3
+- time >= 1.0 && < 1.5,
+- filepath < 1.4,
++ time >= 1.0 && < 1.6,
++ filepath < 1.5,
+ process >= 1.1 && < 1.3
if flag(splitBase)
- build-depends:
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index f00b9c5..561c625 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xmonad-contrib
-PORTVERSION= 0.11.3
-PORTREVISION= 2
+PORTVERSION= 0.11.4
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,8 @@ COMMENT= Third-party extensions for xmonad
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions mtl>=1 random utf8-string X11>=1.6.1 \
- xmonad>=0.11
+USE_CABAL= extensible-exceptions mtl>=1 old-time random utf8-string \
+ X11>=1.6.1 xmonad>=0.11
USE_XORG= x11
RUN_DEPENDS+= bash:${PORTSDIR}/shells/bash
@@ -24,5 +23,7 @@ XFT_DESC= Use Xft to render text
XFT_FLAG_ENABLE= use_xft
XFT_FLAG_CABAL= X11-xft>=0.2
+FLAGS_DISABLE= testing
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad-contrib/distinfo b/x11-wm/hs-xmonad-contrib/distinfo
index e39158a..7ccfe7a 100644
--- a/x11-wm/hs-xmonad-contrib/distinfo
+++ b/x11-wm/hs-xmonad-contrib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-contrib-0.11.3.tar.gz) = aae39e11681fe8e8763d203ed6964a7e18b1558d8b8322b9ae5e523f46de0992
-SIZE (cabal/xmonad-contrib-0.11.3.tar.gz) = 401707
+SHA256 (cabal/xmonad-contrib-0.11.4.tar.gz) = a379b3d4f2d3d8793d6c76812e90cbb055fa0598cfba944af47139bb77e2acbc
+SIZE (cabal/xmonad-contrib-0.11.4.tar.gz) = 401743
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index b50229e..ce204d7 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xmonad
-PORTVERSION= 0.11
-PORTREVISION= 10
+PORTVERSION= 0.11.1
CATEGORIES= x11-wm haskell
MAINTAINER= haskell@FreeBSD.org
@@ -22,6 +21,8 @@ EXECUTABLE= xmonad
OPTIONS_DEFINE+= XFORK_FIX
OPTIONS_DEFAULT+= XFORK_FIX
+FLAGS_DISABLE= testing
+
XFORK_FIX_DESC= Apply workaround for losing hotkeys (XMonad \#576)
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index 175ac67..c48469c 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmonad-0.11.tar.gz) = e5bd36d5184facad66acf2688b02922bfc6de32b576758f4b00688253c425bdb
-SIZE (cabal/xmonad-0.11.tar.gz) = 59119
+SHA256 (cabal/xmonad-0.11.1.tar.gz) = 39e0bf227df782d7a5799c811ad0d8b70c9d6eaaa94e8cc395fcf25895d6d2dd
+SIZE (cabal/xmonad-0.11.1.tar.gz) = 59307
diff --git a/x11-wm/hs-xmonad/files/patch-xmonad.cabal b/x11-wm/hs-xmonad/files/patch-xmonad.cabal
new file mode 100644
index 0000000..31e0825
--- /dev/null
+++ b/x11-wm/hs-xmonad/files/patch-xmonad.cabal
@@ -0,0 +1,11 @@
+--- xmonad.cabal.orig 2015-03-27 17:59:21 UTC
++++ xmonad.cabal
+@@ -58,7 +58,7 @@ library
+ else
+ build-depends: base < 3
+ build-depends: X11>=1.5 && < 1.7, mtl, unix,
+- utf8-string >= 0.3 && < 0.4
++ utf8-string >= 0.3
+
+ if true
+ ghc-options: -funbox-strict-fields -Wall
diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index 3240ded..17eabcb 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -2,7 +2,7 @@
PORTNAME= X11-xft
PORTVERSION= 0.3.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index 03ca9b6..cc6f165 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -3,7 +3,7 @@
PORTNAME= X11
PORTVERSION= 1.6.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index e92fca8..15e104d 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xmobar
-PORTVERSION= 0.21
-PORTREVISION= 1
+PORTVERSION= 0.23.1
CATEGORIES= x11 haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,8 +10,9 @@ COMMENT= Minimalistic text-based status bar
LICENSE= BSD3CLAUSE
-USE_CABAL= HTTP>=4000 mtl>=2.0 parsec regex-compat stm>=2.3 \
- utf8-string X11>=1.6.1
+USE_CABAL= HTTP>=4000.2.4 mtl>=2.1 parsec>=3.1 regex-compat stm>=2.3 \
+ X11>=1.6.1
+USE_XORG= xpm
EXECUTABLE= xmobar
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index cd90d00..d8bd286 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/xmobar-0.21.tar.gz) = f576b6c090db0d8ea8497106dfa8098c529ec620d41d5e2791a47e04d0d20fc0
-SIZE (cabal/xmobar-0.21.tar.gz) = 85387
+SHA256 (cabal/xmobar-0.23.1.tar.gz) = 3b31558373bdb8561f06440da902dd0db8398e5c774fa027931785c263f5567a
+SIZE (cabal/xmobar-0.23.1.tar.gz) = 96169
OpenPOWER on IntegriCloud