From 0c76a8384fc1de4958eb1228befbee727f00c596 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Mon, 9 May 2011 05:28:57 +0000 Subject: - Please welcome GHC 7.0.3 GHC in the ports tree has been updated to 7.0.3 and all other Haskell ports are also updated to their corresponding Haskell Platform versions, or latest versions. We would like to acknowledge the support of the FreeBSD Donations Team and Eotvos Lorand University, Faculty of Informatics who contributed to the server that we used for testing. We would also like to thank all the testers who tested FreeBSD Haskell ports and provided their feedback. PR: ports/156642 Approved by: tabthorpe (mentor) Obtained from: FreeBSD Haskell --- graphics/hs-HGL/Makefile | 5 ++- graphics/hs-HGL/distinfo | 1 - .../patch-Graphics__HGL__Internals__Utilities.hs | 11 ++++++ graphics/hs-HGL/files/patch-HGL.cabal | 11 ++++++ graphics/hs-HGL/pkg-plist | 44 ---------------------- 5 files changed, 26 insertions(+), 46 deletions(-) create mode 100644 graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs create mode 100644 graphics/hs-HGL/files/patch-HGL.cabal delete mode 100644 graphics/hs-HGL/pkg-plist (limited to 'graphics/hs-HGL') diff --git a/graphics/hs-HGL/Makefile b/graphics/hs-HGL/Makefile index 85fd038aea77..228373530997 100644 --- a/graphics/hs-HGL/Makefile +++ b/graphics/hs-HGL/Makefile @@ -7,13 +7,16 @@ PORTNAME= HGL PORTVERSION= 3.2.0.2 +PORTREVISION= 1 CATEGORIES= graphics haskell MAINTAINER= haskell@FreeBSD.org COMMENT= A simple Haskell graphics library based on X11 or Win32 +LICENSE= BSD + CABAL_SETUP= Setup.hs -USE_HACKAGE= X11 +USE_CABAL= X11 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include diff --git a/graphics/hs-HGL/distinfo b/graphics/hs-HGL/distinfo index 8cfcf5ab6d5b..a01b658da4ff 100644 --- a/graphics/hs-HGL/distinfo +++ b/graphics/hs-HGL/distinfo @@ -1,3 +1,2 @@ -MD5 (cabal/HGL-3.2.0.2.tar.gz) = fd653c4fe622312920754a5ec35f4d65 SHA256 (cabal/HGL-3.2.0.2.tar.gz) = 7f0734d1a8a8ad1fdfff44b7838a2d8e6aef025a08549461bc2946b78cdb8c8f SIZE (cabal/HGL-3.2.0.2.tar.gz) = 38914 diff --git a/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs new file mode 100644 index 000000000000..0b03fe9d5ceb --- /dev/null +++ b/graphics/hs-HGL/files/patch-Graphics__HGL__Internals__Utilities.hs @@ -0,0 +1,11 @@ +--- ./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 +@@ -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 Control.Concurrent( MVar, takeMVar, putMVar ) + + bracket :: IO a -> (a -> IO b) -> (a -> IO c) -> IO c diff --git a/graphics/hs-HGL/files/patch-HGL.cabal b/graphics/hs-HGL/files/patch-HGL.cabal new file mode 100644 index 000000000000..3733424e49f1 --- /dev/null +++ b/graphics/hs-HGL/files/patch-HGL.cabal @@ -0,0 +1,11 @@ +--- ./HGL.cabal.orig 2009-11-03 15:50:11.000000000 +0100 ++++ ./HGL.cabal 2011-03-13 18:29:56.867337655 +0100 +@@ -22,7 +22,7 @@ + + library + if flag(split-base) +- build-depends: base >= 3 && < 4, array ++ build-depends: base >= 3, array + else + build-depends: base < 2 + exposed-modules: diff --git a/graphics/hs-HGL/pkg-plist b/graphics/hs-HGL/pkg-plist deleted file mode 100644 index cf79ba076332..000000000000 --- a/graphics/hs-HGL/pkg-plist +++ /dev/null @@ -1,44 +0,0 @@ -@comment $FreeBSD$ -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Core.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Brush.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Font.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Monad.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Pen.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Picture.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Region.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw/Text.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Draw.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Event.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Events.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Flag.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Types.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals/Utilities.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Key.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Run.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Units.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Utils.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Window.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/DC.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Display.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Timer.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Types.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Window.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/SOE.hi -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o -%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a -%%LIBDIR_REL%%/register.sh -%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE -%%NOPORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11 -@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Internals -@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/Draw -@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL -@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics -@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%% -@dirrm %%LIBDIR_REL%% -@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh -@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%% -@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old -- cgit v1.2.3