5 files changed, 28 insertions, 25 deletions

diff --git a/devel/hs-mueval/Makefile b/devel/hs-mueval/Makefile
index 03945273997d..c657b4d024c2 100644
--- a/devel/hs-mueval/Makefile
+++ b/devel/hs-mueval/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	mueval
-PORTVERSION=	0.8
+PORTVERSION=	0.8.1
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Safely evaluate Haskell expressions
 
+LICENSE=	BSD
+
 CABAL_SETUP=	Setup.hs
-USE_HACKAGE=	hint>=0.3.1 show>=0.3 utf8-string
+USE_CABAL=	hint>=0.3.1 mtl show>=0.3 utf8-string
 
 EXECUTABLE=	mueval mueval-core
 
diff --git a/devel/hs-mueval/distinfo b/devel/hs-mueval/distinfo
index f08d2b961b37..4645993df23e 100644
--- a/devel/hs-mueval/distinfo
+++ b/devel/hs-mueval/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/mueval-0.8.tar.gz) = 26528dd9ceb8e37779b311ae1614295b
-SHA256 (cabal/mueval-0.8.tar.gz) = cb2cf474d1a94fb71b84b572e134bed85ecbceafd3dbe9daed3d0a1023504c8a
-SIZE (cabal/mueval-0.8.tar.gz) = 14353
+SHA256 (cabal/mueval-0.8.1.tar.gz) = 41c6ab1d0f406106061322ae98aecc8bd650b2c41ae1a32abdbaad00513646a5
+SIZE (cabal/mueval-0.8.1.tar.gz) = 14744
diff --git a/devel/hs-mueval/files/patch-Mueval__Interpreter.hs b/devel/hs-mueval/files/patch-Mueval__Interpreter.hs
new file mode 100644
index 000000000000..45f0a82a44a9
--- /dev/null
+++ b/devel/hs-mueval/files/patch-Mueval__Interpreter.hs
@@ -0,0 +1,11 @@
+--- ./Mueval/Interpreter.hs.orig	2011-01-11 21:24:11.000000000 +0100
++++ ./Mueval/Interpreter.hs	2011-03-13 14:28:39.132489232 +0100
+@@ -120,7 +120,7 @@
+ exceptionMsg = "*Exception: "
+ 
+ -- | Renders the input String including its exceptions using @exceptionMsg@
+-render :: (Control.Monad.Trans.MonadIO m)
++render :: (Functor m, Control.Monad.Trans.MonadIO m)
+           => Int -- ^ max number of characters to include
+           -> String -- ^ input
+           -> m (String, Bool) -- ^ ( output, @True@ if we found an exception )
diff --git a/devel/hs-mueval/files/patch-mueval.cabal b/devel/hs-mueval/files/patch-mueval.cabal
new file mode 100644
index 000000000000..50590a6efa02
--- /dev/null
+++ b/devel/hs-mueval/files/patch-mueval.cabal
@@ -0,0 +1,11 @@
+--- ./mueval.cabal.orig	2011-01-11 21:24:11.000000000 +0100
++++ ./mueval.cabal	2011-03-13 14:27:32.901910764 +0100
+@@ -31,7 +31,7 @@
+ library
+         exposed-modules:     Mueval.Parallel, Mueval.Context, Mueval.Interpreter,
+                              Mueval.ArgsParse, Mueval.Resources
+-        build-depends:       base>=4 && < 5, containers, directory, mtl<1.2, filepath, unix, process,
++        build-depends:       base>=4 && < 5, containers, directory, mtl, filepath, unix, process,
+                              hint>=0.3.1, show>=0.3, utf8-string, Cabal, extensible-exceptions
+         ghc-options:         -Wall -static -O2
+ 
diff --git a/devel/hs-mueval/pkg-plist b/devel/hs-mueval/pkg-plist
deleted file mode 100644
index 0a41778dc54c..000000000000
--- a/devel/hs-mueval/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-@comment $FreeBSD$
-bin/mueval
-bin/mueval-core
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/ArgsParse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Context.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Interpreter.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Parallel.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval/Resources.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Mueval
-@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