diff options
author | pgj <pgj@FreeBSD.org> | 2015-08-21 07:02:14 +0800 |
---|---|---|
committer | pgj <pgj@FreeBSD.org> | 2015-08-21 07:02:14 +0800 |
commit | 28f3daa3db1a02ef56aa677eccd053223c740402 (patch) | |
tree | 607a5ca77efd301a2b4dc49b05d108829fcffa77 /lang/ghc | |
parent | b9abb39738d3acc9d1938e87002d98cc5fb34c35 (diff) | |
download | freebsd-ports-gnome-28f3daa3db1a02ef56aa677eccd053223c740402.tar.gz freebsd-ports-gnome-28f3daa3db1a02ef56aa677eccd053223c740402.tar.zst freebsd-ports-gnome-28f3daa3db1a02ef56aa677eccd053223c740402.zip |
- Update The Glorious Glasgow Haskell Compiler to version 7.10.2
- Include a patch for addressing timer issues [1]
- Add support for building both GHC and Haskell ports with Clang, either from
ports or the base system
- Discontinue supporting Haskell Platform, use Stackage instead as a
reference
- Drop support for FreeBSD 8.x, optimize bootstrap compiler tarballs
- Update Gtk2Hs to version 0.13 [2]
- Update Pandoc to version 1.15.0.6
- Update git-annex to version 5.20150727
- Update Darcs to 2.10 [3]
- Unbreak wxHaskell ports
Please note that port revisions for all the Haskell ports without version
changes are bumped.
New ports (48):
converters/hs-aeson-pretty JSON pretty-printing library and command-line
tool
converters/hs-sandi Data encoding library
devel/hs-StateVar State variables
devel/hs-base-orphans Backwards-compatible orphan instances for base
devel/hs-bytestring-mmap Mmap support for strict ByteStrings
devel/hs-constraints Constraint manipulation
devel/hs-data-ordlist Set and bag operations on ordered lists
devel/hs-easy-file Cross-platform File handling
devel/hs-extra Extra functions
devel/hs-geniplate-mirror Use Template Haskell to generate Uniplate-like
functions
devel/hs-haddock-api Documentation-generation tool for Haskell
libraries
devel/hs-hex Convert strings into hexadecimal and back
devel/hs-hourglass Simple performant time related library
devel/hs-hsb2hs Preprocesses a file, adding blobs from files
as string literals
devel/hs-hspec-core Testing Framework for Haskell
devel/hs-hspec-discover Automatically discover and run Hspec tests
devel/hs-js-flot Obtain minified flot code
devel/hs-js-jquery Obtain minified jQuery code
devel/hs-lifted-async Run lifted IO operations asynchronously and
wait for their results
devel/hs-map-syntax Syntax sugar for defining maps
devel/hs-memory Memory and related abtraction stuff
devel/hs-mutable-containers Abstactions and concrete implementations of
mutable containers
devel/hs-newtype Typeclass and set of functions for working
with newtypes
devel/hs-old-locale Locale library
devel/hs-old-time Time library
devel/hs-preprocessor-tools Framework for extending Haskell's syntax via
quick-and-dirty preprocessors
devel/hs-time-locale-compat Compatibility of TimeLocale between old-locale
and time-1.5
devel/hs-uuid-types Type definitions for Universally Unique
Identifiers
math/hs-Agda-stdlib Agda standard library
math/hs-adjunctions Adjunctions and representable functors
math/hs-kan-extensions Kan extensions, Kan lifts, various forms of
the Yoneda lemma, and (co)density (co)monads
net-im/hs-haskell-xmpp Haskell XMPP library based on HaXml & STM
net-p2p/hs-torrent BitTorrent file parser and generater
net/hs-aws Amazon Web Services (AWS) for Haskell
net/hs-network-uri URI manipulation
security/hs-cryptonite Cryptography Primitives sink
security/hs-nonce Generate cryptographic nonces
shells/hs-shelly Shell-like (systems) programming in Haskell
sysutils/hs-ekg-json JSON encoding of ekg metrics
textproc/hs-bencode Parser and printer for bencoded data
textproc/hs-cassava CSV parsing and encoding library
textproc/hs-cmark Fast, accurate CommonMark (Markdown) parser
and renderer
textproc/hs-pandoc-citeproc Supports using pandoc with citeproc
textproc/hs-regex-applicative Regex-based parsing with applicative interface
textproc/hs-regex-compat-tdfa Unicode Support version of Text.Regex, using
regex-tdfa
textproc/hs-rfc5051 Simple unicode collation as per RFC5051
www/hs-http2 HTTP/2.0 library including frames and HPACK
www/hs-multipart HTTP multipart split out of the cgi package
Updated ports (317):
archivers/hs-tar 0.4.0.1_8 --> 0.4.2.1
archivers/hs-zip-archive 0.2.3.4_1 --> 0.2.3.7
archivers/hs-zlib 0.5.4.1_6 --> 0.5.4.2
archivers/hs-zlib-bindings 0.1.1.3_7 --> 0.1.1.5
audio/hs-ALUT 2.3.0.1_2 --> 2.4.0.0
audio/hs-OpenAL 1.6.0.0_1 --> 1.7.0.0
audio/hs-libmpd 0.8.0.5_1 --> 0.9.0.2
benchmarks/hs-criterion 0.8.1.0_1 --> 1.1.0.0
converters/hs-aeson 0.7.0.6_1 --> 0.8.0.2
converters/hs-json 0.7_8 --> 0.9.1
databases/hs-esqueleto 1.4.4_1 --> 2.4.1
databases/hs-hedis 0.6.5 --> 0.6.9
databases/hs-mysql 0.1.1.6_1 --> 0.1.1.8
databases/hs-persistent 1.3.1.1_1 --> 2.2
databases/hs-persistent-sqlite 1.3.0.5_1 --> 2.2
databases/hs-persistent-template 1.3.1.4_1 --> 2.1.3.4
devel/hs-BNFC 2.6.0.3_8 --> 2.8
devel/hs-Boolean 0.2.1_1 --> 0.2.3
devel/hs-ConfigFile 1.1.2_1 --> 1.1.4
devel/hs-List 0.5.1_8 --> 0.5.2
devel/hs-MissingH 1.2.1.0_1 --> 1.3.0.1
devel/hs-MonadCatchIO-transformers 0.3.1.0_1 --> 0.3.1.3
devel/hs-MonadRandom 0.1.13_1 --> 0.4
devel/hs-ObjectName 1.0.0.0_14 --> 1.1.0.0
devel/hs-QuickCheck 2.6_6 --> 2.8.1
devel/hs-ReadArgs 1.2.1_8 --> 1.2.2
devel/hs-STMonadTrans 0.3.2_1 --> 0.3.3
devel/hs-ShellCheck 0.3.5 --> 0.3.8
devel/hs-Stream 0.4.7.1_1 --> 0.4.7.2
devel/hs-alex 3.1.3_1 --> 3.1.4
devel/hs-ansi-terminal 0.6.1.1_1 --> 0.6.2.1
devel/hs-ansi-wl-pprint 0.6.7.1_1 --> 0.6.7.3
devel/hs-asn1-encoding 0.8.1.3_1 --> 0.9.0
devel/hs-asn1-parse 0.8.1_1 --> 0.9.1
devel/hs-asn1-types 0.2.3_1 --> 0.3.0
devel/hs-async 2.0.1.5_1 --> 2.0.2
devel/hs-atomic-primops 0.6.0.6_1 --> 0.8
devel/hs-auto-update 0.1.0.0_1 --> 0.1.2.2
devel/hs-basic-prelude 0.3.8_1 --> 0.5.0
devel/hs-bifunctors 4.1.1.1_1 --> 5
devel/hs-blaze-builder 0.3.3.2_1 --> 0.4.0.1
devel/hs-blaze-builder-enumerator 0.2.0.6_1 --> 0.2.1.0
devel/hs-blaze-textual 0.2.0.9_1 --> 0.2.1.0
devel/hs-bloomfilter 2.0.0.0_1 --> 2.0.1.0
devel/hs-boxes 0.1.3_1 --> 0.1.4
devel/hs-bytestring-lexing 0.4.3.2 --> 0.5.0.2
devel/hs-c2hs 0.17.2_1 --> 0.26.1
devel/hs-cabal-install 1.18.0.5_1 --> 1.22.6.0
devel/hs-cereal 0.4.0.1_1 --> 0.4.1.1
devel/hs-checkers 0.3.2_1 --> 0.4.3
devel/hs-chunked-data 0.1.0.1_1 --> 0.2.0
devel/hs-classy-prelude 0.9.3_1 --> 0.12.1.1
devel/hs-classy-prelude-conduit 0.9.3_1 --> 0.12.0.1
devel/hs-cmdargs 0.10.9_1 --> 0.10.13
devel/hs-conduit 1.1.7_1 --> 1.2.5
devel/hs-conduit-combinators 0.2.8.2_1 --> 1.0.3
devel/hs-conduit-extra 1.1.3_1 --> 1.1.9.1
devel/hs-convertible 1.1.0.0_1 --> 1.1.1.0
devel/hs-cpphs 1.18.5_1 --> 1.19
devel/hs-darcs 2.8.5 --> 2.10.1
devel/hs-data-hash 0.2.0.0_1 --> 0.2.0.1
devel/hs-data-pprint 0.2.3_1 --> 0.2.4
devel/hs-datetime 0.2.1_12 --> 0.3.1
devel/hs-deepseq-generics 0.1.1.1_1 --> 0.1.1.2
devel/hs-dlist 0.7.1_1 --> 0.7.1.1
devel/hs-edit-distance 0.2.1.2_7 --> 0.2.2.1
devel/hs-either 4.3.0.1_1 --> 4.4.1
devel/hs-enclosed-exceptions 1.0.0.2_1 --> 1.0.1.1
devel/hs-equivalence 0.2.5_1 --> 0.3.1
devel/hs-errors 1.4.7_1 --> 2.0.0
devel/hs-exceptions 0.6.1_1 --> 0.8.0.2
devel/hs-fast-logger 2.2.0_1 --> 2.4.1
devel/hs-fgl 5.5.0.1_1 --> 5.5.2.1
devel/hs-file-embed 0.0.7_1 --> 0.0.9
devel/hs-filemanip 0.3.6.2_8 --> 0.3.6.3
devel/hs-filestore 0.6.0.3_1 --> 0.6.1
devel/hs-free 4.9_1 --> 4.12.1
devel/hs-fsnotify 0.1.0.3_1 --> 0.2.1
devel/hs-gconf 0.12.5.0_1 --> 0.13.0.2
devel/hs-generic-deriving 1.6.3_1 --> 1.8.0
devel/hs-ghc-events 0.4.3.0_1 --> 0.4.4.0
devel/hs-gio 0.12.5.3_1 --> 0.13.1.0
devel/hs-git-annex 5.20140817_1 --> 5.20150727
devel/hs-glib 0.12.5.4_1 --> 0.13.1.1
devel/hs-gtk2hs-buildtools 0.12.5.2_2 --> 0.13.0.4
devel/hs-haddock 2.14.3_1 --> 2.16.1
devel/hs-haddock-library 1.1.0_1 --> 1.2.1
devel/hs-happy 1.19.4_1 --> 1.19.5
devel/hs-hashable 1.2.2.0_1,1 --> 1.2.3.3,1
devel/hs-hashtables 1.1.2.1_1 --> 1.2.0.2
devel/hs-haskell-src 1.0.1.6_1 --> 1.0.2.0
devel/hs-haskell-src-exts 1.15.0.1_1 --> 1.16.0.1
devel/hs-hasktags 0.69.0_1 --> 0.69.1
devel/hs-hastache 0.6.0_1 --> 0.6.1
devel/hs-hinotify 0.3.7_1 --> 0.3.8.1
devel/hs-hint 0.4.2.0_1 --> 0.4.2.3
devel/hs-hlint 1.9.3_1 --> 1.9.21
devel/hs-hoogle 4.2.34_1 --> 4.2.41
devel/hs-hslogger 1.2.4_1 --> 1.2.9
devel/hs-hslua 0.3.13_1 --> 0.4.0
devel/hs-hspec 1.11.0_1 --> 2.1.10
devel/hs-hspec-expectations 0.6.0.1_1 --> 0.7.1
devel/hs-keys 3.10.1_1 --> 3.10.2
devel/hs-language-c 0.4.5_1 --> 0.4.7
devel/hs-language-javascript 0.5.13_1 --> 0.5.14.2
devel/hs-lens 4.3.3_1 --> 4.12.3
devel/hs-lifted-base 0.2.3.0_1 --> 0.2.3.6
devel/hs-mmorph 1.0.3_1 --> 1.0.4
devel/hs-monad-control 0.3.3.0_1 --> 1.0.0.4
devel/hs-monad-logger 0.3.7.1_1 --> 0.3.13.2
devel/hs-monad-loops 0.4.2.1_1 --> 0.4.3
devel/hs-monad-par 0.3.4.6_1 --> 0.3.4.7
devel/hs-mono-traversable 0.6.1_1 --> 0.9.2.1
devel/hs-mtl 2.1.3.1_1 --> 2.2.1
devel/hs-mueval 0.9.1.1_1 --> 0.9.1.1.2
devel/hs-murmur-hash 0.1.0.7_1 --> 0.1.0.8
devel/hs-optparse-applicative 0.9.1.1_1 --> 0.11.0.2
devel/hs-parallel 3.2.0.4_1 --> 3.2.0.6
devel/hs-pcre-light 0.4.0.2_1 --> 0.4.0.3
devel/hs-primitive 0.5.2.1_1 --> 0.6
devel/hs-profunctors 4.2.0.1_1 --> 5.1.1
devel/hs-project-template 0.1.4.1_1 --> 0.2.0
devel/hs-random 1.0.1.1_10 --> 1.1
devel/hs-reflection 1.5.1_1 --> 2
devel/hs-resource-pool 0.2.3.0_1 --> 0.2.3.2
devel/hs-resourcet 1.1.2.3_1 --> 1.1.6
devel/hs-safe 0.3.7_1 --> 0.3.9
devel/hs-scientific 0.3.3.0_1 --> 0.3.3.8
devel/hs-securemem 0.1.3_1 --> 0.1.9
devel/hs-setenv 0.1.1.1_1 --> 0.1.1.3
devel/hs-shake 0.13.2_1 --> 0.15.5
devel/hs-silently 1.2.4.1_7 --> 1.2.5
devel/hs-stm 2.4.2_6 --> 2.4.4
devel/hs-stm-chans 3.0.0.2_1 --> 3.0.0.4
devel/hs-streaming-commons 0.1.4.1_1 --> 0.1.12.1
devel/hs-syb 0.4.1_1 --> 0.5.1
devel/hs-syb-with-class 0.6.1.5_1 --> 0.6.1.6
devel/hs-system-fileio 0.3.14_1 --> 0.3.16.3
devel/hs-system-filepath 0.4.12_1 --> 0.4.13.4
devel/hs-tagged 0.7.2_1 --> 0.8.1
devel/hs-test-framework 0.8.0.3_1 --> 0.8.1.1
devel/hs-text 1.1.0.0_1 --> 1.2.1.3
devel/hs-text-icu 0.6.3.7_2 --> 0.7.0.1
devel/hs-threads 0.5.1.2_1 --> 0.5.1.3
devel/hs-threadscope 0.2.4_1 --> 0.2.7
devel/hs-timezone-olson 0.1.4_1 --> 0.1.7
devel/hs-timezone-series 0.1.3_1 --> 0.1.5.1
devel/hs-transformers-base 0.4.2_1 --> 0.4.4
devel/hs-transformers-compat 0.3.3.4_1 --> 0.4.0.4
devel/hs-unix-compat 0.4.1.3_1 --> 0.4.1.4
devel/hs-unix-time 0.3.3_1 --> 0.3.5
devel/hs-unordered-containers 0.2.4.0_1 --> 0.2.5.1
devel/hs-utf8-string 0.3.8_1 --> 1
devel/hs-uuagc 0.9.51_1 --> 0.9.52.1
devel/hs-uuagc-cabal 1.0.5.0_1 --> 1.0.6.0
devel/hs-uuid 1.3.3_1 --> 1.3.11
devel/hs-uulib 0.9.16_1 --> 0.9.20
devel/hs-vault 0.3.0.3_1 --> 0.3.0.4
devel/hs-vector 0.10.9.1_1 --> 0.10.12.3
devel/hs-vector-algorithms 0.6.0.3_1 --> 0.7.0.1
devel/hs-vector-instances 3.3_1 --> 3.3.1
devel/hs-vector-th-unbox 0.2.1.0_1 --> 0.2.1.2
devel/hs-void 0.6.1_1 --> 0.7
devel/hs-word8 0.1.1_1 --> 0.1.2
dns/hs-dns 1.4.2_1 --> 2.0.0
graphics/hs-JuicyPixels 3.1.6.1_1 --> 3.2.6
graphics/hs-cairo 0.12.5.3_1 --> 0.13.1.0
graphics/hs-dia-base 0.1.1.2_8 --> 0.1.1.3
graphics/hs-dia-functions 0.2.1.3_8 --> 0.2.1.4
graphics/hs-svgcairo 0.12.5.2_1 --> 0.13.0.3
lang/hs-brainfuck 0.1_15 --> 0.1.0.2
lang/hs-unlambda 0.1.3_8 --> 0.1.4.1
mail/hs-email-validate 2.0.1_1 --> 2.1.3
mail/hs-mime 0.4.0.1_1 --> 0.4.0.2
mail/hs-mime-mail 0.4.5.2_1 --> 0.4.9
mail/hs-mime-types 0.1.0.4_1 --> 0.1.0.6
math/hs-Agda 2.4.0.2_1 --> 2.4.2.3
math/hs-NumInstances 1.3_6 --> 1.4
math/hs-categories 1.0.6_1 --> 1.0.7
math/hs-comonad 4.2.2_1 --> 4.2.7.2
math/hs-contravariant 1.1_1 --> 1.3.2
math/hs-data-lens 2.10.5_1 --> 2.10.7
math/hs-data-lens-template 2.1.8_1 --> 2.1.9
math/hs-ieee754 0.7.3_10 --> 0.7.6
math/hs-mwc-random 0.13.1.2_1 --> 0.13.3.2
math/hs-pointed 4.1_1 --> 4.2.0.2
math/hs-semigroupoids 4.0.4_1 --> 5.0.0.3
math/hs-semigroups 0.15.2_1 --> 0.16.2.2
math/hs-statistics 0.13.2.1_1 --> 0.13.2.3
math/hs-vector-space 0.8.7_1 --> 0.10.2
net/hs-connection 0.2.3_1 --> 0.2.5
net/hs-gsasl 0.3.5_1 --> 0.3.6
net/hs-hoauth2 0.4.3 --> 0.4.8
net/hs-iproute 1.3.1_1 --> 1.5.0
net/hs-network 2.4.2.3_1 --> 2.6.2.1
net/hs-network-info 0.2.0.5_1 --> 0.2.0.7
net/hs-network-multicast 0.0.11_1 --> 0.1.0
net/hs-network-protocol-xmpp 0.4.6_2 --> 0.4.8
net/hs-simple-sendfile 0.2.15_1 --> 0.2.21
print/hs-hscolour 1.20.3_8,1 --> 1.23,1
security/hs-DRBG 0.5.2_1 --> 0.5.4
security/hs-HsOpenSSL 0.11_2 --> 0.11.1.1
security/hs-RSA 2.0.0_1 --> 2.1.0.1
security/hs-SHA 1.6.4.1_1 --> 1.6.4.2
security/hs-cipher-aes 0.2.8_1 --> 0.2.11
security/hs-cipher-aes128 0.6.4_1 --> 0.7.0.1
security/hs-clientsession 0.9.0.3_1 --> 0.9.1.1
security/hs-cprng-aes 0.5.2_1 --> 0.6.1
security/hs-crypto-api 0.13_1 --> 0.13.2
security/hs-crypto-conduit 0.5.4_1 --> 0.5.5
security/hs-crypto-numbers 0.2.3_1 --> 0.2.7
security/hs-crypto-pubkey 0.2.4_1 --> 0.2.8
security/hs-crypto-pubkey-types 0.4.2.2_1 --> 0.4.3
security/hs-crypto-random 0.0.7_1 --> 0.0.9
security/hs-entropy 0.3.2_1 --> 0.3.7
security/hs-gnutls 0.1.5_1 --> 0.2
security/hs-pwstore-fast 2.4.1_1 --> 2.4.4
security/hs-skein 1.0.9_1 --> 1.0.9.3
security/hs-tls 1.2.8_1 --> 1.3.1
security/hs-x509 1.4.11_1 --> 1.6.0
security/hs-x509-store 1.4.4_1 --> 1.6.0
security/hs-x509-system 1.4.5_1 --> 1.6.0
security/hs-x509-validation 1.5.0_1 --> 1.6.0
sysutils/hs-angel 0.5.0_1 --> 0.6.2
sysutils/hs-ekg 0.4.0.1_1 --> 0.4.0.8
sysutils/hs-ekg-core 0.1.0.1_1 --> 0.1.1.0
textproc/hs-Diff 0.3.0_1 --> 0.3.2
textproc/hs-HStringTemplate 0.7.3_1 --> 0.8.3
textproc/hs-HaXml 1.24.1_1 --> 1.25.3
textproc/hs-attoparsec 0.10.4.0_7 --> 0.12.1.6
textproc/hs-attoparsec-enumerator 0.3.3_1 --> 0.3.4
textproc/hs-blaze-html 0.7.0.2_1 --> 0.8.1.0
textproc/hs-blaze-markup 0.6.1.0_1 --> 0.7.0.2
textproc/hs-case-insensitive 1.1.0.3_1 --> 1.2.0.4
textproc/hs-citeproc-hs 0.3.9_1 --> 0.3.10
textproc/hs-double-conversion 0.2.0.6_7 --> 2.0.1.0
textproc/hs-feed 0.3.9.2_1 --> 0.3.10.0
textproc/hs-hexpat 0.20.6_1 --> 0.20.9
textproc/hs-highlighting-kate 0.5.11.1 --> 0.6
textproc/hs-hs-bibutils 5.0_6 --> 5.5
textproc/hs-html-conduit 1.1.0.5_1 --> 1.2.0
textproc/hs-hxt 9.3.1.4_1 --> 9.3.1.15
textproc/hs-hxt-charproperties 9.1.1.1_1 --> 9.2.0.1
textproc/hs-hxt-regex-xmlschema 9.1.0_7 --> 9.2.0.2
textproc/hs-hxt-unicode 9.0.2.2_1 --> 9.0.2.4
textproc/hs-lhs2tex 1.18.1_8 --> 1.19
textproc/hs-pandoc 1.13.2 --> 1.15.0.6
textproc/hs-pandoc-types 1.12.4.1_1 --> 1.12.4.5
textproc/hs-parsec 3.1.5_1 --> 3.1.9
textproc/hs-polyparse 1.9_6 --> 1.11
textproc/hs-stringsearch 0.3.6.5_1 --> 0.3.6.6
textproc/hs-tagsoup 0.13.1_1 --> 0.13.3
textproc/hs-tagstream-conduit 0.5.5.1_1 --> 0.5.5.3
textproc/hs-texmath 0.8.0.1 --> 0.8.3
textproc/hs-uri 0.1.6.2_1 --> 0.1.6.3
textproc/hs-xml 1.3.13_6 --> 1.3.14
textproc/hs-xml-conduit 1.2.1_1 --> 1.3.1
textproc/hs-xml-hamlet 0.4.0.9_1 --> 0.4.0.11
textproc/hs-xml-types 0.3.4_1 --> 0.3.6
textproc/hs-xmlhtml 0.2.3.2_1 --> 0.2.3.4
textproc/hs-yaml 0.8.8.4_1 --> 0.8.13
www/hs-DAV 1.0.1_1 --> 1.0.7
www/hs-HTTP 4000.2.10_1 --> 4000.2.20
www/hs-authenticate 1.3.2.9_1 --> 1.3.2.11
www/hs-cgi 3001.1.8.5_1,1 --> 3001.2.2.2,1
www/hs-cookie 0.4.1.2_1 --> 0.4.1.6
www/hs-gitit 0.10.6.1_1 --> 0.11.1
www/hs-hS3 0.5.8_1 --> 0.5.9
www/hs-happstack-server 7.3.7_1 --> 7.4.4
www/hs-heist 0.13.1.2_1 --> 0.14.1.1
www/hs-hjsmin 0.1.4.7_1 --> 0.1.5.0
www/hs-http-client 0.3.6.1_1 --> 0.4.20
www/hs-http-conduit 2.1.4_1 --> 2.1.8
www/hs-http-date 0.0.4_8 --> 0.0.6.1
www/hs-http-reverse-proxy 0.4.0.1_1 --> 0.4.2
www/hs-http-server 1.0.4_1 --> 1.0.6
www/hs-http-types 0.8.5_1 --> 0.8.6
www/hs-oeis 0.3.5_1 --> 0.3.6
www/hs-path-pieces 0.1.4_1 --> 0.2.0
www/hs-recaptcha 0.1.0.2_1 --> 0.1.0.3
www/hs-shakespeare 2.0.1.1_1 --> 2.0.5
www/hs-snap 0.13.2.8_1 --> 0.14.0.6
www/hs-snap-core 0.9.6.3_1 --> 0.9.7.2
www/hs-snap-server 0.9.4.5_1 --> 0.9.5.1
www/hs-wai 3.0.1.1_1 --> 3.0.3.0
www/hs-wai-app-static 3.0.0_1 --> 3.1.1
www/hs-wai-extra 3.0.1.2_1 --> 3.0.10
www/hs-wai-logger 2.2.0_1 --> 2.2.4.1
www/hs-warp 3.0.0.5_1 --> 3.1.3
www/hs-warp-tls 3.0.0_1 --> 3.1.1
www/hs-webkit 0.12.6.1_1 --> 0.13.1.3
www/hs-xss-sanitize 0.3.5.2_1 --> 0.3.5.6
www/hs-yesod 1.2.6.1_1 --> 1.4.1.5
www/hs-yesod-auth 1.3.4_1 --> 1.4.6
www/hs-yesod-auth-hashdb 1.3.0.1_1 --> 1.4.2.2
www/hs-yesod-bin 1.2.12.3_1 --> 1.4.13.3
www/hs-yesod-core 1.2.19_1 --> 1.4.13
www/hs-yesod-form 1.3.14_1 --> 1.4.4.1
www/hs-yesod-persistent 1.2.3_1 --> 1.4.0.3
www/hs-yesod-static 1.2.4_1 --> 1.5.0.2
www/hs-yesod-test 1.2.3.2_1 --> 1.4.3.1
x11-toolkits/hs-GLURaw 1.4.0.1_1 --> 1.5.0.1
x11-toolkits/hs-GLUT 2.5.1.1_1,1 --> 2.7.0.1,1
x11-toolkits/hs-OpenGL 2.9.2.0_1,1 --> 2.12.0.1,1
x11-toolkits/hs-OpenGLRaw 1.5.0.0_1 --> 2.5.1.0
x11-toolkits/hs-gtk 0.12.5.7_1 --> 0.13.9
x11-toolkits/hs-gtk2hs 0.12.5_1,1 --> 0.13,1
x11-toolkits/hs-gtksourceview2 0.12.5.0_1 --> 0.13.1.3
x11-toolkits/hs-pango 0.12.5.3_1 --> 0.13.1.0
x11-toolkits/hs-vte 0.12.5.0_1 --> 0.13.0.2
x11-toolkits/hs-wx 0.90.1.0_1 --> 0.91.0.0
x11-toolkits/hs-wxc 0.90.1.1_1 --> 0.91.0.0
x11-toolkits/hs-wxcore 0.90.1.1_1 --> 0.91.0.0
x11-toolkits/hs-wxdirect 0.90.1.1_1 --> 0.91.0.0
x11-wm/hs-xmonad 0.11_10 --> 0.11.1
x11-wm/hs-xmonad-contrib 0.11.3_2 --> 0.11.4
x11/hs-xmobar 0.21_1 --> 0.23.1
Removed ports (14):
devel/hs-MaybeT Support for computations with failures (deprecated)
devel/hs-geniplate Use template Haskell to generate Uniplate-like
functions (upstream support is discontinued)
devel/hs-glade Binding to the glade library (upstream support is
discontinued)
devel/hs-haskell-platform The Haskell Platform (it is not tracked any more)
devel/hs-ranges Ranges and various functions on them (deprecated)
devel/hs-testpack Test Utility Pack for HUnit and QuickCheck
(upstream is unmaintained)
graphics/hs-soegtk GUI functions as used in the book "The Haskell
School of Expression" (upstream support is
discontinued)
lang/hs-epic Compiler for a simple functional language (it is
not needed any more)
math/hs-nats Natural numbers (it has been merged into the base
library of GHC)
multimedia/hs-gstreamer Binding to the GStreamer open source multimedia
framework (upstream support is discontinued) [2]
www/hs-scgi Haskell library for writing SCGI programs
(deprecated)
www/hs-yesod-platform Meta package for Yesod (upstream support is
discontinued)
www/hs-yesod-routes Effective routing for Yesod (upstream support is
discontinued)
x11-toolkits/hs-gtkglext Binding to the GTK+ OpenGL Extension (upstream
support is discontinued)
PR: 181049 [1]
PR: 197925 [2]
PR: 200684 [3]
Submitted by: arrowdodger <6yearold@gmail.com> [1]
Obtained from: FreeBSD Haskell
Diffstat (limited to 'lang/ghc')
-rw-r--r-- | lang/ghc/Makefile | 103 | ||||
-rw-r--r-- | lang/ghc/bsd.cabal.mk | 34 | ||||
-rw-r--r-- | lang/ghc/bsd.cabal.options.mk | 14 | ||||
-rw-r--r-- | lang/ghc/bsd.hackage.mk | 61 | ||||
-rw-r--r-- | lang/ghc/distinfo | 24 | ||||
-rw-r--r-- | lang/ghc/files/patch-aclocal.m4 | 57 | ||||
-rw-r--r-- | lang/ghc/files/patch-configure.ac | 14 | ||||
-rw-r--r-- | lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs | 11 | ||||
-rw-r--r-- | lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs | 18 |
9 files changed, 209 insertions, 127 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 9e763ff52093..95106dc9cac9 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ghc -PORTVERSION= 7.8.3 -PORTREVISION= 1 +PORTVERSION= 7.10.2 CATEGORIES= lang haskell MASTER_SITES= http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \ LOCAL/pgj/:boot @@ -20,22 +19,23 @@ ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_NUMBER_LIMIT= 4 GHC_VERSION= ${PORTVERSION} -HSCOLOUR_VERSION= 1.20.3 +HSCOLOUR_VERSION= 1.23 +LLVM_VERSION= 35 DATADIR= ${PREFIX}/share/ghc-${GHC_VERSION} EXAMPLESDIR= ${PREFIX}/share/examples/ghc-${GHC_VERSION} -CONFLICTS= ghc-6.* ghc-7.0.* ghc-7.2.* ghc-7.4.* ghc-7.6.* ghc-7.7.* +CONFLICTS= ghc-7.4.* ghc-7.6.* ghc-7.8.* LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp USE_AUTOTOOLS= autoconf autoheader USE_PERL5= build -USES= gmake iconv:translit ncurses perl5 tar:bzip2 -USE_BINUTILS= yes -USE_GCC= yes +USES= gmake iconv:translit ncurses perl5 tar:xz -MAKE_ENV= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 +MAKE_ENV+= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 +# This is needed on FreeBSD 9.x due to the bootstrap tarball. +TAR= env LC_ALL=en_US.UTF-8 /usr/bin/tar # The configure process accepts,filters and canonicalises # the CONFIGURE_TARGET variable. You can read the files @@ -44,11 +44,17 @@ MAKE_ENV= LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 # You can view below. GNU_CONFIGURE= yes -OPTIONS_DEFINE= PROFILE DYNAMIC LLVM DOCS -OPTIONS_DEFAULT= PROFILE DYNAMIC DOCS +OPTIONS_DEFINE= PROFILE DYNAMIC LLVM DOCS +OPTIONS_SINGLE= C_Compiler +OPTIONS_SINGLE_C_Compiler= GCC PCLANG BCLANG + +OPTIONS_DEFAULT= PROFILE DYNAMIC DOCS GCC BOOT_DESC= Use installed GHC for bootstrapping BOOTH_DESC= Use installed HsColour for bootstrapping +GCC_DESC= Build with GCC (from ports) +PCLANG_DESC= Build with Clang from ports +BCLANG_DESC= Build with Clang from base PROFILE_DESC= Add support for performance profiling DYNAMIC_DESC= Add support for dynamic linking LLVM_DESC= Add support for generating code via LLVM @@ -73,32 +79,39 @@ LIB_DEPENDS+= libffi.so.6:${PORTSDIR}/devel/libffi .if empty(PORT_OPTIONS:MBOOT) -BOOT_GHC_VERSION= 7.6.3 +BOOT_GHC_VERSION= 7.10.2 +DISTFILES+= ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${EXTRACT_SUFX}:boot +LIB_DEPENDS+= libutil.so.9:${PORTSDIR}/misc/compat9x -.if ${ARCH} == "i386" +.endif # MBOOT -.if ${OSVERSION} >= 1000043 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd10-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 900000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd9-boot${EXTRACT_SUFX}:boot -.else -DISTFILES+= ghc-${BOOT_GHC_VERSION}-i386-freebsd8-boot${EXTRACT_SUFX}:boot +.if ${PORT_OPTIONS:MPCLANG} +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION} +RUN_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION} +CC= ${LOCALBASE}/bin/clang${LLVM_VERSION} +CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION} +CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_VERSION} +LDFLAGS+= -B${LOCALBASE}/bin +CFLAGS+= -Qunused-arguments +CONFIGURE_ARGS+= --with-clang=${CC} --with-gcc=${CC} +USE_BINUTILS= yes +.if empty(PORT_OPTIONS:MBOOT) +CONFIGURE_ARGS_BOOT+= --with-clang=${CC} --with-gcc=${CC} .endif - -.elif ${ARCH} == "amd64" - -.if ${OSVERSION} >= 1000043 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd10-boot${EXTRACT_SUFX}:boot -.elif ${OSVERSION} >= 900000 -DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd9-boot${EXTRACT_SUFX}:boot -.else -DISTFILES+= ghc-${BOOT_GHC_VERSION}-amd64-freebsd8-boot${EXTRACT_SUFX}:boot +.elif ${PORT_OPTIONS:MBCLANG} +CC= /usr/bin/clang +CXX= /usr/bin/clang++ +CPP= /usr/bin/clang-cpp +CFLAGS+= -Qunused-arguments +CONFIGURE_ARGS+= --with-clang=${CC} --with-gcc=${CC} +.else # GCC +USE_GCC= yes +CONFIGURE_ARGS+= --with-gcc=${CC} +.if empty(PORT_OPTIONS:MBOOT) +CONFIGURE_ARGS_BOOT+= --with-gcc=${CC} .endif - .endif -.endif # MBOOT - DOCSDIR= ${PREFIX}/share/doc/${DISTNAME} GHC_LIBDIR= ${STAGEDIR}${PREFIX}/lib/ghc-${GHC_VERSION} GHC_LIBDIR_REL= lib/ghc-${GHC_VERSION} @@ -107,8 +120,7 @@ PLIST_SUB+= GHC_VERSION=${GHC_VERSION} GHC_LIBDIR=${GHC_LIBDIR_REL} HACKAGE_SITE?= http://hackage.haskell.org/package/ -CONFIGURE_ARGS= --with-gcc=${CC} \ - --with-ld=${LD} \ +CONFIGURE_ARGS+= --with-ld=${LD} \ --with-gmp-includes=${LOCALBASE}/include \ --with-gmp-libraries=${LOCALBASE}/lib @@ -122,11 +134,11 @@ CONFIGURE_ARGS+= --with-system-libffi \ .endif .if ${PORT_OPTIONS:MLLVM} -BUILD_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34 -RUN_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34 +BUILD_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION} +RUN_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION} -CONFIGURE_ARGS+= --with-opt=${LOCALBASE}/bin/opt34 \ - --with-llc=${LOCALBASE}/bin/llc34 +CONFIGURE_ARGS+= --with-opt=${LOCALBASE}/bin/opt${LLVM_VERSION} \ + --with-llc=${LOCALBASE}/bin/llc${LLVM_VERSION} .endif .if empty(PORT_OPTIONS:MBOOT) @@ -138,7 +150,7 @@ BOOT_HSC2HS= ${BOOT_DIR}/bin/hsc2hs SLAVE_CMD= ${SETENV} PATH=${BOOT_DIR}/bin:${PATH} -CONFIGURE_ARGS_BOOT= --prefix=${BOOT_DIR} --with-gcc=${CC} --with-ld=${LD} +CONFIGURE_ARGS_BOOT+= --prefix=${BOOT_DIR} --with-ld=${LD} CONFIGURE_ARGS+= --with-ghc=${BOOT_GHC} .else # MBOOT @@ -156,7 +168,6 @@ CFLAGS+= -I${LOCALBASE}/include # override TMPDIR because /tmp often doesn't have enough space # to build some of the larger libraries. TMPDIR= ${WRKSRC}/tmp -MAKE_ENV+= TMPDIR=${TMPDIR} # Defining with documentation: # An in place installation and registration of hscolour will be @@ -181,7 +192,6 @@ SLAVES_PREFIX= ${WRKDIR}/slaves_prefix SLAVES_WRKDIRPREFIX= ${WRKDIR}/slaves_wrkdirprefix MAKE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} -MAKE_ENV+= LC_ALL=en_US.UTF-8 CONFIGURE_ENV+= PATH=${SLAVES_PREFIX}/bin:${PATH} .endif # MBOOTH @@ -217,6 +227,9 @@ post-extract: @${ECHO} >> ${WRKSRC}/mk/build.mk "BSD_PATH_TO_HSC2HS = ${BOOT_HSC2HS}" .endif @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -I${NCURSESINC} -L${NCURSESLIB} -I${LOCALBASE}/include -L${LOCALBASE}/lib" +.if ${PORT_OPTIONS:MPCLANG} + @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_HC_OPTS += -optl=-B${LOCALBASE}/bin" +.endif @${ECHO} >> ${WRKSRC}/mk/build.mk "SRC_CC_OPTS += ${CFLAGS}" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_HSC2HS_OPTS += -I${LOCALBASE}/include --lflag=-L${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_LD_OPTS += -L${LOCALBASE}/lib" @@ -224,6 +237,12 @@ post-extract: @${ECHO} >> ${WRKSRC}/mk/build.mk "EXTRA_CABAL_CONFIGURE_FLAGS += --extra-lib-dirs=${LOCALBASE}/lib" @${ECHO} >> ${WRKSRC}/mk/build.mk "libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes=${NCURSESINC} --configure-option=--with-curses-libraries=${NCURSESLIB}" @${ECHO} >> ${WRKSRC}/mk/build.mk "V = 0" +.if ${PORT_OPTIONS:MBCLANG} || ${PORT_OPTIONS:MPCLANG} + @${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${WRKSRC}/settings.in +.if empty(PORT_OPTIONS:MBOOT) + @${REINPLACE_CMD} -e 's|@SettingsCCompilerFlags@|& -Qunused-arguments|' ${BOOT_DIR}/settings.in +.endif +.endif post-install-script: @${FIND} -ds ${GHC_LIBDIR} -type f -print | ${SED} -E -e \ @@ -249,7 +268,6 @@ post-install-script: post-patch: @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|; \ s|%%AR%%|${AR}|; \ - s|%%RANLIB%%|${RANLIB}|; \ s|%%LD%%|${LD}|' \ ${WRKSRC}/libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs @@ -260,9 +278,6 @@ pre-configure: @(cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install) .endif -# Defining with documentation: -# Defining "SLAVE" in devel/hs-haddock and print/hs-hscolour flips the building process -# functionally to this port. .if ${PORT_OPTIONS:MDOCS} && empty(PORT_OPTIONS:MBOOTH) @${ECHO_MSG} -e "\a" @${ECHO_MSG} "======================================================================" @@ -290,7 +305,7 @@ post-install: .if ${PORT_OPTIONS:MDOCS} @${LN} -sf haddock-ghc-${GHC_VERSION} ${STAGEDIR}${PREFIX}/bin/haddock .endif - @(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit ${GHC_LIBDIR}/mkGmpDerivedConstants \ + @(for f in ${STAGEDIR}${PREFIX}/bin/hp2ps ${GHC_LIBDIR}/unlit \ $$(${FIND} ${GHC_LIBDIR}/bin -type f; ${FIND} ${GHC_LIBDIR} -name '*.so'); do \ ${STRIP_CMD} $$f; done) diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk index 7b9188422ecb..fae7bb72ae9c 100644 --- a/lang/ghc/bsd.cabal.mk +++ b/lang/ghc/bsd.cabal.mk @@ -10,8 +10,10 @@ # .if !defined(METAPORT) -MASTER_SITES?= http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/ +MASTER_SITES?= http://hackage.haskell.org/package/${PORTNAME}-${PORTVERSION}/:hackage +DISTFILES?= ${DISTNAME}${EXTRACT_SUFX}:hackage DIST_SUBDIR?= cabal +EXTRACT_ONLY?= ${DISTNAME}${EXTRACT_SUFX} .else USES+= metaport .endif # !METAPORT @@ -74,18 +76,34 @@ BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc BUILD_DEPENDS+= ghc>=${GHC_VERSION}:${PORTSDIR}/lang/ghc .endif + +.if ${PORT_OPTIONS:MPCLANG} +BUILD_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION} +RUN_DEPENDS+= ${LOCALBASE}/bin/clang${LLVM_VERSION}:${PORTSDIR}/lang/clang${LLVM_VERSION} +CC= ${LOCALBASE}/bin/clang${LLVM_VERSION} +CXX= ${LOCALBASE}/bin/clang++${LLVM_VERSION} +CPP= ${LOCALBASE}/bin/clang-cpp${LLVM_VERSION} +CFLAGS+= -Qunused-arguments +LDFLAGS+= -B${LOCALBASE}/bin +CONFIGURE_ARGS+= --ghc-option=-optl=-B${LOCALBASE}/bin USE_BINUTILS= yes +.elif ${PORT_OPTIONS:MBCLANG} +CC= /usr/bin/clang +CXX= /usr/bin/clang++ +CPP= /usr/bin/clang-cpp +CFLAGS+= -Qunused-arguments +.else # GCC USE_GCC= yes +.endif -CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} \ - --with-ranlib=${RANLIB} +CONFIGURE_ARGS+= --with-gcc=${CC} --with-ld=${LD} --with-ar=${AR} .if ${PORT_OPTIONS:MLLVM} CONFIGURE_ARGS+= --ghc-option=-fllvm \ - --ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt34 \ - --ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc34 + --ghc-option=-pgmlo --ghc-option=${LOCALBASE}/bin/opt${LLVM_VERSION} \ + --ghc-option=-pgmlc --ghc-option=${LOCALBASE}/bin/llc${LLVM_VERSION} -BUILD_DEPENDS+= ${LOCALBASE}/bin/opt34:${PORTSDIR}/devel/llvm34 +BUILD_DEPENDS+= ${LOCALBASE}/bin/opt${LLVM_VERSION}:${PORTSDIR}/devel/llvm${LLVM_VERSION} .endif .if defined(USE_ALEX) @@ -154,7 +172,7 @@ HADDOCK_OPTS= # empty .if ${PORT_OPTIONS:MHSCOLOUR} BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour -HSCOLOUR_VERSION= 1.20.3 +HSCOLOUR_VERSION= 1.23 HSCOLOUR_DATADIR= ${LOCALBASE}/share/cabal/ghc-${GHC_VERSION}/hscolour-${HSCOLOUR_VERSION} HADDOCK_OPTS+= --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css .endif # HSCOLOUR @@ -180,7 +198,6 @@ CONFIGURE_ARGS+= --haddock-options=-w --with-haddock=${HADDOCK_CMD} .if ${PORT_OPTIONS:MDYNAMIC} CONFIGURE_ARGS+= --enable-shared --enable-executable-dynamic -CONFIGURE_ARGS+= "--ghc-option=-optl -rpath" "--ghc-option=-optl ${CABAL_LIBDIR}/${DISTNAME}" .else CONFIGURE_ARGS+= --disable-shared --disable-executable-dynamic .endif @@ -260,6 +277,7 @@ do-install: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${SETUP_CMD} copy --destdir=${STAGEDIR} .if !defined(STANDALONE) + @${MKDIR} ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR} cd ${WRKSRC} && ${INSTALL_SCRIPT} register.sh ${STAGEDIR}${CABAL_LIBDIR}/${CABAL_LIBSUBDIR}/register.sh .endif diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk index ca06b7974bc0..ae70ad7ec24e 100644 --- a/lang/ghc/bsd.cabal.options.mk +++ b/lang/ghc/bsd.cabal.options.mk @@ -18,19 +18,27 @@ GHC_CMD?= ${LOCALBASE}/bin/ghc HADDOCK_CMD?= ${LOCALBASE}/bin/haddock HSCOLOUR_CMD?= ${LOCALBASE}/bin/HsColour -GHC_VERSION?= 7.8.3 +GHC_VERSION?= 7.10.2 +LLVM_VERSION= 35 HSCOLOUR_DESC?= Colorize generated documentation by HsColour DYNAMIC_DESC?= Add support for dynamic linking PROFILE_DESC?= Add support for profiling LLVM_DESC?= Use the LLVM backend for code generation +GCC_DESC= Build with GCC (from ports) +PCLANG_DESC= Build with Clang from ports +BCLANG_DESC= Build with Clang from base -.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.dyn_hi)) && !defined(IGNORE_DYNAMIC) +OPTIONS_SINGLE+= C_Compiler +OPTIONS_SINGLE_C_Compiler= GCC PCLANG BCLANG +OPTIONS_DEFAULT+= GCC + +.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts-ghc${GHC_VERSION}.so)) && !defined(IGNORE_DYNAMIC) OPTIONS_DEFINE+= DYNAMIC OPTIONS_DEFAULT+= DYNAMIC .endif -.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/ghc-${GHC_VERSION}/GHC.p_hi)) && !defined(IGNORE_PROFILE) +.if (!exists(${GHC_CMD}) || exists(${LOCALBASE}/lib/ghc-${GHC_VERSION}/rts/libHSrts_p.a)) && !defined(IGNORE_PROFILE) OPTIONS_DEFINE+= PROFILE .endif diff --git a/lang/ghc/bsd.hackage.mk b/lang/ghc/bsd.hackage.mk index 01617fc46ef8..72fbdd5f68f5 100644 --- a/lang/ghc/bsd.hackage.mk +++ b/lang/ghc/bsd.hackage.mk @@ -15,7 +15,9 @@ abstract-deque_port= devel/hs-abstract-deque abstract-par_port= devel/hs-abstract-par activehs_port= www/hs-activehs # executable activehs-base_port= devel/hs-activehs-base +adjunctions_port= math/hs-adjunctions aeson_port= converters/hs-aeson +aeson-pretty_port= converters/hs-aeson-pretty # executable Agda_port= math/hs-Agda # executable alex_port= devel/hs-alex # executable ALUT_port= audio/hs-ALUT @@ -34,10 +36,13 @@ attoparsec_port= textproc/hs-attoparsec attoparsec-enumerator_port= textproc/hs-attoparsec-enumerator authenticate_port= www/hs-authenticate auto-update_port= devel/hs-auto-update +aws_port= net/hs-aws +base-orphans_port= devel/hs-base-orphans base-unicode-symbols_port= devel/hs-base-unicode-symbols base16-bytestring_port= devel/hs-base16-bytestring base64-bytestring_port= devel/hs-base64-bytestring basic-prelude_port= devel/hs-basic-prelude +bencode_port= textproc/hs-bencode bifunctors_port= devel/hs-bifunctors bio_port= science/hs-bio # executable bits-atomic_port= devel/hs-bits-atomic @@ -57,12 +62,14 @@ byteable_port= devel/hs-byteable byteorder_port= devel/hs-byteorder bytestring-csv_port= textproc/hs-bytestring-csv bytestring-lexing_port= devel/hs-bytestring-lexing +bytestring-mmap_port= devel/hs-bytestring-mmap bytestring-nums_port= devel/hs-bytestring-nums # executable bytestring-show_port= devel/hs-bytestring-show c2hs_port= devel/hs-c2hs # executable cabal-install_port= devel/hs-cabal-install # executable cairo_port= graphics/hs-cairo case-insensitive_port= textproc/hs-case-insensitive +cassava_port= textproc/hs-cassava categories_port= math/hs-categories cereal_port= devel/hs-cereal certificate_port= security/hs-certificate @@ -79,6 +86,7 @@ citeproc-hs_port= textproc/hs-citeproc-hs classy-prelude_port= devel/hs-classy-prelude classy-prelude-conduit_port= devel/hs-classy-prelude-conduit clientsession_port= security/hs-clientsession +cmark_port= textproc/hs-cmark cmdargs_port= devel/hs-cmdargs comonad_port= math/hs-comonad conduit_port= devel/hs-conduit @@ -87,6 +95,7 @@ conduit-extra_port= devel/hs-conduit-extra ConfigFile_port= devel/hs-ConfigFile configurator_port= devel/hs-configurator connection_port= net/hs-connection +constraints_port= devel/hs-constraints contravariant_port= math/hs-contravariant convertible_port= devel/hs-convertible cookie_port= www/hs-cookie @@ -107,6 +116,7 @@ cryptocipher_port= security/hs-cryptocipher cryptohash_port= security/hs-cryptohash cryptohash-conduit_port= security/hs-cryptohash-conduit cryptohash-cryptoapi_port= security/hs-cryptohash-cryptoapi +cryptonite_port= security/hs-cryptonite css-text_port= www/hs-css-text csv_port= textproc/hs-csv curl_port= ftp/hs-curl # lib_depends @@ -120,6 +130,7 @@ data-default-instances-old-locale_port= devel/hs-data-default-instances- data-hash_port= devel/hs-data-hash data-lens_port= math/hs-data-lens data-lens-template_port= math/hs-data-lens-template +data-ordlist_port= devel/hs-data-ordlist data-pprint_port= devel/hs-data-pprint dataenc_port= converters/hs-dataenc date-cache_port= devel/hs-date-cache @@ -137,21 +148,23 @@ dlist-instances_port= devel/hs-dlist-instances dns_port= dns/hs-dns double-conversion_port= textproc/hs-double-conversion DRBG_port= security/hs-DRBG +easy-file_port= devel/hs-easy-file edit-distance_port= devel/hs-edit-distance either_port= devel/hs-either ekg_port= sysutils/hs-ekg ekg-core_port= sysutils/hs-ekg-core +ekg-json_port= sysutils/hs-ekg-json email-validate_port= mail/hs-email-validate enclosed-exceptions_port= devel/hs-enclosed-exceptions entropy_port= security/hs-entropy enumerator_port= devel/hs-enumerator -epic_port= lang/hs-epic # executable equivalence_port= devel/hs-equivalence erf_port= math/hs-erf errors_port= devel/hs-errors esqueleto_port= databases/hs-esqueleto exceptions_port= devel/hs-exceptions extensible-exceptions_port= devel/hs-extensible-exceptions +extra_port= devel/hs-extra fast-logger_port= devel/hs-fast-logger fastcgi_port= www/hs-fastcgi # lib_depends feed_port= textproc/hs-feed @@ -163,14 +176,13 @@ free_port= devel/hs-free fsnotify_port= devel/hs-fsnotify gconf_port= devel/hs-gconf generic-deriving_port= devel/hs-generic-deriving -geniplate_port= devel/hs-geniplate +geniplate-mirror_port= devel/hs-geniplate-mirror ghc-events_port= devel/hs-ghc-events # executable ghc-mtl_port= devel/hs-ghc-mtl ghc-paths_port= devel/hs-ghc-paths gio_port= devel/hs-gio git-annex_port= devel/hs-git-annex # executable gitit_port= www/hs-gitit # executable -glade_port= devel/hs-glade glib_port= devel/hs-glib Glob_port= devel/hs-Glob GLURaw_port= x11-toolkits/hs-GLURaw @@ -178,13 +190,12 @@ GLUT_port= x11-toolkits/hs-GLUT gnuidn_port= dns/hs-gnuidn # lib_depends gnutls_port= security/hs-gnutls # lib_depends gsasl_port= net/hs-gsasl # lib_depends -gstreamer_port= multimedia/hs-gstreamer # lib_depends gtk_port= x11-toolkits/hs-gtk gtk2hs_port= x11-toolkits/hs-gtk2hs # metaport gtk2hs-buildtools_port= devel/hs-gtk2hs-buildtools # executable -gtkglext_port= x11-toolkits/hs-gtkglext # lib_depends gtksourceview2_port= x11-toolkits/hs-gtksourceview2 haddock_port= devel/hs-haddock # executable +haddock-api_port= devel/hs-haddock-api haddock-library_port= devel/hs-haddock-library happstack_port= www/hs-happstack # executable happstack-server_port= www/hs-happstack-server @@ -192,14 +203,15 @@ happy_port= devel/hs-happy hashable_port= devel/hs-hashable hashed-storage_port= devel/hs-hashed-storage hashtables_port= devel/hs-hashtables -haskell-platform_port= devel/hs-haskell-platform # metaport haskell-src_port= devel/hs-haskell-src haskell-src-exts_port= devel/hs-haskell-src-exts +haskell-xmpp_port= net-im/hs-haskell-xmpp hasktags_port= devel/hs-hasktags # executable hastache_port= devel/hs-hastache HaXml_port= textproc/hs-HaXml # executable hedis_port= databases/hs-hedis heist_port= www/hs-heist +hex_port= devel/hs-hex hexpat_port= textproc/hs-hexpat HGL_port= graphics/hs-HGL highlighting-kate_port= textproc/hs-highlighting-kate @@ -211,13 +223,17 @@ hlint_port= devel/hs-hlint hoauth2_port= net/hs-hoauth2 hoogle_port= devel/hs-hoogle # executable hostname_port= net/hs-hostname +hourglass_port= devel/hs-hourglass hs-bibutils_port= textproc/hs-hs-bibutils hS3_port= www/hs-hS3 # executable +hsb2hs_port= devel/hs-hsb2hs hscolour_port= print/hs-hscolour # executable hslogger_port= devel/hs-hslogger hslua_port= devel/hs-hslua HsOpenSSL_port= security/hs-HsOpenSSL hspec_port= devel/hs-hspec # executable +hspec-core_port= devel/hs-hspec-core +hspec-discover_port= devel/hs-hspec-discover # executable hspec-expectations_port= devel/hs-hspec-expectations HStringTemplate_port= textproc/hs-HStringTemplate html_port= textproc/hs-html @@ -230,6 +246,7 @@ http-date_port= www/hs-http-date http-reverse-proxy_port= www/hs-http-reverse-proxy http-server_port= www/hs-http-server http-types_port= www/hs-http-types +http2_port= www/hs-http2 HUnit_port= devel/hs-HUnit hxt_port= textproc/hs-hxt hxt-charproperties_port= textproc/hs-hxt-charproperties @@ -238,8 +255,11 @@ hxt-unicode_port= textproc/hs-hxt-unicode ieee754_port= math/hs-ieee754 IfElse_port= devel/hs-IfElse iproute_port= net/hs-iproute +js-flot_port= devel/hs-js-flot +js-jquery_port= devel/hs-js-jquery json_port= converters/hs-json JuicyPixels_port= graphics/hs-JuicyPixels +kan-extensions_port= math/hs-kan-extensions keys_port= devel/hs-keys kqueue_port= devel/hs-kqueue language-c_port= devel/hs-language-c @@ -251,12 +271,14 @@ lhs2tex_port= textproc/hs-lhs2tex libmpd_port= audio/hs-libmpd libxml_port= textproc/hs-libxml libxml-sax_port= textproc/hs-libxml-sax # lib_depends +lifted-async_port= devel/hs-lifted-async lifted-base_port= devel/hs-lifted-base List_port= devel/hs-List logict_port= devel/hs-logict maccatcher_port= net/hs-maccatcher +map-syntax_port= devel/hs-map-syntax math-functions_port= math/hs-math-functions -MaybeT_port= devel/hs-MaybeT +memory_port= devel/hs-memory MemoTrie_port= devel/hs-MemoTrie mime_port= mail/hs-mime mime-mail_port= mail/hs-mime-mail @@ -277,22 +299,29 @@ monads-tf_port= devel/hs-monads-tf mono-traversable_port= devel/hs-mono-traversable mtl_port= devel/hs-mtl mueval_port= devel/hs-mueval # executable +multipart_port= www/hs-multipart murmur-hash_port= devel/hs-murmur-hash +mutable-containers_port= devel/hs-mutable-containers mwc-random_port= math/hs-mwc-random mysql_port= databases/hs-mysql -nats_port= math/hs-nats network_port= net/hs-network network-info_port= net/hs-network-info network-multicast_port= net/hs-network-multicast network-protocol-xmpp_port= net/hs-network-protocol-xmpp +network-uri_port= net/hs-network-uri +newtype_port= devel/hs-newtype +nonce_port= security/hs-nonce NumInstances_port= math/hs-NumInstances ObjectName_port= devel/hs-ObjectName oeis_port= www/hs-oeis +old-locale_port= devel/hs-old-locale +old-time_port= devel/hs-old-time OpenAL_port= audio/hs-OpenAL OpenGL_port= x11-toolkits/hs-OpenGL OpenGLRaw_port= x11-toolkits/hs-OpenGLRaw optparse-applicative_port= devel/hs-optparse-applicative pandoc_port= textproc/hs-pandoc # executable +pandoc-citeproc_port= textproc/hs-pandoc-citeproc # executable pandoc-types_port= textproc/hs-pandoc-types pango_port= x11-toolkits/hs-pango parallel_port= devel/hs-parallel @@ -308,6 +337,7 @@ pointed_port= math/hs-pointed polyparse_port= textproc/hs-polyparse porte_port= ports-mgmt/hs-porte # executable prelude-extras_port= devel/hs-prelude-extras +preprocessor-tools_port= devel/hs-preprocessor-tools prettyclass_port= devel/hs-prettyclass primitive_port= devel/hs-primitive probability_port= math/hs-probability @@ -320,22 +350,24 @@ pwstore-fast_port= security/hs-pwstore-fast QuickCheck_port= devel/hs-QuickCheck quickcheck-io_port= devel/hs-quickcheck-io random_port= devel/hs-random -ranges_port= devel/hs-ranges ReadArgs_port= devel/hs-ReadArgs # executable readline_port= devel/hs-readline recaptcha_port= www/hs-recaptcha reflection_port= devel/hs-reflection +regex-applicative_port= textproc/hs-regex-applicative regex-base_port= textproc/hs-regex-base regex-compat_port= textproc/hs-regex-compat +regex-compat-tdfa_port= textproc/hs-regex-compat-tdfa regex-pcre-builtin_port= textproc/hs-regex-pcre-builtin # lib_depends regex-posix_port= textproc/hs-regex-posix regex-tdfa_port= textproc/hs-regex-tdfa resource-pool_port= devel/hs-resource-pool resourcet_port= devel/hs-resourcet +rfc5051_port= textproc/hs-rfc5051 RSA_port= security/hs-RSA safe_port= devel/hs-safe SafeSemaphore_port= devel/hs-SafeSemaphore -scgi_port= www/hs-scgi +sandi_port= converters/hs-sandi scientific_port= devel/hs-scientific securemem_port= devel/hs-securemem semigroupoids_port= math/hs-semigroupoids @@ -346,6 +378,7 @@ SHA_port= security/hs-SHA shake_port= devel/hs-shake # executable shakespeare_port= www/hs-shakespeare ShellCheck_port= devel/hs-ShellCheck # executable +shelly_port= shells/hs-shelly show_port= devel/hs-show silently_port= devel/hs-silently simple-reflect_port= devel/hs-simple-reflect @@ -356,8 +389,8 @@ snap_port= www/hs-snap snap-core_port= www/hs-snap-core snap-server_port= www/hs-snap-server # lib_depends socks_port= net/hs-socks -soegtk_port= graphics/hs-soegtk split_port= devel/hs-split +StateVar_port= devel/hs-StateVar statistics_port= math/hs-statistics stm_port= devel/hs-stm stm-chans_port= devel/hs-stm-chans @@ -380,7 +413,6 @@ temporary_port= devel/hs-temporary test-framework_port= devel/hs-test-framework test-framework-hunit_port= devel/hs-test-framework-hunit test-framework-quickcheck2_port= devel/hs-test-framework-quickcheck2 -testpack_port= devel/hs-testpack texmath_port= textproc/hs-texmath # executable text_port= devel/hs-text text-icu_port= devel/hs-text-icu # lib_depends @@ -388,9 +420,11 @@ tf-random_port= devel/hs-tf-random threads_port= devel/hs-threads threadscope_port= devel/hs-threadscope # executable time-compat_port= devel/hs-time-compat +time-locale-compat_port= devel/hs-time-locale-compat timezone-olson_port= devel/hs-timezone-olson timezone-series_port= devel/hs-timezone-series tls_port= security/hs-tls +torrent_port= net-p2p/hs-torrent transformers-base_port= devel/hs-transformers-base transformers-compat_port= devel/hs-transformers-compat TypeCompose_port= devel/hs-TypeCompose @@ -409,6 +443,7 @@ uuagc_port= devel/hs-uuagc uuagc-bootstrap_port= devel/hs-uuagc-bootstrap # executable uuagc-cabal_port= devel/hs-uuagc-cabal uuid_port= devel/hs-uuid +uuid-types_port= devel/hs-uuid-types uulib_port= devel/hs-uulib vault_port= devel/hs-vault vector_port= devel/hs-vector @@ -454,8 +489,6 @@ yesod-bin_port= www/hs-yesod-bin yesod-core_port= www/hs-yesod-core yesod-form_port= www/hs-yesod-form yesod-persistent_port= www/hs-yesod-persistent -yesod-platform_port= www/hs-yesod-platform -yesod-routes_port= www/hs-yesod-routes yesod-static_port= www/hs-yesod-static yesod-test_port= www/hs-yesod-test zip-archive_port= archivers/hs-zip-archive diff --git a/lang/ghc/distinfo b/lang/ghc/distinfo index 430202064f0b..04c2eab3129c 100644 --- a/lang/ghc/distinfo +++ b/lang/ghc/distinfo @@ -1,16 +1,8 @@ -SHA256 (ghc-7.8.3-src.tar.bz2) = 2358826f8424bf571dcc313bd882422fe108a340d6e37db4339ff6d5d6ac3f37 -SIZE (ghc-7.8.3-src.tar.bz2) = 10696541 -SHA256 (hscolour-1.20.3.tar.gz) = 3adb816fba3ecdf9f1ee5fb23feb0611b0762f7e8c2a282c2def5cc2f5483d96 -SIZE (hscolour-1.20.3.tar.gz) = 25810 -SHA256 (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = efdb68255cdcdeabbec1031a44f631cf8d0a619f9687b09d5a00230d3b871148 -SIZE (ghc-7.6.3-i386-freebsd8-boot.tar.bz2) = 55495926 -SHA256 (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 15ab9262d0f7ba213431b73e1a21318d5a420fb298b3f7cb28da1c8562241dcd -SIZE (ghc-7.6.3-amd64-freebsd8-boot.tar.bz2) = 55410502 -SHA256 (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 2a10cc8aa24282612c1ba9a8dd2234192bef2f307fd70fa209b32bb97a1d73a2 -SIZE (ghc-7.6.3-i386-freebsd9-boot.tar.bz2) = 55500650 -SHA256 (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = a0e21b166c94994a22005d0bb15822d16c10e79856f57b500466e23d8f5c13a6 -SIZE (ghc-7.6.3-amd64-freebsd9-boot.tar.bz2) = 55418614 -SHA256 (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 4ab59ac9642641d612fdb636e544248ee2e74834bafe1d29ef556215ea097409 -SIZE (ghc-7.6.3-i386-freebsd10-boot.tar.bz2) = 55512004 -SHA256 (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 8ce856cbd5b9fa230d17bc3d28b96206d84dce4aa3c1c9c7016262ff132271ad -SIZE (ghc-7.6.3-amd64-freebsd10-boot.tar.bz2) = 55418435 +SHA256 (ghc-7.10.2-src.tar.xz) = 54cd73755b784d78e2f13d5eb161bfa38d3efee9e8a56f7eb6cd9f2d6e2615f5 +SIZE (ghc-7.10.2-src.tar.xz) = 11113204 +SHA256 (hscolour-1.23.tar.gz) = 97167eaecc309eff51317d6e925881bc9f27921bd52692121f0fc5aaee1791b0 +SIZE (hscolour-1.23.tar.gz) = 26027 +SHA256 (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 5cadd55316fe6c1bf275d0f44f10b46342096922a15ecb9fb78c80fc293f901a +SIZE (ghc-7.10.2-boot-i386-freebsd.tar.xz) = 39858716 +SHA256 (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 4af0ee0795537baa11a96fba23477f8390ccb5f45910cda119d0a16bdebaedc8 +SIZE (ghc-7.10.2-boot-amd64-freebsd.tar.xz) = 49833224 diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4 index e4727230d96d..550ec1adc5ef 100644 --- a/lang/ghc/files/patch-aclocal.m4 +++ b/lang/ghc/files/patch-aclocal.m4 @@ -1,20 +1,39 @@ ---- ./aclocal.m4.orig 2014-07-10 06:27:16.000000000 +0200 -+++ ./aclocal.m4 2014-07-11 11:23:41.000000000 +0200 -@@ -47,6 +47,8 @@ - # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET} - # so this justs uses $bootstrap_target. +--- aclocal.m4.orig 2015-07-21 13:52:50 UTC ++++ aclocal.m4 +@@ -1718,36 +1718,6 @@ int main(int argc, char *argv[]) + } + alarm(1); -+ bootstrap_target=`echo "$bootstrap_target" | sed -e 's/-unknown-/-portbld-/g'` -+ - if test "$build_alias" = "" - then - if test "$bootstrap_target" != "" -@@ -1817,7 +1819,7 @@ - dnl If special linker flags are needed to build things, then allow - dnl the user to pass them in via LDFLAGS. - changequote(, )dnl -- GHC_LDFLAGS=`echo $LDFLAGS | sed 's/\(^\| \)\([^ ]\)/\1-optl\2/g'` -+ GHC_LDFLAGS=`echo $LDFLAGS | sed -r 's/(^| )([^ ])/\1-optl\2/g'` - changequote([, ])dnl - if ! "$WithGhc" $GHC_LDFLAGS -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd - then +- if (timer_create(CLOCK_PROCESS_CPUTIME_ID, &ev, &timer) != 0) { +- fprintf(stderr,"No CLOCK_PROCESS_CPUTIME_ID timer\n"); +- exit(1); +- } +- +- it.it_value.tv_sec = 0; +- it.it_value.tv_nsec = 1; +- it.it_interval = it.it_value; +- if (timer_settime(timer, 0, &it, NULL) != 0) { +- fprintf(stderr,"settime problem\n"); +- exit(4); +- } +- +- tock = 0; +- +- for(n = 3; n < 20000; n++){ +- for(m = 2; m <= n/2; m++){ +- if (!(n%m)) count++; +- if (tock) goto out; +- } +- } +-out: +- +- if (!tock) { +- fprintf(stderr,"no CLOCK_PROCESS_CPUTIME_ID signal\n"); +- exit(5); +- } +- +- timer_delete(timer); +- + if (timer_create(CLOCK_REALTIME, &ev, &timer) != 0) { + fprintf(stderr,"No CLOCK_REALTIME timer\n"); + exit(2); diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac index 7f1323c78d5c..ddffa1650ae5 100644 --- a/lang/ghc/files/patch-configure.ac +++ b/lang/ghc/files/patch-configure.ac @@ -1,6 +1,6 @@ ---- ./configure.ac.orig 2014-07-10 07:04:42.000000000 +0200 -+++ ./configure.ac 2014-07-11 10:27:40.000000000 +0200 -@@ -435,6 +435,9 @@ +--- configure.ac.orig 2015-07-21 19:50:11 UTC ++++ configure.ac +@@ -383,6 +383,9 @@ AC_SUBST([SplitObjsBroken]) dnl ** Building a cross compiler? dnl -------------------------------------------------------------- CrossCompiling=NO @@ -10,11 +10,3 @@ # If 'host' and 'target' differ, then this means we are building a cross-compiler. if test "$target" != "$host" ; then CrossCompiling=YES -@@ -914,7 +917,6 @@ - FP_VISIBILITY_HIDDEN - - dnl ** check for librt --AC_CHECK_LIB(rt, clock_gettime) - AC_CHECK_FUNCS(clock_gettime timer_settime) - FP_CHECK_TIMER_CREATE - diff --git a/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs new file mode 100644 index 000000000000..53cf700d7ccc --- /dev/null +++ b/lang/ghc/files/patch-libraries_Cabal_Cabal_Distribution_Simple_GHC.hs @@ -0,0 +1,11 @@ +--- libraries/Cabal/Cabal/Distribution/Simple/GHC.hs.orig 2015-04-01 00:24:45 UTC ++++ libraries/Cabal/Cabal/Distribution/Simple/GHC.hs +@@ -875,7 +875,7 @@ getRPaths lbi clbi | supportRPaths hostO + supportRPaths Linux = True + supportRPaths Windows = False + supportRPaths OSX = True +- supportRPaths FreeBSD = False ++ supportRPaths FreeBSD = True + supportRPaths OpenBSD = False + supportRPaths NetBSD = False + supportRPaths DragonFly = False diff --git a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs index 029e58760180..7a4425743eaa 100644 --- a/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs +++ b/lang/ghc/files/patch-libraries__Cabal__Cabal__Distribution__Simple__Program__Builtin.hs @@ -1,18 +1,12 @@ ---- ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2014-07-10 06:34:21.000000000 +0200 -+++ ./libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs 2014-07-26 23:57:20.869626927 +0200 -@@ -198,13 +198,18 @@ +--- libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs.orig 2015-06-19 10:36:50 UTC ++++ libraries/Cabal/Cabal/Distribution/Simple/Program/Builtin.hs +@@ -261,10 +261,13 @@ alexProgram = (simpleProgram "alex") { gccProgram :: Program gccProgram = (simpleProgram "gcc") { programFindVersion = findProgramVersion "-dumpversion" id + , programFindLocation = \v p -> findProgramOnSearchPath v p "%%CC%%" } - ranlibProgram :: Program --ranlibProgram = simpleProgram "ranlib" -+ranlibProgram = (simpleProgram "ranlib") { -+ programFindLocation = \_v _p -> return (Just "%%RANLIB%%") -+ } - arProgram :: Program -arProgram = simpleProgram "ar" +arProgram = (simpleProgram "ar") { @@ -20,8 +14,8 @@ + } stripProgram :: Program - stripProgram = simpleProgram "strip" -@@ -257,7 +262,9 @@ + stripProgram = (simpleProgram "strip") { +@@ -336,7 +339,9 @@ greencardProgram :: Program greencardProgram = simpleProgram "greencard" ldProgram :: Program @@ -31,4 +25,4 @@ + } tarProgram :: Program - tarProgram = simpleProgram "tar" + tarProgram = (simpleProgram "tar") { |