From e37d1ad339502cfb61f0d034960c14f1158bd70c Mon Sep 17 00:00:00 2001 From: kili Date: Mon, 11 Apr 2011 14:59:16 +0000 Subject: [PATCH] Accept hs-network-2.3 and bump. --- audio/hs-libmpd/Makefile | 6 +++--- audio/hs-libmpd/patches/patch-libmpd_cabal | 19 +++++++++++++++++++ audio/hs-libmpd/pkg/PLIST | 8 +++++--- 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 audio/hs-libmpd/patches/patch-libmpd_cabal diff --git a/audio/hs-libmpd/Makefile b/audio/hs-libmpd/Makefile index 71f2eeee430..036b6cc20c8 100644 --- a/audio/hs-libmpd/Makefile +++ b/audio/hs-libmpd/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2011/01/19 17:19:51 jasper Exp $ +# $OpenBSD: Makefile,v 1.3 2011/04/11 14:59:16 kili Exp $ COMMENT= Haskell interface to MPD DISTNAME= libmpd-0.5.0 -REVISION= 0 +REVISION= 1 CATEGORIES= audio MAINTAINER= Jasper Lievisse Adriaanse @@ -21,6 +21,6 @@ MODULES= lang/ghc MODGHC_BUILD= cabal hackage haddock register BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= devel/hs-network>=2.1,<2.3 +RUN_DEPENDS= devel/hs-network>=2.1,<2.4 .include diff --git a/audio/hs-libmpd/patches/patch-libmpd_cabal b/audio/hs-libmpd/patches/patch-libmpd_cabal new file mode 100644 index 00000000000..3a832a4c686 --- /dev/null +++ b/audio/hs-libmpd/patches/patch-libmpd_cabal @@ -0,0 +1,19 @@ +$OpenBSD: patch-libmpd_cabal,v 1.1 2011/04/11 14:59:16 kili Exp $ +--- libmpd.cabal.orig Wed Sep 8 15:47:02 2010 ++++ libmpd.cabal Sun Dec 26 23:12:45 2010 +@@ -41,11 +41,11 @@ Library + 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 && < 2.4, ++ mtl >= 1.1 && < 1.2, filepath >= 1.0 && < 1.3, + utf8-string >= 0.3.1 && < 0.4, +- containers >= 0.3 && < 0.4, +- time >= 1.1 && < 1.2, ++ containers >= 0.4 && < 0.5, ++ time >= 1.1 && < 1.3, + 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 index 304e4c345fc..c2e4469ee0f 100644 --- a/audio/hs-libmpd/pkg/PLIST +++ b/audio/hs-libmpd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2010/12/03 07:40:18 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.2 2011/04/11 14:59:16 kili Exp $ lib/ghc/${DISTNAME}/ lib/ghc/${DISTNAME}/HS${DISTNAME}.o lib/ghc/${DISTNAME}/Network/ @@ -31,6 +31,7 @@ share/doc/hs-${DISTNAME}/html/Network-MPD.html share/doc/hs-${DISTNAME}/html/doc-index-60.html share/doc/hs-${DISTNAME}/html/doc-index-61.html share/doc/hs-${DISTNAME}/html/doc-index-A.html +share/doc/hs-${DISTNAME}/html/doc-index-All.html share/doc/hs-${DISTNAME}/html/doc-index-B.html share/doc/hs-${DISTNAME}/html/doc-index-C.html share/doc/hs-${DISTNAME}/html/doc-index-D.html @@ -55,8 +56,7 @@ share/doc/hs-${DISTNAME}/html/doc-index-W.html share/doc/hs-${DISTNAME}/html/doc-index.html share/doc/hs-${DISTNAME}/html/frames.html share/doc/hs-${DISTNAME}/html/haddock-util.js -share/doc/hs-${DISTNAME}/html/haddock.css -share/doc/hs-${DISTNAME}/html/haskell_icon.gif +share/doc/hs-${DISTNAME}/html/hslogo-16.png share/doc/hs-${DISTNAME}/html/index-frames.html share/doc/hs-${DISTNAME}/html/index.html share/doc/hs-${DISTNAME}/html/libmpd.haddock @@ -64,4 +64,6 @@ share/doc/hs-${DISTNAME}/html/mini_Network-MPD-Commands-Extensions.html share/doc/hs-${DISTNAME}/html/mini_Network-MPD-Core.html share/doc/hs-${DISTNAME}/html/mini_Network-MPD.html share/doc/hs-${DISTNAME}/html/minus.gif +share/doc/hs-${DISTNAME}/html/ocean.css share/doc/hs-${DISTNAME}/html/plus.gif +share/doc/hs-${DISTNAME}/html/synopsis.png