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/hs-xmlhtml | |
| parent | Rename net/bird-devel to net/bird2 (diff) | |
Update lang/ghc 8.4.2 and the hs-* ports the newer versions
* Update lang/ghc to 8.4.2
* Update the boostrap compiler to 8.4.1
* Update the many hs-* ports
* Bump the rest
Thanks a lot to arrowd for doing all the heavy lifting :)
PR: 227968
Exp-run by: antoine
Submitted by: arrowd
Differential Revision: https://reviews.freebsd.org/D15005
Notes
Notes:
svn path=/head/; revision=470870
Diffstat (limited to 'textproc/hs-xmlhtml')
| -rw-r--r-- | textproc/hs-xmlhtml/Makefile | 6 | ||||
| -rw-r--r-- | textproc/hs-xmlhtml/distinfo | 6 | ||||
| -rw-r--r-- | textproc/hs-xmlhtml/files/patch-src_Text_Blaze_Renderer_XmlHtml.hs | 30 | ||||
| -rw-r--r-- | textproc/hs-xmlhtml/files/patch-xmlhtml.cabal | 17 |
4 files changed, 11 insertions, 48 deletions
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, |