2 files changed, 40 insertions, 116 deletions

diff --git a/textproc/hs-HaXml/Makefile b/textproc/hs-HaXml/Makefile
index 93f26120554b..a96bcdbb3104 100644
--- a/textproc/hs-HaXml/Makefile
+++ b/textproc/hs-HaXml/Makefile
@@ -15,79 +15,33 @@ DISTNAME=	HaXml-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A collection of utilities for using Haskell and XML together
 
+BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}/bin
 
-.include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/nhc98)
-WITH_NHC98=	yes
-.endif
-.if exists(${LOCALBASE}/bin/ghc)
-WITH_GHC=	yes
-.endif
-
-.if defined(PACKAGE_BUILDING)
-WITH_GHC=	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(WITH_NHC98)
-PLIST_SUB+=	NHC98=""
-.else
-PLIST_SUB+=	NHC98="@comment "
-.endif
-.if defined(WITH_GHC)
 GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
-PLIST_SUB+=	GHC="" GHC_VERSION="${GHC_VERSION}"
-.else
-PLIST_SUB+=	GHC="@comment "
-.endif
-
-pre-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_GHC) && !defined(WITH_NHC98)
-	@${FALSE}
-.endif
-	@${ECHO_CMD} ""
+PLIST_SUB+=	GHC_VERSION="${GHC_VERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/bin/false,/usr/bin/false,' ${WRKSRC}/configure
 
 post-configure:
 	@${REINPLACE_CMD} -e '/hugs/d' ${WRKSRC}/obj/compilers
+	@${REINPLACE_CMD} -e '/nhc98/d' ${WRKSRC}/obj/compilers
 
 post-install:
-.if defined(WITH_GHC)
 	@${INSTALL_DATA} ${WRKSRC}/obj/ghc/HaXml.pkgconf \
 		${PREFIX}/lib/ghc-${GHC_VERSION}/imports/HaXml/
 	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
-.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC} && ${RM} -rf docs/HaXml/CVS)
 	@(cd ${WRKSRC} && ${CP} -R docs/* ${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/hs-HaXml/pkg-plist b/textproc/hs-HaXml/pkg-plist
index 4a81d81dbfa3..7825bdfbf516 100644
--- a/textproc/hs-HaXml/pkg-plist
+++ b/textproc/hs-HaXml/pkg-plist
@@ -3,51 +3,29 @@ bin/DtdToHaskell
 bin/MkOneOf
 bin/Validate
 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
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Html/Pretty.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/Verbatim.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%%include/nhc98/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Xtract/Lex.hi
-%%NHC98%%include/nhc98/HaXml/Text/XML/HaXml/Xtract/Parse.hi
-%%NHC98%%lib/nhc98/ix86-FreeBSD/libHSHaXml.a
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/HaXml.pkgconf
-%%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
-%%GHC%%lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Pretty.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/Verbatim.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
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/HaXml.pkgconf
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators/HuttonMeijerWallace.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Combinators.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Escape.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Haskell2Xml.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Generate.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Parse.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html/Pretty.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Lex.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/OneOfN.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Parse.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Pretty.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Types.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Validate.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Verbatim.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Wrappers.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xml2Haskell.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Combinators.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Lex.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract/Parse.hi
+lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml.hi
+lib/ghc-%%GHC_VERSION%%/HSHaXml.o
+lib/ghc-%%GHC_VERSION%%/libHSHaXml.a
 %%PORTDOCS%%%%DOCSDIR%%/Combinators.html
 %%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.ParserCombinators.HuttonMeijerWallace.html
 %%PORTDOCS%%%%DOCSDIR%%/HaXml/Text.PrettyPrint.HughesPJ.html
@@ -138,24 +116,16 @@ bin/Xtract
 %%PORTDOCS%%%%DOCSDIR%%/icfp99.html
 %%PORTDOCS%%%%DOCSDIR%%/icfp99.ps.gz
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%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/Xtract
-%%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/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
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/ParserCombinators
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Html
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml/Xtract
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML/HaXml
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text/XML
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml/Text
+@dirrm lib/ghc-%%GHC_VERSION%%/imports/HaXml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/HaXml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%GHC%%@exec %D/bin/ghc-pkg register %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/HaXml.pkgconf
-%%GHC%%@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-%%GHC%%@unexec %D/bin/ghc-pkg unregister HaXml
-%%GHC%%@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@exec %D/bin/ghc-pkg register %D/lib/ghc-%%GHC_VERSION%%/imports/HaXml/HaXml.pkgconf
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister HaXml
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old