* Upgrade to 1.11.

* Change knobs. GHC, NHC98 and HUGS are now auto-detected. If not already
  installed, define WITH_GHC, WITH_NHC98 resp. WITH_HUGS.
* Build package with WITH_GHC, WITH_NHC98, and WITH_HUGS defined.

3 files changed, 85 insertions, 114 deletions

diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile
index 121f32804263..46ea61fb8163 100644
--- a/textproc/hs-haxml/Makefile
+++ b/textproc/hs-haxml/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	haxml
-PORTVERSION=	1.09
-PORTREVISION=	2
+PORTVERSION=	1.11
 CATEGORIES=	textproc haskell
 MASTER_SITES=	http://www.haskell.org/HaXml/ \
 		ftp://ftp.cs.york.ac.uk/pub/haskell/HaXml/
@@ -16,55 +15,79 @@ DISTNAME=	HaXml-${PORTVERSION}
 MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	A collection of utilities for using Haskell and XML together
 
-.if !defined(WITHOUT_NHC98)
-BUILD_DEPENDS=	nhc98:${PORTSDIR}/lang/nhc98
-RUN_DEPENDS=	nhc98:${PORTSDIR}/lang/nhc98
-.endif
-.if !defined(WITHOUT_GHC)
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
-.endif
-
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-ALL_TARGET=	#empty
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/bin
 
-.if defined(WITHOUT_GHC)
-CONFIGURE_ARGS+=	--buildwith=nhc98
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/nhc98)
+WITH_NHC98=	yes
+.endif
+.if exists(${LOCALBASE}/bin/ghc)
+WITH_GHC=	yes
+.endif
+.if exists(${LOCALBASE}/bin/hugs)
+WITH_HUGS=	yes
+.endif
+
+.if defined(PACKAGE_BUILDING)
+WITH_NHC98=	yes
+WITH_GHC=	yes
+WITH_HUGS=	yes
+.endif
+
+.if defined(WITH_NHC98)
+BUILD_DEPENDS+=	nhc98:${PORTSDIR}/lang/nhc98
+RUN_DEPENDS=	nhc98:${PORTSDIR}/lang/nhc98
+.endif
+.if defined(WITH_GHC)
+BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 .endif
-.if defined(WITHOUT_NHC98)
-CONFIGURE_ARGS+=	--buildwith=ghc
+.if defined(WITH_HUGS)
+BUILD_DEPENDS+=	hugs:${PORTSDIR}/lang/hugs
+RUN_DEPENDS+=	hugs:${PORTSDIR}/lang/hugs
 .endif
 
-.if !defined(WITHOUT_NHC98)
+.if defined(WITH_NHC98)
 PLIST_SUB+=	NHC98=""
 .else
 PLIST_SUB+=	NHC98="@comment "
 .endif
-.if !defined(WITHOUT_GHC)
+.if defined(WITH_GHC)
 GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
 PLIST_SUB+=	GHC="" GHC_VERSION="${GHC_VERSION}"
 .else
 PLIST_SUB+=	GHC="@comment "
 .endif
+.if defined(WITH_HUGS)
+PLIST_SUB+=	HUGS=""
+.else
+PLIST_SUB+=	HUGS="@comment "
+.endif
 
 pre-everything::
 	@${ECHO_CMD} ""
-.if defined(WITHOUT_GHC) && defined(WITHOUT_NHC98)
-	@${ECHO_CMD} "Without everything?"
-	@${ECHO_CMD} ""
+.if defined(WITH_NHC98)
+	@${ECHO_CMD} " HaXml will be installed for nhc98."
+.else
+	@${ECHO_CMD} " Define WITH_NHC98 to install HaXml for nhc98."
+.endif
+.if defined(WITH_GHC)
+	@${ECHO_CMD} " HaXml will be installed for ghc."
+.else
+	@${ECHO_CMD} " Define WITH_GHC   to install HaXml for ghc."
+.endif
+.if defined(WITH_HUGS)
+	@${ECHO_CMD} " HaXml will be installed for hugs"
+.else
+	@${ECHO_CMD} " Define WITH_HUGS  to install HaXml for hugs"
+.endif
+.if !defined(WITH_GHC) && !defined(WITH_NHC98) && !defined(WITH_HUGS)
 	@${FALSE}
-.elif !defined(WITHOUT_GHC) && !defined(WITHOUT_NHC98)
-	@${ECHO_CMD} " HaXml will be installed for both nhc98 and ghc."
-	@${ECHO_CMD} " Define WITHOUT_GHC   to avoid installation for ghc."
-	@${ECHO_CMD} " Define WITHOUT_NHC98 to avoid installation for nhc98."
-.elif defined(WITHOUT_NHC98)
-	@${ECHO_CMD} " HaXml will be installed for ghc only."
-.elif defined(WITHOUT_GHC)
-	@${ECHO_CMD} " HaXml will be installed for nhc98 only."
 .endif
 	@${ECHO_CMD} ""
 
