From 52b6ecfa0d99b9ed0c118c295ede0a31210baccd Mon Sep 17 00:00:00 2001 From: pgj Date: Tue, 4 Jun 2013 18:53:40 +0000 Subject: - 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 [1] Reported by: sperber, bapt [2] Tested by: sperber [2] Obtained from: FreeBSD Haskell --- graphics/hs-HGL/Makefile | 5 ++--- .../patch-Graphics__HGL__Internals__Utilities.hs | 20 +++++++++++++++-- graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs | 20 +++++++++++++++++ .../files/patch-Graphics__HGL__X11__Display.hs | 26 ++++++++++++++++++++++ .../files/patch-Graphics__HGL__X11__Types.hs | 20 +++++++++++++++++ 5 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs create mode 100644 graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs create mode 100644 graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs (limited to 'graphics/hs-HGL') diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile index ef3b5a33ffb0..69d7e67083ac 100644 --- a/graphics/hs-HGL/Makefile +++ b/graphics/hs-HGL/Makefile @@ -3,15 +3,14 @@ PORTNAME= HGL PORTVERSION= 3.2.0.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= A simple Haskell graphics library based on X11 or Win32 +COMMENT= Simple Haskell graphics library based on X11 or Win32 LICENSE= BSD -CABAL_SETUP= Setup.hs USE_CABAL= X11 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs index 0b03fe9d5ceb..d09a4cb11689 100644 --- a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs +++ b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs @@ -1,11 +1,27 @@ --- ./Graphics/HGL/Internals/Utilities.hs.orig 2009-11-03 15:50:11.000000000 +0100 -+++ ./Graphics/HGL/Internals/Utilities.hs 2011-03-13 18:31:25.754332789 +0100 ++++ ./Graphics/HGL/Internals/Utilities.hs 2013-05-01 01:30:47.000000000 +0200 @@ -20,7 +20,7 @@ modMVar, modMVar_ ) where -import qualified Control.Exception as E (bracket, try, IOException, tryJust, ioErrors) -+import qualified Control.OldException as E (bracket, try, IOException, tryJust, ioErrors) ++import qualified Control.Exception as E (bracket, try, IOException, tryJust) import Control.Concurrent( MVar, takeMVar, putMVar ) bracket :: IO a -> (a -> IO b) -> (a -> IO c) -> IO c +@@ -32,15 +32,7 @@ + + type Exception = E.IOException + safeTry :: IO a -> IO (Either Exception a) +- +-#if __GLASGOW_HASKELL >= 610 +--- ghc-6.10 + safeTry = E.try +-#else +--- ghc 6.8 (and below?) +-safeTry = E.tryJust E.ioErrors +-#endif +- + + ---------------------------------------------------------------- + -- Utilities diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs new file mode 100644 index 000000000000..5e29c6df339a --- /dev/null +++ b/graphics/hs-HGL/files/patch-Graphics__HGL__Run.hs @@ -0,0 +1,20 @@ +--- ./Graphics/HGL/Run.hs.orig 2009-11-03 15:50:11.000000000 +0100 ++++ ./Graphics/HGL/Run.hs 2013-05-01 01:51:50.000000000 +0200 +@@ -24,7 +24,7 @@ + import Graphics.HGL.Internals.Utilities (safeTry) + import Control.Concurrent (forkIO, yield) + import Data.IORef( newIORef, readIORef, writeIORef ) +-import System.IO.Error (try) ++import System.IO.Error (tryIOError) + #endif + + ---------------------------------------------------------------- +@@ -60,7 +60,7 @@ + beginGraphics + quit <- newIORef False + safeTry $ do +- forkIO (try m >> writeIORef quit True) ++ forkIO (tryIOError m >> writeIORef quit True) + yield + handleEvents (readIORef quit) + endGraphics diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs new file mode 100644 index 000000000000..0951e6ec3eee --- /dev/null +++ b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Display.hs @@ -0,0 +1,26 @@ +--- ./Graphics/HGL/X11/Display.hs.orig 2009-11-03 15:50:11.000000000 +0100 ++++ ./Graphics/HGL/X11/Display.hs 2013-05-01 02:01:44.000000000 +0200 +@@ -14,12 +14,12 @@ + import Control.Monad (when) + import Data.Maybe (isJust) + import System.Environment (getEnv) +-import System.IO.Error (try) ++import System.IO.Error (tryIOError, catchIOError) + import System.IO.Unsafe (unsafePerformIO) + + getDisplayName :: IO String + getDisplayName = do +- disp <- try (getEnv "DISPLAY") ++ disp <- tryIOError (getEnv "DISPLAY") + return (either (const ":0.0") id disp) + + displayRef :: MVar (Maybe X.Display) +@@ -32,7 +32,7 @@ + openDisplay' + where + openDisplay' = do +- display <- X.openDisplay host `catch` \ err -> ++ display <- X.openDisplay host `catchIOError` \ err -> + ioError (userError ("Unable to open X display " ++ host)) + modMVar displayRef (const $ Just display) + return display diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs new file mode 100644 index 000000000000..892c5fe75355 --- /dev/null +++ b/graphics/hs-HGL/files/patch-Graphics__HGL__X11__Types.hs @@ -0,0 +1,20 @@ +--- ./Graphics/HGL/X11/Types.hs.orig 2009-11-03 15:50:11.000000000 +0100 ++++ ./Graphics/HGL/X11/Types.hs 2013-05-01 01:53:35.000000000 +0200 +@@ -30,6 +30,7 @@ + import Control.Concurrent.MVar (MVar) + import Data.Bits + import Data.Word (Word8) ++import System.IO.Error + + ---------------------------------------------------------------- + -- Units +@@ -84,8 +85,7 @@ + (X.Color p _ _ _ _) <- + X.allocColor display color_map (X.Color 0 r g b xcolor_flags) + return p) +- `catch` \ err -> +- print err >> return 0 ++ `catchIOError` \err -> print err >> return 0 + -- ioError (userError ("Error: " ++ show err + -- ++ "\nUnable to allocate colo[u]r " ++ show (r,g,b) + -- ++ " - I'll bet you're running Netscape.")) -- cgit