diff options
author | Gabor Pali <pgj@FreeBSD.org> | 2012-02-13 05:05:11 +0000 |
---|---|---|
committer | Gabor Pali <pgj@FreeBSD.org> | 2012-02-13 05:05:11 +0000 |
commit | e16a7f5d330c36d91a2d5e491debcd1093d01f88 (patch) | |
tree | 072a1867082bffc202f60bffcae8d167d1b783ff /math | |
parent | - Update to 0.3.3 (diff) |
- Update to 2.3.0
Obtained from: FreeBSD Haskell
Notes
Notes:
svn path=/head/; revision=291205
Diffstat (limited to 'math')
-rw-r--r-- | math/hs-Agda-executable/Makefile | 5 | ||||
-rw-r--r-- | math/hs-Agda-executable/distinfo | 4 | ||||
-rw-r--r-- | math/hs-Agda/Makefile | 29 | ||||
-rw-r--r-- | math/hs-Agda/distinfo | 4 | ||||
-rw-r--r-- | math/hs-Agda/files/patch-Agda.cabal | 40 | ||||
-rw-r--r-- | math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Generate.hs | 11 | ||||
-rw-r--r-- | math/hs-Agda/files/patch-src__full__Agda__Utils__Generics.hs | 11 | ||||
-rw-r--r-- | math/hs-Agda/pkg-descr | 2 |
8 files changed, 50 insertions, 56 deletions
diff --git a/math/hs-Agda-executable/Makefile b/math/hs-Agda-executable/Makefile index df1de6db8a66..00b4d90d41e7 100644 --- a/math/hs-Agda-executable/Makefile +++ b/math/hs-Agda-executable/Makefile @@ -6,15 +6,14 @@ # PORTNAME= Agda-executable -PORTVERSION= 2.2.10 -PORTREVISION= 1 +PORTVERSION= 2.3.0 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Command-line program for type-checking and compiling Agda programs CABAL_SETUP= Setup.hs -USE_CABAL= Agda>=2.2.10 Agda<2.2.11 +USE_CABAL= Agda>=2.3.0 Agda<2.3.1 USE_ICONV= yes diff --git a/math/hs-Agda-executable/distinfo b/math/hs-Agda-executable/distinfo index 40c939b6e575..de1da2624e63 100644 --- a/math/hs-Agda-executable/distinfo +++ b/math/hs-Agda-executable/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/Agda-executable-2.2.10.tar.gz) = c65fda739b23d1c996918e8adaf5d8bf7d4a37479e05cd9d56377cb5cb5f544a -SIZE (cabal/Agda-executable-2.2.10.tar.gz) = 1788 +SHA256 (cabal/Agda-executable-2.3.0.tar.gz) = b75ce406ac9343dbc10a221f7552df2d5ddccc8ef38359d33465c02dbe992ad8 +SIZE (cabal/Agda-executable-2.3.0.tar.gz) = 1764 diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile index 0a87c79bd6e4..1d7ee3e08f04 100644 --- a/math/hs-Agda/Makefile +++ b/math/hs-Agda/Makefile @@ -6,17 +6,16 @@ # PORTNAME= Agda -PORTVERSION= 2.2.10 -PORTREVISION= 2 +PORTVERSION= 2.3.0 CATEGORIES= math haskell MAINTAINER= haskell@FreeBSD.org COMMENT= A functional programming language and proof assistant CABAL_SETUP= Setup.hs -USE_CABAL= binary>=0.4.4 haskeline>=0.6.3.2 haskell-src-exts>=1.9.6 \ - mtl>=2 QuickCheck>=2.3 syb utf8-string>=0.3 xhtml>=3000.2 \ - zlib>=0.4.0.1 +USE_CABAL= binary>=0.4.4 hashable>=1.1 hashtables>=1.0 haskeline>=0.6.3.2 \ + haskell-src-exts>=1.9.6 mtl>=2 QuickCheck>=2.3 syb \ + utf8-string>=0.3 xhtml>=3000.2 zlib>=0.4.0.1 USE_ALEX= yes USE_HAPPY= yes @@ -24,11 +23,29 @@ USE_ICONV= yes EXECUTABLE= agda-mode -PORTDATA= * INSTALL_PORTDATA= (cd ${WRKSRC} && ${INSTALL_DATA} README ${DATADIR}; \ cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${DATADIR}) SHOW_PKGMSG= yes +OPTIONS= USE_LOCALE "Use encoding specified by the locale" off \ + EPIC "Install the Epic compiler" off + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk" +.include <bsd.port.options.mk> + +.if defined(WITH_USE_LOCALE) +CONFIGURE_ARGS+= --flags="use-locale" +.else +CONFIGURE_ARGS+= --flags="-use-locale" +.endif + +.if defined(WITH_EPIC) +CONFIGURE_ARGS+= --flags="epic" +USE_CABAL+= epic>=0.1.13 +.else +CONFIGURE_ARGS+= --flags="-epic" +.endif + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo index 9dd99ea833b4..f847c1b64b49 100644 --- a/math/hs-Agda/distinfo +++ b/math/hs-Agda/distinfo @@ -1,2 +1,2 @@ -SHA256 (cabal/Agda-2.2.10.tar.gz) = 5cd3b69a744b86b74344b790350d8a6f2b62f206f5a53a9cfad22cc3ca3309ae -SIZE (cabal/Agda-2.2.10.tar.gz) = 517723 +SHA256 (cabal/Agda-2.3.0.tar.gz) = 608e130bd33a1c14ea544b46bfb55c0c8e31ab43952572df38df90d086e30cdc +SIZE (cabal/Agda-2.3.0.tar.gz) = 608029 diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal index 0978224feb14..172bb274914e 100644 --- a/math/hs-Agda/files/patch-Agda.cabal +++ b/math/hs-Agda/files/patch-Agda.cabal @@ -1,20 +1,20 @@ ---- ./Agda.cabal.orig 2011-02-20 16:43:52.000000000 +0100 -+++ ./Agda.cabal 2011-03-13 15:30:44.772094824 +0100 -@@ -77,7 +77,7 @@ - build-depends: epic >= 0.1.7 && < 0.2 - build-depends: mtl == 2.0.*, - QuickCheck >= 2.3 && < 2.5, -- haskell-src-exts >= 1.9.6 && < 1.10, -+ haskell-src-exts >= 1.9.6, - containers >= 0.1.0 && < 1, - pretty >= 1 && < 2, - directory >= 1.0 && < 1.2, -@@ -90,7 +90,7 @@ - process >= 1.0.1.0 && < 2, - haskeline >= 0.6.3.2 && < 0.7, - xhtml == 3000.2.*, -- syb >= 0.1 && < 0.3 -+ syb >= 0.1 - build-tools: happy >= 1.15 && < 2, - alex >= 2.0.1 && < 3 - extensions: CPP +--- ./Agda.cabal.orig 2011-11-23 09:12:57.000000000 +0100 ++++ ./Agda.cabal 2011-12-03 04:20:35.000000000 +0100 +@@ -71,7 +71,7 @@ + if flag(use-locale) + build-depends: base >= 4.2 && < 4.5 + else +- build-depends: base == 4.1.*, ++ build-depends: base >= 4.1, + utf8-string == 0.3.* + if flag(epic) + build-depends: epic >= 0.1.13 && < 0.2 +@@ -334,7 +334,7 @@ + if flag(use-locale) + build-depends: base >= 4.2 && < 4.5 + else +- build-depends: base == 4.1.*, ++ build-depends: base >= 4.1, + utf8-string == 0.3.* + build-depends: filepath >= 1.1 && < 1.3, + process >= 1.0.1.0 && < 1.2, diff --git a/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Generate.hs b/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Generate.hs deleted file mode 100644 index fa10c8edfa4a..000000000000 --- a/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Generate.hs +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/full/Agda/Interaction/Highlighting/Generate.hs.orig 2011-02-20 16:43:52.000000000 +0100 -+++ ./src/full/Agda/Interaction/Highlighting/Generate.hs 2011-03-13 15:37:48.951336040 +0100 -@@ -37,7 +37,7 @@ - import Control.Monad.State - import Control.Applicative - import Data.Monoid --import Data.Generics -+import Data.Generics hiding (everythingBut) - import Data.Function - import Agda.Utils.Generics - import Agda.Utils.FileName diff --git a/math/hs-Agda/files/patch-src__full__Agda__Utils__Generics.hs b/math/hs-Agda/files/patch-src__full__Agda__Utils__Generics.hs deleted file mode 100644 index b9b45b9ace71..000000000000 --- a/math/hs-Agda/files/patch-src__full__Agda__Utils__Generics.hs +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/full/Agda/Utils/Generics.hs.orig 2011-02-20 16:43:52.000000000 +0100 -+++ ./src/full/Agda/Utils/Generics.hs 2011-03-13 15:32:35.151924104 +0100 -@@ -3,7 +3,7 @@ - -} - module Agda.Utils.Generics where - --import Data.Generics -+import Data.Generics hiding (everythingBut) - - isString :: GenericQ Bool - isString = mkQ False (const True :: String -> Bool) diff --git a/math/hs-Agda/pkg-descr b/math/hs-Agda/pkg-descr index 5c70fb2cc8f0..eff01c4dd9ac 100644 --- a/math/hs-Agda/pkg-descr +++ b/math/hs-Agda/pkg-descr @@ -10,4 +10,4 @@ system for constructive mathematics developed by the Swedish logician Per Martin-Lof. It has many similarities with other proof assistants based on dependent types, such as Coq, Epigram and NuPRL. -WWW: http://wiki.portal.chalmers.se/agda/ +WWW: http://wiki.portal.chalmers.se/agda/ |