aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authortcberner <tcberner@FreeBSD.org>2017-08-09 01:21:45 +0800
committertcberner <tcberner@FreeBSD.org>2017-08-09 01:21:45 +0800
commitee60daaa63bd0c8bb6bda9259c2888d246485683 (patch)
tree45b457da59382af32e809be042d2a1a7cad9e952 /devel
parenta7493fd13477d976d8614619fdeb02d1e3836e7e (diff)
downloadfreebsd-ports-gnome-ee60daaa63bd0c8bb6bda9259c2888d246485683.tar.gz
freebsd-ports-gnome-ee60daaa63bd0c8bb6bda9259c2888d246485683.tar.zst
freebsd-ports-gnome-ee60daaa63bd0c8bb6bda9259c2888d246485683.zip
- Update The Glorious Glasgow Haskell Compiler to version 8.0.2
- Simplified port by only suporting GCC, and creating a build.mk file - Update Pandoc to 1.19.2.1 - Update git-annex to 6.20170520 - Update Darcs to 2.12.5 - Update Gtk2Hs to 0.13.2.2 - Update Agda to 2.5.2 Please note that port revisions for all the Haskell ports without version changes are bumped. See the UPDATING file for instructions. New ports (63): hs-EdisonAPI API for EdisonCore hs-EdisonCore Efficent, purely-functional data structures hs-ListLike Generic support for list-like structures hs-Only Canonical anonymous 1-tuple type hs-aeson-compat Compatibility layer for aeson hs-attoparsec-iso8601 Parsing of ISO 8601 dates hs-base-compat Compatibility with later versions of base hs-call-stack Support call stacks hs-clock Access to high-resolution clocks and timers hs-code-page Adjusting code pages on Windows hs-colour Data type for colors and transparency hs-concurrent-output Ungarble output from several threads hs-cryptohash-md5 Pure MD5 implementation hs-cryptohash-sha1 Pure SHA-1 implementation hs-cryptohash-sha256 Pure SHA-256 implementation hs-data-endian Endian-sensitive data hs-dbus Client for the D-Bus IPC system hs-disk-free-space Retrieving information about disk space usage hs-doctemplates Pandoc-style document templates hs-ed25519 Ed25519 public-key signature system hs-fdo-notify FreeDesktop.org's Desktop Notifications hs-fixed Signed 15.16 precision fixed point arithmetic hs-fmlist FoldMap lists hs-foundation Custom Prelude hs-gitrev Compile-time git revision info hs-graphviz Binding for the GraphViz library hs-hackage-security Tools for securing the Hackage package server hs-half Half-precision floating-point hs-haskell-lexer Fully compliant Haskell 98 lexer hs-http-api-data Converting types to and from HTTP API data hs-integer-logarithms Integer logarithms implementation hs-io-streams Easy-to-use primitives for I/O using streams hs-io-streams-haproxy HAProxy protocol version 1.5 support hs-magic Binding to the libmagic library hs-microlens Microlens hs-microlens-th Automated generation of lenses hs-microstache Mustache templates hs-monad-unlift Type classes for unlifting monad transformers hs-monadplus Partial maps and filters over MonadPlus hs-mono-traversable-instances Extra type classes for mono-traversable hs-mountpoints Listing currently mounted filesystems hs-newtype-generics Full replacement of newtype hs-pretty-show Working with derived Show instances hs-process-extras Read process input/output as ByteString/Text hs-psqueues Priority Search Queues hs-readable Reading data types from ByteString/Text hs-refact Data type for apply-refact hs-regex-pcre PCRE backend to accompany regex-base hs-safe-exceptions Safe, consistent, and easy exception handling hs-say Send messages to handles in a thread-safe way hs-scanner Incremental combinator parser for ByteStrings hs-skylighting Syntax highlighting library binding hs-terminal-size Get terminal window sizes without ncurses hs-text-short Data type for keeping short strings in memory hs-th-abstraction Inspecting types via Template Haskell hs-th-lift Derive Template Haskell's Lift class hs-th-lift-instances Orphan instances for commonly used types hs-tls-session-manager TLS session manager hs-typed-process Launching/interaction with external processes hs-unexceptionalio IO without non-error/synchronous exceptions hs-uri-bytestring RFC3986 compliant URI parser hs-uri-bytestring-aeson Aeson instance for URI.ByteString hs-wl-pprint-text Version of wl-pprint to use Text Updated ports (314): hs-ALUT 2.4.0.0_1 --> 2.4.0.2 hs-Agda 2.4.2.3 --> 2.5.2 hs-Agda-stdlib 0.9_1 --> 0.13 hs-BNFC 2.8 --> 2.8.1 hs-Boolean 0.2.3 --> 0.2.4 hs-DAV 1.0.7 --> 1.3.1 hs-DRBG 0.5.4 --> 0.5.5 hs-Diff 0.3.2 --> 0.3.4 hs-GLURaw 1.5.0.1 --> 2.0.0.3 hs-GLUT 2.7.0.1_1,1 --> 2.7.0.12,1 hs-Glob 0.7.5_2 --> 0.8.0 hs-HStringTemplate 0.8.3 --> 0.8.6 hs-HTTP 4000.2.20 --> 4000.3.7 hs-HUnit 1.2.5.2_7 --> 1.6.0.0 hs-HaXml 1.25.3 --> 1.25.4 hs-HsOpenSSL 0.11.1.1 --> 0.11.4.9 hs-JuicyPixels 3.2.6 --> 3.2.8.2 hs-List 0.5.2 --> 0.6.0 hs-MemoTrie 0.6.2_2 --> 0.6.8 hs-MissingH 1.3.0.1 --> 1.4.0.1 hs-MonadRandom 0.4 --> 0.5.1 hs-ObjectName 1.1.0.0 --> 1.1.0.1 hs-OpenAL 1.7.0.0 --> 1.7.0.4 hs-OpenGL 2.12.0.1,1 --> 3.0.2.0,1 hs-OpenGLRaw 2.5.1.0_1 --> 3.2.4.0 hs-QuickCheck 2.8.1 --> 2.10.0.1 hs-RSA 2.1.0.1 --> 2.3.0 hs-ReadArgs 1.2.2 --> 1.2.3 hs-STMonadTrans 0.3.3 --> 0.4.3 hs-StateVar 1.1.0.1 --> 1.1.0.4 hs-TypeCompose 0.9.10_2 --> 0.9.12 hs-activehs 0.3.1_12 --> 0.3.2 hs-activehs-base 0.3.0.2_9 --> 0.3.0.4 hs-adjunctions 4.2.1 --> 4.3 hs-aeson 0.8.0.2 --> 1.2.1.0 hs-aeson-pretty 0.7.2 --> 0.8.5 hs-alex 3.1.4 --> 3.2.1 hs-ansi-terminal 0.6.2.1 --> 0.6.3.1 hs-asn1-data 0.7.1_9 --> 0.7.2 hs-asn1-encoding 0.9.0 --> 0.9.5 hs-asn1-parse 0.9.1 --> 0.9.4 hs-asn1-types 0.3.0 --> 0.3.2 hs-async 2.0.2 --> 2.1.1.1 hs-atomic-primops 0.8 --> 0.8.0.4 hs-attoparsec 0.12.1.6 --> 0.13.1.0 hs-authenticate 1.3.2.11 --> 1.3.3.2 hs-auto-update 0.1.2.2 --> 0.1.4 hs-aws 0.12.1 --> 0.16 hs-base-orphans 0.4.4 --> 0.6 hs-basic-prelude 0.5.0 --> 0.6.1.1 hs-bifunctors 5 --> 5.4.2 hs-blaze-builder 0.4.0.1 --> 0.4.0.2 hs-blaze-html 0.8.1.0 --> 0.9.0.1 hs-blaze-markup 0.7.0.2 --> 0.8.0.0 hs-brainfuck 0.1.0.2 --> 0.1.0.3 hs-c2hs 0.28.1_1 --> 0.28.2_1 hs-cabal-install 1.22.6.0 --> 1.24.0.2 hs-cairo 0.13.1.0 --> 0.13.3.1 hs-case-insensitive 1.2.0.4 --> 1.2.0.10 hs-cassava 0.4.3.1 --> 0.5.0.0 hs-cereal 0.4.1.1 --> 0.5.4.0 hs-cgi 3001.2.2.2,1 --> 3001.3.0.2,1 hs-checkers 0.4.3 --> 0.4.7 hs-chunked-data 0.2.0 --> 0.3.0 hs-cipher-aes128 0.7.0.1 --> 0.7.0.3 hs-classy-prelude 0.12.1.1 --> 1.2.0.1 hs-classy-prelude-conduit 0.12.0.1 --> 1.2.0 hs-clientsession 0.9.1.1 --> 0.9.1.2 hs-cmark 0.4.0.1 --> 0.5.5.1 hs-cmdargs 0.10.13 --> 0.10.17 hs-comonad 4.2.7.2 --> 5.0.1 hs-conduit 1.2.5 --> 1.2.11 hs-conduit-combinators 1.0.3 --> 1.1.1 hs-conduit-extra 1.1.9.1 --> 1.1.16 hs-connection 0.2.5 --> 0.2.8 hs-constraints 0.4.1.3 --> 0.9.1 hs-contravariant 1.3.2 --> 1.4 hs-cookie 0.4.1.6 --> 0.4.2.1 hs-cpphs 1.19 --> 1.20.8 hs-criterion 1.1.0.0 --> 1.2.1.0 hs-cryptohash 0.11.6_2 --> 0.11.9 hs-cryptohash-cryptoapi 0.1.3_2 --> 0.1.4 hs-cryptonite 0.6 --> 0.24 hs-css-text 0.1.2.1_2 --> 0.1.2.2 hs-darcs 2.10.1 --> 2.12.5 hs-data-default 0.5.3_7 --> 0.7.1.1 hs-data-default-class 0.0.1_7 --> 0.1.2.0 hs-data-default-instances-base 0.0.1_7 --> 0.1.0.1 hs-data-lens 2.10.7 --> 2.11.1 hs-data-lens-template 2.1.9 --> 2.2 hs-data-pprint 0.2.4 --> 0.2.4.1 hs-deepseq-generics 0.1.1.2 --> 0.2.0.0 hs-dia-base 0.1.1.3 --> 0.1.1.4 hs-directory-tree 0.12.0_2 --> 0.12.1 hs-distributive 0.4.4_2 --> 0.5.2 hs-dlist 0.7.1.1 --> 0.8.0.3 hs-dlist-instances 0.1_2 --> 0.1.1.1 hs-dns 2.0.0 --> 2.0.10 hs-double-conversion 2.0.1.0 --> 2.0.2.0 hs-either 4.4.1 --> 4.4.1.1 hs-ekg 0.4.0.8 --> 0.4.0.13 hs-ekg-core 0.1.1.0 --> 0.1.1.1 hs-ekg-json 0.1.0.0 --> 0.1.0.5 hs-email-validate 2.1.3 --> 2.3 hs-enclosed-exceptions 1.0.1.1 --> 1.0.2 hs-entropy 0.3.7 --> 0.3.8 hs-equivalence 0.3.1 --> 0.3.2 hs-errors 2.0.0 --> 2.2.1 hs-esqueleto 2.4.1 --> 2.5.3 hs-exceptions 0.8.0.2 --> 0.8.3 hs-extra 1.4.1 --> 1.6 hs-fast-logger 2.4.1 --> 2.4.10 hs-feed 0.3.10.0 --> 0.3.12.0 hs-fgl 5.5.2.1 --> 5.5.3.1 hs-file-embed 0.0.9 --> 0.0.10 hs-filestore 0.6.1 --> 0.6.3.1 hs-free 4.12.1 --> 4.12.4 hs-gconf 0.13.0.2 --> 0.13.1.0 hs-generic-deriving 1.8.0 --> 1.11.2 hs-geniplate-mirror 0.7.1 --> 0.7.5 hs-ghc-events 0.4.4.0 --> 0.6.0 hs-gio 0.13.1.0 --> 0.13.3.1 hs-git-annex 5.20150727_1 --> 6.20170520 hs-gitit 0.11.1 --> 0.12.2.1 hs-glib 0.13.1.1 --> 0.13.4.1 hs-gnuidn 0.2.1_3 --> 0.2.2 hs-gtk 0.13.9 --> 0.14.6 hs-gtk2hs 0.13,1 --> 0.13.2.2,1 hs-gtk2hs-buildtools 0.13.0.4_1 --> 0.13.2.2 hs-gtksourceview2 0.13.1.3 --> 0.13.3.1 hs-haddock 2.16.1 --> 2.17.5 hs-haddock-api 2.16.1 --> 2.17.4 hs-haddock-library 1.2.1 --> 1.4.3 hs-happstack-server 7.4.4 --> 7.4.6.4 hs-hashable 1.2.3.3,1 --> 1.2.6.1,1 hs-hashtables 1.2.0.2 --> 1.2.1.1 hs-haskell-src-exts 1.16.0.1 --> 1.19.1 hs-hasktags 0.69.1 --> 0.69.3 hs-hedis 0.6.9 --> 0.9.8 hs-heist 0.14.1.1 --> 1.0.1.0 hs-hexpat 0.20.9 --> 0.20.13 hs-highlighting-kate 0.6 --> 0.6.4 hs-hinotify 0.3.8.1 --> 0.3.9 hs-hint 0.4.2.3 --> 0.7.0 hs-hjsmin 0.1.5.0 --> 0.2.0.2 hs-hlint 1.9.21 --> 2.0.9 hs-hoauth2 0.4.8 --> 0.5.9 hs-hoogle 4.2.41 --> 5.0.12 hs-hourglass 0.2.9 --> 0.2.10 hs-hscolour 1.23,1 --> 1.24.1,1 hs-hslogger 1.2.9 --> 1.2.10 hs-hslua 0.4.0 --> 0.5.0 hs-hspec 2.1.10 --> 2.4.4 hs-hspec-core 2.1.10 --> 2.4.4 hs-hspec-discover 2.1.10 --> 2.4.4 hs-hspec-expectations 0.7.1 --> 0.8.2 hs-html-conduit 1.2.0 --> 1.2.1.1 hs-http-client 0.4.20 --> 0.5.7.0 hs-http-client-tls 0.2.2_2 --> 0.3.5.1 hs-http-conduit 2.1.8 --> 2.2.3.1 hs-http-reverse-proxy 0.4.2 --> 0.4.4 hs-http-types 0.8.6 --> 0.9.1 hs-http2 1.0.4 --> 1.6.3 hs-hxt 9.3.1.15 --> 9.3.1.16 hs-hxt-regex-xmlschema 9.2.0.2 --> 9.2.0.3 hs-ieee754 0.7.6 --> 0.8.0 hs-iproute 1.5.0 --> 1.7.1 hs-js-jquery 1.11.3 --> 3.2.1 hs-kan-extensions 4.2.2 --> 5.0.2 hs-keys 3.10.2 --> 3.11 hs-kqueue 0.1.2.6_2 --> 0.2 hs-language-c 0.5.0 --> 0.6.1 hs-language-javascript 0.5.14.2 --> 0.6.0.10 hs-largeword 1.2.3_2 --> 1.2.5 hs-lens 4.12.3 --> 4.15.3 hs-libmpd 0.9.0.2 --> 0.9.0.6 hs-lifted-async 0.7.0.1 --> 0.9.3 hs-lifted-base 0.2.3.6 --> 0.2.3.11 hs-map-syntax 0.2 --> 0.2.0.2 hs-math-functions 0.1.5.2_2 --> 0.2.1.0 hs-memory 0.8 --> 0.14.6 hs-mime-mail 0.4.9 --> 0.4.13.1 hs-mime-types 0.1.0.6 --> 0.1.0.7 hs-mmorph 1.0.4 --> 1.1.0 hs-monad-control 1.0.0.4 --> 1.0.2.1 hs-monad-logger 0.3.13.2 --> 0.3.24 hs-monad-par 0.3.4.7 --> 0.3.4.8 hs-monadcryptorandom 0.6.1_2 --> 0.7.1 hs-monads-tf 0.1.0.2_2 --> 0.1.0.3 hs-mono-traversable 0.9.2.1 --> 1.0.2 hs-mueval 0.9.1.1.2 --> 0.9.3 hs-murmur-hash 0.1.0.8 --> 0.1.0.9 hs-mutable-containers 0.3.2 --> 0.3.3 hs-mwc-random 0.13.3.2 --> 0.13.6.0 hs-mysql 0.1.1.8 --> 0.1.4 hs-network 2.6.2.1 --> 2.6.3.2 hs-network-info 0.2.0.7 --> 0.2.0.8 hs-network-multicast 0.1.0 --> 0.2.0 hs-network-uri 2.6.0.3 --> 2.6.1.0 hs-nonce 1.0.2 --> 1.0.4 hs-oeis 0.3.6 --> 0.3.9 hs-optparse-applicative 0.11.0.2 --> 0.14.0.0 hs-pandoc 1.15.0.6_1 --> 1.19.2.1 hs-pandoc-citeproc 0.7.3.1 --> 0.10.5.1 hs-pandoc-types 1.12.4.5 --> 1.19 hs-pango 0.13.1.0 --> 0.13.3.1 hs-parallel 3.2.0.6 --> 3.2.1.1 hs-parsec 3.1.9 --> 3.1.11 hs-path-pieces 0.2.0 --> 0.2.1 hs-pcre-light 0.4.0.3 --> 0.4.0.4 hs-persistent 2.2 --> 2.7.0 hs-persistent-sqlite 2.2 --> 2.6.2 hs-persistent-template 2.1.3.4 --> 2.5.2 hs-pointed 4.2.0.2 --> 5 hs-polyparse 1.11 --> 1.12 hs-prelude-extras 0.4_2 --> 0.4.0.3 hs-primitive 0.6 --> 0.6.2.0 hs-probability 0.2.4.1_2 --> 0.2.5.1 hs-profunctors 5.1.1 --> 5.2 hs-pureMD5 2.1.2.1_10 --> 2.1.3 hs-quickcheck-io 0.1.1_2 --> 0.2.0 hs-reflection 2 --> 2.1.2 hs-regex-applicative 0.3.2.1 --> 0.3.3 hs-regex-tdfa 1.2.0_2 --> 1.2.2 hs-resourcet 1.1.6 --> 1.1.9 hs-safe 0.3.9 --> 0.3.15 hs-sandi 0.3.5 --> 0.4.0 hs-scientific 0.3.3.8 --> 0.3.5.1 hs-semigroupoids 5.0.0.3 --> 5.2 hs-semigroups 0.16.2.2 --> 0.18.3 hs-setlocale 1.0.0.4 --> 1.0.0.5 hs-shake 0.15.5 --> 0.15.11 hs-shakespeare 2.0.5 --> 2.0.13 hs-shelly 1.6.3.3 --> 1.6.8.3 hs-simple-sendfile 0.2.21 --> 0.2.25 hs-skein 1.0.9.3 --> 1.0.9.4 hs-snap 0.14.0.6 --> 1.0.0.1 hs-snap-core 0.9.7.2 --> 1.0.2.1 hs-snap-server 0.9.5.1 --> 1.0.2.2 hs-socks 0.5.4_2 --> 0.5.5 hs-split 0.2.2_7 --> 0.2.3.2 hs-statistics 0.13.2.3 --> 0.14.0.2 hs-stm 2.4.4 --> 2.4.4.1 hs-streaming-commons 0.1.12.1 --> 0.1.18 hs-svgcairo 0.13.0.3 --> 0.13.1.1 hs-syb 0.5.1 --> 0.7 hs-syb-with-class 0.6.1.6 --> 0.6.1.7 hs-tagged 0.8.1 --> 0.8.5 hs-tagsoup 0.13.3 --> 0.14.1 hs-tar 0.4.2.1 --> 0.5.0.3 hs-temporary 1.2.0.3_2 --> 1.2.1 hs-test-framework-hunit 0.3.0.1_2 --> 0.3.0.2 hs-test-framework-quickcheck2 0.3.0.3_2 --> 0.3.0.4 hs-texmath 0.8.3 --> 0.9.4.1 hs-text 1.2.1.3 --> 1.2.2.2 hs-threads 0.5.1.3 --> 0.5.1.4 hs-threadscope 0.2.7 --> 0.2.8 hs-time-locale-compat 0.1.1.0 --> 0.1.1.3 hs-timezone-olson 0.1.7 --> 0.1.8 hs-timezone-series 0.1.5.1 --> 0.1.8 hs-tls 1.3.1 --> 1.3.11 hs-torrent 10000.0.0 --> 10000.1.1 hs-transformers-compat 0.4.0.4 --> 0.5.1.4 hs-unix-compat 0.4.1.4 --> 0.4.3.1 hs-unix-time 0.3.5 --> 0.3.7 hs-unlambda 0.1.4.1 --> 0.1.4.2 hs-unordered-containers 0.2.5.1 --> 0.2.8.0 hs-uri 0.1.6.3 --> 0.1.6.4 hs-utf8-string 1 --> 1.0.1.1 hs-utility-ht 0.0.10_2 --> 0.0.14_2 hs-uuid 1.3.11 --> 1.3.13 hs-uuid-types 1.0.2 --> 1.0.3 hs-uulib 0.9.20 --> 0.9.22 hs-vault 0.3.0.4 --> 0.3.0.7 hs-vector 0.10.12.3 --> 0.12.0.1 hs-vector-binary-instances 0.2.1.0_2 --> 0.2.3.5 hs-vector-instances 3.3.1 --> 3.4 hs-vector-space 0.10.2 --> 0.10.4 hs-vector-th-unbox 0.2.1.2 --> 0.2.1.6 hs-void 0.7 --> 0.7.2 hs-vte 0.13.0.2 --> 0.13.1.1 hs-wai 3.0.3.0 --> 3.2.1.1 hs-wai-app-static 3.1.1 --> 3.1.6.1 hs-wai-extra 3.0.10 --> 3.0.20.0 hs-wai-logger 2.2.4.1 --> 2.3.0 hs-warp 3.1.3 --> 3.2.13 hs-warp-tls 3.1.1 --> 3.2.4 hs-webkit 0.13.1.3 --> 0.14.2.1 hs-wx 0.91.0.0 --> 0.92.3.0 hs-wxc 0.91.0.0 --> 0.92.3.0 hs-wxcore 0.91.0.0 --> 0.92.3.0 hs-wxdirect 0.91.0.0 --> 0.92.3.0 hs-x509 1.6.0 --> 1.6.5 hs-x509-store 1.6.0 --> 1.6.2 hs-x509-system 1.6.0 --> 1.6.4 hs-x509-validation 1.6.0 --> 1.6.5 hs-xml-conduit 1.3.1 --> 1.5.1 hs-xml-hamlet 0.4.0.11 --> 0.4.1 hs-xmlhtml 0.2.3.4 --> 0.2.4 hs-xmobar 0.24.3 --> 0.24.5 hs-xss-sanitize 0.3.5.6 --> 0.3.5.7 hs-yaml 0.8.13 --> 0.8.23.1 hs-yesod 1.4.1.5 --> 1.4.5 hs-yesod-auth 1.4.6 --> 1.4.17.2 hs-yesod-auth-hashdb 1.4.2.2 --> 1.6.1 hs-yesod-bin 1.4.13.3 --> 1.5.2.3 hs-yesod-core 1.4.13 --> 1.4.35 hs-yesod-form 1.4.4.1 --> 1.4.12 hs-yesod-persistent 1.4.0.3 --> 1.4.2 hs-yesod-static 1.5.0.2 --> 1.5.3 hs-yesod-test 1.4.3.1 --> 1.5.7 hs-zip-archive 0.2.3.7 --> 0.3.1.1 hs-zlib 0.5.4.2 --> 0.6.1.2 scroll 1.20151219 --> 1.20170122 Removed ports (5): hs-MonadCatchIO-mtl Deprecated in favor of exceptions hs-MonadCatchIO-transformers Deprecated in favor of exceptions hs-citeproc-hs Replaced by pandoc-citeproc hs-directory Part of the packages shipped with GHC hs-syb-with-class-instances-text Upstream is unmaintained This was created together with pgj@. Reviewed by: pgj, 6yearold_gmail.com Differential Revision: https://reviews.freebsd.org/D11558
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile43
-rw-r--r--devel/hs-BNFC/Makefile2
-rw-r--r--devel/hs-BNFC/distinfo5
-rw-r--r--devel/hs-Boolean/Makefile2
-rw-r--r--devel/hs-Boolean/distinfo5
-rw-r--r--devel/hs-BoundedChan/Makefile2
-rw-r--r--devel/hs-BoundedChan/distinfo1
-rw-r--r--devel/hs-ConfigFile/Makefile1
-rw-r--r--devel/hs-ConfigFile/distinfo1
-rw-r--r--devel/hs-DrIFT/Makefile2
-rw-r--r--devel/hs-DrIFT/distinfo1
-rw-r--r--devel/hs-EdisonAPI/Makefile15
-rw-r--r--devel/hs-EdisonAPI/distinfo3
-rw-r--r--devel/hs-EdisonAPI/pkg-descr11
-rw-r--r--devel/hs-EdisonCore/Makefile13
-rw-r--r--devel/hs-EdisonCore/distinfo3
-rw-r--r--devel/hs-EdisonCore/pkg-descr7
-rw-r--r--devel/hs-Glob/Makefile5
-rw-r--r--devel/hs-Glob/distinfo5
-rw-r--r--devel/hs-Glob/files/patch-Glob.cabal11
-rw-r--r--devel/hs-HUnit/Makefile5
-rw-r--r--devel/hs-HUnit/distinfo5
-rw-r--r--devel/hs-IfElse/Makefile2
-rw-r--r--devel/hs-IfElse/distinfo1
-rw-r--r--devel/hs-List/Makefile2
-rw-r--r--devel/hs-List/distinfo5
-rw-r--r--devel/hs-ListLike/Makefile (renamed from devel/hs-MonadCatchIO-transformers/Makefile)8
-rw-r--r--devel/hs-ListLike/distinfo3
-rw-r--r--devel/hs-ListLike/pkg-descr12
-rw-r--r--devel/hs-MemoTrie/Makefile5
-rw-r--r--devel/hs-MemoTrie/distinfo5
-rw-r--r--devel/hs-MissingH/Makefile2
-rw-r--r--devel/hs-MissingH/distinfo5
-rw-r--r--devel/hs-MonadCatchIO-mtl/Makefile17
-rw-r--r--devel/hs-MonadCatchIO-mtl/distinfo2
-rw-r--r--devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal11
-rw-r--r--devel/hs-MonadCatchIO-mtl/pkg-descr6
-rw-r--r--devel/hs-MonadCatchIO-transformers/distinfo2
-rw-r--r--devel/hs-MonadCatchIO-transformers/pkg-descr7
-rw-r--r--devel/hs-MonadRandom/Makefile4
-rw-r--r--devel/hs-MonadRandom/distinfo5
-rw-r--r--devel/hs-MonadRandom/files/patch-MonadRandom.cabal10
-rw-r--r--devel/hs-ObjectName/Makefile2
-rw-r--r--devel/hs-ObjectName/distinfo5
-rw-r--r--devel/hs-Only/Makefile (renamed from devel/hs-directory/Makefile)6
-rw-r--r--devel/hs-Only/distinfo3
-rw-r--r--devel/hs-Only/pkg-descr11
-rw-r--r--devel/hs-PSQueue/Makefile2
-rw-r--r--devel/hs-PSQueue/distinfo1
-rw-r--r--devel/hs-QuickCheck/Makefile2
-rw-r--r--devel/hs-QuickCheck/distinfo5
-rw-r--r--devel/hs-ReadArgs/Makefile2
-rw-r--r--devel/hs-ReadArgs/distinfo5
-rw-r--r--devel/hs-STMonadTrans/Makefile2
-rw-r--r--devel/hs-STMonadTrans/distinfo5
-rw-r--r--devel/hs-SafeSemaphore/Makefile2
-rw-r--r--devel/hs-SafeSemaphore/distinfo1
-rw-r--r--devel/hs-ShellCheck/Makefile2
-rw-r--r--devel/hs-ShellCheck/distinfo6
-rw-r--r--devel/hs-StateVar/Makefile4
-rw-r--r--devel/hs-StateVar/distinfo5
-rw-r--r--devel/hs-Stream/Makefile1
-rw-r--r--devel/hs-Stream/distinfo1
-rw-r--r--devel/hs-TypeCompose/Makefile5
-rw-r--r--devel/hs-TypeCompose/distinfo5
-rw-r--r--devel/hs-abstract-deque/Makefile2
-rw-r--r--devel/hs-abstract-deque/distinfo1
-rw-r--r--devel/hs-abstract-par/Makefile2
-rw-r--r--devel/hs-abstract-par/distinfo1
-rw-r--r--devel/hs-activehs-base/Makefile3
-rw-r--r--devel/hs-activehs-base/distinfo5
-rw-r--r--devel/hs-activehs-base/files/patch-activehs-base.cabal12
-rw-r--r--devel/hs-alex/Makefile2
-rw-r--r--devel/hs-alex/distinfo5
-rw-r--r--devel/hs-ansi-terminal/Makefile2
-rw-r--r--devel/hs-ansi-terminal/distinfo5
-rw-r--r--devel/hs-ansi-wl-pprint/Makefile1
-rw-r--r--devel/hs-ansi-wl-pprint/distinfo1
-rw-r--r--devel/hs-arrows/Makefile2
-rw-r--r--devel/hs-arrows/distinfo1
-rw-r--r--devel/hs-asn1-data/Makefile3
-rw-r--r--devel/hs-asn1-data/distinfo5
-rw-r--r--devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs11
-rw-r--r--devel/hs-asn1-encoding/Makefile2
-rw-r--r--devel/hs-asn1-encoding/distinfo5
-rw-r--r--devel/hs-asn1-parse/Makefile2
-rw-r--r--devel/hs-asn1-parse/distinfo5
-rw-r--r--devel/hs-asn1-types/Makefile4
-rw-r--r--devel/hs-asn1-types/distinfo5
-rw-r--r--devel/hs-async/Makefile2
-rw-r--r--devel/hs-async/distinfo5
-rw-r--r--devel/hs-atomic-primops/Makefile2
-rw-r--r--devel/hs-atomic-primops/distinfo5
-rw-r--r--devel/hs-auto-update/Makefile2
-rw-r--r--devel/hs-auto-update/distinfo5
-rw-r--r--devel/hs-base-compat/Makefile13
-rw-r--r--devel/hs-base-compat/distinfo3
-rw-r--r--devel/hs-base-compat/pkg-descr11
-rw-r--r--devel/hs-base-orphans/Makefile2
-rw-r--r--devel/hs-base-orphans/distinfo5
-rw-r--r--devel/hs-base-unicode-symbols/Makefile2
-rw-r--r--devel/hs-base-unicode-symbols/distinfo1
-rw-r--r--devel/hs-base16-bytestring/Makefile2
-rw-r--r--devel/hs-base16-bytestring/distinfo1
-rw-r--r--devel/hs-base64-bytestring/Makefile2
-rw-r--r--devel/hs-base64-bytestring/distinfo1
-rw-r--r--devel/hs-basic-prelude/Makefile2
-rw-r--r--devel/hs-basic-prelude/distinfo5
-rw-r--r--devel/hs-bifunctors/Makefile4
-rw-r--r--devel/hs-bifunctors/distinfo5
-rw-r--r--devel/hs-bits-atomic/Makefile2
-rw-r--r--devel/hs-bits-atomic/distinfo1
-rw-r--r--devel/hs-blaze-builder-enumerator/Makefile4
-rw-r--r--devel/hs-blaze-builder-enumerator/distinfo1
-rw-r--r--devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal9
-rw-r--r--devel/hs-blaze-builder/Makefile2
-rw-r--r--devel/hs-blaze-builder/distinfo5
-rw-r--r--devel/hs-blaze-textual/Makefile1
-rw-r--r--devel/hs-blaze-textual/distinfo1
-rw-r--r--devel/hs-bloomfilter/Makefile1
-rw-r--r--devel/hs-bloomfilter/distinfo1
-rw-r--r--devel/hs-boxes/Makefile1
-rw-r--r--devel/hs-boxes/distinfo1
-rw-r--r--devel/hs-bsd-sysctl/Makefile2
-rw-r--r--devel/hs-bsd-sysctl/distinfo1
-rw-r--r--devel/hs-byteable/Makefile2
-rw-r--r--devel/hs-byteable/distinfo1
-rw-r--r--devel/hs-byteorder/Makefile2
-rw-r--r--devel/hs-byteorder/distinfo1
-rw-r--r--devel/hs-bytestring-lexing/Makefile1
-rw-r--r--devel/hs-bytestring-lexing/distinfo1
-rw-r--r--devel/hs-bytestring-mmap/Makefile1
-rw-r--r--devel/hs-bytestring-mmap/distinfo1
-rw-r--r--devel/hs-bytestring-nums/Makefile2
-rw-r--r--devel/hs-bytestring-nums/distinfo1
-rw-r--r--devel/hs-bytestring-show/Makefile2
-rw-r--r--devel/hs-bytestring-show/distinfo1
-rw-r--r--devel/hs-bytestring-show/files/patch-bytestring-show.cabal11
-rw-r--r--devel/hs-c2hs/Makefile2
-rw-r--r--devel/hs-c2hs/distinfo6
-rw-r--r--devel/hs-cabal-install/Makefile7
-rw-r--r--devel/hs-cabal-install/distinfo5
-rw-r--r--devel/hs-call-stack/Makefile13
-rw-r--r--devel/hs-call-stack/distinfo3
-rw-r--r--devel/hs-call-stack/pkg-descr3
-rw-r--r--devel/hs-cereal/Makefile2
-rw-r--r--devel/hs-cereal/distinfo5
-rw-r--r--devel/hs-checkers/Makefile2
-rw-r--r--devel/hs-checkers/distinfo5
-rw-r--r--devel/hs-chunked-data/Makefile2
-rw-r--r--devel/hs-chunked-data/distinfo5
-rw-r--r--devel/hs-classy-prelude-conduit/Makefile2
-rw-r--r--devel/hs-classy-prelude-conduit/distinfo5
-rw-r--r--devel/hs-classy-prelude/Makefile13
-rw-r--r--devel/hs-classy-prelude/distinfo5
-rw-r--r--devel/hs-clock/Makefile13
-rw-r--r--devel/hs-clock/distinfo3
-rw-r--r--devel/hs-clock/pkg-descr4
-rw-r--r--devel/hs-cmdargs/Makefile2
-rw-r--r--devel/hs-cmdargs/distinfo5
-rw-r--r--devel/hs-code-page/Makefile13
-rw-r--r--devel/hs-code-page/distinfo3
-rw-r--r--devel/hs-code-page/pkg-descr10
-rw-r--r--devel/hs-colour/Makefile13
-rw-r--r--devel/hs-colour/distinfo3
-rw-r--r--devel/hs-colour/pkg-descr5
-rw-r--r--devel/hs-concurrent-output/Makefile15
-rw-r--r--devel/hs-concurrent-output/distinfo3
-rw-r--r--devel/hs-concurrent-output/files/patch-concurrent-output.cabal11
-rw-r--r--devel/hs-concurrent-output/pkg-descr9
-rw-r--r--devel/hs-conduit-combinators/Makefile2
-rw-r--r--devel/hs-conduit-combinators/distinfo5
-rw-r--r--devel/hs-conduit-extra/Makefile2
-rw-r--r--devel/hs-conduit-extra/distinfo5
-rw-r--r--devel/hs-conduit/Makefile2
-rw-r--r--devel/hs-conduit/distinfo5
-rw-r--r--devel/hs-configurator/Makefile2
-rw-r--r--devel/hs-configurator/distinfo1
-rw-r--r--devel/hs-constraints/Makefile4
-rw-r--r--devel/hs-constraints/distinfo5
-rw-r--r--devel/hs-convertible/Makefile1
-rw-r--r--devel/hs-convertible/distinfo1
-rw-r--r--devel/hs-cpphs/Makefile2
-rw-r--r--devel/hs-cpphs/distinfo5
-rw-r--r--devel/hs-darcs/Makefile14
-rw-r--r--devel/hs-darcs/distinfo5
-rw-r--r--devel/hs-darcs/files/patch-Setup.lhs10
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal11
-rw-r--r--devel/hs-data-default-class/Makefile3
-rw-r--r--devel/hs-data-default-class/distinfo5
-rw-r--r--devel/hs-data-default-instances-base/Makefile3
-rw-r--r--devel/hs-data-default-instances-base/distinfo5
-rw-r--r--devel/hs-data-default-instances-containers/Makefile2
-rw-r--r--devel/hs-data-default-instances-containers/distinfo1
-rw-r--r--devel/hs-data-default-instances-dlist/Makefile2
-rw-r--r--devel/hs-data-default-instances-dlist/distinfo1
-rw-r--r--devel/hs-data-default-instances-old-locale/Makefile2
-rw-r--r--devel/hs-data-default-instances-old-locale/distinfo1
-rw-r--r--devel/hs-data-default/Makefile3
-rw-r--r--devel/hs-data-default/distinfo5
-rw-r--r--devel/hs-data-endian/Makefile13
-rw-r--r--devel/hs-data-endian/distinfo3
-rw-r--r--devel/hs-data-endian/pkg-descr3
-rw-r--r--devel/hs-data-hash/Makefile1
-rw-r--r--devel/hs-data-hash/distinfo1
-rw-r--r--devel/hs-data-ordlist/Makefile1
-rw-r--r--devel/hs-data-ordlist/distinfo1
-rw-r--r--devel/hs-data-pprint/Makefile4
-rw-r--r--devel/hs-data-pprint/distinfo5
-rw-r--r--devel/hs-data-pprint/files/patch-data-pprint.cabal10
-rw-r--r--devel/hs-date-cache/Makefile2
-rw-r--r--devel/hs-date-cache/distinfo1
-rw-r--r--devel/hs-datetime/Makefile1
-rw-r--r--devel/hs-datetime/distinfo1
-rw-r--r--devel/hs-dbus/Makefile15
-rw-r--r--devel/hs-dbus/distinfo3
-rw-r--r--devel/hs-dbus/pkg-descr13
-rw-r--r--devel/hs-deepseq-generics/Makefile2
-rw-r--r--devel/hs-deepseq-generics/distinfo5
-rw-r--r--devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal11
-rw-r--r--devel/hs-directory-tree/Makefile3
-rw-r--r--devel/hs-directory-tree/distinfo5
-rw-r--r--devel/hs-directory/distinfo3
-rw-r--r--devel/hs-directory/pkg-descr4
-rw-r--r--devel/hs-dlist-instances/Makefile3
-rw-r--r--devel/hs-dlist-instances/distinfo5
-rw-r--r--devel/hs-dlist/Makefile2
-rw-r--r--devel/hs-dlist/distinfo5
-rw-r--r--devel/hs-easy-file/Makefile1
-rw-r--r--devel/hs-easy-file/distinfo1
-rw-r--r--devel/hs-edit-distance/Makefile1
-rw-r--r--devel/hs-edit-distance/distinfo1
-rw-r--r--devel/hs-either/Makefile8
-rw-r--r--devel/hs-either/distinfo5
-rw-r--r--devel/hs-either/files/patch-either.cabal14
-rw-r--r--devel/hs-enclosed-exceptions/Makefile2
-rw-r--r--devel/hs-enclosed-exceptions/distinfo5
-rw-r--r--devel/hs-enumerator/Makefile2
-rw-r--r--devel/hs-enumerator/distinfo1
-rw-r--r--devel/hs-equivalence/Makefile2
-rw-r--r--devel/hs-equivalence/distinfo5
-rw-r--r--devel/hs-errors/Makefile4
-rw-r--r--devel/hs-errors/distinfo5
-rw-r--r--devel/hs-exceptions/Makefile4
-rw-r--r--devel/hs-exceptions/distinfo5
-rw-r--r--devel/hs-extensible-exceptions/Makefile2
-rw-r--r--devel/hs-extensible-exceptions/distinfo1
-rw-r--r--devel/hs-extra/Makefile4
-rw-r--r--devel/hs-extra/distinfo5
-rw-r--r--devel/hs-fast-logger/Makefile4
-rw-r--r--devel/hs-fast-logger/distinfo5
-rw-r--r--devel/hs-fast-logger/files/patch-fast-logger.cabal10
-rw-r--r--devel/hs-fgl/Makefile2
-rw-r--r--devel/hs-fgl/distinfo5
-rw-r--r--devel/hs-file-embed/Makefile2
-rw-r--r--devel/hs-file-embed/distinfo5
-rw-r--r--devel/hs-filemanip/Makefile1
-rw-r--r--devel/hs-filemanip/distinfo1
-rw-r--r--devel/hs-filestore/Makefile2
-rw-r--r--devel/hs-filestore/distinfo5
-rw-r--r--devel/hs-fmlist/Makefile13
-rw-r--r--devel/hs-fmlist/distinfo3
-rw-r--r--devel/hs-fmlist/pkg-descr6
-rw-r--r--devel/hs-foundation/Makefile13
-rw-r--r--devel/hs-foundation/distinfo3
-rw-r--r--devel/hs-foundation/pkg-descr12
-rw-r--r--devel/hs-free/Makefile2
-rw-r--r--devel/hs-free/distinfo5
-rw-r--r--devel/hs-fsnotify/Makefile1
-rw-r--r--devel/hs-fsnotify/distinfo1
-rw-r--r--devel/hs-gconf/Makefile2
-rw-r--r--devel/hs-gconf/distinfo5
-rw-r--r--devel/hs-generic-deriving/Makefile2
-rw-r--r--devel/hs-generic-deriving/distinfo5
-rw-r--r--devel/hs-geniplate-mirror/Makefile2
-rw-r--r--devel/hs-geniplate-mirror/distinfo5
-rw-r--r--devel/hs-ghc-events/Makefile2
-rw-r--r--devel/hs-ghc-events/distinfo5
-rw-r--r--devel/hs-ghc-mtl/Makefile2
-rw-r--r--devel/hs-ghc-mtl/distinfo1
-rw-r--r--devel/hs-ghc-paths/Makefile2
-rw-r--r--devel/hs-ghc-paths/distinfo1
-rw-r--r--devel/hs-gio/Makefile2
-rw-r--r--devel/hs-gio/distinfo5
-rw-r--r--devel/hs-git-annex/Makefile133
-rw-r--r--devel/hs-git-annex/distinfo5
-rw-r--r--devel/hs-git-annex/files/patch-Build__Configure.hs6
-rw-r--r--devel/hs-git-annex/files/patch-Build__DesktopFile.hs12
-rw-r--r--devel/hs-git-annex/files/patch-Setup.hs44
-rw-r--r--devel/hs-git-annex/files/patch-Utility_QuickCheck.hs12
-rw-r--r--devel/hs-git-annex/files/patch-git-annex.cabal7
-rw-r--r--devel/hs-git-annex/pkg-plist4
-rw-r--r--devel/hs-gitrev/Makefile15
-rw-r--r--devel/hs-gitrev/distinfo3
-rw-r--r--devel/hs-gitrev/pkg-descr6
-rw-r--r--devel/hs-glib/Makefile2
-rw-r--r--devel/hs-glib/distinfo5
-rw-r--r--devel/hs-gtk2hs-buildtools/Makefile5
-rw-r--r--devel/hs-gtk2hs-buildtools/distinfo5
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs2
-rw-r--r--devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs15
-rw-r--r--devel/hs-haddock-api/Makefile2
-rw-r--r--devel/hs-haddock-api/distinfo5
-rw-r--r--devel/hs-haddock-library/Makefile2
-rw-r--r--devel/hs-haddock-library/distinfo5
-rw-r--r--devel/hs-haddock/Makefile2
-rw-r--r--devel/hs-haddock/distinfo5
-rw-r--r--devel/hs-haddock/pkg-plist4
-rw-r--r--devel/hs-happy/Makefile1
-rw-r--r--devel/hs-happy/distinfo1
-rw-r--r--devel/hs-hashable/Makefile4
-rw-r--r--devel/hs-hashable/distinfo5
-rw-r--r--devel/hs-hashed-storage/Makefile2
-rw-r--r--devel/hs-hashed-storage/distinfo1
-rw-r--r--devel/hs-hashtables/Makefile2
-rw-r--r--devel/hs-hashtables/distinfo5
-rw-r--r--devel/hs-haskell-lexer/Makefile13
-rw-r--r--devel/hs-haskell-lexer/distinfo3
-rw-r--r--devel/hs-haskell-lexer/pkg-descr3
-rw-r--r--devel/hs-haskell-src-exts/Makefile4
-rw-r--r--devel/hs-haskell-src-exts/distinfo5
-rw-r--r--devel/hs-haskell-src/Makefile1
-rw-r--r--devel/hs-haskell-src/distinfo1
-rw-r--r--devel/hs-hasktags/Makefile2
-rw-r--r--devel/hs-hasktags/distinfo5
-rw-r--r--devel/hs-hastache/Makefile1
-rw-r--r--devel/hs-hastache/distinfo1
-rw-r--r--devel/hs-hastache/files/patch-hastache.cabal29
-rw-r--r--devel/hs-hex/Makefile1
-rw-r--r--devel/hs-hex/distinfo1
-rw-r--r--devel/hs-hinotify/Makefile4
-rw-r--r--devel/hs-hinotify/distinfo5
-rw-r--r--devel/hs-hint/Makefile10
-rw-r--r--devel/hs-hint/distinfo5
-rw-r--r--devel/hs-hlibev/Makefile2
-rw-r--r--devel/hs-hlibev/distinfo1
-rw-r--r--devel/hs-hlint/Makefile4
-rw-r--r--devel/hs-hlint/distinfo5
-rw-r--r--devel/hs-hoogle/Makefile12
-rw-r--r--devel/hs-hoogle/distinfo5
-rw-r--r--devel/hs-hourglass/Makefile2
-rw-r--r--devel/hs-hourglass/distinfo5
-rw-r--r--devel/hs-hsb2hs/Makefile1
-rw-r--r--devel/hs-hsb2hs/distinfo1
-rw-r--r--devel/hs-hslogger/Makefile2
-rw-r--r--devel/hs-hslogger/distinfo5
-rw-r--r--devel/hs-hslua/Makefile2
-rw-r--r--devel/hs-hslua/distinfo5
-rw-r--r--devel/hs-hspec-core/Makefile2
-rw-r--r--devel/hs-hspec-core/distinfo5
-rw-r--r--devel/hs-hspec-discover/Makefile2
-rw-r--r--devel/hs-hspec-discover/distinfo5
-rw-r--r--devel/hs-hspec-expectations/Makefile4
-rw-r--r--devel/hs-hspec-expectations/distinfo5
-rw-r--r--devel/hs-hspec/Makefile2
-rw-r--r--devel/hs-hspec/distinfo5
-rw-r--r--devel/hs-io-streams-haproxy/Makefile15
-rw-r--r--devel/hs-io-streams-haproxy/distinfo3
-rw-r--r--devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal11
-rw-r--r--devel/hs-io-streams-haproxy/pkg-descr7
-rw-r--r--devel/hs-io-streams/Makefile15
-rw-r--r--devel/hs-io-streams/distinfo3
-rw-r--r--devel/hs-io-streams/files/patch-io-streams.cabal18
-rw-r--r--devel/hs-io-streams/pkg-descr4
-rw-r--r--devel/hs-js-flot/Makefile1
-rw-r--r--devel/hs-js-flot/distinfo1
-rw-r--r--devel/hs-js-jquery/Makefile2
-rw-r--r--devel/hs-js-jquery/distinfo5
-rw-r--r--devel/hs-keys/Makefile2
-rw-r--r--devel/hs-keys/distinfo5
-rw-r--r--devel/hs-kqueue/Makefile3
-rw-r--r--devel/hs-kqueue/distinfo5
-rw-r--r--devel/hs-kqueue/files/patch-kqueue.cabal17
-rw-r--r--devel/hs-kqueue/files/patch-src__System__KQueue.chs22
-rw-r--r--devel/hs-language-c/Makefile2
-rw-r--r--devel/hs-language-c/distinfo6
-rw-r--r--devel/hs-language-javascript/Makefile2
-rw-r--r--devel/hs-language-javascript/distinfo5
-rw-r--r--devel/hs-largeword/Makefile3
-rw-r--r--devel/hs-largeword/distinfo5
-rw-r--r--devel/hs-lazysmallcheck/Makefile2
-rw-r--r--devel/hs-lazysmallcheck/distinfo1
-rw-r--r--devel/hs-lens/Makefile4
-rw-r--r--devel/hs-lens/distinfo5
-rw-r--r--devel/hs-lifted-async/Makefile2
-rw-r--r--devel/hs-lifted-async/distinfo5
-rw-r--r--devel/hs-lifted-base/Makefile2
-rw-r--r--devel/hs-lifted-base/distinfo5
-rw-r--r--devel/hs-logict/Makefile2
-rw-r--r--devel/hs-logict/distinfo1
-rw-r--r--devel/hs-map-syntax/Makefile2
-rw-r--r--devel/hs-map-syntax/distinfo5
-rw-r--r--devel/hs-memory/Makefile4
-rw-r--r--devel/hs-memory/distinfo5
-rw-r--r--devel/hs-microlens-th/Makefile15
-rw-r--r--devel/hs-microlens-th/distinfo3
-rw-r--r--devel/hs-microlens-th/pkg-descr6
-rw-r--r--devel/hs-microlens/Makefile13
-rw-r--r--devel/hs-microlens/distinfo3
-rw-r--r--devel/hs-microlens/pkg-descr6
-rw-r--r--devel/hs-microstache/Makefile15
-rw-r--r--devel/hs-microstache/distinfo3
-rw-r--r--devel/hs-microstache/pkg-descr6
-rw-r--r--devel/hs-mmap/Makefile2
-rw-r--r--devel/hs-mmap/distinfo1
-rw-r--r--devel/hs-mmorph/Makefile4
-rw-r--r--devel/hs-mmorph/distinfo5
-rw-r--r--devel/hs-monad-control/Makefile2
-rw-r--r--devel/hs-monad-control/distinfo5
-rw-r--r--devel/hs-monad-logger/Makefile2
-rw-r--r--devel/hs-monad-logger/distinfo5
-rw-r--r--devel/hs-monad-loops/Makefile1
-rw-r--r--devel/hs-monad-loops/distinfo1
-rw-r--r--devel/hs-monad-par-extras/Makefile2
-rw-r--r--devel/hs-monad-par-extras/distinfo1
-rw-r--r--devel/hs-monad-par/Makefile2
-rw-r--r--devel/hs-monad-par/distinfo5
-rw-r--r--devel/hs-monad-unlift/Makefile15
-rw-r--r--devel/hs-monad-unlift/distinfo3
-rw-r--r--devel/hs-monad-unlift/pkg-descr3
-rw-r--r--devel/hs-monadplus/Makefile11
-rw-r--r--devel/hs-monadplus/distinfo3
-rw-r--r--devel/hs-monadplus/pkg-descr5
-rw-r--r--devel/hs-monads-tf/Makefile3
-rw-r--r--devel/hs-monads-tf/distinfo5
-rw-r--r--devel/hs-mono-traversable-instances/Makefile16
-rw-r--r--devel/hs-mono-traversable-instances/distinfo3
-rw-r--r--devel/hs-mono-traversable-instances/pkg-descr3
-rw-r--r--devel/hs-mono-traversable/Makefile4
-rw-r--r--devel/hs-mono-traversable/distinfo5
-rw-r--r--devel/hs-mtl/Makefile1
-rw-r--r--devel/hs-mtl/distinfo1
-rw-r--r--devel/hs-mtl/files/patch-git_594984022
-rw-r--r--devel/hs-mueval/Makefile2
-rw-r--r--devel/hs-mueval/distinfo5
-rw-r--r--devel/hs-murmur-hash/Makefile2
-rw-r--r--devel/hs-murmur-hash/distinfo5
-rw-r--r--devel/hs-mutable-containers/Makefile2
-rw-r--r--devel/hs-mutable-containers/distinfo5
-rw-r--r--devel/hs-ncurses/Makefile5
-rw-r--r--devel/hs-newtype-generics/Makefile13
-rw-r--r--devel/hs-newtype-generics/distinfo3
-rw-r--r--devel/hs-newtype-generics/pkg-descr7
-rw-r--r--devel/hs-newtype/Makefile1
-rw-r--r--devel/hs-newtype/distinfo1
-rw-r--r--devel/hs-old-locale/Makefile1
-rw-r--r--devel/hs-old-locale/distinfo1
-rw-r--r--devel/hs-old-locale/files/patch-git_15fea2d21
-rw-r--r--devel/hs-old-time/Makefile1
-rw-r--r--devel/hs-old-time/distinfo1
-rw-r--r--devel/hs-old-time/files/patch-git_82790af23
-rw-r--r--devel/hs-optparse-applicative/Makefile2
-rw-r--r--devel/hs-optparse-applicative/distinfo5
-rw-r--r--devel/hs-parallel/Makefile2
-rw-r--r--devel/hs-parallel/distinfo5
-rw-r--r--devel/hs-pcre-light/Makefile3
-rw-r--r--devel/hs-pcre-light/distinfo5
-rw-r--r--devel/hs-prelude-extras/Makefile3
-rw-r--r--devel/hs-prelude-extras/distinfo5
-rw-r--r--devel/hs-preprocessor-tools/Makefile1
-rw-r--r--devel/hs-preprocessor-tools/distinfo1
-rw-r--r--devel/hs-prettyclass/Makefile2
-rw-r--r--devel/hs-prettyclass/distinfo1
-rw-r--r--devel/hs-primitive/Makefile2
-rw-r--r--devel/hs-primitive/distinfo5
-rw-r--r--devel/hs-process-extras/Makefile15
-rw-r--r--devel/hs-process-extras/distinfo3
-rw-r--r--devel/hs-process-extras/pkg-descr7
-rw-r--r--devel/hs-profunctors/Makefile5
-rw-r--r--devel/hs-profunctors/distinfo5
-rw-r--r--devel/hs-profunctors/files/patch-git_c0574c22
-rw-r--r--devel/hs-project-template/Makefile1
-rw-r--r--devel/hs-project-template/distinfo1
-rw-r--r--devel/hs-psqueues/Makefile15
-rw-r--r--devel/hs-psqueues/distinfo3
-rw-r--r--devel/hs-psqueues/pkg-descr21
-rw-r--r--devel/hs-quickcheck-io/Makefile3
-rw-r--r--devel/hs-quickcheck-io/distinfo5
-rw-r--r--devel/hs-random/Makefile1
-rw-r--r--devel/hs-random/distinfo1
-rw-r--r--devel/hs-readable/Makefile15
-rw-r--r--devel/hs-readable/distinfo3
-rw-r--r--devel/hs-readable/pkg-descr4
-rw-r--r--devel/hs-readline/Makefile2
-rw-r--r--devel/hs-readline/distinfo1
-rw-r--r--devel/hs-refact/Makefile13
-rw-r--r--devel/hs-refact/distinfo3
-rw-r--r--devel/hs-refact/pkg-descr5
-rw-r--r--devel/hs-reflection/Makefile2
-rw-r--r--devel/hs-reflection/distinfo5
-rw-r--r--devel/hs-resource-pool/Makefile1
-rw-r--r--devel/hs-resource-pool/distinfo1
-rw-r--r--devel/hs-resourcet/Makefile6
-rw-r--r--devel/hs-resourcet/distinfo5
-rw-r--r--devel/hs-safe-exceptions/Makefile15
-rw-r--r--devel/hs-safe-exceptions/distinfo3
-rw-r--r--devel/hs-safe-exceptions/pkg-descr3
-rw-r--r--devel/hs-safe/Makefile2
-rw-r--r--devel/hs-safe/distinfo5
-rw-r--r--devel/hs-say/Makefile15
-rw-r--r--devel/hs-say/distinfo3
-rw-r--r--devel/hs-say/pkg-descr3
-rw-r--r--devel/hs-scientific/Makefile4
-rw-r--r--devel/hs-scientific/distinfo5
-rw-r--r--devel/hs-securemem/Makefile1
-rw-r--r--devel/hs-securemem/distinfo1
-rw-r--r--devel/hs-setenv/Makefile1
-rw-r--r--devel/hs-setenv/distinfo1
-rw-r--r--devel/hs-setlocale/Makefile2
-rw-r--r--devel/hs-setlocale/distinfo6
-rw-r--r--devel/hs-shake/Makefile2
-rw-r--r--devel/hs-shake/distinfo5
-rw-r--r--devel/hs-show/Makefile2
-rw-r--r--devel/hs-show/distinfo1
-rw-r--r--devel/hs-silently/Makefile1
-rw-r--r--devel/hs-silently/distinfo1
-rw-r--r--devel/hs-simple-reflect/Makefile2
-rw-r--r--devel/hs-simple-reflect/distinfo1
-rw-r--r--devel/hs-smallcheck/Makefile2
-rw-r--r--devel/hs-smallcheck/distinfo1
-rw-r--r--devel/hs-split/Makefile3
-rw-r--r--devel/hs-split/distinfo5
-rw-r--r--devel/hs-split/files/patch-split.cabal11
-rw-r--r--devel/hs-stm-chans/Makefile1
-rw-r--r--devel/hs-stm-chans/distinfo1
-rw-r--r--devel/hs-stm/Makefile2
-rw-r--r--devel/hs-stm/distinfo5
-rw-r--r--devel/hs-streaming-commons/Makefile4
-rw-r--r--devel/hs-streaming-commons/distinfo5
-rw-r--r--devel/hs-strict/Makefile2
-rw-r--r--devel/hs-strict/distinfo1
-rw-r--r--devel/hs-syb-with-class-instances-text/Makefile16
-rw-r--r--devel/hs-syb-with-class-instances-text/distinfo2
-rw-r--r--devel/hs-syb-with-class-instances-text/pkg-descr3
-rw-r--r--devel/hs-syb-with-class/Makefile2
-rw-r--r--devel/hs-syb-with-class/distinfo5
-rw-r--r--devel/hs-syb/Makefile2
-rw-r--r--devel/hs-syb/distinfo5
-rw-r--r--devel/hs-system-fileio/Makefile1
-rw-r--r--devel/hs-system-fileio/distinfo1
-rw-r--r--devel/hs-system-filepath/Makefile1
-rw-r--r--devel/hs-system-filepath/distinfo1
-rw-r--r--devel/hs-tagged/Makefile4
-rw-r--r--devel/hs-tagged/distinfo5
-rw-r--r--devel/hs-tagged/files/patch-tagged.cabal11
-rw-r--r--devel/hs-temporary/Makefile3
-rw-r--r--devel/hs-temporary/distinfo5
-rw-r--r--devel/hs-terminal-size/Makefile13
-rw-r--r--devel/hs-terminal-size/distinfo3
-rw-r--r--devel/hs-terminal-size/pkg-descr3
-rw-r--r--devel/hs-test-framework-hunit/Makefile5
-rw-r--r--devel/hs-test-framework-hunit/distinfo5
-rw-r--r--devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal16
-rw-r--r--devel/hs-test-framework-quickcheck2/Makefile3
-rw-r--r--devel/hs-test-framework-quickcheck2/distinfo5
-rw-r--r--devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal11
-rw-r--r--devel/hs-test-framework/Makefile1
-rw-r--r--devel/hs-test-framework/distinfo1
-rw-r--r--devel/hs-test-framework/files/patch-test-framework.cabal11
-rw-r--r--devel/hs-text-icu/Makefile2
-rw-r--r--devel/hs-text-icu/distinfo1
-rw-r--r--devel/hs-text-short/Makefile15
-rw-r--r--devel/hs-text-short/distinfo3
-rw-r--r--devel/hs-text-short/pkg-descr11
-rw-r--r--devel/hs-text/Makefile2
-rw-r--r--devel/hs-text/distinfo5
-rw-r--r--devel/hs-tf-random/Makefile2
-rw-r--r--devel/hs-tf-random/distinfo1
-rw-r--r--devel/hs-th-abstraction/Makefile13
-rw-r--r--devel/hs-th-abstraction/distinfo3
-rw-r--r--devel/hs-th-abstraction/pkg-descr5
-rw-r--r--devel/hs-th-lift-instances/Makefile15
-rw-r--r--devel/hs-th-lift-instances/distinfo3
-rw-r--r--devel/hs-th-lift-instances/pkg-descr3
-rw-r--r--devel/hs-th-lift/Makefile13
-rw-r--r--devel/hs-th-lift/distinfo3
-rw-r--r--devel/hs-th-lift/pkg-descr3
-rw-r--r--devel/hs-threads/Makefile2
-rw-r--r--devel/hs-threads/distinfo5
-rw-r--r--devel/hs-threadscope/Makefile5
-rw-r--r--devel/hs-threadscope/distinfo5
-rw-r--r--devel/hs-time-compat/Makefile2
-rw-r--r--devel/hs-time-compat/distinfo1
-rw-r--r--devel/hs-time-locale-compat/Makefile4
-rw-r--r--devel/hs-time-locale-compat/distinfo5
-rw-r--r--devel/hs-timezone-olson/Makefile2
-rw-r--r--devel/hs-timezone-olson/distinfo5
-rw-r--r--devel/hs-timezone-series/Makefile2
-rw-r--r--devel/hs-timezone-series/distinfo5
-rw-r--r--devel/hs-transformers-base/Makefile1
-rw-r--r--devel/hs-transformers-base/distinfo1
-rw-r--r--devel/hs-transformers-compat/Makefile2
-rw-r--r--devel/hs-transformers-compat/distinfo5
-rw-r--r--devel/hs-typed-process/Makefile15
-rw-r--r--devel/hs-typed-process/distinfo3
-rw-r--r--devel/hs-typed-process/pkg-descr3
-rw-r--r--devel/hs-unamb/Makefile2
-rw-r--r--devel/hs-unamb/distinfo1
-rw-r--r--devel/hs-unexceptionalio/Makefile13
-rw-r--r--devel/hs-unexceptionalio/distinfo3
-rw-r--r--devel/hs-unexceptionalio/pkg-descr7
-rw-r--r--devel/hs-uniplate/Makefile2
-rw-r--r--devel/hs-uniplate/distinfo1
-rw-r--r--devel/hs-unix-compat/Makefile2
-rw-r--r--devel/hs-unix-compat/distinfo5
-rw-r--r--devel/hs-unix-time/Makefile2
-rw-r--r--devel/hs-unix-time/distinfo5
-rw-r--r--devel/hs-unordered-containers/Makefile2
-rw-r--r--devel/hs-unordered-containers/distinfo5
-rw-r--r--devel/hs-utf8-light/Makefile2
-rw-r--r--devel/hs-utf8-light/distinfo1
-rw-r--r--devel/hs-utf8-string/Makefile2
-rw-r--r--devel/hs-utf8-string/distinfo5
-rw-r--r--devel/hs-utf8-string/files/patch-git_6b70ee716
-rw-r--r--devel/hs-utility-ht/Makefile2
-rw-r--r--devel/hs-utility-ht/distinfo5
-rw-r--r--devel/hs-uuagc-bootstrap/Makefile2
-rw-r--r--devel/hs-uuagc-bootstrap/distinfo1
-rw-r--r--devel/hs-uuagc-cabal/Makefile1
-rw-r--r--devel/hs-uuagc-cabal/distinfo1
-rw-r--r--devel/hs-uuagc/Makefile1
-rw-r--r--devel/hs-uuagc/distinfo1
-rw-r--r--devel/hs-uuid-types/Makefile2
-rw-r--r--devel/hs-uuid-types/distinfo5
-rw-r--r--devel/hs-uuid/Makefile6
-rw-r--r--devel/hs-uuid/distinfo5
-rw-r--r--devel/hs-uulib/Makefile2
-rw-r--r--devel/hs-uulib/distinfo5
-rw-r--r--devel/hs-vault/Makefile2
-rw-r--r--devel/hs-vault/distinfo5
-rw-r--r--devel/hs-vector-algorithms/Makefile1
-rw-r--r--devel/hs-vector-algorithms/distinfo1
-rw-r--r--devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal11
-rw-r--r--devel/hs-vector-binary-instances/Makefile3
-rw-r--r--devel/hs-vector-binary-instances/distinfo5
-rw-r--r--devel/hs-vector-instances/Makefile2
-rw-r--r--devel/hs-vector-instances/distinfo5
-rw-r--r--devel/hs-vector-th-unbox/Makefile4
-rw-r--r--devel/hs-vector-th-unbox/distinfo5
-rw-r--r--devel/hs-vector/Makefile2
-rw-r--r--devel/hs-vector/distinfo5
-rw-r--r--devel/hs-void/Makefile2
-rw-r--r--devel/hs-void/distinfo5
-rw-r--r--devel/hs-wl-pprint-text/Makefile15
-rw-r--r--devel/hs-wl-pprint-text/distinfo3
-rw-r--r--devel/hs-wl-pprint-text/pkg-descr3
-rw-r--r--devel/hs-word8/Makefile1
-rw-r--r--devel/hs-word8/distinfo1
-rw-r--r--devel/stack/Makefile12
-rw-r--r--devel/stack/distinfo6
650 files changed, 2207 insertions, 921 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 69242f6aa5da..5778b3b82145 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -889,16 +889,18 @@
SUBDIR += hs-BoundedChan
SUBDIR += hs-ConfigFile
SUBDIR += hs-DrIFT
+ SUBDIR += hs-EdisonAPI
+ SUBDIR += hs-EdisonCore
SUBDIR += hs-Glob
SUBDIR += hs-HUnit
SUBDIR += hs-IfElse
SUBDIR += hs-List
+ SUBDIR += hs-ListLike
SUBDIR += hs-MemoTrie
SUBDIR += hs-MissingH
- SUBDIR += hs-MonadCatchIO-mtl
- SUBDIR += hs-MonadCatchIO-transformers
SUBDIR += hs-MonadRandom
SUBDIR += hs-ObjectName
+ SUBDIR += hs-Only
SUBDIR += hs-PSQueue
SUBDIR += hs-QuickCheck
SUBDIR += hs-ReadArgs
@@ -922,6 +924,7 @@
SUBDIR += hs-async
SUBDIR += hs-atomic-primops
SUBDIR += hs-auto-update
+ SUBDIR += hs-base-compat
SUBDIR += hs-base-orphans
SUBDIR += hs-base-unicode-symbols
SUBDIR += hs-base16-bytestring
@@ -943,12 +946,17 @@
SUBDIR += hs-bytestring-show
SUBDIR += hs-c2hs
SUBDIR += hs-cabal-install
+ SUBDIR += hs-call-stack
SUBDIR += hs-cereal
SUBDIR += hs-checkers
SUBDIR += hs-chunked-data
SUBDIR += hs-classy-prelude
SUBDIR += hs-classy-prelude-conduit
+ SUBDIR += hs-clock
SUBDIR += hs-cmdargs
+ SUBDIR += hs-code-page
+ SUBDIR += hs-colour
+ SUBDIR += hs-concurrent-output
SUBDIR += hs-conduit
SUBDIR += hs-conduit-combinators
SUBDIR += hs-conduit-extra
@@ -963,13 +971,14 @@
SUBDIR += hs-data-default-instances-containers
SUBDIR += hs-data-default-instances-dlist
SUBDIR += hs-data-default-instances-old-locale
+ SUBDIR += hs-data-endian
SUBDIR += hs-data-hash
SUBDIR += hs-data-ordlist
SUBDIR += hs-data-pprint
SUBDIR += hs-date-cache
SUBDIR += hs-datetime
+ SUBDIR += hs-dbus
SUBDIR += hs-deepseq-generics
- SUBDIR += hs-directory
SUBDIR += hs-directory-tree
SUBDIR += hs-dlist
SUBDIR += hs-dlist-instances
@@ -988,6 +997,8 @@
SUBDIR += hs-file-embed
SUBDIR += hs-filemanip
SUBDIR += hs-filestore
+ SUBDIR += hs-fmlist
+ SUBDIR += hs-foundation
SUBDIR += hs-free
SUBDIR += hs-fsnotify
SUBDIR += hs-gconf
@@ -998,6 +1009,7 @@
SUBDIR += hs-ghc-paths
SUBDIR += hs-gio
SUBDIR += hs-git-annex
+ SUBDIR += hs-gitrev
SUBDIR += hs-glib
SUBDIR += hs-gtk2hs-buildtools
SUBDIR += hs-haddock
@@ -1007,6 +1019,7 @@
SUBDIR += hs-hashable
SUBDIR += hs-hashed-storage
SUBDIR += hs-hashtables
+ SUBDIR += hs-haskell-lexer
SUBDIR += hs-haskell-src
SUBDIR += hs-haskell-src-exts
SUBDIR += hs-hasktags
@@ -1025,6 +1038,8 @@
SUBDIR += hs-hspec-core
SUBDIR += hs-hspec-discover
SUBDIR += hs-hspec-expectations
+ SUBDIR += hs-iostreams
+ SUBDIR += hs-iostreams-haproxy
SUBDIR += hs-js-flot
SUBDIR += hs-js-jquery
SUBDIR += hs-keys
@@ -1039,6 +1054,9 @@
SUBDIR += hs-logict
SUBDIR += hs-map-syntax
SUBDIR += hs-memory
+ SUBDIR += hs-microlens
+ SUBDIR += hs-microlens-th
+ SUBDIR += hs-microstache
SUBDIR += hs-mmap
SUBDIR += hs-mmorph
SUBDIR += hs-monad-control
@@ -1046,12 +1064,16 @@
SUBDIR += hs-monad-loops
SUBDIR += hs-monad-par
SUBDIR += hs-monad-par-extras
+ SUBDIR += hs-monad-unlift
+ SUBDIR += hs-monadplus
SUBDIR += hs-monads-tf
SUBDIR += hs-mono-traversable
+ SUBDIR += hs-mono-traversable-instances
SUBDIR += hs-mtl
SUBDIR += hs-mueval
SUBDIR += hs-murmur-hash
SUBDIR += hs-mutable-containers
+ SUBDIR += hs-newtype-generics
SUBDIR += hs-ncurses
SUBDIR += hs-newtype
SUBDIR += hs-old-locale
@@ -1063,15 +1085,21 @@
SUBDIR += hs-preprocessor-tools
SUBDIR += hs-prettyclass
SUBDIR += hs-primitive
+ SUBDIR += hs-process-extras
SUBDIR += hs-profunctors
SUBDIR += hs-project-template
+ SUBDIR += hs-psqueues
SUBDIR += hs-quickcheck-io
SUBDIR += hs-random
+ SUBDIR += hs-readable
SUBDIR += hs-readline
+ SUBDIR += hs-refact
SUBDIR += hs-reflection
SUBDIR += hs-resource-pool
SUBDIR += hs-resourcet
SUBDIR += hs-safe
+ SUBDIR += hs-safe-exceptions
+ SUBDIR += hs-say
SUBDIR += hs-scientific
SUBDIR += hs-securemem
SUBDIR += hs-setenv
@@ -1088,17 +1116,21 @@
SUBDIR += hs-strict
SUBDIR += hs-syb
SUBDIR += hs-syb-with-class
- SUBDIR += hs-syb-with-class-instances-text
SUBDIR += hs-system-fileio
SUBDIR += hs-system-filepath
SUBDIR += hs-tagged
SUBDIR += hs-temporary
+ SUBDIR += hs-terminal-size
SUBDIR += hs-test-framework
SUBDIR += hs-test-framework-hunit
SUBDIR += hs-test-framework-quickcheck2
SUBDIR += hs-text
SUBDIR += hs-text-icu
+ SUBDIR += hs-text-short
SUBDIR += hs-tf-random
+ SUBDIR += hs-th-abstraction
+ SUBDIR += hs-th-lift
+ SUBDIR += hs-th-lift-instances
SUBDIR += hs-threads
SUBDIR += hs-threadscope
SUBDIR += hs-time-compat
@@ -1107,7 +1139,9 @@
SUBDIR += hs-timezone-series
SUBDIR += hs-transformers-base
SUBDIR += hs-transformers-compat
+ SUBDIR += hs-typed-process
SUBDIR += hs-unamb
+ SUBDIR += hs-unexceptionalio
SUBDIR += hs-uniplate
SUBDIR += hs-unix-compat
SUBDIR += hs-unix-time
@@ -1128,6 +1162,7 @@
SUBDIR += hs-vector-instances
SUBDIR += hs-vector-th-unbox
SUBDIR += hs-void
+ SUBDIR += hs-wl-pprint-text
SUBDIR += hs-word8
SUBDIR += htable
SUBDIR += hub
diff --git a/devel/hs-BNFC/Makefile b/devel/hs-BNFC/Makefile
index 84eafee9333a..7b442f52bfe8 100644
--- a/devel/hs-BNFC/Makefile
+++ b/devel/hs-BNFC/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= BNFC
-PORTVERSION= 2.8
+PORTVERSION= 2.8.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-BNFC/distinfo b/devel/hs-BNFC/distinfo
index b8879a264d2b..2ef77ad5a36d 100644
--- a/devel/hs-BNFC/distinfo
+++ b/devel/hs-BNFC/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/BNFC-2.8.tar.gz) = 21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34
-SIZE (cabal/BNFC-2.8.tar.gz) = 183591
+TIMESTAMP = 1499627811
+SHA256 (cabal/BNFC-2.8.1.tar.gz) = 2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920
+SIZE (cabal/BNFC-2.8.1.tar.gz) = 225015
diff --git a/devel/hs-Boolean/Makefile b/devel/hs-Boolean/Makefile
index 7ec21fea8b64..8e98e83311de 100644
--- a/devel/hs-Boolean/Makefile
+++ b/devel/hs-Boolean/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= Boolean
-PORTVERSION= 0.2.3
+PORTVERSION= 0.2.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Boolean/distinfo b/devel/hs-Boolean/distinfo
index 1e079675c174..c378fc89b008 100644
--- a/devel/hs-Boolean/distinfo
+++ b/devel/hs-Boolean/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Boolean-0.2.3.tar.gz) = f64d64ddd1300beab481af21b7f451f6f1d189709a994c2b4e573e78bc0155d3
-SIZE (cabal/Boolean-0.2.3.tar.gz) = 6608
+TIMESTAMP = 1499627811
+SHA256 (cabal/Boolean-0.2.4.tar.gz) = 67216013b02b8ac5b534a1ef25f409f930eea1a85eae801933a01ad43145eef8
+SIZE (cabal/Boolean-0.2.4.tar.gz) = 6634
diff --git a/devel/hs-BoundedChan/Makefile b/devel/hs-BoundedChan/Makefile
index c8119ab585fb..5a155f970635 100644
--- a/devel/hs-BoundedChan/Makefile
+++ b/devel/hs-BoundedChan/Makefile
@@ -3,7 +3,7 @@
PORTNAME= BoundedChan
PORTVERSION= 1.0.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-BoundedChan/distinfo b/devel/hs-BoundedChan/distinfo
index 1c925cc39a3d..83dce08f57aa 100644
--- a/devel/hs-BoundedChan/distinfo
+++ b/devel/hs-BoundedChan/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627811
SHA256 (cabal/BoundedChan-1.0.3.0.tar.gz) = 531ceaed7f62844c2a63a7cbfdcab332ea5eaa218e9922ca3305580438adc46d
SIZE (cabal/BoundedChan-1.0.3.0.tar.gz) = 3591
diff --git a/devel/hs-ConfigFile/Makefile b/devel/hs-ConfigFile/Makefile
index 4c6a953287ff..00c596cbacf0 100644
--- a/devel/hs-ConfigFile/Makefile
+++ b/devel/hs-ConfigFile/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ConfigFile
PORTVERSION= 1.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ConfigFile/distinfo b/devel/hs-ConfigFile/distinfo
index e680782c4d10..182b274e7f00 100644
--- a/devel/hs-ConfigFile/distinfo
+++ b/devel/hs-ConfigFile/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627812
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 d95e146dd200..c89e13532287 100644
--- a/devel/hs-DrIFT/Makefile
+++ b/devel/hs-DrIFT/Makefile
@@ -2,7 +2,7 @@
PORTNAME= DrIFT
PORTVERSION= 2.4.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-DrIFT/distinfo b/devel/hs-DrIFT/distinfo
index ba543f98badf..bfedcf3f127c 100644
--- a/devel/hs-DrIFT/distinfo
+++ b/devel/hs-DrIFT/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627812
SHA256 (cabal/DrIFT-2.4.2.tar.gz) = 742a0b12f16a9da215a29c8284ae379734a70e7811a5f4b1a02dba2873751cf0
SIZE (cabal/DrIFT-2.4.2.tar.gz) = 69676
diff --git a/devel/hs-EdisonAPI/Makefile b/devel/hs-EdisonAPI/Makefile
new file mode 100644
index 000000000000..c17c2f457a0a
--- /dev/null
+++ b/devel/hs-EdisonAPI/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= EdisonAPI
+PORTVERSION= 1.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A library of efficient, purely-functional data structures (API)
+
+LICENSE= MIT
+
+USE_CABAL= mtl
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-EdisonAPI/distinfo b/devel/hs-EdisonAPI/distinfo
new file mode 100644
index 000000000000..c3562b5b71c7
--- /dev/null
+++ b/devel/hs-EdisonAPI/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996490
+SHA256 (cabal/EdisonAPI-1.3.1.tar.gz) = 95a3b8d01599520a50456219b5a2e9f7832bcddaaeb8e94ce777bd87a4a6b56e
+SIZE (cabal/EdisonAPI-1.3.1.tar.gz) = 30512
diff --git a/devel/hs-EdisonAPI/pkg-descr b/devel/hs-EdisonAPI/pkg-descr
new file mode 100644
index 000000000000..e83fa3d6151d
--- /dev/null
+++ b/devel/hs-EdisonAPI/pkg-descr
@@ -0,0 +1,11 @@
+Edison is a library of purely functional data structures written by Chris
+Okasaki. It is named after Thomas Alva Edison and for the mnemonic value
+EDiSon (Efficient Data Structures). Edison provides several families of
+abstractions, each with multiple implementations. The main abstractions
+provided by Edison are: Sequences such as stacks, queues, and dequeues;
+Collections such as sets, bags and heaps; and Associative Collections such
+as finite maps and priority queues where the priority and element are
+distinct.
+
+WWW: http://rwd.rdockins.name/edison/home/
+
diff --git a/devel/hs-EdisonCore/Makefile b/devel/hs-EdisonCore/Makefile
new file mode 100644
index 000000000000..c3b5618ffc27
--- /dev/null
+++ b/devel/hs-EdisonCore/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= EdisonCore
+PORTVERSION= 1.3.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A library of efficent, purely-functional data structures (Core Implementations)
+
+USE_CABAL= EdisonAPI mtl QuickCheck
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-EdisonCore/distinfo b/devel/hs-EdisonCore/distinfo
new file mode 100644
index 000000000000..539ff6b5ab70
--- /dev/null
+++ b/devel/hs-EdisonCore/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996696
+SHA256 (cabal/EdisonCore-1.3.1.1.tar.gz) = 3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b
+SIZE (cabal/EdisonCore-1.3.1.1.tar.gz) = 80699
diff --git a/devel/hs-EdisonCore/pkg-descr b/devel/hs-EdisonCore/pkg-descr
new file mode 100644
index 000000000000..1cb6cdaded6e
--- /dev/null
+++ b/devel/hs-EdisonCore/pkg-descr
@@ -0,0 +1,7 @@
+This package provides the core Edison data structure implementations,
+including multiple sequence, set, bag, and finite map concrete implementations
+with various performance characteristics. The implementations in this package
+have no dependencies other than those commonly bundled with Haskell compilers.
+
+WWW: http://rwd.rdockins.name/edison/home/
+
diff --git a/devel/hs-Glob/Makefile b/devel/hs-Glob/Makefile
index 9897d6cf1463..67d65b16d356 100644
--- a/devel/hs-Glob/Makefile
+++ b/devel/hs-Glob/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= Glob
-PORTVERSION= 0.7.5
-PORTREVISION= 2
+PORTVERSION= 0.8.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= Globbing library
LICENSE= BSD3CLAUSE
-USE_CABAL= dlist>=0.4
+USE_CABAL= dlist>=0.4 transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-Glob/distinfo b/devel/hs-Glob/distinfo
index 0b910e5ee196..af2aff5a2e01 100644
--- a/devel/hs-Glob/distinfo
+++ b/devel/hs-Glob/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/Glob-0.7.5.tar.gz) = 0063bbc680d90f522455c0dec1121837689da542f4d9c70924d98bfb1389be41
-SIZE (cabal/Glob-0.7.5.tar.gz) = 23443
+TIMESTAMP = 1499452388
+SHA256 (cabal/Glob-0.8.0.tar.gz) = 38f011be0e7818ab1e76880882b15217cd7d5be56a3dab631c14d614e2b2e896
+SIZE (cabal/Glob-0.8.0.tar.gz) = 23943
diff --git a/devel/hs-Glob/files/patch-Glob.cabal b/devel/hs-Glob/files/patch-Glob.cabal
deleted file mode 100644
index 70ad0f1072e2..000000000000
--- a/devel/hs-Glob/files/patch-Glob.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 3c35bfea1d77..448c20235a8a 100644
--- a/devel/hs-HUnit/Makefile
+++ b/devel/hs-HUnit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= HUnit
-PORTVERSION= 1.2.5.2
-PORTREVISION= 7
+PORTVERSION= 1.6.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,5 +9,7 @@ COMMENT= Unit testing framework for Haskell
LICENSE= BSD3CLAUSE
+USE_CABAL= call-stack
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-HUnit/distinfo b/devel/hs-HUnit/distinfo
index 647d173b8527..6ecf2c9fe5ff 100644
--- a/devel/hs-HUnit/distinfo
+++ b/devel/hs-HUnit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/HUnit-1.2.5.2.tar.gz) = 0af5ad34dba27de48b94ce6d5f7ee3aa6af6183bdc4a3967b811e28520369a41
-SIZE (cabal/HUnit-1.2.5.2.tar.gz) = 24889
+TIMESTAMP = 1499627813
+SHA256 (cabal/HUnit-1.6.0.0.tar.gz) = 7448e6b966e98e84b7627deba23f71b508e9a61e7bc571d74304a25d30e6d0de
+SIZE (cabal/HUnit-1.6.0.0.tar.gz) = 21937
diff --git a/devel/hs-IfElse/Makefile b/devel/hs-IfElse/Makefile
index b32219be07da..a7b996c75fa9 100644
--- a/devel/hs-IfElse/Makefile
+++ b/devel/hs-IfElse/Makefile
@@ -2,7 +2,7 @@
PORTNAME= IfElse
PORTVERSION= 0.85
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-IfElse/distinfo b/devel/hs-IfElse/distinfo
index 102e361d482b..630846fea58a 100644
--- a/devel/hs-IfElse/distinfo
+++ b/devel/hs-IfElse/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627813
SHA256 (cabal/IfElse-0.85.tar.gz) = 8ad3bfc3e2c867e6330d9bff874b3105476c35b2e1638fd448f233e9f80addcd
SIZE (cabal/IfElse-0.85.tar.gz) = 2865
diff --git a/devel/hs-List/Makefile b/devel/hs-List/Makefile
index 1dec721ed587..1f111663be02 100644
--- a/devel/hs-List/Makefile
+++ b/devel/hs-List/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= List
-PORTVERSION= 0.5.2
+PORTVERSION= 0.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-List/distinfo b/devel/hs-List/distinfo
index 4ce3b381a902..c9acc7f2cffd 100644
--- a/devel/hs-List/distinfo
+++ b/devel/hs-List/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/List-0.5.2.tar.gz) = 27ddf9a9b348c3a2fc72ba8bed78ecacd32f26cc7ae1b8de8a066bd14ec8eaac
-SIZE (cabal/List-0.5.2.tar.gz) = 6242
+TIMESTAMP = 1499627813
+SHA256 (cabal/List-0.6.0.tar.gz) = 03de2236b8802ddc76ff22d6de0037855d00790d0f4071b3467b419521a29889
+SIZE (cabal/List-0.6.0.tar.gz) = 6189
diff --git a/devel/hs-MonadCatchIO-transformers/Makefile b/devel/hs-ListLike/Makefile
index cbc9815e0cc3..e3f0031f57e0 100644
--- a/devel/hs-MonadCatchIO-transformers/Makefile
+++ b/devel/hs-ListLike/Makefile
@@ -1,15 +1,15 @@
# $FreeBSD$
-PORTNAME= MonadCatchIO-transformers
-PORTVERSION= 0.3.1.3
+PORTNAME= ListLike
+PORTVERSION= 4.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Monad-transformer-compatible version of Control.Exception
+COMMENT= Generic support for list-like structures in Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions monads-tf
+USE_CABAL= dlist fmlist text utf8-string vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-ListLike/distinfo b/devel/hs-ListLike/distinfo
new file mode 100644
index 000000000000..010c4cdb2e97
--- /dev/null
+++ b/devel/hs-ListLike/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719758
+SHA256 (cabal/ListLike-4.5.1.tar.gz) = b70745335b563cd9039bb17a1e2faf7edb1b68febdd19586b28ab67c55562a8d
+SIZE (cabal/ListLike-4.5.1.tar.gz) = 29600
diff --git a/devel/hs-ListLike/pkg-descr b/devel/hs-ListLike/pkg-descr
new file mode 100644
index 000000000000..c4d10f36ce76
--- /dev/null
+++ b/devel/hs-ListLike/pkg-descr
@@ -0,0 +1,12 @@
+Generic support for list-like structures in Haskell.
+
+The ListLike module provides a common interface to the various Haskell types
+that are list-like. Predefined interfaces include standard Haskell lists,
+Arrays, ByteStrings, and lazy ByteStrings. Custom types can easily be made
+ListLike instances as well.
+
+ListLike also provides for String-like types, such as String and ByteString,
+for types that support input and output, and for types that can handle
+infinite lists.
+
+WWW: http://hackage.haskell.org/package/ListLike
diff --git a/devel/hs-MemoTrie/Makefile b/devel/hs-MemoTrie/Makefile
index a94f819844d2..3d31ce647676 100644
--- a/devel/hs-MemoTrie/Makefile
+++ b/devel/hs-MemoTrie/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= MemoTrie
-PORTVERSION= 0.6.2
-PORTREVISION= 2
+PORTVERSION= 0.6.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT= Trie-based memo functions
LICENSE= BSD3CLAUSE
-USE_CABAL= void
+USE_CABAL= newtype-generics void
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-MemoTrie/distinfo b/devel/hs-MemoTrie/distinfo
index 0633cd874e39..1962e7a19fc2 100644
--- a/devel/hs-MemoTrie/distinfo
+++ b/devel/hs-MemoTrie/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MemoTrie-0.6.2.tar.gz) = 9ddc11172db26a54681f14dd8ce881c87a3b0e72dcc7a15b74132f30b4408bbc
-SIZE (cabal/MemoTrie-0.6.2.tar.gz) = 6250
+TIMESTAMP = 1499627814
+SHA256 (cabal/MemoTrie-0.6.8.tar.gz) = 5fd9495722d94ff61aa6cde0287fe8222926f5adf929d52fef0532d483429da4
+SIZE (cabal/MemoTrie-0.6.8.tar.gz) = 8399
diff --git a/devel/hs-MissingH/Makefile b/devel/hs-MissingH/Makefile
index 6566861950cb..a19fe4fba5ef 100644
--- a/devel/hs-MissingH/Makefile
+++ b/devel/hs-MissingH/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= MissingH
-PORTVERSION= 1.3.0.1
+PORTVERSION= 1.4.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-MissingH/distinfo b/devel/hs-MissingH/distinfo
index 5093588314db..5028956bb8f7 100644
--- a/devel/hs-MissingH/distinfo
+++ b/devel/hs-MissingH/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MissingH-1.3.0.1.tar.gz) = ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3
-SIZE (cabal/MissingH-1.3.0.1.tar.gz) = 116812
+TIMESTAMP = 1499544768
+SHA256 (cabal/MissingH-1.4.0.1.tar.gz) = 283f2afd46625d98b4e29f77edadfa5e6009a227812ee2ece10091ad6a7e9b71
+SIZE (cabal/MissingH-1.4.0.1.tar.gz) = 109582
diff --git a/devel/hs-MonadCatchIO-mtl/Makefile b/devel/hs-MonadCatchIO-mtl/Makefile
deleted file mode 100644
index 6a337d038cc9..000000000000
--- a/devel/hs-MonadCatchIO-mtl/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
-# $FreeBSD$
-
-PORTNAME= MonadCatchIO-mtl
-PORTVERSION= 0.3.1.0
-PORTREVISION= 2
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Monad-transformer version of the Control.Exception module
-
-LICENSE= BSD3CLAUSE
-
-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/distinfo b/devel/hs-MonadCatchIO-mtl/distinfo
deleted file mode 100644
index 4d2ec948365b..000000000000
--- a/devel/hs-MonadCatchIO-mtl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/MonadCatchIO-mtl-0.3.1.0.tar.gz) = 18c24e23bcb14ccfe3d46012b7935a0f7927eff298c7d6f76b087fc4c6715961
-SIZE (cabal/MonadCatchIO-mtl-0.3.1.0.tar.gz) = 1730
diff --git a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal b/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
deleted file mode 100644
index 987af20bcd8c..000000000000
--- a/devel/hs-MonadCatchIO-mtl/files/patch-MonadCatchIO-mtl.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-mtl/pkg-descr b/devel/hs-MonadCatchIO-mtl/pkg-descr
deleted file mode 100644
index 706083b2d48c..000000000000
--- a/devel/hs-MonadCatchIO-mtl/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Provides a monad-transformer version of the Control.Exception.catch
-Haskell function. For this, it defines the MonadCatchIO class, a subset
-of MonadIO. It defines proper instances for most monad transformers in
-the 'mtl' library.
-
-WWW: http://darcsden.com/jcpetruzza/MonadCatchIO-mtl
diff --git a/devel/hs-MonadCatchIO-transformers/distinfo b/devel/hs-MonadCatchIO-transformers/distinfo
deleted file mode 100644
index d18607148b86..000000000000
--- a/devel/hs-MonadCatchIO-transformers/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-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-MonadCatchIO-transformers/pkg-descr b/devel/hs-MonadCatchIO-transformers/pkg-descr
deleted file mode 100644
index 500453cc9c70..000000000000
--- a/devel/hs-MonadCatchIO-transformers/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-Provides functions to throw and catch exceptions. Unlike the functions from
-Control.Exception, which work in IO, these work in any stack of monad
-transformers (from the 'transformers' package) with IO as the base monad.
-You can extend this functionality to other monads, by creating an instance
-of the MonadCatchIO class.
-
-WWW: http://hackage.haskell.org/package/MonadCatchIO-transformers
diff --git a/devel/hs-MonadRandom/Makefile b/devel/hs-MonadRandom/Makefile
index eb2e52ed4391..b91a7fe5938a 100644
--- a/devel/hs-MonadRandom/Makefile
+++ b/devel/hs-MonadRandom/Makefile
@@ -1,13 +1,13 @@
# $FreeBSD$
PORTNAME= MonadRandom
-PORTVERSION= 0.4
+PORTVERSION= 0.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Random-number generation monad
-USE_CABAL= mtl random transformers-compat>=0.4
+USE_CABAL= mtl primitive 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 ab6bac382761..6143b7ff832e 100644
--- a/devel/hs-MonadRandom/distinfo
+++ b/devel/hs-MonadRandom/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/MonadRandom-0.4.tar.gz) = d32f3f7a8390125f43a67b78741c6655452dfc4388009ab4ca5a265ab5b86f93
-SIZE (cabal/MonadRandom-0.4.tar.gz) = 5064
+TIMESTAMP = 1499445934
+SHA256 (cabal/MonadRandom-0.5.1.tar.gz) = 9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87
+SIZE (cabal/MonadRandom-0.5.1.tar.gz) = 10326
diff --git a/devel/hs-MonadRandom/files/patch-MonadRandom.cabal b/devel/hs-MonadRandom/files/patch-MonadRandom.cabal
new file mode 100644
index 000000000000..35793f2304ed
--- /dev/null
+++ b/devel/hs-MonadRandom/files/patch-MonadRandom.cabal
@@ -0,0 +1,10 @@
+--- MonadRandom.cabal.orig 2017-07-10 13:35:15 UTC
++++ MonadRandom.cabal
+@@ -37,7 +37,6 @@ library
+ transformers-compat >=0.4 && <0.6,
+ mtl >=2.1 && <2.3,
+ primitive >=0.6 && <0.7,
+- fail >=4.9 ,
+ random
+ ghc-options: -Wall
+ default-language: Haskell2010
diff --git a/devel/hs-ObjectName/Makefile b/devel/hs-ObjectName/Makefile
index 968768c567ae..02cfb6d44354 100644
--- a/devel/hs-ObjectName/Makefile
+++ b/devel/hs-ObjectName/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ObjectName
-PORTVERSION= 1.1.0.0
+PORTVERSION= 1.1.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ObjectName/distinfo b/devel/hs-ObjectName/distinfo
index ecc51246047a..7a7335392455 100644
--- a/devel/hs-ObjectName/distinfo
+++ b/devel/hs-ObjectName/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ObjectName-1.1.0.0.tar.gz) = afa91a31b325d2d70b27c367cf0447410f31f8e80bb851b5cbe6a9e9d372054e
-SIZE (cabal/ObjectName-1.1.0.0.tar.gz) = 2583
+TIMESTAMP = 1499547842
+SHA256 (cabal/ObjectName-1.1.0.1.tar.gz) = 72dbef237580fd4e8567de2de752835bbadd3629f486d1586486d49a49aad210
+SIZE (cabal/ObjectName-1.1.0.1.tar.gz) = 2557
diff --git a/devel/hs-directory/Makefile b/devel/hs-Only/Makefile
index f2e27108d421..16b851916edc 100644
--- a/devel/hs-directory/Makefile
+++ b/devel/hs-Only/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
-PORTNAME= directory
-PORTVERSION= 1.3.0.1
+PORTNAME= Only
+PORTVERSION= 0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Library for manipulating files and directories in a portable way
+COMMENT= This package provides a canonical anonymous 1-tuple type
LICENSE= BSD3CLAUSE
diff --git a/devel/hs-Only/distinfo b/devel/hs-Only/distinfo
new file mode 100644
index 000000000000..f2d151814ae7
--- /dev/null
+++ b/devel/hs-Only/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499539872
+SHA256 (cabal/Only-0.1.tar.gz) = ab7aa193e8c257d3bda6b0b3c1cbcf74cdaa85ab08cb20c2dd62ba248c1ab265
+SIZE (cabal/Only-0.1.tar.gz) = 1960
diff --git a/devel/hs-Only/pkg-descr b/devel/hs-Only/pkg-descr
new file mode 100644
index 000000000000..afce2902a3be
--- /dev/null
+++ b/devel/hs-Only/pkg-descr
@@ -0,0 +1,11 @@
+This package provides a canonical anonymous 1-tuple type missing from Haskell
+for attaching typeclass instances.
+
+NOTE: There is also the OneTuple package which by using a boxed data-type
+provides a 1-tuple type which has laziness properties which are more faithful
+to the ones of Haskell's native tuples; whereas the primary purpose of Only is
+to provide the traditionally so named type-wrapper for attaching typeclass
+instances.
+
+WWW: https://github.com/haskell/Only
+
diff --git a/devel/hs-PSQueue/Makefile b/devel/hs-PSQueue/Makefile
index d1e061850da4..8535add3acd8 100644
--- a/devel/hs-PSQueue/Makefile
+++ b/devel/hs-PSQueue/Makefile
@@ -2,7 +2,7 @@
PORTNAME= PSQueue
PORTVERSION= 1.1
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-PSQueue/distinfo b/devel/hs-PSQueue/distinfo
index 42f31babc8ea..d9dda354b543 100644
--- a/devel/hs-PSQueue/distinfo
+++ b/devel/hs-PSQueue/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627814
SHA256 (cabal/PSQueue-1.1.tar.gz) = a8e0871ad10f916f55c3b9baec53eff23c4e97e09cf96d6c66771789e00a49cc
SIZE (cabal/PSQueue-1.1.tar.gz) = 6280
diff --git a/devel/hs-QuickCheck/Makefile b/devel/hs-QuickCheck/Makefile
index fe1fad80de34..62533977baaa 100644
--- a/devel/hs-QuickCheck/Makefile
+++ b/devel/hs-QuickCheck/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= QuickCheck
-PORTVERSION= 2.8.1
+PORTVERSION= 2.10.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-QuickCheck/distinfo b/devel/hs-QuickCheck/distinfo
index 87c1a1a57ee3..154ed1dcf6f6 100644
--- a/devel/hs-QuickCheck/distinfo
+++ b/devel/hs-QuickCheck/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/QuickCheck-2.8.1.tar.gz) = 7073aa3635660476aa31df7cf0476926a1ac0231235020122eb276070675763b
-SIZE (cabal/QuickCheck-2.8.1.tar.gz) = 38999
+TIMESTAMP = 1499459639
+SHA256 (cabal/QuickCheck-2.10.0.1.tar.gz) = 00d50522cd9550b1e8ae31ccddf2749d39a533807f4207abf1d36f231e00b42e
+SIZE (cabal/QuickCheck-2.10.0.1.tar.gz) = 54415
diff --git a/devel/hs-ReadArgs/Makefile b/devel/hs-ReadArgs/Makefile
index 146a4d2074ce..1a13c0e3e085 100644
--- a/devel/hs-ReadArgs/Makefile
+++ b/devel/hs-ReadArgs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ReadArgs
-PORTVERSION= 1.2.2
+PORTVERSION= 1.2.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ReadArgs/distinfo b/devel/hs-ReadArgs/distinfo
index 37d4784294c4..0f78f81e16d7 100644
--- a/devel/hs-ReadArgs/distinfo
+++ b/devel/hs-ReadArgs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ReadArgs-1.2.2.tar.gz) = 47a1a21621a45a960f516393c1e7c5d33a7d840db0f7eff20d43e6fc7fc9deec
-SIZE (cabal/ReadArgs-1.2.2.tar.gz) = 5102
+TIMESTAMP = 1499627815
+SHA256 (cabal/ReadArgs-1.2.3.tar.gz) = 9f4b2a9dfa9f0d851f79853a56ffde3b35e218d5f2bf8354c91a1344a1251a69
+SIZE (cabal/ReadArgs-1.2.3.tar.gz) = 5100
diff --git a/devel/hs-STMonadTrans/Makefile b/devel/hs-STMonadTrans/Makefile
index 25128f80d3f0..bdf8a77db120 100644
--- a/devel/hs-STMonadTrans/Makefile
+++ b/devel/hs-STMonadTrans/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= STMonadTrans
-PORTVERSION= 0.3.3
+PORTVERSION= 0.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-STMonadTrans/distinfo b/devel/hs-STMonadTrans/distinfo
index 6b2f9f9399e9..77b76fa18b1e 100644
--- a/devel/hs-STMonadTrans/distinfo
+++ b/devel/hs-STMonadTrans/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/STMonadTrans-0.3.3.tar.gz) = d9911c7634c42b94f57ac7c2a6d523f6d7124870b35fc3030cb72109ba3aa315
-SIZE (cabal/STMonadTrans-0.3.3.tar.gz) = 4820
+TIMESTAMP = 1499627815
+SHA256 (cabal/STMonadTrans-0.4.3.tar.gz) = 574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db
+SIZE (cabal/STMonadTrans-0.4.3.tar.gz) = 5786
diff --git a/devel/hs-SafeSemaphore/Makefile b/devel/hs-SafeSemaphore/Makefile
index 09e5c1586efd..72ccc5daf7c0 100644
--- a/devel/hs-SafeSemaphore/Makefile
+++ b/devel/hs-SafeSemaphore/Makefile
@@ -2,7 +2,7 @@
PORTNAME= SafeSemaphore
PORTVERSION= 0.10.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-SafeSemaphore/distinfo b/devel/hs-SafeSemaphore/distinfo
index 16e51a6a6991..ae661b9fd032 100644
--- a/devel/hs-SafeSemaphore/distinfo
+++ b/devel/hs-SafeSemaphore/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627815
SHA256 (cabal/SafeSemaphore-0.10.1.tar.gz) = 21e5b737a378cae9e1faf85cab015316d4c84d4b37e6d9d202111cef8c4cef66
SIZE (cabal/SafeSemaphore-0.10.1.tar.gz) = 24007
diff --git a/devel/hs-ShellCheck/Makefile b/devel/hs-ShellCheck/Makefile
index e83eab93b573..610620b73873 100644
--- a/devel/hs-ShellCheck/Makefile
+++ b/devel/hs-ShellCheck/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ShellCheck
-PORTVERSION= 0.4.5
+PORTVERSION= 0.4.6
CATEGORIES= devel haskell
MAINTAINER= luca.pizzamiglio@gmail.com
diff --git a/devel/hs-ShellCheck/distinfo b/devel/hs-ShellCheck/distinfo
index 5d28dfe87657..c527598c5e5e 100644
--- a/devel/hs-ShellCheck/distinfo
+++ b/devel/hs-ShellCheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487064735
-SHA256 (cabal/ShellCheck-0.4.5.tar.gz) = 53039ac314b99af691a99aec111572ee51b0579280c7fa5795ac48d0c4e02fa7
-SIZE (cabal/ShellCheck-0.4.5.tar.gz) = 109721
+TIMESTAMP = 1499627816
+SHA256 (cabal/ShellCheck-0.4.6.tar.gz) = 11eb9b2794363fbccc6fbd18601db49680e2c439440a9b103eebfda1aa86b1bc
+SIZE (cabal/ShellCheck-0.4.6.tar.gz) = 116618
diff --git a/devel/hs-StateVar/Makefile b/devel/hs-StateVar/Makefile
index 1bbf8dd20161..41f903e94301 100644
--- a/devel/hs-StateVar/Makefile
+++ b/devel/hs-StateVar/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= StateVar
-PORTVERSION= 1.1.0.1
+PORTVERSION= 1.1.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= State variables
LICENSE= BSD3CLAUSE
-USE_CABAL= stm>=2.0
+USE_CABAL= stm
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-StateVar/distinfo b/devel/hs-StateVar/distinfo
index 584800b0abf3..ecf2f362f8b5 100644
--- a/devel/hs-StateVar/distinfo
+++ b/devel/hs-StateVar/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/StateVar-1.1.0.1.tar.gz) = 0eae79ccc58509f2302cb90f2306d6bb2f1805a2847058fa643d18cc370be5aa
-SIZE (cabal/StateVar-1.1.0.1.tar.gz) = 4462
+TIMESTAMP = 1499443877
+SHA256 (cabal/StateVar-1.1.0.4.tar.gz) = 7ad68decb5c9a76f83c95ece5fa13d1b053e4fb1079bd2d3538f6b05014dffb7
+SIZE (cabal/StateVar-1.1.0.4.tar.gz) = 4587
diff --git a/devel/hs-Stream/Makefile b/devel/hs-Stream/Makefile
index a1a634bb31d6..df0145fcd6c0 100644
--- a/devel/hs-Stream/Makefile
+++ b/devel/hs-Stream/Makefile
@@ -3,6 +3,7 @@
PORTNAME= Stream
PORTVERSION= 0.4.7.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-Stream/distinfo b/devel/hs-Stream/distinfo
index 04b62c912e14..06a32567de7f 100644
--- a/devel/hs-Stream/distinfo
+++ b/devel/hs-Stream/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627816
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 4c9b28156e6e..17d37e1c4ff0 100644
--- a/devel/hs-TypeCompose/Makefile
+++ b/devel/hs-TypeCompose/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= TypeCompose
-PORTVERSION= 0.9.10
-PORTREVISION= 2
+PORTVERSION= 0.9.12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,5 +10,7 @@ COMMENT= Type composition classes and instances
LICENSE= BSD3CLAUSE
+USE_CABAL= base-orphans
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-TypeCompose/distinfo b/devel/hs-TypeCompose/distinfo
index 46f4bbd8f229..fa65760e56f1 100644
--- a/devel/hs-TypeCompose/distinfo
+++ b/devel/hs-TypeCompose/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/TypeCompose-0.9.10.tar.gz) = b8775cdd8239bfba32b9cc62abf44124bc39be907b5fa29d19f433e31a6ef4f2
-SIZE (cabal/TypeCompose-0.9.10.tar.gz) = 17866
+TIMESTAMP = 1499627817
+SHA256 (cabal/TypeCompose-0.9.12.tar.gz) = 3a182c2cc93f8291b3aedfc32c0b1faa84a982601c1a24cbe7fe1ecc50e333e2
+SIZE (cabal/TypeCompose-0.9.12.tar.gz) = 17946
diff --git a/devel/hs-abstract-deque/Makefile b/devel/hs-abstract-deque/Makefile
index 7ac40b058d85..b5f7caa610b2 100644
--- a/devel/hs-abstract-deque/Makefile
+++ b/devel/hs-abstract-deque/Makefile
@@ -2,7 +2,7 @@
PORTNAME= abstract-deque
PORTVERSION= 0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-deque/distinfo b/devel/hs-abstract-deque/distinfo
index 917676268041..a00a333060ae 100644
--- a/devel/hs-abstract-deque/distinfo
+++ b/devel/hs-abstract-deque/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627817
SHA256 (cabal/abstract-deque-0.3.tar.gz) = 09aa10f38193a8275a7791b92a4f3a7192a304874637e2a35c897dde25d75ca2
SIZE (cabal/abstract-deque-0.3.tar.gz) = 7219
diff --git a/devel/hs-abstract-par/Makefile b/devel/hs-abstract-par/Makefile
index f0b52453e552..31d3881c7e90 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-abstract-par/distinfo b/devel/hs-abstract-par/distinfo
index 122e180581d2..bc3bebb4f1a6 100644
--- a/devel/hs-abstract-par/distinfo
+++ b/devel/hs-abstract-par/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627817
SHA256 (cabal/abstract-par-0.3.3.tar.gz) = 248a8739bd902462cb16755b690b55660e196e58cc7e6ef8157a72c2a3d5d860
SIZE (cabal/abstract-par-0.3.3.tar.gz) = 4714
diff --git a/devel/hs-activehs-base/Makefile b/devel/hs-activehs-base/Makefile
index 2d421bb0b27e..8f9186cbc56c 100644
--- a/devel/hs-activehs-base/Makefile
+++ b/devel/hs-activehs-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= activehs-base
-PORTVERSION= 0.3.0.2
-PORTREVISION= 9
+PORTVERSION= 0.3.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-activehs-base/distinfo b/devel/hs-activehs-base/distinfo
index c10fe3b3e237..94603a8b3acf 100644
--- a/devel/hs-activehs-base/distinfo
+++ b/devel/hs-activehs-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/activehs-base-0.3.0.2.tar.gz) = bb65782c7c29a745c435e7857b5f466017c622a57a604ef8ee645fad5cd75973
-SIZE (cabal/activehs-base-0.3.0.2.tar.gz) = 1873
+TIMESTAMP = 1499538392
+SHA256 (cabal/activehs-base-0.3.0.4.tar.gz) = 92d516583737ceb2272807eab8280ebb3b36e679c5a219ca9813d0c695efb13e
+SIZE (cabal/activehs-base-0.3.0.4.tar.gz) = 1881
diff --git a/devel/hs-activehs-base/files/patch-activehs-base.cabal b/devel/hs-activehs-base/files/patch-activehs-base.cabal
index 9f24f99262fc..47ab808ddeba 100644
--- a/devel/hs-activehs-base/files/patch-activehs-base.cabal
+++ b/devel/hs-activehs-base/files/patch-activehs-base.cabal
@@ -1,12 +1,10 @@
---- activehs-base.cabal.orig 2012-09-11 07:56:08 UTC
+--- activehs-base.cabal.orig 2017-07-11 16:35:24 UTC
+++ activehs-base.cabal
-@@ -21,7 +21,7 @@ Library
- Exposed-Modules:
+@@ -22,6 +22,6 @@ Library
ActiveHs.Base
Build-Depends:
-- base >= 4.0 && < 4.7,
-- QuickCheck >= 2.4 && < 2.6
-+ base >= 4.0 && < 4.9,
-+ QuickCheck >= 2.4 && < 2.9
+ base >= 4.0 && < 4.10,
+- QuickCheck >= 2.4 && < 2.9
++ QuickCheck >= 2.4 && < 2.11
diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 48134fc0ad15..5ab31ca763ce 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= alex
-PORTVERSION= 3.1.4
+PORTVERSION= 3.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index be00f43be4a9..881bf30b7a29 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/alex-3.1.4.tar.gz) = d64e4eccd953c62795ed566a6de5f3d150b653e05872ff697b3d9dbc961da19f
-SIZE (cabal/alex-3.1.4.tar.gz) = 101827
+TIMESTAMP = 1499627818
+SHA256 (cabal/alex-3.2.1.tar.gz) = a4e7f7ec729f4fae5a5c778bc48421a90acf65c7278f6970cf123fb3b6230e6c
+SIZE (cabal/alex-3.2.1.tar.gz) = 111167
diff --git a/devel/hs-ansi-terminal/Makefile b/devel/hs-ansi-terminal/Makefile
index 400c6373755e..0b000eeb7539 100644
--- a/devel/hs-ansi-terminal/Makefile
+++ b/devel/hs-ansi-terminal/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ansi-terminal
-PORTVERSION= 0.6.2.1
+PORTVERSION= 0.6.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-terminal/distinfo b/devel/hs-ansi-terminal/distinfo
index 718b46e311b6..3455706769c7 100644
--- a/devel/hs-ansi-terminal/distinfo
+++ b/devel/hs-ansi-terminal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ansi-terminal-0.6.2.1.tar.gz) = 965a38671ddd195b243af9d0284faedb52b852eace5f7cced11e6fcf2e47b7f6
-SIZE (cabal/ansi-terminal-0.6.2.1.tar.gz) = 14652
+TIMESTAMP = 1499627818
+SHA256 (cabal/ansi-terminal-0.6.3.1.tar.gz) = 458f98e0c9217897f0ff07f730cfc3ed380089936fb31942aec31bb336608095
+SIZE (cabal/ansi-terminal-0.6.3.1.tar.gz) = 30199
diff --git a/devel/hs-ansi-wl-pprint/Makefile b/devel/hs-ansi-wl-pprint/Makefile
index d9fb74075c8b..f96a30c34aaf 100644
--- a/devel/hs-ansi-wl-pprint/Makefile
+++ b/devel/hs-ansi-wl-pprint/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ansi-wl-pprint
PORTVERSION= 0.6.7.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ansi-wl-pprint/distinfo b/devel/hs-ansi-wl-pprint/distinfo
index fed41c5cffce..2e0a4c19b235 100644
--- a/devel/hs-ansi-wl-pprint/distinfo
+++ b/devel/hs-ansi-wl-pprint/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627819
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-arrows/Makefile b/devel/hs-arrows/Makefile
index aa861a9d666f..319b0d5e7931 100644
--- a/devel/hs-arrows/Makefile
+++ b/devel/hs-arrows/Makefile
@@ -3,7 +3,7 @@
PORTNAME= arrows
PORTVERSION= 0.4.4.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-arrows/distinfo b/devel/hs-arrows/distinfo
index 84946a03c6fa..800754e96563 100644
--- a/devel/hs-arrows/distinfo
+++ b/devel/hs-arrows/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627819
SHA256 (cabal/arrows-0.4.4.1.tar.gz) = 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2
SIZE (cabal/arrows-0.4.4.1.tar.gz) = 12261
diff --git a/devel/hs-asn1-data/Makefile b/devel/hs-asn1-data/Makefile
index ebef297582c3..5611019f36fb 100644
--- a/devel/hs-asn1-data/Makefile
+++ b/devel/hs-asn1-data/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-data
-PORTVERSION= 0.7.1
-PORTREVISION= 9
+PORTVERSION= 0.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-data/distinfo b/devel/hs-asn1-data/distinfo
index e9b1c130d835..febb43807e12 100644
--- a/devel/hs-asn1-data/distinfo
+++ b/devel/hs-asn1-data/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-data-0.7.1.tar.gz) = f9a8a8ec41e89ebb4af6bd6b8a4c45515e44d7d61524d02b52881bfe7caf4783
-SIZE (cabal/asn1-data-0.7.1.tar.gz) = 17500
+TIMESTAMP = 1499627819
+SHA256 (cabal/asn1-data-0.7.2.tar.gz) = 83999c03cbc993f7e0dea010942a4dc39ae986c498c57eadc1e5ee1b4e23aca1
+SIZE (cabal/asn1-data-0.7.2.tar.gz) = 17672
diff --git a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs b/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
deleted file mode 100644
index 2ead06800a21..000000000000
--- a/devel/hs-asn1-data/files/patch-Data_ASN1_Parse.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 1eec53a2bd02..3560322bf356 100644
--- a/devel/hs-asn1-encoding/Makefile
+++ b/devel/hs-asn1-encoding/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-encoding
-PORTVERSION= 0.9.0
+PORTVERSION= 0.9.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-encoding/distinfo b/devel/hs-asn1-encoding/distinfo
index a96bb12cd1ec..1124f6df4982 100644
--- a/devel/hs-asn1-encoding/distinfo
+++ b/devel/hs-asn1-encoding/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-encoding-0.9.0.tar.gz) = 17e9194f41b5a85a733fb54ee4a0c8466f6f67462f53c1e8a05b3d42fda7a30b
-SIZE (cabal/asn1-encoding-0.9.0.tar.gz) = 15997
+TIMESTAMP = 1499545891
+SHA256 (cabal/asn1-encoding-0.9.5.tar.gz) = 1e863bfd363f6c3760cc80f2c0d422e17845a9f79fe006030db202ecab5aaf29
+SIZE (cabal/asn1-encoding-0.9.5.tar.gz) = 16114
diff --git a/devel/hs-asn1-parse/Makefile b/devel/hs-asn1-parse/Makefile
index e341cd39d2ba..ffef6afeff27 100644
--- a/devel/hs-asn1-parse/Makefile
+++ b/devel/hs-asn1-parse/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-parse
-PORTVERSION= 0.9.1
+PORTVERSION= 0.9.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-asn1-parse/distinfo b/devel/hs-asn1-parse/distinfo
index 1f5f1e111793..1a0d7c24539a 100644
--- a/devel/hs-asn1-parse/distinfo
+++ b/devel/hs-asn1-parse/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-parse-0.9.1.tar.gz) = e18087baa87225a5ea41c9758f7499b362ba6293931cb9c5bc3548c90f3133de
-SIZE (cabal/asn1-parse-0.9.1.tar.gz) = 2785
+TIMESTAMP = 1499545839
+SHA256 (cabal/asn1-parse-0.9.4.tar.gz) = c6a328f570c69db73f8d2416f9251e8a03753f90d5d19e76cbe69509a3ceb708
+SIZE (cabal/asn1-parse-0.9.4.tar.gz) = 2860
diff --git a/devel/hs-asn1-types/Makefile b/devel/hs-asn1-types/Makefile
index e3d8a8217615..6c79415782b0 100644
--- a/devel/hs-asn1-types/Makefile
+++ b/devel/hs-asn1-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= asn1-types
-PORTVERSION= 0.3.0
+PORTVERSION= 0.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= ASN.1 types
LICENSE= BSD3CLAUSE
-USE_CABAL= hourglass
+USE_CABAL= hourglass memory
.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 784bf5efbedb..764c93c5dea3 100644
--- a/devel/hs-asn1-types/distinfo
+++ b/devel/hs-asn1-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/asn1-types-0.3.0.tar.gz) = b998dad88b94f8da7058df52f03936d66c81a2d012549c87affeecac5cb5a8aa
-SIZE (cabal/asn1-types-0.3.0.tar.gz) = 5391
+TIMESTAMP = 1499545858
+SHA256 (cabal/asn1-types-0.3.2.tar.gz) = 0c571fff4a10559c6a630d4851ba3cdf1d558185ce3dcfca1136f9883d647217
+SIZE (cabal/asn1-types-0.3.2.tar.gz) = 6424
diff --git a/devel/hs-async/Makefile b/devel/hs-async/Makefile
index 0477a9e43e80..91ffe88ba1e9 100644
--- a/devel/hs-async/Makefile
+++ b/devel/hs-async/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= async
-PORTVERSION= 2.0.2
+PORTVERSION= 2.1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-async/distinfo b/devel/hs-async/distinfo
index ff48c0540e0f..4955e17e4c19 100644
--- a/devel/hs-async/distinfo
+++ b/devel/hs-async/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/async-2.0.2.tar.gz) = db54d384259eee2f3ca525821f45fe509b9a101fbf3a8df7132aa9622626fd2b
-SIZE (cabal/async-2.0.2.tar.gz) = 8565
+TIMESTAMP = 1499444628
+SHA256 (cabal/async-2.1.1.1.tar.gz) = cd83e471466ea6885b2e8fb60f452db3ac3fdf3ea2d6370aa1e071ebc37544e2
+SIZE (cabal/async-2.1.1.1.tar.gz) = 10608
diff --git a/devel/hs-atomic-primops/Makefile b/devel/hs-atomic-primops/Makefile
index 17672a1cee03..1e2b39e935e7 100644
--- a/devel/hs-atomic-primops/Makefile
+++ b/devel/hs-atomic-primops/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= atomic-primops
-PORTVERSION= 0.8
+PORTVERSION= 0.8.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-atomic-primops/distinfo b/devel/hs-atomic-primops/distinfo
index 8ec74aa1c2b7..b74ee8e82196 100644
--- a/devel/hs-atomic-primops/distinfo
+++ b/devel/hs-atomic-primops/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/atomic-primops-0.8.tar.gz) = c0e19e8005bb7320a0a9f6eaa5b464adb14aa88308e9922249305eeaa42f6471
-SIZE (cabal/atomic-primops-0.8.tar.gz) = 33588
+TIMESTAMP = 1499450732
+SHA256 (cabal/atomic-primops-0.8.0.4.tar.gz) = 47e1e393848c0538aa1733a90a63bd08a00915ec7499d90014aaecc792db9864
+SIZE (cabal/atomic-primops-0.8.0.4.tar.gz) = 34075
diff --git a/devel/hs-auto-update/Makefile b/devel/hs-auto-update/Makefile
index b0219c06daa2..24f47698f60a 100644
--- a/devel/hs-auto-update/Makefile
+++ b/devel/hs-auto-update/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= auto-update
-PORTVERSION= 0.1.2.2
+PORTVERSION= 0.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-auto-update/distinfo b/devel/hs-auto-update/distinfo
index 5e0526850464..fd55b6f10ab1 100644
--- a/devel/hs-auto-update/distinfo
+++ b/devel/hs-auto-update/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/auto-update-0.1.2.2.tar.gz) = 7b3000c330055d4059fe8d9ab044c29e3a57b4dc31b88ea386a75a886b6144db
-SIZE (cabal/auto-update-0.1.2.2.tar.gz) = 6651
+TIMESTAMP = 1499627821
+SHA256 (cabal/auto-update-0.1.4.tar.gz) = 5e96c151024e8bcaf4eaa932e16995872b2017f46124b967e155744d9580b425
+SIZE (cabal/auto-update-0.1.4.tar.gz) = 8607
diff --git a/devel/hs-base-compat/Makefile b/devel/hs-base-compat/Makefile
new file mode 100644
index 000000000000..346c9e181b13
--- /dev/null
+++ b/devel/hs-base-compat/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= base-compat
+PORTVERSION= 0.9.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Provides functions available in later versions of base to a wider range of compilers
+
+LICENSE= MIT
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-base-compat/distinfo b/devel/hs-base-compat/distinfo
new file mode 100644
index 000000000000..30eaf35ba24b
--- /dev/null
+++ b/devel/hs-base-compat/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499541026
+SHA256 (cabal/base-compat-0.9.3.tar.gz) = 7d602b0f0543fadbd598a090c738e9ce9b07a1896673dc27f1503ae3bea1a210
+SIZE (cabal/base-compat-0.9.3.tar.gz) = 27632
diff --git a/devel/hs-base-compat/pkg-descr b/devel/hs-base-compat/pkg-descr
new file mode 100644
index 000000000000..8070cfe9be6b
--- /dev/null
+++ b/devel/hs-base-compat/pkg-descr
@@ -0,0 +1,11 @@
+Provides functions available in later versions of base to a wider range of
+compilers, without requiring you to use CPP pragmas in your code. See the README
+for what is covered. Also see the changelog for recent changes.
+
+Note that base-compat does not add any orphan instances. There is a separate
+package, base-orphans, for that.
+
+In addition, base-compat does not backport any data types or type classes.
+See this section of the README for more info.
+
+WWW: https://github.com/haskell-compat/base-compat
diff --git a/devel/hs-base-orphans/Makefile b/devel/hs-base-orphans/Makefile
index 4bda66211d93..bdd0752ad466 100644
--- a/devel/hs-base-orphans/Makefile
+++ b/devel/hs-base-orphans/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= base-orphans
-PORTVERSION= 0.4.4
+PORTVERSION= 0.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-orphans/distinfo b/devel/hs-base-orphans/distinfo
index 96924c04e284..914152611128 100644
--- a/devel/hs-base-orphans/distinfo
+++ b/devel/hs-base-orphans/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/base-orphans-0.4.4.tar.gz) = f4323cc2ae2b25ce228d7291ff65ac5e6c583070b53eaf21dd509ebe25bf0f42
-SIZE (cabal/base-orphans-0.4.4.tar.gz) = 13068
+TIMESTAMP = 1499444442
+SHA256 (cabal/base-orphans-0.6.tar.gz) = c7282aa7516652e6e4a78ccdfb654a99c9da683875748ad5898a3f200be7ad0e
+SIZE (cabal/base-orphans-0.6.tar.gz) = 18087
diff --git a/devel/hs-base-unicode-symbols/Makefile b/devel/hs-base-unicode-symbols/Makefile
index 66fed67ce046..71fdcef917b5 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= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base-unicode-symbols/distinfo b/devel/hs-base-unicode-symbols/distinfo
index 2b45526e5bfa..b22606d29201 100644
--- a/devel/hs-base-unicode-symbols/distinfo
+++ b/devel/hs-base-unicode-symbols/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
SHA256 (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = a2f841430fec32edba778b74bde83bf0170ada7c5e2e59d7187c8f06d92dcca9
SIZE (cabal/base-unicode-symbols-0.2.2.4.tar.gz) = 5562
diff --git a/devel/hs-base16-bytestring/Makefile b/devel/hs-base16-bytestring/Makefile
index 781e32c8fd37..435a182d81bd 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base16-bytestring/distinfo b/devel/hs-base16-bytestring/distinfo
index 650a4c79ede3..037937ec0505 100644
--- a/devel/hs-base16-bytestring/distinfo
+++ b/devel/hs-base16-bytestring/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
SHA256 (cabal/base16-bytestring-0.1.1.6.tar.gz) = 5afe65a152c5418f5f4e3579a5e0d5ca19c279dc9bf31c1a371ccbe84705c449
SIZE (cabal/base16-bytestring-0.1.1.6.tar.gz) = 3694
diff --git a/devel/hs-base64-bytestring/Makefile b/devel/hs-base64-bytestring/Makefile
index 3e577f7abf26..b767736a43b9 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-base64-bytestring/distinfo b/devel/hs-base64-bytestring/distinfo
index 7e8b3be0249d..9f919349a61c 100644
--- a/devel/hs-base64-bytestring/distinfo
+++ b/devel/hs-base64-bytestring/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627821
SHA256 (cabal/base64-bytestring-1.0.0.1.tar.gz) = ab25abf4b00a2f52b270bc3ed43f1d59f16c8eec9d7dffb14df1e9265b233b50
SIZE (cabal/base64-bytestring-1.0.0.1.tar.gz) = 9080
diff --git a/devel/hs-basic-prelude/Makefile b/devel/hs-basic-prelude/Makefile
index ac37d873a539..3c586f1c15cc 100644
--- a/devel/hs-basic-prelude/Makefile
+++ b/devel/hs-basic-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= basic-prelude
-PORTVERSION= 0.5.0
+PORTVERSION= 0.6.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-basic-prelude/distinfo b/devel/hs-basic-prelude/distinfo
index a1e555b06399..4ed645814eec 100644
--- a/devel/hs-basic-prelude/distinfo
+++ b/devel/hs-basic-prelude/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/basic-prelude-0.5.0.tar.gz) = d1f562338ed9934a02b4fadc9f9a33f467d10105dbe03f527b47d4ae536210d1
-SIZE (cabal/basic-prelude-0.5.0.tar.gz) = 5743
+TIMESTAMP = 1499627821
+SHA256 (cabal/basic-prelude-0.6.1.1.tar.gz) = f7b178ad8d1491933e1eb8def0b98c7270da3a5e06bed977f0c624c24ff92ec7
+SIZE (cabal/basic-prelude-0.6.1.1.tar.gz) = 6009
diff --git a/devel/hs-bifunctors/Makefile b/devel/hs-bifunctors/Makefile
index 95a22f469d72..2730176b02e7 100644
--- a/devel/hs-bifunctors/Makefile
+++ b/devel/hs-bifunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bifunctors
-PORTVERSION= 5
+PORTVERSION= 5.4.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Bifunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= semigroups>=0.8.3.1 tagged>=0.7.3
+USE_CABAL= base-orphans comonad 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 29f009f021b8..8dce950a9667 100644
--- a/devel/hs-bifunctors/distinfo
+++ b/devel/hs-bifunctors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/bifunctors-5.tar.gz) = 41df923a03f15ba2d00335aea2409ebf48ee7585f0a1101f1ec282fe5a07298d
-SIZE (cabal/bifunctors-5.tar.gz) = 10562
+TIMESTAMP = 1499542053
+SHA256 (cabal/bifunctors-5.4.2.tar.gz) = 38620267824abbf834f708f1b7cf10307c1d2719b1a0f8ae49330a1002dfdc8d
+SIZE (cabal/bifunctors-5.4.2.tar.gz) = 39535
diff --git a/devel/hs-bits-atomic/Makefile b/devel/hs-bits-atomic/Makefile
index 6d852cd3c6b3..a63cce50300b 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= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bits-atomic/distinfo b/devel/hs-bits-atomic/distinfo
index 52e579d6dd8e..e34ba4fe9445 100644
--- a/devel/hs-bits-atomic/distinfo
+++ b/devel/hs-bits-atomic/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/bits-atomic-0.1.3.tar.gz) = e0ac3456cf0338e1d5ed33f4c3c6b932d652add2ac827c6a1b6636c6e754cb8d
SIZE (cabal/bits-atomic-0.1.3.tar.gz) = 7982
diff --git a/devel/hs-blaze-builder-enumerator/Makefile b/devel/hs-blaze-builder-enumerator/Makefile
index 5681e08b1689..b65216b742e0 100644
--- a/devel/hs-blaze-builder-enumerator/Makefile
+++ b/devel/hs-blaze-builder-enumerator/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-builder-enumerator
PORTVERSION= 0.2.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,7 @@ 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 \
- streaming-commons>=0.1.10
+USE_CABAL= blaze-builder enumerator streaming-commons
.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 03c891974651..34ad87e35b46 100644
--- a/devel/hs-blaze-builder-enumerator/distinfo
+++ b/devel/hs-blaze-builder-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
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
index 2cc38b10c15a..4605b668925e 100644
--- a/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
+++ b/devel/hs-blaze-builder-enumerator/files/patch-blaze-builder-enumerator.cabal
@@ -1,6 +1,13 @@
--- blaze-builder-enumerator.cabal.orig 2015-04-01 17:10:57 UTC
+++ blaze-builder-enumerator.cabal
-@@ -49,8 +49,7 @@ Library
+@@ -43,14 +43,13 @@ Library
+ , bytestring >= 0.9 && < 0.11
+ , enumerator >= 0.4.3.1 && < 0.5
+ , streaming-commons >= 0.1.10 && < 0.2
+- , transformers >= 0.2 && < 0.5
++ , transformers >= 0.2
+ Exposed-modules:
+ Blaze.ByteString.Builder.Enumerator
if flag(newbuilder)
Build-depends:
diff --git a/devel/hs-blaze-builder/Makefile b/devel/hs-blaze-builder/Makefile
index d09ea0698f14..7a5c4d641b2f 100644
--- a/devel/hs-blaze-builder/Makefile
+++ b/devel/hs-blaze-builder/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= blaze-builder
-PORTVERSION= 0.4.0.1
+PORTVERSION= 0.4.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-builder/distinfo b/devel/hs-blaze-builder/distinfo
index 2f75f60ae439..30274144b35e 100644
--- a/devel/hs-blaze-builder/distinfo
+++ b/devel/hs-blaze-builder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/blaze-builder-0.4.0.1.tar.gz) = c136ec877bb8d1558409e87b77174977ae01f8dff5bddb472df8b8d4c7e0a3c5
-SIZE (cabal/blaze-builder-0.4.0.1.tar.gz) = 57113
+TIMESTAMP = 1499546087
+SHA256 (cabal/blaze-builder-0.4.0.2.tar.gz) = 9ad3e4661bf5556d650fb9aa56a3ad6e6eec7575e87d472e8ab6d15eaef163d4
+SIZE (cabal/blaze-builder-0.4.0.2.tar.gz) = 58681
diff --git a/devel/hs-blaze-textual/Makefile b/devel/hs-blaze-textual/Makefile
index e34329a2fa7a..7710fbf01630 100644
--- a/devel/hs-blaze-textual/Makefile
+++ b/devel/hs-blaze-textual/Makefile
@@ -2,6 +2,7 @@
PORTNAME= blaze-textual
PORTVERSION= 0.2.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-blaze-textual/distinfo b/devel/hs-blaze-textual/distinfo
index 08620f567b48..bbcc1722f430 100644
--- a/devel/hs-blaze-textual/distinfo
+++ b/devel/hs-blaze-textual/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
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 99228152485a..dbf244ba7dc3 100644
--- a/devel/hs-bloomfilter/Makefile
+++ b/devel/hs-bloomfilter/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bloomfilter
PORTVERSION= 2.0.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bloomfilter/distinfo b/devel/hs-bloomfilter/distinfo
index 85c94c7fff64..4849664c4a67 100644
--- a/devel/hs-bloomfilter/distinfo
+++ b/devel/hs-bloomfilter/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
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 e77118f2047d..216e15214dc1 100644
--- a/devel/hs-boxes/Makefile
+++ b/devel/hs-boxes/Makefile
@@ -2,6 +2,7 @@
PORTNAME= boxes
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-boxes/distinfo b/devel/hs-boxes/distinfo
index e6d863864160..19bce67a016a 100644
--- a/devel/hs-boxes/distinfo
+++ b/devel/hs-boxes/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
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 e9240b6062b2..92a42042c4be 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= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bsd-sysctl/distinfo b/devel/hs-bsd-sysctl/distinfo
index d2c54e2b94cb..eff026fbdfe9 100644
--- a/devel/hs-bsd-sysctl/distinfo
+++ b/devel/hs-bsd-sysctl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/bsd-sysctl-1.0.7.tar.gz) = de8c9e2b6d0fa64f7e33885392a05b450e30da35d80de10f37c918ac8d2e1aa3
SIZE (cabal/bsd-sysctl-1.0.7.tar.gz) = 6183
diff --git a/devel/hs-byteable/Makefile b/devel/hs-byteable/Makefile
index 543bb55fcf8a..b3499275238c 100644
--- a/devel/hs-byteable/Makefile
+++ b/devel/hs-byteable/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteable
PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteable/distinfo b/devel/hs-byteable/distinfo
index 11d3c1e2095b..0097dff3c870 100644
--- a/devel/hs-byteable/distinfo
+++ b/devel/hs-byteable/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/byteable-0.1.1.tar.gz) = 243b34a1b5b64b39e39fe58f75c18f6cad5b668b10cabcd86816cbde27783fe2
SIZE (cabal/byteable-0.1.1.tar.gz) = 2400
diff --git a/devel/hs-byteorder/Makefile b/devel/hs-byteorder/Makefile
index 0c6670728d26..a29c64c76a77 100644
--- a/devel/hs-byteorder/Makefile
+++ b/devel/hs-byteorder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= byteorder
PORTVERSION= 1.0.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-byteorder/distinfo b/devel/hs-byteorder/distinfo
index a1c0b78b4b22..3a4873c29cab 100644
--- a/devel/hs-byteorder/distinfo
+++ b/devel/hs-byteorder/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
SHA256 (cabal/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919
SIZE (cabal/byteorder-1.0.4.tar.gz) = 2030
diff --git a/devel/hs-bytestring-lexing/Makefile b/devel/hs-bytestring-lexing/Makefile
index adf7ab389d06..5dcb321986c3 100644
--- a/devel/hs-bytestring-lexing/Makefile
+++ b/devel/hs-bytestring-lexing/Makefile
@@ -3,6 +3,7 @@
PORTNAME= bytestring-lexing
PORTVERSION= 0.5.0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-lexing/distinfo b/devel/hs-bytestring-lexing/distinfo
index 5ad031818cf3..035e04bee31b 100644
--- a/devel/hs-bytestring-lexing/distinfo
+++ b/devel/hs-bytestring-lexing/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
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
index c23b2e740858..2381a20e1a80 100644
--- a/devel/hs-bytestring-mmap/Makefile
+++ b/devel/hs-bytestring-mmap/Makefile
@@ -2,6 +2,7 @@
PORTNAME= bytestring-mmap
PORTVERSION= 0.2.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-mmap/distinfo b/devel/hs-bytestring-mmap/distinfo
index 93a825b438ce..668ccd42740c 100644
--- a/devel/hs-bytestring-mmap/distinfo
+++ b/devel/hs-bytestring-mmap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627822
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-nums/Makefile b/devel/hs-bytestring-nums/Makefile
index 0cb43c1f2689..a022ded4130e 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= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-nums/distinfo b/devel/hs-bytestring-nums/distinfo
index a1d9cc088072..0a4d5c2d5993 100644
--- a/devel/hs-bytestring-nums/distinfo
+++ b/devel/hs-bytestring-nums/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627823
SHA256 (cabal/bytestring-nums-0.3.6.tar.gz) = bdca97600d91f00bb3c0f654784e3fbd2d62fcf4671820578105487cdf39e7cd
SIZE (cabal/bytestring-nums-0.3.6.tar.gz) = 3770
diff --git a/devel/hs-bytestring-show/Makefile b/devel/hs-bytestring-show/Makefile
index ebb40e415b60..d6ed55e071d4 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-bytestring-show/distinfo b/devel/hs-bytestring-show/distinfo
index 82c5cb792baf..7876a0176d41 100644
--- a/devel/hs-bytestring-show/distinfo
+++ b/devel/hs-bytestring-show/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627823
SHA256 (cabal/bytestring-show-0.3.5.6.tar.gz) = 29242efd16951ebba888218c469a99ff25b19ab74ee1e0d7b4db09b8800a0812
SIZE (cabal/bytestring-show-0.3.5.6.tar.gz) = 8145
diff --git a/devel/hs-bytestring-show/files/patch-bytestring-show.cabal b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
new file mode 100644
index 000000000000..fa60616d91cd
--- /dev/null
+++ b/devel/hs-bytestring-show/files/patch-bytestring-show.cabal
@@ -0,0 +1,11 @@
+--- bytestring-show.cabal.orig 2017-07-08 18:54:46 UTC
++++ bytestring-show.cabal
+@@ -16,7 +16,7 @@ flag integer-simple
+ description: use with integer-simple build of GHC
+
+ library
+- build-depends: base < 5, binary < 0.8, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6
++ build-depends: base < 5, binary < 0.9, bytestring >= 0.9 && <= 1, array < 0.6, containers < 0.6
+
+ exposed-modules:
+ Text.Show.ByteString
diff --git a/devel/hs-c2hs/Makefile b/devel/hs-c2hs/Makefile
index ce0fe1ebeecd..671000d9b919 100644
--- a/devel/hs-c2hs/Makefile
+++ b/devel/hs-c2hs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= c2hs
-PORTVERSION= 0.28.1
+PORTVERSION= 0.28.2
PORTREVISION= 1
CATEGORIES= devel haskell
diff --git a/devel/hs-c2hs/distinfo b/devel/hs-c2hs/distinfo
index 2c6b94f46cad..54b7479f6378 100644
--- a/devel/hs-c2hs/distinfo
+++ b/devel/hs-c2hs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486993392
-SHA256 (cabal/c2hs-0.28.1.tar.gz) = 95b04ef42cf43a1078e9c8a4bf9264dd26e8653b441b3fb7f2296c8b3a0752bb
-SIZE (cabal/c2hs-0.28.1.tar.gz) = 205622
+TIMESTAMP = 1499627824
+SHA256 (cabal/c2hs-0.28.2.tar.gz) = f4171478cafe9f4906735763c2e0bc1ca0a9f56b50e9d59aac07520434920f9e
+SIZE (cabal/c2hs-0.28.2.tar.gz) = 205916
diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 4b181195025b..3d9a58654b59 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cabal-install
-PORTVERSION= 1.22.6.0
+PORTVERSION= 1.24.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,9 @@ COMMENT= Command-line interface for Cabal and Hackage
LICENSE= BSD3CLAUSE
-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
+USE_CABAL= async base16-bytestring cryptohash-sha256 hackage-security \
+ hashable HTTP mtl network network-uri old-time random stm \
+ tar zlib
STANDALONE= yes
EXECUTABLE= cabal
diff --git a/devel/hs-cabal-install/distinfo b/devel/hs-cabal-install/distinfo
index 3194cae126ee..e357bb419c56 100644
--- a/devel/hs-cabal-install/distinfo
+++ b/devel/hs-cabal-install/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cabal-install-1.22.6.0.tar.gz) = 9d239e385696a7faa49f068aea451882baec6a7df26fbddbd08271c9053cb0b4
-SIZE (cabal/cabal-install-1.22.6.0.tar.gz) = 302564
+TIMESTAMP = 1499540276
+SHA256 (cabal/cabal-install-1.24.0.2.tar.gz) = 2ac8819238a0e57fff9c3c857e97b8705b1b5fef2e46cd2829e85d96e2a00fe0
+SIZE (cabal/cabal-install-1.24.0.2.tar.gz) = 499937
diff --git a/devel/hs-call-stack/Makefile b/devel/hs-call-stack/Makefile
new file mode 100644
index 000000000000..f956def523ed
--- /dev/null
+++ b/devel/hs-call-stack/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= call-stack
+PORTVERSION= 0.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The call-stack package
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-call-stack/distinfo b/devel/hs-call-stack/distinfo
new file mode 100644
index 000000000000..59b4d0446cca
--- /dev/null
+++ b/devel/hs-call-stack/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499547219
+SHA256 (cabal/call-stack-0.1.0.tar.gz) = f25f5e0992a39371079cc25c2a14b5abb872fa7d868a32753aac3a258b83b1e2
+SIZE (cabal/call-stack-0.1.0.tar.gz) = 2473
diff --git a/devel/hs-call-stack/pkg-descr b/devel/hs-call-stack/pkg-descr
new file mode 100644
index 000000000000..e0499cd7eb67
--- /dev/null
+++ b/devel/hs-call-stack/pkg-descr
@@ -0,0 +1,3 @@
+Use GHC call-stacks in a backward compatible way.
+
+WWW: https://hackage.haskell.org/package/call-stack
diff --git a/devel/hs-cereal/Makefile b/devel/hs-cereal/Makefile
index 891578352351..676a373ad875 100644
--- a/devel/hs-cereal/Makefile
+++ b/devel/hs-cereal/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cereal
-PORTVERSION= 0.4.1.1
+PORTVERSION= 0.5.4.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cereal/distinfo b/devel/hs-cereal/distinfo
index 2853ab1df6d8..f99ee80b5cec 100644
--- a/devel/hs-cereal/distinfo
+++ b/devel/hs-cereal/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cereal-0.4.1.1.tar.gz) = df047216179ba3817134e32c73ef9e3b5dddbd4efff604f50ca0ca0c93753097
-SIZE (cabal/cereal-0.4.1.1.tar.gz) = 22656
+TIMESTAMP = 1499627824
+SHA256 (cabal/cereal-0.5.4.0.tar.gz) = daca6c5aeff21ca233bebe006c158b0e4421b239c722768b568fca9b32cafee7
+SIZE (cabal/cereal-0.5.4.0.tar.gz) = 19504
diff --git a/devel/hs-checkers/Makefile b/devel/hs-checkers/Makefile
index 76af9e653c12..b5191c210f56 100644
--- a/devel/hs-checkers/Makefile
+++ b/devel/hs-checkers/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= checkers
-PORTVERSION= 0.4.3
+PORTVERSION= 0.4.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-checkers/distinfo b/devel/hs-checkers/distinfo
index 8f64068af05c..beb5d19fb724 100644
--- a/devel/hs-checkers/distinfo
+++ b/devel/hs-checkers/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/checkers-0.4.3.tar.gz) = c0589321485225b7f37f108d232eb4caa42ba52afe0d28dccbe932185862c567
-SIZE (cabal/checkers-0.4.3.tar.gz) = 15022
+TIMESTAMP = 1499538835
+SHA256 (cabal/checkers-0.4.7.tar.gz) = f9d9cb2fcd613d0cfe440aae024e27e9ccb5c8f925046e4f71f6360d8f4c2b97
+SIZE (cabal/checkers-0.4.7.tar.gz) = 15026
diff --git a/devel/hs-chunked-data/Makefile b/devel/hs-chunked-data/Makefile
index e320c81b7e40..d475008a8118 100644
--- a/devel/hs-chunked-data/Makefile
+++ b/devel/hs-chunked-data/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= chunked-data
-PORTVERSION= 0.2.0
+PORTVERSION= 0.3.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-chunked-data/distinfo b/devel/hs-chunked-data/distinfo
index 3f032bab4c10..08ac2c815ca5 100644
--- a/devel/hs-chunked-data/distinfo
+++ b/devel/hs-chunked-data/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/chunked-data-0.2.0.tar.gz) = 9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272
-SIZE (cabal/chunked-data-0.2.0.tar.gz) = 4923
+TIMESTAMP = 1499627825
+SHA256 (cabal/chunked-data-0.3.0.tar.gz) = e1be9da64c3682fd907aa9f1a118e8bfba7964d509fddf54bd245b199dc15f2f
+SIZE (cabal/chunked-data-0.3.0.tar.gz) = 4349
diff --git a/devel/hs-classy-prelude-conduit/Makefile b/devel/hs-classy-prelude-conduit/Makefile
index 116e25f33b28..4a9901889680 100644
--- a/devel/hs-classy-prelude-conduit/Makefile
+++ b/devel/hs-classy-prelude-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude-conduit
-PORTVERSION= 0.12.0.1
+PORTVERSION= 1.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-classy-prelude-conduit/distinfo b/devel/hs-classy-prelude-conduit/distinfo
index 02e71d9dca36..f6816aa3392e 100644
--- a/devel/hs-classy-prelude-conduit/distinfo
+++ b/devel/hs-classy-prelude-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = b12758b3ebe429268ca5a0f18a61ffc9429d6cdc00b4362742ea0717460462f7
-SIZE (cabal/classy-prelude-conduit-0.12.0.1.tar.gz) = 1598
+TIMESTAMP = 1499627826
+SHA256 (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 24090dd042cd74d2663a5870482a60746b9096754f598b5171b800511230ec7f
+SIZE (cabal/classy-prelude-conduit-1.2.0.tar.gz) = 1735
diff --git a/devel/hs-classy-prelude/Makefile b/devel/hs-classy-prelude/Makefile
index 5f910e7e2fbf..f0cd3722a972 100644
--- a/devel/hs-classy-prelude/Makefile
+++ b/devel/hs-classy-prelude/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= classy-prelude
-PORTVERSION= 0.12.1.1
+PORTVERSION= 1.2.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,11 +9,12 @@ COMMENT= Typeclass-based Prelude
LICENSE= MIT
-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
+USE_CABAL= async basic-prelude bifunctors chunked-data dlist \
+ exceptions hashable lifted-async lifted-base monad-unlift \
+ mono-traversable mono-traversable-instances mtl \
+ mutable-containers primitive safe-exceptions say semigroups \
+ stm stm-chans text time-locale-compat transformers-base \
+ unordered-containers vector vector-instances
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-classy-prelude/distinfo b/devel/hs-classy-prelude/distinfo
index 166c94d5dd36..e72567fe62a0 100644
--- a/devel/hs-classy-prelude/distinfo
+++ b/devel/hs-classy-prelude/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/classy-prelude-0.12.1.1.tar.gz) = 670a85ffd10ff467e5eec1164462932c00bb6282cda2987a2b92c82f09ac3d13
-SIZE (cabal/classy-prelude-0.12.1.1.tar.gz) = 10273
+TIMESTAMP = 1499627825
+SHA256 (cabal/classy-prelude-1.2.0.1.tar.gz) = a47ee0c339a73b19fb511e1477fec6a385d2180bcc836a92c157dcb5c91ffa34
+SIZE (cabal/classy-prelude-1.2.0.1.tar.gz) = 12017
diff --git a/devel/hs-clock/Makefile b/devel/hs-clock/Makefile
new file mode 100644
index 000000000000..02325b2071f1
--- /dev/null
+++ b/devel/hs-clock/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= clock
+PORTVERSION= 0.7.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A package for convenient access to high-resolution clock and timer functions
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-clock/distinfo b/devel/hs-clock/distinfo
new file mode 100644
index 000000000000..6c3e33220931
--- /dev/null
+++ b/devel/hs-clock/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499692787
+SHA256 (cabal/clock-0.7.2.tar.gz) = 886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f
+SIZE (cabal/clock-0.7.2.tar.gz) = 7465
diff --git a/devel/hs-clock/pkg-descr b/devel/hs-clock/pkg-descr
new file mode 100644
index 000000000000..37748a5a5bd3
--- /dev/null
+++ b/devel/hs-clock/pkg-descr
@@ -0,0 +1,4 @@
+A package for convenient access to high-resolution clock and timer functions of
+different operating systems via a unified API.
+
+WWW: http://hackage.haskell.org/package/clock
diff --git a/devel/hs-cmdargs/Makefile b/devel/hs-cmdargs/Makefile
index 901c6e0a425c..ac7b2abe82e8 100644
--- a/devel/hs-cmdargs/Makefile
+++ b/devel/hs-cmdargs/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cmdargs
-PORTVERSION= 0.10.13
+PORTVERSION= 0.10.17
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cmdargs/distinfo b/devel/hs-cmdargs/distinfo
index 13b88cc1930f..8509d2ff8fcf 100644
--- a/devel/hs-cmdargs/distinfo
+++ b/devel/hs-cmdargs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cmdargs-0.10.13.tar.gz) = 66117c1fadaa2a79be07998287ca7cee334c249615b0fab9b91467ad813bbf6e
-SIZE (cabal/cmdargs-0.10.13.tar.gz) = 64008
+TIMESTAMP = 1499596679
+SHA256 (cabal/cmdargs-0.10.17.tar.gz) = 3437a4caf4ced650b61620e1c66f406db76ff70244928e5a4e7a20e5e88374da
+SIZE (cabal/cmdargs-0.10.17.tar.gz) = 64440
diff --git a/devel/hs-code-page/Makefile b/devel/hs-code-page/Makefile
new file mode 100644
index 000000000000..0e23bf06a190
--- /dev/null
+++ b/devel/hs-code-page/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= code-page
+PORTVERSION= 0.1.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A cross-platform module that exports functions which adjust code pages on Windows
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-code-page/distinfo b/devel/hs-code-page/distinfo
new file mode 100644
index 000000000000..96e1d94bf360
--- /dev/null
+++ b/devel/hs-code-page/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499790338
+SHA256 (cabal/code-page-0.1.3.tar.gz) = e65c86600e06d85f2e2c2a9df4b3d68e2dbd3adb2df9e922a4cd744966762191
+SIZE (cabal/code-page-0.1.3.tar.gz) = 4718
diff --git a/devel/hs-code-page/pkg-descr b/devel/hs-code-page/pkg-descr
new file mode 100644
index 000000000000..b2fb523749a7
--- /dev/null
+++ b/devel/hs-code-page/pkg-descr
@@ -0,0 +1,10 @@
+This library provides two modules:
+
+ * System.IO.CodePage: a cross-platform module that exports functions which
+ adjust code pages on Windows, and do nothing on other operating systems.
+
+ * System.Win32.CodePage: On Windows, this exports functions for getting,
+ setting, and analyzing code pages. On other operating systems, this module
+ exports nothing.
+
+WWW: https://hackage.haskell.org/package/code-page
diff --git a/devel/hs-colour/Makefile b/devel/hs-colour/Makefile
new file mode 100644
index 000000000000..d655d0b8b7fa
--- /dev/null
+++ b/devel/hs-colour/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= colour
+PORTVERSION= 2.3.3
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package provides a data type for colours and transparency
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-colour/distinfo b/devel/hs-colour/distinfo
new file mode 100644
index 000000000000..db94588f4d62
--- /dev/null
+++ b/devel/hs-colour/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499547650
+SHA256 (cabal/colour-2.3.3.tar.gz) = 8d15a63494f8e2a06fe6dc38baee8e948adfae0e93749b9e3ce0fd8ece09b6e2
+SIZE (cabal/colour-2.3.3.tar.gz) = 20392
diff --git a/devel/hs-colour/pkg-descr b/devel/hs-colour/pkg-descr
new file mode 100644
index 000000000000..3876a3997a17
--- /dev/null
+++ b/devel/hs-colour/pkg-descr
@@ -0,0 +1,5 @@
+This package provides a data type for colours and transparency.
+Colours can be blended and composed. Various colour spaces are
+supported. A module of colour names (Data.Colour.Names) is provided.
+
+WWW: http://hackage.haskell.org/package/colour
diff --git a/devel/hs-concurrent-output/Makefile b/devel/hs-concurrent-output/Makefile
new file mode 100644
index 000000000000..d04077288657
--- /dev/null
+++ b/devel/hs-concurrent-output/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= concurrent-output
+PORTVERSION= 1.10.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Ungarble output from several threads or commands
+
+LICENSE= BSD2CLAUSE
+
+USE_CABAL= text async stm exceptions ansi-terminal terminal-size
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-concurrent-output/distinfo b/devel/hs-concurrent-output/distinfo
new file mode 100644
index 000000000000..f3d0b41e12c9
--- /dev/null
+++ b/devel/hs-concurrent-output/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501333173
+SHA256 (cabal/concurrent-output-1.10.0.tar.gz) = 29716759e088f2a59b4aef2c9cb5e4931d7990f1a6393adcb551781ed1af58b2
+SIZE (cabal/concurrent-output-1.10.0.tar.gz) = 21764
diff --git a/devel/hs-concurrent-output/files/patch-concurrent-output.cabal b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
new file mode 100644
index 000000000000..a517c388b924
--- /dev/null
+++ b/devel/hs-concurrent-output/files/patch-concurrent-output.cabal
@@ -0,0 +1,11 @@
+--- concurrent-output.cabal.orig 2017-05-19 15:55:09 UTC
++++ concurrent-output.cabal
+@@ -34,7 +34,7 @@ Library
+ , text (>= 0.11.0 && < 1.3.0)
+ , async (>= 2.0 && < 2.2)
+ , stm (>= 2.0 && < 2.5)
+- , process (>= 1.6.0 && < 1.7.0)
++ , process
+ , directory (>= 1.2.0 && < 1.4.0)
+ , transformers (>= 0.3.0 && < 0.6.0)
+ , exceptions (>= 0.6.0 && < 0.9.0)
diff --git a/devel/hs-concurrent-output/pkg-descr b/devel/hs-concurrent-output/pkg-descr
new file mode 100644
index 000000000000..ed809c2db02d
--- /dev/null
+++ b/devel/hs-concurrent-output/pkg-descr
@@ -0,0 +1,9 @@
+Lets multiple threads and external processes concurrently output to the
+console, without it getting all garbled up.
+
+Built on top of that is a way of defining multiple output regions, which are
+automatically laid out on the screen and can be individually updated by
+concurrent threads. Can be used for progress displays etc.
+
+WWW: http://hackage.haskell.org/package/concurrent-output
+
diff --git a/devel/hs-conduit-combinators/Makefile b/devel/hs-conduit-combinators/Makefile
index c5f79cb56198..0572e6866c44 100644
--- a/devel/hs-conduit-combinators/Makefile
+++ b/devel/hs-conduit-combinators/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-combinators
-PORTVERSION= 1.0.3
+PORTVERSION= 1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit-combinators/distinfo b/devel/hs-conduit-combinators/distinfo
index b8915bbc4208..28904c912a66 100644
--- a/devel/hs-conduit-combinators/distinfo
+++ b/devel/hs-conduit-combinators/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-combinators-1.0.3.tar.gz) = 29c1f3dd854d11212474692c6c3a4158ed2929e8443ff2878eee5ea1ed6700bf
-SIZE (cabal/conduit-combinators-1.0.3.tar.gz) = 38172
+TIMESTAMP = 1499627827
+SHA256 (cabal/conduit-combinators-1.1.1.tar.gz) = a022e80d54d6cae017ae69e04b44fd6f57f8bac6b889e574dc09d30170ac0918
+SIZE (cabal/conduit-combinators-1.1.1.tar.gz) = 38380
diff --git a/devel/hs-conduit-extra/Makefile b/devel/hs-conduit-extra/Makefile
index 12683b586da5..65b6e826afe3 100644
--- a/devel/hs-conduit-extra/Makefile
+++ b/devel/hs-conduit-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit-extra
-PORTVERSION= 1.1.9.1
+PORTVERSION= 1.1.16
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit-extra/distinfo b/devel/hs-conduit-extra/distinfo
index 50bdc241aee9..bb3c610cd933 100644
--- a/devel/hs-conduit-extra/distinfo
+++ b/devel/hs-conduit-extra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-extra-1.1.9.1.tar.gz) = 3f1be15bef32652caa9a98e175c95614c0f6d04ca29c35d30ddbc940a90fa0a3
-SIZE (cabal/conduit-extra-1.1.9.1.tar.gz) = 29571
+TIMESTAMP = 1499627827
+SHA256 (cabal/conduit-extra-1.1.16.tar.gz) = bd72c1bacd5f59a74a73a0aa115b8314f0a1dc1b24d939e52a983113c960f8d5
+SIZE (cabal/conduit-extra-1.1.16.tar.gz) = 34402
diff --git a/devel/hs-conduit/Makefile b/devel/hs-conduit/Makefile
index b3376359f2ab..8a4d095c9e73 100644
--- a/devel/hs-conduit/Makefile
+++ b/devel/hs-conduit/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= conduit
-PORTVERSION= 1.2.5
+PORTVERSION= 1.2.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-conduit/distinfo b/devel/hs-conduit/distinfo
index dcde7641cbdc..0ede71efa0c2 100644
--- a/devel/hs-conduit/distinfo
+++ b/devel/hs-conduit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/conduit-1.2.5.tar.gz) = b100cdb428731923205372dded60b6529d33728f69a0eb951a01f53c182c2a46
-SIZE (cabal/conduit-1.2.5.tar.gz) = 46805
+TIMESTAMP = 1499543753
+SHA256 (cabal/conduit-1.2.11.tar.gz) = 0b66423f04d991262b800174064d0c6046fba0009eddcca616f9afaf84dca8f7
+SIZE (cabal/conduit-1.2.11.tar.gz) = 50240
diff --git a/devel/hs-configurator/Makefile b/devel/hs-configurator/Makefile
index e121c375bb34..fb879d793858 100644
--- a/devel/hs-configurator/Makefile
+++ b/devel/hs-configurator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.3.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-configurator/distinfo b/devel/hs-configurator/distinfo
index 1ffcc4ec4af8..fa149af9b6c2 100644
--- a/devel/hs-configurator/distinfo
+++ b/devel/hs-configurator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627827
SHA256 (cabal/configurator-0.3.0.0.tar.gz) = 6eb9996b672e9f7112ca23482c42fa533553312c3c13f38a8a06476e67c031b4
SIZE (cabal/configurator-0.3.0.0.tar.gz) = 15232
diff --git a/devel/hs-constraints/Makefile b/devel/hs-constraints/Makefile
index aa95bda4cf6d..8d517c0f9e19 100644
--- a/devel/hs-constraints/Makefile
+++ b/devel/hs-constraints/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= constraints
-PORTVERSION= 0.4.1.3
+PORTVERSION= 0.9.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Constraint manipulation
LICENSE= BSD3CLAUSE
-USE_CABAL= newtype>=0.2
+USE_CABAL= hashable mtl transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-constraints/distinfo b/devel/hs-constraints/distinfo
index 1bb8e26226ee..33ab50904526 100644
--- a/devel/hs-constraints/distinfo
+++ b/devel/hs-constraints/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/constraints-0.4.1.3.tar.gz) = dd4353b66c85980363050566a13d17ad0216f072a06f207cb8d36530ded67af0
-SIZE (cabal/constraints-0.4.1.3.tar.gz) = 7311
+TIMESTAMP = 1499444670
+SHA256 (cabal/constraints-0.9.1.tar.gz) = 276e012838861145fca65d065dd9839f7cbd71236032b557194389180a30a785
+SIZE (cabal/constraints-0.9.1.tar.gz) = 18503
diff --git a/devel/hs-convertible/Makefile b/devel/hs-convertible/Makefile
index 737bdfbc5b9c..64b0529283a0 100644
--- a/devel/hs-convertible/Makefile
+++ b/devel/hs-convertible/Makefile
@@ -3,6 +3,7 @@
PORTNAME= convertible
PORTVERSION= 1.1.1.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-convertible/distinfo b/devel/hs-convertible/distinfo
index 76a4901de85a..aa551f69bf81 100644
--- a/devel/hs-convertible/distinfo
+++ b/devel/hs-convertible/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627827
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-cpphs/Makefile b/devel/hs-cpphs/Makefile
index c27affa50ef0..855ca369d6f3 100644
--- a/devel/hs-cpphs/Makefile
+++ b/devel/hs-cpphs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cpphs
-PORTVERSION= 1.19
+PORTVERSION= 1.20.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-cpphs/distinfo b/devel/hs-cpphs/distinfo
index e79d6bde247c..d2925493b20e 100644
--- a/devel/hs-cpphs/distinfo
+++ b/devel/hs-cpphs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/cpphs-1.19.tar.gz) = e05c97be645eafeed5c7475f84a02016ad56eaf67ad0a725b8ebff7fbcc73e3a
-SIZE (cabal/cpphs-1.19.tar.gz) = 44056
+TIMESTAMP = 1499627828
+SHA256 (cabal/cpphs-1.20.8.tar.gz) = e56d64a7d8058e0fb63f0669397c1c861efb20a0376e0e74d86942ac151105ae
+SIZE (cabal/cpphs-1.20.8.tar.gz) = 45108
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 54cd8d9fa7eb..b828d3b42acb 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= darcs
-PORTVERSION= 2.10.1
+PORTVERSION= 2.12.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,12 +10,12 @@ COMMENT= Distributed, interactive, smart revision control system
LICENSE= GPLv2
-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
+USE_CABAL= async attoparsec base16-bytestring cryptohash \
+ data-ordlist dataenc fgl graphviz hashable html HTTP \
+ mmap mtl parsec random \
+ regex-applicative regex-compat-tdfa sandi tar \
+ text transformers-compat unix-compat \
+ utf8-string vector zip-archive zlib
EXECUTABLE= darcs
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 674b3132fd28..b1637f2cebd2 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/darcs-2.10.1.tar.gz) = f1ef65b43780e7593ca1afdae5ecf44ed91d62cc1be360693a52c5ff7b57ee94
-SIZE (cabal/darcs-2.10.1.tar.gz) = 1509208
+TIMESTAMP = 1499538866
+SHA256 (cabal/darcs-2.12.5.tar.gz) = 355b04c85c27bca43c8c380212988d9c1e9a984b0b593ceb2884de4295063553
+SIZE (cabal/darcs-2.12.5.tar.gz) = 1460698
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index c93b12126848..e37898d12a64 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,6 +1,6 @@
---- ./Setup.lhs.orig 2013-02-06 07:07:21.000000000 +0100
-+++ ./Setup.lhs 2014-07-13 22:44:31.000000000 +0200
-@@ -26,7 +26,7 @@
+--- Setup.lhs.orig 2017-01-11 20:07:29 UTC
++++ Setup.lhs
+@@ -26,7 +26,7 @@ import Distribution.Version
import Data.Version( showVersion )
import Distribution.Simple.LocalBuildInfo
( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
@@ -9,7 +9,7 @@
import Distribution.Simple.PackageIndex ( topologicalOrder )
import Distribution.Simple.Program ( gccProgram, rawSystemProgramStdoutConf )
import Distribution.Simple.Setup
-@@ -200,7 +200,7 @@
+@@ -217,7 +217,7 @@ installManpage :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO ()
installManpage pkg lbi verbosity copy =
copyFiles verbosity
@@ -17,4 +17,4 @@
+ (prefix (absoluteInstallDirs pkg lbi copy) </> "man" </> "man1")
[(buildDir lbi </> "darcs", "darcs.1")]
- determineVersion :: Verbosity -> PackageDescription -> IO (String, String)
+ -- ---------------------------------------------------------------------
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
new file mode 100644
index 000000000000..18095e40a87a
--- /dev/null
+++ b/devel/hs-darcs/files/patch-darcs.cabal
@@ -0,0 +1,11 @@
+--- darcs.cabal.orig 2017-07-11 16:28:16 UTC
++++ darcs.cabal
+@@ -400,7 +400,7 @@ Library
+ transformers-compat >= 0.4 && < 0.6,
+ parsec >= 3.1 && < 3.2,
+ fgl >= 5.5.0.1 && < 5.6,
+- graphviz >= 2999.17.0.1 && < 2999.19,
++ graphviz >= 2999.17.0.1 && < 2999.20,
+ html >= 1.0.1.2 && < 1.1,
+ filepath >= 1.3.0.1 && < 1.5.0.0,
+ haskeline >= 0.6.3 && < 0.8,
diff --git a/devel/hs-data-default-class/Makefile b/devel/hs-data-default-class/Makefile
index ff032871af21..9a0ca9723fa4 100644
--- a/devel/hs-data-default-class/Makefile
+++ b/devel/hs-data-default-class/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-default-class
-PORTVERSION= 0.0.1
-PORTREVISION= 7
+PORTVERSION= 0.1.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-class/distinfo b/devel/hs-data-default-class/distinfo
index 31fd528a0f3d..464fd1fafb02 100644
--- a/devel/hs-data-default-class/distinfo
+++ b/devel/hs-data-default-class/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-class-0.0.1.tar.gz) = adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31
-SIZE (cabal/data-default-class-0.0.1.tar.gz) = 1461
+TIMESTAMP = 1499627829
+SHA256 (cabal/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
+SIZE (cabal/data-default-class-0.1.2.0.tar.gz) = 2522
diff --git a/devel/hs-data-default-instances-base/Makefile b/devel/hs-data-default-instances-base/Makefile
index bec4750fbc4a..8f046f7753fb 100644
--- a/devel/hs-data-default-instances-base/Makefile
+++ b/devel/hs-data-default-instances-base/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-default-instances-base
-PORTVERSION= 0.0.1
-PORTREVISION= 7
+PORTVERSION= 0.1.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-base/distinfo b/devel/hs-data-default-instances-base/distinfo
index ac501b02ff33..92eddcf0b843 100644
--- a/devel/hs-data-default-instances-base/distinfo
+++ b/devel/hs-data-default-instances-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-instances-base-0.0.1.tar.gz) = eb12ff0174ae1fe2613058b87d0752f94e64df9a9bf971780c2e24bf0cb662a0
-SIZE (cabal/data-default-instances-base-0.0.1.tar.gz) = 1930
+TIMESTAMP = 1499627830
+SHA256 (cabal/data-default-instances-base-0.1.0.1.tar.gz) = 844fe453f674b6b0998da804465914abce8936c5e640d8bb8bff37ad07d7a17a
+SIZE (cabal/data-default-instances-base-0.1.0.1.tar.gz) = 1554
diff --git a/devel/hs-data-default-instances-containers/Makefile b/devel/hs-data-default-instances-containers/Makefile
index 70d45256768c..3294b52f7c02 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= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-containers/distinfo b/devel/hs-data-default-instances-containers/distinfo
index 67aacc61da1d..6576bb357d2a 100644
--- a/devel/hs-data-default-instances-containers/distinfo
+++ b/devel/hs-data-default-instances-containers/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-default-instances-containers-0.0.1.tar.gz) = a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a
SIZE (cabal/data-default-instances-containers-0.0.1.tar.gz) = 1659
diff --git a/devel/hs-data-default-instances-dlist/Makefile b/devel/hs-data-default-instances-dlist/Makefile
index f86cd4604227..76628997145a 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= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-dlist/distinfo b/devel/hs-data-default-instances-dlist/distinfo
index f62a64d50b1e..fa9fd22b9699 100644
--- a/devel/hs-data-default-instances-dlist/distinfo
+++ b/devel/hs-data-default-instances-dlist/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959
SIZE (cabal/data-default-instances-dlist-0.0.1.tar.gz) = 1503
diff --git a/devel/hs-data-default-instances-old-locale/Makefile b/devel/hs-data-default-instances-old-locale/Makefile
index 9da6291cfec6..a9fb775eaf74 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default-instances-old-locale/distinfo b/devel/hs-data-default-instances-old-locale/distinfo
index 475d09844e98..16f3c50a4a6d 100644
--- a/devel/hs-data-default-instances-old-locale/distinfo
+++ b/devel/hs-data-default-instances-old-locale/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
SHA256 (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802
SIZE (cabal/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
diff --git a/devel/hs-data-default/Makefile b/devel/hs-data-default/Makefile
index 5266420f2c68..5ee16ba88fdc 100644
--- a/devel/hs-data-default/Makefile
+++ b/devel/hs-data-default/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= data-default
-PORTVERSION= 0.5.3
-PORTREVISION= 7
+PORTVERSION= 0.7.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-default/distinfo b/devel/hs-data-default/distinfo
index 46c14a4b1a21..dce4860a7ea1 100644
--- a/devel/hs-data-default/distinfo
+++ b/devel/hs-data-default/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-default-0.5.3.tar.gz) = ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034
-SIZE (cabal/data-default-0.5.3.tar.gz) = 1623
+TIMESTAMP = 1499627829
+SHA256 (cabal/data-default-0.7.1.1.tar.gz) = b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511
+SIZE (cabal/data-default-0.7.1.1.tar.gz) = 1627
diff --git a/devel/hs-data-endian/Makefile b/devel/hs-data-endian/Makefile
new file mode 100644
index 000000000000..d1481a6d3f71
--- /dev/null
+++ b/devel/hs-data-endian/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= data-endian
+PORTVERSION= 0.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Endian-sensitive data
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-data-endian/distinfo b/devel/hs-data-endian/distinfo
new file mode 100644
index 000000000000..b983e0971148
--- /dev/null
+++ b/devel/hs-data-endian/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501335045
+SHA256 (cabal/data-endian-0.1.1.tar.gz) = 8c1d4f30374f8331d31f4d7c6b39284331b6b9436e7b50f86547417bd05f2ac0
+SIZE (cabal/data-endian-0.1.1.tar.gz) = 2788
diff --git a/devel/hs-data-endian/pkg-descr b/devel/hs-data-endian/pkg-descr
new file mode 100644
index 000000000000..8e9be44da194
--- /dev/null
+++ b/devel/hs-data-endian/pkg-descr
@@ -0,0 +1,3 @@
+This package provides helpers for converting endian-sensitive data.
+
+WWW: https://github.com/mvv/data-endian
diff --git a/devel/hs-data-hash/Makefile b/devel/hs-data-hash/Makefile
index 7ebe7dedcbe2..079a44a215b0 100644
--- a/devel/hs-data-hash/Makefile
+++ b/devel/hs-data-hash/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-hash
PORTVERSION= 0.2.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-hash/distinfo b/devel/hs-data-hash/distinfo
index 9f44700516fb..8e75d5aff7b2 100644
--- a/devel/hs-data-hash/distinfo
+++ b/devel/hs-data-hash/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
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
index 3d7e5e71c198..723703f4aac0 100644
--- a/devel/hs-data-ordlist/Makefile
+++ b/devel/hs-data-ordlist/Makefile
@@ -2,6 +2,7 @@
PORTNAME= data-ordlist
PORTVERSION= 0.4.7.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-data-ordlist/distinfo b/devel/hs-data-ordlist/distinfo
index 84fbd37ceec0..bb7c22be6541 100644
--- a/devel/hs-data-ordlist/distinfo
+++ b/devel/hs-data-ordlist/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627830
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-pprint/Makefile b/devel/hs-data-pprint/Makefile
index 5935bd598519..bc9aea80728e 100644
--- a/devel/hs-data-pprint/Makefile
+++ b/devel/hs-data-pprint/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= data-pprint
-PORTVERSION= 0.2.4
+PORTVERSION= 0.2.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Prettyprint and compare Data values
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 parallel>=3.1
+USE_CABAL= mtl parallel
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-data-pprint/distinfo b/devel/hs-data-pprint/distinfo
index cc583500b7e0..eff54157f627 100644
--- a/devel/hs-data-pprint/distinfo
+++ b/devel/hs-data-pprint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/data-pprint-0.2.4.tar.gz) = 659bf5b10d5c177982bed9f6676a656387c70e9223ea0b1060afbe446f499864
-SIZE (cabal/data-pprint-0.2.4.tar.gz) = 10112
+TIMESTAMP = 1499448153
+SHA256 (cabal/data-pprint-0.2.4.1.tar.gz) = 0c06aae83e1e41883927fbaa008964acd7d6b005a0f7e44c95fa5062943e0f83
+SIZE (cabal/data-pprint-0.2.4.1.tar.gz) = 10117
diff --git a/devel/hs-data-pprint/files/patch-data-pprint.cabal b/devel/hs-data-pprint/files/patch-data-pprint.cabal
new file mode 100644
index 000000000000..a63eb3a49419
--- /dev/null
+++ b/devel/hs-data-pprint/files/patch-data-pprint.cabal
@@ -0,0 +1,10 @@
+--- data-pprint.cabal.orig 2017-07-10 15:51:41 UTC
++++ data-pprint.cabal
+@@ -72,6 +72,6 @@ library
+ pretty >= 1.0 && < 1.2,
+ mtl >= 2.0 && < 2.3,
+ deepseq >= 1.1 && < 1.5,
+- time >= 1.2 && < 1.6,
++ time >= 1.2 && < 1.7,
+ parallel >= 3.1 && < 3.3
+
diff --git a/devel/hs-date-cache/Makefile b/devel/hs-date-cache/Makefile
index 1dda19d3ff04..1cb954ca3af3 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= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-date-cache/distinfo b/devel/hs-date-cache/distinfo
index 5bf3401bd783..0a4b730b040f 100644
--- a/devel/hs-date-cache/distinfo
+++ b/devel/hs-date-cache/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627831
SHA256 (cabal/date-cache-0.3.0.tar.gz) = abce44f11dd9da4abaca9e33da2c74bd32b42fea027d171c03b6c10cda62303f
SIZE (cabal/date-cache-0.3.0.tar.gz) = 2126
diff --git a/devel/hs-datetime/Makefile b/devel/hs-datetime/Makefile
index 583939a50a2d..c3bfc1c8cabe 100644
--- a/devel/hs-datetime/Makefile
+++ b/devel/hs-datetime/Makefile
@@ -3,6 +3,7 @@
PORTNAME= datetime
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-datetime/distinfo b/devel/hs-datetime/distinfo
index 67c44c65626e..f1b398b13494 100644
--- a/devel/hs-datetime/distinfo
+++ b/devel/hs-datetime/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627831
SHA256 (cabal/datetime-0.3.1.tar.gz) = 333c7577c5051eb23d172568b9d4fe186f8b5bc750ba1d09822c275d76edbd4a
SIZE (cabal/datetime-0.3.1.tar.gz) = 15071
diff --git a/devel/hs-dbus/Makefile b/devel/hs-dbus/Makefile
new file mode 100644
index 000000000000..bd04b57d9d51
--- /dev/null
+++ b/devel/hs-dbus/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= dbus
+PORTVERSION= 0.10.13
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A client library for the D-Bus IPC system
+
+LICENSE= GPLv3
+
+USE_CABAL= cereal libxml-sax network parsec random text vector xml-types
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-dbus/distinfo b/devel/hs-dbus/distinfo
new file mode 100644
index 000000000000..14245bed4930
--- /dev/null
+++ b/devel/hs-dbus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501342515
+SHA256 (cabal/dbus-0.10.13.tar.gz) = aa94aefba8a0be240faddec88442afd8db1fa4e994423d474b112ec1c67e7aca
+SIZE (cabal/dbus-0.10.13.tar.gz) = 75603
diff --git a/devel/hs-dbus/pkg-descr b/devel/hs-dbus/pkg-descr
new file mode 100644
index 000000000000..4b968c71b5b2
--- /dev/null
+++ b/devel/hs-dbus/pkg-descr
@@ -0,0 +1,13 @@
+D-Bus is a simple, message-based protocol for inter-process communication,
+which allows applications to interact with other parts of the machine and the
+user's session using remote procedure calls.
+
+D-Bus is a essential part of the modern Linux desktop, where it replaces
+earlier protocols such as CORBA and DCOP.
+
+This library is an implementation of the D-Bus protocol in Haskell. It can be
+used to add D-Bus support to Haskell applications, without the awkward
+interfaces common to foreign bindings.
+
+WWW: https://github.com/rblaze/haskell-dbus#readme
+
diff --git a/devel/hs-deepseq-generics/Makefile b/devel/hs-deepseq-generics/Makefile
index c7ef01f26245..8b9dac1701f1 100644
--- a/devel/hs-deepseq-generics/Makefile
+++ b/devel/hs-deepseq-generics/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= deepseq-generics
-PORTVERSION= 0.1.1.2
+PORTVERSION= 0.2.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-deepseq-generics/distinfo b/devel/hs-deepseq-generics/distinfo
index 5359067853f9..f344190f38b7 100644
--- a/devel/hs-deepseq-generics/distinfo
+++ b/devel/hs-deepseq-generics/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/deepseq-generics-0.1.1.2.tar.gz) = 839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06
-SIZE (cabal/deepseq-generics-0.1.1.2.tar.gz) = 5304
+TIMESTAMP = 1499444756
+SHA256 (cabal/deepseq-generics-0.2.0.0.tar.gz) = b0b3ef5546c0768ef9194519a90c629f8f2ba0348487e620bb89d512187c7c9d
+SIZE (cabal/deepseq-generics-0.2.0.0.tar.gz) = 5192
diff --git a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal b/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
deleted file mode 100644
index 0245d5386535..000000000000
--- a/devel/hs-deepseq-generics/files/patch-deepseq-generics.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 e9d095a13975..c5b152b8bb86 100644
--- a/devel/hs-directory-tree/Makefile
+++ b/devel/hs-directory-tree/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= directory-tree
-PORTVERSION= 0.12.0
-PORTREVISION= 2
+PORTVERSION= 0.12.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-directory-tree/distinfo b/devel/hs-directory-tree/distinfo
index 27ecf8e3d60c..b736767ddc50 100644
--- a/devel/hs-directory-tree/distinfo
+++ b/devel/hs-directory-tree/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/directory-tree-0.12.0.tar.gz) = ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5
-SIZE (cabal/directory-tree-0.12.0.tar.gz) = 12024
+TIMESTAMP = 1499627831
+SHA256 (cabal/directory-tree-0.12.1.tar.gz) = e2084495b3a226cf54d949635c86fc14e89daa09d86cce39e3c3cf898ae6e517
+SIZE (cabal/directory-tree-0.12.1.tar.gz) = 12261
diff --git a/devel/hs-directory/distinfo b/devel/hs-directory/distinfo
deleted file mode 100644
index 68dd5f329300..000000000000
--- a/devel/hs-directory/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1486844627
-SHA256 (cabal/directory-1.3.0.1.tar.gz) = b2b444aea7faac750efa23c994d9a16f207f12b2009cf38ba39fc7334f373f3c
-SIZE (cabal/directory-1.3.0.1.tar.gz) = 69401
diff --git a/devel/hs-directory/pkg-descr b/devel/hs-directory/pkg-descr
deleted file mode 100644
index 734cb0047d97..000000000000
--- a/devel/hs-directory/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This library provides a basic set of operations for manipulating files
-and directories in a portable way.
-
-WWW: https://github.com/haskell/directory
diff --git a/devel/hs-dlist-instances/Makefile b/devel/hs-dlist-instances/Makefile
index fd05f71049e9..9458168704d2 100644
--- a/devel/hs-dlist-instances/Makefile
+++ b/devel/hs-dlist-instances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= dlist-instances
-PORTVERSION= 0.1
-PORTREVISION= 2
+PORTVERSION= 0.1.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist-instances/distinfo b/devel/hs-dlist-instances/distinfo
index 315dc4394517..7d69d5afb950 100644
--- a/devel/hs-dlist-instances/distinfo
+++ b/devel/hs-dlist-instances/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dlist-instances-0.1.tar.gz) = 2598aae775532829923d2a8f99dcaaa20e49efec31314e8460a761ee653b3264
-SIZE (cabal/dlist-instances-0.1.tar.gz) = 1676
+TIMESTAMP = 1499459956
+SHA256 (cabal/dlist-instances-0.1.1.1.tar.gz) = d14a10c06f52fb412b2c1066d729f5534aa43204221e7ba7d81d935c44ce4f5b
+SIZE (cabal/dlist-instances-0.1.1.1.tar.gz) = 1749
diff --git a/devel/hs-dlist/Makefile b/devel/hs-dlist/Makefile
index 6288b3521685..fff9b0a721ea 100644
--- a/devel/hs-dlist/Makefile
+++ b/devel/hs-dlist/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dlist
-PORTVERSION= 0.7.1.1
+PORTVERSION= 0.8.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-dlist/distinfo b/devel/hs-dlist/distinfo
index a41378fd3338..c6c49fd409be 100644
--- a/devel/hs-dlist/distinfo
+++ b/devel/hs-dlist/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/dlist-0.7.1.1.tar.gz) = 08b07f28e01f4a7e17239c33b37fbef0bf6073712337a97a145a583577df5efd
-SIZE (cabal/dlist-0.7.1.1.tar.gz) = 6161
+TIMESTAMP = 1499627832
+SHA256 (cabal/dlist-0.8.0.3.tar.gz) = 876782c96957ff480863effb33878f48dd55de7fa64d036e12bf1fbd49542f2f
+SIZE (cabal/dlist-0.8.0.3.tar.gz) = 8596
diff --git a/devel/hs-easy-file/Makefile b/devel/hs-easy-file/Makefile
index 1c0a16c6afc2..b9415c7970a1 100644
--- a/devel/hs-easy-file/Makefile
+++ b/devel/hs-easy-file/Makefile
@@ -2,6 +2,7 @@
PORTNAME= easy-file
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-easy-file/distinfo b/devel/hs-easy-file/distinfo
index 442be3eb075b..2cd4b787e652 100644
--- a/devel/hs-easy-file/distinfo
+++ b/devel/hs-easy-file/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
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-edit-distance/Makefile b/devel/hs-edit-distance/Makefile
index e383af325ba3..e63ee6759f9a 100644
--- a/devel/hs-edit-distance/Makefile
+++ b/devel/hs-edit-distance/Makefile
@@ -2,6 +2,7 @@
PORTNAME= edit-distance
PORTVERSION= 0.2.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-edit-distance/distinfo b/devel/hs-edit-distance/distinfo
index 85c64552e7f2..f42daab8bbd8 100644
--- a/devel/hs-edit-distance/distinfo
+++ b/devel/hs-edit-distance/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
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-either/Makefile b/devel/hs-either/Makefile
index 95f7c319a0bd..02b6daea9eb2 100644
--- a/devel/hs-either/Makefile
+++ b/devel/hs-either/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= either
-PORTVERSION= 4.4.1
+PORTVERSION= 4.4.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,9 +9,9 @@ COMMENT= Either monad transformer
LICENSE= BSD3CLAUSE
-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
+USE_CABAL= bifunctors exceptions free mmorph monad-control \
+ MonadRandom mtl profunctors semigroupoids semigroups \
+ transformers-base
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-either/distinfo b/devel/hs-either/distinfo
index 84bef2727732..69815b6ae8a3 100644
--- a/devel/hs-either/distinfo
+++ b/devel/hs-either/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/either-4.4.1.tar.gz) = 91e57debc09bcaa7d4b884902ea6d3201ca3fec77625a059edd84bcaeb5909cb
-SIZE (cabal/either-4.4.1.tar.gz) = 9243
+TIMESTAMP = 1499627832
+SHA256 (cabal/either-4.4.1.1.tar.gz) = b087cb0fb63fec2fbdcac05fef0d03751daef5deb86cda3c732b9a6a31e634d3
+SIZE (cabal/either-4.4.1.1.tar.gz) = 9376
diff --git a/devel/hs-either/files/patch-either.cabal b/devel/hs-either/files/patch-either.cabal
new file mode 100644
index 000000000000..ab50ef682130
--- /dev/null
+++ b/devel/hs-either/files/patch-either.cabal
@@ -0,0 +1,14 @@
+--- either.cabal.orig 2017-07-10 15:15:32 UTC
++++ either.cabal
+@@ -32,9 +32,9 @@ library
+ exceptions >= 0.5 && < 0.9,
+ free >= 4.9 && < 5,
+ monad-control >= 0.3.2 && < 1.1,
+- MonadRandom >= 0.1 && < 0.5,
++ MonadRandom >= 0.1 && < 0.6,
+ mtl >= 2.0 && < 2.3,
+- mmorph >= 1.0.0 && < 1.1,
++ mmorph >= 1.0.0 && < 1.2,
+ profunctors >= 4 && < 6,
+ semigroups >= 0.8.3.1 && < 1,
+ semigroupoids >= 4 && < 6,
diff --git a/devel/hs-enclosed-exceptions/Makefile b/devel/hs-enclosed-exceptions/Makefile
index d2306d4a23e7..64c65d434316 100644
--- a/devel/hs-enclosed-exceptions/Makefile
+++ b/devel/hs-enclosed-exceptions/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= enclosed-exceptions
-PORTVERSION= 1.0.1.1
+PORTVERSION= 1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enclosed-exceptions/distinfo b/devel/hs-enclosed-exceptions/distinfo
index bd569bcf8f0c..a459aca75509 100644
--- a/devel/hs-enclosed-exceptions/distinfo
+++ b/devel/hs-enclosed-exceptions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = e5236133ba5a2395fbac9f8436eb8765ede4a0a8b36341ccbb8a4cddf00c5d99
-SIZE (cabal/enclosed-exceptions-1.0.1.1.tar.gz) = 4566
+TIMESTAMP = 1499627832
+SHA256 (cabal/enclosed-exceptions-1.0.2.tar.gz) = 7b9beab82d219c0dd879dfdef70fb74a4a7595b4dbd0baf7adb12cdbbe8189f1
+SIZE (cabal/enclosed-exceptions-1.0.2.tar.gz) = 5266
diff --git a/devel/hs-enumerator/Makefile b/devel/hs-enumerator/Makefile
index 78876b4978e5..c50501fad3ca 100644
--- a/devel/hs-enumerator/Makefile
+++ b/devel/hs-enumerator/Makefile
@@ -2,7 +2,7 @@
PORTNAME= enumerator
PORTVERSION= 0.4.20
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-enumerator/distinfo b/devel/hs-enumerator/distinfo
index c1f9e82e96b9..11f76a64f017 100644
--- a/devel/hs-enumerator/distinfo
+++ b/devel/hs-enumerator/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627832
SHA256 (cabal/enumerator-0.4.20.tar.gz) = 33e21054352bb579e8db8697256ff3c61b3dc862c567f9e0fc2509f95e2b4709
SIZE (cabal/enumerator-0.4.20.tar.gz) = 53986
diff --git a/devel/hs-equivalence/Makefile b/devel/hs-equivalence/Makefile
index eaa20d8e958a..f8816a8caa53 100644
--- a/devel/hs-equivalence/Makefile
+++ b/devel/hs-equivalence/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= equivalence
-PORTVERSION= 0.3.1
+PORTVERSION= 0.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-equivalence/distinfo b/devel/hs-equivalence/distinfo
index 9349edba452b..0851897e619b 100644
--- a/devel/hs-equivalence/distinfo
+++ b/devel/hs-equivalence/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/equivalence-0.3.1.tar.gz) = 7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e
-SIZE (cabal/equivalence-0.3.1.tar.gz) = 8350
+TIMESTAMP = 1499627833
+SHA256 (cabal/equivalence-0.3.2.tar.gz) = 7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529
+SIZE (cabal/equivalence-0.3.2.tar.gz) = 8378
diff --git a/devel/hs-errors/Makefile b/devel/hs-errors/Makefile
index a5029c309957..98059612584a 100644
--- a/devel/hs-errors/Makefile
+++ b/devel/hs-errors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= errors
-PORTVERSION= 2.0.0
+PORTVERSION= 2.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Simplified error-handling
LICENSE= BSD3CLAUSE
-USE_CABAL= safe>=0.3.3
+USE_CABAL= exceptions>=0.6 safe>=0.3.3 transformers-compat unexceptionalio text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-errors/distinfo b/devel/hs-errors/distinfo
index f846ddacfef6..0a965efdc044 100644
--- a/devel/hs-errors/distinfo
+++ b/devel/hs-errors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/errors-2.0.0.tar.gz) = 4527db37c2560b9b3a96eab58c632bf1fbb5e2d530b378eb9043ecedb0de4703
-SIZE (cabal/errors-2.0.0.tar.gz) = 8051
+TIMESTAMP = 1499451104
+SHA256 (cabal/errors-2.2.1.tar.gz) = 4197eb87910bf32d81b92247c2f8fbeee1650217532374ecb63a09d12255f531
+SIZE (cabal/errors-2.2.1.tar.gz) = 8821
diff --git a/devel/hs-exceptions/Makefile b/devel/hs-exceptions/Makefile
index 383bf7f826b3..04af10620e39 100644
--- a/devel/hs-exceptions/Makefile
+++ b/devel/hs-exceptions/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= exceptions
-PORTVERSION= 0.8.0.2
+PORTVERSION= 0.8.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Extensible optionally-pure exceptions
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl>=2.0 stm>=2.2 transformers-compat>=0.3
+USE_CABAL= mtl stm transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-exceptions/distinfo b/devel/hs-exceptions/distinfo
index 7e311699bb69..da74124de563 100644
--- a/devel/hs-exceptions/distinfo
+++ b/devel/hs-exceptions/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/exceptions-0.8.0.2.tar.gz) = 070a3e0d1495243770fb3a629d5187ce898f069cb3621c5f7c610ae264982bf4
-SIZE (cabal/exceptions-0.8.0.2.tar.gz) = 12241
+TIMESTAMP = 1499444351
+SHA256 (cabal/exceptions-0.8.3.tar.gz) = 4d6ad97e8e3d5dc6ce9ae68a469dc2fd3f66e9d312bc6faa7ab162eddcef87be
+SIZE (cabal/exceptions-0.8.3.tar.gz) = 12986
diff --git a/devel/hs-extensible-exceptions/Makefile b/devel/hs-extensible-exceptions/Makefile
index 43687062a78c..8d8ba3046664 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= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-extensible-exceptions/distinfo b/devel/hs-extensible-exceptions/distinfo
index ff89f15c5a1f..e3594b520253 100644
--- a/devel/hs-extensible-exceptions/distinfo
+++ b/devel/hs-extensible-exceptions/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627833
SHA256 (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388
SIZE (cabal/extensible-exceptions-0.1.1.4.tar.gz) = 8531
diff --git a/devel/hs-extra/Makefile b/devel/hs-extra/Makefile
index 848f063aec9e..87b00eb94a88 100644
--- a/devel/hs-extra/Makefile
+++ b/devel/hs-extra/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= extra
-PORTVERSION= 1.4.1
+PORTVERSION= 1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Extra functions
LICENSE= BSD3CLAUSE
+USE_CABAL= clock
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-extra/distinfo b/devel/hs-extra/distinfo
index 10c9ac0cd146..a58102038407 100644
--- a/devel/hs-extra/distinfo
+++ b/devel/hs-extra/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/extra-1.4.1.tar.gz) = e02ca751533eb44b221a8e6250c70a125627be8fc1c9711092dc3d2668f2d001
-SIZE (cabal/extra-1.4.1.tar.gz) = 31235
+TIMESTAMP = 1499627833
+SHA256 (cabal/extra-1.6.tar.gz) = 0766e656fad80cfff4fc4c0370d2fe1712077549a5f8a57c38d2c1b5da7b14df
+SIZE (cabal/extra-1.6.tar.gz) = 36369
diff --git a/devel/hs-fast-logger/Makefile b/devel/hs-fast-logger/Makefile
index 41139b293b1e..936d5e68ed8a 100644
--- a/devel/hs-fast-logger/Makefile
+++ b/devel/hs-fast-logger/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= fast-logger
-PORTVERSION= 2.4.1
+PORTVERSION= 2.4.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Fast logging system
LICENSE= BSD3CLAUSE
-USE_CABAL= auto-update>=0.1.2 text
+USE_CABAL= auto-update easy-file old-locale text unix-time
.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 1e2a7ada305f..c05e4df04faa 100644
--- a/devel/hs-fast-logger/distinfo
+++ b/devel/hs-fast-logger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/fast-logger-2.4.1.tar.gz) = e51218b5a00b8b5746fcbd1666262f9ae77b9daea5c4e351459a321c0c0a534e
-SIZE (cabal/fast-logger-2.4.1.tar.gz) = 6211
+TIMESTAMP = 1499627834
+SHA256 (cabal/fast-logger-2.4.10.tar.gz) = dec4a5d1a88f822d08d334ee870a08a8bb63b2b226d145cd24a7f08676ce678d
+SIZE (cabal/fast-logger-2.4.10.tar.gz) = 9537
diff --git a/devel/hs-fast-logger/files/patch-fast-logger.cabal b/devel/hs-fast-logger/files/patch-fast-logger.cabal
deleted file mode 100644
index 3f9ce7c18d0b..000000000000
--- a/devel/hs-fast-logger/files/patch-fast-logger.cabal
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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 937cd5b6a9cc..16b615ea6277 100644
--- a/devel/hs-fgl/Makefile
+++ b/devel/hs-fgl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= fgl
-PORTVERSION= 5.5.2.1
+PORTVERSION= 5.5.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fgl/distinfo b/devel/hs-fgl/distinfo
index 42f437b83f82..917f6f6c0665 100644
--- a/devel/hs-fgl/distinfo
+++ b/devel/hs-fgl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/fgl-5.5.2.1.tar.gz) = 0c2e745b7c2532f67b87a1c97ef016dca7444113d3901722c48c3193e71bd5d9
-SIZE (cabal/fgl-5.5.2.1.tar.gz) = 51963
+TIMESTAMP = 1499541554
+SHA256 (cabal/fgl-5.5.3.1.tar.gz) = dea97201d22c55b57a38b8f5a1ff272be8ba83db3824ab0f1232c60b8dcc2e4c
+SIZE (cabal/fgl-5.5.3.1.tar.gz) = 54868
diff --git a/devel/hs-file-embed/Makefile b/devel/hs-file-embed/Makefile
index ccc2968879e8..d8525e5c22a7 100644
--- a/devel/hs-file-embed/Makefile
+++ b/devel/hs-file-embed/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= file-embed
-PORTVERSION= 0.0.9
+PORTVERSION= 0.0.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-file-embed/distinfo b/devel/hs-file-embed/distinfo
index 1f6cd82e6aca..d3031a0c3178 100644
--- a/devel/hs-file-embed/distinfo
+++ b/devel/hs-file-embed/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/file-embed-0.0.9.tar.gz) = 58b3a6b0e0566b9f89286ecd456a669273b8333cd39356d4cc88ef897d93d005
-SIZE (cabal/file-embed-0.0.9.tar.gz) = 5624
+TIMESTAMP = 1499627834
+SHA256 (cabal/file-embed-0.0.10.tar.gz) = f751925cec5773a4fad5a48ca0a86a21091ee5f1efccf618a64a89fa2cf5f711
+SIZE (cabal/file-embed-0.0.10.tar.gz) = 6247
diff --git a/devel/hs-filemanip/Makefile b/devel/hs-filemanip/Makefile
index 5b1dd783e572..96596b5cf345 100644
--- a/devel/hs-filemanip/Makefile
+++ b/devel/hs-filemanip/Makefile
@@ -3,6 +3,7 @@
PORTNAME= filemanip
PORTVERSION= 0.3.6.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filemanip/distinfo b/devel/hs-filemanip/distinfo
index 6ea50035080f..ab907943273d 100644
--- a/devel/hs-filemanip/distinfo
+++ b/devel/hs-filemanip/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627834
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 6fcbe68cd90c..0ccba25d07b0 100644
--- a/devel/hs-filestore/Makefile
+++ b/devel/hs-filestore/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= filestore
-PORTVERSION= 0.6.1
+PORTVERSION= 0.6.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-filestore/distinfo b/devel/hs-filestore/distinfo
index df9d1c96775d..6088cc20a8d7 100644
--- a/devel/hs-filestore/distinfo
+++ b/devel/hs-filestore/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/filestore-0.6.1.tar.gz) = 0009c97f00044d2902209050d3b85a32dbad656ad0bb6276e811d7b0aca5d455
-SIZE (cabal/filestore-0.6.1.tar.gz) = 31837
+TIMESTAMP = 1499627835
+SHA256 (cabal/filestore-0.6.3.1.tar.gz) = 816f0db22291c7ac719db4b342e8ecc42c8ab749374cc70790887a6d025ad8de
+SIZE (cabal/filestore-0.6.3.1.tar.gz) = 31776
diff --git a/devel/hs-fmlist/Makefile b/devel/hs-fmlist/Makefile
new file mode 100644
index 000000000000..8e2edd4e1090
--- /dev/null
+++ b/devel/hs-fmlist/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= fmlist
+PORTVERSION= 0.9
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= FoldMap lists are lists represented by their foldMap function
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-fmlist/distinfo b/devel/hs-fmlist/distinfo
new file mode 100644
index 000000000000..dea77335835d
--- /dev/null
+++ b/devel/hs-fmlist/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719989
+SHA256 (cabal/fmlist-0.9.tar.gz) = 581153395a71e3c139365ffbebbeac6d880a6fdfee23e7f5d942ccbeb2aefcbf
+SIZE (cabal/fmlist-0.9.tar.gz) = 4256
diff --git a/devel/hs-fmlist/pkg-descr b/devel/hs-fmlist/pkg-descr
new file mode 100644
index 000000000000..6ba34e535217
--- /dev/null
+++ b/devel/hs-fmlist/pkg-descr
@@ -0,0 +1,6 @@
+FoldMap lists are lists represented by their foldMap function. FoldMap lists
+have O(1) cons, snoc and append, just like DLists, but other operations might
+have favorable performance characteristics as well. These wild claims are
+still completely unverified though.
+
+WWW: http://hackage.haskell.org/package/fmlist
diff --git a/devel/hs-foundation/Makefile b/devel/hs-foundation/Makefile
new file mode 100644
index 000000000000..d0672ee1950f
--- /dev/null
+++ b/devel/hs-foundation/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= foundation
+PORTVERSION= 0.0.13
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A custom prelude with no dependencies apart from base
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-foundation/distinfo b/devel/hs-foundation/distinfo
new file mode 100644
index 000000000000..59ee0c7dfef8
--- /dev/null
+++ b/devel/hs-foundation/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499627835
+SHA256 (cabal/foundation-0.0.13.tar.gz) = 106a85cbbf936591df44b46ee04d39f29c15752f6eca438341f2b735e9c0755f
+SIZE (cabal/foundation-0.0.13.tar.gz) = 221540
diff --git a/devel/hs-foundation/pkg-descr b/devel/hs-foundation/pkg-descr
new file mode 100644
index 000000000000..38f7cc1da12d
--- /dev/null
+++ b/devel/hs-foundation/pkg-descr
@@ -0,0 +1,12 @@
+This package has the following goals:
+ * provide a base like sets of modules that provide a consistent set of
+ features and bugfixes across multiple versions of GHC (unlike base).
+ * provide a better and more efficient prelude than base's prelude.
+ * be self-sufficient: no external dependencies apart from base.
+ * provide better data-types: packed unicode string by default, arrays.
+ * Better numerical classes that better represent mathematical thing
+ (No more all-in-one Num).
+ * Better I/O system with less Lazy IO
+ * Usual partial functions distinguished through type system
+
+WWW: https://hackage.haskell.org/package/foundation
diff --git a/devel/hs-free/Makefile b/devel/hs-free/Makefile
index 86194dcc6b5b..f31e8aa1f1f8 100644
--- a/devel/hs-free/Makefile
+++ b/devel/hs-free/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= free
-PORTVERSION= 4.12.1
+PORTVERSION= 4.12.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-free/distinfo b/devel/hs-free/distinfo
index e523078645db..c6c9e393deaf 100644
--- a/devel/hs-free/distinfo
+++ b/devel/hs-free/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/free-4.12.1.tar.gz) = 376559042204e56bcd1152f04bf01079118c6ccba5e0cf8344de929537bc286b
-SIZE (cabal/free-4.12.1.tar.gz) = 49736
+TIMESTAMP = 1499627836
+SHA256 (cabal/free-4.12.4.tar.gz) = c9fe45aae387855626ecb5a0fea6afdb207143cb00af3b1f715d1032d2d08784
+SIZE (cabal/free-4.12.4.tar.gz) = 50601
diff --git a/devel/hs-fsnotify/Makefile b/devel/hs-fsnotify/Makefile
index 72bad04d3bd3..f22d1147ab6f 100644
--- a/devel/hs-fsnotify/Makefile
+++ b/devel/hs-fsnotify/Makefile
@@ -2,6 +2,7 @@
PORTNAME= fsnotify
PORTVERSION= 0.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-fsnotify/distinfo b/devel/hs-fsnotify/distinfo
index 1dc69d4078a9..728dfcc0bee5 100644
--- a/devel/hs-fsnotify/distinfo
+++ b/devel/hs-fsnotify/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627836
SHA256 (cabal/fsnotify-0.2.1.tar.gz) = ebcf1b7bd825f269510850f20508a2ba0f640a41af08de0c171d8ba24618542b
SIZE (cabal/fsnotify-0.2.1.tar.gz) = 14689
diff --git a/devel/hs-gconf/Makefile b/devel/hs-gconf/Makefile
index 365f10509d37..b6c423b1eb77 100644
--- a/devel/hs-gconf/Makefile
+++ b/devel/hs-gconf/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gconf
-PORTVERSION= 0.13.0.2
+PORTVERSION= 0.13.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gconf/distinfo b/devel/hs-gconf/distinfo
index bccf100b122d..df39899b5024 100644
--- a/devel/hs-gconf/distinfo
+++ b/devel/hs-gconf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gconf-0.13.0.2.tar.gz) = 930ac96d4e46d6fc8f5fb9c5a19ff79695f8d01fa3a110da25f1ba95828add77
-SIZE (cabal/gconf-0.13.0.2.tar.gz) = 35926
+TIMESTAMP = 1499627837
+SHA256 (cabal/gconf-0.13.1.0.tar.gz) = 57cfa606ef4dcd377e0d77d59b880439382ad05604b3e3d439fd64af64a21dad
+SIZE (cabal/gconf-0.13.1.0.tar.gz) = 26625
diff --git a/devel/hs-generic-deriving/Makefile b/devel/hs-generic-deriving/Makefile
index 380256201b95..3b887cf735f7 100644
--- a/devel/hs-generic-deriving/Makefile
+++ b/devel/hs-generic-deriving/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= generic-deriving
-PORTVERSION= 1.8.0
+PORTVERSION= 1.11.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-generic-deriving/distinfo b/devel/hs-generic-deriving/distinfo
index 4cfb6fb27f08..f17dac442933 100644
--- a/devel/hs-generic-deriving/distinfo
+++ b/devel/hs-generic-deriving/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/generic-deriving-1.8.0.tar.gz) = 26b3d927c1341e372118c976d4d8b33a7c4a42ec657734ef9b4653ab1aa486cd
-SIZE (cabal/generic-deriving-1.8.0.tar.gz) = 29935
+TIMESTAMP = 1499450572
+SHA256 (cabal/generic-deriving-1.11.2.tar.gz) = 29960f2aa810abffc2f02658e7fa523cbfa4c92102e02d252482f9551bc122f9
+SIZE (cabal/generic-deriving-1.11.2.tar.gz) = 66546
diff --git a/devel/hs-geniplate-mirror/Makefile b/devel/hs-geniplate-mirror/Makefile
index 4ff286881e57..814151f860a4 100644
--- a/devel/hs-geniplate-mirror/Makefile
+++ b/devel/hs-geniplate-mirror/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= geniplate-mirror
-PORTVERSION= 0.7.1
+PORTVERSION= 0.7.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-geniplate-mirror/distinfo b/devel/hs-geniplate-mirror/distinfo
index 4cf96ad95c03..4559e257c665 100644
--- a/devel/hs-geniplate-mirror/distinfo
+++ b/devel/hs-geniplate-mirror/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/geniplate-mirror-0.7.1.tar.gz) = 60d4b0a0d01a93ee9188eb52d39803d9c2c814d321f95acfb0fdb8c7c075e773
-SIZE (cabal/geniplate-mirror-0.7.1.tar.gz) = 9259
+TIMESTAMP = 1499447732
+SHA256 (cabal/geniplate-mirror-0.7.5.tar.gz) = 519b913dac8f56d5b0d93c15881cae63f759270540c634e6f845a31084be729f
+SIZE (cabal/geniplate-mirror-0.7.5.tar.gz) = 9297
diff --git a/devel/hs-ghc-events/Makefile b/devel/hs-ghc-events/Makefile
index e3bc987a88bd..89d9af661f0b 100644
--- a/devel/hs-ghc-events/Makefile
+++ b/devel/hs-ghc-events/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= ghc-events
-PORTVERSION= 0.4.4.0
+PORTVERSION= 0.6.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-events/distinfo b/devel/hs-ghc-events/distinfo
index 49f97900fc31..d5b8b4ab4904 100644
--- a/devel/hs-ghc-events/distinfo
+++ b/devel/hs-ghc-events/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/ghc-events-0.4.4.0.tar.gz) = ab2bf624848165872375954f6b67379991557a58dff66959f585ee9807c84f6d
-SIZE (cabal/ghc-events-0.4.4.0.tar.gz) = 102944
+TIMESTAMP = 1499451126
+SHA256 (cabal/ghc-events-0.6.0.tar.gz) = 277da9dcd9a1910e530c76b2ad8875868f5e2d8acff44091623dc97255ce0769
+SIZE (cabal/ghc-events-0.6.0.tar.gz) = 153517
diff --git a/devel/hs-ghc-mtl/Makefile b/devel/hs-ghc-mtl/Makefile
index 826d267f8f6f..f0e411ca3b3c 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-mtl/distinfo b/devel/hs-ghc-mtl/distinfo
index 9c319377b28e..61739ae5260f 100644
--- a/devel/hs-ghc-mtl/distinfo
+++ b/devel/hs-ghc-mtl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627837
SHA256 (cabal/ghc-mtl-1.2.1.0.tar.gz) = 934e36c03ae0cbf59d6eb6d626983a3e520c6101417284b0a652db74e333d940
SIZE (cabal/ghc-mtl-1.2.1.0.tar.gz) = 2963
diff --git a/devel/hs-ghc-paths/Makefile b/devel/hs-ghc-paths/Makefile
index 0bcd5f8de789..8ee5773961d1 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-ghc-paths/distinfo b/devel/hs-ghc-paths/distinfo
index fd8cca66f7c9..46b995f709f4 100644
--- a/devel/hs-ghc-paths/distinfo
+++ b/devel/hs-ghc-paths/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627837
SHA256 (cabal/ghc-paths-0.1.0.9.tar.gz) = afa68fb86123004c37c1dc354286af2d87a9dcfb12ddcb80e8bd0cd55bc87945
SIZE (cabal/ghc-paths-0.1.0.9.tar.gz) = 2402
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index 5c4930c27273..c3c3acd505fc 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= gio
-PORTVERSION= 0.13.1.0
+PORTVERSION= 0.13.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-gio/distinfo b/devel/hs-gio/distinfo
index 67620fc1577e..ab8dd7804ffd 100644
--- a/devel/hs-gio/distinfo
+++ b/devel/hs-gio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gio-0.13.1.0.tar.gz) = b274b121b7814d25e0125f3129287a2407c83f458731040297a6fc6ebf6cabe3
-SIZE (cabal/gio-0.13.1.0.tar.gz) = 79367
+TIMESTAMP = 1499627838
+SHA256 (cabal/gio-0.13.3.1.tar.gz) = ac63f42321800731b9dc1f753f27ee877c04fdf7bcbcab0e2c57348a4739d827
+SIZE (cabal/gio-0.13.3.1.tar.gz) = 70058
diff --git a/devel/hs-git-annex/Makefile b/devel/hs-git-annex/Makefile
index 95ef2c76d532..b43f5b8b0c8d 100644
--- a/devel/hs-git-annex/Makefile
+++ b/devel/hs-git-annex/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
-PORTVERSION= 5.20150727
-PORTREVISION= 1
+PORTVERSION= 6.20170520
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,17 +10,52 @@ COMMENT= Manage files with git, without checking their contents into git
LICENSE= GPLv3
-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
+USE_CABAL= hslogger split IfElse QuickCheck SafeSemaphore bloomfilter \
+ concurrent-output disk-free-space edit-distance esqueleto \
+ feed magic network persistent-sqlite regex-tdfa sandi \
+ torrent uuid
USES= gmake perl5
USE_PERL5= build
-MAN1PAGES= git-annex.1 git-annex-shell.1
+MAN1PAGES= git-annex-add.1 git-annex-expire.1 git-annex-lookupkey.1 \
+ git-annex-remotedaemon.1 git-annex-ungroup.1 \
+ git-annex-addunused.1 git-annex-find.1 git-annex-map.1 \
+ git-annex-repair.1 git-annex-uninit.1 git-annex-addurl.1 \
+ git-annex-findref.1 git-annex-matchexpression.1 \
+ git-annex-required.1 git-annex-unlock.1 git-annex-adjust.1 \
+ git-annex-fix.1 git-annex-matching-options.1 \
+ git-annex-resolvemerge.1 git-annex-untrust.1 \
+ git-annex-assistant.1 git-annex-forget.1 git-annex-merge.1 \
+ git-annex-rmurl.1 git-annex-unused.1 git-annex-calckey.1 \
+ git-annex-fromkey.1 git-annex-metadata.1 git-annex-schedule.1 \
+ git-annex-upgrade.1 git-annex-checkpresentkey.1 \
+ git-annex-fsck.1 git-annex-migrate.1 git-annex-semitrust.1 \
+ git-annex-vadd.1 git-annex-contentlocation.1 \
+ git-annex-fuzztest.1 git-annex-mirror.1 git-annex-setkey.1 \
+ git-annex-vcycle.1 git-annex-copy.1 git-annex-get.1 \
+ git-annex-move.1 git-annex-setpresentkey.1 \
+ git-annex-version.1 git-annex-dead.1 git-annex-group.1 \
+ git-annex-multicast.1 git-annex-shell.1 git-annex-vfilter.1 \
+ git-annex-describe.1 git-annex-groupwanted.1 \
+ git-annex-numcopies.1 git-annex-smudge.1 git-annex-vicfg.1 \
+ git-annex-diffdriver.1 git-annex-import.1 git-annex-p2p.1 \
+ git-annex-status.1 git-annex-view.1 git-annex-direct.1 \
+ git-annex-importfeed.1 git-annex-pre-commit.1 \
+ git-annex-sync.1 git-annex-vpop.1 git-annex-drop.1 \
+ git-annex-indirect.1 git-annex-preferred-content.1 \
+ git-annex-test.1 git-annex-wanted.1 git-annex-dropkey.1 \
+ git-annex-info.1 git-annex-proxy.1 git-annex-testremote.1 \
+ git-annex-watch.1 git-annex-dropunused.1 git-annex-init.1 \
+ git-annex-readpresentkey.1 git-annex-transferkey.1 \
+ git-annex-webapp.1 git-annex-edit.1 git-annex-initremote.1 \
+ git-annex-registerurl.1 git-annex-transferkeys.1 \
+ git-annex-whereis.1 git-annex-enable-tor.1 git-annex-list.1 \
+ git-annex-reinit.1 git-annex-trust.1 git-annex.1 \
+ git-annex-enableremote.1 git-annex-lock.1 \
+ git-annex-reinject.1 git-annex-unannex.1 \
+ git-remote-tor-annex.1 git-annex-examinekey.1 git-annex-log.1 \
+ git-annex-rekey.1 git-annex-undo.1
BUILD_DEPENDS+= rsync:net/rsync \
git:devel/git \
@@ -31,92 +65,45 @@ RUN_DEPENDS+= rsync:net/rsync \
git:devel/git \
gsha256sum:sysutils/coreutils
-EXECUTABLE= git-annex git-annex-shell
+EXECUTABLE= git-annex git-annex-shell git-remote-tor-annex
STANDALONE= yes
-FLAGS_DEFINE= S3 WEBDAV INOTIFY ASSISTANT WEBAPP WEBAPP_SECURE PAIRING \
- 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 DATABASE
+FLAGS_DEFINE= S3 ASSISTANT WEBDAV WEBAPP PAIRING PRODUCTION DBUS
+FLAGS_DEFAULT= S3 ASSISTANT WEBDAV WEBAPP PAIRING PRODUCTION
S3_DESC= S3 support
S3_FLAG_ENABLE= S3
-S3_FLAG_CABAL= hS3
+S3_FLAG_CABAL= conduit conduit-extra aws
+
+WEBDAV_DESC= WebDAV support
+WEBDAV_FLAG_ENABLE= WebDAV
+WEBDAV_FLAG_CABAL= DAV
ASSISTANT_DESC= 'assistant' and 'watch' commands
ASSISTANT_FLAG_ENABLE= Assistant
-
-INOTIFY_DESC= File system notifications support
-INOTIFY_FLAG_ENABLE= Inotify
-INOTIFY_FLAG_CABAL= hinotify
+ASSISTANT_FLAG_CABAL= dns mountpoints hinotify
WEBAPP_DESC= Web application (requires assistant)
WEBAPP_FLAG_DEPENDS= ASSISTANT
WEBAPP_FLAG_ENABLE= Webapp
-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
-WEBAPP_SECURE_FLAG_ENABLE= Webapp-secure
-WEBAPP_SECURE_FLAG_CABAL= warp-tls>=1.4 securemem byteable
+WEBAPP_FLAG_CABAL= yesod yesod-static yesod-form yesod-core path-pieces \
+ warp warp-tls wai wai-extra blaze-builder \
+ clientsession shakespeare
PAIRING_DESC= Enable pairing (requires web application)
PAIRING_FLAG_DEPENDS= WEBAPP
PAIRING_FLAG_ENABLE= Pairing
PAIRING_FLAG_CABAL= network-multicast network-info
-XMPP_DESC= Enable notifications using XMPP (requires assistant)
-XMPP_FLAG_DEPENDS= ASSISTANT
-XMPP_FLAG_ENABLE= XMPP
-XMPP_FLAG_CABAL= gnutls>=0.1.4 network-protocol-xmpp xml-types
-
-DNS_DESC= Use the DNS library for lookups (requires XMPP)
-DNS_FLAG_DEPENDS= ASSISTANT XMPP
-DNS_FLAG_ENABLE= DNS
-DNS_FLAG_CABAL= dns
-
PRODUCTION_DESC= Production build
PRODUCTION_FLAG_ENABLE= Production
-TDFA_DESC= Use regex-tdfa for wildcards
-TDFA_FLAG_ENABLE= TDFA
-TDFA_FLAG_CABAL= regex-tdfa
-
-WEBDAV_DESC= WebDAV support
-WEBDAV_FLAG_ENABLE= WebDAV
-WEBDAV_FLAG_CABAL= DAV>=0.3 http-conduit xml-conduit http-types
-
-FEED_DESC= Podcast feed support
-FEED_FLAG_ENABLE= Feed
-FEED_FLAG_CABAL= feed
-
-QUVI_DESC= quvi to download videos
-QUVI_FLAG_ENABLE= Quvi
-QUVI_FLAG_CABAL= aeson
-
-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
+DBUS_DESC= Dbus support
+DBUS_FLAG_ENABLE= Dbus
+DBUS_FLAG_CABAL= dbus fdo-notify
-DATABASE_DESC= Build with persistent for database use
-DATABASE_FLAG_ENABLE= Database
-DATABASE_FLAG_CABAL= esqueleto persistent-sqlite persistent \
- persistent-template
+FLAGS_ENABLE= ConcurrentOutput TorrentParser MagicMime
+FLAGS_DISABLE= Benchmark TestSuite Android AndroidSplice
.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 1cc0fbc15a2b..001933951e4b 100644
--- a/devel/hs-git-annex/distinfo
+++ b/devel/hs-git-annex/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/git-annex-5.20150727.tar.gz) = 9826836bd0eb4e35be8664862405afbf2ff4dff9a643b2f8ec61c295bd16099f
-SIZE (cabal/git-annex-5.20150727.tar.gz) = 5095110
+TIMESTAMP = 1499627839
+SHA256 (cabal/git-annex-6.20170520.tar.gz) = f8cf9b44172ce1914c8be8134795c4197d02960b81a2ba596712cbd35e002717
+SIZE (cabal/git-annex-6.20170520.tar.gz) = 1124314
diff --git a/devel/hs-git-annex/files/patch-Build__Configure.hs b/devel/hs-git-annex/files/patch-Build__Configure.hs
index ea06e561b749..4a60a71ad332 100644
--- a/devel/hs-git-annex/files/patch-Build__Configure.hs
+++ b/devel/hs-git-annex/files/patch-Build__Configure.hs
@@ -1,6 +1,6 @@
---- ./Build/Configure.hs.orig 2014-07-09 22:09:05.000000000 +0200
-+++ ./Build/Configure.hs 2014-07-13 15:15:00.000000000 +0200
-@@ -68,7 +68,7 @@
+--- Build/Configure.hs.orig 2017-06-12 17:56:05 UTC
++++ Build/Configure.hs
+@@ -75,7 +75,7 @@ shaTestCases l = map make l
else search cmds
shacmds n = concatMap (\x -> [x, 'g':x]) $
diff --git a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
index 5a5352bc2d4a..8290342bfff3 100644
--- a/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
+++ b/devel/hs-git-annex/files/patch-Build__DesktopFile.hs
@@ -1,14 +1,14 @@
---- ./Build/DesktopFile.hs.orig 2014-07-09 22:09:05.000000000 +0200
-+++ ./Build/DesktopFile.hs 2014-07-13 01:40:51.000000000 +0200
-@@ -25,6 +25,7 @@
+--- Build/DesktopFile.hs.orig 2017-06-12 17:56:05 UTC
++++ Build/DesktopFile.hs
+@@ -25,6 +25,7 @@ import System.Environment
#ifndef mingw32_HOST_OS
import System.Posix.User
#endif
+import System.FilePath.Posix
import Data.Maybe
-
- systemwideInstall :: IO Bool
-@@ -48,12 +49,17 @@
+ import Control.Applicative
+ import Prelude
+@@ -50,12 +51,17 @@ writeFDODesktop :: FilePath -> IO ()
writeFDODesktop command = do
systemwide <- systemwideInstall
diff --git a/devel/hs-git-annex/files/patch-Setup.hs b/devel/hs-git-annex/files/patch-Setup.hs
index 9691658ad45f..1a01309521fa 100644
--- a/devel/hs-git-annex/files/patch-Setup.hs
+++ b/devel/hs-git-annex/files/patch-Setup.hs
@@ -1,45 +1,11 @@
---- Setup.hs.orig 2015-07-27 16:25:52 UTC
+--- Setup.hs.orig 2017-06-12 17:56:05 UTC
+++ Setup.hs
-@@ -23,6 +23,7 @@ main = defaultMainWithHooks simpleUserHo
- Configure.run Configure.tests
- return (Nothing, [])
- , postInst = myPostInst
-+ , postCopy = myPostCopy
- }
-
- myPostInst :: Args -> InstallFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-@@ -34,6 +35,15 @@ myPostInst _ (InstallFlags { installVerb
- dest = NoCopyDest
- verbosity = fromFlag installVerbosity
-
-+myPostCopy :: Args -> CopyFlags -> PackageDescription -> LocalBuildInfo -> IO ()
-+myPostCopy _ (CopyFlags { copyVerbosity, copyDest }) pkg lbi = do
-+ installGitAnnexShell dest verbosity pkg lbi
-+ installManpages dest verbosity pkg lbi
-+ installDesktopFile dest verbosity pkg lbi
-+ where
-+ dest = fromFlag copyDest
-+ verbosity = fromFlag copyVerbosity
-+
- installGitAnnexShell :: CopyDest -> Verbosity -> PackageDescription -> LocalBuildInfo -> IO ()
- installGitAnnexShell copyDest verbosity pkg lbi =
- rawSystemExit verbosity "ln"
-@@ -50,14 +60,14 @@ installManpages :: CopyDest -> Verbosity
+@@ -54,7 +54,7 @@ installManpages :: CopyDest -> Verbosity -> PackageDes
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 = ""
-+ <$> 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
-+ dstBinDir = bindir $ absoluteInstallDirs pkg lbi NoCopyDest
+ -- If mdwn2man fails, perhaps because perl is not available,
+ -- we just skip installing man pages.
+ srcManpages = zip (repeat "man") . map takeFileName . catMaybes
diff --git a/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs b/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs
new file mode 100644
index 000000000000..28ecb91890cb
--- /dev/null
+++ b/devel/hs-git-annex/files/patch-Utility_QuickCheck.hs
@@ -0,0 +1,12 @@
+--- Utility/QuickCheck.hs.orig 2017-06-12 17:56:05 UTC
++++ Utility/QuickCheck.hs
+@@ -35,9 +35,6 @@ instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) w
+ instance Arbitrary POSIXTime where
+ arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+
+-instance Arbitrary EpochTime where
+- arbitrary = fromInteger <$> nonNegative arbitrarySizedIntegral
+-
+ {- Pids are never negative, or 0. -}
+ instance Arbitrary ProcessID where
+ arbitrary = arbitrarySizedBoundedIntegral `suchThat` (> 0)
diff --git a/devel/hs-git-annex/files/patch-git-annex.cabal b/devel/hs-git-annex/files/patch-git-annex.cabal
index fb102a057ff0..55604acd49d5 100644
--- a/devel/hs-git-annex/files/patch-git-annex.cabal
+++ b/devel/hs-git-annex/files/patch-git-annex.cabal
@@ -1,10 +1,7 @@
---- git-annex.cabal.orig 2015-07-27 16:25:52 UTC
+--- git-annex.cabal.orig 2017-06-12 17:56:05 UTC
+++ git-annex.cabal
-@@ -218,9 +218,9 @@ Executable git-annex
- CPP-Options: -DANDROID_SPLICES
-
+@@ -446,7 +446,6 @@ Executable git-annex
if flag(Webapp)
-+ extensions: TemplateHaskell
Build-Depends:
yesod (>= 1.2.6),
- yesod-default (>= 1.2.0),
diff --git a/devel/hs-git-annex/pkg-plist b/devel/hs-git-annex/pkg-plist
deleted file mode 100644
index 02dfba5c4c0e..000000000000
--- a/devel/hs-git-annex/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/xdg/autostart/git-annex.desktop
-share/applications/git-annex.desktop
-share/icons/hicolor/16x16/apps/git-annex.png
-share/icons/hicolor/scalable/apps/git-annex.svg
diff --git a/devel/hs-gitrev/Makefile b/devel/hs-gitrev/Makefile
new file mode 100644
index 000000000000..1e1198b7d33a
--- /dev/null
+++ b/devel/hs-gitrev/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= gitrev
+PORTVERSION= 1.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Compile git revision info into Haskell projects
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= base-compat
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-gitrev/distinfo b/devel/hs-gitrev/distinfo
new file mode 100644
index 000000000000..a663b88ab8f5
--- /dev/null
+++ b/devel/hs-gitrev/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500996936
+SHA256 (cabal/gitrev-1.3.1.tar.gz) = a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332
+SIZE (cabal/gitrev-1.3.1.tar.gz) = 3756
diff --git a/devel/hs-gitrev/pkg-descr b/devel/hs-gitrev/pkg-descr
new file mode 100644
index 000000000000..bb27b0d5b2a0
--- /dev/null
+++ b/devel/hs-gitrev/pkg-descr
@@ -0,0 +1,6 @@
+Some handy Template Haskell splices for including the current git hash and
+branch in the code of your project. Useful for including in panic messages,
+--version output, or diagnostic info for more informative bug reports.
+
+WWW: https://github.com/acfoltzer/gitrev
+
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index ee5031ec1322..33a1d38367a3 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= glib
-PORTVERSION= 0.13.1.1
+PORTVERSION= 0.13.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-glib/distinfo b/devel/hs-glib/distinfo
index 6d08348ce0c0..6012de34c7a7 100644
--- a/devel/hs-glib/distinfo
+++ b/devel/hs-glib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/glib-0.13.1.1.tar.gz) = e494b416ee7b80743af586edf5f7f497b4ce5eae6c070ec12b0e9ec5b99b43f1
-SIZE (cabal/glib-0.13.1.1.tar.gz) = 48228
+TIMESTAMP = 1499537811
+SHA256 (cabal/glib-0.13.4.1.tar.gz) = f57202ed4094cc50caa8b390c8b78a1620b3c43b913edb1e5bda0f3c5be32630
+SIZE (cabal/glib-0.13.4.1.tar.gz) = 39441
diff --git a/devel/hs-gtk2hs-buildtools/Makefile b/devel/hs-gtk2hs-buildtools/Makefile
index 92e5cc4f557d..50c90a6be8ea 100644
--- a/devel/hs-gtk2hs-buildtools/Makefile
+++ b/devel/hs-gtk2hs-buildtools/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= gtk2hs-buildtools
-PORTVERSION= 0.13.0.4
-PORTREVISION= 1
+PORTVERSION= 0.13.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -16,7 +15,5 @@ USE_HAPPY= yes
EXECUTABLE= gtk2hsC2hs gtk2hsHookGenerator gtk2hsTypeGen
-STANDALONE= yes
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-gtk2hs-buildtools/distinfo b/devel/hs-gtk2hs-buildtools/distinfo
index 02392bc17433..8f7d36f1bde7 100644
--- a/devel/hs-gtk2hs-buildtools/distinfo
+++ b/devel/hs-gtk2hs-buildtools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 2a24c2d4124ec046800326922807ab457e2beaf0ffb320162687e1475dbe3510
-SIZE (cabal/gtk2hs-buildtools-0.13.0.4.tar.gz) = 169272
+TIMESTAMP = 1499539633
+SHA256 (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = c5e4b59f8711ec4e4e25a91ce4213c5396dd0b56179751ed6da255ac35edfb4b
+SIZE (cabal/gtk2hs-buildtools-0.13.2.2.tar.gz) = 178124
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
index f0400f06d69c..03e1bd95991a 100644
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs__c__CAST.hs
@@ -1,4 +1,4 @@
---- c2hs/c/CAST.hs.orig 2017-03-21 18:15:30 UTC
+--- c2hs/c/CAST.hs.orig 2017-01-14 09:17:54 UTC
+++ c2hs/c/CAST.hs
@@ -1125,6 +1125,9 @@ instance Binary CStorageSpec where
put_ bh (CTypedef ae) = do
diff --git a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
index b06fe7616609..9c1fbee08541 100644
--- a/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
+++ b/devel/hs-gtk2hs-buildtools/files/patch-c2hs_toplevel_C2HSConfig.hs
@@ -5,18 +5,9 @@ c2hs: C header contains errors:
The symbol `long' does not fit here.
*** Error code 1
---- c2hs/toplevel/C2HSConfig.hs.orig 2017-03-21 18:17:37 UTC
+--- c2hs/toplevel/C2HSConfig.hs.orig 2017-01-14 09:17:54 UTC
+++ c2hs/toplevel/C2HSConfig.hs
-@@ -64,14 +64,17 @@ cpp = case os of
- -- * `-x c' forces CPP to regard the input as C code; this option seems to be
- -- understood at least on Linux, FreeBSD, and Solaris and seems to make a
- -- difference over the default language setting on FreeBSD
-+--
-+-- * Pass -std=c99 as c2hs get's confused by the c11 parts in the FreeBSD
-+-- system headers.
- --
- -- * `-P' would suppress `#line' directives
- --
+@@ -70,8 +70,8 @@ cpp = case os of
cppopts :: [String]
cppopts = case (os,cpp) of
("openbsd","cpp") -> ["-xc", "-w"]
@@ -25,5 +16,5 @@ c2hs: C header contains errors:
+ (_,"cpp") -> ["-x", "c", "-w", "-std=c99"]
+ (_,"gcc") -> ["-E", "-x", "c", "-w", "-std=c99"]
_ -> []
-
+
-- C preprocessor option for including only definitions (EXPORTED)
diff --git a/devel/hs-haddock-api/Makefile b/devel/hs-haddock-api/Makefile
index 2ec7d93b2459..9eb4dbe64326 100644
--- a/devel/hs-haddock-api/Makefile
+++ b/devel/hs-haddock-api/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-api
-PORTVERSION= 2.16.1
+PORTVERSION= 2.17.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock-api/distinfo b/devel/hs-haddock-api/distinfo
index 1d7a4bb3e6f2..0dbdea95c108 100644
--- a/devel/hs-haddock-api/distinfo
+++ b/devel/hs-haddock-api/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-api-2.16.1.tar.gz) = e2061d67e3de2bb39a98225712f119ef21a62567afac361bd9b2ddf0ba2aedea
-SIZE (cabal/haddock-api-2.16.1.tar.gz) = 125372
+TIMESTAMP = 1499452541
+SHA256 (cabal/haddock-api-2.17.4.tar.gz) = 5a97114f567bb7384d07dfc77a7c2f6c35017193e63411b85ab2a3f7fe35d601
+SIZE (cabal/haddock-api-2.17.4.tar.gz) = 145712
diff --git a/devel/hs-haddock-library/Makefile b/devel/hs-haddock-library/Makefile
index 49e1f3adf54d..91fcfde88b77 100644
--- a/devel/hs-haddock-library/Makefile
+++ b/devel/hs-haddock-library/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= haddock-library
-PORTVERSION= 1.2.1
+PORTVERSION= 1.4.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock-library/distinfo b/devel/hs-haddock-library/distinfo
index 63fd398d1116..2723301ae1e4 100644
--- a/devel/hs-haddock-library/distinfo
+++ b/devel/hs-haddock-library/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-library-1.2.1.tar.gz) = 0fb1a09d2b6f5339bc008a8ebf6519f22d27f65cfcc682488a7b67e8ee151056
-SIZE (cabal/haddock-library-1.2.1.tar.gz) = 38606
+TIMESTAMP = 1499448291
+SHA256 (cabal/haddock-library-1.4.3.tar.gz) = f764763f8004715431a184a981493781b8380e13fd89ca0075ac426edc5d445b
+SIZE (cabal/haddock-library-1.4.3.tar.gz) = 38863
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 97836694bc0b..17f2e5ce28a7 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haddock
-PORTVERSION= 2.16.1
+PORTVERSION= 2.17.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 340a26fb4bb1..3191273deadb 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haddock-2.16.1.tar.gz) = 46ecd130cb5ad2b5c7452c843f9b75e976f1416d1cf17e6436d65c2c0bdbd6d6
-SIZE (cabal/haddock-2.16.1.tar.gz) = 216323
+TIMESTAMP = 1499538938
+SHA256 (cabal/haddock-2.17.5.tar.gz) = 1493012ed12ca8cad901380fece150e4b342a8bacd9ba319bff8be7ebb37bee3
+SIZE (cabal/haddock-2.17.5.tar.gz) = 244683
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
index f8193e05dd97..85fc89b4d9c7 100644
--- a/devel/hs-haddock/pkg-plist
+++ b/devel/hs-haddock/pkg-plist
@@ -1,2 +1,2 @@
-@exec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
-@unexec /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%%
+@postexec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
+@postunexec [ -f %%GHC_HADDOCK_CMD%% ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%% || rm -f %%HADDOCK%%
diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 06a878c83f08..d18aebe2fe45 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -3,6 +3,7 @@
PORTNAME= happy
PORTVERSION= 1.19.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index aa017607273a..03e89dcd0154 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
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 8748ce486135..d95e7842426f 100644
--- a/devel/hs-hashable/Makefile
+++ b/devel/hs-hashable/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hashable
-PORTVERSION= 1.2.3.3
+PORTVERSION= 1.2.6.1
PORTEPOCH= 1
CATEGORIES= devel haskell
@@ -10,7 +10,7 @@ COMMENT= Class for types that can be converted to a hash value
LICENSE= BSD3CLAUSE
-USE_CABAL= text>=0.11.0.5
+USE_CABAL= text>=0.11.0.5 vector
FLAGS_DEFINE= INTEGER_GMP SSE2 SSE41
FLAGS_DEFAULT= INTEGER_GMP SSE2
diff --git a/devel/hs-hashable/distinfo b/devel/hs-hashable/distinfo
index 4afe612aab92..6ac7cd366364 100644
--- a/devel/hs-hashable/distinfo
+++ b/devel/hs-hashable/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hashable-1.2.3.3.tar.gz) = fc923f7d1fdc0062416a61f6ab96b4e1958e1aee1ddf1c71fa2cc6d08154e44e
-SIZE (cabal/hashable-1.2.3.3.tar.gz) = 23944
+TIMESTAMP = 1499444230
+SHA256 (cabal/hashable-1.2.6.1.tar.gz) = 94ca8789e13bc05c1582c46b709f3b0f5aeec2092be634b8606dbd9c5915bb7a
+SIZE (cabal/hashable-1.2.6.1.tar.gz) = 30305
diff --git a/devel/hs-hashed-storage/Makefile b/devel/hs-hashed-storage/Makefile
index 2613f4cd336d..c1f82213e716 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashed-storage/distinfo b/devel/hs-hashed-storage/distinfo
index 80c49d2722dd..da799e91cea0 100644
--- a/devel/hs-hashed-storage/distinfo
+++ b/devel/hs-hashed-storage/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
SHA256 (cabal/hashed-storage-0.5.11.tar.gz) = 734b5e91081e355384f86fdd67f242e095e8c5196b182a62cc996fdabdb21569
SIZE (cabal/hashed-storage-0.5.11.tar.gz) = 57315
diff --git a/devel/hs-hashtables/Makefile b/devel/hs-hashtables/Makefile
index 2a0461743df2..8b05dcc5b5c6 100644
--- a/devel/hs-hashtables/Makefile
+++ b/devel/hs-hashtables/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hashtables
-PORTVERSION= 1.2.0.2
+PORTVERSION= 1.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hashtables/distinfo b/devel/hs-hashtables/distinfo
index cb3331d3b895..5b17209d1054 100644
--- a/devel/hs-hashtables/distinfo
+++ b/devel/hs-hashtables/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hashtables-1.2.0.2.tar.gz) = 012be9fa5e91118b9301ca58138fbf45222119a284d5561ca6f7e3f9b42e1837
-SIZE (cabal/hashtables-1.2.0.2.tar.gz) = 54283
+TIMESTAMP = 1499459894
+SHA256 (cabal/hashtables-1.2.1.1.tar.gz) = 227f554a93310645c654254659969b347de3d1bf3d98901dbb5c113ece72e951
+SIZE (cabal/hashtables-1.2.1.1.tar.gz) = 53674
diff --git a/devel/hs-haskell-lexer/Makefile b/devel/hs-haskell-lexer/Makefile
new file mode 100644
index 000000000000..70bc5d3ea37e
--- /dev/null
+++ b/devel/hs-haskell-lexer/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= haskell-lexer
+PORTVERSION= 1.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A fully compliant Haskell 98 lexer
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-haskell-lexer/distinfo b/devel/hs-haskell-lexer/distinfo
new file mode 100644
index 000000000000..12a4838366d0
--- /dev/null
+++ b/devel/hs-haskell-lexer/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720420
+SHA256 (cabal/haskell-lexer-1.0.1.tar.gz) = d7d42ab3c4bc2f0232ede8b005fb9de57f862ee4c1c83aa61e1022346fc84366
+SIZE (cabal/haskell-lexer-1.0.1.tar.gz) = 12380
diff --git a/devel/hs-haskell-lexer/pkg-descr b/devel/hs-haskell-lexer/pkg-descr
new file mode 100644
index 000000000000..69b5920898aa
--- /dev/null
+++ b/devel/hs-haskell-lexer/pkg-descr
@@ -0,0 +1,3 @@
+A fully compliant Haskell 98 lexer.
+
+WWW: http://hackage.haskell.org/package/haskell-lexer
diff --git a/devel/hs-haskell-src-exts/Makefile b/devel/hs-haskell-src-exts/Makefile
index a92a23dbeb77..14886b6229a5 100644
--- a/devel/hs-haskell-src-exts/Makefile
+++ b/devel/hs-haskell-src-exts/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= haskell-src-exts
-PORTVERSION= 1.16.0.1
+PORTVERSION= 1.19.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Manipulating Haskell source
LICENSE= BSD3CLAUSE
-USE_CABAL= cpphs>=1.3
+USE_CABAL= cpphs
USE_HAPPY= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-haskell-src-exts/distinfo b/devel/hs-haskell-src-exts/distinfo
index e2d628abb831..6be8325d27cb 100644
--- a/devel/hs-haskell-src-exts/distinfo
+++ b/devel/hs-haskell-src-exts/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 3f3bd41ad3a346a78e80195eca83de529d3ece63fa7edcd4df3b8bf40a970fc1
-SIZE (cabal/haskell-src-exts-1.16.0.1.tar.gz) = 1410081
+TIMESTAMP = 1501416565
+SHA256 (cabal/haskell-src-exts-1.19.1.tar.gz) = f0f5b2867673d654c7cce8a5fcc69222ea09af460c29a819c23cccf6311ba971
+SIZE (cabal/haskell-src-exts-1.19.1.tar.gz) = 1296952
diff --git a/devel/hs-haskell-src/Makefile b/devel/hs-haskell-src/Makefile
index 92047cb04bc3..f6e0e665e442 100644
--- a/devel/hs-haskell-src/Makefile
+++ b/devel/hs-haskell-src/Makefile
@@ -2,6 +2,7 @@
PORTNAME= haskell-src
PORTVERSION= 1.0.2.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-haskell-src/distinfo b/devel/hs-haskell-src/distinfo
index 2ed2cd3688ad..90bac848ea19 100644
--- a/devel/hs-haskell-src/distinfo
+++ b/devel/hs-haskell-src/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627839
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 b05ca0f007a5..72eef06077fd 100644
--- a/devel/hs-hasktags/Makefile
+++ b/devel/hs-hasktags/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hasktags
-PORTVERSION= 0.69.1
+PORTVERSION= 0.69.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hasktags/distinfo b/devel/hs-hasktags/distinfo
index 193a3cc0a9b4..358d9a444b55 100644
--- a/devel/hs-hasktags/distinfo
+++ b/devel/hs-hasktags/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hasktags-0.69.1.tar.gz) = 243f802c581ea7c0327065d2c71f21019dc6d7dc7dfadad9d17fffd8b34df1e6
-SIZE (cabal/hasktags-0.69.1.tar.gz) = 55906
+TIMESTAMP = 1499452576
+SHA256 (cabal/hasktags-0.69.3.tar.gz) = 4e069aa63c2a7d762332d1acbc12a3d705abdc5e24c06d55129e1a3fd66e5afa
+SIZE (cabal/hasktags-0.69.3.tar.gz) = 62888
diff --git a/devel/hs-hastache/Makefile b/devel/hs-hastache/Makefile
index f9e004babaf4..18a58a2d3d50 100644
--- a/devel/hs-hastache/Makefile
+++ b/devel/hs-hastache/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hastache
PORTVERSION= 0.6.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hastache/distinfo b/devel/hs-hastache/distinfo
index 35d7df616e3e..41407ad2d527 100644
--- a/devel/hs-hastache/distinfo
+++ b/devel/hs-hastache/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
SHA256 (cabal/hastache-0.6.1.tar.gz) = 8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464
SIZE (cabal/hastache-0.6.1.tar.gz) = 16452
diff --git a/devel/hs-hastache/files/patch-hastache.cabal b/devel/hs-hastache/files/patch-hastache.cabal
new file mode 100644
index 000000000000..cd911a4513d7
--- /dev/null
+++ b/devel/hs-hastache/files/patch-hastache.cabal
@@ -0,0 +1,29 @@
+--- hastache.cabal.orig 2014-12-23 10:40:08 UTC
++++ hastache.cabal
+@@ -27,7 +27,7 @@ extra-source-files:
+ executable mkReadme
+ main-is: mkReadme.hs
+ build-depends: hastache, process,
+- base >=4 && <4.9
++ base >=4.4 && <4.10
+ ,bytestring
+ ,mtl
+ ,transformers
+@@ -46,7 +46,7 @@ library
+ Text.Hastache.Context
+
+ build-depends:
+- base >=4 && <4.9
++ base >=4.4 && <4.10
+ ,bytestring
+ ,mtl
+ ,transformers
+@@ -69,7 +69,7 @@ test-suite test-hastache
+
+ build-depends:
+ hastache
+- ,base >=4 && <4.9
++ ,base >=4.4 && <4.10
+ ,directory
+ ,mtl
+ ,HUnit
diff --git a/devel/hs-hex/Makefile b/devel/hs-hex/Makefile
index 501e1fffe875..d20e9b9c0411 100644
--- a/devel/hs-hex/Makefile
+++ b/devel/hs-hex/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hex
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hex/distinfo b/devel/hs-hex/distinfo
index 028bd5b9ff27..865934a937ce 100644
--- a/devel/hs-hex/distinfo
+++ b/devel/hs-hex/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
SHA256 (cabal/hex-0.1.2.tar.gz) = 12ee1243edd80570a486521565fb0c9b5e39374f21a12f050636e71d55ec61ec
SIZE (cabal/hex-0.1.2.tar.gz) = 1956
diff --git a/devel/hs-hinotify/Makefile b/devel/hs-hinotify/Makefile
index 3b55f6aed5a7..6a8f9b020ced 100644
--- a/devel/hs-hinotify/Makefile
+++ b/devel/hs-hinotify/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hinotify
-PORTVERSION= 0.3.8.1
+PORTVERSION= 0.3.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,5 +11,7 @@ LICENSE= BSD3CLAUSE
LIB_DEPENDS= libinotify.so:devel/libinotify
+USE_CABAL= async
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hinotify/distinfo b/devel/hs-hinotify/distinfo
index 0786180a0527..4c22b16eb385 100644
--- a/devel/hs-hinotify/distinfo
+++ b/devel/hs-hinotify/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hinotify-0.3.8.1.tar.gz) = 37d46e32c362ff1e2d9c8d79a553e0d2e59e009d46708163fb05a07e1a71810d
-SIZE (cabal/hinotify-0.3.8.1.tar.gz) = 8344
+TIMESTAMP = 1499627841
+SHA256 (cabal/hinotify-0.3.9.tar.gz) = f2480e4c08a516831c2221eebc6a9d3242e892932d9315c34cbe92a101c5df99
+SIZE (cabal/hinotify-0.3.9.tar.gz) = 9021
diff --git a/devel/hs-hint/Makefile b/devel/hs-hint/Makefile
index 21f719d7e506..105492453361 100644
--- a/devel/hs-hint/Makefile
+++ b/devel/hs-hint/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hint
-PORTVERSION= 0.4.2.3
+PORTVERSION= 0.7.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,13 +13,5 @@ LICENSE= BSD3CLAUSE
USE_CABAL= exceptions extensible-exceptions ghc-mtl>=1.2.1 ghc-paths \
mtl random utf8-string
-INSTALL_PORTEXAMPLES= cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}
-
-INSTALL_PORTDATA= ${INSTALL_DATA} \
- ${WRKSRC}/AUTHORS \
- ${WRKSRC}/README \
- ${WRKSRC}/CHANGELOG.markdown \
- ${STAGEDIR}${DATADIR}
-
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hint/distinfo b/devel/hs-hint/distinfo
index 0705311b2690..a86f3e935bad 100644
--- a/devel/hs-hint/distinfo
+++ b/devel/hs-hint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hint-0.4.2.3.tar.gz) = cf2b3f98ba6929e2e79dfc373e101ee6ae1711a5706e718cf0152733da4a40b7
-SIZE (cabal/hint-0.4.2.3.tar.gz) = 30117
+TIMESTAMP = 1499544799
+SHA256 (cabal/hint-0.7.0.tar.gz) = 299a735848bd6b2e0bdeeee4b47d9d52f865198fbb9403df3f6571801b3e8155
+SIZE (cabal/hint-0.7.0.tar.gz) = 28138
diff --git a/devel/hs-hlibev/Makefile b/devel/hs-hlibev/Makefile
index 5a103a4c373c..9876c9bbbd88 100644
--- a/devel/hs-hlibev/Makefile
+++ b/devel/hs-hlibev/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hlibev
PORTVERSION= 0.4.0
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hlibev/distinfo b/devel/hs-hlibev/distinfo
index 7c1d484f3cbe..6d33daf25c98 100644
--- a/devel/hs-hlibev/distinfo
+++ b/devel/hs-hlibev/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627841
SHA256 (cabal/hlibev-0.4.0.tar.gz) = dc37dafa42fad03228f353eaa0cda8d57eaf2f8c2558c3de29d2425526e02610
SIZE (cabal/hlibev-0.4.0.tar.gz) = 6366
diff --git a/devel/hs-hlint/Makefile b/devel/hs-hlint/Makefile
index c1d1ecd22b44..51e589260859 100644
--- a/devel/hs-hlint/Makefile
+++ b/devel/hs-hlint/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hlint
-PORTVERSION= 1.9.21
+PORTVERSION= 2.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Source code suggestions
LICENSE= BSD3CLAUSE
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
+ haskell-src-exts>=1.16 hscolour>=1.21 refact uniplate>=1.5 yaml
EXECUTABLE= hlint
diff --git a/devel/hs-hlint/distinfo b/devel/hs-hlint/distinfo
index 797190e14399..87c73ce3021c 100644
--- a/devel/hs-hlint/distinfo
+++ b/devel/hs-hlint/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hlint-1.9.21.tar.gz) = 8694a193e0f55b9a74ddd4fb44a242872f91e36ea59dd96ab489562a65cb6393
-SIZE (cabal/hlint-1.9.21.tar.gz) = 88802
+TIMESTAMP = 1499627842
+SHA256 (cabal/hlint-2.0.9.tar.gz) = 252993e74def5caae29a546f39ce37ce2cf2b6bcafa6cc5c867fb5d07fb4a5ad
+SIZE (cabal/hlint-2.0.9.tar.gz) = 102835
diff --git a/devel/hs-hoogle/Makefile b/devel/hs-hoogle/Makefile
index b4e7d34b2842..b7f6d15da9de 100644
--- a/devel/hs-hoogle/Makefile
+++ b/devel/hs-hoogle/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hoogle
-PORTVERSION= 4.2.41
+PORTVERSION= 5.0.12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,11 +10,11 @@ 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.16 \
- http-types>=0.7 parsec>=2.1 QuickCheck random resourcet \
- 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
+USE_CABAL= aeson cmdargs conduit conduit-extra connection extra \
+ haskell-src-exts http-conduit http-types js-flot js-jquery \
+ mmap network network-uri old-locale process-extras QuickCheck \
+ resourcet tar text uniplate utf8-string vector wai wai-logger \
+ warp warp-tls zlib
EXECUTABLE= hoogle
diff --git a/devel/hs-hoogle/distinfo b/devel/hs-hoogle/distinfo
index ad1f0b7d7521..dfbeb4d4eadb 100644
--- a/devel/hs-hoogle/distinfo
+++ b/devel/hs-hoogle/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hoogle-4.2.41.tar.gz) = a6b80301849314399f622d8c68c3b46cb0ae85a65f625f47817f23d40ed7a1be
-SIZE (cabal/hoogle-4.2.41.tar.gz) = 135709
+TIMESTAMP = 1499627842
+SHA256 (cabal/hoogle-5.0.12.tar.gz) = 1d37f1e96b699fe71ea3661ac2a9424cfd178cba5cc26b0a7ee5505e6fb49308
+SIZE (cabal/hoogle-5.0.12.tar.gz) = 85464
diff --git a/devel/hs-hourglass/Makefile b/devel/hs-hourglass/Makefile
index d262dac03a4c..9da5e9077d41 100644
--- a/devel/hs-hourglass/Makefile
+++ b/devel/hs-hourglass/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hourglass
-PORTVERSION= 0.2.9
+PORTVERSION= 0.2.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hourglass/distinfo b/devel/hs-hourglass/distinfo
index 84a2f947bcd7..004beeb32729 100644
--- a/devel/hs-hourglass/distinfo
+++ b/devel/hs-hourglass/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hourglass-0.2.9.tar.gz) = 9b54f163a1ecad98fbd14cb9737c28001b2648106d98cbd68fb2f5cfed090af6
-SIZE (cabal/hourglass-0.2.9.tar.gz) = 24919
+TIMESTAMP = 1499627843
+SHA256 (cabal/hourglass-0.2.10.tar.gz) = d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80
+SIZE (cabal/hourglass-0.2.10.tar.gz) = 26417
diff --git a/devel/hs-hsb2hs/Makefile b/devel/hs-hsb2hs/Makefile
index 62692b468a38..d40d66e52677 100644
--- a/devel/hs-hsb2hs/Makefile
+++ b/devel/hs-hsb2hs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hsb2hs
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hsb2hs/distinfo b/devel/hs-hsb2hs/distinfo
index dfc1480a3782..7678c1dbee86 100644
--- a/devel/hs-hsb2hs/distinfo
+++ b/devel/hs-hsb2hs/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627843
SHA256 (cabal/hsb2hs-0.3.1.tar.gz) = 8ad800820554f273ada083dfce2f463d920fb1ceb053255023a4c883b090f9d8
SIZE (cabal/hsb2hs-0.3.1.tar.gz) = 2387
diff --git a/devel/hs-hslogger/Makefile b/devel/hs-hslogger/Makefile
index fba6efa57025..b1d396c346fb 100644
--- a/devel/hs-hslogger/Makefile
+++ b/devel/hs-hslogger/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= hslogger
-PORTVERSION= 1.2.9
+PORTVERSION= 1.2.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslogger/distinfo b/devel/hs-hslogger/distinfo
index a3c3b8cfa6d5..ca3967e131eb 100644
--- a/devel/hs-hslogger/distinfo
+++ b/devel/hs-hslogger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hslogger-1.2.9.tar.gz) = be62cc2783876b9e6d857c5ae60ab4408131fc51314a7b7d971212395f0fb476
-SIZE (cabal/hslogger-1.2.9.tar.gz) = 35576
+TIMESTAMP = 1499627844
+SHA256 (cabal/hslogger-1.2.10.tar.gz) = d7ca6e94a4aacb47a8dc30e3960ab8deff482d2ec9dca9a87b225e03e97e452b
+SIZE (cabal/hslogger-1.2.10.tar.gz) = 35889
diff --git a/devel/hs-hslua/Makefile b/devel/hs-hslua/Makefile
index 226fa652639a..4713ee9658ca 100644
--- a/devel/hs-hslua/Makefile
+++ b/devel/hs-hslua/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hslua
-PORTVERSION= 0.4.0
+PORTVERSION= 0.5.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hslua/distinfo b/devel/hs-hslua/distinfo
index 2bd503366a26..c2f863c5136c 100644
--- a/devel/hs-hslua/distinfo
+++ b/devel/hs-hslua/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hslua-0.4.0.tar.gz) = 77a865a3258656c2536c154d18ac38873a371685fde6ba03a3436f65f7bda050
-SIZE (cabal/hslua-0.4.0.tar.gz) = 129883
+TIMESTAMP = 1499627844
+SHA256 (cabal/hslua-0.5.0.tar.gz) = 6b270a14cce6046a443e6700d0b73725bef2dc068dd40aa6a1feb1c84f41171b
+SIZE (cabal/hslua-0.5.0.tar.gz) = 132155
diff --git a/devel/hs-hspec-core/Makefile b/devel/hs-hspec-core/Makefile
index f295c7b4e74f..891cd2575c2a 100644
--- a/devel/hs-hspec-core/Makefile
+++ b/devel/hs-hspec-core/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-core
-PORTVERSION= 2.1.10
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-core/distinfo b/devel/hs-hspec-core/distinfo
index b61d2cfa9735..4ed332246055 100644
--- a/devel/hs-hspec-core/distinfo
+++ b/devel/hs-hspec-core/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-core-2.1.10.tar.gz) = 682e7e77e6f6256caefa6c0582d89dbee8efd864ac14a98cfba4707a9eb20ee0
-SIZE (cabal/hspec-core-2.1.10.tar.gz) = 31124
+TIMESTAMP = 1499627845
+SHA256 (cabal/hspec-core-2.4.4.tar.gz) = 601d321cdf7f2685880ee80c31154763884cb90dc512906005c4a485e8c8bfdf
+SIZE (cabal/hspec-core-2.4.4.tar.gz) = 40871
diff --git a/devel/hs-hspec-discover/Makefile b/devel/hs-hspec-discover/Makefile
index 93d2f36a834d..6f236fac8001 100644
--- a/devel/hs-hspec-discover/Makefile
+++ b/devel/hs-hspec-discover/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-discover
-PORTVERSION= 2.1.10
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec-discover/distinfo b/devel/hs-hspec-discover/distinfo
index d7e8b0958085..a21ccef98240 100644
--- a/devel/hs-hspec-discover/distinfo
+++ b/devel/hs-hspec-discover/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-discover-2.1.10.tar.gz) = efb14e44b9beef570d55c2db4904002bf61e7744cd00a3a5fc8c236b8f071a0b
-SIZE (cabal/hspec-discover-2.1.10.tar.gz) = 5646
+TIMESTAMP = 1499627846
+SHA256 (cabal/hspec-discover-2.4.4.tar.gz) = 76423bc72f3ed0a80ccefb26fbf3fb16c3d74a69d69b4ce0bc88db54984d5d47
+SIZE (cabal/hspec-discover-2.4.4.tar.gz) = 5942
diff --git a/devel/hs-hspec-expectations/Makefile b/devel/hs-hspec-expectations/Makefile
index 51fff1e33223..fc40aa304791 100644
--- a/devel/hs-hspec-expectations/Makefile
+++ b/devel/hs-hspec-expectations/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec-expectations
-PORTVERSION= 0.7.1
+PORTVERSION= 0.8.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Catchy combinators for HUnit
LICENSE= MIT
-USE_CABAL= HUnit
+USE_CABAL= call-stack HUnit
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-hspec-expectations/distinfo b/devel/hs-hspec-expectations/distinfo
index 8a324976d0a2..a652ea8cc82f 100644
--- a/devel/hs-hspec-expectations/distinfo
+++ b/devel/hs-hspec-expectations/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-expectations-0.7.1.tar.gz) = afcac6b3492a2db618e0e85e83cb106ba555fd966a3b045ee4aa30ccf199a258
-SIZE (cabal/hspec-expectations-0.7.1.tar.gz) = 4005
+TIMESTAMP = 1499544608
+SHA256 (cabal/hspec-expectations-0.8.2.tar.gz) = 819607ea1faf35ce5be34be61c6f50f3389ea43892d56fb28c57a9f5d54fb4ef
+SIZE (cabal/hspec-expectations-0.8.2.tar.gz) = 5492
diff --git a/devel/hs-hspec/Makefile b/devel/hs-hspec/Makefile
index e59cfd8da701..ceec95ce63f5 100644
--- a/devel/hs-hspec/Makefile
+++ b/devel/hs-hspec/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= hspec
-PORTVERSION= 2.1.10
+PORTVERSION= 2.4.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-hspec/distinfo b/devel/hs-hspec/distinfo
index f5e185fd06c4..4bf6e7e7d4ac 100644
--- a/devel/hs-hspec/distinfo
+++ b/devel/hs-hspec/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/hspec-2.1.10.tar.gz) = f8fad4636ac0c89373c1b82e77fed8702ac84278597107ba9407052b9453a154
-SIZE (cabal/hspec-2.1.10.tar.gz) = 5382
+TIMESTAMP = 1499627845
+SHA256 (cabal/hspec-2.4.4.tar.gz) = b01a3245da9c597608befddc4fc3cae35e5bc753235877076f11ae8e0647cf21
+SIZE (cabal/hspec-2.4.4.tar.gz) = 10634
diff --git a/devel/hs-io-streams-haproxy/Makefile b/devel/hs-io-streams-haproxy/Makefile
new file mode 100644
index 000000000000..cb937d615984
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= io-streams-haproxy
+PORTVERSION= 1.0.0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= HAProxy protocol version 1.5 support for I/O using streams
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec io-streams network
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-io-streams-haproxy/distinfo b/devel/hs-io-streams-haproxy/distinfo
new file mode 100644
index 000000000000..5753d01dfff3
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499716472
+SHA256 (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = c4c0c512443e4da45f1a0023acc4ccee820e25c1088c06346abfb31b9e6e927f
+SIZE (cabal/io-streams-haproxy-1.0.0.1.tar.gz) = 9892
diff --git a/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
new file mode 100644
index 000000000000..bd2556d4f862
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/files/patch-io-streams-haproxy.cabal
@@ -0,0 +1,11 @@
+--- io-streams-haproxy.cabal.orig 2017-07-10 20:00:53 UTC
++++ io-streams-haproxy.cabal
+@@ -38,7 +38,7 @@ library
+ build-depends: base >= 4.5 && < 4.10,
+ attoparsec >= 0.7 && < 0.14,
+ bytestring >= 0.9 && < 0.11,
+- io-streams >= 1.3 && < 1.4,
++ io-streams >= 1.3 && < 1.5,
+ network >= 2.3 && < 2.7,
+ transformers >= 0.3 && < 0.6
+ default-language: Haskell2010
diff --git a/devel/hs-io-streams-haproxy/pkg-descr b/devel/hs-io-streams-haproxy/pkg-descr
new file mode 100644
index 000000000000..bc3a1c898726
--- /dev/null
+++ b/devel/hs-io-streams-haproxy/pkg-descr
@@ -0,0 +1,7 @@
+HAProxy protocol version 1.5 support
+(see http://haproxy.1wt.eu/download/1.5/doc/proxy-protocol.txt) for
+applications using io-streams. The proxy protocol allows information about a
+networked peer (like remote address and port) to be propagated through a
+forwarding proxy that is configured to speak this protocol.
+
+WWW: http://hackage.haskell.org/package/io-streams-haproxy
diff --git a/devel/hs-io-streams/Makefile b/devel/hs-io-streams/Makefile
new file mode 100644
index 000000000000..bb088ca8e65e
--- /dev/null
+++ b/devel/hs-io-streams/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= io-streams
+PORTVERSION= 1.4.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Simple and easy-to-use primitives for I/O using streams
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= attoparsec network primitive text vector zlib-bindings
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-io-streams/distinfo b/devel/hs-io-streams/distinfo
new file mode 100644
index 000000000000..8f375908cf33
--- /dev/null
+++ b/devel/hs-io-streams/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499694762
+SHA256 (cabal/io-streams-1.4.0.0.tar.gz) = 6d393da60cbbbb31ca3cfe6e25beea6a1fd426ed1348723b357c6358f538930e
+SIZE (cabal/io-streams-1.4.0.0.tar.gz) = 62422
diff --git a/devel/hs-io-streams/files/patch-io-streams.cabal b/devel/hs-io-streams/files/patch-io-streams.cabal
new file mode 100644
index 000000000000..41a7921eb24d
--- /dev/null
+++ b/devel/hs-io-streams/files/patch-io-streams.cabal
@@ -0,0 +1,18 @@
+--- io-streams.cabal.orig 2017-07-10 15:08:37 UTC
++++ io-streams.cabal
+@@ -122,7 +122,6 @@ Library
+ Build-depends: base >= 4 && <5,
+ attoparsec >= 0.10 && <0.14,
+ bytestring >= 0.9 && <0.11,
+- bytestring-builder >= 0.10 && <0.11,
+ network >= 2.3 && <2.7,
+ primitive >= 0.2 && <0.7,
+ process >= 1.1 && <1.7,
+@@ -205,7 +204,6 @@ Test-suite testsuite
+ Build-depends: base >= 4 && <5,
+ attoparsec >= 0.10 && <0.14,
+ bytestring >= 0.9 && <0.11,
+- bytestring-builder >= 0.10 && <0.11,
+ deepseq >= 1.2 && <1.5,
+ directory >= 1.1 && <2,
+ filepath >= 1.2 && <2,
diff --git a/devel/hs-io-streams/pkg-descr b/devel/hs-io-streams/pkg-descr
new file mode 100644
index 000000000000..03d9f4a68b2b
--- /dev/null
+++ b/devel/hs-io-streams/pkg-descr
@@ -0,0 +1,4 @@
+The io-streams library contains simple and easy-to-use primitives for I/O using
+streams.
+
+WWW: http://hackage.haskell.org/package/io-streams
diff --git a/devel/hs-js-flot/Makefile b/devel/hs-js-flot/Makefile
index afe5f5cb4837..06e2c83cf22b 100644
--- a/devel/hs-js-flot/Makefile
+++ b/devel/hs-js-flot/Makefile
@@ -2,6 +2,7 @@
PORTNAME= js-flot
PORTVERSION= 0.8.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-js-flot/distinfo b/devel/hs-js-flot/distinfo
index 187227743469..d902e5d7ee79 100644
--- a/devel/hs-js-flot/distinfo
+++ b/devel/hs-js-flot/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627846
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-jquery/Makefile b/devel/hs-js-jquery/Makefile
index 02093d645f42..b1a083f622ae 100644
--- a/devel/hs-js-jquery/Makefile
+++ b/devel/hs-js-jquery/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= js-jquery
-PORTVERSION= 1.11.3
+PORTVERSION= 3.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-js-jquery/distinfo b/devel/hs-js-jquery/distinfo
index acae74b0abc9..ee23890482a0 100644
--- a/devel/hs-js-jquery/distinfo
+++ b/devel/hs-js-jquery/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/js-jquery-1.11.3.tar.gz) = 3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257
-SIZE (cabal/js-jquery-1.11.3.tar.gz) = 120919
+TIMESTAMP = 1499618157
+SHA256 (cabal/js-jquery-3.2.1.tar.gz) = 60503d82d0a601291cf0aa495edecbdb749dcf8982502bf18b9a886979ac1e0f
+SIZE (cabal/js-jquery-3.2.1.tar.gz) = 112319
diff --git a/devel/hs-keys/Makefile b/devel/hs-keys/Makefile
index f221c3257287..74775fcbac8b 100644
--- a/devel/hs-keys/Makefile
+++ b/devel/hs-keys/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= keys
-PORTVERSION= 3.10.2
+PORTVERSION= 3.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-keys/distinfo b/devel/hs-keys/distinfo
index 4cf4edfc81f5..214b50411120 100644
--- a/devel/hs-keys/distinfo
+++ b/devel/hs-keys/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/keys-3.10.2.tar.gz) = 425f1ee508efd371220d2eae4d81be1423797968af2387a2a83b937fb186bef6
-SIZE (cabal/keys-3.10.2.tar.gz) = 8635
+TIMESTAMP = 1499627846
+SHA256 (cabal/keys-3.11.tar.gz) = 0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2
+SIZE (cabal/keys-3.11.tar.gz) = 8674
diff --git a/devel/hs-kqueue/Makefile b/devel/hs-kqueue/Makefile
index fd95a5523483..1ac7c6876fc5 100644
--- a/devel/hs-kqueue/Makefile
+++ b/devel/hs-kqueue/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= kqueue
-PORTVERSION= 0.1.2.6
-PORTREVISION= 2
+PORTVERSION= 0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-kqueue/distinfo b/devel/hs-kqueue/distinfo
index 716fbaf364f4..2655994756cf 100644
--- a/devel/hs-kqueue/distinfo
+++ b/devel/hs-kqueue/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/kqueue-0.1.2.6.tar.gz) = e851243826ecadda865809289d6f6921483ab5fed54f9d12453277dd355445e0
-SIZE (cabal/kqueue-0.1.2.6.tar.gz) = 7398
+TIMESTAMP = 1499627846
+SHA256 (cabal/kqueue-0.2.tar.gz) = 700c6daf8a3f6ff1dbbc7f8ef10f3acb2ffddb4ccc65a68fa533907802f67369
+SIZE (cabal/kqueue-0.2.tar.gz) = 7505
diff --git a/devel/hs-kqueue/files/patch-kqueue.cabal b/devel/hs-kqueue/files/patch-kqueue.cabal
deleted file mode 100644
index a6145d68df98..000000000000
--- a/devel/hs-kqueue/files/patch-kqueue.cabal
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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-kqueue/files/patch-src__System__KQueue.chs b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
index f5a9586bc0dd..294fed64b0b5 100644
--- a/devel/hs-kqueue/files/patch-src__System__KQueue.chs
+++ b/devel/hs-kqueue/files/patch-src__System__KQueue.chs
@@ -1,14 +1,22 @@
---- ./src/System/KQueue.chs.orig 2012-01-03 14:00:32.000000000 +0100
-+++ ./src/System/KQueue.chs 2012-01-27 07:17:17.000000000 +0100
-@@ -21,6 +21,7 @@
+--- src/System/KQueue.chs.orig 2016-05-30 14:31:11 UTC
++++ src/System/KQueue.chs
+@@ -21,6 +21,7 @@ module System.KQueue
#include <sys/time.h>
#include <sys/event.h>
+#include "MachDeps.h"
+ #if __GLASGOW_HASKELL__ <= 708
import Control.Applicative ( (<$>), (<*>) )
- import Control.Exception ( Exception, throwIO )
-@@ -62,11 +63,19 @@
+@@ -57,6 +58,7 @@ import Foreign.C ( CInt )
+ import Foreign.C ( CLong
+ , CTime
+ , CULong
++ , CUInt
+ )
+
+ -- | A kernel event queue.
+@@ -68,11 +70,19 @@ kqueue = KQueue <$> {#call kqueue as kqueue_ #}
-- | A kernel event.
data KEvent = KEvent
@@ -28,13 +36,13 @@
, udata :: Ptr () -- ^ User-defined data, passed through unchanged.
} deriving (Show, Eq)
-@@ -122,8 +131,10 @@
+@@ -128,8 +138,10 @@ enum FFlag
, NoteExit = NOTE_EXIT
, NoteFork = NOTE_FORK
, NoteExec = NOTE_EXEC
+#ifndef __FreeBSD__
, NoteSignal = NOTE_SIGNAL
- , NoteReap = NOTE_REAP
+ // , NoteReap = NOTE_REAP
+#endif
};
#endc
diff --git a/devel/hs-language-c/Makefile b/devel/hs-language-c/Makefile
index 65bc346da2b6..19f3bfef1a93 100644
--- a/devel/hs-language-c/Makefile
+++ b/devel/hs-language-c/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= language-c
-PORTVERSION= 0.5.0
+PORTVERSION= 0.6.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-c/distinfo b/devel/hs-language-c/distinfo
index 0f68692100b0..f3bf44a232b6 100644
--- a/devel/hs-language-c/distinfo
+++ b/devel/hs-language-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486993392
-SHA256 (cabal/language-c-0.5.0.tar.gz) = 86d58bc017a7bba157fc4d5d0ab9e3a3d3f3a2f98bfe46b5b0d5d72a0f5d2222
-SIZE (cabal/language-c-0.5.0.tar.gz) = 170403
+TIMESTAMP = 1499627847
+SHA256 (cabal/language-c-0.6.1.tar.gz) = 23cadc9d04e46490ec57f56b79ecdc2a709ebf57571345905e6e30db29fa37e8
+SIZE (cabal/language-c-0.6.1.tar.gz) = 179625
diff --git a/devel/hs-language-javascript/Makefile b/devel/hs-language-javascript/Makefile
index 0f8a5f55f391..b55dd42617cf 100644
--- a/devel/hs-language-javascript/Makefile
+++ b/devel/hs-language-javascript/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= language-javascript
-PORTVERSION= 0.5.14.2
+PORTVERSION= 0.6.0.10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-language-javascript/distinfo b/devel/hs-language-javascript/distinfo
index c9de3973546f..e6721b6b616d 100644
--- a/devel/hs-language-javascript/distinfo
+++ b/devel/hs-language-javascript/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/language-javascript-0.5.14.2.tar.gz) = 2a86bd58b1821f1522be191c8d77a80e35550d43637a37644cbb15caac37d546
-SIZE (cabal/language-javascript-0.5.14.2.tar.gz) = 48466
+TIMESTAMP = 1499627848
+SHA256 (cabal/language-javascript-0.6.0.10.tar.gz) = caf14c410bf4463fda497af2b9ea750eddff34e55bc1cfc696f2fb4a36983e54
+SIZE (cabal/language-javascript-0.6.0.10.tar.gz) = 101770
diff --git a/devel/hs-largeword/Makefile b/devel/hs-largeword/Makefile
index 19f9cd748134..b5021f8dda6b 100644
--- a/devel/hs-largeword/Makefile
+++ b/devel/hs-largeword/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= largeword
-PORTVERSION= 1.2.3
-PORTREVISION= 2
+PORTVERSION= 1.2.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-largeword/distinfo b/devel/hs-largeword/distinfo
index ef21db6dec00..8e5dd0af5991 100644
--- a/devel/hs-largeword/distinfo
+++ b/devel/hs-largeword/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/largeword-1.2.3.tar.gz) = 960e341af0de950db4e7c47a987bb0789f7759bb27c801ac26e89a28add5acd1
-SIZE (cabal/largeword-1.2.3.tar.gz) = 4278
+TIMESTAMP = 1499627848
+SHA256 (cabal/largeword-1.2.5.tar.gz) = 00b3b06d846649bf404f52a725c88349a38bc8c810e16c99f3100c4e1e9d7d46
+SIZE (cabal/largeword-1.2.5.tar.gz) = 4339
diff --git a/devel/hs-lazysmallcheck/Makefile b/devel/hs-lazysmallcheck/Makefile
index 561edf5c1f8a..9700416849bd 100644
--- a/devel/hs-lazysmallcheck/Makefile
+++ b/devel/hs-lazysmallcheck/Makefile
@@ -2,7 +2,7 @@
PORTNAME= lazysmallcheck
PORTVERSION= 0.6
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lazysmallcheck/distinfo b/devel/hs-lazysmallcheck/distinfo
index 00ccad62bed0..9ae7998acb26 100644
--- a/devel/hs-lazysmallcheck/distinfo
+++ b/devel/hs-lazysmallcheck/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627848
SHA256 (cabal/lazysmallcheck-0.6.tar.gz) = 9dd4dfb590c77e4f6aff68296602de58422eed5e7148fc29190d875a4e7d0f53
SIZE (cabal/lazysmallcheck-0.6.tar.gz) = 16862
diff --git a/devel/hs-lens/Makefile b/devel/hs-lens/Makefile
index 9f8cb01a052e..df6ba4d9c6e8 100644
--- a/devel/hs-lens/Makefile
+++ b/devel/hs-lens/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lens
-PORTVERSION= 4.12.3
+PORTVERSION= 4.15.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -14,7 +14,7 @@ USE_CABAL= base-orphans>=0.3 bifunctors>=5 comonad>=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 \
+ th-abstraction 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
diff --git a/devel/hs-lens/distinfo b/devel/hs-lens/distinfo
index 90b626c43420..448a02506de2 100644
--- a/devel/hs-lens/distinfo
+++ b/devel/hs-lens/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/lens-4.12.3.tar.gz) = 48fa9d46b37ff4f650204f82df7d40f7ae78418badf40d9d3fc7eba479f82821
-SIZE (cabal/lens-4.12.3.tar.gz) = 967851
+TIMESTAMP = 1499627850
+SHA256 (cabal/lens-4.15.3.tar.gz) = a2613bb987792da597b514c979636882931d46c596b37d5fbbcdb63bed30cd7e
+SIZE (cabal/lens-4.15.3.tar.gz) = 985354
diff --git a/devel/hs-lifted-async/Makefile b/devel/hs-lifted-async/Makefile
index a8e0776feb62..426cfcab8f1a 100644
--- a/devel/hs-lifted-async/Makefile
+++ b/devel/hs-lifted-async/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-async
-PORTVERSION= 0.7.0.1
+PORTVERSION= 0.9.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-async/distinfo b/devel/hs-lifted-async/distinfo
index 3e32b11d68d9..539c569e4539 100644
--- a/devel/hs-lifted-async/distinfo
+++ b/devel/hs-lifted-async/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/lifted-async-0.7.0.1.tar.gz) = c3235d0f4a90baba3217269562bee655c6d9c538e2b57b6c5b23da4ef1bb6e6a
-SIZE (cabal/lifted-async-0.7.0.1.tar.gz) = 9060
+TIMESTAMP = 1499608443
+SHA256 (cabal/lifted-async-0.9.3.tar.gz) = 97978307f34c8ab1d765724d723a13fede4112a94fe5fbf3494f00378961b461
+SIZE (cabal/lifted-async-0.9.3.tar.gz) = 10321
diff --git a/devel/hs-lifted-base/Makefile b/devel/hs-lifted-base/Makefile
index d4f9139ae4e2..c50747ca8e50 100644
--- a/devel/hs-lifted-base/Makefile
+++ b/devel/hs-lifted-base/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= lifted-base
-PORTVERSION= 0.2.3.6
+PORTVERSION= 0.2.3.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-lifted-base/distinfo b/devel/hs-lifted-base/distinfo
index a672801dc8af..b8006a1fb228 100644
--- a/devel/hs-lifted-base/distinfo
+++ b/devel/hs-lifted-base/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/lifted-base-0.2.3.6.tar.gz) = 57c5837d83f569bb72136ca89256e50e1ac168ee935804a8e7763e9d8322e1fb
-SIZE (cabal/lifted-base-0.2.3.6.tar.gz) = 11613
+TIMESTAMP = 1499627850
+SHA256 (cabal/lifted-base-0.2.3.11.tar.gz) = 8ec47a9fce7cf5913766a5c53e1b2cf254be733fa9d62e6e2f3f24e538005aab
+SIZE (cabal/lifted-base-0.2.3.11.tar.gz) = 11777
diff --git a/devel/hs-logict/Makefile b/devel/hs-logict/Makefile
index 7cba0369a59f..00338e7ef7ef 100644
--- a/devel/hs-logict/Makefile
+++ b/devel/hs-logict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= logict
PORTVERSION= 0.6.0.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-logict/distinfo b/devel/hs-logict/distinfo
index 9f889cc47ee3..504e7376a8aa 100644
--- a/devel/hs-logict/distinfo
+++ b/devel/hs-logict/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627850
SHA256 (cabal/logict-0.6.0.2.tar.gz) = 1182b68e8d00279460c7fb9b8284bf129805c07754c678b2a8de5a6d768e161e
SIZE (cabal/logict-0.6.0.2.tar.gz) = 5370
diff --git a/devel/hs-map-syntax/Makefile b/devel/hs-map-syntax/Makefile
index 9b5211d495af..c21e9039fd1b 100644
--- a/devel/hs-map-syntax/Makefile
+++ b/devel/hs-map-syntax/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= map-syntax
-PORTVERSION= 0.2
+PORTVERSION= 0.2.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-map-syntax/distinfo b/devel/hs-map-syntax/distinfo
index 43334ad941e2..809123a512af 100644
--- a/devel/hs-map-syntax/distinfo
+++ b/devel/hs-map-syntax/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/map-syntax-0.2.tar.gz) = 395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b
-SIZE (cabal/map-syntax-0.2.tar.gz) = 7129
+TIMESTAMP = 1499627850
+SHA256 (cabal/map-syntax-0.2.0.2.tar.gz) = b18f95a6369a600fda189c6f475606cbf5f5f1827f96ca3384f33ae76bda4d8a
+SIZE (cabal/map-syntax-0.2.0.2.tar.gz) = 6944
diff --git a/devel/hs-memory/Makefile b/devel/hs-memory/Makefile
index 5850cc37ff03..31bc92325254 100644
--- a/devel/hs-memory/Makefile
+++ b/devel/hs-memory/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= memory
-PORTVERSION= 0.8
+PORTVERSION= 0.14.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Memory and related abtraction stuff
LICENSE= BSD3CLAUSE
+USE_CABAL= foundation
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-memory/distinfo b/devel/hs-memory/distinfo
index 970dfe7c1e36..c5cc22911f6d 100644
--- a/devel/hs-memory/distinfo
+++ b/devel/hs-memory/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/memory-0.8.tar.gz) = 7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de
-SIZE (cabal/memory-0.8.tar.gz) = 35030
+TIMESTAMP = 1499444278
+SHA256 (cabal/memory-0.14.6.tar.gz) = c7dec070174756f1753010585a6dcd4f958a4360634142c4e387b3475bffc160
+SIZE (cabal/memory-0.14.6.tar.gz) = 37020
diff --git a/devel/hs-microlens-th/Makefile b/devel/hs-microlens-th/Makefile
new file mode 100644
index 000000000000..968885b2eb5a
--- /dev/null
+++ b/devel/hs-microlens-th/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= microlens-th
+PORTVERSION= 0.4.1.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package lets you automatically generate lenses for data types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= microlens
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-microlens-th/distinfo b/devel/hs-microlens-th/distinfo
new file mode 100644
index 000000000000..80e863a6dc7b
--- /dev/null
+++ b/devel/hs-microlens-th/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499789717
+SHA256 (cabal/microlens-th-0.4.1.1.tar.gz) = 5b1a400db8577805d80fb83963ef2a41cf43023b38300fdeaacb01a4fb526a7b
+SIZE (cabal/microlens-th-0.4.1.1.tar.gz) = 16406
diff --git a/devel/hs-microlens-th/pkg-descr b/devel/hs-microlens-th/pkg-descr
new file mode 100644
index 000000000000..81cdf658e8db
--- /dev/null
+++ b/devel/hs-microlens-th/pkg-descr
@@ -0,0 +1,6 @@
+This package lets you automatically generate lenses for data types; code was
+extracted from the lens package, and therefore generated lenses are fully
+compatible with ones generated by lens (and can be used both from lens and
+microlens).
+
+WWW: https://hackage.haskell.org/package/microlens-th
diff --git a/devel/hs-microlens/Makefile b/devel/hs-microlens/Makefile
new file mode 100644
index 000000000000..18a330e0c73c
--- /dev/null
+++ b/devel/hs-microlens/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= microlens
+PORTVERSION= 0.4.8.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The microlens package
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-microlens/distinfo b/devel/hs-microlens/distinfo
new file mode 100644
index 000000000000..2ab34561f53c
--- /dev/null
+++ b/devel/hs-microlens/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499703416
+SHA256 (cabal/microlens-0.4.8.0.tar.gz) = aa0b12717671593f7e2cd686762fb842b22bf3e5b4559e4db8863f1d30be7af5
+SIZE (cabal/microlens-0.4.8.0.tar.gz) = 24766
diff --git a/devel/hs-microlens/pkg-descr b/devel/hs-microlens/pkg-descr
new file mode 100644
index 000000000000..6ddfff4a974a
--- /dev/null
+++ b/devel/hs-microlens/pkg-descr
@@ -0,0 +1,6 @@
+This library is an extract from lens (with no dependencies). It's not a toy
+lenses library, unsuitable for “real world”, but merely a small one. It is
+compatible with lens, and should have same performance. It also has better
+documentation.
+
+WWW: http://hackage.haskell.org/package/microlens
diff --git a/devel/hs-microstache/Makefile b/devel/hs-microstache/Makefile
new file mode 100644
index 000000000000..524f3325a6f9
--- /dev/null
+++ b/devel/hs-microstache/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= microstache
+PORTVERSION= 1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Mustache templates for Haskell
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson parsec semigroups text unordered-containers vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-microstache/distinfo b/devel/hs-microstache/distinfo
new file mode 100644
index 000000000000..a5f70a866a65
--- /dev/null
+++ b/devel/hs-microstache/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499618263
+SHA256 (cabal/microstache-1.tar.gz) = e8875bfeac9e54e84d7c91f1f448ee80ec07b9b3db28d5369131fbaa20517164
+SIZE (cabal/microstache-1.tar.gz) = 19859
diff --git a/devel/hs-microstache/pkg-descr b/devel/hs-microstache/pkg-descr
new file mode 100644
index 000000000000..adc327c8c432
--- /dev/null
+++ b/devel/hs-microstache/pkg-descr
@@ -0,0 +1,6 @@
+Mustache templates for Haskell.
+
+Based on stache library, which uses megaparsec.
+This library uses parsec, thus the name: microstache.
+
+WWW: https://hackage.haskell.org/package/microstache
diff --git a/devel/hs-mmap/Makefile b/devel/hs-mmap/Makefile
index d7cbc667befb..05080c6b5889 100644
--- a/devel/hs-mmap/Makefile
+++ b/devel/hs-mmap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mmap
PORTVERSION= 0.5.9
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mmap/distinfo b/devel/hs-mmap/distinfo
index 9569fa6a7e81..dfd3bf24ed4a 100644
--- a/devel/hs-mmap/distinfo
+++ b/devel/hs-mmap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627850
SHA256 (cabal/mmap-0.5.9.tar.gz) = 58fcbb04e1cb8e7c36c05823b02dce2faaa989c53d745a7f36192de2fc98b5f8
SIZE (cabal/mmap-0.5.9.tar.gz) = 11731
diff --git a/devel/hs-mmorph/Makefile b/devel/hs-mmorph/Makefile
index 1cc5678b0db2..7c258f7710d9 100644
--- a/devel/hs-mmorph/Makefile
+++ b/devel/hs-mmorph/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mmorph
-PORTVERSION= 1.0.4
+PORTVERSION= 1.1.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Monad morphisms
LICENSE= BSD3CLAUSE
+USE_CABAL= mtl transformers-compat
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-mmorph/distinfo b/devel/hs-mmorph/distinfo
index 0e1846b93999..116cbf814370 100644
--- a/devel/hs-mmorph/distinfo
+++ b/devel/hs-mmorph/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mmorph-1.0.4.tar.gz) = 22e3665b4c86bf28cb4e836da91f586294d74d1cf1c18db364dcf568eba7bf4c
-SIZE (cabal/mmorph-1.0.4.tar.gz) = 6100
+TIMESTAMP = 1499444382
+SHA256 (cabal/mmorph-1.1.0.tar.gz) = c1bcb45560753203f5ce3952f3c8a100b7d5b37c91746372c1da4988c4db74de
+SIZE (cabal/mmorph-1.1.0.tar.gz) = 6663
diff --git a/devel/hs-monad-control/Makefile b/devel/hs-monad-control/Makefile
index 6c99ba9d3bfe..e0ab1e01b378 100644
--- a/devel/hs-monad-control/Makefile
+++ b/devel/hs-monad-control/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-control
-PORTVERSION= 1.0.0.4
+PORTVERSION= 1.0.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-control/distinfo b/devel/hs-monad-control/distinfo
index 6f5a9de683f9..846604e0bfcc 100644
--- a/devel/hs-monad-control/distinfo
+++ b/devel/hs-monad-control/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monad-control-1.0.0.4.tar.gz) = e984b7346af6d31b7ce918e1a0263075af8cbcf5440bc3df698d0354c90df61e
-SIZE (cabal/monad-control-1.0.0.4.tar.gz) = 10709
+TIMESTAMP = 1499444311
+SHA256 (cabal/monad-control-1.0.2.1.tar.gz) = cc4ecb2db714499c0fa518321cfbbf22f98ed03c199d47eee0dea3e0430358c2
+SIZE (cabal/monad-control-1.0.2.1.tar.gz) = 12406
diff --git a/devel/hs-monad-logger/Makefile b/devel/hs-monad-logger/Makefile
index 6400fc960308..661d23d7fe05 100644
--- a/devel/hs-monad-logger/Makefile
+++ b/devel/hs-monad-logger/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-logger
-PORTVERSION= 0.3.13.2
+PORTVERSION= 0.3.24
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-logger/distinfo b/devel/hs-monad-logger/distinfo
index c6f87b261e5f..382f3b033835 100644
--- a/devel/hs-monad-logger/distinfo
+++ b/devel/hs-monad-logger/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monad-logger-0.3.13.2.tar.gz) = c1383c4d32e1f276e3437db39418d5a4c3c3670c25c416b4f6c3fe5ad4b5e2b2
-SIZE (cabal/monad-logger-0.3.13.2.tar.gz) = 7402
+TIMESTAMP = 1499595500
+SHA256 (cabal/monad-logger-0.3.24.tar.gz) = 05e579193068769d641cbf6bf6475682497897e64640b3936f6eda66cb36e8e4
+SIZE (cabal/monad-logger-0.3.24.tar.gz) = 9525
diff --git a/devel/hs-monad-loops/Makefile b/devel/hs-monad-loops/Makefile
index b78cafd88801..d90e7736bda7 100644
--- a/devel/hs-monad-loops/Makefile
+++ b/devel/hs-monad-loops/Makefile
@@ -2,6 +2,7 @@
PORTNAME= monad-loops
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-loops/distinfo b/devel/hs-monad-loops/distinfo
index 49ee6342abfb..199ddd4e6f70 100644
--- a/devel/hs-monad-loops/distinfo
+++ b/devel/hs-monad-loops/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627851
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 bd3a91d3f201..951c2876e39d 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par-extras/distinfo b/devel/hs-monad-par-extras/distinfo
index 09e69d5ca341..5959b71d4e95 100644
--- a/devel/hs-monad-par-extras/distinfo
+++ b/devel/hs-monad-par-extras/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627851
SHA256 (cabal/monad-par-extras-0.3.3.tar.gz) = e21e33190bc248afa4ae467287ac37d24037ef3de6050c44fd85b52f4d5b842e
SIZE (cabal/monad-par-extras-0.3.3.tar.gz) = 9146
diff --git a/devel/hs-monad-par/Makefile b/devel/hs-monad-par/Makefile
index 13f3ff3f39ae..5c0cfd7fbb69 100644
--- a/devel/hs-monad-par/Makefile
+++ b/devel/hs-monad-par/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= monad-par
-PORTVERSION= 0.3.4.7
+PORTVERSION= 0.3.4.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monad-par/distinfo b/devel/hs-monad-par/distinfo
index c437a95a4c6a..cdf663ef60b3 100644
--- a/devel/hs-monad-par/distinfo
+++ b/devel/hs-monad-par/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monad-par-0.3.4.7.tar.gz) = 23b8a68719b4c5848ce9a3381ce9efdc1c96677ba043a3ee74d99223343cc28a
-SIZE (cabal/monad-par-0.3.4.7.tar.gz) = 30411
+TIMESTAMP = 1499627851
+SHA256 (cabal/monad-par-0.3.4.8.tar.gz) = f84cdf51908a1c41c3f672be9520a8fdc028ea39d90a25ecfe5a3b223cfeb951
+SIZE (cabal/monad-par-0.3.4.8.tar.gz) = 30583
diff --git a/devel/hs-monad-unlift/Makefile b/devel/hs-monad-unlift/Makefile
new file mode 100644
index 000000000000..53b205cb4f95
--- /dev/null
+++ b/devel/hs-monad-unlift/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= monad-unlift
+PORTVERSION= 0.2.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The monad-unlift package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= constraints monad-control transformers-base
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-monad-unlift/distinfo b/devel/hs-monad-unlift/distinfo
new file mode 100644
index 000000000000..a1d226785c63
--- /dev/null
+++ b/devel/hs-monad-unlift/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499718296
+SHA256 (cabal/monad-unlift-0.2.0.tar.gz) = 4b5e638619e4821918b4ec67aeffb581ab9df23d168fbb72164137009a15ee0f
+SIZE (cabal/monad-unlift-0.2.0.tar.gz) = 5845
diff --git a/devel/hs-monad-unlift/pkg-descr b/devel/hs-monad-unlift/pkg-descr
new file mode 100644
index 000000000000..2e779d1e4ee5
--- /dev/null
+++ b/devel/hs-monad-unlift/pkg-descr
@@ -0,0 +1,3 @@
+The monad-unlift package
+
+WWW: http://hackage.haskell.org/package/monad-unlift
diff --git a/devel/hs-monadplus/Makefile b/devel/hs-monadplus/Makefile
new file mode 100644
index 000000000000..bd9be57ee2df
--- /dev/null
+++ b/devel/hs-monadplus/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME= monadplus
+PORTVERSION= 1.4.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Haskell98 partial maps and filters over MonadPlus
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-monadplus/distinfo b/devel/hs-monadplus/distinfo
new file mode 100644
index 000000000000..0adffef4e7f5
--- /dev/null
+++ b/devel/hs-monadplus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1500997085
+SHA256 (cabal/monadplus-1.4.2.tar.gz) = 366ed520db1eaf2ec56d8508fee2804cc24c7a6016de4b75b9addec681186595
+SIZE (cabal/monadplus-1.4.2.tar.gz) = 3671
diff --git a/devel/hs-monadplus/pkg-descr b/devel/hs-monadplus/pkg-descr
new file mode 100644
index 000000000000..6e70945c31ab
--- /dev/null
+++ b/devel/hs-monadplus/pkg-descr
@@ -0,0 +1,5 @@
+Filtering and folding over arbitrary MonadPlus instances. This package
+generalizes many common stream operations such as filter, catMaybes etc.
+
+WWW: http://hackage.haskell.org/package/monadplus
+
diff --git a/devel/hs-monads-tf/Makefile b/devel/hs-monads-tf/Makefile
index 1f45127f5043..ab2b69182b7a 100644
--- a/devel/hs-monads-tf/Makefile
+++ b/devel/hs-monads-tf/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= monads-tf
-PORTVERSION= 0.1.0.2
-PORTREVISION= 2
+PORTVERSION= 0.1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-monads-tf/distinfo b/devel/hs-monads-tf/distinfo
index 300f91bf0a28..9f208fe21c19 100644
--- a/devel/hs-monads-tf/distinfo
+++ b/devel/hs-monads-tf/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/monads-tf-0.1.0.2.tar.gz) = cb6f495443f526b00b3d06535aa29e393473244acd410cba1b898eeaa8f8077c
-SIZE (cabal/monads-tf-0.1.0.2.tar.gz) = 14206
+TIMESTAMP = 1499444793
+SHA256 (cabal/monads-tf-0.1.0.3.tar.gz) = 249dd2aa55c4dd6530f1e49f6b052ec91bc590ecfef2bd24c58837a3f8d4b0f1
+SIZE (cabal/monads-tf-0.1.0.3.tar.gz) = 14159
diff --git a/devel/hs-mono-traversable-instances/Makefile b/devel/hs-mono-traversable-instances/Makefile
new file mode 100644
index 000000000000..634d226b6f19
--- /dev/null
+++ b/devel/hs-mono-traversable-instances/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME= mono-traversable-instances
+PORTVERSION= 0.1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The mono-traversable-instances package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= comonad dlist dlist-instances mono-traversable semigroupoids \
+ semigroups vector-instances
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-mono-traversable-instances/distinfo b/devel/hs-mono-traversable-instances/distinfo
new file mode 100644
index 000000000000..bfe390d30f52
--- /dev/null
+++ b/devel/hs-mono-traversable-instances/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720948
+SHA256 (cabal/mono-traversable-instances-0.1.0.0.tar.gz) = b5ff2b8bcebe31ffcc652a8dd3adde6aa7cd7f27a1cf6d058d4c658b370c087e
+SIZE (cabal/mono-traversable-instances-0.1.0.0.tar.gz) = 2520
diff --git a/devel/hs-mono-traversable-instances/pkg-descr b/devel/hs-mono-traversable-instances/pkg-descr
new file mode 100644
index 000000000000..8a5e4bdf415e
--- /dev/null
+++ b/devel/hs-mono-traversable-instances/pkg-descr
@@ -0,0 +1,3 @@
+The mono-traversable-instances package
+
+WWW: http://hackage.haskell.org/package/mono-traversable-instances
diff --git a/devel/hs-mono-traversable/Makefile b/devel/hs-mono-traversable/Makefile
index fbc0fd98ac52..6b4a66756189 100644
--- a/devel/hs-mono-traversable/Makefile
+++ b/devel/hs-mono-traversable/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mono-traversable
-PORTVERSION= 0.9.2.1
+PORTVERSION= 1.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +10,7 @@ COMMENT= Type classes for mapping, folding, and traversing monomorphic container
LICENSE= MIT
USE_CABAL= comonad>=3.0.3 dlist>=0.6 dlist-instances>=0.1 hashable \
- semigroupoids>=3.0 semigroups>=0.10 text>=0.11 \
+ semigroupoids>=3.0 semigroups>=0.10 split 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 d8a1f0bd5c37..43c929c4eac3 100644
--- a/devel/hs-mono-traversable/distinfo
+++ b/devel/hs-mono-traversable/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mono-traversable-0.9.2.1.tar.gz) = 34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef
-SIZE (cabal/mono-traversable-0.9.2.1.tar.gz) = 36866
+TIMESTAMP = 1499627851
+SHA256 (cabal/mono-traversable-1.0.2.tar.gz) = aa110a1f08b726f2e0d17858e09bd76e13d60ccf2bf5366c92c15999da0b3633
+SIZE (cabal/mono-traversable-1.0.2.tar.gz) = 38239
diff --git a/devel/hs-mtl/Makefile b/devel/hs-mtl/Makefile
index def4bfd35a9f..e6bb3517e3fb 100644
--- a/devel/hs-mtl/Makefile
+++ b/devel/hs-mtl/Makefile
@@ -2,6 +2,7 @@
PORTNAME= mtl
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mtl/distinfo b/devel/hs-mtl/distinfo
index 92566c3d8201..860e02872e20 100644
--- a/devel/hs-mtl/distinfo
+++ b/devel/hs-mtl/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627852
SHA256 (cabal/mtl-2.2.1.tar.gz) = cae59d79f3a16f8e9f3c9adc1010c7c6cdddc73e8a97ff4305f6439d855c8dc5
SIZE (cabal/mtl-2.2.1.tar.gz) = 15391
diff --git a/devel/hs-mtl/files/patch-git_5949840 b/devel/hs-mtl/files/patch-git_5949840
new file mode 100644
index 000000000000..ebc02d418f0f
--- /dev/null
+++ b/devel/hs-mtl/files/patch-git_5949840
@@ -0,0 +1,22 @@
+From 59498406a6338d93891dec3abcbdde2cb7e41325 Mon Sep 17 00:00:00 2001
+From: Oleg Grenrus <oleg.grenrus@iki.fi>
+Date: Wed, 23 Dec 2015 16:41:29 +0200
+Subject: [PATCH] Support transformers-0.5
+
+---
+ mtl.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mtl.cabal b/mtl.cabal
+index aaa5187..7702edd 100644
+--- mtl.cabal
++++ mtl.cabal
+@@ -54,7 +54,7 @@ Library
+ Control.Monad.Writer.Class
+ Control.Monad.Writer.Lazy
+ Control.Monad.Writer.Strict
+- build-depends: base < 6, transformers == 0.4.*
++ build-depends: base < 6, transformers >= 0.4 && <0.6
+ extensions:
+ MultiParamTypeClasses
+ FunctionalDependencies
diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 3c393935661f..fcbadff2ba41 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mueval
-PORTVERSION= 0.9.1.1.2
+PORTVERSION= 0.9.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index 652c106d6171..a2949b18a81b 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mueval-0.9.1.1.2.tar.gz) = e04c3b754695cc8f71c072c6398b8a567c112c69d48355b5bca9bfbb1c050ac1
-SIZE (cabal/mueval-0.9.1.1.2.tar.gz) = 15746
+TIMESTAMP = 1499627852
+SHA256 (cabal/mueval-0.9.3.tar.gz) = f72a8bbaffecaeb55b67d78011e182073be8ba9f4a90824903e4c78cfe6e1ef7
+SIZE (cabal/mueval-0.9.3.tar.gz) = 16085
diff --git a/devel/hs-murmur-hash/Makefile b/devel/hs-murmur-hash/Makefile
index 2d6bac570fc1..6c391e2e0806 100644
--- a/devel/hs-murmur-hash/Makefile
+++ b/devel/hs-murmur-hash/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= murmur-hash
-PORTVERSION= 0.1.0.8
+PORTVERSION= 0.1.0.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-murmur-hash/distinfo b/devel/hs-murmur-hash/distinfo
index 62562b5dff3d..87e21ea5f99c 100644
--- a/devel/hs-murmur-hash/distinfo
+++ b/devel/hs-murmur-hash/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/murmur-hash-0.1.0.8.tar.gz) = 6cb9f4dc4a7d5b35e843bb8767d2e2c9745bcfbdacb5daf4fce5f4e05f983a06
-SIZE (cabal/murmur-hash-0.1.0.8.tar.gz) = 4072
+TIMESTAMP = 1499450881
+SHA256 (cabal/murmur-hash-0.1.0.9.tar.gz) = 89b9db94ead4cc0784dbcfb47c51b5664c1718860db00cd8ada3ef6fdd4465ad
+SIZE (cabal/murmur-hash-0.1.0.9.tar.gz) = 4204
diff --git a/devel/hs-mutable-containers/Makefile b/devel/hs-mutable-containers/Makefile
index 32a465b32ebf..54c3753d7d42 100644
--- a/devel/hs-mutable-containers/Makefile
+++ b/devel/hs-mutable-containers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= mutable-containers
-PORTVERSION= 0.3.2
+PORTVERSION= 0.3.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-mutable-containers/distinfo b/devel/hs-mutable-containers/distinfo
index aaa27aac7bae..25af84a7a894 100644
--- a/devel/hs-mutable-containers/distinfo
+++ b/devel/hs-mutable-containers/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/mutable-containers-0.3.2.tar.gz) = 781388cf52faa5f9c4c8a825eef11bec430e323c6913d25b5f4e63d8ce02017e
-SIZE (cabal/mutable-containers-0.3.2.tar.gz) = 11969
+TIMESTAMP = 1499627853
+SHA256 (cabal/mutable-containers-0.3.3.tar.gz) = 7a7a39cbb16978dd1607a3977d7a1e5d8ecda7a528845d6983b5b97c49517ceb
+SIZE (cabal/mutable-containers-0.3.3.tar.gz) = 12062
diff --git a/devel/hs-ncurses/Makefile b/devel/hs-ncurses/Makefile
index e0f3b4171f33..181b6f814f13 100644
--- a/devel/hs-ncurses/Makefile
+++ b/devel/hs-ncurses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ncurses
PORTVERSION= 0.2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,7 +11,8 @@ COMMENT= Modernised Haskell binding to GNU ncurses
LICENSE= GPLv3
-USE_CABAL= c2hs>=0.15
+USE_C2HS= yes
+USE_CABAL= text
USES= ncurses
diff --git a/devel/hs-newtype-generics/Makefile b/devel/hs-newtype-generics/Makefile
new file mode 100644
index 000000000000..b9784d0334af
--- /dev/null
+++ b/devel/hs-newtype-generics/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= newtype-generics
+PORTVERSION= 0.5
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Full replacement for the original newtype package
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-newtype-generics/distinfo b/devel/hs-newtype-generics/distinfo
new file mode 100644
index 000000000000..377a45c1a4b3
--- /dev/null
+++ b/devel/hs-newtype-generics/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499700022
+SHA256 (cabal/newtype-generics-0.5.tar.gz) = dc63ac2c9e682ee292a8f88fa3eb1af1b66d5860f7dcec0d09319c5ef96e7f9c
+SIZE (cabal/newtype-generics-0.5.tar.gz) = 4490
diff --git a/devel/hs-newtype-generics/pkg-descr b/devel/hs-newtype-generics/pkg-descr
new file mode 100644
index 000000000000..780c9c4ae3c0
--- /dev/null
+++ b/devel/hs-newtype-generics/pkg-descr
@@ -0,0 +1,7 @@
+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. Generics support was added in version 0.4, making this package a
+full replacement for the original newtype package, and a better alternative to
+newtype-th.
+
+WWW: http://hackage.haskell.org/package/newtype-genericse
diff --git a/devel/hs-newtype/Makefile b/devel/hs-newtype/Makefile
index a914fee795da..4fd2e9d75642 100644
--- a/devel/hs-newtype/Makefile
+++ b/devel/hs-newtype/Makefile
@@ -2,6 +2,7 @@
PORTNAME= newtype
PORTVERSION= 0.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-newtype/distinfo b/devel/hs-newtype/distinfo
index 4e4d18370e6b..afd7e6783178 100644
--- a/devel/hs-newtype/distinfo
+++ b/devel/hs-newtype/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627853
SHA256 (cabal/newtype-0.2.tar.gz) = b714033abd9a8b0903bcef0d36d0913de2a5003c852f43f97fa688717289e459
SIZE (cabal/newtype-0.2.tar.gz) = 3476
diff --git a/devel/hs-old-locale/Makefile b/devel/hs-old-locale/Makefile
index 5f8ee8fc53ea..b4aa9990fcb7 100644
--- a/devel/hs-old-locale/Makefile
+++ b/devel/hs-old-locale/Makefile
@@ -2,6 +2,7 @@
PORTNAME= old-locale
PORTVERSION= 1.0.0.7
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-locale/distinfo b/devel/hs-old-locale/distinfo
index 538cc2730c3f..bbe9a7186f2a 100644
--- a/devel/hs-old-locale/distinfo
+++ b/devel/hs-old-locale/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627853
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/files/patch-git_15fea2d b/devel/hs-old-locale/files/patch-git_15fea2d
new file mode 100644
index 000000000000..89a56aedd192
--- /dev/null
+++ b/devel/hs-old-locale/files/patch-git_15fea2d
@@ -0,0 +1,21 @@
+From 68cdafe1580fbf448f293ad4efb5ba6313107d0e Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott@gmail.com>
+Date: Tue, 4 Apr 2017 10:26:44 -0400
+Subject: [PATCH 1/2] Allow building with base-4.10.0.0
+
+---
+ old-locale.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/old-locale.cabal b/old-locale.cabal
+index 37057a8..52aa83a 100644
+--- old-locale.cabal
++++ old-locale.cabal
+@@ -31,5 +31,5 @@ Library
+ exposed-modules:
+ System.Locale
+
+- build-depends: base >= 4.2 && < 4.9
++ build-depends: base >= 4.2 && < 4.11
+ ghc-options: -Wall
+
diff --git a/devel/hs-old-time/Makefile b/devel/hs-old-time/Makefile
index 4fa6296b8522..99000c434671 100644
--- a/devel/hs-old-time/Makefile
+++ b/devel/hs-old-time/Makefile
@@ -2,6 +2,7 @@
PORTNAME= old-time
PORTVERSION= 1.1.0.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-old-time/distinfo b/devel/hs-old-time/distinfo
index 87139101e088..7e047ac6ce9c 100644
--- a/devel/hs-old-time/distinfo
+++ b/devel/hs-old-time/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627853
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/files/patch-git_82790af b/devel/hs-old-time/files/patch-git_82790af
new file mode 100644
index 000000000000..d2f1d70132f1
--- /dev/null
+++ b/devel/hs-old-time/files/patch-git_82790af
@@ -0,0 +1,23 @@
+From 320f806511c2819c7ae338a5e75a74fc4c3411b7 Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott@gmail.com>
+Date: Tue, 4 Apr 2017 10:29:41 -0400
+Subject: [PATCH 1/2] Allow building with base-4.10.0.0
+
+---
+ old-time.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/old-time.cabal b/old-time.cabal
+index d322965..3a0e85c 100644
+--- old-time.cabal
++++ old-time.cabal
+@@ -53,7 +53,7 @@ Library
+ HsTime.h
+
+ build-depends:
+- base >= 4.7 && < 4.9,
++ base >= 4.7 && < 4.11,
+ old-locale == 1.0.*
+
+ ghc-options: -Wall
+
diff --git a/devel/hs-optparse-applicative/Makefile b/devel/hs-optparse-applicative/Makefile
index 5359e2f18a03..cb3810a0263d 100644
--- a/devel/hs-optparse-applicative/Makefile
+++ b/devel/hs-optparse-applicative/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= optparse-applicative
-PORTVERSION= 0.11.0.2
+PORTVERSION= 0.14.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-optparse-applicative/distinfo b/devel/hs-optparse-applicative/distinfo
index a00ea9d3a1f5..cba28fc18757 100644
--- a/devel/hs-optparse-applicative/distinfo
+++ b/devel/hs-optparse-applicative/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/optparse-applicative-0.11.0.2.tar.gz) = 31c6923c01cfd6dce0cf83f3430c17d164169f0db6ff2de9b3b294926214255a
-SIZE (cabal/optparse-applicative-0.11.0.2.tar.gz) = 30425
+TIMESTAMP = 1499447048
+SHA256 (cabal/optparse-applicative-0.14.0.0.tar.gz) = b55b32fdd5d101b2d6edb2746a66648fc2cd1b850d7adea185f201ac71b83c1a
+SIZE (cabal/optparse-applicative-0.14.0.0.tar.gz) = 53120
diff --git a/devel/hs-parallel/Makefile b/devel/hs-parallel/Makefile
index 0efe30d5ca24..df37fc262ac5 100644
--- a/devel/hs-parallel/Makefile
+++ b/devel/hs-parallel/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= parallel
-PORTVERSION= 3.2.0.6
+PORTVERSION= 3.2.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-parallel/distinfo b/devel/hs-parallel/distinfo
index cce1d45d6166..5c4be6485683 100644
--- a/devel/hs-parallel/distinfo
+++ b/devel/hs-parallel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/parallel-3.2.0.6.tar.gz) = b928d3fbd0b7b247bfb7072796c6950f3a5b61ec051449cddf86ebfe89dbe642
-SIZE (cabal/parallel-3.2.0.6.tar.gz) = 12990
+TIMESTAMP = 1499444913
+SHA256 (cabal/parallel-3.2.1.1.tar.gz) = 323bb9bc9e36fb9bfb08e68a772411302b1599bfffbc6de20fa3437ce1473c17
+SIZE (cabal/parallel-3.2.1.1.tar.gz) = 13367
diff --git a/devel/hs-pcre-light/Makefile b/devel/hs-pcre-light/Makefile
index 5bcbdb735e50..f3f79fb6b118 100644
--- a/devel/hs-pcre-light/Makefile
+++ b/devel/hs-pcre-light/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pcre-light
-PORTVERSION= 0.4.0.3
+PORTVERSION= 0.4.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,6 +9,7 @@ COMMENT= Small, efficient, and portable regex library for Perl 5 compatible
LICENSE= BSD3CLAUSE
+USES= pkgconfig
LIB_DEPENDS= libpcre.so:devel/pcre
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
diff --git a/devel/hs-pcre-light/distinfo b/devel/hs-pcre-light/distinfo
index a670ce2345b1..979b58547205 100644
--- a/devel/hs-pcre-light/distinfo
+++ b/devel/hs-pcre-light/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/pcre-light-0.4.0.3.tar.gz) = 6e6309fe0f759fe685c8c58a14dd204f7691675b15adbd88208ee332b5702d50
-SIZE (cabal/pcre-light-0.4.0.3.tar.gz) = 16574
+TIMESTAMP = 1499627854
+SHA256 (cabal/pcre-light-0.4.0.4.tar.gz) = 02c97e39263d18fd26aa63d52c88c4bfbb5c3f66ab40564552e7f11d5d889e75
+SIZE (cabal/pcre-light-0.4.0.4.tar.gz) = 15065
diff --git a/devel/hs-prelude-extras/Makefile b/devel/hs-prelude-extras/Makefile
index b93e89fead23..4ae5a2c8a2c9 100644
--- a/devel/hs-prelude-extras/Makefile
+++ b/devel/hs-prelude-extras/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= prelude-extras
-PORTVERSION= 0.4
-PORTREVISION= 2
+PORTVERSION= 0.4.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-prelude-extras/distinfo b/devel/hs-prelude-extras/distinfo
index cb1337f371fc..8f485d698d45 100644
--- a/devel/hs-prelude-extras/distinfo
+++ b/devel/hs-prelude-extras/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/prelude-extras-0.4.tar.gz) = 56c9963dc814429451ca66539765c377e932bc5413a637e251aa2af66f62fa57
-SIZE (cabal/prelude-extras-0.4.tar.gz) = 4958
+TIMESTAMP = 1499627854
+SHA256 (cabal/prelude-extras-0.4.0.3.tar.gz) = 09bb087f0870a353ec1e7e1a08017b9a766d430d956afb88ca000a6a876bf877
+SIZE (cabal/prelude-extras-0.4.0.3.tar.gz) = 8141
diff --git a/devel/hs-preprocessor-tools/Makefile b/devel/hs-preprocessor-tools/Makefile
index a158db528b4c..883c31dcf276 100644
--- a/devel/hs-preprocessor-tools/Makefile
+++ b/devel/hs-preprocessor-tools/Makefile
@@ -2,6 +2,7 @@
PORTNAME= preprocessor-tools
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-preprocessor-tools/distinfo b/devel/hs-preprocessor-tools/distinfo
index 3a00f578b089..4c431d9d228c 100644
--- a/devel/hs-preprocessor-tools/distinfo
+++ b/devel/hs-preprocessor-tools/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
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-prettyclass/Makefile b/devel/hs-prettyclass/Makefile
index 48c4e2de3ad4..db2ddc337da5 100644
--- a/devel/hs-prettyclass/Makefile
+++ b/devel/hs-prettyclass/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prettyclass
PORTVERSION= 1.0.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-prettyclass/distinfo b/devel/hs-prettyclass/distinfo
index 39e26b6ddb96..dea617a4d328 100644
--- a/devel/hs-prettyclass/distinfo
+++ b/devel/hs-prettyclass/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/prettyclass-1.0.0.0.tar.gz) = e537446e7a346e5e0872ed8281db2bb0220c737f10757848c901da1399548986
SIZE (cabal/prettyclass-1.0.0.0.tar.gz) = 1542
diff --git a/devel/hs-primitive/Makefile b/devel/hs-primitive/Makefile
index c3674d03a4b6..a7edc0af71ed 100644
--- a/devel/hs-primitive/Makefile
+++ b/devel/hs-primitive/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= primitive
-PORTVERSION= 0.6
+PORTVERSION= 0.6.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-primitive/distinfo b/devel/hs-primitive/distinfo
index 91392bdabf9c..5b1160e13356 100644
--- a/devel/hs-primitive/distinfo
+++ b/devel/hs-primitive/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/primitive-0.6.tar.gz) = 34a5f39213c68369e7edc2a3ea175d3f4edbf89e9f0777784710eff6f2d69722
-SIZE (cabal/primitive-0.6.tar.gz) = 12677
+TIMESTAMP = 1499444407
+SHA256 (cabal/primitive-0.6.2.0.tar.gz) = b8e8d70213e22b3fab0e0d11525c02627489618988fdc636052ca0adce282ae1
+SIZE (cabal/primitive-0.6.2.0.tar.gz) = 23954
diff --git a/devel/hs-process-extras/Makefile b/devel/hs-process-extras/Makefile
new file mode 100644
index 000000000000..f1e14a35cb9a
--- /dev/null
+++ b/devel/hs-process-extras/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= process-extras
+PORTVERSION= 0.7.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Read process input and output as ByteStrings or Text
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= data-default generic-deriving ListLike mtl text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-process-extras/distinfo b/devel/hs-process-extras/distinfo
new file mode 100644
index 000000000000..0cd81481a508
--- /dev/null
+++ b/devel/hs-process-extras/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499719583
+SHA256 (cabal/process-extras-0.7.2.tar.gz) = e76c1031ec696dcd25b05f1b00611585a40050aa30548394d084a72267a8e958
+SIZE (cabal/process-extras-0.7.2.tar.gz) = 14267
diff --git a/devel/hs-process-extras/pkg-descr b/devel/hs-process-extras/pkg-descr
new file mode 100644
index 000000000000..0c353cc81be2
--- /dev/null
+++ b/devel/hs-process-extras/pkg-descr
@@ -0,0 +1,7 @@
+Extends http://hackage.haskell.org/package/process. Read process input and
+output as ByteStrings or Text, or write your own ProcessOutput instance. Lazy
+process input and output. ProcessMaker class for more flexibility in the
+process creation API.
+
+WWW: http://hackage.haskell.org/package/process-extras
+
diff --git a/devel/hs-profunctors/Makefile b/devel/hs-profunctors/Makefile
index 671a6c857d26..7c841d19b093 100644
--- a/devel/hs-profunctors/Makefile
+++ b/devel/hs-profunctors/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= profunctors
-PORTVERSION= 5.1.1
+PORTVERSION= 5.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,8 @@ COMMENT= Profunctors
LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=4 distributive>=0.4.4 tagged>=0.4.4
+USE_CABAL= base-orphans bifunctors comonad contravariant \
+ distributive tagged
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-profunctors/distinfo b/devel/hs-profunctors/distinfo
index 136ffac32930..f23b78305725 100644
--- a/devel/hs-profunctors/distinfo
+++ b/devel/hs-profunctors/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/profunctors-5.1.1.tar.gz) = 873f4478cdadd574c070c00fa790e4b0d8fb6f00577f142bf6e9dacbd48d8253
-SIZE (cabal/profunctors-5.1.1.tar.gz) = 17866
+TIMESTAMP = 1499595371
+SHA256 (cabal/profunctors-5.2.tar.gz) = 87a7e25c4745ea8ff479dd1212ec2e57710abb3d3dd30f948fa16be1d3ee05a4
+SIZE (cabal/profunctors-5.2.tar.gz) = 23236
diff --git a/devel/hs-profunctors/files/patch-git_c0574c b/devel/hs-profunctors/files/patch-git_c0574c
new file mode 100644
index 000000000000..af645f89acb5
--- /dev/null
+++ b/devel/hs-profunctors/files/patch-git_c0574c
@@ -0,0 +1,22 @@
+From c0574c91a459083066d656bec39e67dfa02daf06 Mon Sep 17 00:00:00 2001
+From: Ryan Scott <ryan.gl.scott@gmail.com>
+Date: Mon, 10 Apr 2017 09:41:23 -0400
+Subject: [PATCH] Bump base-orphans upper version bounds
+
+---
+ profunctors.cabal | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/profunctors.cabal b/profunctors.cabal
+index 1233e734..8f94e27c 100644
+--- profunctors.cabal
++++ profunctors.cabal
+@@ -30,7 +30,7 @@ source-repository head
+ library
+ build-depends:
+ base >= 4 && < 5,
+- base-orphans >= 0.4 && < 0.6,
++ base-orphans >= 0.4 && < 0.7,
+ bifunctors >= 5.2 && < 6,
+ comonad >= 4 && < 6,
+ contravariant >= 1 && < 2,
diff --git a/devel/hs-project-template/Makefile b/devel/hs-project-template/Makefile
index 71e0917a97d1..925323f1802e 100644
--- a/devel/hs-project-template/Makefile
+++ b/devel/hs-project-template/Makefile
@@ -2,6 +2,7 @@
PORTNAME= project-template
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-project-template/distinfo b/devel/hs-project-template/distinfo
index 24f8fe521f7d..66526b2a741d 100644
--- a/devel/hs-project-template/distinfo
+++ b/devel/hs-project-template/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
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-psqueues/Makefile b/devel/hs-psqueues/Makefile
new file mode 100644
index 000000000000..96030e716417
--- /dev/null
+++ b/devel/hs-psqueues/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= psqueues
+PORTVERSION= 0.2.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Provides Priority Search Queues
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-psqueues/distinfo b/devel/hs-psqueues/distinfo
new file mode 100644
index 000000000000..804de738bb55
--- /dev/null
+++ b/devel/hs-psqueues/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499689628
+SHA256 (cabal/psqueues-0.2.3.0.tar.gz) = 25ed95de5de62831d3e1db47aabd0b589ddf71aeec2d53bc3104a9bb663743a7
+SIZE (cabal/psqueues-0.2.3.0.tar.gz) = 26646
diff --git a/devel/hs-psqueues/pkg-descr b/devel/hs-psqueues/pkg-descr
new file mode 100644
index 000000000000..f912ac17c9f3
--- /dev/null
+++ b/devel/hs-psqueues/pkg-descr
@@ -0,0 +1,21 @@
+The psqueues package provides Priority Search Queues in three different flavors.
+
+ * OrdPSQ k p v, which uses the Ord k instance to provide fast insertion,
+ deletion and lookup. This implementation is based on Ralf Hinze's A Simple
+ Implementation Technique for Priority Search Queues. Hence, it is similar to
+ the PSQueue library, although it is considerably faster and provides a
+ slightly different API.
+
+ * IntPSQ p v is a far more efficient implementation. It fixes the key type to
+ Int and uses a radix tree (like IntMap) with an additional min-heap property.
+
+ * HashPSQ k p v is a fairly straightforward extension of IntPSQ: it simply
+ uses the keys' hashes as indices in the IntPSQ. If there are any hash
+ collisions, it uses an OrdPSQ to resolve those. The performance of this
+ implementation is comparable to that of IntPSQ, but it is more widely
+ applicable since the keys are not restricted to Int, but rather to any
+ Hashable datatype.
+
+Each of the three implementations provides the same API, so they can be used interchangeably. The benchmarks show how they perform relative to one another, and also compared to the other Priority Search Queue implementations on Hackage: PSQueue and fingertree-psqueue.
+
+WWW: https://hackage.haskell.org/package/psqueues
diff --git a/devel/hs-quickcheck-io/Makefile b/devel/hs-quickcheck-io/Makefile
index 4ecbbef1f681..c9a3a5f67909 100644
--- a/devel/hs-quickcheck-io/Makefile
+++ b/devel/hs-quickcheck-io/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= quickcheck-io
-PORTVERSION= 0.1.1
-PORTREVISION= 2
+PORTVERSION= 0.2.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-quickcheck-io/distinfo b/devel/hs-quickcheck-io/distinfo
index 0b718d1a65cf..2f777529c916 100644
--- a/devel/hs-quickcheck-io/distinfo
+++ b/devel/hs-quickcheck-io/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/quickcheck-io-0.1.1.tar.gz) = a23a6e011aafd211c2521ddb9f61ffb5d256837148b5f5c35a152bdb37d6039b
-SIZE (cabal/quickcheck-io-0.1.1.tar.gz) = 1646
+TIMESTAMP = 1499547635
+SHA256 (cabal/quickcheck-io-0.2.0.tar.gz) = fb779119d79fe08ff4d502fb6869a70c9a8d5fd8ae0959f605c3c937efd96422
+SIZE (cabal/quickcheck-io-0.2.0.tar.gz) = 1843
diff --git a/devel/hs-random/Makefile b/devel/hs-random/Makefile
index c0322ce466ed..accdf3b5a03e 100644
--- a/devel/hs-random/Makefile
+++ b/devel/hs-random/Makefile
@@ -2,6 +2,7 @@
PORTNAME= random
PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-random/distinfo b/devel/hs-random/distinfo
index aac052b8e65a..137eabe39137 100644
--- a/devel/hs-random/distinfo
+++ b/devel/hs-random/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
SIZE (cabal/random-1.1.tar.gz) = 10870
diff --git a/devel/hs-readable/Makefile b/devel/hs-readable/Makefile
new file mode 100644
index 000000000000..80181c0289e3
--- /dev/null
+++ b/devel/hs-readable/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= readable
+PORTVERSION= 0.3.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Reading data types from ByteString and Text
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-readable/distinfo b/devel/hs-readable/distinfo
new file mode 100644
index 000000000000..a51972be0809
--- /dev/null
+++ b/devel/hs-readable/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499694963
+SHA256 (cabal/readable-0.3.1.tar.gz) = 703037ad2cca4d6d42ba23e2758d1911cd82e3e922c4078076c273231e4b43c9
+SIZE (cabal/readable-0.3.1.tar.gz) = 2907
diff --git a/devel/hs-readable/pkg-descr b/devel/hs-readable/pkg-descr
new file mode 100644
index 000000000000..6d6c5f319795
--- /dev/null
+++ b/devel/hs-readable/pkg-descr
@@ -0,0 +1,4 @@
+Provides a Readable type class for reading data types from ByteString and Text.
+ Also includes efficient implementations for common data types.
+
+WWW: http://hackage.haskell.org/package/readable
diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index 85386bc776e9..3fc0b6d722c8 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -3,7 +3,7 @@
PORTNAME= readline
PORTVERSION= 1.0.3.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-readline/distinfo b/devel/hs-readline/distinfo
index a19af54e3f3f..7918210073d8 100644
--- a/devel/hs-readline/distinfo
+++ b/devel/hs-readline/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627854
SHA256 (cabal/readline-1.0.3.0.tar.gz) = c0b9e174910620db0edea8f9fd6fb6c1d7b066260d523e9a7208294c46a75feb
SIZE (cabal/readline-1.0.3.0.tar.gz) = 52261
diff --git a/devel/hs-refact/Makefile b/devel/hs-refact/Makefile
new file mode 100644
index 000000000000..d6ff92d47c3b
--- /dev/null
+++ b/devel/hs-refact/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= refact
+PORTVERSION= 0.3.0.2
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This library provides a datatype which can be interpreted by apply-refact
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-refact/distinfo b/devel/hs-refact/distinfo
new file mode 100644
index 000000000000..6255d49b5ad3
--- /dev/null
+++ b/devel/hs-refact/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499787634
+SHA256 (cabal/refact-0.3.0.2.tar.gz) = 0ad029727797c8ca5d179c7abf1bfc135d86a7d72cf93785ee12ad243aeb1f6c
+SIZE (cabal/refact-0.3.0.2.tar.gz) = 2345
diff --git a/devel/hs-refact/pkg-descr b/devel/hs-refact/pkg-descr
new file mode 100644
index 000000000000..4d6c78ce7b4a
--- /dev/null
+++ b/devel/hs-refact/pkg-descr
@@ -0,0 +1,5 @@
+This library provides a datatype which can be interpreted by apply-refact.
+It exists as a seperate library so that applications can specify refactorings
+without depending on GHC
+
+WWW: https://hackage.haskell.org/package/refact
diff --git a/devel/hs-reflection/Makefile b/devel/hs-reflection/Makefile
index b607c9ce2809..9fd729453cc6 100644
--- a/devel/hs-reflection/Makefile
+++ b/devel/hs-reflection/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= reflection
-PORTVERSION= 2
+PORTVERSION= 2.1.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-reflection/distinfo b/devel/hs-reflection/distinfo
index e025aa7d2b3f..cec6f7cf28da 100644
--- a/devel/hs-reflection/distinfo
+++ b/devel/hs-reflection/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/reflection-2.tar.gz) = ee199e899e3810c3c8fd27dbda5cc3d1730f69e4a75f7494482863cf4d9499c2
-SIZE (cabal/reflection-2.tar.gz) = 13194
+TIMESTAMP = 1499627855
+SHA256 (cabal/reflection-2.1.2.tar.gz) = a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39
+SIZE (cabal/reflection-2.1.2.tar.gz) = 14334
diff --git a/devel/hs-resource-pool/Makefile b/devel/hs-resource-pool/Makefile
index 2e8542297453..e4064e8919d9 100644
--- a/devel/hs-resource-pool/Makefile
+++ b/devel/hs-resource-pool/Makefile
@@ -2,6 +2,7 @@
PORTNAME= resource-pool
PORTVERSION= 0.2.3.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-resource-pool/distinfo b/devel/hs-resource-pool/distinfo
index 6f889e525a4d..8fd19b0bd466 100644
--- a/devel/hs-resource-pool/distinfo
+++ b/devel/hs-resource-pool/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627855
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 aa6659e0d60e..df16fa3a3d47 100644
--- a/devel/hs-resourcet/Makefile
+++ b/devel/hs-resourcet/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= resourcet
-PORTVERSION= 1.1.6
+PORTVERSION= 1.1.9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ 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 transformers-compat>=0.3
+USE_CABAL= exceptions lifted-base mmorph monad-control mtl \
+ transformers-base transformers-compat
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-resourcet/distinfo b/devel/hs-resourcet/distinfo
index 12e5783cf1a0..f56286edbe44 100644
--- a/devel/hs-resourcet/distinfo
+++ b/devel/hs-resourcet/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/resourcet-1.1.6.tar.gz) = 3e10ea62fd97334a5fd6aa3410e6cf50d46b914aa1c028b7393e234b94521a7e
-SIZE (cabal/resourcet-1.1.6.tar.gz) = 11627
+TIMESTAMP = 1499458469
+SHA256 (cabal/resourcet-1.1.9.tar.gz) = 5a1999d26b896603cab8121b77f36723dc50960291872b691ff4a9533e162ef5
+SIZE (cabal/resourcet-1.1.9.tar.gz) = 15215
diff --git a/devel/hs-safe-exceptions/Makefile b/devel/hs-safe-exceptions/Makefile
new file mode 100644
index 000000000000..5eddfdd566cd
--- /dev/null
+++ b/devel/hs-safe-exceptions/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= safe-exceptions
+PORTVERSION= 0.1.6.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The safe-exceptions package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= exceptions
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-safe-exceptions/distinfo b/devel/hs-safe-exceptions/distinfo
new file mode 100644
index 000000000000..651ca5d1f089
--- /dev/null
+++ b/devel/hs-safe-exceptions/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499717912
+SHA256 (cabal/safe-exceptions-0.1.6.0.tar.gz) = 71d47ce1049465b02d89231f2931e7a1d22b6960e85fca5281162e979cf08d1c
+SIZE (cabal/safe-exceptions-0.1.6.0.tar.gz) = 13447
diff --git a/devel/hs-safe-exceptions/pkg-descr b/devel/hs-safe-exceptions/pkg-descr
new file mode 100644
index 000000000000..759dc66d60ac
--- /dev/null
+++ b/devel/hs-safe-exceptions/pkg-descr
@@ -0,0 +1,3 @@
+The safe-exceptions package
+
+WWW: http://hackage.haskell.org/package/safe-exceptions
diff --git a/devel/hs-safe/Makefile b/devel/hs-safe/Makefile
index d7cceeee09a9..2a782f0a5a81 100644
--- a/devel/hs-safe/Makefile
+++ b/devel/hs-safe/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= safe
-PORTVERSION= 0.3.9
+PORTVERSION= 0.3.15
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-safe/distinfo b/devel/hs-safe/distinfo
index 1fa4b9d98302..8122ac9d35b4 100644
--- a/devel/hs-safe/distinfo
+++ b/devel/hs-safe/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/safe-0.3.9.tar.gz) = d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9
-SIZE (cabal/safe-0.3.9.tar.gz) = 6931
+TIMESTAMP = 1499627855
+SHA256 (cabal/safe-0.3.15.tar.gz) = a35e4ae609aabd568da7e7d220ab529c34040b71ae50df1ee353896445a66a2d
+SIZE (cabal/safe-0.3.15.tar.gz) = 9988
diff --git a/devel/hs-say/Makefile b/devel/hs-say/Makefile
new file mode 100644
index 000000000000..0478c112bcf1
--- /dev/null
+++ b/devel/hs-say/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= say
+PORTVERSION= 0.1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The say packagae
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-say/distinfo b/devel/hs-say/distinfo
new file mode 100644
index 000000000000..16c53626cb61
--- /dev/null
+++ b/devel/hs-say/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499718718
+SHA256 (cabal/say-0.1.0.0.tar.gz) = f26fdb94ed81a2ae503beca0dcea74da7ee37408ba2e41ab3fdcaa9a7622fc40
+SIZE (cabal/say-0.1.0.0.tar.gz) = 5728
diff --git a/devel/hs-say/pkg-descr b/devel/hs-say/pkg-descr
new file mode 100644
index 000000000000..e2fb582fb645
--- /dev/null
+++ b/devel/hs-say/pkg-descr
@@ -0,0 +1,3 @@
+The say package
+
+WWW: http://hackage.haskell.org/package/say
diff --git a/devel/hs-scientific/Makefile b/devel/hs-scientific/Makefile
index 6f48878a10f2..73f2d8f979cd 100644
--- a/devel/hs-scientific/Makefile
+++ b/devel/hs-scientific/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= scientific
-PORTVERSION= 0.3.3.8
+PORTVERSION= 0.3.5.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Numbers represented using scientific notation
LICENSE= BSD3CLAUSE
-USE_CABAL= hashable>=1.1.2 text>=0.8
+USE_CABAL= hashable>=1.1.2 text>=0.8 integer-logarithms vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-scientific/distinfo b/devel/hs-scientific/distinfo
index f91c9de62e16..c36c330750e5 100644
--- a/devel/hs-scientific/distinfo
+++ b/devel/hs-scientific/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/scientific-0.3.3.8.tar.gz) = e30cde2a44a7beded15afd56606c562b76e457835e7de2942815f22bc74bce4c
-SIZE (cabal/scientific-0.3.3.8.tar.gz) = 18543
+TIMESTAMP = 1499627855
+SHA256 (cabal/scientific-0.3.5.1.tar.gz) = 5ba6e682cbb6cd5c6444d1c6c35f3b396e316637a14456b18de58c9a33661ba6
+SIZE (cabal/scientific-0.3.5.1.tar.gz) = 20777
diff --git a/devel/hs-securemem/Makefile b/devel/hs-securemem/Makefile
index b1a5d520fcf5..6e4ef44e4956 100644
--- a/devel/hs-securemem/Makefile
+++ b/devel/hs-securemem/Makefile
@@ -2,6 +2,7 @@
PORTNAME= securemem
PORTVERSION= 0.1.9
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-securemem/distinfo b/devel/hs-securemem/distinfo
index ab0b798d33e4..2cfe81816758 100644
--- a/devel/hs-securemem/distinfo
+++ b/devel/hs-securemem/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
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 97cf3c68515a..01a263d88fb2 100644
--- a/devel/hs-setenv/Makefile
+++ b/devel/hs-setenv/Makefile
@@ -2,6 +2,7 @@
PORTNAME= setenv
PORTVERSION= 0.1.1.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setenv/distinfo b/devel/hs-setenv/distinfo
index dded823e77af..710827f5c44b 100644
--- a/devel/hs-setenv/distinfo
+++ b/devel/hs-setenv/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
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-setlocale/Makefile b/devel/hs-setlocale/Makefile
index bcffdff6ef98..cb52ddbc01fc 100644
--- a/devel/hs-setlocale/Makefile
+++ b/devel/hs-setlocale/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= setlocale
-PORTVERSION= 1.0.0.4
+PORTVERSION= 1.0.0.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-setlocale/distinfo b/devel/hs-setlocale/distinfo
index 249df5c37886..7faa69e6456a 100644
--- a/devel/hs-setlocale/distinfo
+++ b/devel/hs-setlocale/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1475870204
-SHA256 (cabal/setlocale-1.0.0.4.tar.gz) = 32396aedcb8fdd6c56821dcde25c2cbd76462b13a6dc229bec29cb78df1fa7e9
-SIZE (cabal/setlocale-1.0.0.4.tar.gz) = 2138
+TIMESTAMP = 1499627856
+SHA256 (cabal/setlocale-1.0.0.5.tar.gz) = 57438491475004eda12d7a73eea0ab1c5fb28774027626e5bbcb142fe57d9ff0
+SIZE (cabal/setlocale-1.0.0.5.tar.gz) = 2108
diff --git a/devel/hs-shake/Makefile b/devel/hs-shake/Makefile
index af2c6d8239c4..3d416c62ecb7 100644
--- a/devel/hs-shake/Makefile
+++ b/devel/hs-shake/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= shake
-PORTVERSION= 0.15.5
+PORTVERSION= 0.15.11
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-shake/distinfo b/devel/hs-shake/distinfo
index 66d22f9b1f30..b7f44b6f0a76 100644
--- a/devel/hs-shake/distinfo
+++ b/devel/hs-shake/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/shake-0.15.5.tar.gz) = 2c806824c9e8a619f364c3ec6bb910d7b1d0b0d3ba39ab472bffb60311f373a3
-SIZE (cabal/shake-0.15.5.tar.gz) = 507883
+TIMESTAMP = 1499544643
+SHA256 (cabal/shake-0.15.11.tar.gz) = 05520d833ce9563977aa57d777a644b2a2322366a9f54c1004d83967e826b1bb
+SIZE (cabal/shake-0.15.11.tar.gz) = 513926
diff --git a/devel/hs-show/Makefile b/devel/hs-show/Makefile
index aec1d07304f4..070f1e4132cb 100644
--- a/devel/hs-show/Makefile
+++ b/devel/hs-show/Makefile
@@ -3,7 +3,7 @@
PORTNAME= show
PORTVERSION= 0.6
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-show/distinfo b/devel/hs-show/distinfo
index 56a76cb12b4f..b531c43675a1 100644
--- a/devel/hs-show/distinfo
+++ b/devel/hs-show/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/show-0.6.tar.gz) = 4f57a947a538d021406f649049dde27d4d8d0b44aac3ba38fa64806c9d737b95
SIZE (cabal/show-0.6.tar.gz) = 7635
diff --git a/devel/hs-silently/Makefile b/devel/hs-silently/Makefile
index 3306d814d82f..f322b082ce2a 100644
--- a/devel/hs-silently/Makefile
+++ b/devel/hs-silently/Makefile
@@ -2,6 +2,7 @@
PORTNAME= silently
PORTVERSION= 1.2.5
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-silently/distinfo b/devel/hs-silently/distinfo
index c9b6aed74b4c..420a250088cb 100644
--- a/devel/hs-silently/distinfo
+++ b/devel/hs-silently/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/silently-1.2.5.tar.gz) = cef625635053a46032ca53b43d311921875a437910b6568ded17027fdca83839
SIZE (cabal/silently-1.2.5.tar.gz) = 3364
diff --git a/devel/hs-simple-reflect/Makefile b/devel/hs-simple-reflect/Makefile
index 48ba1ad017ff..f86c586cfeaa 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-simple-reflect/distinfo b/devel/hs-simple-reflect/distinfo
index f8fcfcbeb906..5e7ecbf9a708 100644
--- a/devel/hs-simple-reflect/distinfo
+++ b/devel/hs-simple-reflect/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/simple-reflect-0.3.2.tar.gz) = 38224eb3d0d5eafc7101ad48fa92001c3e753a015d53bb12753a3836b871ecb6
SIZE (cabal/simple-reflect-0.3.2.tar.gz) = 4492
diff --git a/devel/hs-smallcheck/Makefile b/devel/hs-smallcheck/Makefile
index c3aec7b9c76e..5af58b0c0d50 100644
--- a/devel/hs-smallcheck/Makefile
+++ b/devel/hs-smallcheck/Makefile
@@ -3,7 +3,7 @@
PORTNAME= smallcheck
PORTVERSION= 1.1.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-smallcheck/distinfo b/devel/hs-smallcheck/distinfo
index 1d9ad5cb7b2c..b3e772e79269 100644
--- a/devel/hs-smallcheck/distinfo
+++ b/devel/hs-smallcheck/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
SHA256 (cabal/smallcheck-1.1.1.tar.gz) = 4d17607c1a620491e7e495a17575b73952932c761e7f9bdfa87e0102fb52f9f9
SIZE (cabal/smallcheck-1.1.1.tar.gz) = 15202
diff --git a/devel/hs-split/Makefile b/devel/hs-split/Makefile
index e3ba2116e009..83c3bf798482 100644
--- a/devel/hs-split/Makefile
+++ b/devel/hs-split/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= split
-PORTVERSION= 0.2.2
-PORTREVISION= 7
+PORTVERSION= 0.2.3.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-split/distinfo b/devel/hs-split/distinfo
index c58d4bbf48ef..305823326e7d 100644
--- a/devel/hs-split/distinfo
+++ b/devel/hs-split/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/split-0.2.2.tar.gz) = f9cf9e571357f227aed5be9a78f5bbf78ef55c99df2edf7fdc659acc1f904375
-SIZE (cabal/split-0.2.2.tar.gz) = 14666
+TIMESTAMP = 1499447103
+SHA256 (cabal/split-0.2.3.2.tar.gz) = 4943eaad0dd473d44b4b97b8b9731c20f05ba86abb8a1fa07f8df819f09eb63a
+SIZE (cabal/split-0.2.3.2.tar.gz) = 15779
diff --git a/devel/hs-split/files/patch-split.cabal b/devel/hs-split/files/patch-split.cabal
deleted file mode 100644
index be8fe222fdd5..000000000000
--- a/devel/hs-split/files/patch-split.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 6be17fe14f18..b07d13b484ad 100644
--- a/devel/hs-stm-chans/Makefile
+++ b/devel/hs-stm-chans/Makefile
@@ -2,6 +2,7 @@
PORTNAME= stm-chans
PORTVERSION= 3.0.0.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm-chans/distinfo b/devel/hs-stm-chans/distinfo
index e0fa2ef77f8c..a8ea94309239 100644
--- a/devel/hs-stm-chans/distinfo
+++ b/devel/hs-stm-chans/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627856
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 e026222609f2..22cde311a15c 100644
--- a/devel/hs-stm/Makefile
+++ b/devel/hs-stm/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= stm
-PORTVERSION= 2.4.4
+PORTVERSION= 2.4.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-stm/distinfo b/devel/hs-stm/distinfo
index 314276a4b6bb..02ce74b1dacf 100644
--- a/devel/hs-stm/distinfo
+++ b/devel/hs-stm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/stm-2.4.4.tar.gz) = 5dfb588a01b46f427b16a92d6b7843ac81489639bbdfd962e5795c19dbfe883d
-SIZE (cabal/stm-2.4.4.tar.gz) = 10349
+TIMESTAMP = 1498678463
+SHA256 (cabal/stm-2.4.4.1.tar.gz) = 8f999095ed8d50d2056fc6e185035ee8166c50751e1af8de02ac38d382bf3384
+SIZE (cabal/stm-2.4.4.1.tar.gz) = 10367
diff --git a/devel/hs-streaming-commons/Makefile b/devel/hs-streaming-commons/Makefile
index e7c7f805a95f..99b29947f4a7 100644
--- a/devel/hs-streaming-commons/Makefile
+++ b/devel/hs-streaming-commons/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= streaming-commons
-PORTVERSION= 0.1.12.1
+PORTVERSION= 0.1.18
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Common lower-level functions needed by various streaming data libraries
LICENSE= MIT
-USE_CABAL= blaze-builder>=0.3 network random stm text zlib
+USE_CABAL= async blaze-builder network random stm text zlib
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-streaming-commons/distinfo b/devel/hs-streaming-commons/distinfo
index 53346afce3b7..d2427bab995d 100644
--- a/devel/hs-streaming-commons/distinfo
+++ b/devel/hs-streaming-commons/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/streaming-commons-0.1.12.1.tar.gz) = d5bd8dd0b11a13d1d128d15dce31b3f2f4625c7f72d4420e749d85bf170a4fd7
-SIZE (cabal/streaming-commons-0.1.12.1.tar.gz) = 86864
+TIMESTAMP = 1499627857
+SHA256 (cabal/streaming-commons-0.1.18.tar.gz) = 27af2efb901a003c83fc6c71563eb70f45b4823516c299759d800a48d9f083cb
+SIZE (cabal/streaming-commons-0.1.18.tar.gz) = 87832
diff --git a/devel/hs-strict/Makefile b/devel/hs-strict/Makefile
index 0a03a25d57e0..4d965caf7955 100644
--- a/devel/hs-strict/Makefile
+++ b/devel/hs-strict/Makefile
@@ -2,7 +2,7 @@
PORTNAME= strict
PORTVERSION= 0.3.2
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-strict/distinfo b/devel/hs-strict/distinfo
index e089fb25d600..37a716c9d25e 100644
--- a/devel/hs-strict/distinfo
+++ b/devel/hs-strict/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627857
SHA256 (cabal/strict-0.3.2.tar.gz) = 2cd35a67938db635a87617d9576d5df0158b581e8e5694f07487c0f4b1549221
SIZE (cabal/strict-0.3.2.tar.gz) = 3948
diff --git a/devel/hs-syb-with-class-instances-text/Makefile b/devel/hs-syb-with-class-instances-text/Makefile
deleted file mode 100644
index 404b77639c41..000000000000
--- a/devel/hs-syb-with-class-instances-text/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= syb-with-class-instances-text
-PORTVERSION= 0.0.1
-PORTREVISION= 12
-CATEGORIES= devel haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Scrap Your Boilerplate With Class Text instance
-
-LICENSE= BSD3CLAUSE
-
-USE_CABAL= syb-with-class text>=0.7.1
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/devel/hs-syb-with-class-instances-text/distinfo b/devel/hs-syb-with-class-instances-text/distinfo
deleted file mode 100644
index 18d876d50d9e..000000000000
--- a/devel/hs-syb-with-class-instances-text/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/syb-with-class-instances-text-0.0.1.tar.gz) = 0e0aa90c02cbe76380274830be51e04cb3cc13d5ea5761ba5540779bd0c4d76e
-SIZE (cabal/syb-with-class-instances-text-0.0.1.tar.gz) = 1838
diff --git a/devel/hs-syb-with-class-instances-text/pkg-descr b/devel/hs-syb-with-class-instances-text/pkg-descr
deleted file mode 100644
index 1f2b7d81c006..000000000000
--- a/devel/hs-syb-with-class-instances-text/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Provides SYB-with-class instances for Text from the text package.
-
-WWW: http://hackage.haskell.org/package/syb-with-class-instances-text
diff --git a/devel/hs-syb-with-class/Makefile b/devel/hs-syb-with-class/Makefile
index 7189fde12787..f6ecddc074f3 100644
--- a/devel/hs-syb-with-class/Makefile
+++ b/devel/hs-syb-with-class/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= syb-with-class
-PORTVERSION= 0.6.1.6
+PORTVERSION= 0.6.1.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb-with-class/distinfo b/devel/hs-syb-with-class/distinfo
index 41462786f910..19544d142ad6 100644
--- a/devel/hs-syb-with-class/distinfo
+++ b/devel/hs-syb-with-class/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/syb-with-class-0.6.1.6.tar.gz) = 565c909dcf39c30c7fa2b5721e5d1049dbc9cdcd23e63645f69d8e245e84c1b0
-SIZE (cabal/syb-with-class-0.6.1.6.tar.gz) = 12515
+TIMESTAMP = 1499448315
+SHA256 (cabal/syb-with-class-0.6.1.7.tar.gz) = 5c521870d8c533dabb0483015592897e1bc2356dacd19ad7f279e41b69e66abb
+SIZE (cabal/syb-with-class-0.6.1.7.tar.gz) = 12524
diff --git a/devel/hs-syb/Makefile b/devel/hs-syb/Makefile
index fbe3ba5857ac..bb8b8da5b79c 100644
--- a/devel/hs-syb/Makefile
+++ b/devel/hs-syb/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= syb
-PORTVERSION= 0.5.1
+PORTVERSION= 0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-syb/distinfo b/devel/hs-syb/distinfo
index fa8be9c884bd..d1aea72d6031 100644
--- a/devel/hs-syb/distinfo
+++ b/devel/hs-syb/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/syb-0.5.1.tar.gz) = 81b05f0e78d03e1cabe9610a6045a5ae74d88eaed7e79464d436ccaa6af93846
-SIZE (cabal/syb-0.5.1.tar.gz) = 39469
+TIMESTAMP = 1499627857
+SHA256 (cabal/syb-0.7.tar.gz) = b8757dce5ab4045c49a0ae90407d575b87ee5523a7dd5dfa5c9d54fcceff42b5
+SIZE (cabal/syb-0.7.tar.gz) = 39566
diff --git a/devel/hs-system-fileio/Makefile b/devel/hs-system-fileio/Makefile
index c94909f154d8..a6e46b1af235 100644
--- a/devel/hs-system-fileio/Makefile
+++ b/devel/hs-system-fileio/Makefile
@@ -2,6 +2,7 @@
PORTNAME= system-fileio
PORTVERSION= 0.3.16.3
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-fileio/distinfo b/devel/hs-system-fileio/distinfo
index 88c5f333f024..c3db8cf034b5 100644
--- a/devel/hs-system-fileio/distinfo
+++ b/devel/hs-system-fileio/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627858
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 4ac83df0132a..8db67de2659e 100644
--- a/devel/hs-system-filepath/Makefile
+++ b/devel/hs-system-filepath/Makefile
@@ -2,6 +2,7 @@
PORTNAME= system-filepath
PORTVERSION= 0.4.13.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-system-filepath/distinfo b/devel/hs-system-filepath/distinfo
index 10b75e63b874..50074e72a946 100644
--- a/devel/hs-system-filepath/distinfo
+++ b/devel/hs-system-filepath/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627858
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-tagged/Makefile b/devel/hs-tagged/Makefile
index 38be9aefa824..a02893d86140 100644
--- a/devel/hs-tagged/Makefile
+++ b/devel/hs-tagged/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= tagged
-PORTVERSION= 0.8.1
+PORTVERSION= 0.8.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Haskell 98 phantom types to avoid unsafely passing dummy arguments
LICENSE= BSD3CLAUSE
+USE_CABAL= transformers-compat
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-tagged/distinfo b/devel/hs-tagged/distinfo
index 14ddc6e32d00..4bd7820e0cc1 100644
--- a/devel/hs-tagged/distinfo
+++ b/devel/hs-tagged/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/tagged-0.8.1.tar.gz) = 5bdd98389fcca3aa9c9902d1fb209fd431685ba6530f3051ebe1960fe1c782c1
-SIZE (cabal/tagged-0.8.1.tar.gz) = 8088
+TIMESTAMP = 1499459567
+SHA256 (cabal/tagged-0.8.5.tar.gz) = e47c51c955ed77b0fa36897f652df990aa0a8c4eb278efaddcd604be00fc8d99
+SIZE (cabal/tagged-0.8.5.tar.gz) = 10860
diff --git a/devel/hs-tagged/files/patch-tagged.cabal b/devel/hs-tagged/files/patch-tagged.cabal
new file mode 100644
index 000000000000..ed0eb7c3ac4d
--- /dev/null
+++ b/devel/hs-tagged/files/patch-tagged.cabal
@@ -0,0 +1,11 @@
+--- tagged.cabal.orig 2017-07-07 20:47:45 UTC
++++ tagged.cabal
+@@ -57,7 +57,7 @@ library
+
+ if impl(ghc>=7.6)
+ exposed-modules: Data.Proxy.TH
+- build-depends: template-haskell >= 2.8 && < 2.12
++ build-depends: template-haskell >= 2.8 && < 2.13
+
+ if flag(deepseq)
+ build-depends: deepseq >= 1.1 && < 1.5
diff --git a/devel/hs-temporary/Makefile b/devel/hs-temporary/Makefile
index eb5fd35bb738..1f350c016be7 100644
--- a/devel/hs-temporary/Makefile
+++ b/devel/hs-temporary/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= temporary
-PORTVERSION= 1.2.0.3
-PORTREVISION= 2
+PORTVERSION= 1.2.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-temporary/distinfo b/devel/hs-temporary/distinfo
index c7bacf28cc1a..882bbe77d180 100644
--- a/devel/hs-temporary/distinfo
+++ b/devel/hs-temporary/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/temporary-1.2.0.3.tar.gz) = 8a889c7e62a2bb144eb9e394fab51e5dbd843d473ac2eab9e16b55a9eb3a4647
-SIZE (cabal/temporary-1.2.0.3.tar.gz) = 5308
+TIMESTAMP = 1499627858
+SHA256 (cabal/temporary-1.2.1.tar.gz) = 9ecf88065cf69e965dc672c4a94f0b5e909d3e398c24d947bbd5e9814277a4f8
+SIZE (cabal/temporary-1.2.1.tar.gz) = 5137
diff --git a/devel/hs-terminal-size/Makefile b/devel/hs-terminal-size/Makefile
new file mode 100644
index 000000000000..1c271b2b524a
--- /dev/null
+++ b/devel/hs-terminal-size/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= terminal-size
+PORTVERSION= 0.3.2.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Get terminal window height and width
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-terminal-size/distinfo b/devel/hs-terminal-size/distinfo
new file mode 100644
index 000000000000..edfa59a47b5d
--- /dev/null
+++ b/devel/hs-terminal-size/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1501333052
+SHA256 (cabal/terminal-size-0.3.2.1.tar.gz) = b5c23e964756bc13914649a67d63233f59ad0a813abe7cadeb2fc9d586dc9658
+SIZE (cabal/terminal-size-0.3.2.1.tar.gz) = 4175
diff --git a/devel/hs-terminal-size/pkg-descr b/devel/hs-terminal-size/pkg-descr
new file mode 100644
index 000000000000..140e20dd7ca2
--- /dev/null
+++ b/devel/hs-terminal-size/pkg-descr
@@ -0,0 +1,3 @@
+Get terminal window height and width without ncurses dependency.
+
+WWW: http://hackage.haskell.org/package/terminal-size
diff --git a/devel/hs-test-framework-hunit/Makefile b/devel/hs-test-framework-hunit/Makefile
index 28ee9401c112..c6ed7562c63f 100644
--- a/devel/hs-test-framework-hunit/Makefile
+++ b/devel/hs-test-framework-hunit/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= test-framework-hunit
-PORTVERSION= 0.3.0.1
-PORTREVISION= 2
+PORTVERSION= 0.3.0.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,7 +9,7 @@ COMMENT= HUnit support for the test-framework package
LICENSE= BSD3CLAUSE
-USE_CABAL= extensible-exceptions>=0.1.1 HUnit>=1.2 test-framework>=0.2.0
+USE_CABAL= extensible-exceptions HUnit test-framework
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-test-framework-hunit/distinfo b/devel/hs-test-framework-hunit/distinfo
index 001155ebfd03..7f16fa1b6e75 100644
--- a/devel/hs-test-framework-hunit/distinfo
+++ b/devel/hs-test-framework-hunit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/test-framework-hunit-0.3.0.1.tar.gz) = d3f9fd8e5e7251fa2f4727feb1397d80d9e979a4b086ee962dc239e3662910c0
-SIZE (cabal/test-framework-hunit-0.3.0.1.tar.gz) = 2690
+TIMESTAMP = 1499627859
+SHA256 (cabal/test-framework-hunit-0.3.0.2.tar.gz) = 95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8
+SIZE (cabal/test-framework-hunit-0.3.0.2.tar.gz) = 2770
diff --git a/devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal b/devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal
new file mode 100644
index 000000000000..0479ad483dfb
--- /dev/null
+++ b/devel/hs-test-framework-hunit/files/patch-test-framework-hunit.cabal
@@ -0,0 +1,16 @@
+From 70a36fbeefd29c9340782d52ba0295014120c82d Mon Sep 17 00:00:00 2001
+From: Adam Bergmark <adam@bergmark.nl>
+Date: Sat, 25 Mar 2017 11:52:44 +0100
+Subject: [PATCH] Allow time 1.6.* and HUnit 1.6.*
+
+--- test-framework-hunit.cabal.orig 2015-09-04 15:42:16 UTC
++++ test-framework-hunit.cabal
+@@ -24,7 +24,7 @@ Flag Base3
+ Library
+ Exposed-Modules: Test.Framework.Providers.HUnit
+
+- Build-Depends: test-framework >= 0.2.0, HUnit >= 1.2 && < 1.4, extensible-exceptions >= 0.1.1 && < 0.2.0
++ Build-Depends: test-framework >= 0.2.0, HUnit >= 1.2 && < 1.7, extensible-exceptions >= 0.1.1 && < 0.2.0
+ if flag(base3)
+ Build-Depends: base >= 3 && < 4
+ else
diff --git a/devel/hs-test-framework-quickcheck2/Makefile b/devel/hs-test-framework-quickcheck2/Makefile
index bf848b7be014..84b48062ca53 100644
--- a/devel/hs-test-framework-quickcheck2/Makefile
+++ b/devel/hs-test-framework-quickcheck2/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= test-framework-quickcheck2
-PORTVERSION= 0.3.0.3
-PORTREVISION= 2
+PORTVERSION= 0.3.0.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework-quickcheck2/distinfo b/devel/hs-test-framework-quickcheck2/distinfo
index 5d1611734de2..8299410e9485 100644
--- a/devel/hs-test-framework-quickcheck2/distinfo
+++ b/devel/hs-test-framework-quickcheck2/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/test-framework-quickcheck2-0.3.0.3.tar.gz) = cc96c6f30c29b16a3f7ec5c108f320a6c0f0d3ef71afff8a1cb98caf33ffe18a
-SIZE (cabal/test-framework-quickcheck2-0.3.0.3.tar.gz) = 3518
+TIMESTAMP = 1499627859
+SHA256 (cabal/test-framework-quickcheck2-0.3.0.4.tar.gz) = d763afb99fa14cffaccbfad259534a656be129329ba12246fed2e4330619486e
+SIZE (cabal/test-framework-quickcheck2-0.3.0.4.tar.gz) = 3813
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
deleted file mode 100644
index 64f0f4a67575..000000000000
--- a/devel/hs-test-framework-quickcheck2/files/patch-test-framework-quickcheck2.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 8518670aea28..f033ca9c05bc 100644
--- a/devel/hs-test-framework/Makefile
+++ b/devel/hs-test-framework/Makefile
@@ -2,6 +2,7 @@
PORTNAME= test-framework
PORTVERSION= 0.8.1.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-test-framework/distinfo b/devel/hs-test-framework/distinfo
index ac25d81801b6..c3edb1f25d57 100644
--- a/devel/hs-test-framework/distinfo
+++ b/devel/hs-test-framework/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627859
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/files/patch-test-framework.cabal b/devel/hs-test-framework/files/patch-test-framework.cabal
new file mode 100644
index 000000000000..9f4db483b1df
--- /dev/null
+++ b/devel/hs-test-framework/files/patch-test-framework.cabal
@@ -0,0 +1,11 @@
+--- test-framework.cabal.orig 2017-07-08 19:34:13 UTC
++++ test-framework.cabal
+@@ -50,7 +50,7 @@ Library
+ base >= 4.3 && < 5, random >= 1.0, containers >= 0.1,
+ regex-posix >= 0.72,
+ old-locale >= 1.0,
+- time >= 1.1.2 && < 1.6,
++ time >= 1.1.2 && < 1.7,
+ xml >= 1.3.5, hostname >= 1.0
+
+ Extensions: CPP
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 9406d8649efc..0f24ca69db9e 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= text-icu
PORTVERSION= 0.7.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text-icu/distinfo b/devel/hs-text-icu/distinfo
index df0f0b184181..ac03514ab2b8 100644
--- a/devel/hs-text-icu/distinfo
+++ b/devel/hs-text-icu/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627859
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-short/Makefile b/devel/hs-text-short/Makefile
new file mode 100644
index 000000000000..52962ca1fdf9
--- /dev/null
+++ b/devel/hs-text-short/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= text-short
+PORTVERSION= 0.1
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package provides the ShortText type which is suitable for keeping many short strings in memory
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable semigroups text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-text-short/distinfo b/devel/hs-text-short/distinfo
new file mode 100644
index 000000000000..061c1b8f838f
--- /dev/null
+++ b/devel/hs-text-short/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499546701
+SHA256 (cabal/text-short-0.1.tar.gz) = c06af3e53c345fa50df8e30589d854c84d212787eba648e6ded9b794e0df937e
+SIZE (cabal/text-short-0.1.tar.gz) = 6048
diff --git a/devel/hs-text-short/pkg-descr b/devel/hs-text-short/pkg-descr
new file mode 100644
index 000000000000..66cb96b1c1c6
--- /dev/null
+++ b/devel/hs-text-short/pkg-descr
@@ -0,0 +1,11 @@
+This package provides the ShortText type which is suitable for keeping many
+short strings in memory. This is similiar to how ShortByteString relates to
+ ByteString.
+
+The main difference between Text and ShortText is that ShortText uses UTF-8
+instead of UTF-16 internally and also doesn't support slicing (thereby
+saving 2 words). Consequently, the memory footprint of a (boxed) ShortText
+value is 4 words (2 words when unboxed) plus the length of the UTF-8 encoded
+payload.
+
+WWW: https://hackage.haskell.org/package/text-short
diff --git a/devel/hs-text/Makefile b/devel/hs-text/Makefile
index 8cb68caa2ea0..708d442fe311 100644
--- a/devel/hs-text/Makefile
+++ b/devel/hs-text/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= text
-PORTVERSION= 1.2.1.3
+PORTVERSION= 1.2.2.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-text/distinfo b/devel/hs-text/distinfo
index 21a9b6928f91..2be66835e568 100644
--- a/devel/hs-text/distinfo
+++ b/devel/hs-text/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/text-1.2.1.3.tar.gz) = 98364c94f259ec95e380e44bde90b37708ec6f0d45eb9efe821ab67959e9f83f
-SIZE (cabal/text-1.2.1.3.tar.gz) = 145946
+TIMESTAMP = 1499546607
+SHA256 (cabal/text-1.2.2.2.tar.gz) = 31465106360a7d7e214d96f1d1b4303a113ffce1bde44a4e614053a1e5072df9
+SIZE (cabal/text-1.2.2.2.tar.gz) = 151048
diff --git a/devel/hs-tf-random/Makefile b/devel/hs-tf-random/Makefile
index 9e85e896b8c4..21651b0d2344 100644
--- a/devel/hs-tf-random/Makefile
+++ b/devel/hs-tf-random/Makefile
@@ -2,7 +2,7 @@
PORTNAME= tf-random
PORTVERSION= 0.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-tf-random/distinfo b/devel/hs-tf-random/distinfo
index 262758d3ae17..347da89f2ef9 100644
--- a/devel/hs-tf-random/distinfo
+++ b/devel/hs-tf-random/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627859
SHA256 (cabal/tf-random-0.5.tar.gz) = 2e30cec027b313c9e1794d326635d8fc5f79b6bf6e7580ab4b00186dadc88510
SIZE (cabal/tf-random-0.5.tar.gz) = 18483
diff --git a/devel/hs-th-abstraction/Makefile b/devel/hs-th-abstraction/Makefile
new file mode 100644
index 000000000000..35038d7d8d1d
--- /dev/null
+++ b/devel/hs-th-abstraction/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= th-abstraction
+PORTVERSION= 0.2.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= This package normalizes variations in the interface for inspecting datatype information via Template Haskell
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-abstraction/distinfo b/devel/hs-th-abstraction/distinfo
new file mode 100644
index 000000000000..7ba65f2abd89
--- /dev/null
+++ b/devel/hs-th-abstraction/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499694293
+SHA256 (cabal/th-abstraction-0.2.3.0.tar.gz) = 954bf25a4d558242970b2085333b2fb8811d2a926354a5d237a2db9c0718de03
+SIZE (cabal/th-abstraction-0.2.3.0.tar.gz) = 22183
diff --git a/devel/hs-th-abstraction/pkg-descr b/devel/hs-th-abstraction/pkg-descr
new file mode 100644
index 000000000000..3beaf70b6eba
--- /dev/null
+++ b/devel/hs-th-abstraction/pkg-descr
@@ -0,0 +1,5 @@
+This package normalizes variations in the interface for inspecting datatype
+information via Template Haskell so that packages and support a single, easier
+to use informational datatype while supporting many versions of Template Haskell.
+
+WWW: http://hackage.haskell.org/package/th-abstraction
diff --git a/devel/hs-th-lift-instances/Makefile b/devel/hs-th-lift-instances/Makefile
new file mode 100644
index 000000000000..efae271c7fc5
--- /dev/null
+++ b/devel/hs-th-lift-instances/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= th-lift-instances
+PORTVERSION= 0.1.11
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Some more Lift instances for common haskell data types
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= text th-lift vector
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-lift-instances/distinfo b/devel/hs-th-lift-instances/distinfo
new file mode 100644
index 000000000000..4fa1281f4107
--- /dev/null
+++ b/devel/hs-th-lift-instances/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499621827
+SHA256 (cabal/th-lift-instances-0.1.11.tar.gz) = 1da46afabdc73c86f279a0557d5a8f9af1296f9f6043264ba354b1c9cc65a6b8
+SIZE (cabal/th-lift-instances-0.1.11.tar.gz) = 4477
diff --git a/devel/hs-th-lift-instances/pkg-descr b/devel/hs-th-lift-instances/pkg-descr
new file mode 100644
index 000000000000..22b83781c96e
--- /dev/null
+++ b/devel/hs-th-lift-instances/pkg-descr
@@ -0,0 +1,3 @@
+Most data types in haskell platform do not have Lift instances. This package provides orphan instances for containers, text, bytestring and vector.
+
+WWW: http://hackage.haskell.org/package/th-lift-instances
diff --git a/devel/hs-th-lift/Makefile b/devel/hs-th-lift/Makefile
new file mode 100644
index 000000000000..2bc68f6f6b13
--- /dev/null
+++ b/devel/hs-th-lift/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= th-lift
+PORTVERSION= 0.7.7
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Derive Template Haskell's Lift class for datatypes.
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-th-lift/distinfo b/devel/hs-th-lift/distinfo
new file mode 100644
index 000000000000..c50cacb6471d
--- /dev/null
+++ b/devel/hs-th-lift/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499621822
+SHA256 (cabal/th-lift-0.7.7.tar.gz) = 16c6fa6fbe972fa0d850698c147cd9a30dc0e201554d9a4ee9ade62dc807cbb5
+SIZE (cabal/th-lift-0.7.7.tar.gz) = 12399
diff --git a/devel/hs-th-lift/pkg-descr b/devel/hs-th-lift/pkg-descr
new file mode 100644
index 000000000000..97e675739882
--- /dev/null
+++ b/devel/hs-th-lift/pkg-descr
@@ -0,0 +1,3 @@
+Derive Template Haskell's Lift class for datatypes.
+
+WWW: http://hackage.haskell.org/package/th-lift
diff --git a/devel/hs-threads/Makefile b/devel/hs-threads/Makefile
index dbd33390567f..1a9b2f381f7a 100644
--- a/devel/hs-threads/Makefile
+++ b/devel/hs-threads/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= threads
-PORTVERSION= 0.5.1.3
+PORTVERSION= 0.5.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-threads/distinfo b/devel/hs-threads/distinfo
index db08e1a6a00e..32a63654f916 100644
--- a/devel/hs-threads/distinfo
+++ b/devel/hs-threads/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/threads-0.5.1.3.tar.gz) = 02bd4c7597f77d0d5064db4031547cd7b4989f453c77d520223ba2b1b9846411
-SIZE (cabal/threads-0.5.1.3.tar.gz) = 7239
+TIMESTAMP = 1499447395
+SHA256 (cabal/threads-0.5.1.4.tar.gz) = d3b805b743cc7c0bce2a9b142f45bb1ad07e7bd6c2bd97a5fc442c007276febd
+SIZE (cabal/threads-0.5.1.4.tar.gz) = 7395
diff --git a/devel/hs-threadscope/Makefile b/devel/hs-threadscope/Makefile
index 5fdd47934b9d..c672767c2a90 100644
--- a/devel/hs-threadscope/Makefile
+++ b/devel/hs-threadscope/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= threadscope
-PORTVERSION= 0.2.7
+PORTVERSION= 0.2.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,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 text
+USE_CABAL= cairo ghc-events glib gtk mtl pango text
EXECUTABLE= threadscope
diff --git a/devel/hs-threadscope/distinfo b/devel/hs-threadscope/distinfo
index a93d17e84830..8e4294c912fb 100644
--- a/devel/hs-threadscope/distinfo
+++ b/devel/hs-threadscope/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/threadscope-0.2.7.tar.gz) = cc5653831252d55b3ba7506ea648e770b2c4489cdf4d78828f07dc24ea7ffdb6
-SIZE (cabal/threadscope-0.2.7.tar.gz) = 79966
+TIMESTAMP = 1501147826
+SHA256 (cabal/threadscope-0.2.8.tar.gz) = c27e15011d4630b77ed51e725e7668e06f6e06b73c2b9b601560af0e60e3f218
+SIZE (cabal/threadscope-0.2.8.tar.gz) = 79624
diff --git a/devel/hs-time-compat/Makefile b/devel/hs-time-compat/Makefile
index 50cabf4e4a25..ee232153eca6 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= 8
+PORTREVISION= 9
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-time-compat/distinfo b/devel/hs-time-compat/distinfo
index 5967d17ffb23..a5e3aa568faa 100644
--- a/devel/hs-time-compat/distinfo
+++ b/devel/hs-time-compat/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627860
SHA256 (cabal/time-compat-0.1.0.3.tar.gz) = 590711214510c0d2d09780c7fe3b21748bc4802e9053f78ccd6658e951fe0f7f
SIZE (cabal/time-compat-0.1.0.3.tar.gz) = 2256
diff --git a/devel/hs-time-locale-compat/Makefile b/devel/hs-time-locale-compat/Makefile
index efae2d3a06d7..dc7ae2c30a6c 100644
--- a/devel/hs-time-locale-compat/Makefile
+++ b/devel/hs-time-locale-compat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= time-locale-compat
-PORTVERSION= 0.1.1.0
+PORTVERSION= 0.1.1.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,5 +9,7 @@ COMMENT= Compatibility of TimeLocale between old-locale and time-1.5
LICENSE= BSD3CLAUSE
+USE_CABAL= old-locale
+
.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
index 254aff6e4d70..0533bd70cba7 100644
--- a/devel/hs-time-locale-compat/distinfo
+++ b/devel/hs-time-locale-compat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/time-locale-compat-0.1.1.0.tar.gz) = 25a04d0099482c2f367fb80e557ab59ba09c99aec6061c2b52733178420cb455
-SIZE (cabal/time-locale-compat-0.1.1.0.tar.gz) = 1933
+TIMESTAMP = 1499627860
+SHA256 (cabal/time-locale-compat-0.1.1.3.tar.gz) = 9144bf68b47791a2ac73f45aeadbc5910be2da9ad174909e1a10a70b4576aced
+SIZE (cabal/time-locale-compat-0.1.1.3.tar.gz) = 1925
diff --git a/devel/hs-timezone-olson/Makefile b/devel/hs-timezone-olson/Makefile
index 05ca18ba3067..cb0ce7e338bb 100644
--- a/devel/hs-timezone-olson/Makefile
+++ b/devel/hs-timezone-olson/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-olson
-PORTVERSION= 0.1.7
+PORTVERSION= 0.1.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-olson/distinfo b/devel/hs-timezone-olson/distinfo
index 755daf315011..ba5547e3d00f 100644
--- a/devel/hs-timezone-olson/distinfo
+++ b/devel/hs-timezone-olson/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/timezone-olson-0.1.7.tar.gz) = 232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa
-SIZE (cabal/timezone-olson-0.1.7.tar.gz) = 11313
+TIMESTAMP = 1499450481
+SHA256 (cabal/timezone-olson-0.1.8.tar.gz) = b96b01015ae5191a56d6bbdbbc3d084f0afb9acd72d84c301792f07871dd3747
+SIZE (cabal/timezone-olson-0.1.8.tar.gz) = 11356
diff --git a/devel/hs-timezone-series/Makefile b/devel/hs-timezone-series/Makefile
index f7b71b91614b..5f5f42ae154f 100644
--- a/devel/hs-timezone-series/Makefile
+++ b/devel/hs-timezone-series/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= timezone-series
-PORTVERSION= 0.1.5.1
+PORTVERSION= 0.1.8
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-timezone-series/distinfo b/devel/hs-timezone-series/distinfo
index 89961061e022..1eb2e5ffdc44 100644
--- a/devel/hs-timezone-series/distinfo
+++ b/devel/hs-timezone-series/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/timezone-series-0.1.5.1.tar.gz) = d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56
-SIZE (cabal/timezone-series-0.1.5.1.tar.gz) = 5330
+TIMESTAMP = 1499448454
+SHA256 (cabal/timezone-series-0.1.8.tar.gz) = 8119d90e4e78fdb662e83f2a350e30678e5e9078737ee90b6c121b62c1a3cdf6
+SIZE (cabal/timezone-series-0.1.8.tar.gz) = 6250
diff --git a/devel/hs-transformers-base/Makefile b/devel/hs-transformers-base/Makefile
index a0887bea8f44..191da8aae503 100644
--- a/devel/hs-transformers-base/Makefile
+++ b/devel/hs-transformers-base/Makefile
@@ -2,6 +2,7 @@
PORTNAME= transformers-base
PORTVERSION= 0.4.4
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-base/distinfo b/devel/hs-transformers-base/distinfo
index 966b08ccdc33..29160531051a 100644
--- a/devel/hs-transformers-base/distinfo
+++ b/devel/hs-transformers-base/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627861
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 eb5636fbee83..49a7b438db9e 100644
--- a/devel/hs-transformers-compat/Makefile
+++ b/devel/hs-transformers-compat/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= transformers-compat
-PORTVERSION= 0.4.0.4
+PORTVERSION= 0.5.1.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-transformers-compat/distinfo b/devel/hs-transformers-compat/distinfo
index 14290a24ab78..4f0a0b90b5b8 100644
--- a/devel/hs-transformers-compat/distinfo
+++ b/devel/hs-transformers-compat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/transformers-compat-0.4.0.4.tar.gz) = d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52
-SIZE (cabal/transformers-compat-0.4.0.4.tar.gz) = 12048
+TIMESTAMP = 1498678403
+SHA256 (cabal/transformers-compat-0.5.1.4.tar.gz) = d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f
+SIZE (cabal/transformers-compat-0.5.1.4.tar.gz) = 18574
diff --git a/devel/hs-typed-process/Makefile b/devel/hs-typed-process/Makefile
new file mode 100644
index 000000000000..484ef4f4593f
--- /dev/null
+++ b/devel/hs-typed-process/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= typed-process
+PORTVERSION= 0.1.0.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= The typed-process package
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= async conduit conduit-extra exceptions stm
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-typed-process/distinfo b/devel/hs-typed-process/distinfo
new file mode 100644
index 000000000000..1c4fce06c6c2
--- /dev/null
+++ b/devel/hs-typed-process/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499720967
+SHA256 (cabal/typed-process-0.1.0.0.tar.gz) = de866bc6ccb3ae3ccce20701add8bd913f7d7b4e252a9133eac35d035d0a10f8
+SIZE (cabal/typed-process-0.1.0.0.tar.gz) = 12886
diff --git a/devel/hs-typed-process/pkg-descr b/devel/hs-typed-process/pkg-descr
new file mode 100644
index 000000000000..46049d20fa59
--- /dev/null
+++ b/devel/hs-typed-process/pkg-descr
@@ -0,0 +1,3 @@
+The typed-process package
+
+WWW: http://hackage.haskell.org/package/typed-process
diff --git a/devel/hs-unamb/Makefile b/devel/hs-unamb/Makefile
index 3af42e625da1..0f9bb6afcdc1 100644
--- a/devel/hs-unamb/Makefile
+++ b/devel/hs-unamb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unamb
PORTVERSION= 0.2.5
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unamb/distinfo b/devel/hs-unamb/distinfo
index 1a5de1cc3152..7fc7f9555ae1 100644
--- a/devel/hs-unamb/distinfo
+++ b/devel/hs-unamb/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627861
SHA256 (cabal/unamb-0.2.5.tar.gz) = 3359f05602ae61095c13f8db1df9222030b60ce83ad64faa705a387c18c58b89
SIZE (cabal/unamb-0.2.5.tar.gz) = 6765
diff --git a/devel/hs-unexceptionalio/Makefile b/devel/hs-unexceptionalio/Makefile
new file mode 100644
index 000000000000..478caf7e2844
--- /dev/null
+++ b/devel/hs-unexceptionalio/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME= unexceptionalio
+PORTVERSION= 0.3.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= IO without any non-error, synchronous exceptions
+
+LICENSE= BSD3CLAUSE
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-unexceptionalio/distinfo b/devel/hs-unexceptionalio/distinfo
new file mode 100644
index 000000000000..ce404424d4db
--- /dev/null
+++ b/devel/hs-unexceptionalio/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499452943
+SHA256 (cabal/unexceptionalio-0.3.0.tar.gz) = 927e2be6bb9ced73c1c17d79c981cadef4039d9ee45d2d3d6b4c133ff93ff0b8
+SIZE (cabal/unexceptionalio-0.3.0.tar.gz) = 2335
diff --git a/devel/hs-unexceptionalio/pkg-descr b/devel/hs-unexceptionalio/pkg-descr
new file mode 100644
index 000000000000..ccab481cc4db
--- /dev/null
+++ b/devel/hs-unexceptionalio/pkg-descr
@@ -0,0 +1,7 @@
+When you've caught all the exceptions that can be handled safely,
+this is what you're left with.
+
+It is intended that you use qualified imports with this library.
+
+WWW: https://hackage.haskell.org/package/unexceptionalio
+
diff --git a/devel/hs-uniplate/Makefile b/devel/hs-uniplate/Makefile
index 68d8c6fba98b..438271c4f71d 100644
--- a/devel/hs-uniplate/Makefile
+++ b/devel/hs-uniplate/Makefile
@@ -3,7 +3,7 @@
PORTNAME= uniplate
PORTVERSION= 1.6.12
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uniplate/distinfo b/devel/hs-uniplate/distinfo
index c0b8784e5f07..c34b48d125b0 100644
--- a/devel/hs-uniplate/distinfo
+++ b/devel/hs-uniplate/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627861
SHA256 (cabal/uniplate-1.6.12.tar.gz) = fcc60bc6b3f6e925f611646db90e6db9f05286a9363405f844df1dc15572a8b7
SIZE (cabal/uniplate-1.6.12.tar.gz) = 30055
diff --git a/devel/hs-unix-compat/Makefile b/devel/hs-unix-compat/Makefile
index c61b6692e63e..286972d418df 100644
--- a/devel/hs-unix-compat/Makefile
+++ b/devel/hs-unix-compat/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= unix-compat
-PORTVERSION= 0.4.1.4
+PORTVERSION= 0.4.3.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-compat/distinfo b/devel/hs-unix-compat/distinfo
index b02b126258dd..6471cd40c909 100644
--- a/devel/hs-unix-compat/distinfo
+++ b/devel/hs-unix-compat/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/unix-compat-0.4.1.4.tar.gz) = fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b
-SIZE (cabal/unix-compat-0.4.1.4.tar.gz) = 12830
+TIMESTAMP = 1499627861
+SHA256 (cabal/unix-compat-0.4.3.1.tar.gz) = 72801d5a654a6e108c153f412ebd54c37fb445643770e0b97701a59e109f7e27
+SIZE (cabal/unix-compat-0.4.3.1.tar.gz) = 13152
diff --git a/devel/hs-unix-time/Makefile b/devel/hs-unix-time/Makefile
index d4cbd47db081..a00285d3d423 100644
--- a/devel/hs-unix-time/Makefile
+++ b/devel/hs-unix-time/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unix-time
-PORTVERSION= 0.3.5
+PORTVERSION= 0.3.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unix-time/distinfo b/devel/hs-unix-time/distinfo
index a028d8ab3e9d..d59e5ce39abd 100644
--- a/devel/hs-unix-time/distinfo
+++ b/devel/hs-unix-time/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/unix-time-0.3.5.tar.gz) = 7f1c58cd0328bbcb1d050af05670bc6f44dea3ee0894f30c6f87ee4a0d01675e
-SIZE (cabal/unix-time-0.3.5.tar.gz) = 40201
+TIMESTAMP = 1499627862
+SHA256 (cabal/unix-time-0.3.7.tar.gz) = 1131301131dd3e73353a346daa04578ec067073e7674d447051ac1a87262b4e1
+SIZE (cabal/unix-time-0.3.7.tar.gz) = 40549
diff --git a/devel/hs-unordered-containers/Makefile b/devel/hs-unordered-containers/Makefile
index c8e0182ae729..a2a47703434f 100644
--- a/devel/hs-unordered-containers/Makefile
+++ b/devel/hs-unordered-containers/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= unordered-containers
-PORTVERSION= 0.2.5.1
+PORTVERSION= 0.2.8.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-unordered-containers/distinfo b/devel/hs-unordered-containers/distinfo
index dca2a234c777..a571c53c5490 100644
--- a/devel/hs-unordered-containers/distinfo
+++ b/devel/hs-unordered-containers/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/unordered-containers-0.2.5.1.tar.gz) = 6e5878ade3ea65f2a7cb0a1df155f88f7e710d5bb975a5cbf1b45fb8cfee811a
-SIZE (cabal/unordered-containers-0.2.5.1.tar.gz) = 26093
+TIMESTAMP = 1499596921
+SHA256 (cabal/unordered-containers-0.2.8.0.tar.gz) = a4a188359ff28640359131061953f7dbb8258da8ecf0542db0d23f08bfa6eea8
+SIZE (cabal/unordered-containers-0.2.8.0.tar.gz) = 31824
diff --git a/devel/hs-utf8-light/Makefile b/devel/hs-utf8-light/Makefile
index d974f5bc1d82..c80fa39461ad 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= 2
+PORTREVISION= 3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-light/distinfo b/devel/hs-utf8-light/distinfo
index c435ede9d23e..4f55fb6716cb 100644
--- a/devel/hs-utf8-light/distinfo
+++ b/devel/hs-utf8-light/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627862
SHA256 (cabal/utf8-light-0.4.2.tar.gz) = 184c428ce7896d702da46f6f107e6873ff100dbc1af40b49b5ce87317e619e67
SIZE (cabal/utf8-light-0.4.2.tar.gz) = 5821
diff --git a/devel/hs-utf8-string/Makefile b/devel/hs-utf8-string/Makefile
index 4f34953f6f94..d20be246dd5e 100644
--- a/devel/hs-utf8-string/Makefile
+++ b/devel/hs-utf8-string/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= utf8-string
-PORTVERSION= 1
+PORTVERSION= 1.0.1.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-utf8-string/distinfo b/devel/hs-utf8-string/distinfo
index 34d35826b420..90f08763191f 100644
--- a/devel/hs-utf8-string/distinfo
+++ b/devel/hs-utf8-string/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/utf8-string-1.tar.gz) = 79f388d3f089e0c483c1dc1afad524b06f1abb6e288ed9029f934cffb3b2ba08
-SIZE (cabal/utf8-string-1.tar.gz) = 7707
+TIMESTAMP = 1499444718
+SHA256 (cabal/utf8-string-1.0.1.1.tar.gz) = fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140
+SIZE (cabal/utf8-string-1.0.1.1.tar.gz) = 8667
diff --git a/devel/hs-utf8-string/files/patch-git_6b70ee7 b/devel/hs-utf8-string/files/patch-git_6b70ee7
new file mode 100644
index 000000000000..5ad204e8f019
--- /dev/null
+++ b/devel/hs-utf8-string/files/patch-git_6b70ee7
@@ -0,0 +1,16 @@
+From ea531a1888b901a56f1503a66c2828f636fb21f9 Mon Sep 17 00:00:00 2001
+From: Herbert Valerio Riedel <hvr@gnu.org>
+Date: Sat, 2 Jan 2016 23:57:50 +0100
+Subject: [PATCH 1/2] Allow GHC 7.10 / base-4.9
+
+--- utf8-string.cabal.orig 2015-08-23 16:19:40 UTC
++++ utf8-string.cabal
+@@ -19,7 +19,7 @@ Tested-With: GHC==7.0.4, GHC==7.4.2, GHC==7.6.3
+ library
+ Ghc-options: -W -O2
+
+- build-depends: base >= 4.3 && < 4.9, bytestring >= 0.9
++ build-depends: base >= 4.3 && < 5.0, bytestring >= 0.9
+
+ Extensions: CPP
+ Exposed-modules: Codec.Binary.UTF8.String
diff --git a/devel/hs-utility-ht/Makefile b/devel/hs-utility-ht/Makefile
index 1d8b3e5b0286..9b4fc6cf94ab 100644
--- a/devel/hs-utility-ht/Makefile
+++ b/devel/hs-utility-ht/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= utility-ht
-PORTVERSION= 0.0.10
+PORTVERSION= 0.0.14
PORTREVISION= 2
CATEGORIES= devel haskell
diff --git a/devel/hs-utility-ht/distinfo b/devel/hs-utility-ht/distinfo
index 569d45540235..30645c73c503 100644
--- a/devel/hs-utility-ht/distinfo
+++ b/devel/hs-utility-ht/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/utility-ht-0.0.10.tar.gz) = ad8399180f495e6bb30e416a67a43d1bf82a7dd99293badd6e0d7674c1facd9f
-SIZE (cabal/utility-ht-0.0.10.tar.gz) = 20103
+TIMESTAMP = 1499627862
+SHA256 (cabal/utility-ht-0.0.14.tar.gz) = 69c2eee1330839cdff40fad4f68f8c7ce41ae3b46a9e1d575f589fcdcf7ceba8
+SIZE (cabal/utility-ht-0.0.14.tar.gz) = 25927
diff --git a/devel/hs-uuagc-bootstrap/Makefile b/devel/hs-uuagc-bootstrap/Makefile
index 5ba6a77e9a5f..51d273d16d69 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= 13
+PORTREVISION= 14
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-bootstrap/distinfo b/devel/hs-uuagc-bootstrap/distinfo
index ec40679cb55c..214e91403001 100644
--- a/devel/hs-uuagc-bootstrap/distinfo
+++ b/devel/hs-uuagc-bootstrap/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627862
SHA256 (cabal/uuagc-bootstrap-0.9.40.2.tar.gz) = b83bcb9466026f1edaa396fd28efadff373066bb50a471a546fef42ffe454b7f
SIZE (cabal/uuagc-bootstrap-0.9.40.2.tar.gz) = 405302
diff --git a/devel/hs-uuagc-cabal/Makefile b/devel/hs-uuagc-cabal/Makefile
index 8cb9ec81b008..6eda0f8fe7c0 100644
--- a/devel/hs-uuagc-cabal/Makefile
+++ b/devel/hs-uuagc-cabal/Makefile
@@ -2,6 +2,7 @@
PORTNAME= uuagc-cabal
PORTVERSION= 1.0.6.0
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc-cabal/distinfo b/devel/hs-uuagc-cabal/distinfo
index de780e5ef4e0..b34ca2b703e4 100644
--- a/devel/hs-uuagc-cabal/distinfo
+++ b/devel/hs-uuagc-cabal/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627863
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 56896be02d37..24dd6eee08c0 100644
--- a/devel/hs-uuagc/Makefile
+++ b/devel/hs-uuagc/Makefile
@@ -3,6 +3,7 @@
PORTNAME= uuagc
PORTVERSION= 0.9.52.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuagc/distinfo b/devel/hs-uuagc/distinfo
index 0fb591a91105..d469d8747b2e 100644
--- a/devel/hs-uuagc/distinfo
+++ b/devel/hs-uuagc/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627862
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
index 170a0bba7bcb..09625c5e4458 100644
--- a/devel/hs-uuid-types/Makefile
+++ b/devel/hs-uuid-types/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uuid-types
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uuid-types/distinfo b/devel/hs-uuid-types/distinfo
index 576c52677e10..62577b26987e 100644
--- a/devel/hs-uuid-types/distinfo
+++ b/devel/hs-uuid-types/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uuid-types-1.0.2.tar.gz) = 56c6e9d6c05f30461419d2c3b90ef7e5f2fb8dd51c09846b5f4ce12d034f2e05
-SIZE (cabal/uuid-types-1.0.2.tar.gz) = 12142
+TIMESTAMP = 1499448182
+SHA256 (cabal/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd
+SIZE (cabal/uuid-types-1.0.3.tar.gz) = 11999
diff --git a/devel/hs-uuid/Makefile b/devel/hs-uuid/Makefile
index 12dc1ca5438e..a2d89949f100 100644
--- a/devel/hs-uuid/Makefile
+++ b/devel/hs-uuid/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= uuid
-PORTVERSION= 1.3.11
+PORTVERSION= 1.3.13
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +9,8 @@ COMMENT= Creating, comparing, parsing and printing Universally Unique Identifier
LICENSE= BSD3CLAUSE
-USE_CABAL= cryptohash>=0.7 network-info>=0.2 random>=1.0.1 text>=1 \
- uuid-types>=1.0.2
+USE_CABAL= cryptohash-md5 cryptohash-sha1 entropy network-info random \
+ text uuid-types
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-uuid/distinfo b/devel/hs-uuid/distinfo
index ad2711d96953..d67fc4508451 100644
--- a/devel/hs-uuid/distinfo
+++ b/devel/hs-uuid/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uuid-1.3.11.tar.gz) = 671876d2f848c9155bfe661eb138d585897ab5b0a2f2e143ef85114d459814d5
-SIZE (cabal/uuid-1.3.11.tar.gz) = 8578
+TIMESTAMP = 1499452434
+SHA256 (cabal/uuid-1.3.13.tar.gz) = dfac808a7026217d018b408eab18facc6a85c6183be308d4ac7877e80599b027
+SIZE (cabal/uuid-1.3.13.tar.gz) = 8926
diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index 64012ef9214d..86d6fb8a7746 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= uulib
-PORTVERSION= 0.9.20
+PORTVERSION= 0.9.22
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index 9b33d6df39a0..5f00cf1175bb 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/uulib-0.9.20.tar.gz) = e2bb4d7b2aa0d3e987748185589d7d25b453d3ee448a468aab8971df651ee7e3
-SIZE (cabal/uulib-0.9.20.tar.gz) = 45120
+TIMESTAMP = 1499627863
+SHA256 (cabal/uulib-0.9.22.tar.gz) = cdd0a15d33834e367e2b9d9a6b78cb17e1947e31c7d2d26344a144bf3ab131ad
+SIZE (cabal/uulib-0.9.22.tar.gz) = 45487
diff --git a/devel/hs-vault/Makefile b/devel/hs-vault/Makefile
index 528af8e5a1ea..2960d8f42e2c 100644
--- a/devel/hs-vault/Makefile
+++ b/devel/hs-vault/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vault
-PORTVERSION= 0.3.0.4
+PORTVERSION= 0.3.0.7
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vault/distinfo b/devel/hs-vault/distinfo
index d98e273922d8..886921f34bdb 100644
--- a/devel/hs-vault/distinfo
+++ b/devel/hs-vault/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vault-0.3.0.4.tar.gz) = 561ef32877935067e458333a44a37f15b4063559c4cb4ddc412ccf705ec6062a
-SIZE (cabal/vault-0.3.0.4.tar.gz) = 5009
+TIMESTAMP = 1499458511
+SHA256 (cabal/vault-0.3.0.7.tar.gz) = 9e9189da0821d68fc8f85aab958bbec141635858a7aeb8178e1eec5872a366f0
+SIZE (cabal/vault-0.3.0.7.tar.gz) = 5140
diff --git a/devel/hs-vector-algorithms/Makefile b/devel/hs-vector-algorithms/Makefile
index dcb27f8d9f52..f583f635ebd9 100644
--- a/devel/hs-vector-algorithms/Makefile
+++ b/devel/hs-vector-algorithms/Makefile
@@ -2,6 +2,7 @@
PORTNAME= vector-algorithms
PORTVERSION= 0.7.0.1
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-algorithms/distinfo b/devel/hs-vector-algorithms/distinfo
index a5c442db6d98..0ad9e7af2ede 100644
--- a/devel/hs-vector-algorithms/distinfo
+++ b/devel/hs-vector-algorithms/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627863
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-algorithms/files/patch-vector-algorithms.cabal b/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal
new file mode 100644
index 000000000000..ef5d891319d5
--- /dev/null
+++ b/devel/hs-vector-algorithms/files/patch-vector-algorithms.cabal
@@ -0,0 +1,11 @@
+--- vector-algorithms.cabal.orig 2017-07-07 20:17:27 UTC
++++ vector-algorithms.cabal
+@@ -44,7 +44,7 @@ library
+ hs-source-dirs: src
+
+ build-depends: base >= 4.5 && < 5,
+- vector >= 0.6 && < 0.12,
++ vector >= 0.6 && < 0.13,
+ primitive >=0.3 && <0.7,
+ bytestring >= 0.9 && < 1.0
+
diff --git a/devel/hs-vector-binary-instances/Makefile b/devel/hs-vector-binary-instances/Makefile
index 8c78d2369fc3..c189614d8eab 100644
--- a/devel/hs-vector-binary-instances/Makefile
+++ b/devel/hs-vector-binary-instances/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= vector-binary-instances
-PORTVERSION= 0.2.1.0
-PORTREVISION= 2
+PORTVERSION= 0.2.3.5
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-binary-instances/distinfo b/devel/hs-vector-binary-instances/distinfo
index eaf71dc2946a..06fbd9065513 100644
--- a/devel/hs-vector-binary-instances/distinfo
+++ b/devel/hs-vector-binary-instances/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-binary-instances-0.2.1.0.tar.gz) = 9450018a61ee5a62b802c1b2cfe8d289b7c8f3debeb0f8828679a4c085d31909
-SIZE (cabal/vector-binary-instances-0.2.1.0.tar.gz) = 3114
+TIMESTAMP = 1499627864
+SHA256 (cabal/vector-binary-instances-0.2.3.5.tar.gz) = e11255baeca51fb01df28b120ee308802d4e45929e520c8464e3f74513682a5a
+SIZE (cabal/vector-binary-instances-0.2.3.5.tar.gz) = 4133
diff --git a/devel/hs-vector-instances/Makefile b/devel/hs-vector-instances/Makefile
index 6d3f15215387..c14905189629 100644
--- a/devel/hs-vector-instances/Makefile
+++ b/devel/hs-vector-instances/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vector-instances
-PORTVERSION= 3.3.1
+PORTVERSION= 3.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector-instances/distinfo b/devel/hs-vector-instances/distinfo
index 3cd2700551e5..7af9110640e5 100644
--- a/devel/hs-vector-instances/distinfo
+++ b/devel/hs-vector-instances/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-instances-3.3.1.tar.gz) = 68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59
-SIZE (cabal/vector-instances-3.3.1.tar.gz) = 3726
+TIMESTAMP = 1499627864
+SHA256 (cabal/vector-instances-3.4.tar.gz) = 1b0246ef0cf8372d61d5c7840d857f49299af2304b5107510377255ed4dd5381
+SIZE (cabal/vector-instances-3.4.tar.gz) = 5276
diff --git a/devel/hs-vector-th-unbox/Makefile b/devel/hs-vector-th-unbox/Makefile
index e578fee23262..44dd21d37cc7 100644
--- a/devel/hs-vector-th-unbox/Makefile
+++ b/devel/hs-vector-th-unbox/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vector-th-unbox
-PORTVERSION= 0.2.1.2
+PORTVERSION= 0.2.1.6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,7 +9,7 @@ COMMENT= Deriver for Data.Vector.Unboxed using Template Haskell
LICENSE= BSD3CLAUSE
-USE_CABAL= vector>=0.7
+USE_CABAL= vector
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/devel/hs-vector-th-unbox/distinfo b/devel/hs-vector-th-unbox/distinfo
index 6521be6e4e49..9c8b20c9c889 100644
--- a/devel/hs-vector-th-unbox/distinfo
+++ b/devel/hs-vector-th-unbox/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05
-SIZE (cabal/vector-th-unbox-0.2.1.2.tar.gz) = 4536
+TIMESTAMP = 1499459996
+SHA256 (cabal/vector-th-unbox-0.2.1.6.tar.gz) = be87d4a6f1005ee2d0de6adf521e05c9e83c441568a8a8b60c79efe24ae90235
+SIZE (cabal/vector-th-unbox-0.2.1.6.tar.gz) = 4717
diff --git a/devel/hs-vector/Makefile b/devel/hs-vector/Makefile
index 855b23e6d4ea..06bb9aef7430 100644
--- a/devel/hs-vector/Makefile
+++ b/devel/hs-vector/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= vector
-PORTVERSION= 0.10.12.3
+PORTVERSION= 0.12.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-vector/distinfo b/devel/hs-vector/distinfo
index 7ef33ea92189..25c0f1dde667 100644
--- a/devel/hs-vector/distinfo
+++ b/devel/hs-vector/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/vector-0.10.12.3.tar.gz) = 0f765ce0238d89ffdb67656a364f7bf5012d68de9642da6bb2a425b61f88e89a
-SIZE (cabal/vector-0.10.12.3.tar.gz) = 103617
+TIMESTAMP = 1499445633
+SHA256 (cabal/vector-0.12.0.1.tar.gz) = b100ee79b9da2651276278cd3e0f08a3c152505cc52982beda507515af173d7b
+SIZE (cabal/vector-0.12.0.1.tar.gz) = 121798
diff --git a/devel/hs-void/Makefile b/devel/hs-void/Makefile
index 7c610284fa03..fcf7fdab7ef9 100644
--- a/devel/hs-void/Makefile
+++ b/devel/hs-void/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= void
-PORTVERSION= 0.7
+PORTVERSION= 0.7.2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-void/distinfo b/devel/hs-void/distinfo
index daedb86f01c3..7b3b59ff82cc 100644
--- a/devel/hs-void/distinfo
+++ b/devel/hs-void/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cabal/void-0.7.tar.gz) = 981b85d19bb51c1ac60103b184b86061621e0b016d4db24dd965751b2bc96f47
-SIZE (cabal/void-0.7.tar.gz) = 3900
+TIMESTAMP = 1499627864
+SHA256 (cabal/void-0.7.2.tar.gz) = d3fffe66a03e4b53db1e459edf75ad8402385a817cae415d857ec0b03ce0cf2b
+SIZE (cabal/void-0.7.2.tar.gz) = 5563
diff --git a/devel/hs-wl-pprint-text/Makefile b/devel/hs-wl-pprint-text/Makefile
new file mode 100644
index 000000000000..ead23629123c
--- /dev/null
+++ b/devel/hs-wl-pprint-text/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= wl-pprint-text
+PORTVERSION= 1.1.1.0
+CATEGORIES= devel haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= A clone of wl-pprint for use with the text library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= base-compat text
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/devel/hs-wl-pprint-text/distinfo b/devel/hs-wl-pprint-text/distinfo
new file mode 100644
index 000000000000..096e33a8bb8e
--- /dev/null
+++ b/devel/hs-wl-pprint-text/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1499543226
+SHA256 (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 2960c8201c05d912a1df748a3ceeadc7525905ff1c371d7b4972f4011eca0acd
+SIZE (cabal/wl-pprint-text-1.1.1.0.tar.gz) = 16575
diff --git a/devel/hs-wl-pprint-text/pkg-descr b/devel/hs-wl-pprint-text/pkg-descr
new file mode 100644
index 000000000000..595f33e9e690
--- /dev/null
+++ b/devel/hs-wl-pprint-text/pkg-descr
@@ -0,0 +1,3 @@
+A clone of wl-pprint for use with the text library
+
+WWW: https://hackage.haskell.org/package/wl-pprint-text
diff --git a/devel/hs-word8/Makefile b/devel/hs-word8/Makefile
index 5a6a632d7520..408731ca0352 100644
--- a/devel/hs-word8/Makefile
+++ b/devel/hs-word8/Makefile
@@ -2,6 +2,7 @@
PORTNAME= word8
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/hs-word8/distinfo b/devel/hs-word8/distinfo
index 5f314321424e..235536f79a98 100644
--- a/devel/hs-word8/distinfo
+++ b/devel/hs-word8/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1499627864
SHA256 (cabal/word8-0.1.2.tar.gz) = 3cbae3755a078ecff46524b3f6e0018f7e796e6dac9c710fe09b433c544676dd
SIZE (cabal/word8-0.1.2.tar.gz) = 6218
diff --git a/devel/stack/Makefile b/devel/stack/Makefile
index 77b96250c9a3..74af0ed424c0 100644
--- a/devel/stack/Makefile
+++ b/devel/stack/Makefile
@@ -10,11 +10,12 @@
PORTNAME= stack
PORTVERSION= 1.5.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= devel haskell
MASTER_SITES= GH \
https://github.com/applicative-tech/stack-dependencies/releases/download/v${PORTVERSION}/:deps
-DISTFILES= stack-dependencies-${PORTVERSION}${EXTRACT_SUFX}:deps
+DISTFILES= stack-dependencies-${PORTVERSION}-ghc802${EXTRACT_SUFX}:deps
MAINTAINER= tobik@FreeBSD.org
COMMENT= Cross-platform program for developing Haskell programs
@@ -22,6 +23,15 @@ COMMENT= Cross-platform program for developing Haskell programs
LICENSE= BSD3CLAUSE
BUILD_DEPENDS= ghc>0:lang/ghc \
+ hs-mtl>0:devel/hs-mtl \
+ hs-network>0:net/hs-network \
+ hs-old-locale>0:devel/hs-old-locale \
+ hs-old-time>0:devel/hs-old-time \
+ hs-parsec>0:textproc/hs-parsec \
+ hs-random>0:devel/hs-random \
+ hs-stm>0:devel/hs-stm \
+ hs-text>0:devel/hs-text \
+ hs-zlib>0:archivers/hs-zlib \
cabal:devel/hs-cabal-install
LIB_DEPENDS= libgmp.so:math/gmp \
libffi.so:devel/libffi
diff --git a/devel/stack/distinfo b/devel/stack/distinfo
index 3af857f9fe5f..b60adb58946f 100644
--- a/devel/stack/distinfo
+++ b/devel/stack/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1501088211
-SHA256 (stack-dependencies-1.5.0.tar.gz) = 7c1697018d681a9b1515036c2a002b99489d58173ea0a3681e6b9e096ea92120
-SIZE (stack-dependencies-1.5.0.tar.gz) = 42174012
+TIMESTAMP = 1501704650
+SHA256 (stack-dependencies-1.5.0-ghc802.tar.gz) = 2bd7a9139ad07e9751dcedb5aa64ce31713b2af77eb1b1403b0330d8cdb1a63e
+SIZE (stack-dependencies-1.5.0-ghc802.tar.gz) = 42304138
SHA256 (applicative-tech-stack-dependencies-v1.5.0_GH0.tar.gz) = 6bec257b601d79ba47244911a5e37a15ff99ce029d234cb59937455203568942
SIZE (applicative-tech-stack-dependencies-v1.5.0_GH0.tar.gz) = 997