@@ -72,16 +95,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,/bin/false,/usr/bin/false,' ${WRKSRC}/configure
 
 post-install:
-.if !defined(WITHOUT_GHC)
+.if defined(WITH_GHC)
 	@${INSTALL_DATA} ${WRKSRC}/obj/ghc/pkg.conf \
 		${PREFIX}/lib/ghc-${GHC_VERSION}/imports/HaXml/
 	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 .endif
 .if !defined(NOPORTDOCS)
-	@${RM} -rf ${WRKSRC}/docs/CVS
-	@${RM} -rf ${WRKSRC}/docs/HaXml/CVS
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC} && ${CP} -R docs/* ${DOCSDIR})
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/hs-haxml/distinfo b/textproc/hs-haxml/distinfo
index 7694e94905ed..8f089dacb568 100644
--- a/textproc/hs-haxml/distinfo
+++ b/textproc/hs-haxml/distinfo
@@ -1 +1 @@
-MD5 (HaXml-1.09.tar.gz) = 552797144efccd6a1035572cc6078f4a
+MD5 (HaXml-1.11.tar.gz) = 66a3cca7ebb62a50f5f799f3bf633d28
diff --git a/textproc/hs-haxml/pkg-plist b/textproc/hs-haxml/pkg-plist
index 36aff216c8d8..ec4516aeb6c2 100644
--- a/textproc/hs-haxml/pkg-plist
+++ b/textproc/hs-haxml/pkg-plist
@@ -6,6 +6,7 @@ bin/Xtract
 %%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/Escape.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
@@ -27,6 +28,7 @@ bin/Xtract
 %%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/XML/HaXml/Combinators.hi
+%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Escape.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
@@ -46,86 +48,30 @@ bin/Xtract
 %%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
+%%HUGS%%lib/hugs/libraries/Text/ParserCombinators/HuttonMeijerWallace.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Combinators.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/DtdToHaskell/Convert.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/DtdToHaskell/Instance.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/DtdToHaskell/TypeDef.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Escape.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Haskell2Xml.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Html/Generate.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Html/Parse.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Html/Pretty.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Lex.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/OneOfN.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Parse.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Pretty.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Types.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Validate.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Verbatim.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Wrappers.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Xml2Haskell.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Xtract/Combinators.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Xtract/Lex.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml/Xtract/Parse.hs
+%%HUGS%%lib/hugs/libraries/Text/XML/HaXml.hs
 %%PORTDOCS%%%%DOCSDIR%%/Combinators.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.ParserCombinators.HuttonMeijerWallace.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.PrettyPrint.HughesPJ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Combinators.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.DtdToHaskell.Convert.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.DtdToHaskell.Instance.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.DtdToHaskell.TypeDef.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Haskell2Xml.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Html.Generate.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Html.Parse.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Html.Pretty.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Lex.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.OneOfN.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Parse.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Pretty.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Types.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Validate.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Verbatim.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Wrappers.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xml2Haskell.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xtract.Combinators.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xtract.Lex.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.Xtract.Parse.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.XML.HaXml.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tA.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tB.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tC.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tD.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tE.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tF.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tG.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tH.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tI.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tJ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tK.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tL.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tM.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tN.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tO.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tP.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tQ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tR.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tS.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tT.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tU.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tV.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tW.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tX.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tY.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-tZ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vA.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vB.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vC.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vD.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vE.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vF.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vG.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vH.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vI.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vJ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vK.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vL.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vM.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vN.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vO.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vP.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vQ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vR.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vS.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vT.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vU.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vV.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vW.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vX.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vY.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index-vZ.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/doc-index.html
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/haddock.css
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/haskell_icon.gif
-%%PORTDOCS%%%%DOCSDIR%%/HaXml/index.html
 %%PORTDOCS%%%%DOCSDIR%%/Haskell2Xml.html
 %%PORTDOCS%%%%DOCSDIR%%/Xml2Haskell.html
 %%PORTDOCS%%%%DOCSDIR%%/Xtract.html
@@ -150,7 +96,11 @@ bin/Xtract
 %%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 %%DOCSDIR%%/HaXml
+%%HUGS%%@dirrm lib/hugs/libraries/Text/XML/HaXml/DtdToHaskell
+%%HUGS%%@dirrm lib/hugs/libraries/Text/XML/HaXml/Html
+%%HUGS%%@dirrm lib/hugs/libraries/Text/XML/HaXml/Xtract
+%%HUGS%%@dirrm lib/hugs/libraries/Text/XML/HaXml
+%%HUGS%%@dirrm lib/hugs/libraries/Text/XML
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%GHC%%@exec %D/bin/ghc-pkg -a < %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/pkg.conf
 %%GHC%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old