summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
Diffstat (limited to 'math')
-rw-r--r--math/Makefile4
-rw-r--r--math/hs-Agda/Makefile30
-rw-r--r--math/hs-Agda/distinfo4
-rw-r--r--math/hs-Agda/files/patch-Agda.cabal27
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs11
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs24
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs13
-rw-r--r--math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs11
-rw-r--r--math/hs-NumInstances/Makefile4
-rw-r--r--math/hs-categories/Makefile5
-rw-r--r--math/hs-categories/distinfo4
-rw-r--r--math/hs-categories/files/patch-src__Control__Categorical__Functor.hs101
-rw-r--r--math/hs-categories/files/patch-src__Control__Category__Dual.hs61
-rw-r--r--math/hs-comonad-transformers/Makefile17
-rw-r--r--math/hs-comonad-transformers/distinfo2
-rw-r--r--math/hs-comonad-transformers/pkg-descr3
-rw-r--r--math/hs-comonad/Makefile10
-rw-r--r--math/hs-comonad/distinfo4
-rw-r--r--math/hs-comonad/pkg-descr2
-rw-r--r--math/hs-comonads-fd/Makefile17
-rw-r--r--math/hs-comonads-fd/distinfo2
-rw-r--r--math/hs-comonads-fd/pkg-descr3
-rw-r--r--math/hs-contravariant/Makefile9
-rw-r--r--math/hs-contravariant/distinfo4
-rw-r--r--math/hs-contravariant/files/patch-contravariant.cabal12
-rw-r--r--math/hs-contravariant/pkg-descr2
-rw-r--r--math/hs-data-lens-template/Makefile5
-rw-r--r--math/hs-data-lens-template/distinfo4
-rw-r--r--math/hs-data-lens-template/pkg-descr2
-rw-r--r--math/hs-data-lens/Makefile10
-rw-r--r--math/hs-data-lens/distinfo4
-rw-r--r--math/hs-data-lens/pkg-descr2
-rw-r--r--math/hs-distributive/Makefile9
-rw-r--r--math/hs-distributive/distinfo4
-rw-r--r--math/hs-distributive/files/patch-distributive.cabal12
-rw-r--r--math/hs-distributive/pkg-descr2
-rw-r--r--math/hs-erf/Makefile4
-rw-r--r--math/hs-groupoids/Makefile16
-rw-r--r--math/hs-groupoids/distinfo2
-rw-r--r--math/hs-groupoids/pkg-descr3
-rw-r--r--math/hs-ieee754/Makefile4
-rw-r--r--math/hs-math-functions/Makefile9
-rw-r--r--math/hs-math-functions/distinfo4
-rw-r--r--math/hs-mwc-random/Makefile7
-rw-r--r--math/hs-mwc-random/distinfo4
-rw-r--r--math/hs-nats/Makefile9
-rw-r--r--math/hs-nats/distinfo4
-rw-r--r--math/hs-nats/pkg-descr2
-rw-r--r--math/hs-pointed/Makefile12
-rw-r--r--math/hs-pointed/distinfo4
-rw-r--r--math/hs-pointed/pkg-descr2
-rw-r--r--math/hs-probability/Makefile7
-rw-r--r--math/hs-probability/distinfo4
-rw-r--r--math/hs-semigroupoid-extras/Makefile16
-rw-r--r--math/hs-semigroupoid-extras/distinfo2
-rw-r--r--math/hs-semigroupoid-extras/pkg-descr3
-rw-r--r--math/hs-semigroupoids/Makefile11
-rw-r--r--math/hs-semigroupoids/distinfo4
-rw-r--r--math/hs-semigroups/Makefile9
-rw-r--r--math/hs-semigroups/distinfo4
-rw-r--r--math/hs-semigroups/pkg-descr12
-rw-r--r--math/hs-statistics/Makefile10
-rw-r--r--math/hs-statistics/distinfo4
-rw-r--r--math/hs-vector-space/Makefile7
-rw-r--r--math/hs-vector-space/distinfo4
65 files changed, 302 insertions, 321 deletions
diff --git a/math/Makefile b/math/Makefile
index 19e30fc6942b..d7472396b0ea 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -168,21 +168,17 @@
SUBDIR += hs-NumInstances
SUBDIR += hs-categories
SUBDIR += hs-comonad
- SUBDIR += hs-comonad-transformers
- SUBDIR += hs-comonads-fd
SUBDIR += hs-contravariant
SUBDIR += hs-data-lens
SUBDIR += hs-data-lens-template
SUBDIR += hs-distributive
SUBDIR += hs-erf
- SUBDIR += hs-groupoids
SUBDIR += hs-ieee754
SUBDIR += hs-math-functions
SUBDIR += hs-mwc-random
SUBDIR += hs-nats
SUBDIR += hs-pointed
SUBDIR += hs-probability
- SUBDIR += hs-semigroupoid-extras
SUBDIR += hs-semigroupoids
SUBDIR += hs-semigroups
SUBDIR += hs-statistics
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index 9d9fb6e6dd31..9cc19a148685 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -2,38 +2,30 @@
# $FreeBSD$
PORTNAME= Agda
-PORTVERSION= 2.3.2
-PORTREVISION= 6
+PORTVERSION= 2.4.0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Dependently typed functional programming language and proof assistant
-USE_CABAL= geniplate>=0.6.0.3 hashable>=1.1 hashtables \
- haskeline>=0.6.3.2 haskell-src-exts>=1.9.6 mtl \
- QuickCheck>=2.3 parallel syb>=0.1 unordered-containers>=0.2 \
- xhtml zlib>=0.4.0.1
+USE_CABAL= boxes>=0.1.3 data-hash>=0.2.0.0 equivalence>=0.2.4 \
+ geniplate>=0.6.0.3 hashable hashtables>=1.0 \
+ haskell-src-exts>=1.9.6 mtl>=2.1.1 parallel QuickCheck>=2.6 \
+ STMonadTrans>=0.3.2 strict>=0.3.2 text>=0.11 \
+ unordered-containers>=0.2 zlib>=0.4.0.1
USE_ALEX= yes
USE_HAPPY= yes
-USES= iconv
+USES= iconv:translit
EXECUTABLE= agda-mode agda
-INSTALL_PORTDATA= (cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR}; \
- cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR})
+INSTALL_PORTDATA= cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DATADIR}
-OPTIONS_DEFINE= EPIC
+FLAGS_DEFINE= EPIC
EPIC_DESC= Install the Epic compiler
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.options.mk"
-
-.if ${PORT_OPTIONS:MEPIC}
-CONFIGURE_ARGS+= --flags="epic"
-USE_CABAL+= epic>=0.1.13
-.else
-CONFIGURE_ARGS+= --flags="-epic"
-.endif
+EPIC_FLAG_ENABLE= epic
+EPIC_FLAG_CABAL= epic>=0.1.13
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-Agda/distinfo b/math/hs-Agda/distinfo
index 485c853062a9..be99d677aef3 100644
--- a/math/hs-Agda/distinfo
+++ b/math/hs-Agda/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/Agda-2.3.2.tar.gz) = d47a0b2a0806ea5c109b59280211a47b980b47a8f6ac0ab9fca673f3d4c6e0f6
-SIZE (cabal/Agda-2.3.2.tar.gz) = 726462
+SHA256 (cabal/Agda-2.4.0.2.tar.gz) = 0b41cf9f841fd78b60490c66a4f08c9f57316e96ca8f3449dacb52cbf48d848d
+SIZE (cabal/Agda-2.4.0.2.tar.gz) = 910389
diff --git a/math/hs-Agda/files/patch-Agda.cabal b/math/hs-Agda/files/patch-Agda.cabal
index 42b95170d46e..ae803d339dd4 100644
--- a/math/hs-Agda/files/patch-Agda.cabal
+++ b/math/hs-Agda/files/patch-Agda.cabal
@@ -1,20 +1,11 @@
---- ./Agda.cabal.orig 2012-11-12 01:25:25.000000000 +0100
-+++ ./Agda.cabal 2013-05-03 23:08:18.000000000 +0200
-@@ -69,7 +69,7 @@
-
- build-depends: base >= 4.2 && < 4.7,
- mtl >= 2.0 && < 2.2,
-- QuickCheck >= 2.3 && < 2.6,
-+ QuickCheck >= 2.3 && < 2.7,
- haskell-src-exts >= 1.9.6 && < 1.14,
+--- ./Agda.cabal.orig 2014-06-16 12:42:15.000000000 +0200
++++ ./Agda.cabal 2014-07-13 13:20:32.000000000 +0200
+@@ -76,7 +76,7 @@
+ transformers == 0.3.*,
+ -- mtl-2.1 contains a severe bug
+ mtl >= 2.1.1 && < 2.2,
+- QuickCheck >= 2.7.5 && < 2.8,
++ QuickCheck >= 2.6 && < 2.7,
+ haskell-src-exts >= 1.9.6 && < 1.16,
containers >= 0.1 && < 0.6,
unordered-containers == 0.2.*,
-@@ -83,7 +83,7 @@
- haskeline >= 0.6.3.2 && < 0.8,
- xhtml == 3000.2.*,
- hashable >= 1.1.2.3 && < 1.2,
-- hashtables == 1.0.*,
-+ hashtables == 1.1.*,
- geniplate >= 0.6.0.3 && < 0.7,
- parallel < 3.3,
- deepseq == 1.3.*,
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs b/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs
new file mode 100644
index 000000000000..ef4b91782fce
--- /dev/null
+++ b/math/hs-Agda/files/patch-src__full__Agda__Interaction__Highlighting__Precise.hs
@@ -0,0 +1,11 @@
+--- ./src/full/Agda/Interaction/Highlighting/Precise.hs.orig 2014-07-29 19:41:41.000000000 +0100
++++ ./src/full/Agda/Interaction/Highlighting/Precise.hs 2014-08-10 11:30:01.000000000 +0100
+@@ -40,7 +40,7 @@
+ import Data.Monoid
+ import Control.Applicative ((<$>), (<*>))
+ import Control.Monad
+-import Agda.Utils.QuickCheck
++import Agda.Utils.QuickCheck hiding (ranges)
+ import Data.Map (Map)
+ import qualified Data.Map as Map
+ import Data.Typeable (Typeable)
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs
deleted file mode 100644
index 5108666a5839..000000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Abstract__Name.hs
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./src/full/Agda/Syntax/Abstract/Name.hs.orig 2012-11-12 01:25:21.000000000 +0100
-+++ ./src/full/Agda/Syntax/Abstract/Name.hs 2013-02-10 15:14:44.000000000 +0100
-@@ -239,8 +239,8 @@
- show x = show (nameConcrete x) -- ++ "|" ++ show (nameId x)
-
- instance Hashable Name where
-- {-# INLINE hash #-}
-- hash = hash . nameId
-+ {-# INLINE hashWithSalt #-}
-+ hashWithSalt salt = hashWithSalt salt . nameId
-
- instance Show QName where
- show q = concat $ intersperse "." $ map show $ qnameToList q
-@@ -255,8 +255,8 @@
- compare = compare `on` qnameName
-
- instance Hashable QName where
-- {-# INLINE hash #-}
-- hash = hash . qnameName
-+ {-# INLINE hashWithSalt #-}
-+ hashWithSalt salt = hashWithSalt salt . qnameName
-
- instance HasRange Name where
- getRange = getRange . nameConcrete
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs b/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs
deleted file mode 100644
index b071c8448e13..000000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Syntax__Common.hs
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./src/full/Agda/Syntax/Common.hs.orig 2012-11-12 01:25:21.000000000 +0100
-+++ ./src/full/Agda/Syntax/Common.hs 2013-02-10 15:12:42.000000000 +0100
-@@ -272,8 +272,8 @@
- fromEnum (NameId n _) = fromIntegral n
-
- instance Hashable NameId where
-- {-# INLINE hash #-}
-- hash (NameId n m) = hash (n, m)
-+ {-# INLINE hashWithSalt #-}
-+ hashWithSalt salt (NameId n m) = hashWithSalt salt (n, m)
-
- newtype Constr a = Constr a
-
diff --git a/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs b/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs
deleted file mode 100644
index 1d480e01d10b..000000000000
--- a/math/hs-Agda/files/patch-src__full__Agda__Utils__Pointer.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/full/Agda/Utils/Pointer.hs.orig 2012-11-12 01:25:22.000000000 +0100
-+++ ./src/full/Agda/Utils/Pointer.hs 2013-02-10 15:11:53.000000000 +0100
-@@ -71,7 +71,7 @@
- compare = compare `on` ptrTag
-
- instance Hashable (Ptr a) where
-- hash = hash . ptrTag
-+ hashWithSalt salt = hashWithSalt salt . ptrTag
-
- instance NFData (Ptr a) where
-
diff --git a/math/hs-NumInstances/Makefile b/math/hs-NumInstances/Makefile
index 4257749c09f0..e5deec994545 100644
--- a/math/hs-NumInstances/Makefile
+++ b/math/hs-NumInstances/Makefile
@@ -2,13 +2,13 @@
PORTNAME= NumInstances
PORTVERSION= 1.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Instances of numeric classes for functions and tuples
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-categories/Makefile b/math/hs-categories/Makefile
index 4b10ea894434..7bd9260d38d2 100644
--- a/math/hs-categories/Makefile
+++ b/math/hs-categories/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= categories
-PORTVERSION= 1.0.5
-PORTREVISION= 5
+PORTVERSION= 1.0.6
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Categories
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= void>=0.5.4.2
diff --git a/math/hs-categories/distinfo b/math/hs-categories/distinfo
index 5204cd51b157..30e3635a5f4e 100644
--- a/math/hs-categories/distinfo
+++ b/math/hs-categories/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/categories-1.0.5.tar.gz) = 7fce017b35ae7e273250a93070e053396c763995d148c16cdcc0110a16ed739b
-SIZE (cabal/categories-1.0.5.tar.gz) = 8992
+SHA256 (cabal/categories-1.0.6.tar.gz) = 9e159abff9a4e0652a46c4206c94e46ecb7c0fa8822fbea921af480c57cfb544
+SIZE (cabal/categories-1.0.6.tar.gz) = 9061
diff --git a/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs b/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs
new file mode 100644
index 000000000000..5f73258d2345
--- /dev/null
+++ b/math/hs-categories/files/patch-src__Control__Categorical__Functor.hs
@@ -0,0 +1,101 @@
+--- ./src/Control/Categorical/Functor.hs.orig 2013-06-20 22:09:11.000000000 +0200
++++ ./src/Control/Categorical/Functor.hs 2014-07-13 17:57:00.000000000 +0200
+@@ -2,7 +2,7 @@
+ #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
+ {-# LANGUAGE Trustworthy #-}
+ #endif
+-{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts, UndecidableInstances, FlexibleInstances #-}
++{-# LANGUAGE MultiParamTypeClasses, FunctionalDependencies, FlexibleContexts, UndecidableInstances, FlexibleInstances, DeriveDataTypeable #-}
+ -------------------------------------------------------------------------------------------
+ -- |
+ -- Module : Control.Categorical.Functor
+@@ -29,86 +29,12 @@
+ import Control.Category
+ import Prelude hiding (id, (.), Functor(..))
+ import qualified Prelude
+-#ifdef __GLASGOW_HASKELL__
+-import Data.Data (Data(..), mkDataType, DataType, mkConstr, Constr, constrIndex, Fixity(..))
+-#if MIN_VERSION_base(4,4,0)
+-import Data.Typeable (Typeable1(..), TyCon, mkTyCon3, mkTyConApp, gcast1)
+-#else
+-import Data.Typeable (Typeable1(..), TyCon, mkTyCon, mkTyConApp, gcast1)
+-#endif
+-#endif
++import Data.Typeable
+
+ -- TODO Data, Typeable
+-newtype LiftedFunctor f a = LiftedFunctor (f a) deriving (Show, Read)
+-
+-#ifdef __GLASGOW_HASKELL__
+-
+-liftedTyCon :: TyCon
+-#if MIN_VERSION_base(4,4,0)
+-liftedTyCon = mkTyCon3 "categories" "Control.Categorical.Functor" "LiftedFunctor"
+-#else
+-liftedTyCon = mkTyCon "Control.Categorical.Functor.LiftedFunctor"
+-#endif
+-{-# NOINLINE liftedTyCon #-}
+-
+-liftedConstr :: Constr
+-liftedConstr = mkConstr liftedDataType "LiftedFunctor" [] Prefix
+-{-# NOINLINE liftedConstr #-}
+-
+-liftedDataType :: DataType
+-liftedDataType = mkDataType "Control.Categorical.Fucntor.LiftedFunctor" [liftedConstr]
+-{-# NOINLINE liftedDataType #-}
+-
+-instance Typeable1 f => Typeable1 (LiftedFunctor f) where
+- typeOf1 tfa = mkTyConApp liftedTyCon [typeOf1 (undefined `asArgsType` tfa)]
+- where asArgsType :: f a -> t f a -> f a
+- asArgsType = const
+-
+-instance (Typeable1 f, Data (f a), Data a) => Data (LiftedFunctor f a) where
+- gfoldl f z (LiftedFunctor a) = z LiftedFunctor `f` a
+- toConstr _ = liftedConstr
+- gunfold k z c = case constrIndex c of
+- 1 -> k (z LiftedFunctor)
+- _ -> error "gunfold"
+- dataTypeOf _ = liftedDataType
+- dataCast1 f = gcast1 f
+-#endif
+-
+-newtype LoweredFunctor f a = LoweredFunctor (f a) deriving (Show, Read)
+-
+-#ifdef __GLASGOW_HASKELL__
+-
+-loweredTyCon :: TyCon
+-#if MIN_VERSION_base(4,4,0)
+-loweredTyCon = mkTyCon3 "categories" "Control.Categorical.Functor" "LoweredFunctor"
+-#else
+-loweredTyCon = mkTyCon "Control.Categorical.Functor.LoweredFunctor"
+-#endif
+-{-# NOINLINE loweredTyCon #-}
+-
+-loweredConstr :: Constr
+-loweredConstr = mkConstr loweredDataType "LoweredFunctor" [] Prefix
+-{-# NOINLINE loweredConstr #-}
+-
+-loweredDataType :: DataType
+-loweredDataType = mkDataType "Control.Categorical.Fucntor.LoweredFunctor" [loweredConstr]
+-{-# NOINLINE loweredDataType #-}
+-
+-instance Typeable1 f => Typeable1 (LoweredFunctor f) where
+- typeOf1 tfa = mkTyConApp loweredTyCon [typeOf1 (undefined `asArgsType` tfa)]
+- where asArgsType :: f a -> t f a -> f a
+- asArgsType = const
+-
+-instance (Typeable1 f, Data (f a), Data a) => Data (LoweredFunctor f a) where
+- gfoldl f z (LoweredFunctor a) = z LoweredFunctor `f` a
+- toConstr _ = loweredConstr
+- gunfold k z c = case constrIndex c of
+- 1 -> k (z LoweredFunctor)
+- _ -> error "gunfold"
+- dataTypeOf _ = loweredDataType
+- dataCast1 f = gcast1 f
++newtype LiftedFunctor f a = LiftedFunctor (f a) deriving (Show, Read, Typeable)
+
+-#endif
++newtype LoweredFunctor f a = LoweredFunctor (f a) deriving (Show, Read, Typeable)
+
+ class (Category r, Category t) => Functor f r t | f r -> t, f t -> r where
+ fmap :: r a b -> t (f a) (f b)
diff --git a/math/hs-categories/files/patch-src__Control__Category__Dual.hs b/math/hs-categories/files/patch-src__Control__Category__Dual.hs
new file mode 100644
index 000000000000..58f59950b87b
--- /dev/null
+++ b/math/hs-categories/files/patch-src__Control__Category__Dual.hs
@@ -0,0 +1,61 @@
+--- ./src/Control/Category/Dual.hs.orig 2013-06-20 22:09:11.000000000 +0200
++++ ./src/Control/Category/Dual.hs 2014-07-13 17:56:00.000000000 +0200
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TypeOperators, FlexibleContexts #-}
++{-# LANGUAGE TypeOperators, FlexibleContexts, DeriveDataTypeable #-}
+ {-# LANGUAGE CPP #-}
+ #if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ >= 702
+ {-# LANGUAGE Trustworthy #-}
+@@ -24,50 +24,11 @@
+
+ import Prelude (undefined,const,error)
+ import Control.Category
+-
+-#ifdef __GLASGOW_HASKELL__
+-import Data.Data (Data(..), mkDataType, DataType, mkConstr, Constr, constrIndex, Fixity(..))
+-#if MIN_VERSION_base(4,4,0)
+-import Data.Typeable (Typeable2(..), TyCon, mkTyCon3, mkTyConApp, gcast1)
+-#else
+-import Data.Typeable (Typeable2(..), TyCon, mkTyCon, mkTyConApp, gcast1)
+-#endif
+-#endif
++import Data.Typeable
+
+ data Dual k a b = Dual { runDual :: k b a }
++ deriving Typeable
+
+ instance Category k => Category (Dual k) where
+ id = Dual id
+ Dual f . Dual g = Dual (g . f)
+-
+-#ifdef __GLASGOW_HASKELL__
+-instance Typeable2 k => Typeable2 (Dual k) where
+- typeOf2 tfab = mkTyConApp dataTyCon [typeOf2 (undefined `asDualArgsType` tfab)]
+- where asDualArgsType :: f b a -> t f a b -> f b a
+- asDualArgsType = const
+-
+-dataTyCon :: TyCon
+-#if MIN_VERSION_base(4,4,0)
+-dataTyCon = mkTyCon3 "categories" "Control.Category.Dual" "Dual"
+-#else
+-dataTyCon = mkTyCon "Control.Category.Dual.Dual"
+-#endif
+-{-# NOINLINE dataTyCon #-}
+-
+-dualConstr :: Constr
+-dualConstr = mkConstr dataDataType "Dual" [] Prefix
+-{-# NOINLINE dualConstr #-}
+-
+-dataDataType :: DataType
+-dataDataType = mkDataType "Control.Category.Dual.Dual" [dualConstr]
+-{-# NOINLINE dataDataType #-}
+-
+-instance (Typeable2 k, Data a, Data b, Data (k b a)) => Data (Dual k a b) where
+- gfoldl f z (Dual a) = z Dual `f` a
+- toConstr _ = dualConstr
+- gunfold k z c = case constrIndex c of
+- 1 -> k (z Dual)
+- _ -> error "gunfold"
+- dataTypeOf _ = dataDataType
+- dataCast1 f = gcast1 f
+-#endif
diff --git a/math/hs-comonad-transformers/Makefile b/math/hs-comonad-transformers/Makefile
deleted file mode 100644
index 540c4cad7efe..000000000000
--- a/math/hs-comonad-transformers/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= comonad-transformers
-PORTVERSION= 3.0.2
-PORTREVISION= 4
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Comonad transformers
-
-LICENSE= BSD
-
-USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 distributive>=0.2.2 \
- semigroupoids>=3.0 semigroups>=0.8.3.1 transformers>=0.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-comonad-transformers/distinfo b/math/hs-comonad-transformers/distinfo
deleted file mode 100644
index 4b70cdbaefc2..000000000000
--- a/math/hs-comonad-transformers/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/comonad-transformers-3.0.2.tar.gz) = 2d9d31329b02e005b32fa85608cc026e464e22aa8dd44e15217700772e8620a4
-SIZE (cabal/comonad-transformers-3.0.2.tar.gz) = 8381
diff --git a/math/hs-comonad-transformers/pkg-descr b/math/hs-comonad-transformers/pkg-descr
deleted file mode 100644
index d2ac6c6de823..000000000000
--- a/math/hs-comonad-transformers/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Comonad transformers.
-
-WWW: http://github.com/ekmett/comonad-transformers/
diff --git a/math/hs-comonad/Makefile b/math/hs-comonad/Makefile
index 508cca5fe5dc..e31e61b7b99c 100644
--- a/math/hs-comonad/Makefile
+++ b/math/hs-comonad/Makefile
@@ -1,16 +1,16 @@
# $FreeBSD$
PORTNAME= comonad
-PORTVERSION= 3.0.2
-PORTREVISION= 5
+PORTVERSION= 4.2.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 compatible comonads
+COMMENT= Comonads
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= semigroups>=0.8.3 transformers>=0.2
+USE_CABAL= contravariant>=0.2.0.1 distributive>=0.2.2 semigroups>=0.8.3.1 \
+ tagged>=0.1 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-comonad/distinfo b/math/hs-comonad/distinfo
index 2a8f812b7bf8..f93c8be2c7e3 100644
--- a/math/hs-comonad/distinfo
+++ b/math/hs-comonad/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/comonad-3.0.2.tar.gz) = 5e3999df99acb4a956b6593718a0aa099c5386fc7f88915c963517d6998bde67
-SIZE (cabal/comonad-3.0.2.tar.gz) = 7660
+SHA256 (cabal/comonad-4.2.2.tar.gz) = 4822281f025267480e03da26f9dcfeebffeb85e759861596b44d731981674e08
+SIZE (cabal/comonad-4.2.2.tar.gz) = 15726
diff --git a/math/hs-comonad/pkg-descr b/math/hs-comonad/pkg-descr
index dbfe091539f6..a00dc05b21e1 100644
--- a/math/hs-comonad/pkg-descr
+++ b/math/hs-comonad/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 compatible comonads.
+Comonads.
WWW: http://github.com/ekmett/comonad/
diff --git a/math/hs-comonads-fd/Makefile b/math/hs-comonads-fd/Makefile
deleted file mode 100644
index 0ff058d79cb8..000000000000
--- a/math/hs-comonads-fd/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= comonads-fd
-PORTVERSION= 3.0.1
-PORTREVISION= 6
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Comonad transformers using functional dependencies
-
-LICENSE= BSD
-
-USE_CABAL= comonad>=3.0 comonad-transformers>=3.0 mtl>=2.0 \
- semigroups>=0.8.3.1 transformers>=0.2
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-comonads-fd/distinfo b/math/hs-comonads-fd/distinfo
deleted file mode 100644
index 87725c14fc40..000000000000
--- a/math/hs-comonads-fd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/comonads-fd-3.0.1.tar.gz) = deb75179224f69d6987f5c7d4186b151afa2125d35243088fa0b8c000fd7e92a
-SIZE (cabal/comonads-fd-3.0.1.tar.gz) = 3494
diff --git a/math/hs-comonads-fd/pkg-descr b/math/hs-comonads-fd/pkg-descr
deleted file mode 100644
index 2854ac4d1d2d..000000000000
--- a/math/hs-comonads-fd/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Comonad transformers using functional dependencies.
-
-WWW: http://github.com/ekmett/comonads-fd/
diff --git a/math/hs-contravariant/Makefile b/math/hs-contravariant/Makefile
index 52c5209bb3a3..316a789090a1 100644
--- a/math/hs-contravariant/Makefile
+++ b/math/hs-contravariant/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= contravariant
-PORTVERSION= 0.4
-PORTREVISION= 5
+PORTVERSION= 1.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 contravariant functors
+COMMENT= Contravariant functors
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= tagged>=0.4.4 transformers>=0.3
+USE_CABAL= semigroups>=0.15.2 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-contravariant/distinfo b/math/hs-contravariant/distinfo
index 16145605d7e0..689f10098b9f 100644
--- a/math/hs-contravariant/distinfo
+++ b/math/hs-contravariant/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/contravariant-0.4.tar.gz) = 8361967a6ee1a3fe113a57242507f56364d8c3daf558370633db74b613a31adb
-SIZE (cabal/contravariant-0.4.tar.gz) = 3277
+SHA256 (cabal/contravariant-1.1.tar.gz) = 10da1f37d9342b61d5b75bc95f6caa873ab266ff1f8b8ca59d4f2297e8335848
+SIZE (cabal/contravariant-1.1.tar.gz) = 4845
diff --git a/math/hs-contravariant/files/patch-contravariant.cabal b/math/hs-contravariant/files/patch-contravariant.cabal
deleted file mode 100644
index 8dccf0102fe3..000000000000
--- a/math/hs-contravariant/files/patch-contravariant.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./contravariant.cabal.orig 2013-02-05 23:24:34.000000000 +0100
-+++ ./contravariant.cabal 2013-02-10 10:56:13.000000000 +0100
-@@ -25,8 +25,7 @@
- build-depends:
- base < 5,
- tagged >= 0.4.4 && < 1,
-- transformers >= 0.2 && < 0.4,
-- transformers-compat >= 0.1 && < 1
-+ transformers >= 0.3 && < 0.4
- exposed-modules:
- Data.Functor.Contravariant
- Data.Functor.Contravariant.Compose
diff --git a/math/hs-contravariant/pkg-descr b/math/hs-contravariant/pkg-descr
index 1bf600d0adf2..f4c854e6238c 100644
--- a/math/hs-contravariant/pkg-descr
+++ b/math/hs-contravariant/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 contravariant functors.
+Contravariant functors.
WWW: http://github.com/ekmett/contravariant/
diff --git a/math/hs-data-lens-template/Makefile b/math/hs-data-lens-template/Makefile
index fa4cf8bd1e39..b356be59f555 100644
--- a/math/hs-data-lens-template/Makefile
+++ b/math/hs-data-lens-template/Makefile
@@ -1,14 +1,13 @@
# $FreeBSD$
PORTNAME= data-lens-template
-PORTVERSION= 2.1.7
-PORTREVISION= 7
+PORTVERSION= 2.1.8
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utilities for Data.Lens
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= data-lens>=2.0
diff --git a/math/hs-data-lens-template/distinfo b/math/hs-data-lens-template/distinfo
index 3338afcfd07e..421fae8bbe02 100644
--- a/math/hs-data-lens-template/distinfo
+++ b/math/hs-data-lens-template/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-template-2.1.7.tar.gz) = 897046267245481834d4aa972de77af9c09fd4b861c9ddb609806bfacadc1d81
-SIZE (cabal/data-lens-template-2.1.7.tar.gz) = 3332
+SHA256 (cabal/data-lens-template-2.1.8.tar.gz) = 18281e49e5e7e8540e956f14d643834931a0d39acfe1450e061fa536ec2f1d71
+SIZE (cabal/data-lens-template-2.1.8.tar.gz) = 3405
diff --git a/math/hs-data-lens-template/pkg-descr b/math/hs-data-lens-template/pkg-descr
index b65b50f489cc..9b04025aed3a 100644
--- a/math/hs-data-lens-template/pkg-descr
+++ b/math/hs-data-lens-template/pkg-descr
@@ -1,3 +1,3 @@
Automatically derive Lenses for your data type for use with Data.Lens.
-WWW: http://github.com/ekmett/data-lens-template/
+WWW: http://github.com/roconnor/data-lens-template/
diff --git a/math/hs-data-lens/Makefile b/math/hs-data-lens/Makefile
index 003cf6a6f691..af26754fc25a 100644
--- a/math/hs-data-lens/Makefile
+++ b/math/hs-data-lens/Makefile
@@ -1,17 +1,15 @@
# $FreeBSD$
PORTNAME= data-lens
-PORTVERSION= 2.10.2
-PORTREVISION= 7
+PORTVERSION= 2.10.5
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 lenses
+COMMENT= Used to be Haskell 98 Lenses
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=1.1.1.3 comonad-transformers>=2.0 \
- semigroupoids>=1.2.4 transformers>=0.2.0
+USE_CABAL= comonad>=4.0 semigroupoids>=4.0
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-data-lens/distinfo b/math/hs-data-lens/distinfo
index 1899c71726cb..656f99f0b0a9 100644
--- a/math/hs-data-lens/distinfo
+++ b/math/hs-data-lens/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/data-lens-2.10.2.tar.gz) = 6591e2f4712d262c49eea32788699eec6cab929c074496504b0057980ba464d7
-SIZE (cabal/data-lens-2.10.2.tar.gz) = 6012
+SHA256 (cabal/data-lens-2.10.5.tar.gz) = 20456098f36cfb436cd84dcdd98a58160cc25ce6d202d00e9a3002073a27ca86
+SIZE (cabal/data-lens-2.10.5.tar.gz) = 6063
diff --git a/math/hs-data-lens/pkg-descr b/math/hs-data-lens/pkg-descr
index fea8146d8fec..1429af39cd05 100644
--- a/math/hs-data-lens/pkg-descr
+++ b/math/hs-data-lens/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 lenses.
+Used to be Haskell 98 Lenses.
WWW: http://github.com/roconnor/data-lens/
diff --git a/math/hs-distributive/Makefile b/math/hs-distributive/Makefile
index f4a6e8f1ada4..d2347a8d686a 100644
--- a/math/hs-distributive/Makefile
+++ b/math/hs-distributive/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= distributive
-PORTVERSION= 0.3.1
-PORTREVISION= 5
+PORTVERSION= 0.4.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 distributive functors -- Dual to Traversable
+COMMENT= Distributive functors -- Dual to Traversable
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= transformers>=0.3
+USE_CABAL= tagged>=0.7 transformers-compat>=0.3
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-distributive/distinfo b/math/hs-distributive/distinfo
index 3cbeeb3c357e..78fbbd2194ba 100644
--- a/math/hs-distributive/distinfo
+++ b/math/hs-distributive/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/distributive-0.3.1.tar.gz) = 6c49c36c7c098b3640ff03c3379d766ef23c9914053d671e584ba7df03e6c37d
-SIZE (cabal/distributive-0.3.1.tar.gz) = 5900
+SHA256 (cabal/distributive-0.4.4.tar.gz) = 82d1f53495fe9c25e4e974825666b4a6232af7452784e145cc04aeb365b25468
+SIZE (cabal/distributive-0.4.4.tar.gz) = 6686
diff --git a/math/hs-distributive/files/patch-distributive.cabal b/math/hs-distributive/files/patch-distributive.cabal
deleted file mode 100644
index 6e956aa320cb..000000000000
--- a/math/hs-distributive/files/patch-distributive.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./distributive.cabal.orig 2013-01-06 18:34:35.000000000 +0100
-+++ ./distributive.cabal 2013-01-14 20:36:11.000000000 +0100
-@@ -33,8 +33,7 @@
- library
- build-depends:
- base >= 4 && < 5,
-- transformers >= 0.2 && < 0.4,
-- transformers-compat >= 0.1 && < 0.2
-+ transformers >= 0.3 && < 0.4
-
- hs-source-dirs: src
- exposed-modules: Data.Distributive
diff --git a/math/hs-distributive/pkg-descr b/math/hs-distributive/pkg-descr
index af14ab605ad6..1d5151f6f3f1 100644
--- a/math/hs-distributive/pkg-descr
+++ b/math/hs-distributive/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 distributive functors -- dual to Traversable.
+Distributive functors -- Dual to Traversable.
WWW: http://github.com/ekmett/distributive/
diff --git a/math/hs-erf/Makefile b/math/hs-erf/Makefile
index 9f4a8c4d2590..627d6b3532a7 100644
--- a/math/hs-erf/Makefile
+++ b/math/hs-erf/Makefile
@@ -3,13 +3,13 @@
PORTNAME= erf
PORTVERSION= 2.0.0.0
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= The error function, erf, and friends for Haskell
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-groupoids/Makefile b/math/hs-groupoids/Makefile
deleted file mode 100644
index 4e9f39a51a8e..000000000000
--- a/math/hs-groupoids/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= groupoids
-PORTVERSION= 3.0.1.1
-PORTREVISION= 6
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 Groupoids
-
-LICENSE= BSD
-
-USE_CABAL= semigroupoids>=3
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-groupoids/distinfo b/math/hs-groupoids/distinfo
deleted file mode 100644
index 6ed86ea9df96..000000000000
--- a/math/hs-groupoids/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/groupoids-3.0.1.1.tar.gz) = c35c27bdee4f43f86e649356a41635911e8c66c9701da19515a5b178b0979d64
-SIZE (cabal/groupoids-3.0.1.1.tar.gz) = 2935
diff --git a/math/hs-groupoids/pkg-descr b/math/hs-groupoids/pkg-descr
deleted file mode 100644
index 20697c4e0785..000000000000
--- a/math/hs-groupoids/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Haskell 98 Groupoids.
-
-WWW: http://github.com/ekmett/groupoids/
diff --git a/math/hs-ieee754/Makefile b/math/hs-ieee754/Makefile
index c2b553ff12fb..46a759a87a30 100644
--- a/math/hs-ieee754/Makefile
+++ b/math/hs-ieee754/Makefile
@@ -2,13 +2,13 @@
PORTNAME= ieee754
PORTVERSION= 0.7.3
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Utilities for dealing with IEEE floating point numbers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-math-functions/Makefile b/math/hs-math-functions/Makefile
index b3753d4e6671..3028d6754cd1 100644
--- a/math/hs-math-functions/Makefile
+++ b/math/hs-math-functions/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= math-functions
-PORTVERSION= 0.1.3.0
-PORTREVISION= 5
+PORTVERSION= 0.1.5.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Special mathematical functions and Chebyshev polynomials
+COMMENT= Special functions and Chebyshev polynomials
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= erf>=2 vector>=0.7
+USE_CABAL= erf>=2 vector>=0.7 vector-th-unbox
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-math-functions/distinfo b/math/hs-math-functions/distinfo
index 32964fffb4d6..53429c2bf281 100644
--- a/math/hs-math-functions/distinfo
+++ b/math/hs-math-functions/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/math-functions-0.1.3.0.tar.gz) = c5abf1f44ef52c30e5dab9675e8fb8605e6568ea356ed1fd9d4f57b81cca9d1b
-SIZE (cabal/math-functions-0.1.3.0.tar.gz) = 23729
+SHA256 (cabal/math-functions-0.1.5.2.tar.gz) = 9ec9b809d33c3b4deebc07d8e776cb3f81866e99906ed84f9c4145fe8eb39f89
+SIZE (cabal/math-functions-0.1.5.2.tar.gz) = 28490
diff --git a/math/hs-mwc-random/Makefile b/math/hs-mwc-random/Makefile
index e4963a3b14c1..aab0d227b488 100644
--- a/math/hs-mwc-random/Makefile
+++ b/math/hs-mwc-random/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= mwc-random
-PORTVERSION= 0.12.0.1
-PORTREVISION= 6
+PORTVERSION= 0.13.1.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Fast, high quality pseudo random number generation
+COMMENT= Fast, high-quality pseudo random number generation
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= primitive vector>=0.7
diff --git a/math/hs-mwc-random/distinfo b/math/hs-mwc-random/distinfo
index 3cbf5a63cc03..fab61f5eec30 100644
--- a/math/hs-mwc-random/distinfo
+++ b/math/hs-mwc-random/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/mwc-random-0.12.0.1.tar.gz) = ec78bdcdf87ed4ea390a20337f04dd551dbd62fc1846cd7f466a862162f704eb
-SIZE (cabal/mwc-random-0.12.0.1.tar.gz) = 19471
+SHA256 (cabal/mwc-random-0.13.1.2.tar.gz) = 113f1ff03412e49f1f87815c99c007f063d5aef3be3039de57a09c6dd3ad0a2c
+SIZE (cabal/mwc-random-0.13.1.2.tar.gz) = 20831
diff --git a/math/hs-nats/Makefile b/math/hs-nats/Makefile
index 4d20beb31206..3b62446d0455 100644
--- a/math/hs-nats/Makefile
+++ b/math/hs-nats/Makefile
@@ -1,14 +1,15 @@
# $FreeBSD$
PORTNAME= nats
-PORTVERSION= 0.1
-PORTREVISION= 5
+PORTVERSION= 0.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 natural numbers
+COMMENT= Natural numbers
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= hashable>=1.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-nats/distinfo b/math/hs-nats/distinfo
index 858b141455d4..2b3a2fa2cb15 100644
--- a/math/hs-nats/distinfo
+++ b/math/hs-nats/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/nats-0.1.tar.gz) = 7e87fa4ac81bc35a3f1dafca011c19b95f869ddd15e30a5348e0685ea53cf021
-SIZE (cabal/nats-0.1.tar.gz) = 3734
+SHA256 (cabal/nats-0.2.tar.gz) = e364218c0cad3602b14d3bc3866b9a8958c075dd1346d935e5362fa88ac65317
+SIZE (cabal/nats-0.2.tar.gz) = 4740
diff --git a/math/hs-nats/pkg-descr b/math/hs-nats/pkg-descr
index 0fb820219cf3..ae9b740b07ea 100644
--- a/math/hs-nats/pkg-descr
+++ b/math/hs-nats/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 natural numbers.
+Natural numbers.
WWW: http://github.com/ekmett/nats/
diff --git a/math/hs-pointed/Makefile b/math/hs-pointed/Makefile
index 14bd5b91873a..c7bc75c95173 100644
--- a/math/hs-pointed/Makefile
+++ b/math/hs-pointed/Makefile
@@ -1,18 +1,16 @@
# $FreeBSD$
PORTNAME= pointed
-PORTVERSION= 3.0.2
-PORTREVISION= 6
+PORTVERSION= 4.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 pointed and copointed data
+COMMENT= Pointed and copointed data
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=3 comonad-transformers>=3 data-default>=0.4 \
- semigroupoids>=3.0 semigroups>=0.8.3.1 stm>=2.1.2.1 \
- transformers>=0.2
+USE_CABAL= comonad>=4 data-default-class>=0.0.1 semigroupoids>=4 \
+ semigroups>=0.8.3.1 stm>=2.1.2.1 tagged>=0.5
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-pointed/distinfo b/math/hs-pointed/distinfo
index 25262b978d4b..8ca86b115641 100644
--- a/math/hs-pointed/distinfo
+++ b/math/hs-pointed/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/pointed-3.0.2.tar.gz) = 10c6aae5d0d18ae10c7901a07b6dc53eb340eaa84eca2265f04aea3a4a27e8d8
-SIZE (cabal/pointed-3.0.2.tar.gz) = 3084
+SHA256 (cabal/pointed-4.1.tar.gz) = cf4cb662ea5d3ebdcc42ab953b92dcfb4571a579e0ec193e5ed084ae03b580d0
+SIZE (cabal/pointed-4.1.tar.gz) = 3232
diff --git a/math/hs-pointed/pkg-descr b/math/hs-pointed/pkg-descr
index 1a41b00150b8..3b3775c01d1f 100644
--- a/math/hs-pointed/pkg-descr
+++ b/math/hs-pointed/pkg-descr
@@ -1,3 +1,3 @@
-Haskell 98 pointed and copointed data.
+Pointed and copointed data.
WWW: http://github.com/ekmett/pointed/
diff --git a/math/hs-probability/Makefile b/math/hs-probability/Makefile
index 59b6fd984f5b..658af5df94c3 100644
--- a/math/hs-probability/Makefile
+++ b/math/hs-probability/Makefile
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= probability
-PORTVERSION= 0.2.4
-PORTREVISION= 8
+PORTVERSION= 0.2.4.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Probabilistic Functional Programming
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= random>=1.0 transformers>=0.0.1 utility-ht>=0.0.6
+USE_CABAL= random>=1.0 utility-ht>=0.0.6
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-probability/distinfo b/math/hs-probability/distinfo
index 7eca7d23ec36..7f8ddae0d826 100644
--- a/math/hs-probability/distinfo
+++ b/math/hs-probability/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/probability-0.2.4.tar.gz) = eaf8f2b9c673d15f5a492d56b6895b04c490cee2d240a300046d12cc6a13cce1
-SIZE (cabal/probability-0.2.4.tar.gz) = 27208
+SHA256 (cabal/probability-0.2.4.1.tar.gz) = 6c4bcb7343d1fda94fb1799e3e1d8dc45c5a018ac40b38d4f8d19e36001d075a
+SIZE (cabal/probability-0.2.4.1.tar.gz) = 27023
diff --git a/math/hs-semigroupoid-extras/Makefile b/math/hs-semigroupoid-extras/Makefile
deleted file mode 100644
index 5b82e3285f12..000000000000
--- a/math/hs-semigroupoid-extras/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= semigroupoid-extras
-PORTVERSION= 3.0.1
-PORTREVISION= 6
-CATEGORIES= math haskell
-
-MAINTAINER= haskell@FreeBSD.org
-COMMENT= Semigroupoids requiring Haskell extensions
-
-LICENSE= BSD
-
-USE_CABAL= comonad>=3 distributive>=0.2.2 groupoids>=3 semigroupoids>=3
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>
diff --git a/math/hs-semigroupoid-extras/distinfo b/math/hs-semigroupoid-extras/distinfo
deleted file mode 100644
index f98545574921..000000000000
--- a/math/hs-semigroupoid-extras/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (cabal/semigroupoid-extras-3.0.1.tar.gz) = ed762d6c59ca75abc6fe0a7ed0119757588daca25d0ebc1681612be96bead1ac
-SIZE (cabal/semigroupoid-extras-3.0.1.tar.gz) = 5284
diff --git a/math/hs-semigroupoid-extras/pkg-descr b/math/hs-semigroupoid-extras/pkg-descr
deleted file mode 100644
index 87c1c79973b3..000000000000
--- a/math/hs-semigroupoid-extras/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Semigroupoids and semigroupoid operations requiring Haskell extensions.
-
-WWW: http://github.com/ekmett/semigroupoid-extras
diff --git a/math/hs-semigroupoids/Makefile b/math/hs-semigroupoids/Makefile
index bfa9a133cd0f..03a85438a8dd 100644
--- a/math/hs-semigroupoids/Makefile
+++ b/math/hs-semigroupoids/Makefile
@@ -1,17 +1,16 @@
# $FreeBSD$
PORTNAME= semigroupoids
-PORTVERSION= 3.0.2
-PORTREVISION= 6
+PORTVERSION= 4.0.4
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 semigroupoids: Category sans id
+COMMENT= Semigroupoids: Category sans id
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= comonad>=3.0 contravariant>=0.2.0.1 semigroups>=0.8.3.1 \
- transformers>=0.2
+USE_CABAL= comonad>=4 contravariant>=0.2.0.1 distributive>=0.2.2 \
+ semigroups>=0.8.3.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroupoids/distinfo b/math/hs-semigroupoids/distinfo
index 40be9cf6c415..b649ac80e225 100644
--- a/math/hs-semigroupoids/distinfo
+++ b/math/hs-semigroupoids/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroupoids-3.0.2.tar.gz) = 95bb528ddbf75fd357fbbada902060291400fa62a3734c7c7d5903ee543c234c
-SIZE (cabal/semigroupoids-3.0.2.tar.gz) = 12007
+SHA256 (cabal/semigroupoids-4.0.4.tar.gz) = 198dec1ba80a37c00691f9c1f10f076beb7e2f4de3501be565962eb9ae19657a
+SIZE (cabal/semigroupoids-4.0.4.tar.gz) = 16194
diff --git a/math/hs-semigroups/Makefile b/math/hs-semigroups/Makefile
index 8e8cc8cb68e0..1dccdc6b5b4d 100644
--- a/math/hs-semigroups/Makefile
+++ b/math/hs-semigroups/Makefile
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= semigroups
-PORTVERSION= 0.9.1
-PORTREVISION= 4
+PORTVERSION= 0.15.2
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Haskell 98 semigroups
+COMMENT= Anything that associates
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= nats>=0.1
+USE_CABAL= hashable>=1.1 nats>=0.1 text>=0.10 unordered-containers>=0.2
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/math/hs-semigroups/distinfo b/math/hs-semigroups/distinfo
index f79856f2898a..dd868cade6d4 100644
--- a/math/hs-semigroups/distinfo
+++ b/math/hs-semigroups/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/semigroups-0.9.1.tar.gz) = b8fbf8c6279dea64a0e332f82b845213ca790ea2b2305cbfb67d25ee000a89c4
-SIZE (cabal/semigroups-0.9.1.tar.gz) = 9556
+SHA256 (cabal/semigroups-0.15.2.tar.gz) = 7716062afb636193fed5f544cbed96fe329c461db90cf3a45b7f475e413300d2
+SIZE (cabal/semigroups-0.15.2.tar.gz) = 11723
diff --git a/math/hs-semigroups/pkg-descr b/math/hs-semigroups/pkg-descr
index 9d25811291c6..ab2cb213a4a9 100644
--- a/math/hs-semigroups/pkg-descr
+++ b/math/hs-semigroups/pkg-descr
@@ -1,8 +1,8 @@
-Haskell 98 semigroups. In mathematics, a semigroup is an algebraic structure
-consisting of a set together with an associative binary operation. A
-semigroup generalizes a monoid in that there might not exist an identity
-element. It also (originally) generalized a group (a monoid with all
-inverses) to a type where every element did not have to have an inverse,
-thus the name semigroup.
+In mathematics, a semigroup is an algebraic structure consisting of a
+set together with an associative binary operation. A semigroup
+generalizes a monoid in that there might not exist an identity element.
+It also (originally) generalized a group (a monoid with all inverses) to
+a type where every element did not have to have an inverse, thus the
+name semigroup.
WWW: http://github.com/ekmett/semigroups/
diff --git a/math/hs-statistics/Makefile b/math/hs-statistics/Makefile
index a0346366246d..4527962f4656 100644
--- a/math/hs-statistics/Makefile
+++ b/math/hs-statistics/Makefile
@@ -2,17 +2,17 @@
# $FreeBSD$
PORTNAME= statistics
-PORTVERSION= 0.10.3.1
-PORTREVISION= 4
+PORTVERSION= 0.13.2.1
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
COMMENT= Library of statistical types, data, and functions
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
-USE_CABAL= erf math-functions>=0.1.2 monad-par>=0.3.4 mwc-random>=0.11.0.0 \
- primitive>=0.3 vector>=0.7.1 vector-algorithms>=0.4
+USE_CABAL= aeson>=0.6.0.0 erf math-functions>=0.1.5.2 monad-par>=0.3.4 \
+ mwc-random>=0.13.0.0 primitive>=0.3 vector>=0.10 \
+ vector-algorithms>=0.4 vector-binary-instances>=0.2.1
INSTALL_PORTDATA= ${INSTALL_DATA} ${WRKSRC}/README.markdown ${STAGEDIR}${DATADIR}
diff --git a/math/hs-statistics/distinfo b/math/hs-statistics/distinfo
index 25c293f98ad0..3c77fbaf4ec1 100644
--- a/math/hs-statistics/distinfo
+++ b/math/hs-statistics/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/statistics-0.10.3.1.tar.gz) = 1a98a923c37850b16d85e1a6bb0dc315068241d58c736032b314c7ac3b764b89
-SIZE (cabal/statistics-0.10.3.1.tar.gz) = 63082
+SHA256 (cabal/statistics-0.13.2.1.tar.gz) = 6aef1be73b9f3b2df0f4938d5981e6e343d73b9b11658dfb86b659692f5e313e
+SIZE (cabal/statistics-0.13.2.1.tar.gz) = 79625
diff --git a/math/hs-vector-space/Makefile b/math/hs-vector-space/Makefile
index 7ad97e2deb9c..45af75d6f90b 100644
--- a/math/hs-vector-space/Makefile
+++ b/math/hs-vector-space/Makefile
@@ -2,14 +2,13 @@
# $FreeBSD$
PORTNAME= vector-space
-PORTVERSION= 0.8.6
-PORTREVISION= 7
+PORTVERSION= 0.8.7
CATEGORIES= math haskell
MAINTAINER= haskell@FreeBSD.org
-COMMENT= Vector & affine spaces, linear maps, and derivatives
+COMMENT= Vector and affine spaces, linear maps, and derivatives
-LICENSE= BSD
+LICENSE= BSD3CLAUSE
USE_CABAL= Boolean>=0.1.0 MemoTrie>=0.5 NumInstances>=1.0
diff --git a/math/hs-vector-space/distinfo b/math/hs-vector-space/distinfo
index 5177144420d0..ad975ed5c39c 100644
--- a/math/hs-vector-space/distinfo
+++ b/math/hs-vector-space/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/vector-space-0.8.6.tar.gz) = 94b0e355e82cc8af180554ab05fbe6ff4f35a7fc888c3337d16f596f21167f0e
-SIZE (cabal/vector-space-0.8.6.tar.gz) = 13630
+SHA256 (cabal/vector-space-0.8.7.tar.gz) = 75076924a56c58cd44ca1e07286a6b32f0e8d0558d42ba08af7a3e3b16196cc4
+SIZE (cabal/vector-space-0.8.7.tar.gz) = 13882