Date: Wed, 14 Aug 2002 19:36:40 +0200 (CEST) From: Oliver Braun <obraun@informatik.unibw-muenchen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/41667: [MAINTAINER UPDATE] Update port: textproc/haxml -> 1.07 Message-ID: <20020814173640.80E29179@unsane.de>
next in thread | raw e-mail | index | archive | help
>Number: 41667
>Category: ports
>Synopsis: [MAINTAINER UPDATE] Update port: textproc/haxml -> 1.07
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 14 10:40:03 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Oliver Braun
>Release: FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD galore.unsane.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Tue Aug 13 10:13:56 CEST 2002 root@galore.unsane.de:/usr/obj/usr/src/sys/GALORE_OB i386
>Description:
Update textproc/haxml from 1.05 to 1.07.
Committer: the updated port should not work until lang/nhc98 was updated to
1.14a, i.e. PR ports/41629 has been committed. To build with WITHOUT_NHC98
defined, hmake has to be updated to 3.06, i.e. PR ports/41574 has been
committed or lang/nhc98 has to be installed.
So, please commit PR ports/41629 (nhc98) first and then this PR. IMO we do not
have to wait for PR ports/41574, since building textproc/haxml without nhc98
will be the exception resp. the build works if lang/nhc98 is installed anyway
(it includes hmake 3.06).
Regards,
Olli
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/haxml/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile 2002/06/04 23:05:39 1.1
+++ Makefile 2002/08/14 17:28:02
@@ -5,21 +5,71 @@
# $FreeBSD: ports/textproc/haxml/Makefile,v 1.1 2002/06/04 23:05:39 petef Exp $
PORTNAME= haxml
-PORTVERSION= 1.05
+PORTVERSION= 1.07
CATEGORIES= textproc
-MASTER_SITES= ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
+MASTER_SITES= http://www.haskell.org/HaXml/ \
+ ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
DISTNAME= HaXml-${PORTVERSION}
MAINTAINER= obraun@informatik.unibw-muenchen.de
+.if !defined(WITHOUT_NHC98)
BUILD_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
+RUN_DEPENDS= nhc98:${PORTSDIR}/lang/nhc98
+.else
+WITH_GHC= yes
+BUILD_DEPENDS= hmake:${PORTSDIR}/devel/hmake
+.endif
+.if defined(WITH_GHC)
+BUILD_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+= ghc:${PORTSDIR}/lang/ghc
+.endif
+HAS_CONFIGURE= yes
USE_GMAKE= yes
+ALL_TARGET= #empty
-do-install:
- @(cd ${WRKSRC} && ${INSTALL_PROGRAM} Canonicalise DrIFT DtdToHaskell Xtract ${PREFIX}/bin)
- @${MKDIR} ${PREFIX}/lib/haxml
- ${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/lib/haxml
+CONFIGURE_ARGS+= --prefix=${PREFIX}
+
+.if !defined(WITHOUT_NHC98) && !defined(WITH_GHC)
+CONFIGURE_ARGS+= --buildwith=nhc98
+.elif defined(WITHOUT_NHC98)
+CONFIGURE_ARGS+= --buildwith=ghc
+.endif
+
+.if !defined(WITHOUT_NHC98)
+PLIST_SUB+= NHC98=""
+.else
+PLIST_SUB+= NHC98="@comment "
+.endif
+.if defined(WITH_GHC)
+GHC_VERSION= `${PREFIX}/bin/ghc --version 2>&1 | \
+ ${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'`
+PLIST_SUB+= GHC="" GHC_VERSION="${GHC_VERSION}"
+.else
+PLIST_SUB+= GHC="@comment "
+.endif
+
+pre-everything:
+ @${ECHO_CMD} ""
+.if defined(WITH_GHC) && !defined(WITHOUT_NHC98)
+ @${ECHO_CMD} " HaXml will be installed for both nhc98 and ghc.
+.elif defined(WITHOUT_NHC98)
+ @${ECHO_CMD} " HaXml will be installed for ghc only."
+.else
+ @${ECHO_CMD} " HaXml will be installed for nhc98 only."
+ @${ECHO_CMD} " Define WITH_GHC to install for ghc, too."
+ @${ECHO_CMD} " Define WITHOUT_NHC98 to install for ghc only."
+.endif
+ @${ECHO_CMD} ""
+
+post-install:
+.if defined(WITH_GHC)
+ @${INSTALL_DATA} ${WRKSRC}/obj/ghc/pkg.conf \
+ ${PREFIX}/lib/ghc-${GHC_VERSION}/imports/HaXml/
+.endif
+ @(cd ${WRKSRC} && ${INSTALL_PROGRAM} \
+ Canonicalise DtdToHaskell MkOneOf Validate Xtract ${PREFIX}/bin)
.if !defined(NOPORTDOCS)
@${RM} -rf ${WRKSRC}/docs/CVS
@${MKDIR} ${DOCSDIR}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/haxml/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 2002/06/04 23:05:39 1.1
+++ distinfo 2002/08/14 17:28:02
@@ -1 +1 @@
-MD5 (HaXml-1.05.tar.gz) = 0b9e3ecb0dd257682822c2ddc57fa0de
+MD5 (HaXml-1.07.tar.gz) = 9efa0f2c6160fb957ec9777ff12fd9b4
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/textproc/haxml/pkg-descr,v
retrieving revision 1.1
diff -u -r1.1 pkg-descr
--- pkg-descr 2002/06/04 23:05:39 1.1
+++ pkg-descr 2002/08/14 17:28:02
@@ -2,7 +2,7 @@
includes a parser for XML, a separate error-correcting parser for HTML, and
pretty-printers for XML and HTML.
-WWW: http://www.cs.york.ac.uk/fp/HaXml/
+WWW: http://www.haskell.org/HaXml/
-- Oliver Braun
obraun@informatik.unibw-muenchen.de
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/haxml/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist 2002/06/04 23:05:39 1.1
+++ pkg-plist 2002/08/14 17:28:03
@@ -1,55 +1,154 @@
bin/Canonicalise
-bin/DrIFT
bin/DtdToHaskell
+bin/MkOneOf
+bin/Validate
bin/Xtract
-lib/haxml/ExitFailure.hs
-lib/haxml/Haskell2Xml.hi
-lib/haxml/Haskell2Xml.hs
-lib/haxml/Haskell2Xml.o
-lib/haxml/ParseSTLib.hi
-lib/haxml/ParseSTLib.hs
-lib/haxml/ParseSTLib.o
-lib/haxml/Pretty.hi
-lib/haxml/Pretty.lhs
-lib/haxml/Pretty.o
-lib/haxml/SymTab.hs
-lib/haxml/Xml2Haskell.hi
-lib/haxml/Xml2Haskell.hs
-lib/haxml/Xml2Haskell.o
-lib/haxml/XmlCombinators.hi
-lib/haxml/XmlCombinators.hs
-lib/haxml/XmlCombinators.o
-lib/haxml/XmlHtmlGen.hi
-lib/haxml/XmlHtmlGen.hs
-lib/haxml/XmlHtmlGen.o
-lib/haxml/XmlHtmlPP.hs
-lib/haxml/XmlHtmlParse.hi
-lib/haxml/XmlHtmlParse.hs
-lib/haxml/XmlHtmlParse.o
-lib/haxml/XmlLex.hi
-lib/haxml/XmlLex.hs
-lib/haxml/XmlLex.o
-lib/haxml/XmlLib.hi
-lib/haxml/XmlLib.hs
-lib/haxml/XmlLib.o
-lib/haxml/XmlPP.hi
-lib/haxml/XmlPP.hs
-lib/haxml/XmlPP.o
-lib/haxml/XmlParse.hi
-lib/haxml/XmlParse.hs
-lib/haxml/XmlParse.o
-lib/haxml/XmlTypes.hi
-lib/haxml/XmlTypes.hs
-lib/haxml/XmlTypes.o
-%%PORTDOCS%%share/doc/haxml/HaXml.ps.gz
+%%NHC98%%include/nhc98/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
+%%NHC98%%include/nhc98/HaXml/Text/PrettyPrint/HughesPJ.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Combinators.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Haskell2Xml.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Html/Generate.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Html/Parse.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Lex.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/OneOfN.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Parse.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Pretty.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Types.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Validate.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Wrappers.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Xml2Haskell.hi
+%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml.hi
+%%NHC98%%lib/nhc98/ix86-FreeBSD/libHSHaXml.a
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/pkg.conf
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/PrettyPrint/HughesPJ.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Combinators.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell/Convert.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell/Instance.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell/TypeDef.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Haskell2Xml.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Generate.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Parse.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Lex.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/OneOfN.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Parse.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Pretty.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Types.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Validate.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Wrappers.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xml2Haskell.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Lex.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Parse.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/HSHaXml.o
+%%GHC%%lib/ghc-%%GHC_VERSION%%/libHSHaXml.a
+%%PORTDOCS%%share/doc/haxml/Combinators.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.ParserCombinators.HuttonMeijerWallace.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.PrettyPrint.HughesPJ.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Combinators.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.Convert.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.Instance.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.DtdToHaskell.TypeDef.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Haskell2Xml.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Generate.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Parse.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Html.Pretty.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Lex.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.OneOfN.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Parse.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Pretty.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Types.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Validate.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Wrappers.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xml2Haskell.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Combinators.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Lex.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.Xtract.Parse.html
+%%PORTDOCS%%share/doc/haxml/HaXml/Text.XML.HaXml.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tA.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tB.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tC.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tD.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tE.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tF.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tG.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tH.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tI.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tJ.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tK.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tL.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tM.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tN.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tO.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tP.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tQ.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tR.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tS.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tT.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tU.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tV.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tW.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tX.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tY.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-tZ.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vA.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vB.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vC.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vD.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vE.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vF.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vG.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vH.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vI.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vJ.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vK.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vL.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vM.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vN.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vO.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vP.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vQ.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vR.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vS.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vT.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vU.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vV.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vW.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vX.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vY.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index-vZ.html
+%%PORTDOCS%%share/doc/haxml/HaXml/doc-index.html
+%%PORTDOCS%%share/doc/haxml/HaXml/haddock.css
+%%PORTDOCS%%share/doc/haxml/HaXml/haskell_icon.gif
+%%PORTDOCS%%share/doc/haxml/HaXml/index.html
%%PORTDOCS%%share/doc/haxml/Haskell2Xml.html
+%%PORTDOCS%%share/doc/haxml/LICENSE
%%PORTDOCS%%share/doc/haxml/Xml2Haskell.html
-%%PORTDOCS%%share/doc/haxml/XmlLib.html
%%PORTDOCS%%share/doc/haxml/Xtract.html
%%PORTDOCS%%share/doc/haxml/brubeck.gif
+%%PORTDOCS%%share/doc/haxml/changelog.html
%%PORTDOCS%%share/doc/haxml/icfp99.dvi
%%PORTDOCS%%share/doc/haxml/icfp99.html
%%PORTDOCS%%share/doc/haxml/icfp99.ps.gz
%%PORTDOCS%%share/doc/haxml/index.html
-@dirrm lib/haxml
+%%NHC98%%@dirrm include/nhc98/HaXml/Text/ParserCombinators
+%%NHC98%%@dirrm include/nhc98/HaXml/Text/PrettyPrint
+%%NHC98%%@dirrm include/nhc98/HaXml/Text/XML/HaXml/Html
+%%NHC98%%@dirrm include/nhc98/HaXml/Text/XML/HaXml
+%%NHC98%%@dirrm include/nhc98/HaXml/Text/XML
+%%NHC98%%@dirrm include/nhc98/HaXml/Text
+%%NHC98%%@dirrm include/nhc98/HaXml
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/PrettyPrint
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/DtdToHaskell
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text
+%%GHC%%@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml
+%%PORTDOCS%%@dirrm share/doc/haxml/HaXml
%%PORTDOCS%%@dirrm share/doc/haxml
+%%GHC%%@exec %D/bin/ghc-pkg -a < %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/pkg.conf
+%%GHC%%@unexec %D/bin/ghc-pkg -r HaXml
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020814173640.80E29179>