mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-28 10:08:24 +00:00
- Update to 2.8.1
Obtained from: FreeBSD Haskell
This commit is contained in:
parent
999fc5aad6
commit
64db021c15
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=298183
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= darcs
|
||||
PORTVERSION= 2.5.2
|
||||
PORTREVISION= 3
|
||||
PORTVERSION= 2.8.1
|
||||
CATEGORIES= devel haskell
|
||||
|
||||
MAINTAINER= haskell@FreeBSD.org
|
||||
@ -16,10 +15,10 @@ COMMENT= A distributed, interactive, smart revision control system
|
||||
LICENSE= GPLv2
|
||||
FILE_LICENSE= COPYING
|
||||
|
||||
USE_CABAL= hashed-storage>=0.5.2 haskeline>=0.6.2.2 html>=1.0 HUnit>=1 \
|
||||
mtl>=1 parsec>=2 QuickCheck>=2.1 regex-compat>=0.71 tar>=0.3 \
|
||||
test-framework>=0.2.2 test-framework-hunit>=0.2.2 \
|
||||
test-framework-quickcheck2>=0.2.2 text>=0.11 zlib>=0.5.1
|
||||
USE_CABAL= hashed-storage>=0.5.6 haskeline>=0.6.3 html>=1.0 \
|
||||
mtl>=1.0 parsec>=2.0 random>=1.0 regex-compat>=0.95.1 \
|
||||
regex-posix>=0.95.1 tar>=0.4 text>=0.11.0.6 unix-compat>=0.1.2 \
|
||||
vector>=0.7 zlib>=0.5.1.0
|
||||
|
||||
EXECUTABLE= darcs
|
||||
|
||||
@ -30,15 +29,13 @@ OPTIONS= CURL "Use libcurl for HTTP support" on \
|
||||
STATIC "Build static binary" off \
|
||||
TERMINFO "Use the terminfo package" off \
|
||||
THREADED "Use threading and SMP support" on \
|
||||
TYPE_WITNESSES "Use GADT type witnesses" off \
|
||||
COLOR "Use ANSI color escapes" off \
|
||||
MMAP "Compile with mmap support" off \
|
||||
TEST "Compile unit tests" off
|
||||
MMAP "Compile with mmap support" off
|
||||
|
||||
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
|
||||
.include <bsd.port.options.mk>
|
||||
|
||||
CONFIGURE_ARGS+= --flags="library"
|
||||
CONFIGURE_ARGS+= --flags="library executable"
|
||||
|
||||
.if defined(WITH_CURL)
|
||||
CONFIGURE_ARGS+= --flags="curl"
|
||||
@ -49,7 +46,7 @@ CONFIGURE_ARGS+= --flags="-curl"
|
||||
|
||||
.if defined(WITH_HTTP)
|
||||
CONFIGURE_ARGS+= --flags="http"
|
||||
USE_CABAL+= HTTP>=3000.0 network>=2.2
|
||||
USE_CABAL+= HTTP>=4000.0.8 network>=2.2
|
||||
.else
|
||||
CONFIGURE_ARGS+= --flags="-http"
|
||||
.endif
|
||||
@ -77,13 +74,6 @@ CONFIGURE_ARGS+= --flags="threaded"
|
||||
CONFIGURE_ARGS+= --flags="-threaded"
|
||||
.endif
|
||||
|
||||
.if defined(WITH_TYPE_WITNESSES)
|
||||
CONFIGURE_ARGS+= --flags="type-witnesses"
|
||||
EXECUTABLE+= witnesses
|
||||
.else
|
||||
CONFIGURE_ARGS+= --flags="-type-witnesses"
|
||||
.endif
|
||||
|
||||
.if defined(WITH_COLOR)
|
||||
CONFIGURE_ARGS+= --flags="color"
|
||||
.else
|
||||
@ -97,12 +87,5 @@ USE_CABAL+= mmap>=0.5
|
||||
CONFIGURE_ARGS+= --flags="-mmap"
|
||||
.endif
|
||||
|
||||
.if defined(WITH_TEST)
|
||||
CONFIGURE_ARGS+= --flags="test"
|
||||
EXECUTABLE+= unit
|
||||
.else
|
||||
CONFIGURE_ARGS+= --flags="-test"
|
||||
.endif
|
||||
|
||||
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
|
||||
.include <bsd.port.mk>
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (cabal/darcs-2.5.2.tar.gz) = 8953f9d64f8013876466b8ad5474a212ee4e164f419ba4012b5dcc9e590fb386
|
||||
SIZE (cabal/darcs-2.5.2.tar.gz) = 1231903
|
||||
SHA256 (cabal/darcs-2.8.1.tar.gz) = a1e5ad3146b6f738ba162623f27fb70498e682c2b1142f38f80e2c187f9ae9bb
|
||||
SIZE (cabal/darcs-2.8.1.tar.gz) = 1293098
|
||||
|
@ -1,38 +1,29 @@
|
||||
--- ./darcs.cabal.orig 2011-03-13 23:40:47.000000000 +0100
|
||||
+++ ./darcs.cabal 2011-12-10 15:26:09.000000000 +0100
|
||||
@@ -170,7 +170,7 @@
|
||||
--- ./darcs.cabal.orig 2012-05-14 13:10:13.000000000 +0200
|
||||
+++ ./darcs.cabal 2012-05-15 15:33:40.000000000 +0200
|
||||
@@ -371,7 +371,7 @@
|
||||
haskeline >= 0.6.3 && < 0.7,
|
||||
hashed-storage >= 0.5.6 && < 0.6,
|
||||
vector >= 0.7,
|
||||
- tar == 0.3.*
|
||||
+ tar == 0.4.*
|
||||
|
||||
build-depends: base < 5,
|
||||
extensible-exceptions >= 0.1 && < 0.2,
|
||||
- regex-compat >= 0.71 && < 0.94,
|
||||
+ regex-compat >= 0.71,
|
||||
mtl >= 1.0 && < 2.1,
|
||||
parsec >= 2.0 && < 3.2,
|
||||
html == 1.0.*,
|
||||
@@ -375,7 +375,7 @@
|
||||
if !os(windows)
|
||||
build-depends: unix >= 1.0 && < 2.6
|
||||
@@ -532,7 +532,7 @@
|
||||
haskeline >= 0.6.3 && < 0.7,
|
||||
hashed-storage >= 0.5.6 && < 0.6,
|
||||
vector >= 0.7,
|
||||
- tar == 0.3.*
|
||||
+ tar == 0.4.*
|
||||
|
||||
build-depends: base < 5,
|
||||
extensible-exceptions >= 0.1 && < 0.2,
|
||||
- regex-compat >= 0.71 && < 0.94,
|
||||
+ regex-compat >= 0.71,
|
||||
mtl >= 1.0 && < 2.1,
|
||||
parsec >= 2.0 && < 3.2,
|
||||
html == 1.0.*,
|
||||
@@ -523,7 +523,7 @@
|
||||
if !os(windows)
|
||||
build-depends: unix >= 1.0 && < 2.6
|
||||
@@ -729,7 +729,7 @@
|
||||
array >= 0.1 && < 0.5,
|
||||
hashed-storage >= 0.5.6 && < 0.6,
|
||||
vector >= 0.7,
|
||||
- tar == 0.3.*,
|
||||
+ tar == 0.4.*,
|
||||
random == 1.0.*
|
||||
|
||||
build-depends: base < 5,
|
||||
extensible-exceptions >= 0.1 && < 0.2,
|
||||
- regex-compat >= 0.71 && < 0.94,
|
||||
+ regex-compat >= 0.71,
|
||||
mtl >= 1.0 && < 2.1,
|
||||
parsec >= 2.0 && < 3.2,
|
||||
html == 1.0.*,
|
||||
@@ -619,7 +619,7 @@
|
||||
|
||||
build-depends: base < 5,
|
||||
extensible-exceptions >= 0.1 && < 0.2,
|
||||
- regex-compat >= 0.71 && < 0.94,
|
||||
+ regex-compat >= 0.71,
|
||||
mtl >= 1.0 && < 2.1,
|
||||
parsec >= 2.0 && < 3.2,
|
||||
html == 1.0.*,
|
||||
if flag(mmap) && !os(windows)
|
||||
|
26
devel/hs-darcs/files/patch-src__Darcs__Repository.hs
Normal file
26
devel/hs-darcs/files/patch-src__Darcs__Repository.hs
Normal file
@ -0,0 +1,26 @@
|
||||
--- ./src/Darcs/Repository.hs.orig 2012-04-22 17:14:14.000000000 +0200
|
||||
+++ ./src/Darcs/Repository.hs 2012-05-10 16:44:09.000000000 +0200
|
||||
@@ -302,19 +302,19 @@
|
||||
removeMetaFiles = mapM_ (removeFile . (darcsdir </>)) .
|
||||
filter ("meta-" `isPrefixOf`) =<< getDirectoryContents darcsdir
|
||||
|
||||
-unpackBasic :: Cache -> Tar.Entries -> IO ()
|
||||
+unpackBasic :: Cache -> Tar.Entries Tar.FormatError -> IO ()
|
||||
unpackBasic c x = do
|
||||
withControlMVar $ \mv -> unpackTar c (basicMetaHandler c mv) x
|
||||
removeMetaFiles
|
||||
|
||||
-unpackPatches :: Cache -> [String] -> Tar.Entries -> IO ()
|
||||
+unpackPatches :: Cache -> [String] -> Tar.Entries Tar.FormatError -> IO ()
|
||||
unpackPatches c ps x = do
|
||||
withControlMVar $ \mv -> unpackTar c (patchesMetaHandler c ps mv) x
|
||||
removeMetaFiles
|
||||
|
||||
-unpackTar :: Cache -> IO () -> Tar.Entries -> IO ()
|
||||
+unpackTar :: Cache -> IO () -> Tar.Entries Tar.FormatError -> 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
|
@ -1,19 +1,19 @@
|
||||
Darcs is a free, open source revision control system. It is:
|
||||
|
||||
* Distributed: Every user has access to the full command set, removing
|
||||
boundaries between server and client or committer and non-committers.
|
||||
boundaries between server and client or committer and non-committers.
|
||||
|
||||
* Interactive: Darcs is easy to learn and efficient to use because it
|
||||
asks you questions in response to simple commands, giving you choices in
|
||||
your work flow. You can choose to record one change in a file, while
|
||||
ignoring another. As you update from upstream, you can review each patch
|
||||
name, even the full "diff" for interesting patches.
|
||||
asks you questions in response to simple commands, giving you choices in
|
||||
your work flow. You can choose to record one change in a file, while
|
||||
ignoring another. As you update from upstream, you can review each patch
|
||||
name, even the full "diff" for interesting patches.
|
||||
|
||||
* Smart: Originally developed by physicist David Roundy, darcs is based
|
||||
on a unique algebra of patches.
|
||||
on a unique algebra of patches.
|
||||
|
||||
This smartness lets you respond to changing demands in ways that would
|
||||
otherwise not be possible. Learn more about spontaneous branches with
|
||||
darcs.
|
||||
|
||||
WWW: http://darcs.net/
|
||||
WWW: http://darcs.net/
|
||||
|
Loading…
Reference in New Issue
Block a user