aboutsummaryrefslogtreecommitdiff
path: root/converters
diff options
context:
space:
mode:
Diffstat (limited to 'converters')
-rw-r--r--converters/Makefile2
-rw-r--r--converters/hs-aeson-pretty/Makefile18
-rw-r--r--converters/hs-aeson-pretty/distinfo2
-rw-r--r--converters/hs-aeson-pretty/pkg-descr9
-rw-r--r--converters/hs-aeson/Makefile9
-rw-r--r--converters/hs-aeson/distinfo4
-rw-r--r--converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs76
-rw-r--r--converters/hs-aeson/files/patch-aeson.cabal11
-rw-r--r--converters/hs-dataenc/Makefile2
-rw-r--r--converters/hs-dataenc/files/patch-dataenc.cabal11
-rw-r--r--converters/hs-json/Makefile8
-rw-r--r--converters/hs-json/distinfo4
-rw-r--r--converters/hs-sandi/Makefile15
-rw-r--r--converters/hs-sandi/distinfo2
-rw-r--r--converters/hs-sandi/pkg-descr3
15 files changed, 73 insertions, 103 deletions
diff --git a/converters/Makefile b/converters/Makefile
index 6848f2b5ba89..cdb003ecff92 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -31,8 +31,10 @@
SUBDIR += gbase
SUBDIR += gbsdconv
SUBDIR += hs-aeson
+ SUBDIR += hs-aeson-pretty
SUBDIR += hs-dataenc
SUBDIR += hs-json
+ SUBDIR += hs-sandi
SUBDIR += htx
SUBDIR += i18ntools
SUBDIR += ical2html
diff --git a/converters/hs-aeson-pretty/Makefile b/converters/hs-aeson-pretty/Makefile
new file mode 100644
index 000000000000..77e6a9b0141a
--- /dev/null
+++ b/converters/hs-aeson-pretty/Makefile
@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME= aeson-pretty
+PORTVERSION= 0.7.2
+CATEGORIES= converters haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= JSON pretty-printing library and command-line tool
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= aeson>=0.7 attoparsec>=0.10 cmdargs>=0.7 text>=0.11 \
+ unordered-containers>=0.1.3.0 vector>=0.9
+
+EXECUTABLE= aeson-pretty
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/converters/hs-aeson-pretty/distinfo b/converters/hs-aeson-pretty/distinfo
new file mode 100644
index 000000000000..21548d0679b1
--- /dev/null
+++ b/converters/hs-aeson-pretty/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/aeson-pretty-0.7.2.tar.gz) = 6408b8b2bcd12cf591e4b93b4d9f5143449b33a59fbd3653f328e2515040570d
+SIZE (cabal/aeson-pretty-0.7.2.tar.gz) = 4838
diff --git a/converters/hs-aeson-pretty/pkg-descr b/converters/hs-aeson-pretty/pkg-descr
new file mode 100644
index 000000000000..3d1c4c717243
--- /dev/null
+++ b/converters/hs-aeson-pretty/pkg-descr
@@ -0,0 +1,9 @@
+A JSON pretty-printing library compatible with aeson as well as a
+command-line tool to improve readabilty of streams of JSON data. The
+/library/ provides the function "encodePretty". It is a drop-in
+replacement for aeson's "encode" function, producing JSON-ByteStrings
+for human readers. The /command-line tool/ reads JSON from stdin and
+writes prettified JSON to stdout. It also offers a complementary
+"compact"-mode, essentially the opposite of pretty-printing.
+
+WWW: http://github.com/informatikr/aeson-pretty
diff --git a/converters/hs-aeson/Makefile b/converters/hs-aeson/Makefile
index 0f380f700a5b..8cd0e7c8c45c 100644
--- a/converters/hs-aeson/Makefile
+++ b/converters/hs-aeson/Makefile
@@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= aeson
-PORTVERSION= 0.7.0.6
-PORTREVISION= 1
+PORTVERSION= 0.8.0.2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -10,9 +9,9 @@ COMMENT= Fast JSON parsing and encoding
LICENSE= BSD3CLAUSE
-USE_CABAL= attoparsec>=0.10.4.0 dlist>=0.2 hashable>=1.1.2.0 mtl \
- scientific>=0.3.1 syb text>=0.11.1.0 unordered-containers>=0.2.3.0 \
- vector>=0.7.1
+USE_CABAL= attoparsec>=0.11.3.4 dlist>=0.2 hashable>=1.1.2.0 mtl \
+ old-locale scientific>=0.3.1 syb text>=1.1.1.0 \
+ unordered-containers>=0.2.3.0 vector>=0.7.1
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-aeson/distinfo b/converters/hs-aeson/distinfo
index c64246dd65be..5d67e7c53185 100644
--- a/converters/hs-aeson/distinfo
+++ b/converters/hs-aeson/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/aeson-0.7.0.6.tar.gz) = 645531759ba18105cadf024415e1be60353ad704ac686ff5ee67c7f4754d4e6f
-SIZE (cabal/aeson-0.7.0.6.tar.gz) = 141565
+SHA256 (cabal/aeson-0.8.0.2.tar.gz) = 0707588dfb5fdfe787eba5b3d5a9950acb224a8dae9dcdcfc9c974ae2b6788d5
+SIZE (cabal/aeson-0.8.0.2.tar.gz) = 143850
diff --git a/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs b/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs
deleted file mode 100644
index 759362be0d67..000000000000
--- a/converters/hs-aeson/files/patch-Data__Aeson__Parser__Internal.hs
+++ /dev/null
@@ -1,76 +0,0 @@
---- ./Data/Aeson/Parser/Internal.hs.orig 2014-05-16 17:43:52.000000000 +0200
-+++ ./Data/Aeson/Parser/Internal.hs 2014-07-12 19:54:00.000000000 +0200
-@@ -41,25 +41,29 @@
- (Builder, byteString, toLazyByteString, charUtf8, word8)
- #endif
-
--import Control.Applicative ((*>), (<$>), (<*), liftA2, pure)
-+import Control.Applicative ((*>), (<$>), (<*), (<|>), liftA2, pure)
-+import Control.Monad (when, void)
- import Data.Aeson.Types (Result(..), Value(..))
--import Data.Attoparsec.Char8 (Parser, char, endOfInput, scientific,
-- skipSpace, string)
-+import Data.Attoparsec.Char8 (Parser, char, endOfInput, isDigit_w8,
-+ skipSpace, string, decimal, signed)
- import Data.Bits ((.|.), shiftL)
- import Data.ByteString (ByteString)
- import Data.Char (chr)
- import Data.Monoid (mappend, mempty)
-+import Data.Scientific (Scientific)
- import Data.Text (Text)
- import Data.Text.Encoding (decodeUtf8')
- import Data.Vector as Vector (Vector, fromList)
- import Data.Word (Word8)
- import qualified Data.Attoparsec as A
-+import qualified Data.Attoparsec.ByteString as I
- import qualified Data.Attoparsec.Lazy as L
- import qualified Data.Attoparsec.Zepto as Z
- import qualified Data.ByteString as B
- import qualified Data.ByteString.Lazy as L
- import qualified Data.ByteString.Unsafe as B
- import qualified Data.HashMap.Strict as H
-+import qualified Data.Scientific as Sci
-
- #define BACKSLASH 92
- #define CLOSE_CURLY 125
-@@ -356,3 +360,40 @@
- #else
- peekWord8' = maybe (fail "not enough bytes") return =<< A.peekWord8
- #endif
-+
-+scientific :: A.Parser Scientific
-+scientific = scientifically id
-+
-+-- A strict pair
-+data SP = SP !Integer {-# UNPACK #-}!Int
-+
-+{-# INLINE scientifically #-}
-+scientifically :: (Scientific -> a) -> Parser a
-+scientifically h = do
-+ let minus = 45
-+ plus = 43
-+ sign <- peekWord8'
-+ let !positive = sign == plus || sign /= minus
-+ when (sign == plus || sign == minus) $
-+ void $ I.anyWord8
-+
-+ n <- decimal
-+
-+ let f fracDigits = SP (B.foldl' step n fracDigits)
-+ (negate $ B.length fracDigits)
-+ step a w = a * 10 + fromIntegral (w - 48)
-+
-+ dotty <- I.peekWord8
-+ -- '.' -> ascii 46
-+ SP c e <- case dotty of
-+ Just 46 -> I.anyWord8 *> (f <$> I.takeWhile isDigit_w8)
-+ _ -> pure (SP n 0)
-+
-+ let !signedCoeff | positive = c
-+ | otherwise = -c
-+
-+ let littleE = 101
-+ bigE = 69
-+ (I.satisfy (\ex -> ex == littleE || ex == bigE) *>
-+ fmap (h . Sci.scientific signedCoeff . (e +)) (signed decimal)) <|>
-+ return (h $ Sci.scientific signedCoeff e)
diff --git a/converters/hs-aeson/files/patch-aeson.cabal b/converters/hs-aeson/files/patch-aeson.cabal
deleted file mode 100644
index 0d2683706ccb..000000000000
--- a/converters/hs-aeson/files/patch-aeson.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./aeson.cabal.orig 2014-05-16 17:43:52.000000000 +0200
-+++ ./aeson.cabal 2014-07-12 19:15:00.000000000 +0200
-@@ -112,7 +112,7 @@
- Data.Aeson.Types.Generic
-
- build-depends:
-- attoparsec >= 0.11.3.4,
-+ attoparsec >= 0.10.4.0,
- base == 4.*,
- containers,
- deepseq,
diff --git a/converters/hs-dataenc/Makefile b/converters/hs-dataenc/Makefile
index 2befe22b4449..c5129650ef0b 100644
--- a/converters/hs-dataenc/Makefile
+++ b/converters/hs-dataenc/Makefile
@@ -2,7 +2,7 @@
PORTNAME= dataenc
PORTVERSION= 0.14.0.7
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/converters/hs-dataenc/files/patch-dataenc.cabal b/converters/hs-dataenc/files/patch-dataenc.cabal
new file mode 100644
index 000000000000..cc9b9c0d34ab
--- /dev/null
+++ b/converters/hs-dataenc/files/patch-dataenc.cabal
@@ -0,0 +1,11 @@
+--- dataenc.cabal.orig 2014-04-22 18:38:41 UTC
++++ dataenc.cabal
+@@ -21,7 +21,7 @@ flag tests
+
+ library
+ hs-source-dirs: src
+- build-depends: array, base >= 3.0.0 && < 4.8, containers
++ build-depends: array, base >= 3.0.0 && < 4.9, containers
+ exposed-modules:
+ Codec.Binary.Base16
+ Codec.Binary.Base32
diff --git a/converters/hs-json/Makefile b/converters/hs-json/Makefile
index 214f7f3ff3e9..96c8e3493f38 100644
--- a/converters/hs-json/Makefile
+++ b/converters/hs-json/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= json
-PORTVERSION= 0.7
-PORTREVISION= 8
+PORTVERSION= 0.9.1
CATEGORIES= converters haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,10 +10,7 @@ COMMENT= Support for serialising Haskell to and from JSON
LICENSE= BSD3CLAUSE
-USE_CABAL= mtl syb>=0.3.3 text
-
-FLAGS_ENABLE= split-base generic
-FLAGS_DISABLE= parse pretty mapdict
+USE_CABAL= mtl parsec syb>=0.3.3 text
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/converters/hs-json/distinfo b/converters/hs-json/distinfo
index 58b1f3d8a6f7..81625decc0a4 100644
--- a/converters/hs-json/distinfo
+++ b/converters/hs-json/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/json-0.7.tar.gz) = d3654272caa269bc65f6f2af82b583ef05434613fe5272d57053fb3bfada68a3
-SIZE (cabal/json-0.7.tar.gz) = 22411
+SHA256 (cabal/json-0.9.1.tar.gz) = 96b57e4d167e45dc80aeff872a922ae9cdb953a1ded29ebbb51019b68f0085a2
+SIZE (cabal/json-0.9.1.tar.gz) = 22568
diff --git a/converters/hs-sandi/Makefile b/converters/hs-sandi/Makefile
new file mode 100644
index 000000000000..258cf2014640
--- /dev/null
+++ b/converters/hs-sandi/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME= sandi
+PORTVERSION= 0.3.5
+CATEGORIES= converters haskell
+
+MAINTAINER= haskell@FreeBSD.org
+COMMENT= Data encoding library
+
+LICENSE= BSD3CLAUSE
+
+USE_CABAL= conduit exceptions>=0.6
+
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
diff --git a/converters/hs-sandi/distinfo b/converters/hs-sandi/distinfo
new file mode 100644
index 000000000000..a49a5d2b4ed8
--- /dev/null
+++ b/converters/hs-sandi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (cabal/sandi-0.3.5.tar.gz) = 856ed995bad4183a69f65c70a78c4be37cf614c906097ea126bae75ce08daea5
+SIZE (cabal/sandi-0.3.5.tar.gz) = 18700
diff --git a/converters/hs-sandi/pkg-descr b/converters/hs-sandi/pkg-descr
new file mode 100644
index 000000000000..17ff49ea45d6
--- /dev/null
+++ b/converters/hs-sandi/pkg-descr
@@ -0,0 +1,3 @@
+Reasonably fast data encoding library.
+
+WWW: http://hackage.haskell.org/package/sandi
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 15:22:29 +0000