cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak with hs-tar-0.4.0.1.

Browse Source 
Also, update to darcs-2.8.3.
This commit is contained in:
kili 2013-01-17 13:19:05 +00:00
parent 26b6cc885d
commit 7b2f513065
4 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/darcs/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.49 2012/10/11 13:31:29 dcoppa Exp $
# $OpenBSD: Makefile,v 1.50 2013/01/17 13:19:05 kili Exp $
COMMENT = advanced revision control system written in Haskell
DISTNAME = darcs-2.8.1
REVISION = 0
DISTNAME = darcs-2.8.3
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@ -17,7 +16,7 @@ LIB_DEPENDS = net/curl
# Yes, build dependencies, because GHC libs are still static and we
# don't want to pull in all of ghc.
BUILD_DEPENDS = archivers/hs-zlib>=0.5.1.0,<0.6.0.0 \
devel/hs-tar>=0.3,<0.4 \
devel/hs-tar>=0.4,<0.5 \
devel/hs-hashed-storage>=0.5.6,<0.6 \
devel/hs-haskeline>=0.6.3,<0.7 \
devel/hs-mmap>=0.5,<0.6 \

7
devel/darcs/distinfo
View File

@ -1,5 +1,2 @@
MD5 (ghc/darcs-2.8.1.tar.gz) = y3CYn0ARwcmCaiZmIugwTA==
RMD160 (ghc/darcs-2.8.1.tar.gz) = aXFA8aeCxL8fy3x7dimGJcihBn8=
SHA1 (ghc/darcs-2.8.1.tar.gz) = FQxMH3weHk2eogofRPogCq0wrPw=
SHA256 (ghc/darcs-2.8.1.tar.gz) = oeWtMUa29zi6FiYj8n+3BJjmgsKxFC84+A4sGH+a6bs=
SIZE (ghc/darcs-2.8.1.tar.gz) = 1293098
SHA256 (ghc/darcs-2.8.3.tar.gz) = kHUIQpJnUM1gqXxh+LoI6Q+v/csRR40QYXo9XWIhb1k=
SIZE (ghc/darcs-2.8.3.tar.gz) = 1289187

30
devel/darcs/patches/patch-darcs_cabal Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-darcs_cabal,v 1.3 2013/01/17 13:19:05 kili Exp $
--- darcs.cabal.orig Mon May 14 13:10:13 2012
+++ darcs.cabal Thu Jan 17 11:08:30 2013
@@ -371,7 +371,7 @@ Library
haskeline >= 0.6.3 && < 0.7,
hashed-storage >= 0.5.6 && < 0.6,
vector >= 0.7,
- tar == 0.3.*
+ tar == 0.4.*
if !os(windows)
build-depends: unix >= 1.0 && < 2.6
@@ -532,7 +532,7 @@ Executable darcs
haskeline >= 0.6.3 && < 0.7,
hashed-storage >= 0.5.6 && < 0.6,
vector >= 0.7,
- tar == 0.3.*
+ tar == 0.4.*
if !os(windows)
build-depends: unix >= 1.0 && < 2.6
@@ -729,7 +729,7 @@ Executable darcs-test
array >= 0.1 && < 0.5,
hashed-storage >= 0.5.6 && < 0.6,
vector >= 0.7,
- tar == 0.3.*,
+ tar == 0.4.*,
random == 1.0.*
if flag(mmap) && !os(windows)

27
devel/darcs/patches/patch-src_Darcs_Repository_hs Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-src_Darcs_Repository_hs,v 1.1 2013/01/17 13:19:05 kili Exp $
--- src/Darcs/Repository.hs.orig Mon May 14 13:10:13 2012
+++ src/Darcs/Repository.hs Thu Jan 17 12:41:17 2013
@@ -302,19 +302,19 @@ removeMetaFiles :: IO ()
removeMetaFiles = mapM_ (removeFile . (darcsdir </>)) .
filter ("meta-" `isPrefixOf`) =<< getDirectoryContents darcsdir
-unpackBasic :: Cache -> Tar.Entries -> IO ()
+unpackBasic :: Show e => Cache -> Tar.Entries e -> IO ()
unpackBasic c x = do
withControlMVar $ \mv -> unpackTar c (basicMetaHandler c mv) x
removeMetaFiles
-unpackPatches :: Cache -> [String] -> Tar.Entries -> IO ()
+unpackPatches :: Show e => Cache -> [String] -> Tar.Entries e -> IO ()
unpackPatches c ps x = do
withControlMVar $ \mv -> unpackTar c (patchesMetaHandler c ps mv) x
removeMetaFiles
-unpackTar :: Cache -> IO () -> Tar.Entries -> IO ()
+unpackTar :: Show e => Cache -> IO () -> Tar.Entries e -> IO ()
unpackTar _ _ Tar.Done = return ()
-unpackTar _ _ (Tar.Fail e)= fail e
+unpackTar _ _ (Tar.Fail e)= fail $ show e
unpackTar c mh (Tar.Next x xs) = case Tar.entryContent x of
Tar.NormalFile x' _ -> do
let p = Tar.entryPath x