Commit aa5ac892 authored by pgj's avatar pgj
Browse files

- 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
parent 8fd76265
......@@ -2,6 +2,7 @@
PORTNAME= configurator
PORTVERSION= 0.2.0.2
PORTREVISION= 1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
......
......@@ -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
......
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
--- ./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
......
--- ./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)
--- ./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
# $FreeBSD$
PORTNAME= either
PORTVERSION= 3.1
PORTVERSION= 3.4
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
......
SHA256 (cabal/either-3.1.tar.gz) = 55b73518e14650a07c9a1cf8eb92be96ecaaf61cf4da02b5185976d1a0a34fdd
SIZE (cabal/either-3.1.tar.gz) = 4945
SHA256 (cabal/either-3.4.tar.gz) = e2c71edae6e117b31cfe7156f36fb212576eeebf593733452a9883721fbacb16
SIZE (cabal/either-3.4.tar.gz) = 5314
# $FreeBSD$
PORTNAME= errors
PORTVERSION= 1.3.1
PORTVERSION= 1.4.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
......@@ -11,7 +11,7 @@ LICENSE= BSD
CABAL_SETUP= Setup.hs
USE_CABAL= either>=3.0.1 safe>=0.3.3 transformers>=0.2
USE_CABAL= either>=3.1 safe>=0.3.3 transformers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/errors-1.3.1.tar.gz) = 33babc5bee751efd9f426ef410fbe1dbc031ddd56538e5e55ec28c1fe7b5d76d
SIZE (cabal/errors-1.3.1.tar.gz) = 6048
SHA256 (cabal/errors-1.4.1.tar.gz) = 80b01229cf6dc9318e227ef6d501136903f744b6fe769c565400fa653277d7a2
SIZE (cabal/errors-1.4.1.tar.gz) = 6910
......@@ -2,7 +2,7 @@
PORTNAME= fast-logger
PORTVERSION= 0.3.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
......
# $FreeBSD$
PORTNAME= filestore
PORTVERSION= 0.6
PORTVERSION= 0.6.0.1
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
......@@ -9,8 +9,7 @@ COMMENT= Interface for versioning file stores
LICENSE= BSD
USE_CABAL= Diff>=0.2 HUnit>=1.2 mtl parsec>=2 split>=0.1 \
utf8-string>=0.3 xml>=1.3
USE_CABAL= Diff>=0.2 parsec>=2 split>=0.1 utf8-string>=0.3 xml>=1.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/filestore-0.6.tar.gz) = 6076b3cb8e702520d0c98526babd96d9942a87cf5af10e604887e33873c7baae
SIZE (cabal/filestore-0.6.tar.gz) = 29622
SHA256 (cabal/filestore-0.6.0.1.tar.gz) = 6eabe0a7d5c8c95a3c827f92db80fe84a14c514f2a74dfca66cf4a56e30243d1
SIZE (cabal/filestore-0.6.0.1.tar.gz) = 29807
# $FreeBSD$
PORTNAME= filesystem-conduit
PORTVERSION= 0.5.0.2
PORTREVISION= 1
PORTVERSION= 1.0.0
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
......@@ -10,7 +9,7 @@ COMMENT= Use system-filepath data types with conduits
LICENSE= BSD
USE_CABAL= conduit>=0.5 system-fileio>=0.3.3 system-filepath>=0.4.3 \
USE_CABAL= conduit>=1.0 system-fileio>=0.3.3 system-filepath>=0.4.3 \
text>=0.11 transformers>=0.2.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
......
SHA256 (cabal/filesystem-conduit-0.5.0.2.tar.gz) = d8f934889839492f04c2e5812aefa62af1a53c67c94f8b22dd641c33c5a0fd6e
SIZE (cabal/filesystem-conduit-0.5.0.2.tar.gz) = 3075
SHA256 (cabal/filesystem-conduit-1.0.0.tar.gz) = db4448dfec7b8cc1c74a7a3164712949fd3b3745af61b9f5a8e65dcc608ce3bb
SIZE (cabal/filesystem-conduit-1.0.0.tar.gz) = 3066
# Created by: Giuseppe Pilichi aka Jacula Modyun <jacula@gmail.com>
# $FreeBSD$
PORTNAME= Agda-executable
PORTVERSION= 2.3.0.1
PORTREVISION= 3
CATEGORIES= math haskell
PORTNAME= geniplate
PORTVERSION= 0.6.0.3
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Command-line program for type-checking and compiling Agda programs
COMMENT= Use template Haskell to generate Uniplate-like functions
CABAL_SETUP= Setup.hs
USE_CABAL= Agda>=2.3.0 Agda<2.3.1
LICENSE= BSD
USE_ICONV= yes
CABAL_SETUP= Setup.hs
EXECUTABLE= agda
STANDALONE= yes
USE_CABAL= mtl
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/geniplate-0.6.0.3.tar.gz) = 76eeb3356a3c588fd80b31fde44d4c8df97fd8f53f9262e57138d9f94eb9e3d8
SIZE (cabal/geniplate-0.6.0.3.tar.gz) = 6824
Use template Haskell to generate Uniplate-like functions.
WWW: http://hackage.haskell.org/package/geniplate
......@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= git-annex
PORTVERSION= 3.20130124
PORTVERSION= 4.20130323
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
......@@ -13,10 +13,10 @@ FILE_LICENSE= COPYRIGHT
CABAL_SETUP= Setup.hs
USE_CABAL= async bloomfilter dataenc edit-distance hslogger HTTP IfElse \
json lifted-base MissingH monad-control mtl network pcre-light \
QuickCheck>=2.1 SafeSemaphore SHA text transformers-base \
utf8-string
USE_CABAL= bloomfilter dataenc edit-distance hslogger HTTP IfElse json \
lifted-base MissingH monad-control mtl network pcre-light \
QuickCheck>=2.1 regex-tdfa SafeSemaphore SHA text \
transformers-base utf8-string uuid
USE_GMAKE= yes
USE_PERL5_BUILD= yes
......@@ -30,7 +30,7 @@ RUN_DEPENDS+= rsync:${PORTSDIR}/net/rsync \
EXECUTABLE= git-annex git-annex-shell
STANDALONE= yes
OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING
OPTIONS_DEFINE= S3 ASSISTANT INOTIFY WEBAPP PAIRING PRODUCTION
OPTIONS_DEFAULT= S3 ASSISTANT
S3_DESC= S3 support
......@@ -38,6 +38,7 @@ ASSISTANT_DESC= 'assistant' and 'watch' commands
INOTIFY_DESC= File system notifications support
WEBAPP_DESC= Web application (req. assistant)
PAIRING_DESC= Enable pairing (req. web application)
PRODUCTION_DESC= Production build
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
......@@ -50,7 +51,7 @@ CONFIGURE_ARGS+= --flags="-S3"
.if ${PORT_OPTIONS:MASSISTANT}
CONFIGURE_ARGS+= --flags="Assistant"
USE_CABAL+= stm>=2.3
USE_CABAL+= async stm>=2.3
.else
CONFIGURE_ARGS+= --flags="-Assistant"
.endif
......@@ -82,5 +83,11 @@ CONFIGURE_ARGS+= --flags="-Pairing"
# Disable all the other options
CONFIGURE_ARGS+= --flags="-DNS -XMPP -Dbus"
.if ${PORT_OPTIONS:MPRODUCTION}
CONFIGURE_ARGS+= --flags="Production"
.else
CONFIGURE_ARGS+= --flags="-Production"
.endif
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
SHA256 (cabal/git-annex-3.20130124.tar.gz) = 02498f5806344aae49ebcf6b67d370da29fc8d770a38dfad8cd8de59c127a290
SIZE (cabal/git-annex-3.20130124.tar.gz) = 2173150
SHA256 (cabal/git-annex-4.20130323.tar.gz) = 1f940d88b8ef91e18155a778b3665c7151f61567945259d41921e389beab779f
SIZE (cabal/git-annex-4.20130323.tar.gz) = 2578033
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment