From 6bac9909a409c0f1a6282aa9b074b471864e6a9f Mon Sep 17 00:00:00 2001 From: Gabor Pali Date: Mon, 30 Aug 2010 10:51:42 +0000 Subject: - Update to 8.5.4 --- textproc/hs-hxt/Makefile | 3 +-- textproc/hs-hxt/distinfo | 6 ++--- textproc/hs-hxt/files/patch-hxt.cabal | 9 ------- .../patch-src__Text__XML__HXT__Parser__TagSoup.hs | 31 ---------------------- textproc/hs-hxt/pkg-plist | 2 +- 5 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 textproc/hs-hxt/files/patch-hxt.cabal delete mode 100644 textproc/hs-hxt/files/patch-src__Text__XML__HXT__Parser__TagSoup.hs (limited to 'textproc/hs-hxt') diff --git a/textproc/hs-hxt/Makefile b/textproc/hs-hxt/Makefile index 0473e40dc8bf..d1e837220d97 100644 --- a/textproc/hs-hxt/Makefile +++ b/textproc/hs-hxt/Makefile @@ -6,8 +6,7 @@ # PORTNAME= hxt -PORTVERSION= 8.5.2 -PORTREVISION= 1 +PORTVERSION= 8.5.4 CATEGORIES= textproc haskell MAINTAINER= haskell@FreeBSD.org diff --git a/textproc/hs-hxt/distinfo b/textproc/hs-hxt/distinfo index dbd6ce037e49..916117ad9bd2 100644 --- a/textproc/hs-hxt/distinfo +++ b/textproc/hs-hxt/distinfo @@ -1,3 +1,3 @@ -MD5 (cabal/hxt-8.5.2.tar.gz) = 36dadba735972c3e3fe9ba92f5d918e7 -SHA256 (cabal/hxt-8.5.2.tar.gz) = 927f6b6b1861f83bb32c6f2895c8907355e28a6d807b3c1802515ef4f71fc234 -SIZE (cabal/hxt-8.5.2.tar.gz) = 251461 +MD5 (cabal/hxt-8.5.4.tar.gz) = 41833fb54fe376555510d97648a607b8 +SHA256 (cabal/hxt-8.5.4.tar.gz) = c888aaf740258a52d465859641b1794a4fc1940a87be55c34b4843bd18b891d9 +SIZE (cabal/hxt-8.5.4.tar.gz) = 256802 diff --git a/textproc/hs-hxt/files/patch-hxt.cabal b/textproc/hs-hxt/files/patch-hxt.cabal deleted file mode 100644 index 242be88b609b..000000000000 --- a/textproc/hs-hxt/files/patch-hxt.cabal +++ /dev/null @@ -1,9 +0,0 @@ ---- ./hxt.cabal.orig 2010-03-15 13:38:37.000000000 +0100 -+++ ./hxt.cabal 2010-06-07 05:17:35.000000000 +0200 -@@ -173,5 +173,5 @@ - network >= 2.1 && < 3, - deepseq >= 1.1 && < 2, - bytestring >= 0.9 && < 1, -- tagsoup >= 0.8 && < 0.9, -+ tagsoup, - curl >= 1.3 && < 2 diff --git a/textproc/hs-hxt/files/patch-src__Text__XML__HXT__Parser__TagSoup.hs b/textproc/hs-hxt/files/patch-src__Text__XML__HXT__Parser__TagSoup.hs deleted file mode 100644 index cdd4e43dedd7..000000000000 --- a/textproc/hs-hxt/files/patch-src__Text__XML__HXT__Parser__TagSoup.hs +++ /dev/null @@ -1,31 +0,0 @@ ---- ./src/Text/XML/HXT/Parser/TagSoup.hs.orig 2010-03-15 13:38:36.000000000 +0100 -+++ ./src/Text/XML/HXT/Parser/TagSoup.hs 2010-06-07 05:27:36.000000000 +0200 -@@ -240,8 +240,8 @@ - - -- own entity lookup to prevent problems with & and tagsoup hack for IE - --lookupEntity :: Bool -> Bool -> String -> Tags --lookupEntity withWarnings _asHtml e0@('#':e) -+lookupEntity :: Bool -> Bool -> (String, Bool) -> Tags -+lookupEntity withWarnings _asHtml (e0@('#':e), b) - = case lookupNumericEntity e of - Just c -> [ TagText [c] ] - Nothing -> ( TagText $ "&" ++ e0 ++ ";") : -@@ -249,7 +249,7 @@ - then [TagWarning $ "illegal char reference: &" ++ e ++ ";"] - else [] - --lookupEntity withWarnings asHtml e -+lookupEntity withWarnings asHtml (e, b) - = case (lookup e entities) of - Just x -> [TagText [toEnum x]] - Nothing -> (TagText $ "&" ++ e ++ ";") : -@@ -266,7 +266,7 @@ - | null r = (s, r) - | otherwise = ("&" ++ s ++ [';'|b], r) - where -- (TagText s) : r = lookupEntity withWarnings asHtml e -+ (TagText s) : r = lookupEntity withWarnings asHtml (e, b) - - -- ---------------------------------------- - {- diff --git a/textproc/hs-hxt/pkg-plist b/textproc/hs-hxt/pkg-plist index 506b37e398b9..beda42286c11 100644 --- a/textproc/hs-hxt/pkg-plist +++ b/textproc/hs-hxt/pkg-plist @@ -93,7 +93,7 @@ %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a %%LIBDIR_REL%%/register.sh -%%NOPORTDOCS%%%%DOCSDIR%%/LICENCE +%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE %%NOPORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/XmlSchema @dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HXT/RelaxNG/Unicode -- cgit v1.2.3