8 files changed, 32 insertions, 106 deletions

diff --git a/audio/hs-ALUT/Makefile b/audio/hs-ALUT/Makefile
index a8f9bc7fa6f5..722c7b832e98 100644
--- a/audio/hs-ALUT/Makefile
+++ b/audio/hs-ALUT/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	ALUT
 PORTVERSION=	2.2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A Haskell binding for the OpenAL Utility Toolkit
 
+LICENSE=	BSD
+
 CABAL_SETUP=	Setup.hs
-USE_HACKAGE=	OpenAL StateVar
+USE_CABAL=	OpenAL StateVar
 USE_OPENAL=	al alut
 
 PORTEXAMPLES=		*
diff --git a/audio/hs-ALUT/pkg-plist b/audio/hs-ALUT/pkg-plist
deleted file mode 100644
index d0da62656eae..000000000000
--- a/audio/hs-ALUT/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT/Config.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT/Constants.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT/Errors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT/Initialization.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT/Loaders.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT/Sleep.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT/Version.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsALUT.h
-%%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%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/ALUT
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound
-@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
diff --git a/audio/hs-OpenAL/Makefile b/audio/hs-OpenAL/Makefile
index 5ab0f67bab1c..737f9a04dc51 100644
--- a/audio/hs-OpenAL/Makefile
+++ b/audio/hs-OpenAL/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	OpenAL
 PORTVERSION=	1.4.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A Haskell binding to the OpenAL cross-platform 3D audio API
 
+LICENSE=	BSD
+
 CABAL_SETUP=	Setup.hs
-USE_HACKAGE=	ObjectName StateVar Tensor
+USE_CABAL=	ObjectName StateVar Tensor
 USE_OPENAL=	al
 
 PORTEXAMPLES=		*
diff --git a/audio/hs-OpenAL/pkg-plist b/audio/hs-OpenAL/pkg-plist
deleted file mode 100644
index fb57d33a2e8d..000000000000
--- a/audio/hs-OpenAL/pkg-plist
+++ /dev/null
@@ -1,48 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/ALboolean.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Attenuation.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/BasicTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Buffer.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/BufferInternal.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Doppler.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Errors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Extensions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Format.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Listener.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/PeekPoke.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/QueryUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/Source.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/SourceState.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/String.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL/StringQueries.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/ALCboolean.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/BasicTypes.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/Capture.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/Context.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/Device.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/Errors.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/Extensions.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/QueryUtils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC/String.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/Config.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/Constants.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsOpenAL.h
-%%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%%/include
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/ALC
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL/AL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound/OpenAL
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Sound
-@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
diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile
index cfe97a520ce8..b19f2d05f27d 100644
--- a/audio/hs-libmpd/Makefile
+++ b/audio/hs-libmpd/Makefile
@@ -6,13 +6,15 @@
 #
 
 PORTNAME=	libmpd
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5.0
 CATEGORIES=	audio haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	An MPD client library
 
-USE_HACKAGE=	utf8-string>=0.3.1 QuickCheck>=2.1.0.0
+LICENSE=	LGPL21
+
+USE_CABAL=	mtl>=1.1 network>=2.1 utf8-string>=0.3.1
 
 CONFIGURE_ARGS+=	--flags="-test -coverage"
 
diff --git a/audio/hs-libmpd/distinfo b/audio/hs-libmpd/distinfo
index 23d3f0d65fa6..516b91279b88 100644
--- a/audio/hs-libmpd/distinfo
+++ b/audio/hs-libmpd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/libmpd-0.4.1.tar.gz) = 0bda72383ba85e3f81683253219b41e75843748d6f0ab54fb6fc57285f9e6a57
-SIZE (cabal/libmpd-0.4.1.tar.gz) = 35377
+SHA256 (cabal/libmpd-0.5.0.tar.gz) = 528d4a3420f3fa00360a5955def57019a3da84bc0ad8214b50b9bb0fcbbde205
+SIZE (cabal/libmpd-0.5.0.tar.gz) = 37305
diff --git a/audio/hs-libmpd/files/patch-libmpd.cabal b/audio/hs-libmpd/files/patch-libmpd.cabal
new file mode 100644
index 000000000000..25bd19418fd7
--- /dev/null
+++ b/audio/hs-libmpd/files/patch-libmpd.cabal
@@ -0,0 +1,18 @@
+--- ./libmpd.cabal.orig	2010-09-08 15:47:02.000000000 +0200
++++ ./libmpd.cabal	2011-03-13 04:15:05.157038443 +0100
+@@ -41,11 +41,11 @@
+     else
+         Build-Depends: base >= 4 && < 5
+ 
+-    Build-Depends:      network >= 2.1 && < 2.3,
+-                        mtl >= 1.1 && < 1.2, filepath >= 1.0 && < 1.2,
++    Build-Depends:      network >= 2.1,
++                        mtl >= 1.1, filepath >= 1.0,
+                         utf8-string >= 0.3.1 && < 0.4,
+-                        containers >= 0.3 && < 0.4,
+-                        time >= 1.1 && < 1.2,
++                        containers >= 0.3,
++                        time >= 1.1,
+                         old-locale >= 1.0 && < 1.1
+     Exposed-Modules:    Network.MPD, Network.MPD.Commands.Extensions,
+                         Network.MPD.Core
diff --git a/audio/hs-libmpd/pkg-plist b/audio/hs-libmpd/pkg-plist
deleted file mode 100644
index 6a549f5e74b8..000000000000
--- a/audio/hs-libmpd/pkg-plist
+++ /dev/null
@@ -1,26 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Commands.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Commands/Arg.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Commands/Parse.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Commands/Query.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Commands/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Core.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Core/Class.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Core/Error.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Utils.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%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Core
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD/Commands
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network/MPD
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Network
-@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