2 files changed, 4 insertions, 47 deletions

diff --git a/textproc/hs-haxml/Makefile b/textproc/hs-haxml/Makefile
index 14408da0bdb3..93f26120554b 100644
--- a/textproc/hs-haxml/Makefile
+++ b/textproc/hs-haxml/Makefile
@@ -29,13 +29,9 @@ WITH_NHC98=	yes
 .if exists(${LOCALBASE}/bin/ghc)
 WITH_GHC=	yes
 .endif
-.if exists(${LOCALBASE}/bin/hugs)
-WITH_HUGS=	yes
-.endif
 
 .if defined(PACKAGE_BUILDING)
 WITH_GHC=	yes
-#WITH_HUGS=	yes
 .endif
 
 .if defined(WITH_NHC98)
@@ -46,10 +42,6 @@ RUN_DEPENDS=	nhc98:${PORTSDIR}/lang/nhc98
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 .endif
-.if defined(WITH_HUGS)
-BUILD_DEPENDS+=	hugs:${PORTSDIR}/lang/hugs
-RUN_DEPENDS+=	hugs:${PORTSDIR}/lang/hugs
-.endif
 
 .if defined(WITH_NHC98)
 PLIST_SUB+=	NHC98=""
@@ -62,11 +54,6 @@ 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} ""
@@ -80,12 +67,7 @@ pre-everything::
 .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)
+.if !defined(WITH_GHC) && !defined(WITH_NHC98)
 	@${FALSE}
 .endif
 	@${ECHO_CMD} ""
@@ -93,6 +75,9 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's,/bin/false,/usr/bin/false,' ${WRKSRC}/configure
 
+post-configure:
+	@${REINPLACE_CMD} -e '/hugs/d' ${WRKSRC}/obj/compilers
+
 post-install:
 .if defined(WITH_GHC)
 	@${INSTALL_DATA} ${WRKSRC}/obj/ghc/HaXml.pkgconf \
diff --git a/textproc/hs-haxml/pkg-plist b/textproc/hs-haxml/pkg-plist
index f345282da8b7..4a81d81dbfa3 100644
--- a/textproc/hs-haxml/pkg-plist
+++ b/textproc/hs-haxml/pkg-plist
@@ -48,29 +48,6 @@ 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
@@ -176,11 +153,6 @@ 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
-%%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%%/HaXml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%GHC%%@exec %D/bin/ghc-pkg register %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/HaXml.pkgconf