diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-05-25 21:44:12 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2018-05-25 21:44:12 +0000 |
| commit | fff1aa535b4a18a05d872de7c9afb3dbf9f6013b (patch) | |
| tree | 86e71c0056b8414191c8b421101694a177fec03e /textproc | |
| parent | b782168218ce43588149523e6d12003aa68ad324 (diff) | |
| download | ports-fff1aa535b4a18a05d872de7c9afb3dbf9f6013b.tar.gz ports-fff1aa535b4a18a05d872de7c9afb3dbf9f6013b.zip | |
Notes
Diffstat (limited to 'textproc')
122 files changed, 383 insertions, 560 deletions
diff --git a/textproc/Makefile b/textproc/Makefile index a47159d333e2..b3b720b6c89b 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -261,6 +261,7 @@ SUBDIR += hs-case-insensitive SUBDIR += hs-cassava SUBDIR += hs-cmark + SUBDIR += hs-cmark-gfm SUBDIR += hs-csv SUBDIR += hs-doctemplates SUBDIR += hs-double-conversion @@ -281,7 +282,6 @@ SUBDIR += hs-pandoc SUBDIR += hs-pandoc-citeproc SUBDIR += hs-pandoc-types - SUBDIR += hs-parsec SUBDIR += hs-polyparse SUBDIR += hs-pretty-show SUBDIR += hs-regex-applicative @@ -295,6 +295,7 @@ SUBDIR += hs-rfc5051 SUBDIR += hs-scanner SUBDIR += hs-skylighting + SUBDIR += hs-skylighting-core SUBDIR += hs-stringsearch SUBDIR += hs-tagsoup SUBDIR += hs-tagstream-conduit @@ -302,6 +303,7 @@ SUBDIR += hs-uri SUBDIR += hs-uri-bytestring SUBDIR += hs-uri-bytestring-aeson + SUBDIR += hs-uri-encode SUBDIR += hs-xml SUBDIR += hs-xml-conduit SUBDIR += hs-xml-hamlet diff --git a/textproc/cgrep/Makefile b/textproc/cgrep/Makefile index 98f8b8cfc791..5d9f63b5cbdf 100644 --- a/textproc/cgrep/Makefile +++ b/textproc/cgrep/Makefile @@ -2,9 +2,7 @@ # $FreeBSD$ PORTNAME= cgrep -PORTVERSION= 6.4.3 -PORTREVISION= 1 -DISTVERSIONPREFIX= v +PORTVERSION= 6.6.25 CATEGORIES= textproc MAINTAINER= lwhsu@FreeBSD.org @@ -12,29 +10,12 @@ COMMENT= Context-aware grep for source codes LICENSE= GPLv2 -BUILD_DEPENDS= ghc:lang/ghc \ - hs-ansi-terminal>=0.5:devel/hs-ansi-terminal \ - hs-cmdargs>=0.10:devel/hs-cmdargs \ - hs-dlist>=0.3:devel/hs-dlist \ - hs-regex-posix>=0.90:textproc/hs-regex-posix \ - hs-safe>=0.3:devel/hs-safe \ - hs-split>=0.2:devel/hs-split \ - hs-stm>=2.1:devel/hs-stm \ - hs-stringsearch>=0.3:textproc/hs-stringsearch \ - hs-unordered-containers>=0.1:devel/hs-unordered-containers +USE_CABAL= aeson ansi-terminal async cmdargs either exceptions regex-pcre \ + regex-posix safe split stringsearch unicode-show unix-compat \ + utf8-string yaml -USE_GITHUB= yes -GH_ACCOUNT= awgn - -USES= gmake - -do-build: - cd ${WRKSRC}/src && ${GMAKE} cgrep - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/cgrep ${STAGEDIR}${PREFIX}/bin/ - - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/cgreprc ${STAGEDIR}${DATADIR} +EXECUTABLE= cgrep +STANDALONE= yes +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/cgrep/distinfo b/textproc/cgrep/distinfo index 5d4d9aa6de6c..e43fba0c142f 100644 --- a/textproc/cgrep/distinfo +++ b/textproc/cgrep/distinfo @@ -1,2 +1,3 @@ -SHA256 (awgn-cgrep-v6.4.3_GH0.tar.gz) = 65cd59f50de4e1865cd39d198da21beb76ba898d859d07718e6605f7ff33ae78 -SIZE (awgn-cgrep-v6.4.3_GH0.tar.gz) = 33419 +TIMESTAMP = 1525721128 +SHA256 (cabal/cgrep-6.6.25.tar.gz) = 9c5ef414859b13b207e1b0867428ce159927868c9b28446c28013d5996f05931 +SIZE (cabal/cgrep-6.6.25.tar.gz) = 34671 diff --git a/textproc/cgrep/files/patch-src_Main.hs b/textproc/cgrep/files/patch-src_Main.hs deleted file mode 100644 index 08eb8a0f3289..000000000000 --- a/textproc/cgrep/files/patch-src_Main.hs +++ /dev/null @@ -1,32 +0,0 @@ -Backport of: -From 2f787c5c1ba42ccee2f1ced759b3a4570afa9b28 Mon Sep 17 00:00:00 2001 -From: ilovezfs <ilovezfs@icloud.com> -Date: Mon, 23 May 2016 03:53:52 -0700 -Subject: [PATCH] cgrep: fix isSymbolicLink collision - -System.Directory.isSymbolicLink collides with -System.PosixCompat.Files.isSymbolicLink (and with -System.Posix.Files.isSymbolicLink) - -This applies the solution proposed here: -https://github.com/haskell/directory/issues/52#issuecomment-220879392 ---- src/Main.hs.orig 2014-06-21 09:27:05 UTC -+++ src/Main.hs -@@ -37,7 +37,7 @@ import System.Console.CmdArgs - import System.Directory - import System.FilePath ((</>), takeFileName) - import System.Environment --import System.Posix.Files -+import System.Posix.Files as PosixFiles - import System.IO - import System.Exit - -@@ -67,7 +67,7 @@ putRecursiveContents opts inchan topdir langs prunedir - status <- getFileStatus path - lstatus <- getSymbolicLinkStatus path - unless (cpath `Set.member` visited) $ -- if isDirectory status && (not (isSymbolicLink lstatus) || deference_recursive opts) -+ if isDirectory status && (not (PosixFiles.isSymbolicLink lstatus) || deference_recursive opts) - then unless (filename `elem` prunedir) $ - putRecursiveContents opts inchan path langs prunedir (Set.insert cpath visited) - else case getLang opts filename >>= (\f -> f `elemIndex` langs <|> toMaybe 0 (null langs) ) of diff --git a/textproc/cgrep/pkg-plist b/textproc/cgrep/pkg-plist deleted file mode 100644 index 0f919920f368..000000000000 --- a/textproc/cgrep/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -bin/cgrep -%%DATADIR%%/cgreprc diff --git a/textproc/hs-Diff/Makefile b/textproc/hs-Diff/Makefile index 8c790c23be34..8cf0212a1cac 100644 --- a/textproc/hs-Diff/Makefile +++ b/textproc/hs-Diff/Makefile @@ -3,7 +3,7 @@ PORTNAME= Diff PORTVERSION= 0.3.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-HStringTemplate/Makefile b/textproc/hs-HStringTemplate/Makefile index f75c25a4d742..328975c204fa 100644 --- a/textproc/hs-HStringTemplate/Makefile +++ b/textproc/hs-HStringTemplate/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= HStringTemplate -PORTVERSION= 0.8.6 -PORTREVISION= 1 +PORTVERSION= 0.8.7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= StringTemplate implementation in Haskell LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder mtl old-locale parsec syb text void +USE_CABAL= blaze-builder mtl old-locale syb void .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-HStringTemplate/distinfo b/textproc/hs-HStringTemplate/distinfo index a37a85f96014..1dc0b6694000 100644 --- a/textproc/hs-HStringTemplate/distinfo +++ b/textproc/hs-HStringTemplate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538746 -SHA256 (cabal/HStringTemplate-0.8.6.tar.gz) = 7022cb9c1e1c223cfb8adf5ca6994b9f4709399ae197cb7541247c0b5d0255cd -SIZE (cabal/HStringTemplate-0.8.6.tar.gz) = 16034 +TIMESTAMP = 1523960618 +SHA256 (cabal/HStringTemplate-0.8.7.tar.gz) = 4f4ea4aa2e45e7c45821b87b0105c201fbadebc2f2d00c211e728403a0af6b0e +SIZE (cabal/HStringTemplate-0.8.7.tar.gz) = 15903 diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile index 2022a6e00e27..8643f3e628f7 100644 --- a/textproc/hs-HaXml/Makefile +++ b/textproc/hs-HaXml/Makefile @@ -16,5 +16,7 @@ USE_CABAL= polyparse>=1.10 random EXECUTABLE= Canonicalise CanonicaliseLazy DtdToHaskell FpMLToHaskell \ MkOneOf Validate XsdToHaskell Xtract +IGNORE= Doesn't build with recent GHC version + .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-appar/Makefile b/textproc/hs-appar/Makefile index ed360a8ae609..a9c28abe7b20 100644 --- a/textproc/hs-appar/Makefile +++ b/textproc/hs-appar/Makefile @@ -2,7 +2,7 @@ PORTNAME= appar PORTVERSION= 0.1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-attoparsec-enumerator/Makefile b/textproc/hs-attoparsec-enumerator/Makefile index 0ea6713134fa..f2881b760c91 100644 --- a/textproc/hs-attoparsec-enumerator/Makefile +++ b/textproc/hs-attoparsec-enumerator/Makefile @@ -2,7 +2,7 @@ PORTNAME= attoparsec-enumerator PORTVERSION= 0.3.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Pass input from an enumerator to an Attoparsec parser LICENSE= MIT -USE_CABAL= attoparsec>=0.10 enumerator>=0.4 text +USE_CABAL= attoparsec>=0.10 enumerator>=0.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-attoparsec-iso8601/Makefile b/textproc/hs-attoparsec-iso8601/Makefile index 6f286942baab..5c0afebf8464 100644 --- a/textproc/hs-attoparsec-iso8601/Makefile +++ b/textproc/hs-attoparsec-iso8601/Makefile @@ -2,7 +2,7 @@ PORTNAME= attoparsec-iso8601 PORTVERSION= 1.0.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Parsing of ISO 8601 dates LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec base-compat text +USE_CABAL= attoparsec base-compat .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal b/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal new file mode 100644 index 000000000000..a8a48a468b50 --- /dev/null +++ b/textproc/hs-attoparsec-iso8601/files/patch-attoparsec-iso8601.cabal @@ -0,0 +1,10 @@ +--- attoparsec-iso8601.cabal.orig 2018-04-29 20:25:05 UTC ++++ attoparsec-iso8601.cabal +@@ -37,7 +37,7 @@ library + build-depends: + attoparsec >= 0.13.0.1, + base >= 4.5 && < 5, +- base-compat >= 0.9.1 && < 0.10, ++ base-compat >= 0.9.1 && < 0.11, + text >= 1.1.1.0, + time >= 1.1.1.4 diff --git a/textproc/hs-attoparsec/Makefile b/textproc/hs-attoparsec/Makefile index b8d2fcad5c52..204e0611b191 100644 --- a/textproc/hs-attoparsec/Makefile +++ b/textproc/hs-attoparsec/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= attoparsec -PORTVERSION= 0.13.1.0 -PORTREVISION= 1 +PORTVERSION= 0.13.2.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Fast combinator parsing for bytestrings and text LICENSE= BSD3CLAUSE -USE_CABAL= scientific text +USE_CABAL= scientific .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-attoparsec/distinfo b/textproc/hs-attoparsec/distinfo index d3dbac0e2561..6228a54fcd84 100644 --- a/textproc/hs-attoparsec/distinfo +++ b/textproc/hs-attoparsec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499537691 -SHA256 (cabal/attoparsec-0.13.1.0.tar.gz) = 52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64 -SIZE (cabal/attoparsec-0.13.1.0.tar.gz) = 159512 +TIMESTAMP = 1523636401 +SHA256 (cabal/attoparsec-0.13.2.2.tar.gz) = dd93471eb969172cc4408222a3842d867adda3dd7fb39ad8a4df1b121a67d848 +SIZE (cabal/attoparsec-0.13.2.2.tar.gz) = 159729 diff --git a/textproc/hs-bencode/Makefile b/textproc/hs-bencode/Makefile index 579b1c5cee86..c57b915c428d 100644 --- a/textproc/hs-bencode/Makefile +++ b/textproc/hs-bencode/Makefile @@ -2,7 +2,7 @@ PORTNAME= bencode PORTVERSION= 0.6.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Parser and printer for bencoded data LICENSE= BSD3CLAUSE -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-blaze-html/Makefile b/textproc/hs-blaze-html/Makefile index 3608446850d2..cf9623e9d394 100644 --- a/textproc/hs-blaze-html/Makefile +++ b/textproc/hs-blaze-html/Makefile @@ -2,7 +2,7 @@ PORTNAME= blaze-html PORTVERSION= 0.9.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Blazingly fast HTML combinator library for Haskell LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 text>=0.10 +USE_CABAL= blaze-builder>=0.3 blaze-markup>=0.7 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-blaze-markup/Makefile b/textproc/hs-blaze-markup/Makefile index 9731ed79fbe9..4be6ab040009 100644 --- a/textproc/hs-blaze-markup/Makefile +++ b/textproc/hs-blaze-markup/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= blaze-markup -PORTVERSION= 0.8.0.0 -PORTREVISION= 1 +PORTVERSION= 0.8.2.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Blazingly fast markup combinator library for Haskell LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder>=0.2 text>=0.10 +USE_CABAL= blaze-builder>=0.2 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-blaze-markup/distinfo b/textproc/hs-blaze-markup/distinfo index 916db7997dbb..c4ac9329c379 100644 --- a/textproc/hs-blaze-markup/distinfo +++ b/textproc/hs-blaze-markup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624825 -SHA256 (cabal/blaze-markup-0.8.0.0.tar.gz) = 19e1cbb9303803273ed7f9fcf3b8b6938578afbed2bfafe5ea9fcc6d743f540f -SIZE (cabal/blaze-markup-0.8.0.0.tar.gz) = 14054 +TIMESTAMP = 1523696236 +SHA256 (cabal/blaze-markup-0.8.2.1.tar.gz) = 90ab7cbc29df9fbe24e208ade58ca9828e3074f1163618f1faaf4da8f0600146 +SIZE (cabal/blaze-markup-0.8.2.1.tar.gz) = 14320 diff --git a/textproc/hs-bytestring-csv/Makefile b/textproc/hs-bytestring-csv/Makefile index 8a693213ce59..a22dcb9f2659 100644 --- a/textproc/hs-bytestring-csv/Makefile +++ b/textproc/hs-bytestring-csv/Makefile @@ -3,7 +3,7 @@ PORTNAME= bytestring-csv PORTVERSION= 0.1.2 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-case-insensitive/Makefile b/textproc/hs-case-insensitive/Makefile index 8cdbdb9784ef..ef4392928060 100644 --- a/textproc/hs-case-insensitive/Makefile +++ b/textproc/hs-case-insensitive/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= case-insensitive -PORTVERSION= 1.2.0.10 -PORTREVISION= 1 +PORTVERSION= 1.2.0.11 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Case-insensitive string comparison LICENSE= BSD3CLAUSE -USE_CABAL= hashable>=1.0 text>=0.3 +USE_CABAL= hashable>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-case-insensitive/distinfo b/textproc/hs-case-insensitive/distinfo index 98fbd8a51042..008d7b75f2e5 100644 --- a/textproc/hs-case-insensitive/distinfo +++ b/textproc/hs-case-insensitive/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499445486 -SHA256 (cabal/case-insensitive-1.2.0.10.tar.gz) = 66321c40fffb35f3a3188ba508753b74aada53fb51c822a9752614b03765306c -SIZE (cabal/case-insensitive-1.2.0.10.tar.gz) = 53630 +TIMESTAMP = 1523428332 +SHA256 (cabal/case-insensitive-1.2.0.11.tar.gz) = a7ce6d17e50caaa0f19ad8e67361499022860554c521b1e57993759da3eb37e3 +SIZE (cabal/case-insensitive-1.2.0.11.tar.gz) = 53581 diff --git a/textproc/hs-cassava/Makefile b/textproc/hs-cassava/Makefile index 0de035ad56fa..2655670f293c 100644 --- a/textproc/hs-cassava/Makefile +++ b/textproc/hs-cassava/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cassava -PORTVERSION= 0.5.0.0 -PORTREVISION= 1 +PORTVERSION= 0.5.1.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= CSV parsing and encoding library LICENSE= BSD3CLAUSE -USE_CABAL= attoparsec blaze-builder hashable Only text text-short \ +USE_CABAL= attoparsec blaze-builder hashable Only text-short \ unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/textproc/hs-cassava/distinfo b/textproc/hs-cassava/distinfo index 52788632d2dc..ed05e311c6c7 100644 --- a/textproc/hs-cassava/distinfo +++ b/textproc/hs-cassava/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538420 -SHA256 (cabal/cassava-0.5.0.0.tar.gz) = 847e4b09860e9721c1436ae48a9db89fff119c7b43c696997c18592ca86fbeb9 -SIZE (cabal/cassava-0.5.0.0.tar.gz) = 33476 +TIMESTAMP = 1524429884 +SHA256 (cabal/cassava-0.5.1.0.tar.gz) = 762c8aaea2cdad61f52bad1b9f1f3b32764b4b6da03371aba6e5017f69614277 +SIZE (cabal/cassava-0.5.1.0.tar.gz) = 37603 diff --git a/textproc/hs-cmark-gfm/Makefile b/textproc/hs-cmark-gfm/Makefile new file mode 100644 index 000000000000..13b6c63d3095 --- /dev/null +++ b/textproc/hs-cmark-gfm/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= cmark-gfm +PORTVERSION= 0.1.3 +CATEGORIES= textproc haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Fast, accurate GitHub Flavored Markdown parser and renderer + +LICENSE= BSD3CLAUSE + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include <bsd.port.mk> diff --git a/textproc/hs-cmark-gfm/distinfo b/textproc/hs-cmark-gfm/distinfo new file mode 100644 index 000000000000..6990da174bc6 --- /dev/null +++ b/textproc/hs-cmark-gfm/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524942342 +SHA256 (cabal/cmark-gfm-0.1.3.tar.gz) = 731cb392e4edfd18d0dae709904791610588e6770934e5112cbdd5e6f3d271ba +SIZE (cabal/cmark-gfm-0.1.3.tar.gz) = 198348 diff --git a/textproc/hs-cmark-gfm/pkg-descr b/textproc/hs-cmark-gfm/pkg-descr new file mode 100644 index 000000000000..f97d0a0a426e --- /dev/null +++ b/textproc/hs-cmark-gfm/pkg-descr @@ -0,0 +1,6 @@ +This package provides Haskell bindings for libcmark-gfm, the reference parser +for GitHub Flavored Markdown, a fully specified variant of Markdown. It +includes sources for libcmark-gfm (0.28.0) and does not require prior +installation of the C library. + +WWW: https://github.com/kivikakk/cmark-gfm-hs diff --git a/textproc/hs-cmark/Makefile b/textproc/hs-cmark/Makefile index 05a3857ef691..1f1e39068edf 100644 --- a/textproc/hs-cmark/Makefile +++ b/textproc/hs-cmark/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= cmark -PORTVERSION= 0.5.5.1 -PORTREVISION= 1 +PORTVERSION= 0.5.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,5 @@ COMMENT= Fast, accurate CommonMark (Markdown) parser and renderer LICENSE= BSD3CLAUSE -USE_CABAL= text>=1.0 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-cmark/distinfo b/textproc/hs-cmark/distinfo index 0315db4a3824..8f26ebf8bb96 100644 --- a/textproc/hs-cmark/distinfo +++ b/textproc/hs-cmark/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499448212 -SHA256 (cabal/cmark-0.5.5.1.tar.gz) = 62b461f2ab0a611f0a88325c98f11c053a356d94e877b5efed564abb4f5b5a0d -SIZE (cabal/cmark-0.5.5.1.tar.gz) = 169811 +TIMESTAMP = 1523465640 +SHA256 (cabal/cmark-0.5.6.tar.gz) = 855c4b7aca6d4e9eb076beb6cc6f74e7578fae7aa3625fd3fca5e3b4901a32b0 +SIZE (cabal/cmark-0.5.6.tar.gz) = 170850 diff --git a/textproc/hs-csv/Makefile b/textproc/hs-csv/Makefile index f3ef566e265f..866171f80703 100644 --- a/textproc/hs-csv/Makefile +++ b/textproc/hs-csv/Makefile @@ -3,7 +3,7 @@ PORTNAME= csv PORTVERSION= 0.1.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ COMMENT= CSV library for Haskell LICENSE= MIT -USE_CABAL= parsec - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-doctemplates/Makefile b/textproc/hs-doctemplates/Makefile index d7a40137abb1..9f2764e8d329 100644 --- a/textproc/hs-doctemplates/Makefile +++ b/textproc/hs-doctemplates/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= doctemplates -PORTVERSION= 0.1.0.2 -PORTREVISION= 1 +PORTVERSION= 0.2.2.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,8 @@ COMMENT= The doctemplates package LICENSE= BSD3CLAUSE -USE_CABAL= aeson blaze-html blaze-markup parsec scientific text \ - unordered-containers vector +USE_CABAL= aeson blaze-html blaze-markup scientific unordered-containers \ + vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-doctemplates/distinfo b/textproc/hs-doctemplates/distinfo index 887a63e2ac97..203b2710ffb8 100644 --- a/textproc/hs-doctemplates/distinfo +++ b/textproc/hs-doctemplates/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720884 -SHA256 (cabal/doctemplates-0.1.0.2.tar.gz) = b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b -SIZE (cabal/doctemplates-0.1.0.2.tar.gz) = 5924 +TIMESTAMP = 1524418494 +SHA256 (cabal/doctemplates-0.2.2.1.tar.gz) = 6b0cfb565fc7fa90d71ac56b83aedecf670678e6f1441278877fbf399e9bccbf +SIZE (cabal/doctemplates-0.2.2.1.tar.gz) = 6139 diff --git a/textproc/hs-double-conversion/Makefile b/textproc/hs-double-conversion/Makefile index 37088bf84848..dcb4c21bdcb6 100644 --- a/textproc/hs-double-conversion/Makefile +++ b/textproc/hs-double-conversion/Makefile @@ -2,7 +2,7 @@ PORTNAME= double-conversion PORTVERSION= 2.0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,12 +10,5 @@ COMMENT= Fast conversion between double-precision floating-point and text LICENSE= BSD3CLAUSE -USE_CABAL= text>=0.11.0.8 - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" - -.if ${PORT_OPTIONS:MPCLANG} || ${PORT_OPTIONS:MBCLANG} -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-double-conversion.cabal -.endif - .include <bsd.port.mk> diff --git a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal b/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal deleted file mode 100644 index f194f16d456b..000000000000 --- a/textproc/hs-double-conversion/files/extra-patch-double-conversion.cabal +++ /dev/null @@ -1,12 +0,0 @@ ---- double-conversion.cabal.orig 2014-08-13 18:38:48 UTC -+++ double-conversion.cabal -@@ -71,7 +71,8 @@ library - double-conversion/src/fixed-dtoa.cc - double-conversion/src/strtod.cc - -- extra-libraries: stdc++ -+ cc-options: -std=c++11 -stdlib=libc++ -+ extra-libraries: cxxrt gcc_s - - include-dirs: - double-conversion/src diff --git a/textproc/hs-feed/Makefile b/textproc/hs-feed/Makefile index a342f5c25ecf..68dedb8f8576 100644 --- a/textproc/hs-feed/Makefile +++ b/textproc/hs-feed/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= feed -PORTVERSION= 0.3.12.0 -PORTREVISION= 1 +PORTVERSION= 1.0.0.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,9 @@ COMMENT= Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds LICENSE= BSD3CLAUSE -USE_CABAL= old-locale>=1.0 old-time>=1 time-locale-compat>=0.1 \ - utf8-string xml>=1.2.6 +USE_CABAL= base-compat old-locale>=1.0 old-time>=1 safe \ + time-locale-compat>=0.1 utf8-string xml>=1.2.6 xml-conduit \ + xml-types .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-feed/distinfo b/textproc/hs-feed/distinfo index 2925abf966f1..c1b4874b42f4 100644 --- a/textproc/hs-feed/distinfo +++ b/textproc/hs-feed/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499538656 -SHA256 (cabal/feed-0.3.12.0.tar.gz) = cc2d6a3b91027d75b91a0a4c0f83f2df68bee3ce0d7338ea5ae0bcab6dd47942 -SIZE (cabal/feed-0.3.12.0.tar.gz) = 102415 +TIMESTAMP = 1523695585 +SHA256 (cabal/feed-1.0.0.0.tar.gz) = 9359a12d3da138ba50fecfc31eed7f92438a6417e9fc3aa17b95a014fa792f17 +SIZE (cabal/feed-1.0.0.0.tar.gz) = 102936 diff --git a/textproc/hs-feed/files/patch-feed.cabal b/textproc/hs-feed/files/patch-feed.cabal new file mode 100644 index 000000000000..981e7de9fb21 --- /dev/null +++ b/textproc/hs-feed/files/patch-feed.cabal @@ -0,0 +1,31 @@ +--- feed.cabal.orig 2017-08-26 23:55:46 UTC ++++ feed.cabal +@@ -71,8 +71,8 @@ library + Data.Text.Util + Data.XML.Compat + build-depends: +- base >= 4 && < 4.11 +- , base-compat == 0.9.* ++ base >= 4 && < 4.12 ++ , base-compat == 0.10.* + , bytestring >= 0.9 && < 0.11 + , old-locale == 1.0.* + , old-time >= 1 && < 1.2 +@@ -82,7 +82,7 @@ library + , time-locale-compat == 0.1.* + , utf8-string < 1.1 + , xml-types >= 0.3.6 && < 0.4 +- , xml-conduit >= 1.3 && < 1.6 ++ , xml-conduit >= 1.3 && < 1.9 + + test-suite tests + ghc-options: -Wall +@@ -104,7 +104,7 @@ test-suite tests + build-depends: + base >= 4 && < 4.11 + , HUnit >= 1.2 && < 1.7 +- , base-compat == 0.9.* ++ , base-compat == 0.10.* + , feed + , old-locale == 1.0.* + , old-time >= 1 && < 1.2 diff --git a/textproc/hs-hexpat/Makefile b/textproc/hs-hexpat/Makefile index 0167f8a07f6e..07adeb9cada4 100644 --- a/textproc/hs-hexpat/Makefile +++ b/textproc/hs-hexpat/Makefile @@ -2,7 +2,7 @@ PORTNAME= hexpat PORTVERSION= 0.20.13 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libexpat.so:textproc/expat2 -USE_CABAL= List>=0.4.2 text>=0.5.0.0 utf8-string>=0.3 +USE_CABAL= List>=0.4.2 utf8-string>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-highlighting-kate/Makefile b/textproc/hs-highlighting-kate/Makefile index ff271b253e4f..175435891e6c 100644 --- a/textproc/hs-highlighting-kate/Makefile +++ b/textproc/hs-highlighting-kate/Makefile @@ -2,7 +2,7 @@ PORTNAME= highlighting-kate PORTVERSION= 0.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +10,8 @@ COMMENT= Syntax highlighting LICENSE= GPLv2 -USE_CABAL= blaze-html>=0.4.2 mtl parsec \ - regex-pcre-builtin>=0.94.4.8.8.35 utf8-string +USE_CABAL= blaze-html>=0.4.2 mtl regex-pcre-builtin>=0.94.4.8.8.35 \ + utf8-string FLAGS_DEFINE= EXECUTABLE diff --git a/textproc/hs-hs-bibutils/Makefile b/textproc/hs-hs-bibutils/Makefile index 39694fb70d50..3133c157b20e 100644 --- a/textproc/hs-hs-bibutils/Makefile +++ b/textproc/hs-hs-bibutils/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= hs-bibutils -PORTVERSION= 5.5 -PORTREVISION= 2 +PORTVERSION= 6.2.0.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hs-bibutils/distinfo b/textproc/hs-hs-bibutils/distinfo index 99260edc6f99..d9e6052e77b4 100644 --- a/textproc/hs-hs-bibutils/distinfo +++ b/textproc/hs-hs-bibutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624830 -SHA256 (cabal/hs-bibutils-5.5.tar.gz) = 95f9f34be9f3145da8acc8a0e9de379236cfe31c5a9bc0eb9489e77402a4c55d -SIZE (cabal/hs-bibutils-5.5.tar.gz) = 499546 +TIMESTAMP = 1525094674 +SHA256 (cabal/hs-bibutils-6.2.0.1.tar.gz) = 4b668090049bf67f107b8bcd39a4664c00b78ff596de9ccb63720af49ed4a630 +SIZE (cabal/hs-bibutils-6.2.0.1.tar.gz) = 515725 diff --git a/textproc/hs-html-conduit/Makefile b/textproc/hs-html-conduit/Makefile index 1b1e94df7b35..b5067886da1d 100644 --- a/textproc/hs-html-conduit/Makefile +++ b/textproc/hs-html-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= html-conduit -PORTVERSION= 1.2.1.1 -PORTREVISION= 1 +PORTVERSION= 1.3.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +10,7 @@ COMMENT= Parse HTML documents using xml-conduit datatypes LICENSE= MIT USE_CABAL= conduit>=1.0 conduit-extra>=1.1.1 resourcet>=0.3 \ - tagstream-conduit>=0.5.5.3 text xml-conduit>=1.3 xml-types>=0.3 + tagstream-conduit>=0.5.5.3 xml-conduit>=1.3 xml-types>=0.3 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-html-conduit/distinfo b/textproc/hs-html-conduit/distinfo index de9512724c3b..310684866a3c 100644 --- a/textproc/hs-html-conduit/distinfo +++ b/textproc/hs-html-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624831 -SHA256 (cabal/html-conduit-1.2.1.1.tar.gz) = 98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8 -SIZE (cabal/html-conduit-1.2.1.1.tar.gz) = 4125 +TIMESTAMP = 1524851689 +SHA256 (cabal/html-conduit-1.3.0.tar.gz) = 78bf09e175079bdd0f0dd363b3a4b2d32d095cc09413ca9d8069bc527809ee96 +SIZE (cabal/html-conduit-1.3.0.tar.gz) = 4458 diff --git a/textproc/hs-html-conduit/files/patch-html-conduit.cabal b/textproc/hs-html-conduit/files/patch-html-conduit.cabal deleted file mode 100644 index ae600cca1aca..000000000000 --- a/textproc/hs-html-conduit/files/patch-html-conduit.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- html-conduit.cabal.orig 2017-07-10 15:41:23 UTC -+++ html-conduit.cabal -@@ -22,7 +22,7 @@ Library - , resourcet >= 0.3 && < 1.2 - , conduit >= 1.0 && < 1.3 - , conduit-extra >= 1.1.1 -- , xml-conduit >= 1.3 && < 1.5 -+ , xml-conduit >= 1.3 && < 1.6 - , tagstream-conduit >= 0.5.5.3 && < 0.6 - , xml-types >= 0.3 && < 0.4 - diff --git a/textproc/hs-html/Makefile b/textproc/hs-html/Makefile index 2f25f70f975c..a92e4c0cbf56 100644 --- a/textproc/hs-html/Makefile +++ b/textproc/hs-html/Makefile @@ -2,7 +2,7 @@ PORTNAME= html PORTVERSION= 1.0.1.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt-charproperties/Makefile b/textproc/hs-hxt-charproperties/Makefile index 0abd9f215dae..579f3c2aac03 100644 --- a/textproc/hs-hxt-charproperties/Makefile +++ b/textproc/hs-hxt-charproperties/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt-charproperties PORTVERSION= 9.2.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt-regex-xmlschema/Makefile b/textproc/hs-hxt-regex-xmlschema/Makefile index 13a374a4f486..bf5f2657842d 100644 --- a/textproc/hs-hxt-regex-xmlschema/Makefile +++ b/textproc/hs-hxt-regex-xmlschema/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt-regex-xmlschema PORTVERSION= 9.2.0.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Regular expression library for W3C XML Schema regular expressions LICENSE= MIT -USE_CABAL= hxt-charproperties>=9.0 parsec>=2.1 text>=0.10 +USE_CABAL= hxt-charproperties>=9.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-hxt-unicode/Makefile b/textproc/hs-hxt-unicode/Makefile index 87fa86675906..69e09e587c5a 100644 --- a/textproc/hs-hxt-unicode/Makefile +++ b/textproc/hs-hxt-unicode/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt-unicode PORTVERSION= 9.0.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile index ab89a5c3dfba..a59a01ae2f94 100644 --- a/textproc/hs-hxt/Makefile +++ b/textproc/hs-hxt/Makefile @@ -2,7 +2,7 @@ PORTNAME= hxt PORTVERSION= 9.3.1.16 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +11,7 @@ COMMENT= Collection of tools for processing XML with Haskell LICENSE= MIT USE_CABAL= HUnit>=1.2 hxt-charproperties>=9.1 hxt-regex-xmlschema>=9.2 \ - hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 \ - parsec>=2.1 + hxt-unicode>=9.0.1 mtl>=2.0.1 network>=2.6 network-uri>=2.6 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-lhs2tex/Makefile b/textproc/hs-lhs2tex/Makefile index 7534d3fbfddb..e914e554a3ee 100644 --- a/textproc/hs-lhs2tex/Makefile +++ b/textproc/hs-lhs2tex/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= lhs2tex -PORTVERSION= 1.19 -PORTREVISION= 2 +PORTVERSION= 1.20 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-lhs2tex/distinfo b/textproc/hs-lhs2tex/distinfo index a9984180aefe..5a6272025550 100644 --- a/textproc/hs-lhs2tex/distinfo +++ b/textproc/hs-lhs2tex/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624833 -SHA256 (cabal/lhs2tex-1.19.tar.gz) = 24ae0557d95673e0c6d9b0aca829181b734359880dd58802ac154b89f384b00e -SIZE (cabal/lhs2tex-1.19.tar.gz) = 658353 +TIMESTAMP = 1524639224 +SHA256 (cabal/lhs2tex-1.20.tar.gz) = ae851e7f7d25ff822e1fec2f48aec7802d62e06458096de28069201562dfb03a +SIZE (cabal/lhs2tex-1.20.tar.gz) = 674326 diff --git a/textproc/hs-lhs2tex/files/patch-Setup.hs b/textproc/hs-lhs2tex/files/patch-Setup.hs index df80ba1420b5..09f425ff12ff 100644 --- a/textproc/hs-lhs2tex/files/patch-Setup.hs +++ b/textproc/hs-lhs2tex/files/patch-Setup.hs @@ -1,6 +1,6 @@ ---- Setup.hs.orig 2012-09-08 22:29:52.000000000 +0100 -+++ Setup.hs 2013-12-08 15:55:17.403235103 +0000 -@@ -205,7 +205,7 @@ +--- Setup.hs.orig 2017-09-29 08:44:16 UTC ++++ Setup.hs +@@ -210,7 +210,7 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer else docdir (absoluteInstallDirs pd lbi cd) `joinFileName` "doc" let manDir = if isWindows then dataPref `joinFileName` "Documentation" @@ -9,7 +9,7 @@ createDirectoryIfMissing True docDir installOrdinaryFile v (lhs2texDocDir `joinFileName` "Guide2.pdf") (docDir `joinFileName` "Guide2.pdf") when (not isWindows) $ -@@ -213,7 +213,8 @@ +@@ -218,7 +218,8 @@ lhs2texPostCopy a (CopyFlags { copyDest = cdf, copyVer installOrdinaryFile v ("lhs2TeX.1") (manDir `joinFileName` "lhs2TeX.1") -- polytable case (installPolyTable ebi) of diff --git a/textproc/hs-lhs2tex/files/patch-src_Document.lhs b/textproc/hs-lhs2tex/files/patch-src_Document.lhs new file mode 100644 index 000000000000..fdbeead0aa32 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Document.lhs @@ -0,0 +1,10 @@ +--- src/Document.lhs.orig 2018-04-25 07:05:53 UTC ++++ src/Document.lhs +@@ -9,6 +9,7 @@ + + %endif + ++> import Prelude hiding ((<>)) + > infixr 5 {-"\enskip"-} <> -- same fixity as `|++|' + + The pretty printer generate documents of type |Doc|. diff --git a/textproc/hs-lhs2tex/files/patch-src_Main.lhs b/textproc/hs-lhs2tex/files/patch-src_Main.lhs new file mode 100644 index 000000000000..dcc2df875b0f --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Main.lhs @@ -0,0 +1,11 @@ +--- src/Main.lhs.orig 2018-04-25 07:41:09 UTC ++++ src/Main.lhs +@@ -21,7 +21,7 @@ + > import Control.Monad.Error + > import Control.Monad.State ( MonadState(..), modify ) + > import Control.Monad.Trans +-> import Prelude hiding ( getContents ) ++> import Prelude hiding ( getContents, (<>) ) + > + > import Version + > import TeXCommands diff --git a/textproc/hs-lhs2tex/files/patch-src_Math.lhs b/textproc/hs-lhs2tex/files/patch-src_Math.lhs new file mode 100644 index 000000000000..942016c7ab32 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Math.lhs @@ -0,0 +1,11 @@ +--- src/Math.lhs.orig 2018-04-25 07:40:44 UTC ++++ src/Math.lhs +@@ -7,7 +7,7 @@ + > module Math ( module Math, substitute, number ) + > where + > +-> import Prelude hiding ( lines ) ++> import Prelude hiding ( lines, (<>) ) + > import Data.List ( partition ) + > import Numeric ( showFFloat ) + > import Control.Applicative ( many ) diff --git a/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs b/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs new file mode 100644 index 000000000000..21728d3ffa0e --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_MathPoly.lhs @@ -0,0 +1,11 @@ +--- src/MathPoly.lhs.orig 2018-04-25 07:08:26 UTC ++++ src/MathPoly.lhs +@@ -13,7 +13,7 @@ are subtle differences, and they will grow over time \ + > module MathPoly ( module MathPoly, substitute, number ) + > where + > +-> import Prelude hiding ( lines ) ++> import Prelude hiding ( lines, (<>) ) + > import Data.List ( partition, nub, insert, sort, transpose ) + > import Numeric ( showFFloat ) + > import Control.Applicative ( many ) diff --git a/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs b/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs new file mode 100644 index 000000000000..f9f22a8c93a4 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_NewCode.lhs @@ -0,0 +1,10 @@ +--- src/NewCode.lhs.orig 2018-04-25 07:08:55 UTC ++++ src/NewCode.lhs +@@ -13,6 +13,7 @@ way that is compatible with the @poly@ or @math@ forma + > module NewCode ( module NewCode ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Monad ( (>=>) ) + > import Data.List ( partition ) + > diff --git a/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs b/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs new file mode 100644 index 000000000000..3b8ca4785939 --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Typewriter.lhs @@ -0,0 +1,10 @@ +--- src/Typewriter.lhs.orig 2018-04-25 07:07:53 UTC ++++ src/Typewriter.lhs +@@ -7,6 +7,7 @@ + > module Typewriter ( module Typewriter ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Monad + > + > import Verbatim ( trim, expand ) diff --git a/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs b/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs new file mode 100644 index 000000000000..c7130dd0541c --- /dev/null +++ b/textproc/hs-lhs2tex/files/patch-src_Verbatim.lhs @@ -0,0 +1,10 @@ +--- src/Verbatim.lhs.orig 2018-04-25 07:07:15 UTC ++++ src/Verbatim.lhs +@@ -7,6 +7,7 @@ + > module Verbatim ( module Verbatim ) + > where + > ++> import Prelude hiding ((<>)) + > import Control.Arrow ( (>>>) ) + > import Data.Char + > import Data.List ( intersperse ) diff --git a/textproc/hs-libxml-sax/Makefile b/textproc/hs-libxml-sax/Makefile index 68671888e58d..a012c777fe07 100644 --- a/textproc/hs-libxml-sax/Makefile +++ b/textproc/hs-libxml-sax/Makefile @@ -2,7 +2,7 @@ PORTNAME= libxml-sax PORTVERSION= 0.7.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Bindings for the libXML2 SAX interface LICENSE= MIT -USE_CABAL= text>=0.7 xml-types>=0.3 +USE_CABAL= xml-types>=0.3 USES= pkgconfig LIB_DEPENDS= libxml2.so:textproc/libxml2 diff --git a/textproc/hs-libxml/Makefile b/textproc/hs-libxml/Makefile index 7999c680c263..92f3ac64544b 100644 --- a/textproc/hs-libxml/Makefile +++ b/textproc/hs-libxml/Makefile @@ -2,7 +2,7 @@ PORTNAME= libxml PORTVERSION= 0.1.1 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-magic/Makefile b/textproc/hs-magic/Makefile index 70fe0da1df84..5b0a32eaeab6 100644 --- a/textproc/hs-magic/Makefile +++ b/textproc/hs-magic/Makefile @@ -2,7 +2,7 @@ PORTNAME= magic PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-pandoc-citeproc/Makefile b/textproc/hs-pandoc-citeproc/Makefile index 84ee9bd8791f..ba9ef140cf46 100644 --- a/textproc/hs-pandoc-citeproc/Makefile +++ b/textproc/hs-pandoc-citeproc/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pandoc-citeproc -PORTVERSION= 0.10.5.1 -PORTREVISION= 1 +PORTVERSION= 0.14.3.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,8 @@ COMMENT= Supports using pandoc with citeproc LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.7 aeson-pretty attoparsec data-default \ - mtl pandoc>=1.13 pandoc-types>=1.12.3 parsec rfc5051 \ - setenv>=0.1 split syb tagsoup text vector xml-conduit>=1.2 \ + mtl pandoc>=1.13 pandoc-types>=1.12.3 rfc5051 \ + setenv>=0.1 split syb tagsoup vector xml-conduit>=1.2 \ yaml>=0.8.8.7 EXECUTABLE= pandoc-citeproc diff --git a/textproc/hs-pandoc-citeproc/distinfo b/textproc/hs-pandoc-citeproc/distinfo index 83916a3d8e09..d9f8e7435e12 100644 --- a/textproc/hs-pandoc-citeproc/distinfo +++ b/textproc/hs-pandoc-citeproc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624836 -SHA256 (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 49038b80ad802098169852b0bc7fc7c9878a85a9091eee4c32211844fecda783 -SIZE (cabal/pandoc-citeproc-0.10.5.1.tar.gz) = 262993 +TIMESTAMP = 1525014746 +SHA256 (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 42c0b2c8365441bf884daa6202e6ed01b42181cf255406c88b3b31cd27cb467a +SIZE (cabal/pandoc-citeproc-0.14.3.1.tar.gz) = 306846 diff --git a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal b/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal deleted file mode 100644 index 26a28052b0e3..000000000000 --- a/textproc/hs-pandoc-citeproc/files/patch-pandoc-citeproc.cabal +++ /dev/null @@ -1,38 +0,0 @@ ---- pandoc-citeproc.cabal.orig 2017-06-04 18:38:13 UTC -+++ pandoc-citeproc.cabal -@@ -99,7 +99,7 @@ library - ghc-prof-options: -fprof-auto-exported - build-depends: containers, directory, mtl, - bytestring, filepath, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - tagsoup, - aeson >= 0.7 && < 1.3, -@@ -146,7 +146,7 @@ executable pandoc-citeproc - ghc-options: -funbox-strict-fields -Wall - ghc-prof-options: -fprof-auto-exported -rtsopts - build-depends: base >= 4, pandoc-citeproc, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - aeson, - aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text, -@@ -169,7 +169,7 @@ executable test-citeproc - else - Buildable: False - build-depends: base >= 4, aeson, directory, text, mtl, -- pandoc-types >= 1.16 && < 1.18, -+ pandoc-types >= 1.16 && < 1.20, - pandoc >= 1.16 && < 2.1, - filepath, - bytestring, pandoc-citeproc, process, temporary >= 1.1, -@@ -185,7 +185,7 @@ test-suite test-pandoc-citeproc - Prelude - Hs-Source-Dirs: tests, prelude, compat - build-depends: base >= 4, aeson, directory, text, -- pandoc-types >= 1.16 && < 1.18, mtl, -+ pandoc-types >= 1.16 && < 1.20, mtl, - pandoc >= 1.16 && < 2.1, filepath, - bytestring, pandoc-citeproc, process, temporary >= 1.1, - yaml >= 0.8.8.7 diff --git a/textproc/hs-pandoc-types/Makefile b/textproc/hs-pandoc-types/Makefile index f770364de835..606e3809647b 100644 --- a/textproc/hs-pandoc-types/Makefile +++ b/textproc/hs-pandoc-types/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= pandoc-types -PORTVERSION= 1.19 -PORTREVISION= 1 +PORTVERSION= 1.17.4.2 +PORTEPOCH= 1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-pandoc-types/distinfo b/textproc/hs-pandoc-types/distinfo index 76620ce18f88..0515e7419fe4 100644 --- a/textproc/hs-pandoc-types/distinfo +++ b/textproc/hs-pandoc-types/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499543994 -SHA256 (cabal/pandoc-types-1.19.tar.gz) = 2bdd244a1a8fda8d3da07b7e0ffbfe54d7808709bb35825963177b112d4dcccf -SIZE (cabal/pandoc-types-1.19.tar.gz) = 21942 +TIMESTAMP = 1524405363 +SHA256 (cabal/pandoc-types-1.17.4.2.tar.gz) = 57e15e0a8c74f1acc96259d24eb77a6febbc182a1fd8092af8c431e7a3263eca +SIZE (cabal/pandoc-types-1.17.4.2.tar.gz) = 24035 diff --git a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal b/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal deleted file mode 100644 index e8741ae401d4..000000000000 --- a/textproc/hs-pandoc-types/files/patch-pandoc-types.cabal +++ /dev/null @@ -1,24 +0,0 @@ ---- pandoc-types.cabal.orig 2017-01-22 09:26:57 UTC -+++ pandoc-types.cabal -@@ -48,10 +48,10 @@ Library - Other-modules: Paths_pandoc_types - Build-depends: base >= 4 && < 5, - containers >= 0.3, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - ghc-prim >= 0.2, - bytestring >= 0.9 && < 0.11, -- aeson >= 0.6.2 && < 1.2, -+ aeson >= 0.6.2 && < 1.3, - QuickCheck >= 2 - if impl(ghc < 7.10) - Build-depends: deepseq-generics >= 0.1 && < 0.2 -@@ -65,7 +65,7 @@ test-suite test-pandoc-types - build-depends: base, - pandoc-types, - syb, -- aeson >= 0.6.2 && < 1.2, -+ aeson >= 0.6.2 && < 1.3, - containers >= 0.3, - bytestring >= 0.9 && < 0.11, - test-framework >= 0.3 && < 0.9, diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile index 7e7b890e4d93..73481fb95230 100644 --- a/textproc/hs-pandoc/Makefile +++ b/textproc/hs-pandoc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= pandoc -PORTVERSION= 1.19.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,14 +10,14 @@ COMMENT= Conversion between markup formats LICENSE= GPLv2 -USE_CABAL= aeson base64-bytestring blaze-html \ - blaze-markup cmark data-default \ +USE_CABAL= Glob aeson aeson-pretty base64-bytestring blaze-html \ + blaze-markup cmark cmark-gfm data-default \ deepseq-generics doctemplates extensible-exceptions \ - filemanip haddock-library highlighting-kate \ - hslua HTTP JuicyPixels mtl \ - network network-uri pandoc-types parsec \ + filemanip haddock-library \ + hslua hslua-module-text HTTP JuicyPixels mtl \ + network network-uri pandoc-types \ random scientific SHA skylighting syb tagsoup\ - temporary texmath text \ + temporary texmath \ unordered-containers vector xml \ yaml zip-archive zlib @@ -49,7 +48,7 @@ HTTPS_FLAG_CABAL= http-client>=0.3.2 http-client-tls>=0.2 http-types>=0.8 TRYPANDOC_DESC= Build trypandoc cgi executable TRYPANDOC_FLAG_ENABLE= trypandoc -TRYPANDOC_FLAG_CABAL= aeson highlighting-kate text wai-extra wai>=0.3 \ +TRYPANDOC_FLAG_CABAL= aeson wai-extra wai>=0.3 \ http-types TRYPANDOC_FLAG_EXECUTABLE= trypandoc diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo index 5f38ab8379a5..8ed8d343faca 100644 --- a/textproc/hs-pandoc/distinfo +++ b/textproc/hs-pandoc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624835 -SHA256 (cabal/pandoc-1.19.2.1.tar.gz) = 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801 -SIZE (cabal/pandoc-1.19.2.1.tar.gz) = 2755101 +TIMESTAMP = 1524940319 +SHA256 (cabal/pandoc-2.2.tar.gz) = 0f2984a6ea4948392154ecdcffcc21c561976c63f9c8aa648a56a677b80e8569 +SIZE (cabal/pandoc-2.2.tar.gz) = 8995928 diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal deleted file mode 100644 index 07d92a10932a..000000000000 --- a/textproc/hs-pandoc/files/patch-pandoc.cabal +++ /dev/null @@ -1,83 +0,0 @@ ---- pandoc.cabal.orig 2017-01-31 15:02:20 UTC -+++ pandoc.cabal -@@ -253,7 +253,7 @@ Flag old-locale - - Library - Build-Depends: base >= 4.7 && <5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - containers >= 0.1 && < 0.6, - unordered-containers >= 0.2 && < 0.3, - array >= 0.3 && < 0.6, -@@ -270,12 +270,12 @@ Library - xml >= 1.3.12 && < 1.4, - random >= 1 && < 1.2, - extensible-exceptions >= 0.1 && < 0.2, -- pandoc-types >= 1.17 && < 1.18, -- aeson >= 0.7 && < 1.2, -+ pandoc-types >= 1.17 && < 1.20, -+ aeson >= 0.7 && < 1.3, - tagsoup >= 0.13.7 && < 0.15, - base64-bytestring >= 0.1 && < 1.1, - zlib >= 0.5 && < 0.7, -- skylighting >= 0.1.1.4 && < 0.2, -+ skylighting >= 0.1.1.4 && < 0.4, - data-default >= 0.4 && < 0.8, - temporary >= 1.1 && < 1.3, - blaze-html >= 0.5 && < 0.10, -@@ -283,7 +283,7 @@ Library - yaml >= 0.8.8.2 && < 0.9, - scientific >= 0.2 && < 0.4, - vector >= 0.10 && < 0.13, -- hslua >= 0.3 && < 0.5, -+ hslua >= 0.3 && < 0.6, - binary >= 0.5 && < 0.9, - SHA >= 1.6 && < 1.7, - haddock-library >= 1.1 && < 1.5, -@@ -424,15 +424,15 @@ Library - - Executable pandoc - Build-Depends: pandoc, -- pandoc-types >= 1.17 && < 1.18, -+ pandoc-types >= 1.17 && < 1.20, - base >= 4.2 && <5, - directory >= 1.2 && < 1.4, - filepath >= 1.1 && < 1.5, - text >= 0.11 && < 1.3, - bytestring >= 0.9 && < 0.11, - extensible-exceptions >= 0.1 && < 0.2, -- skylighting >= 0.1.1.3 && < 0.2, -- aeson >= 0.7.0.5 && < 1.2, -+ skylighting >= 0.1.1.3 && < 0.4, -+ aeson >= 0.7.0.5 && < 1.3, - yaml >= 0.8.8.2 && < 0.9, - containers >= 0.1 && < 0.6, - HTTP >= 4000.0.5 && < 4000.4 -@@ -498,15 +498,15 @@ Test-Suite test-pandoc - Hs-Source-Dirs: prelude - Other-Modules: Prelude - Build-Depends: base >= 4.2 && < 5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - pandoc, -- pandoc-types >= 1.17 && < 1.18, -+ pandoc-types >= 1.17 && < 1.20, - bytestring >= 0.9 && < 0.11, - text >= 0.11 && < 1.3, - directory >= 1 && < 1.4, - filepath >= 1.1 && < 1.5, - process >= 1 && < 1.5, -- skylighting >= 0.1.1.3 && < 0.2, -+ skylighting >= 0.1.1.3 && < 0.4, - Diff >= 0.2 && < 0.4, - test-framework >= 0.3 && < 0.9, - test-framework-hunit >= 0.2 && < 0.4, -@@ -553,7 +553,7 @@ benchmark benchmark-pandoc - Other-Modules: Prelude - Build-Depends: pandoc, - base >= 4.2 && < 5, -- syb >= 0.1 && < 0.7, -+ syb >= 0.1 && < 0.8, - criterion >= 1.0 && < 1.2 - Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind - Default-Language: Haskell98 diff --git a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs deleted file mode 100644 index 648d7ffa890d..000000000000 --- a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs +++ /dev/null @@ -1,14 +0,0 @@ ---- src/Text/Pandoc/Writers/Custom.hs.orig 2017-01-25 16:07:43 UTC -+++ src/Text/Pandoc/Writers/Custom.hs -@@ -183,7 +183,11 @@ writeCustom luaFile opts doc@(Pandoc meta _) = do - setForeignEncoding utf8 - lua <- Lua.newstate - Lua.openlibs lua -+#if MIN_VERSION_hslua(0,5,0) -+ status <- Lua.loadstring lua luaScript -+#else - status <- Lua.loadstring lua luaScript luaFile -+#endif - -- check for error in lua script (later we'll change the return type - -- to handle this more gracefully): - when (status /= 0) $ diff --git a/textproc/hs-parsec/distinfo b/textproc/hs-parsec/distinfo deleted file mode 100644 index 53ec58aa1cb3..000000000000 --- a/textproc/hs-parsec/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1499618976 -SHA256 (cabal/parsec-3.1.11.tar.gz) = 6f87251cb1d11505e621274dec15972de924a9074f07f7430a18892064c2676e -SIZE (cabal/parsec-3.1.11.tar.gz) = 32412 diff --git a/textproc/hs-parsec/pkg-descr b/textproc/hs-parsec/pkg-descr deleted file mode 100644 index cb0f23454412..000000000000 --- a/textproc/hs-parsec/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Parsec is designed from scratch as an industrial-strength parser -library. It is simple, safe, well documented (on the package homepage), -has extensive libraries and good error messages, and is also fast. It -is defined as a monad transformer that can be stacked on arbitrary -monads, and it is also parametric in the input stream type. - -WWW: https://github.com/aslatter/parsec diff --git a/textproc/hs-polyparse/Makefile b/textproc/hs-polyparse/Makefile index 348c87c81e22..2fe6967856d9 100644 --- a/textproc/hs-polyparse/Makefile +++ b/textproc/hs-polyparse/Makefile @@ -2,7 +2,7 @@ PORTNAME= polyparse PORTVERSION= 1.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Variety of alternative parser combinator libraries LICENSE= LGPL21 -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-pretty-show/Makefile b/textproc/hs-pretty-show/Makefile index c0c9fd40bcc0..fc4aca9b2546 100644 --- a/textproc/hs-pretty-show/Makefile +++ b/textproc/hs-pretty-show/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= pretty-show -PORTVERSION= 1.6.13 -PORTREVISION= 1 +PORTVERSION= 1.7 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-pretty-show/distinfo b/textproc/hs-pretty-show/distinfo index 2dc39c2a8127..c5a7d6e05e9a 100644 --- a/textproc/hs-pretty-show/distinfo +++ b/textproc/hs-pretty-show/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499720300 -SHA256 (cabal/pretty-show-1.6.13.tar.gz) = 55ba43cb043e15738adcba3e9a5a5dd3e341026f5334fd0b9c80dfbcbc387dcd -SIZE (cabal/pretty-show-1.6.13.tar.gz) = 140057 +TIMESTAMP = 1523448613 +SHA256 (cabal/pretty-show-1.7.tar.gz) = 382b6ef4a78e4059611b5c86674ad72a6bfce821e8852da4f00b628cfbbc272f +SIZE (cabal/pretty-show-1.7.tar.gz) = 135621 diff --git a/textproc/hs-regex-applicative/Makefile b/textproc/hs-regex-applicative/Makefile index a2b3a73d09ec..f0d1e11e64e3 100644 --- a/textproc/hs-regex-applicative/Makefile +++ b/textproc/hs-regex-applicative/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-applicative PORTVERSION= 0.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-base/Makefile b/textproc/hs-regex-base/Makefile index 80ff3d9612aa..5ef5eaeddb79 100644 --- a/textproc/hs-regex-base/Makefile +++ b/textproc/hs-regex-base/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-base PORTVERSION= 0.93.2 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-compat-tdfa/Makefile b/textproc/hs-regex-compat-tdfa/Makefile index 233c96e65e54..09bda2db8e60 100644 --- a/textproc/hs-regex-compat-tdfa/Makefile +++ b/textproc/hs-regex-compat-tdfa/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-compat-tdfa PORTVERSION= 0.95.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-compat/Makefile b/textproc/hs-regex-compat/Makefile index b08ca00799ec..9cbed60ea6ca 100644 --- a/textproc/hs-regex-compat/Makefile +++ b/textproc/hs-regex-compat/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-compat PORTVERSION= 0.95.1 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-pcre-builtin/Makefile b/textproc/hs-regex-pcre-builtin/Makefile index 18c04e526c00..bba3c39cf15b 100644 --- a/textproc/hs-regex-pcre-builtin/Makefile +++ b/textproc/hs-regex-pcre-builtin/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-pcre-builtin PORTVERSION= 0.94.4.8.8.35 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-pcre/Makefile b/textproc/hs-regex-pcre/Makefile index 63e98b936964..e28e263be526 100644 --- a/textproc/hs-regex-pcre/Makefile +++ b/textproc/hs-regex-pcre/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-pcre PORTVERSION= 0.94.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-posix/Makefile b/textproc/hs-regex-posix/Makefile index 9785b6df46ba..81f259744f84 100644 --- a/textproc/hs-regex-posix/Makefile +++ b/textproc/hs-regex-posix/Makefile @@ -2,7 +2,7 @@ PORTNAME= regex-posix PORTVERSION= 0.95.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-regex-tdfa/Makefile b/textproc/hs-regex-tdfa/Makefile index 22fd0301a58d..c6a9bfa8904c 100644 --- a/textproc/hs-regex-tdfa/Makefile +++ b/textproc/hs-regex-tdfa/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= regex-tdfa -PORTVERSION= 1.2.2 -PORTREVISION= 1 +PORTVERSION= 1.2.3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Replaces/Enhances Text.Regex LICENSE= BSD3CLAUSE -USE_CABAL= mtl parsec regex-base>=0.93.1 +USE_CABAL= mtl regex-base>=0.93.1 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-regex-tdfa/distinfo b/textproc/hs-regex-tdfa/distinfo index 7d1d6321a459..81eec5bfb16b 100644 --- a/textproc/hs-regex-tdfa/distinfo +++ b/textproc/hs-regex-tdfa/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624838 -SHA256 (cabal/regex-tdfa-1.2.2.tar.gz) = cb12d675be7b31ed8086d8d022023d03eb553e55dbee6e1b7a4154933d471d39 -SIZE (cabal/regex-tdfa-1.2.2.tar.gz) = 65969 +TIMESTAMP = 1523955154 +SHA256 (cabal/regex-tdfa-1.2.3.tar.gz) = 89b17ebb812d4597c0007fbbc21c78dfef70a133aa41b208217a9c99bed600d9 +SIZE (cabal/regex-tdfa-1.2.3.tar.gz) = 66268 diff --git a/textproc/hs-rfc5051/Makefile b/textproc/hs-rfc5051/Makefile index 4f6d0b5ef83e..72c06daca208 100644 --- a/textproc/hs-rfc5051/Makefile +++ b/textproc/hs-rfc5051/Makefile @@ -2,7 +2,7 @@ PORTNAME= rfc5051 PORTVERSION= 0.1.0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-scanner/Makefile b/textproc/hs-scanner/Makefile index c070c0c641f5..d5476064cc95 100644 --- a/textproc/hs-scanner/Makefile +++ b/textproc/hs-scanner/Makefile @@ -2,7 +2,7 @@ PORTNAME= scanner PORTVERSION= 0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-skylighting-core/Makefile b/textproc/hs-skylighting-core/Makefile new file mode 100644 index 000000000000..7bc959ab065c --- /dev/null +++ b/textproc/hs-skylighting-core/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PORTNAME= skylighting-core +PORTVERSION= 0.7.1 +CATEGORIES= textproc haskell + +MAINTAINER= haskell@FreeBSD.org +COMMENT= Syntax highlighting library with support for over one hundred languages + +LICENSE= BSD3CLAUSE + +USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html case-insensitive colour hxt mtl \ + pretty-show regex-pcre regex-pcre-builtin safe utf8-string + +.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" +.include <bsd.port.mk> diff --git a/textproc/hs-skylighting-core/distinfo b/textproc/hs-skylighting-core/distinfo new file mode 100644 index 000000000000..667b1ae4b182 --- /dev/null +++ b/textproc/hs-skylighting-core/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524848800 +SHA256 (cabal/skylighting-core-0.7.1.tar.gz) = 4ffe223554db53cedfce5af92a7f22a907904c40bf498777dfdfe3c5ccd8723e +SIZE (cabal/skylighting-core-0.7.1.tar.gz) = 545965 diff --git a/textproc/hs-skylighting-core/pkg-descr b/textproc/hs-skylighting-core/pkg-descr new file mode 100644 index 000000000000..1af3090ca07f --- /dev/null +++ b/textproc/hs-skylighting-core/pkg-descr @@ -0,0 +1,7 @@ +Skylighting is a syntax highlighting library with support for over one hundred +languages. It derives its tokenizers from XML syntax definitions used by KDE's +KSyntaxHighlighting framework, so any syntax supported by that framework can be +added. An optional command-line program is provided. Skylighting is intended to +be the successor to highlighting-kate. + +WWW: http://hackage.haskell.org/package/skylighting diff --git a/textproc/hs-skylighting/Makefile b/textproc/hs-skylighting/Makefile index fe5a47aa3eba..5614321c509d 100644 --- a/textproc/hs-skylighting/Makefile +++ b/textproc/hs-skylighting/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= skylighting -PORTVERSION= 0.3.3.1 -PORTREVISION= 1 +PORTVERSION= 0.7.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,9 @@ COMMENT= Syntax highlighting library with support for over one hundred languages LICENSE= BSD3CLAUSE -USE_CABAL= aeson attoparsec blaze-html case-insensitive hxt mtl \ - pretty-show regex-pcre regex-pcre-builtin safe text utf8-string +USE_CABAL= aeson ansi-terminal attoparsec base64-bytestring blaze-html \ + case-insensitive colour hxt mtl pretty-show regex-pcre \ + regex-pcre-builtin safe skylighting-core utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-skylighting/distinfo b/textproc/hs-skylighting/distinfo index 59a31d6dcf35..be12b27301af 100644 --- a/textproc/hs-skylighting/distinfo +++ b/textproc/hs-skylighting/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499717353 -SHA256 (cabal/skylighting-0.3.3.1.tar.gz) = f3e1f910a4d0e13afff2abdc54ad836ff968fcc8f4083b33c0153367393c5d57 -SIZE (cabal/skylighting-0.3.3.1.tar.gz) = 1014631 +TIMESTAMP = 1524846475 +SHA256 (cabal/skylighting-0.7.1.tar.gz) = c0bcd4f0075c77226052ab9a04f90ff8d2f2c8e97e5083d9e65843635bb0f574 +SIZE (cabal/skylighting-0.7.1.tar.gz) = 491234 diff --git a/textproc/hs-stringsearch/Makefile b/textproc/hs-stringsearch/Makefile index 5079e11069fd..41bb6e06b85d 100644 --- a/textproc/hs-stringsearch/Makefile +++ b/textproc/hs-stringsearch/Makefile @@ -3,7 +3,7 @@ PORTNAME= stringsearch PORTVERSION= 0.3.6.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-tagsoup/Makefile b/textproc/hs-tagsoup/Makefile index a1e655c2eb8b..562476c669be 100644 --- a/textproc/hs-tagsoup/Makefile +++ b/textproc/hs-tagsoup/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tagsoup -PORTVERSION= 0.14.1 -PORTREVISION= 1 +PORTVERSION= 0.14.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,6 @@ COMMENT= Parsing and extracting information from HTML/XML documents LICENSE= BSD3CLAUSE -USE_CABAL= text - FLAGS_DEFINE= DOWNLOAD DOWNLOAD_DESC= Build with Download module diff --git a/textproc/hs-tagsoup/distinfo b/textproc/hs-tagsoup/distinfo index 653cf16d5021..4a5409291a27 100644 --- a/textproc/hs-tagsoup/distinfo +++ b/textproc/hs-tagsoup/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624839 -SHA256 (cabal/tagsoup-0.14.1.tar.gz) = 028be660a864e0918f99f90471caea72af2bfbf8a64a423e181b2b29f9c64aeb -SIZE (cabal/tagsoup-0.14.1.tar.gz) = 44031 +TIMESTAMP = 1523444247 +SHA256 (cabal/tagsoup-0.14.6.tar.gz) = 4b4ed4db1428e859389d628dd5755074f659a424ec49934ec53e44b0fc6a63fb +SIZE (cabal/tagsoup-0.14.6.tar.gz) = 43982 diff --git a/textproc/hs-tagstream-conduit/Makefile b/textproc/hs-tagstream-conduit/Makefile index e35ea9d9bd8a..74c1324736ce 100644 --- a/textproc/hs-tagstream-conduit/Makefile +++ b/textproc/hs-tagstream-conduit/Makefile @@ -2,7 +2,7 @@ PORTNAME= tagstream-conduit PORTVERSION= 0.5.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= Streamlined HTML tag parser LICENSE= BSD3CLAUSE USE_CABAL= attoparsec>=0.10 blaze-builder case-insensitive conduit>=1.2 \ - conduit-extra>=1.1.0 data-default>=0.5.0 resourcet text \ + conduit-extra>=1.1.0 data-default>=0.5.0 resourcet \ xml-conduit>=1.1.0.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" diff --git a/textproc/hs-texmath/Makefile b/textproc/hs-texmath/Makefile index ced97a4f3be3..da4ddc367fb9 100644 --- a/textproc/hs-texmath/Makefile +++ b/textproc/hs-texmath/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= texmath -PORTVERSION= 0.9.4.1 -PORTREVISION= 1 +PORTVERSION= 0.10.1.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,8 +10,7 @@ COMMENT= Conversion between formats used to represent mathematics LICENSE= GPLv2 -USE_CABAL= aeson mtl network network-uri pandoc-types parsec split \ - syb text xml +USE_CABAL= aeson mtl network network-uri pandoc-types split syb xml FLAGS_ENABLE= network-uri FLAGS_DISABLE= executable diff --git a/textproc/hs-texmath/distinfo b/textproc/hs-texmath/distinfo index d300fd4ee54b..4aacb04c0c4b 100644 --- a/textproc/hs-texmath/distinfo +++ b/textproc/hs-texmath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624840 -SHA256 (cabal/texmath-0.9.4.1.tar.gz) = 302202b2c896403963aefe63044ca65ca277482d0e661607010ca3bf8d9a9d04 -SIZE (cabal/texmath-0.9.4.1.tar.gz) = 1705730 +TIMESTAMP = 1524845873 +SHA256 (cabal/texmath-0.10.1.2.tar.gz) = fda230b0ce48efb1f45f14c47d3db255466b973f42699507d53f8a7ca8a5d821 +SIZE (cabal/texmath-0.10.1.2.tar.gz) = 1716634 diff --git a/textproc/hs-texmath/files/patch-texmath.cabal b/textproc/hs-texmath/files/patch-texmath.cabal deleted file mode 100644 index f1f846076b26..000000000000 --- a/textproc/hs-texmath/files/patch-texmath.cabal +++ /dev/null @@ -1,20 +0,0 @@ ---- texmath.cabal.orig 2017-07-10 15:55:23 UTC -+++ texmath.cabal -@@ -87,7 +87,7 @@ Flag network-uri - - Library - Build-depends: xml, parsec >= 3, containers, -- pandoc-types >= 1.12.3.3 && < 1.18, mtl -+ pandoc-types >= 1.12.3.3 , mtl - if impl(ghc >= 6.10) - Build-depends: base >= 4.5 && < 5, syb - else -@@ -141,7 +141,7 @@ Executable texmath - if flag(executable) - Buildable: True - Build-Depends: base >= 4.5 && < 5, texmath, xml, -- pandoc-types >= 1.12.3.3 && < 1.18, -+ pandoc-types >= 1.12.3.3 , - split, aeson, bytestring, text - else - Buildable: False diff --git a/textproc/hs-uri-bytestring-aeson/Makefile b/textproc/hs-uri-bytestring-aeson/Makefile index a0da6bf48e64..5cb5141f869d 100644 --- a/textproc/hs-uri-bytestring-aeson/Makefile +++ b/textproc/hs-uri-bytestring-aeson/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uri-bytestring-aeson -PORTVERSION= 0.1.0.1 -PORTREVISION= 1 +PORTVERSION= 0.1.0.6 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= The uri-bytestring-aeson package LICENSE= BSD3CLAUSE -USE_CABAL= aeson text uri-bytestring +USE_CABAL= aeson uri-bytestring .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-uri-bytestring-aeson/distinfo b/textproc/hs-uri-bytestring-aeson/distinfo index 43e2944dbb99..f7346fcf4d6b 100644 --- a/textproc/hs-uri-bytestring-aeson/distinfo +++ b/textproc/hs-uri-bytestring-aeson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499703625 -SHA256 (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = ef42c3b276a061e3c262de0aea6237aa1aa38ec71038f71d75bb4a3d059525fe -SIZE (cabal/uri-bytestring-aeson-0.1.0.1.tar.gz) = 1987 +TIMESTAMP = 1525011968 +SHA256 (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = d8bd5f0772e8f45a7530b8b4422102ab24a896ac75611a3c36a02a56dffcef0a +SIZE (cabal/uri-bytestring-aeson-0.1.0.6.tar.gz) = 2003 diff --git a/textproc/hs-uri-bytestring/Makefile b/textproc/hs-uri-bytestring/Makefile index c195c20dbf1a..6414880d051e 100644 --- a/textproc/hs-uri-bytestring/Makefile +++ b/textproc/hs-uri-bytestring/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uri-bytestring -PORTVERSION= 0.2.3.3 -PORTREVISION= 1 +PORTVERSION= 0.3.1.1 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-uri-bytestring/distinfo b/textproc/hs-uri-bytestring/distinfo index 71f3e2baf1f5..d057dc82b946 100644 --- a/textproc/hs-uri-bytestring/distinfo +++ b/textproc/hs-uri-bytestring/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499621831 -SHA256 (cabal/uri-bytestring-0.2.3.3.tar.gz) = 3d838bf247e95a66885d2d603c1594ef01d4dade728aa50b6c2224a65d8d0b14 -SIZE (cabal/uri-bytestring-0.2.3.3.tar.gz) = 22514 +TIMESTAMP = 1524253203 +SHA256 (cabal/uri-bytestring-0.3.1.1.tar.gz) = 7f789452877d28799672c5bf9901fdcfdeaf4434d39a62849fd36cfc85e355fb +SIZE (cabal/uri-bytestring-0.3.1.1.tar.gz) = 22241 diff --git a/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal b/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal new file mode 100644 index 000000000000..2f8bf5512c2f --- /dev/null +++ b/textproc/hs-uri-bytestring/files/patch-uri-bytestring.cabal @@ -0,0 +1,10 @@ +--- uri-bytestring.cabal.orig 2018-04-20 19:43:36 UTC ++++ uri-bytestring.cabal +@@ -41,7 +41,6 @@ library + + attoparsec >= 0.13.1.0 && < 0.14 + , base >= 4.6 && < 5 +- , fail >= 4.9 && < 5 + , bytestring >= 0.9.1 && < 0.11 + , blaze-builder >= 0.3.0.0 && < 0.5 + , template-haskell >= 2.9 && < 2.14 diff --git a/textproc/hs-parsec/Makefile b/textproc/hs-uri-encode/Makefile index b37f1598ec83..d315090cbd4f 100644 --- a/textproc/hs-parsec/Makefile +++ b/textproc/hs-uri-encode/Makefile @@ -1,16 +1,15 @@ # $FreeBSD$ -PORTNAME= parsec -PORTVERSION= 3.1.11 -PORTREVISION= 1 +PORTNAME= uri-encode +PORTVERSION= 1.5.0.5 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org -COMMENT= Monadic parser combinators +COMMENT= URI encoding library LICENSE= BSD3CLAUSE -USE_CABAL= mtl text>=0.2 +USE_CABAL= network-uri utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-uri-encode/distinfo b/textproc/hs-uri-encode/distinfo new file mode 100644 index 000000000000..4212e969e867 --- /dev/null +++ b/textproc/hs-uri-encode/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1524855375 +SHA256 (cabal/uri-encode-1.5.0.5.tar.gz) = e82b588aad63112d34f6bad6f1ef72489b9edebfe14f2f523dc1dabdcbe2b186 +SIZE (cabal/uri-encode-1.5.0.5.tar.gz) = 3447 diff --git a/textproc/hs-uri-encode/pkg-descr b/textproc/hs-uri-encode/pkg-descr new file mode 100644 index 000000000000..c31db48b1905 --- /dev/null +++ b/textproc/hs-uri-encode/pkg-descr @@ -0,0 +1,3 @@ +Unicode aware uri-encoding. + +WWW: https://github.com/silkapp/uri-encode diff --git a/textproc/hs-uri/Makefile b/textproc/hs-uri/Makefile index ebf1fb8c67ee..095269b83600 100644 --- a/textproc/hs-uri/Makefile +++ b/textproc/hs-uri/Makefile @@ -2,7 +2,7 @@ PORTNAME= uri PORTVERSION= 0.1.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,7 @@ COMMENT= Library for working with URIs LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=3.0 safe utf8-string +USE_CABAL= safe utf8-string .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xml-conduit/Makefile b/textproc/hs-xml-conduit/Makefile index cb31e113178c..bc76287d5ca7 100644 --- a/textproc/hs-xml-conduit/Makefile +++ b/textproc/hs-xml-conduit/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xml-conduit -PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTVERSION= 1.8.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -13,7 +12,7 @@ LICENSE= MIT USE_CABAL= attoparsec>=0.10 blaze-builder>=0.2 blaze-html>=0.5 \ blaze-markup>=0.5 conduit>=1.0 conduit-extra>=1.1 \ data-default monad-control>=0.3 resourcet>=0.3 \ - text>=0.7 xml-types>=0.3.4 + xml-types>=0.3.4 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xml-conduit/distinfo b/textproc/hs-xml-conduit/distinfo index 0474c080371d..da5da32152d2 100644 --- a/textproc/hs-xml-conduit/distinfo +++ b/textproc/hs-xml-conduit/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546442 -SHA256 (cabal/xml-conduit-1.5.1.tar.gz) = 7afe26fa3e3160552b7a15af4a063f10678400cac54785a06ce9b70a5a5a9734 -SIZE (cabal/xml-conduit-1.5.1.tar.gz) = 37603 +TIMESTAMP = 1523899098 +SHA256 (cabal/xml-conduit-1.8.0.tar.gz) = 0382bfd3627be4970b11228948274faef51ca9a2590a7723b5787a7205a52036 +SIZE (cabal/xml-conduit-1.8.0.tar.gz) = 39469 diff --git a/textproc/hs-xml-hamlet/Makefile b/textproc/hs-xml-hamlet/Makefile index 39de69f686fa..c5c45d6d0c97 100644 --- a/textproc/hs-xml-hamlet/Makefile +++ b/textproc/hs-xml-hamlet/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xml-hamlet -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +9,7 @@ COMMENT= Hamlet-style quasiquoter for XML content LICENSE= BSD3CLAUSE -USE_CABAL= parsec>=2.0 shakespeare>=1.0 text>=0.10 xml-conduit>=1.0 +USE_CABAL= shakespeare>=1.0 xml-conduit>=1.0 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xml-hamlet/distinfo b/textproc/hs-xml-hamlet/distinfo index 6d415afdc903..5e91648bb30c 100644 --- a/textproc/hs-xml-hamlet/distinfo +++ b/textproc/hs-xml-hamlet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624842 -SHA256 (cabal/xml-hamlet-0.4.1.tar.gz) = 7df390f59599a0b16831c3f2cbb13ad0bebb92faa4a350fc6ae613bfba4ec2bb -SIZE (cabal/xml-hamlet-0.4.1.tar.gz) = 9149 +TIMESTAMP = 1524849871 +SHA256 (cabal/xml-hamlet-0.5.0.tar.gz) = 7bcec0aad83e72c2870efd3327553b3d78f6332cf01c12ad4b67c02f499015a3 +SIZE (cabal/xml-hamlet-0.5.0.tar.gz) = 9189 diff --git a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal b/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal deleted file mode 100644 index 019f91570df9..000000000000 --- a/textproc/hs-xml-hamlet/files/patch-xml-hamlet.cabal +++ /dev/null @@ -1,11 +0,0 @@ ---- xml-hamlet.cabal.orig 2017-07-10 13:36:43 UTC -+++ xml-hamlet.cabal -@@ -19,7 +19,7 @@ Library - - Build-depends: base >= 4 && < 5 - , shakespeare >= 1.0 && < 2.2 -- , xml-conduit >= 1.0 && < 1.5 -+ , xml-conduit >= 1.0 && < 1.6 - , text >= 0.10 - , template-haskell - , parsec >= 2.0 && < 3.2 diff --git a/textproc/hs-xml-types/Makefile b/textproc/hs-xml-types/Makefile index fbb26cc16989..4fe4b67b4179 100644 --- a/textproc/hs-xml-types/Makefile +++ b/textproc/hs-xml-types/Makefile @@ -2,7 +2,7 @@ PORTNAME= xml-types PORTVERSION= 0.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,7 +10,5 @@ COMMENT= Basic types for representing XML LICENSE= MIT -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xml/Makefile b/textproc/hs-xml/Makefile index 6722472f99b7..35a12316b799 100644 --- a/textproc/hs-xml/Makefile +++ b/textproc/hs-xml/Makefile @@ -3,7 +3,7 @@ PORTNAME= xml PORTVERSION= 1.3.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,7 +11,5 @@ COMMENT= Simple XML library for Haskell LICENSE= BSD3CLAUSE -USE_CABAL= text - .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xmlhtml/Makefile b/textproc/hs-xmlhtml/Makefile index b9056120e31c..9bd70396b842 100644 --- a/textproc/hs-xmlhtml/Makefile +++ b/textproc/hs-xmlhtml/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xmlhtml -PORTVERSION= 0.2.4 -PORTREVISION= 1 +PORTVERSION= 0.2.5.2 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -10,8 +9,7 @@ COMMENT= XML parser and renderer with HTML 5 quirks mode LICENSE= BSD3CLAUSE -USE_CABAL= blaze-builder blaze-html blaze-markup parsec text \ - unordered-containers +USE_CABAL= blaze-builder blaze-html blaze-markup unordered-containers .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-xmlhtml/distinfo b/textproc/hs-xmlhtml/distinfo index b04f611d4d0b..b159c775f81b 100644 --- a/textproc/hs-xmlhtml/distinfo +++ b/textproc/hs-xmlhtml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499624843 -SHA256 (cabal/xmlhtml-0.2.4.tar.gz) = 80100374fe10802e3c1435d22c9281b35421db72f716d90451adc277dfe4539c -SIZE (cabal/xmlhtml-0.2.4.tar.gz) = 121541 +TIMESTAMP = 1524404821 +SHA256 (cabal/xmlhtml-0.2.5.2.tar.gz) = 64818617644bfc7c3c9fe561435af9929ef60310627b0796c78b4b99240b5bdc +SIZE (cabal/xmlhtml-0.2.5.2.tar.gz) = 123829 diff --git a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs b/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs deleted file mode 100644 index cd84fb74b6a7..000000000000 --- a/textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs +++ /dev/null @@ -1,30 +0,0 @@ ---- src/Text/Blaze/Renderer/XmlHtml.hs.orig 2017-05-19 10:38:07 UTC -+++ src/Text/Blaze/Renderer/XmlHtml.hs -@@ -58,22 +58,20 @@ renderNodes = go [] - (Element (getText tag) attrs (go [] content []) :) - go attrs (CustomParent tag content) = - (Element (fromChoiceStringText tag) attrs (go [] content []) :) -- go attrs (Leaf tag _ _) = -+ go attrs (Leaf tag _ _ _) = - (Element (getText tag) attrs [] :) -- go attrs (CustomLeaf tag _) = -+ go attrs (CustomLeaf tag _ _) = - (Element (fromChoiceStringText tag) attrs [] :) - go attrs (AddAttribute key _ value content) = - go ((getText key, fromChoiceStringText value) : attrs) content - go attrs (AddCustomAttribute key value content) = - go ((fromChoiceStringText key, fromChoiceStringText value) : attrs) - content -- go _ (Content content) = fromChoiceString content --#if MIN_VERSION_blaze_markup(0,6,3) -- go _ (TBI.Comment comment) = -+ go _ (Content content _) = fromChoiceString content -+ go _ (TBI.Comment comment _) = - (X.Comment (fromChoiceStringText comment) :) --#endif - go attrs (Append h1 h2) = go attrs h1 . go attrs h2 -- go _ Empty = id -+ go _ (Empty _) = id - {-# NOINLINE go #-} - {-# INLINE renderNodes #-} - diff --git a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal index 4a675479e68e..73eb6bd5a8d2 100644 --- a/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal +++ b/textproc/hs-xmlhtml/files/patch-xmlhtml.cabal @@ -1,15 +1,10 @@ ---- xmlhtml.cabal.orig 2017-05-19 10:38:07 UTC +--- xmlhtml.cabal.orig 2018-04-22 13:51:05 UTC +++ xmlhtml.cabal -@@ -820,9 +820,9 @@ Library - Text.XmlHtml.HTML.Render - - Build-depends: base >= 4 && < 5, -- blaze-builder >= 0.2 && < 0.5, -- blaze-html >= 0.5 && < 0.9, -- blaze-markup >= 0.5 && < 0.8, -+ blaze-builder >= 0.2 , -+ blaze-html >= 0.5 , -+ blaze-markup >= 0.5 , +@@ -826,7 +826,6 @@ Library + blaze-html >= 0.9 && < 0.10, + blaze-markup >= 0.8 && < 0.9, bytestring >= 0.9 && < 0.11, +- bytestring-builder >= 0.10.4.0.2 && < 0.11, containers >= 0.3 && < 0.6, parsec >= 3.1.2 && < 3.2, + text >= 0.11 && < 1.3, diff --git a/textproc/hs-yaml/Makefile b/textproc/hs-yaml/Makefile index eed0d98fb747..63107efef475 100644 --- a/textproc/hs-yaml/Makefile +++ b/textproc/hs-yaml/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= yaml -PORTVERSION= 0.8.23.1 -PORTREVISION= 1 +PORTVERSION= 0.8.29 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org @@ -11,9 +10,7 @@ COMMENT= Support for parsing and rendering YAML documents LICENSE= BSD3CLAUSE USE_CABAL= aeson>=0.5 attoparsec conduit>=1.1.0 enclosed-exceptions \ - resourcet>=0.3 scientific text unordered-containers vector - -EXECUTABLE= json2yaml yaml2json + resourcet>=0.3 scientific unordered-containers vector .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include <bsd.port.mk> diff --git a/textproc/hs-yaml/distinfo b/textproc/hs-yaml/distinfo index d4b4133c7d1b..6729b43625e5 100644 --- a/textproc/hs-yaml/distinfo +++ b/textproc/hs-yaml/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1499546173 -SHA256 (cabal/yaml-0.8.23.1.tar.gz) = 4a9bc0b540b25db0edafea58e1c7fe5f00770bd599c9c94f16b92210bf0f606b -SIZE (cabal/yaml-0.8.23.1.tar.gz) = 81569 +TIMESTAMP = 1524402297 +SHA256 (cabal/yaml-0.8.29.tar.gz) = 1a5e5fe9d55273c286f177681c2cecb4cff77633af877756317120cc00d20f74 +SIZE (cabal/yaml-0.8.29.tar.gz) = 82660 |