aboutsummaryrefslogtreecommitdiff
path: root/devel/hs-darcs
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2013-03-29 22:43:58 +0000
committerGabor Pali <pgj@FreeBSD.org>2013-03-29 22:43:58 +0000
commitbd8d410bbe561cb06cef8e6439398148ea172996 (patch)
treebb6acd9e4d75e5dd918d3f6f723ca485c7f0dd6f /devel/hs-darcs
parent18f2b16087e8ecd6790e8d551f1083d977da1d77 (diff)
downloadports-bd8d410bbe561cb06cef8e6439398148ea172996.tar.gz
ports-bd8d410bbe561cb06cef8e6439398148ea172996.zip
- Update Haskell ports from the development repository
- Avoid self-dependency for print/hs-hscolour (when HSCOLOUR is set) Contributed by: ashish New ports (5): devel/hs-geniplate 0.6.0.3 devel/hs-uuid 1.2.9 net/hs-maccatcher 2.1.5 net/hs-publicsuffixlist 0.0.3 textproc/hs-regex-tdfa 1.1.8 Removed ports (1): math/hs-Agda-executable 2.3.0.1_3 Updated ports (115): archivers/hs-zip-archive 0.1.3.3 --> 0.1.3.4 archivers/hs-zlib-conduit 0.5.0.3_1 --> 1.0.0 audio/hs-OpenAL 1.4.0.1_3 --> 1.4.0.2 databases/hs-persistent 1.1.4 --> 1.1.5.1 databases/hs-persistent-sqlite 1.1.2 --> 1.1.5 databases/hs-persistent-template 1.1.2.1 --> 1.1.2.4 devel/hs-Boolean 0.1.2 --> 0.2 devel/hs-ansi-terminal 0.5.5.1 --> 0.6 devel/hs-base64-bytestring 1.0.0.0_1 --> 1.0.0.1 devel/hs-base64-conduit 0.5.1 --> 1.0.0 devel/hs-basic-prelude 0.3.2.0 --> 0.3.4.0 devel/hs-bifunctors 3.2 --> 3.2.0.1 devel/hs-blaze-builder-conduit 0.5.0.3_1 --> 1.0.0 devel/hs-classy-prelude 0.4.3 --> 0.5.3 devel/hs-classy-prelude-conduit 0.4.3 --> 0.5.3 devel/hs-cmdargs 0.10.1_1 --> 0.10.2 devel/hs-conduit 0.5.6 --> 1.0.2 devel/hs-darcs 2.8.3_1 --> 2.8.4 devel/hs-either 3.1 --> 3.4 devel/hs-errors 1.3.1 --> 1.4.1 devel/hs-filestore 0.6 --> 0.6.0.1 devel/hs-filesystem-conduit 0.5.0.2_1 --> 1.0.0 devel/hs-git-annex 3.20130124 --> 4.20130323 devel/hs-hashtables 1.0.1.8_1 --> 1.1.0.2 devel/hs-haskeline 0.6.4.7_3 --> 0.7.0.3 devel/hs-hint 0.3.3.5_1 --> 0.3.3.6 devel/hs-hoogle 4.2.15 --> 4.2.16 devel/hs-hspec 1.4.3 --> 1.4.4 devel/hs-lens 3.8.5 --> 3.8.7.3 devel/hs-logict 0.5.0.2_1 --> 0.6 devel/hs-monad-logger 0.2.3.2 --> 0.3.0.1 devel/hs-monad-par 0.3_3 --> 0.3.4.1 devel/hs-mueval 0.8.2_3 --> 0.9 devel/hs-profunctors 3.2 --> 3.3 devel/hs-project-template 0.1.1 --> 0.1.3 devel/hs-readline 1.0.1.0_8 --> 1.0.3.0 devel/hs-reflection 1.1.6 --> 1.1.7 devel/hs-resourcet 0.4.4_1 --> 0.4.5 devel/hs-show 0.4.1.2_4 --> 0.5 devel/hs-simple-reflect 0.2_1 --> 0.3.1 devel/hs-smallcheck 0.6.2 --> 1.0.2 devel/hs-testpack 2.1.2_3 --> 2.1.2.1 devel/hs-threads 0.5.0.1_1 --> 0.5.0.2 devel/hs-time-compat 0.1.0.2_1 --> 0.1.0.3 devel/hs-unix-time 0.1.4_1 --> 0.1.5 devel/hs-uulib 0.9.14_4 --> 0.9.15 mail/hs-email-validate 0.3.2_1 --> 1.0.0 mail/hs-mime-types 0.1.0.2 --> 0.1.0.3 math/hs-Agda 2.3.0.1_3 --> 2.3.2 math/hs-NumInstances 1.0_4 --> 1.2 math/hs-comonad 3.0.1.1 --> 3.0.2 math/hs-contravariant 0.2.0.2_3 --> 0.4 math/hs-distributive 0.3 --> 0.3.1 math/hs-math-functions 0.1.1.2_1 --> 0.1.3.0 net/hs-network-conduit 0.6.2.2 --> 1.0.0 net/hs-sendfile 0.7.8_1 --> 0.7.9 net/hs-simple-sendfile 0.2.10 --> 0.2.11 net/hs-socks 0.4.2_1 --> 0.5.0 security/hs-crypto-api 0.10.2_3 --> 0.11 security/hs-crypto-conduit 0.4.3 --> 0.5.0 security/hs-monadcryptorandom 0.5_1 --> 0.5.1 security/hs-skein 0.1.0.11 --> 0.1.0.12 security/hs-tls 1.1.1 --> 1.1.2 textproc/hs-HStringTemplate 0.6.12_1 --> 0.7.1 textproc/hs-attoparsec 0.10.3.0 --> 0.10.4.0 textproc/hs-attoparsec-conduit 0.5.0.3_1 --> 1.0.0 textproc/hs-blaze-html 0.5.1.3 --> 0.6.0.0 textproc/hs-case-insensitive 0.4.0.4 --> 1.0 textproc/hs-citeproc-hs 0.3.7 --> 0.3.8 textproc/hs-highlighting-kate 0.5.3.5 --> 0.5.3.8 textproc/hs-hs-bibutils 4.16 --> 4.17 textproc/hs-html-conduit 0.1.0.4_1 --> 1.1.0 textproc/hs-hxt-regex-xmlschema 9.0.4_4 --> 9.1.0 textproc/hs-pandoc 1.9.4.5_1 --> 1.11.1 textproc/hs-pandoc-types 1.9.1_3 --> 1.10 textproc/hs-tagstream-conduit 0.5.3_1 --> 0.5.4 textproc/hs-xml-conduit 1.0.3.3_1 --> 1.1.0.3 textproc/hs-xmlhtml 0.2.0.3_1 --> 0.2.1 textproc/hs-yaml 0.8.2 --> 0.8.2.3 www/hs-activehs 0.3.0.1_1 --> 0.3.1 www/hs-authenticate 1.3.2_1 --> 1.3.2.6 www/hs-fastcgi 3001.0.2.3_7 --> 3001.0.2.4 www/hs-gitit 0.10.1.2 --> 0.10.3.1 www/hs-hS3 0.5.6_5 --> 0.5.7 www/hs-hamlet 1.1.3.1 --> 1.1.6.3 www/hs-happstack-server 7.1.1_1 --> 7.1.7 www/hs-heist 0.11.0 --> 0.11.1 www/hs-hjsmin 0.1.4 --> 0.1.4.1 www/hs-http-conduit 1.8.7 --> 1.9.0 www/hs-http-reverse-proxy 0.1.1.1 --> 0.1.1.3 www/hs-http-server 1.0.1_1 --> 1.0.2 www/hs-http-types 0.7.3.0.1_1 --> 0.8.0 www/hs-shakespeare 1.0.2_1 --> 1.0.3.1 www/hs-shakespeare-css 1.0.2_1 --> 1.0.3 www/hs-shakespeare-js 1.1.1 --> 1.1.2.1 www/hs-snap 0.11.0 --> 0.11.2 www/hs-snap-core 0.9.2.2_1 --> 0.9.3.1 www/hs-snap-server 0.9.2.4_1 --> 0.9.3.3 www/hs-wai 1.3.0.1_1 --> 1.4.0 www/hs-wai-app-static 1.3.1_1 --> 1.3.1.2 www/hs-wai-extra 1.3.2 --> 1.3.2.4 www/hs-wai-test 1.3.0_1 --> 1.3.0.4 www/hs-warp 1.3.7.1 --> 1.3.7.4 www/hs-yesod 1.1.7.2 --> 1.1.9.2 www/hs-yesod-auth 1.1.3 --> 1.1.5.3 www/hs-yesod-core 1.1.7.1 --> 1.1.8.2 www/hs-yesod-default 1.1.3 --> 1.1.3.2 www/hs-yesod-form 1.2.0.2 --> 1.2.1.3 www/hs-yesod-json 1.1.2_1 --> 1.1.2.1 www/hs-yesod-platform 1.1.7.2 --> 1.1.8 www/hs-yesod-routes 1.1.1.1_1 --> 1.1.2 www/hs-yesod-static 1.1.1.2 --> 1.1.2.2 www/hs-yesod-test 0.3.3 --> 0.3.5 x11-wm/hs-xmonad-contrib 0.11 --> 0.11.1 x11/hs-X11 1.6.0.2 --> 1.6.1.1 Please note that port revisions for dependent ports are bumped. Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=315580
Diffstat (limited to 'devel/hs-darcs')
-rw-r--r--devel/hs-darcs/Makefile7
-rw-r--r--devel/hs-darcs/distinfo4
-rw-r--r--devel/hs-darcs/files/patch-Setup.lhs12
-rw-r--r--devel/hs-darcs/files/patch-darcs.cabal29
-rw-r--r--devel/hs-darcs/files/patch-src__Darcs__Repository.hs26
5 files changed, 11 insertions, 67 deletions
diff --git a/devel/hs-darcs/Makefile b/devel/hs-darcs/Makefile
index 6fba544e5362..b8716f6abf37 100644
--- a/devel/hs-darcs/Makefile
+++ b/devel/hs-darcs/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= darcs
-PORTVERSION= 2.8.3
-PORTREVISION= 1
+PORTVERSION= 2.8.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
@@ -13,9 +12,9 @@ LICENSE= GPLv2
FILE_LICENSE= COPYING
USE_CABAL= hashed-storage>=0.5.6 haskeline>=0.6.3 html \
- mtl>=1.0 parsec>=2.0 random regex-compat>=0.95.1 \
+ mtl>=1.0 parsec>=2.2 random 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
+ utf8-string>=0.3.6 vector>=0.7 zlib>=0.5.1.0
EXECUTABLE= darcs
diff --git a/devel/hs-darcs/distinfo b/devel/hs-darcs/distinfo
index 0e7662e0cca2..c2655e42837f 100644
--- a/devel/hs-darcs/distinfo
+++ b/devel/hs-darcs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/darcs-2.8.3.tar.gz) = 90750842926750cd60a97c61f8ba08e90faffdcb11478d10617a3d5d62216f59
-SIZE (cabal/darcs-2.8.3.tar.gz) = 1289187
+SHA256 (cabal/darcs-2.8.4.tar.gz) = 3fab4dbb2d5dd9f381d49f4730c12e1534b5c484b0dde9712614a7151f659f98
+SIZE (cabal/darcs-2.8.4.tar.gz) = 1301464
diff --git a/devel/hs-darcs/files/patch-Setup.lhs b/devel/hs-darcs/files/patch-Setup.lhs
index df31ea371518..c2ecc0e43c6e 100644
--- a/devel/hs-darcs/files/patch-Setup.lhs
+++ b/devel/hs-darcs/files/patch-Setup.lhs
@@ -1,15 +1,15 @@
---- ./Setup.lhs.orig 2011-02-11 00:35:43.000000000 +0100
-+++ ./Setup.lhs 2011-03-13 18:05:02.180256196 +0100
-@@ -21,7 +21,7 @@
+--- Setup.lhs.orig 2013-02-06 07:07:21.000000000 +0100
++++ Setup.lhs 2013-02-10 10:48:49.000000000 +0100
+@@ -26,7 +26,7 @@
import Data.Version( showVersion )
import Distribution.Simple.LocalBuildInfo
( LocalBuildInfo(..), absoluteInstallDirs, externalPackageDeps )
-import Distribution.Simple.InstallDirs (mandir, CopyDest (NoCopyDest))
+import Distribution.Simple.InstallDirs (prefix, CopyDest (NoCopyDest))
+ import Distribution.Simple.PackageIndex ( topologicalOrder )
+ import Distribution.Simple.Program ( gccProgram, rawSystemProgramStdoutConf )
import Distribution.Simple.Setup
- (buildVerbosity, copyDest, copyVerbosity, fromFlag,
- haddockVerbosity, installVerbosity, sDistVerbosity)
-@@ -180,7 +180,7 @@
+@@ -200,7 +200,7 @@
-> Verbosity -> CopyDest -> IO ()
installManpage pkg lbi verbosity copy =
copyFiles verbosity
diff --git a/devel/hs-darcs/files/patch-darcs.cabal b/devel/hs-darcs/files/patch-darcs.cabal
deleted file mode 100644
index e07520c70785..000000000000
--- a/devel/hs-darcs/files/patch-darcs.cabal
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./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.*
-
- 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.*
-
- 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.*
-
- if flag(mmap) && !os(windows)
diff --git a/devel/hs-darcs/files/patch-src__Darcs__Repository.hs b/devel/hs-darcs/files/patch-src__Darcs__Repository.hs
deleted file mode 100644
index 1bbacd8dd907..000000000000
--- a/devel/hs-darcs/files/patch-src__Darcs__Repository.hs
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./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
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 21:33:58 +0000