ports/137090: [patch]: update of textproc/hs-haxml from the 1.19.6 version to the 1.19.7 version
Jacula Modyun
jacula at gmail.com
Fri Jul 24 18:40:03 UTC 2009
>Number: 137090
>Category: ports
>Synopsis: [patch]: update of textproc/hs-haxml from the 1.19.6 version to the 1.19.7 version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 24 18:40:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Jacula Modyun
>Release: FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root at splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386
>Description:
See the PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137055
>How-To-Repeat:
>Fix:
--- patch-hs-haxml.diff begins here ---
diff -uNr hs-haxml.orig/Makefile hs-haxml/Makefile
--- hs-haxml.orig/Makefile 2009-02-12 19:20:43.000000000 +0000
+++ hs-haxml/Makefile 2009-07-22 06:26:35.000000000 +0000
@@ -5,7 +5,7 @@
# $FreeBSD: ports/textproc/hs-haxml/Makefile,v 1.41 2009/02/12 19:20:43 pgj Exp $
PORTNAME= haxml
-PORTVERSION= 1.19.6
+PORTVERSION= 1.19.7
CATEGORIES= textproc haskell
MASTER_SITES= http://hackage.haskell.org/packages/archive/HaXml/${PORTVERSION}/
PKGNAMEPREFIX= hs-
@@ -18,38 +18,66 @@
hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc
RUN_DEPENDS= ghc>=6.8:${PORTSDIR}/lang/ghc \
hs-polyparse-ghc>=1.1:${PORTSDIR}/textproc/hs-polyparse-ghc
+LIB_DEPENDS= gmp.8:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS= --ghc --prefix=${PREFIX}
+GHC_VERSION= 6.10.4
+HAXML_VERSION= ${PORTVERSION}
-GHC_VERSION= 6.8.3
-PLIST_SUB+= GHC_VERSION=${GHC_VERSION} \
- HAXMLDIR=lib/HaXml-${PORTVERSION} \
- GHCDIR=ghc-${GHC_VERSION} \
- SUBDIR=lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION} \
- PORTVERSION=${PORTVERSION}
-DOCSDIR= ${PREFIX}/share/doc/HaXml-${PORTVERSION}
-PORTDOCS= *
+GHC_CMD= ${LOCALBASE}/bin/ghc
+SETUP_CMD= ./setup
-.if !defined(NOPORTDOCS)
-PLIST_SUB+= RMLIC="@comment "
+DOCSDIR= ${PREFIX}/share/doc/${DISTNAME}
+HAXML_LIBDIR_REL= lib/${DISTNAME}
+
+PLIST_SUB= GHC_VERSION=${GHC_VERSION} \
+ HAXML_VERSION=${HAXML_VERSION} \
+ HAXML_LIBDIR_REL=${HAXML_LIBDIR_REL}
+
+.if defined(NOPORTDOCS)
+PLIST_SUB+= NOPORTDOCS=""
.else
-PLIST_SUB+= RMLIC=""
+PLIST_SUB+= NOPORTDOCS="@comment "
.endif
+.if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!= (cd ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
+BUILD_DEPENDS+= haddock:${PORTSDIR}/devel/hs-haddock
+.endif
+BUILD_DEPENDS+= HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION= 1.13
+HSCOLOUR_DATADIR= ${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS= *
+.endif
+
+PYSHARE= ${SH} -c '(${FIND} -d $$0 $$2)'
+
+.SILENT:
+
do-configure:
- @cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs configure ${CONFIGURE_ARGS}
+ cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+ && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
do-build:
- @cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs build
+ cd ${WRKSRC} && ${SETUP_CMD} build \
+ && ${SETUP_CMD} register --gen-script
-do-install:
- @cd ${WRKSRC} && ${LOCALBASE}/bin/runhaskell Setup.hs install
+.if !defined(NOPORTDOCS)
+ cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+ --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
+.endif
-post-install:
- @${INSTALL_DATA} ${WRKSRC}/dist/installed-pkg-config ${PREFIX}/lib/HaXml-${PORTVERSION}/ghc-${GHC_VERSION}/HaXml.pkgconf
+do-install:
+ cd ${WRKSRC} && ${SETUP_CMD} install \
+ && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HAXML_LIBDIR_REL}/register.sh
.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC} && ${CP} -R docs/ ${DOCSDIR})
+ cd ${WRKSRC}/docs && ${COPYTREE_SHARE} \* ${DOCSDIR} " -not -regex HaXml.* "
.endif
+post-install:
+ ${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
+
.include <bsd.port.mk>
diff -uNr hs-haxml.orig/distinfo hs-haxml/distinfo
--- hs-haxml.orig/distinfo 2009-02-12 19:20:43.000000000 +0000
+++ hs-haxml/distinfo 2009-07-14 09:45:50.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (HaXml-1.19.6.tar.gz) = 7715780943dd3df6f19a7200783bc4cf
-SHA256 (HaXml-1.19.6.tar.gz) = a0311682502666f36cb7f276c684b1547678dda10c5c450bd428bddc6bb5cdbe
-SIZE (HaXml-1.19.6.tar.gz) = 630102
+MD5 (HaXml-1.19.7.tar.gz) = be31052aeeb4c6d509d6b6071f619242
+SHA256 (HaXml-1.19.7.tar.gz) = 3968bc9da06c4465bf6d63100245fc0d688f7646216b9380c90b970cb2890290
+SIZE (HaXml-1.19.7.tar.gz) = 630148
diff -uNr hs-haxml.orig/files/patch-HaXml.cabal hs-haxml/files/patch-HaXml.cabal
--- hs-haxml.orig/files/patch-HaXml.cabal 1970-01-01 00:00:00.000000000 +0000
+++ hs-haxml/files/patch-HaXml.cabal 2009-07-14 10:02:34.000000000 +0000
@@ -0,0 +1,11 @@
+--- HaXml.cabal.orig 2009-07-14 10:01:24.000000000 +0000
++++ HaXml.cabal 2009-07-14 10:02:19.000000000 +0000
+@@ -52,7 +52,7 @@
+ Text.XML.HaXml.Xtract.Lex,
+ Text.XML.HaXml.Xtract.Parse
+ hs-source-dirs: src
+- build-depends: base, haskell98, polyparse==1.2, filepath
++ build-depends: base, haskell98, polyparse >=1.2, filepath
+ if flag(splitBase)
+ build-depends: base >= 3, pretty, random, containers
+ else
diff -uNr hs-haxml.orig/pkg-descr hs-haxml/pkg-descr
--- hs-haxml.orig/pkg-descr 2004-05-29 14:18:17.000000000 +0000
+++ hs-haxml/pkg-descr 2009-07-14 10:00:00.000000000 +0000
@@ -2,4 +2,24 @@
includes a parser for XML, a separate error-correcting parser for HTML, and
pretty-printers for XML and HTML.
-WWW: http://www.haskell.org/HaXml/
+Author: Malcolm Wallace <Malcolm.Wallace at cs.york.ac.uk>
+Maintainer: author
+license: LGPL
+URL: http://www.cs.york.ac.uk/fp/HaXml/
+WWW: http://www.haskell.org/HaXml/
+
+exposed-modules: Text.XML.HaXml Text.XML.HaXml.ByteStringPP
+ Text.XML.HaXml.Combinators Text.XML.HaXml.DtdToHaskell.Convert
+ Text.XML.HaXml.DtdToHaskell.Instance
+ Text.XML.HaXml.DtdToHaskell.TypeDef Text.XML.HaXml.Escape
+ Text.XML.HaXml.Html.Generate Text.XML.HaXml.Html.Parse
+ Text.XML.HaXml.Html.ParseLazy Text.XML.HaXml.Html.Pretty
+ Text.XML.HaXml.Lex Text.XML.HaXml.OneOfN Text.XML.HaXml.Parse
+ Text.XML.HaXml.ParseLazy Text.XML.HaXml.Posn Text.XML.HaXml.Pretty
+ Text.XML.HaXml.SAX Text.XML.HaXml.ShowXmlLazy Text.XML.HaXml.Types
+ Text.XML.HaXml.TypeMapping Text.XML.HaXml.Util
+ Text.XML.HaXml.Validate Text.XML.HaXml.Verbatim
+ Text.XML.HaXml.Wrappers Text.XML.HaXml.XmlContent
+ Text.XML.HaXml.XmlContent.Parser Text.XML.HaXml.XmlContent.Haskell
+ Text.XML.HaXml.Xtract.Combinators Text.XML.HaXml.Xtract.Lex
+ Text.XML.HaXml.Xtract.Parse
diff -uNr hs-haxml.orig/pkg-plist hs-haxml/pkg-plist
--- hs-haxml.orig/pkg-plist 2009-02-12 19:20:43.000000000 +0000
+++ hs-haxml/pkg-plist 2009-07-14 13:42:36.000000000 +0000
@@ -5,52 +5,52 @@
bin/Validate
bin/Xtract
bin/XtractLazy
-%%SUBDIR%%/HaXml.pkgconf
-%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
-%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
-%%SUBDIR%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
-%%SUBDIR%%/Text/XML/HaXml/Html/Generate.hi
-%%SUBDIR%%/Text/XML/HaXml/Html/Parse.hi
-%%SUBDIR%%/Text/XML/HaXml/Html/ParseLazy.hi
-%%SUBDIR%%/Text/XML/HaXml/Html/Pretty.hi
-%%SUBDIR%%/Text/XML/HaXml/XmlContent/Parser.hi
-%%SUBDIR%%/Text/XML/HaXml/XmlContent/Haskell.hi
-%%SUBDIR%%/Text/XML/HaXml/Xtract/Combinators.hi
-%%SUBDIR%%/Text/XML/HaXml/Xtract/Lex.hi
-%%SUBDIR%%/Text/XML/HaXml/Xtract/Parse.hi
-%%SUBDIR%%/Text/XML/HaXml/ByteStringPP.hi
-%%SUBDIR%%/Text/XML/HaXml/Combinators.hi
-%%SUBDIR%%/Text/XML/HaXml/Escape.hi
-%%SUBDIR%%/Text/XML/HaXml/Lex.hi
-%%SUBDIR%%/Text/XML/HaXml/OneOfN.hi
-%%SUBDIR%%/Text/XML/HaXml/Parse.hi
-%%SUBDIR%%/Text/XML/HaXml/ParseLazy.hi
-%%SUBDIR%%/Text/XML/HaXml/Posn.hi
-%%SUBDIR%%/Text/XML/HaXml/Pretty.hi
-%%SUBDIR%%/Text/XML/HaXml/SAX.hi
-%%SUBDIR%%/Text/XML/HaXml/ShowXmlLazy.hi
-%%SUBDIR%%/Text/XML/HaXml/TypeMapping.hi
-%%SUBDIR%%/Text/XML/HaXml/Types.hi
-%%SUBDIR%%/Text/XML/HaXml/Util.hi
-%%SUBDIR%%/Text/XML/HaXml/Validate.hi
-%%SUBDIR%%/Text/XML/HaXml/Verbatim.hi
-%%SUBDIR%%/Text/XML/HaXml/Wrappers.hi
-%%SUBDIR%%/Text/XML/HaXml/XmlContent.hi
-%%SUBDIR%%/Text/XML/HaXml.hi
-%%SUBDIR%%/HSHaXml-%%PORTVERSION%%.o
-%%SUBDIR%%/libHSHaXml-%%PORTVERSION%%.a
- at dirrm %%SUBDIR%%/Text/XML/HaXml/DtdToHaskell
- at dirrm %%SUBDIR%%/Text/XML/HaXml/Html
- at dirrm %%SUBDIR%%/Text/XML/HaXml/XmlContent
- at dirrm %%SUBDIR%%/Text/XML/HaXml/Xtract
- at dirrm %%SUBDIR%%/Text/XML/HaXml
- at dirrmtry %%SUBDIR%%/Text/XML
- at dirrmtry %%SUBDIR%%/Text
- at dirrm %%HAXMLDIR%%/%%GHCDIR%%
- at dirrm %%HAXMLDIR%%
-%%RMLIC%%%%DOCSDIR%%/COPYRIGHT
-%%RMLIC%%@dirrm %%DOCSDIR%%
- at exec ghc-pkg register %D/%%SUBDIR%%/HaXml.pkgconf
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHaXml-%%HAXML_VERSION%%.o
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ByteStringPP.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Combinators.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Convert.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/Instance.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Escape.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Generate.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Parse.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/ParseLazy.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html/Pretty.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Lex.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/OneOfN.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Parse.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ParseLazy.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Posn.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Pretty.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/SAX.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/ShowXmlLazy.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/TypeMapping.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Types.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Util.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Validate.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Verbatim.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Wrappers.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Haskell.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent/Parser.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Combinators.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Lex.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract/Parse.hi
+%%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHaXml-%%HAXML_VERSION%%.a
+%%HAXML_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Xtract
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/XmlContent
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/Html
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml/DtdToHaskell
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML/HaXml
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text/XML
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Text
+ at dirrm %%HAXML_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+ at dirrm %%HAXML_LIBDIR_REL%%
+ at exec /bin/sh %D/%%HAXML_LIBDIR_REL%%/register.sh
@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
- at unexec ghc-pkg unregister HaXml
+ at unexec %D/bin/ghc-pkg unregister HaXml
@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-haxml.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list