2 files changed, 92 insertions, 73 deletions

diff --git a/devel/hs-hat/Makefile b/devel/hs-hat/Makefile
index a77ddf7c4ac5..58056e220ab6 100644
--- a/devel/hs-hat/Makefile
+++ b/devel/hs-hat/Makefile
@@ -12,8 +12,13 @@ MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/${PORTNAME}/
 
 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
@@ -23,15 +28,26 @@ USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 USE_REINPLACE=	yes
 USE_GLIB=	yes
+.if !defined(WITH_GHC) || defined(WITHOUT_NHC98)
+ALL_TARGET=	hat
+.endif
+.if !defined(WITHOUT_NHC98)
+PLIST_SUB+=	NHC98=""
+.else
+PLIST_SUB+=	NHC98="@comment "
+.endif
 .if defined(WITH_GHC)
-PLIST_SUB=	GHC=""
+PLIST_SUB+=	GHC=""
 .else
-ALL_TARGET=	hat
-PLIST_SUB=	GHC="@comment "
+PLIST_SUB+=	GHC="@comment "
 .endif
 
-CONFIGURE_ARGS=		--prefix=${PREFIX}
-CONFIGURE_ARGS+=	--buildwith=nhc98 --libdir=${PREFIX}/lib
+CONFIGURE_ARGS=		--prefix=${PREFIX} --libdir=${PREFIX}/lib
+.if !defined(WITHOUT_NHC98)
+CONFIGURE_ARGS+=	--buildwith=nhc98
+.else
+CONFIGURE_ARGS+=	--buildwith=ghc
+.endif
 .if !defined(NOPORTDOCS)
 CONFIGURE_ARGS+=	--docdir=${PREFIX}/share/doc +docs
 .endif
@@ -40,11 +56,14 @@ MAN1=		hat-detect.1 hat-observe.1 hat-stack.1 hat-trail.1
 
 pre-everything::
 	@${ECHO_CMD} ""
-.if defined(WITH_GHC)
-	@${ECHO_CMD} " HAT will build and install for both nhc98 and ghc."
+.if defined(WITH_GHC) && !defined(WITHOUT_NHC98)
+	@${ECHO_CMD} " HAT will be built and installed for both nhc98 and ghc."
+.elif defined(WITHOUT_NHC98)
+	@${ECHO_CMD} " HAT will be built and installed for ghc only."
 .else
-	@${ECHO_CMD} " HAT will build and install for nhc98 only."
-	@${ECHO_CMD} " Define WITH_GHC to install for ghc, too."
+	@${ECHO_CMD} " HAT will be built and 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} ""
 
diff --git a/devel/hs-hat/pkg-plist b/devel/hs-hat/pkg-plist
index c2f743ead0ea..b7479439b75a 100644
--- a/devel/hs-hat/pkg-plist
+++ b/devel/hs-hat/pkg-plist
@@ -35,69 +35,69 @@ include/hat/SystemBuiltinTypes.hx
 include/hat/Time.hx
 include/hat/TimeBuiltin.hx
 include/hat/TimeBuiltinTypes.hx
