aboutsummaryrefslogtreecommitdiff
path: root/www/hs-activehs
diff options
context:
space:
mode:
authorGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
committerGabor Pali <pgj@FreeBSD.org>2013-06-04 18:53:40 +0000
commit109269205e521bb1d2d87678a391e5adefff88d6 (patch)
tree93f1f9278a9a48902904b7ff4a5ce711c10efe08 /www/hs-activehs
parentad7295cafd0e46ece6fcbf594ef39a767c296d0e (diff)
downloadports-109269205e521bb1d2d87678a391e5adefff88d6.tar.gz
ports-109269205e521bb1d2d87678a391e5adefff88d6.zip
- Update The Glorious Glasgow Haskell Compiler to version 7.6.3
- Update Haskell Platform to version 2013.2.0.0 Please note that port revisions for all the Haskell ports without version changes are bumped. Some highlights of the update: - Fix PDF generation for pandoc [1] - From now on, PREFIX/{lib,share,share/doc}/cabal/ghc-GHC_VERSION are used for hs- ports (Cabal packages) as prefixes to avoid problems when upgrading with portmaster(8) [2] - Experimental support for LLVM-based code generation (disabled by default) - Many simplifications, refactoring in bsd.cabal.mk New ports (11): devel/hs-asn1-types 0.1.3 devel/hs-data-default-class 0.0.1 devel/hs-data-default-instances-base 0.0.1 devel/hs-data-default-instances-containers 0.0.1 devel/hs-data-default-instances-dlist 0.0.1 devel/hs-data-default-instances-old-locale 0.0.1 devel/hs-extensible-exceptions 0.1.1.4 devel/hs-mmorph 1.0.0 devel/hs-quickcheck-io 0.1.0 x11-toolkits/hs-GLURaw 1.3.0.0 x11-toolkits/hs-OpenGLRaw 1.3.0.0 Updated ports (104): archivers/hs-zlib 0.5.4.0_1 --> 0.5.4.1 databases/hs-persistent 1.1.5.1 --> 1.2.0.1 databases/hs-persistent-sqlite 1.1.5 --> 1.2.0 databases/hs-persistent-template 1.1.2.4 --> 1.2.0 devel/hs-HUnit 1.2.5.1_1 --> 1.2.5.2 devel/hs-IORefCAS 0.2_3 --> 0.2.0.1 devel/hs-MonadRandom 0.1.8 --> 0.1.9 devel/hs-QuickCheck 2.5.1.1_1 --> 2.6 devel/hs-abstract-deque 0.1.6_1 --> 0.2 devel/hs-alex 3.0.2_1 --> 3.0.5 devel/hs-async 2.0.1.3_1 --> 2.0.1.4 devel/hs-basic-prelude 0.3.4.0 --> 0.3.5.0 devel/hs-blaze-builder 0.3.1.0_4 --> 0.3.1.1 devel/hs-byteorder 1.0.3_4 --> 1.0.4 devel/hs-cabal-install 0.14.0_4 --> 1.16.0.2 devel/hs-classy-prelude 0.5.3 --> 0.5.7 devel/hs-cmdargs 0.10.2 --> 0.10.3 devel/hs-conduit 1.0.2 --> 1.0.5 devel/hs-data-default 0.5.0_1 --> 0.5.3 devel/hs-fsnotify 0.0.6 --> 0.0.11 devel/hs-generic-deriving 1.4.0 --> 1.5.0 devel/hs-git-annex 4.20130323_1 --> 4.20130601 devel/hs-haddock 2.11.0_1 --> 2.13.2 devel/hs-hashable 1.2.0.5 --> 1.1.2.5,1 devel/hs-hlint 1.8.43 --> 1.8.45 devel/hs-hspec 1.4.4 --> 1.5.4 devel/hs-hspec-expectations 0.3.0.3_1 --> 0.3.2 devel/hs-largeword 1.0.4 --> 1.0.5 devel/hs-lens 3.8.7.3 --> 3.9.0.2 devel/hs-lifted-base 0.2.0.2 --> 0.2.0.5 devel/hs-monad-control 0.3.1.4_1 --> 0.3.2.1 devel/hs-monad-logger 0.3.0.1 --> 0.3.1.1 devel/hs-monad-par 0.3.4.1 --> 0.3.4.2 devel/hs-pool-conduit 0.1.1_1 --> 0.1.2 devel/hs-profunctors 3.3 --> 3.3.0.1 devel/hs-reflection 1.1.7 --> 1.3.2 devel/hs-resourcet 0.4.5 --> 0.4.7.1 devel/hs-show 0.5 --> 0.6 devel/hs-split 0.2.1.1_1 --> 0.2.2 devel/hs-stm 2.4_1 --> 2.4.2 devel/hs-syb 0.3.7_1 --> 0.4.0 devel/hs-tagged 0.4.4_1 --> 0.6 devel/hs-text 0.11.2.3_1 --> 0.11.3.1 devel/hs-unix-compat 0.4.1.0 --> 0.4.1.1 devel/hs-unix-time 0.1.5 --> 0.1.8 devel/hs-unordered-containers 0.2.3.0 --> 0.2.3.1 devel/hs-utility-ht 0.0.8_3 --> 0.0.9 devel/hs-uuagc 0.9.42.2_3 --> 0.9.42.3 devel/hs-uuid 1.2.9 --> 1.2.13 devel/hs-void 0.5.11 --> 0.6 math/hs-NumInstances 1.2 --> 1.3 math/hs-comonad-transformers 3.0.1_1 --> 3.0.2 math/hs-semigroups 0.9 --> 0.9.1 math/hs-statistics 0.10.2.0_2 --> 0.10.3.1 net/hs-network 2.3.1.0_1 --> 2.4.1.2 net/hs-publicsuffixlist 0.0.3 --> 0.1 net/hs-socks 0.5.0 --> 0.5.1 security/hs-certificate 1.3.5_1 --> 1.3.7 security/hs-cipher-aes 0.1.7 --> 0.1.8 security/hs-clientsession 0.8.1_1 --> 0.9 security/hs-crypto-api 0.11 --> 0.12.1 security/hs-crypto-conduit 0.5.0 --> 0.5.2 security/hs-crypto-pubkey 0.1.2_1 --> 0.1.3 security/hs-crypto-pubkey-types 0.2.0_1 --> 0.3.2 security/hs-cryptocipher 0.4.0_1 --> 0.5.0 security/hs-cryptohash 0.8.3_1 --> 0.9.0 security/hs-skein 0.1.0.12 --> 1.0.3 textproc/hs-HaXml 1.23.3_2 --> 1.24 textproc/hs-attoparsec-conduit 1.0.0 --> 1.0.1 textproc/hs-blaze-html 0.6.0.0 --> 0.6.1.1 textproc/hs-blaze-markup 0.5.1.4 --> 0.5.1.5 textproc/hs-case-insensitive 1.0 --> 1.0.0.2 textproc/hs-highlighting-kate 0.5.3.8 --> 0.5.3.9 textproc/hs-hs-bibutils 4.17 --> 5.0 textproc/hs-polyparse 1.8_3 --> 1.9 textproc/hs-texmath 0.6.1.3 --> 0.6.1.5 textproc/hs-xml 1.3.12_4 --> 1.3.13 textproc/hs-yaml 0.8.2.3 --> 0.8.2.4 www/hs-HTTP 4000.2.5_1 --> 4000.2.8 www/hs-cgi 3001.1.7.4_6,1 --> 3001.1.7.5,1 www/hs-hamlet 1.1.6.3 --> 1.1.7.1 www/hs-happstack-server 7.1.7 --> 7.1.7.1 www/hs-heist 0.11.1 --> 0.12.0 www/hs-http-conduit 1.9.0 --> 1.9.3 www/hs-http-reverse-proxy 0.1.1.3 --> 0.1.1.6 www/hs-shakespeare 1.0.3.1 --> 1.0.5 www/hs-shakespeare-css 1.0.3 --> 1.0.5.1 www/hs-shakespeare-js 1.1.2.1 --> 1.1.4 www/hs-snap 0.11.2 --> 0.12.0 www/hs-wai-extra 1.3.2.4 --> 1.3.4 www/hs-wai-test 1.3.0.4 --> 1.3.1 www/hs-warp 1.3.7.4 --> 1.3.8.1 www/hs-yesod 1.1.9.2 --> 1.2.0.1 www/hs-yesod-auth 1.1.5.3 --> 1.2.0 www/hs-yesod-core 1.1.8.2 --> 1.2.0.4 www/hs-yesod-form 1.2.1.3 --> 1.3.0 www/hs-yesod-persistent 1.1.0.1_1 --> 1.2.0 www/hs-yesod-platform 1.1.8 --> 1.2.0.1 www/hs-yesod-routes 1.1.2 --> 1.2.0 www/hs-yesod-static 1.1.2.2 --> 1.2.0 www/hs-yesod-test 0.3.5 --> 1.2.0 x11-toolkits/hs-GLUT 2.1.2.1_7,1 --> 2.4.0.0,1 x11-toolkits/hs-OpenGL 2.2.3.1_4,1 --> 2.8.0.0,1 x11/hs-xmobar 0.16_2 --> 0.17 Removed ports (2): www/hs-yesod-default 1.1.3.2 www/hs-yesod-json 1.1.2.1 PR: ports/179146 [1] Requested by: Omar Thameen <omar@biglist.com> [1] Reported by: sperber, bapt [2] Tested by: sperber [2] Obtained from: FreeBSD Haskell
Notes
Notes: svn path=/head/; revision=319894
Diffstat (limited to 'www/hs-activehs')
-rw-r--r--www/hs-activehs/Makefile3
-rw-r--r--www/hs-activehs/files/patch-Converter.hs13
-rw-r--r--www/hs-activehs/files/patch-Main.hs10
-rw-r--r--www/hs-activehs/files/patch-Simple.hs19
-rw-r--r--www/hs-activehs/files/patch-Smart.hs10
-rw-r--r--www/hs-activehs/files/patch-Special.hs20
-rw-r--r--www/hs-activehs/files/patch-activehs.cabal19
7 files changed, 31 insertions, 63 deletions
diff --git a/www/hs-activehs/Makefile b/www/hs-activehs/Makefile
index 669699ee8b4d..f14114b0f4a7 100644
--- a/www/hs-activehs/Makefile
+++ b/www/hs-activehs/Makefile
@@ -2,6 +2,7 @@
PORTNAME= activehs
PORTVERSION= 0.3.1
+PORTREVISION= 1
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -9,8 +10,6 @@ COMMENT= Haskell code presentation tool
LICENSE= BSD
-CABAL_SETUP= Setup.hs
-
USE_CABAL= activehs-base>=0.2 blaze-html>=0.5 blaze-markup>=0.5.1.0 \
cmdargs>=0.7 data-pprint>=0.2 dia-base>=0.1 \
dia-functions>=0.2.1.1 haskell-src-exts>=1.12 \
diff --git a/www/hs-activehs/files/patch-Converter.hs b/www/hs-activehs/files/patch-Converter.hs
new file mode 100644
index 000000000000..e4e7da82e900
--- /dev/null
+++ b/www/hs-activehs/files/patch-Converter.hs
@@ -0,0 +1,13 @@
+--- ./Converter.hs.orig 2013-02-12 20:23:45.000000000 +0100
++++ ./Converter.hs 2013-05-28 16:20:35.000000000 +0200
+@@ -249,8 +249,8 @@
+
+ mkName :: String -> HSyn.Name
+ mkName n@(c:_)
+- | isSymbol c = HSyn.Symbol n
+-mkName n = HSyn.Ident n
++ | isLetter c = HSyn.Ident n
++mkName n = HSyn.Symbol n
+
+ mkImport_ :: String -> String -> HSyn.ImportDecl
+ mkImport_ magic m
diff --git a/www/hs-activehs/files/patch-Main.hs b/www/hs-activehs/files/patch-Main.hs
deleted file mode 100644
index 0920ef39498b..000000000000
--- a/www/hs-activehs/files/patch-Main.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Main.hs.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./Main.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -31,7 +31,6 @@
- import System.Locale (defaultTimeLocale)
- import Data.Time (getCurrentTime, formatTime, diffUTCTime)
- import Data.Maybe (listToMaybe)
----import Prelude hiding (catch)
-
- ---------------------------------------------------------------
-
diff --git a/www/hs-activehs/files/patch-Simple.hs b/www/hs-activehs/files/patch-Simple.hs
deleted file mode 100644
index bc6f6eeca660..000000000000
--- a/www/hs-activehs/files/patch-Simple.hs
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./Simple.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Simple.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts #-}
-+{-# LANGUAGE ExistentialQuantification, ScopedTypeVariables, PatternGuards, FlexibleContexts, CPP #-}
-
- module Simple
- ( Task (..), TaskChan
-@@ -23,7 +23,9 @@
- import Control.Monad (when, forever)
- import Control.Monad.Error (MonadError, catchError)
- import Data.List (isPrefixOf)
----import Prelude hiding (catch)
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-
- -------------------------
-
diff --git a/www/hs-activehs/files/patch-Smart.hs b/www/hs-activehs/files/patch-Smart.hs
deleted file mode 100644
index ad3d8eb0ba59..000000000000
--- a/www/hs-activehs/files/patch-Smart.hs
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Smart.hs.orig 2013-02-12 20:23:45.000000000 +0100
-+++ ./Smart.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -37,7 +37,6 @@
- import qualified Data.Data as D
- import Data.List (nub)
- import Data.Char (isAlpha)
----import Prelude hiding (catch)
-
-
- ----------------------------------------------------------------------
diff --git a/www/hs-activehs/files/patch-Special.hs b/www/hs-activehs/files/patch-Special.hs
deleted file mode 100644
index af4c8ebd5c92..000000000000
--- a/www/hs-activehs/files/patch-Special.hs
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./Special.hs.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./Special.hs 2013-02-18 19:59:53.000000000 +0100
-@@ -1,4 +1,4 @@
--{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns #-}
-+{-# LANGUAGE ScopedTypeVariables, OverloadedStrings, ViewPatterns, PatternGuards, NamedFieldPuns, CPP #-}
-
- module Special
- ( SpecialTask (..), exerciseServer'
-@@ -25,8 +25,9 @@
- import System.Directory (getTemporaryDirectory)
-
- import Control.Concurrent (threadDelay, forkIO, killThread)
----import Prelude hiding (catch)
--
-+#if !MIN_VERSION_base(4,6,0)
-+import Prelude hiding (catch)
-+#endif
-
- ---------------------------------------------------------------
-
diff --git a/www/hs-activehs/files/patch-activehs.cabal b/www/hs-activehs/files/patch-activehs.cabal
index 0528ec55bb35..68ed888b6f5d 100644
--- a/www/hs-activehs/files/patch-activehs.cabal
+++ b/www/hs-activehs/files/patch-activehs.cabal
@@ -1,6 +1,21 @@
--- ./activehs.cabal.orig 2013-02-12 20:23:46.000000000 +0100
-+++ ./activehs.cabal 2013-03-10 13:53:48.000000000 +0100
-@@ -76,11 +76,12 @@
++++ ./activehs.cabal 2013-05-28 16:18:31.000000000 +0200
+@@ -63,7 +63,7 @@
+ activehs-base >= 0.2 && < 0.4,
+ data-pprint >= 0.2 && < 0.3,
+ base >= 4.0 && < 4.7,
+- QuickCheck >= 2.4 && < 2.6,
++ QuickCheck >= 2.4 && < 2.7,
+ array >= 0.3 && < 0.5,
+ directory >= 1.1 && < 1.3,
+ containers >= 0.4 && < 0.6,
+@@ -71,16 +71,17 @@
+ text >= 0.11 && < 0.12,
+ snap-core >= 0.6 && < 0.10,
+ snap-server >= 0.6 && < 0.10,
+- syb >= 0.2 && < 0.4,
++ syb >= 0.2 && < 0.5,
+ haskell-src-exts >= 1.12 && < 1.14,
bytestring >= 0.9 && < 0.11,
utf8-string >= 0.3 && < 0.4,
xhtml >= 3000.2 && < 3000.3,