diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2013-06-04 18:53:40 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2013-06-04 18:53:40 +0000 |
| commit | 109269205e521bb1d2d87678a391e5adefff88d6 (patch) | |
| tree | 93f1f9278a9a48902904b7ff4a5ce711c10efe08 /lang/ghc/files | |
| parent | ad7295cafd0e46ece6fcbf594ef39a767c296d0e (diff) | |
| download | ports-109269205e521bb1d2d87678a391e5adefff88d6.tar.gz ports-109269205e521bb1d2d87678a391e5adefff88d6.zip | |
- Update The Glorious Glasgow Haskell Compiler to version 7.6.3
- Update Haskell Platform to version 2013.2.0.0
Please note that port revisions for all the Haskell ports without version
changes are bumped.
Some highlights of the update:
- Fix PDF generation for pandoc [1]
- From now on, PREFIX/{lib,share,share/doc}/cabal/ghc-GHC_VERSION are used for
hs- ports (Cabal packages) as prefixes to avoid problems when upgrading with
portmaster(8) [2]
- Experimental support for LLVM-based code generation (disabled by default)
- Many simplifications, refactoring in bsd.cabal.mk
New ports (11):
devel/hs-asn1-types 0.1.3
devel/hs-data-default-class 0.0.1
devel/hs-data-default-instances-base 0.0.1
devel/hs-data-default-instances-containers 0.0.1
devel/hs-data-default-instances-dlist 0.0.1
devel/hs-data-default-instances-old-locale 0.0.1
devel/hs-extensible-exceptions 0.1.1.4
devel/hs-mmorph 1.0.0
devel/hs-quickcheck-io 0.1.0
x11-toolkits/hs-GLURaw 1.3.0.0
x11-toolkits/hs-OpenGLRaw 1.3.0.0
Updated ports (104):
archivers/hs-zlib 0.5.4.0_1 --> 0.5.4.1
databases/hs-persistent 1.1.5.1 --> 1.2.0.1
databases/hs-persistent-sqlite 1.1.5 --> 1.2.0
databases/hs-persistent-template 1.1.2.4 --> 1.2.0
devel/hs-HUnit 1.2.5.1_1 --> 1.2.5.2
devel/hs-IORefCAS 0.2_3 --> 0.2.0.1
devel/hs-MonadRandom 0.1.8 --> 0.1.9
devel/hs-QuickCheck 2.5.1.1_1 --> 2.6
devel/hs-abstract-deque 0.1.6_1 --> 0.2
devel/hs-alex 3.0.2_1 --> 3.0.5
devel/hs-async 2.0.1.3_1 --> 2.0.1.4
devel/hs-basic-prelude 0.3.4.0 --> 0.3.5.0
devel/hs-blaze-builder 0.3.1.0_4 --> 0.3.1.1
devel/hs-byteorder 1.0.3_4 --> 1.0.4
devel/hs-cabal-install 0.14.0_4 --> 1.16.0.2
devel/hs-classy-prelude 0.5.3 --> 0.5.7
devel/hs-cmdargs 0.10.2 --> 0.10.3
devel/hs-conduit 1.0.2 --> 1.0.5
devel/hs-data-default 0.5.0_1 --> 0.5.3
devel/hs-fsnotify 0.0.6 --> 0.0.11
devel/hs-generic-deriving 1.4.0 --> 1.5.0
devel/hs-git-annex 4.20130323_1 --> 4.20130601
devel/hs-haddock 2.11.0_1 --> 2.13.2
devel/hs-hashable 1.2.0.5 --> 1.1.2.5,1
devel/hs-hlint 1.8.43 --> 1.8.45
devel/hs-hspec 1.4.4 --> 1.5.4
devel/hs-hspec-expectations 0.3.0.3_1 --> 0.3.2
devel/hs-largeword 1.0.4 --> 1.0.5
devel/hs-lens 3.8.7.3 --> 3.9.0.2
devel/hs-lifted-base 0.2.0.2 --> 0.2.0.5
devel/hs-monad-control 0.3.1.4_1 --> 0.3.2.1
devel/hs-monad-logger 0.3.0.1 --> 0.3.1.1
devel/hs-monad-par 0.3.4.1 --> 0.3.4.2
devel/hs-pool-conduit 0.1.1_1 --> 0.1.2
devel/hs-profunctors 3.3 --> 3.3.0.1
devel/hs-reflection 1.1.7 --> 1.3.2
devel/hs-resourcet 0.4.5 --> 0.4.7.1
devel/hs-show 0.5 --> 0.6
devel/hs-split 0.2.1.1_1 --> 0.2.2
devel/hs-stm 2.4_1 --> 2.4.2
devel/hs-syb 0.3.7_1 --> 0.4.0
devel/hs-tagged 0.4.4_1 --> 0.6
devel/hs-text 0.11.2.3_1 --> 0.11.3.1
devel/hs-unix-compat 0.4.1.0 --> 0.4.1.1
devel/hs-unix-time 0.1.5 --> 0.1.8
devel/hs-unordered-containers 0.2.3.0 --> 0.2.3.1
devel/hs-utility-ht 0.0.8_3 --> 0.0.9
devel/hs-uuagc 0.9.42.2_3 --> 0.9.42.3
devel/hs-uuid 1.2.9 --> 1.2.13
devel/hs-void 0.5.11 --> 0.6
math/hs-NumInstances 1.2 --> 1.3
math/hs-comonad-transformers 3.0.1_1 --> 3.0.2
math/hs-semigroups 0.9 --> 0.9.1
math/hs-statistics 0.10.2.0_2 --> 0.10.3.1
net/hs-network 2.3.1.0_1 --> 2.4.1.2
net/hs-publicsuffixlist 0.0.3 --> 0.1
net/hs-socks 0.5.0 --> 0.5.1
security/hs-certificate 1.3.5_1 --> 1.3.7
security/hs-cipher-aes 0.1.7 --> 0.1.8
security/hs-clientsession 0.8.1_1 --> 0.9
security/hs-crypto-api 0.11 --> 0.12.1
security/hs-crypto-conduit 0.5.0 --> 0.5.2
security/hs-crypto-pubkey 0.1.2_1 --> 0.1.3
security/hs-crypto-pubkey-types 0.2.0_1 --> 0.3.2
security/hs-cryptocipher 0.4.0_1 --> 0.5.0
security/hs-cryptohash 0.8.3_1 --> 0.9.0
security/hs-skein 0.1.0.12 --> 1.0.3
textproc/hs-HaXml 1.23.3_2 --> 1.24
textproc/hs-attoparsec-conduit 1.0.0 --> 1.0.1
textproc/hs-blaze-html 0.6.0.0 --> 0.6.1.1
textproc/hs-blaze-markup 0.5.1.4 --> 0.5.1.5
textproc/hs-case-insensitive 1.0 --> 1.0.0.2
textproc/hs-highlighting-kate 0.5.3.8 --> 0.5.3.9
textproc/hs-hs-bibutils 4.17 --> 5.0
textproc/hs-polyparse 1.8_3 --> 1.9
textproc/hs-texmath 0.6.1.3 --> 0.6.1.5
textproc/hs-xml 1.3.12_4 --> 1.3.13
textproc/hs-yaml 0.8.2.3 --> 0.8.2.4
www/hs-HTTP 4000.2.5_1 --> 4000.2.8
www/hs-cgi 3001.1.7.4_6,1 --> 3001.1.7.5,1
www/hs-hamlet 1.1.6.3 --> 1.1.7.1
www/hs-happstack-server 7.1.7 --> 7.1.7.1
www/hs-heist 0.11.1 --> 0.12.0
www/hs-http-conduit 1.9.0 --> 1.9.3
www/hs-http-reverse-proxy 0.1.1.3 --> 0.1.1.6
www/hs-shakespeare 1.0.3.1 --> 1.0.5
www/hs-shakespeare-css 1.0.3 --> 1.0.5.1
www/hs-shakespeare-js 1.1.2.1 --> 1.1.4
www/hs-snap 0.11.2 --> 0.12.0
www/hs-wai-extra 1.3.2.4 --> 1.3.4
www/hs-wai-test 1.3.0.4 --> 1.3.1
www/hs-warp 1.3.7.4 --> 1.3.8.1
www/hs-yesod 1.1.9.2 --> 1.2.0.1
www/hs-yesod-auth 1.1.5.3 --> 1.2.0
www/hs-yesod-core 1.1.8.2 --> 1.2.0.4
www/hs-yesod-form 1.2.1.3 --> 1.3.0
www/hs-yesod-persistent 1.1.0.1_1 --> 1.2.0
www/hs-yesod-platform 1.1.8 --> 1.2.0.1
www/hs-yesod-routes 1.1.2 --> 1.2.0
www/hs-yesod-static 1.1.2.2 --> 1.2.0
www/hs-yesod-test 0.3.5 --> 1.2.0
x11-toolkits/hs-GLUT 2.1.2.1_7,1 --> 2.4.0.0,1
x11-toolkits/hs-OpenGL 2.2.3.1_4,1 --> 2.8.0.0,1
x11/hs-xmobar 0.16_2 --> 0.17
Removed ports (2):
www/hs-yesod-default 1.1.3.2
www/hs-yesod-json 1.1.2.1
PR: ports/179146 [1]
Requested by: Omar Thameen <omar@biglist.com> [1]
Reported by: sperber, bapt [2]
Tested by: sperber [2]
Obtained from: FreeBSD Haskell
Notes
Notes:
svn path=/head/; revision=319894
Diffstat (limited to 'lang/ghc/files')
| -rw-r--r-- | lang/ghc/files/patch-aclocal.m4 | 19 | ||||
| -rw-r--r-- | lang/ghc/files/patch-compiler-main-Dynflags.hs | 11 | ||||
| -rw-r--r-- | lang/ghc/files/patch-configure.ac | 16 | ||||
| -rw-r--r-- | lang/ghc/files/patch-ghc.mk | 14 | ||||
| -rw-r--r-- | lang/ghc/files/patch-libraries-gen_contents_index | 10 | ||||
| -rw-r--r-- | lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc | 18 |
6 files changed, 54 insertions, 34 deletions
diff --git a/lang/ghc/files/patch-aclocal.m4 b/lang/ghc/files/patch-aclocal.m4 index f288e6b77221..48c040f74504 100644 --- a/lang/ghc/files/patch-aclocal.m4 +++ b/lang/ghc/files/patch-aclocal.m4 @@ -1,5 +1,5 @@ ---- aclocal.m4.orig 2012-06-06 19:10:25.000000000 +0200 -+++ aclocal.m4 2013-02-03 01:28:58.024638318 +0100 +--- aclocal.m4.orig 2013-04-18 23:22:46.000000000 +0200 ++++ aclocal.m4 2013-04-29 20:32:30.000000000 +0200 @@ -19,6 +19,8 @@ # In bindists, we haven't called AC_CANONICAL_{BUILD,HOST,TARGET} # so this justs uses $bootstrap_target. @@ -15,10 +15,10 @@ ;; - x86_64) + x86_64|amd64) - GET_ARM_ISA() test -z "[$]2" || eval "[$]2=ArchX86_64" ;; -@@ -186,7 +188,7 @@ + powerpc) +@@ -185,7 +187,7 @@ checkVendor() { case [$]1 in @@ -27,7 +27,7 @@ ;; *) echo "Unknown vendor [$]1" -@@ -1835,7 +1837,7 @@ +@@ -1889,7 +1891,7 @@ vax) $2="vax" ;; @@ -36,12 +36,3 @@ $2="x86_64" ;; *) -@@ -1875,7 +1877,7 @@ - freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku) - $2="$1" - ;; -- freebsd8) # like i686-gentoo-freebsd8 -+ freebsd*) # like i686-gentoo-freebsd8 - $2="freebsd" - ;; - *) diff --git a/lang/ghc/files/patch-compiler-main-Dynflags.hs b/lang/ghc/files/patch-compiler-main-Dynflags.hs new file mode 100644 index 000000000000..ee76c6da2988 --- /dev/null +++ b/lang/ghc/files/patch-compiler-main-Dynflags.hs @@ -0,0 +1,11 @@ +--- compiler/main/DynFlags.hs.orig 2012-06-06 19:10:25.000000000 +0200 ++++ compiler/main/DynFlags.hs 2013-02-08 15:23:36.000000000 +0100 +@@ -2390,7 +2390,7 @@ + flag) + return dflags + HscLlvm +- | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin)) && ++ | not ((arch == ArchX86_64) && (os == OSLinux || os == OSDarwin || os == OSFreeBSD)) && + (not opt_Static || opt_PIC) + -> + do addWarn ("Ignoring " ++ flag ++ " as it is incompatible with -fPIC and -dynamic on this platform") diff --git a/lang/ghc/files/patch-configure.ac b/lang/ghc/files/patch-configure.ac index 11139a3aa71d..e7504949abce 100644 --- a/lang/ghc/files/patch-configure.ac +++ b/lang/ghc/files/patch-configure.ac @@ -1,5 +1,5 @@ ---- configure.ac.orig 2012-06-06 19:10:25.000000000 +0200 -+++ configure.ac 2013-02-02 17:31:55.193634655 +0100 +--- ./configure.ac.orig 2013-04-19 00:31:00.000000000 +0200 ++++ ./configure.ac 2013-04-30 19:30:40.381161098 +0200 @@ -89,6 +89,59 @@ fi WithGhc="$GHC"]) @@ -60,7 +60,17 @@ dnl ** Tell the make system which OS we are using dnl $OSTYPE is set by the operating system to "msys" or "cygwin" or something -@@ -717,7 +770,6 @@ +@@ -379,6 +432,9 @@ + BuildingCrossCompiler=NO + PortingCompiler=NO + CrossCompiling=NO ++ ++build=`echo $build | sed -e 's/amd64-/x86_64-/g; s/-freebsd.*$/-freebsd/g'` ++ + # If 'host' and 'target' differ, then this means we are building a cross-compiler. + if test "$host" != "$target" ; then + BuildingCrossCompiler=YES +@@ -839,7 +895,6 @@ FP_VISIBILITY_HIDDEN dnl ** check for librt diff --git a/lang/ghc/files/patch-ghc.mk b/lang/ghc/files/patch-ghc.mk index 81f97ee717ea..a8e806b6e47c 100644 --- a/lang/ghc/files/patch-ghc.mk +++ b/lang/ghc/files/patch-ghc.mk @@ -1,6 +1,6 @@ ---- ghc.mk.orig 2012-06-06 19:10:25.000000000 +0200 -+++ ghc.mk 2013-01-30 16:24:02.000000000 +0100 -@@ -81,6 +81,7 @@ +--- ghc.mk.orig 2013-04-18 23:22:46.000000000 +0200 ++++ ghc.mk 2013-04-29 20:42:16.000000000 +0200 +@@ -80,6 +80,7 @@ # Catch make if it runs away into an infinite loop ifeq "$(MAKE_RESTARTS)" "" else ifeq "$(MAKE_RESTARTS)" "1" @@ -8,8 +8,8 @@ else $(error Make has restarted itself $(MAKE_RESTARTS) times; is there a makefile bug?) endif -@@ -574,12 +575,18 @@ - $(GHC_GENPRIMOP_DIR) +@@ -595,12 +596,18 @@ + MAYBE_GHCI=driver/ghci endif +ifeq "$(UseSystemLibFFI)" "YES" @@ -20,7 +20,7 @@ + BUILD_DIRS += \ driver \ - driver/ghci \ + $(MAYBE_GHCI) \ driver/ghc \ driver/haddock \ - libffi \ @@ -28,7 +28,7 @@ includes \ rts -@@ -971,6 +978,7 @@ +@@ -1005,6 +1012,7 @@ echo "BUILD_DOCBOOK_PDF = $(BUILD_DOCBOOK_PDF)" >> $(BIN_DIST_MK) echo "BUILD_MAN = $(BUILD_MAN)" >> $(BIN_DIST_MK) echo "GHC_CABAL_INPLACE = utils/ghc-cabal/dist-install/build/tmp/ghc-cabal" >> $(BIN_DIST_MK) diff --git a/lang/ghc/files/patch-libraries-gen_contents_index b/lang/ghc/files/patch-libraries-gen_contents_index deleted file mode 100644 index a2785da02ed9..000000000000 --- a/lang/ghc/files/patch-libraries-gen_contents_index +++ /dev/null @@ -1,10 +0,0 @@ ---- ./libraries/gen_contents_index.orig 2012-02-01 19:10:32.000000000 +0100 -+++ ./libraries/gen_contents_index 2012-05-17 02:20:09.000000000 +0200 -@@ -47,7 +47,6 @@ - esac - - # Now create the combined contents and index pages --echo $HADDOCK_ARGS - $HADDOCK --gen-index --gen-contents -o . \ - -t "Haskell Hierarchical Libraries" \ - -p "prologue.txt" \ diff --git a/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc b/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc new file mode 100644 index 000000000000..ffc1d3df082a --- /dev/null +++ b/lang/ghc/files/patch-libraries__base__GHC__Event__KQueue.hsc @@ -0,0 +1,18 @@ +--- ./libraries/base/GHC/Event/KQueue.hsc.orig 2013-04-18 23:30:14.000000000 +0200 ++++ ./libraries/base/GHC/Event/KQueue.hsc 2013-04-30 13:34:11.549185351 +0200 +@@ -235,10 +235,11 @@ + #endif + deriving (Bits, Eq, Num, Show, Storable) + +-#{enum Filter, Filter +- , filterRead = EVFILT_READ +- , filterWrite = EVFILT_WRITE +- } ++filterRead :: Filter ++filterRead = Filter (#const EVFILT_READ) ++ ++filterWrite :: Filter ++filterWrite = Filter (#const EVFILT_WRITE) + + data TimeSpec = TimeSpec { + tv_sec :: {-# UNPACK #-} !CTime |