-include/nhc98/hat/Hat.hi
-include/nhc98/hat/TArray.hi
-include/nhc98/hat/TCPUTime.hi
-include/nhc98/hat/TChar.hi
-include/nhc98/hat/TComplex.hi
-include/nhc98/hat/TDirectory.hi
-include/nhc98/hat/TDirectoryBuiltin.hi
-include/nhc98/hat/TDirectoryBuiltinTypes.hi
-include/nhc98/hat/TIO.hi
-include/nhc98/hat/TIOBuiltin.hi
-include/nhc98/hat/TIOBuiltinTypes.hi
-include/nhc98/hat/TIx.hi
-include/nhc98/hat/TList.hi
-include/nhc98/hat/TLocale.hi
-include/nhc98/hat/TMaybe.hi
-include/nhc98/hat/TMonad.hi
-include/nhc98/hat/TNumeric.hi
-include/nhc98/hat/TPrelude.hi
-include/nhc98/hat/TPreludeBasic.hi
-include/nhc98/hat/TPreludeBuiltin.hi
-include/nhc98/hat/TPreludeBuiltinTypes.hi
-include/nhc98/hat/TRandom.hi
-include/nhc98/hat/TRandomBuiltin.hi
-include/nhc98/hat/TRatio.hi
-include/nhc98/hat/TSystem.hi
-include/nhc98/hat/TSystemBuiltin.hi
-include/nhc98/hat/TSystemBuiltinTypes.hi
-include/nhc98/hat/TTime.hi
-include/nhc98/hat/TTimeBuiltin.hi
-include/nhc98/hat/TTimeBuiltinTypes.hi
+%%NHC98%%include/nhc98/hat/Hat.hi
+%%NHC98%%include/nhc98/hat/TArray.hi
+%%NHC98%%include/nhc98/hat/TCPUTime.hi
+%%NHC98%%include/nhc98/hat/TChar.hi
+%%NHC98%%include/nhc98/hat/TComplex.hi
+%%NHC98%%include/nhc98/hat/TDirectory.hi
+%%NHC98%%include/nhc98/hat/TDirectoryBuiltin.hi
+%%NHC98%%include/nhc98/hat/TDirectoryBuiltinTypes.hi
+%%NHC98%%include/nhc98/hat/TIO.hi
+%%NHC98%%include/nhc98/hat/TIOBuiltin.hi
+%%NHC98%%include/nhc98/hat/TIOBuiltinTypes.hi
+%%NHC98%%include/nhc98/hat/TIx.hi
+%%NHC98%%include/nhc98/hat/TList.hi
+%%NHC98%%include/nhc98/hat/TLocale.hi
+%%NHC98%%include/nhc98/hat/TMaybe.hi
+%%NHC98%%include/nhc98/hat/TMonad.hi
+%%NHC98%%include/nhc98/hat/TNumeric.hi
+%%NHC98%%include/nhc98/hat/TPrelude.hi
+%%NHC98%%include/nhc98/hat/TPreludeBasic.hi
+%%NHC98%%include/nhc98/hat/TPreludeBuiltin.hi
+%%NHC98%%include/nhc98/hat/TPreludeBuiltinTypes.hi
+%%NHC98%%include/nhc98/hat/TRandom.hi
+%%NHC98%%include/nhc98/hat/TRandomBuiltin.hi
+%%NHC98%%include/nhc98/hat/TRatio.hi
+%%NHC98%%include/nhc98/hat/TSystem.hi
+%%NHC98%%include/nhc98/hat/TSystemBuiltin.hi
+%%NHC98%%include/nhc98/hat/TSystemBuiltinTypes.hi
+%%NHC98%%include/nhc98/hat/TTime.hi
+%%NHC98%%include/nhc98/hat/TTimeBuiltin.hi
+%%NHC98%%include/nhc98/hat/TTimeBuiltinTypes.hi
 lib/ix86-FreeBSD/config
 lib/ix86-FreeBSD/hat-trans
-lib/ix86-FreeBSD/hatlib/nhc98/libHShat.a
-lib/ix86-FreeBSD/hatlib/nhc98/Hat.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltin.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TTime.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltinTypes.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltin.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TSystem.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TRatio.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TRandomBuiltin.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TRandom.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltinTypes.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltin.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBasic.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TPrelude.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TNumeric.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TMonad.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TMaybe.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TLocale.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TList.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TIx.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltinTypes.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltin.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TIO.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltinTypes.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltin.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TDirectory.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TComplex.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TChar.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TCPUTime.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TArray.hi
-lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltinTypes.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/libHShat.a
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/Hat.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltin.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTime.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltinTypes.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystemBuiltin.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TSystem.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRatio.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRandomBuiltin.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TRandom.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltinTypes.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBuiltin.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPreludeBasic.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TPrelude.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TNumeric.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TMonad.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TMaybe.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TLocale.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TList.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIx.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltinTypes.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIOBuiltin.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TIO.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltinTypes.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectoryBuiltin.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TDirectory.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TComplex.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TChar.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TCPUTime.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TArray.hi
+%%NHC98%%lib/ix86-FreeBSD/hatlib/nhc98/TTimeBuiltinTypes.hi
 %%GHC%%lib/ix86-FreeBSD/hatlib/ghc/Hat.hi
 %%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TArray.hi
 %%GHC%%lib/ix86-FreeBSD/hatlib/ghc/TCPUTime.hi
@@ -136,7 +136,7 @@ lib/ix86-FreeBSD/hat-stack
 lib/ix86-FreeBSD/hat-view
 lib/ix86-FreeBSD/hat-trail
 lib/ix86-FreeBSD/hat-observe
-lib/nhc98/ix86-FreeBSD/libHShat.a
+%%NHC98%%lib/nhc98/ix86-FreeBSD/libHShat.a
 %%GHC%%lib/ghc-5.02.2/imports/hat/Hat.hi
 %%GHC%%lib/ghc-5.02.2/imports/hat/TArray.hi
 %%GHC%%lib/ghc-5.02.2/imports/hat/TCPUTime.hi
@@ -216,8 +216,8 @@ lib/nhc98/ix86-FreeBSD/libHShat.a
 %%PORTDOCS%%share/doc/hat/tutorial1.ps
 %%PORTDOCS%%share/doc/hat/tutorial1.tex
 @dirrm include/hat
-@dirrm include/nhc98/hat
-@dirrm lib/ix86-FreeBSD/hatlib/nhc98
+%%NHC98%%@dirrm include/nhc98/hat
+%%NHC98%%@dirrm lib/ix86-FreeBSD/hatlib/nhc98
 %%GHC%%@dirrm lib/ix86-FreeBSD/hatlib/ghc
 @dirrm lib/ix86-FreeBSD/hatlib
 %%PORTDOCS%%@dirrm share/doc/hat