7 files changed, 257 insertions, 73 deletions

diff --git a/x11-toolkits/hs-frantk/Makefile b/x11-toolkits/hs-frantk/Makefile
index ace53b32c59f..25beb6eb98cc 100644
--- a/x11-toolkits/hs-frantk/Makefile
+++ b/x11-toolkits/hs-frantk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	frantk
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.dcs.gla.ac.uk/~meurig/FranTk/
 DISTNAME=	FranTk${PORTVERSION:S/./_/}
@@ -15,12 +16,50 @@ PKGNAMEPREFIX=	hs-
 MAINTAINER=	obraun@FreeBSD.org
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+.if !defined(WITHOUT_GHC)
+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
+.endif
 
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/FranTk1.1/src
 
+.if defined(WITH_HUGS)
 ALL_TARGET=	hugs
 INSTALL_TARGET=	install_hugs
+PLIST_SUB+=	HUGS=""
+.else
+PLIST_SUB+=	HUGS="@comment "
+.endif
+
+.if !defined(WITHOUT_GHC)
+ALL_TARGET+=	all
+INSTALL_TARGET+=install_ghc pkg
+PLIST_SUB+=	GHC=""
+.else
+PLIST_SUB+=	GHC="@comment "
+.endif
+
+pre-fetch:
+	@${ECHO} ""
+.if !defined(WITHOUT_GHC) && !defined(WITH_HUGS)
+	@${ECHO} "   FranTk will be build and installed for ghc by default"
+	@${ECHO} "   Define WITHOUT_GHC to build not for ghc"
+	@${ECHO} "   Define WITH_HUGS   to build     for hugs"
+	@${ECHO} ""
+.endif
+.if defined(WITHOUT_GHC) && !defined(WITH_HUGS)
+	@${ECHO} "   You have defined WITHOUT_GHC and you have not defined WITH_HUGS"
+	@${ECHO} "   This means FranTk will not be installed"
+	@${ECHO} ""
+	@${FALSE}
+.elif !defined(WITHOUT_GHC)
+	@${ECHO} "      Building for ghc"
+.endif
+.if defined(WITH_HUGS)
+	@${ECHO} "      Building for hugs"
+.endif
+	@${ECHO} ""
 
 post-patch:
 	${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/frantk.conf
@@ -30,6 +69,8 @@ post-install:
 	${MKDIR} ${DOCSDIR}
 	${CP} ${WRKDIR}/FranTk1.1/doc/frantk.pdf ${DOCSDIR}
 .endif
+.if defined(WITH_HUGS)
 	@${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/hs-frantk/files/patch-src::FRPSrc::StaticTypes::Compatibility.ghc.hs b/x11-toolkits/hs-frantk/files/patch-src::FRPSrc::StaticTypes::Compatibility.ghc.hs
new file mode 100644
index 000000000000..99187056a931
--- /dev/null
+++ b/x11-toolkits/hs-frantk/files/patch-src::FRPSrc::StaticTypes::Compatibility.ghc.hs
@@ -0,0 +1,10 @@
+--- FRPSrc/StaticTypes/Compatibility.ghc.hs.orig	Fri Aug 23 11:36:12 2002
++++ FRPSrc/StaticTypes/Compatibility.ghc.hs	Fri Aug 23 11:36:36 2002
+@@ -15,6 +15,7 @@
+ import IOExts

+ import Concurrent

+ import Exception

++import Int

+ 

+ double2Float = doubleToFloat

+ 

diff --git a/x11-toolkits/hs-frantk/files/patch-src::FranTkSrc::FranTkConc.lhs b/x11-toolkits/hs-frantk/files/patch-src::FranTkSrc::FranTkConc.lhs
new file mode 100644
index 000000000000..327c5b50eaf1
--- /dev/null
+++ b/x11-toolkits/hs-frantk/files/patch-src::FranTkSrc::FranTkConc.lhs
@@ -0,0 +1,10 @@
+--- FranTkSrc/FranTkConc.lhs.orig	Tue Sep 17 10:46:35 2002
++++ FranTkSrc/FranTkConc.lhs	Tue Sep 17 10:47:34 2002
+@@ -6,6 +6,7 @@
+ import Listener

+ import Concurrent

+ import IOExts

++import CVar

+ 

+ addCVarListener :: CVar a -> Listener a -> GUI (IO ())

+ addCVarListener cv l = 

diff --git a/x11-toolkits/hs-frantk/files/patch-src::TclHaskellSrc::ConcTcl.hs b/x11-toolkits/hs-frantk/files/patch-src::TclHaskellSrc::ConcTcl.hs
new file mode 100644
index 000000000000..b28949f27861
--- /dev/null
+++ b/x11-toolkits/hs-frantk/files/patch-src::TclHaskellSrc::ConcTcl.hs
@@ -0,0 +1,10 @@
+--- TclHaskellSrc/ConcTcl.hs.orig	Fri Aug 23 11:42:21 2002
++++ TclHaskellSrc/ConcTcl.hs	Fri Aug 23 11:42:33 2002
+@@ -4,6 +4,7 @@
+ import IOExts

+ import IO

+ import TclCompatibility

++import CVar

+ 

+ -- Some functions used by FranTk to support worker threads.

+ 

diff --git a/x11-toolkits/hs-frantk/files/patch-src::frantk.conf b/x11-toolkits/hs-frantk/files/patch-src::frantk.conf
new file mode 100644
index 000000000000..a3bcb3251081
--- /dev/null
+++ b/x11-toolkits/hs-frantk/files/patch-src::frantk.conf
@@ -0,0 +1,14 @@
+--- frantk.conf.orig	Sat May 25 18:27:08 2002
++++ frantk.conf	Sat May 25 18:27:51 2002
+@@ -1,8 +1,8 @@
+ Package
+    {name = "FranTk",
+-    import_dirs = ["/local/www.people/personal/meurig/haskell/built/frantk/imports"],
++    import_dirs = ["%%PREFIX%%/lib/frantk/imports"],
+     source_dirs = [],
+-    library_dirs = ["/local/www.people/personal/meurig/haskell/built/frantk"],
++    library_dirs = ["%%PREFIX%%/lib/frantk","/usr/local/lib"],
+     hs_libraries = ["HSFranTk"],
+-    extra_libraries = ["tcl8.3","tk8.3"],
++    extra_libraries = ["tcl83","tk83"],
+     include_dirs = [],
diff --git a/x11-toolkits/hs-frantk/pkg-descr b/x11-toolkits/hs-frantk/pkg-descr
index 20df43126e19..d0ecd6a67255 100644
--- a/x11-toolkits/hs-frantk/pkg-descr
+++ b/x11-toolkits/hs-frantk/pkg-descr
@@ -1,6 +1,8 @@
 FranTk (pronounced "frantic") is a library for building GUIs in Haskell. Its
 high level, provides good support for developing complex dynamic systems, and
-is built on top of Tcl-Tk.
+is built on top of Tcl-Tk. 
+ 
+FranTk works with ghc and hugs98.
 
 WWW: http://haskell.cs.yale.edu/FranTk/
 
diff --git a/x11-toolkits/hs-frantk/pkg-plist b/x11-toolkits/hs-frantk/pkg-plist
index 1529b22506c2..c338602c232e 100644
--- a/x11-toolkits/hs-frantk/pkg-plist
+++ b/x11-toolkits/hs-frantk/pkg-plist
@@ -1,74 +1,171 @@
-lib/frantk/hugs/FranTkSrc/AbstractInterface.lhs
-lib/frantk/hugs/FranTkSrc/BVar.lhs
-lib/frantk/hugs/FranTkSrc/BVars.lhs
-lib/frantk/hugs/FranTkSrc/CItem.lhs
-lib/frantk/hugs/FranTkSrc/CollectionB.lhs
-lib/frantk/hugs/FranTkSrc/CollectionBVar.lhs
-lib/frantk/hugs/FranTkSrc/Component.lhs
-lib/frantk/hugs/FranTkSrc/ComponentWidgets.lhs
-lib/frantk/hugs/FranTkSrc/Conf.lhs
-lib/frantk/hugs/FranTkSrc/DisplayCItem.lhs
-lib/frantk/hugs/FranTkSrc/DisplayPItem.lhs
-lib/frantk/hugs/FranTkSrc/DisplaySimple.lhs
-lib/frantk/hugs/FranTkSrc/DisplayWidget.lhs
-lib/frantk/hugs/FranTkSrc/FM.hs
-lib/frantk/hugs/FranTkSrc/FMGhc.hs
-lib/frantk/hugs/FranTkSrc/FRPWrap.lhs
-lib/frantk/hugs/FranTkSrc/FranTk.lhs
-lib/frantk/hugs/FranTkSrc/FranTkConc.lhs
-lib/frantk/hugs/FranTkSrc/GFRP.lhs
-lib/frantk/hugs/FranTkSrc/GUI.lhs
-lib/frantk/hugs/FranTkSrc/GUIDef.lhs
-lib/frantk/hugs/FranTkSrc/Group.lhs
-lib/frantk/hugs/FranTkSrc/HasInput.lhs
-lib/frantk/hugs/FranTkSrc/Identify.lhs
-lib/frantk/hugs/FranTkSrc/ListB.lhs
-lib/frantk/hugs/FranTkSrc/MItem.lhs
-lib/frantk/hugs/FranTkSrc/MapG.lhs
-lib/frantk/hugs/FranTkSrc/PileArray.lhs
-lib/frantk/hugs/FranTkSrc/PrimWidget.lhs
-lib/frantk/hugs/FranTkSrc/RectInfo.lhs
-lib/frantk/hugs/FranTkSrc/SetB.lhs
-lib/frantk/hugs/FranTkSrc/Style.hs
-lib/frantk/hugs/FranTkSrc/TreeIO.lhs
-lib/frantk/hugs/FranTkSrc/WH.lhs
-lib/frantk/hugs/FranTkSrc/Widget.lhs
-lib/frantk/hugs/FranTkSrc/WidgetConf.lhs
-lib/frantk/hugs/FranTkSrc/WidgetExports.lhs
-lib/frantk/hugs/FranTkSrc/WidgetSet.lhs
-lib/frantk/hugs/FranTkSrc/WidgetSetImpl.lhs
-lib/frantk/hugs/FranTkSrc/Widgets.lhs
-lib/frantk/hugs/TclHaskellSrc/ConcTcl.hs
-lib/frantk/hugs/TclHaskellSrc/ExtArray.hs
-lib/frantk/hugs/TclHaskellSrc/GUIMonad.hs
-lib/frantk/hugs/TclHaskellSrc/PlacePos.hs
-lib/frantk/hugs/TclHaskellSrc/Remover.hs
-lib/frantk/hugs/TclHaskellSrc/Tcl.hs
-lib/frantk/hugs/TclHaskellSrc/TclCompatibility.hs
-lib/frantk/hugs/TclHaskellSrc/TclCompatibilityGhc.hs
-lib/frantk/hugs/TclHaskellSrc/TclCompatibilityGhcSupportsConcurrency.hs
-lib/frantk/hugs/TclHaskellSrc/TclConf.hs
-lib/frantk/hugs/TclHaskellSrc/TclConfB.hs
-lib/frantk/hugs/TclHaskellSrc/TclGUI.hs
-lib/frantk/hugs/TclHaskellSrc/TclHandle.hs
-lib/frantk/hugs/TclHaskellSrc/TclPrim.hs
-lib/frantk/hugs/TclHaskellSrc/TclPrimCore.hs
-lib/frantk/hugs/TclHaskellSrc/TclPrimExports.hs
-lib/frantk/hugs/TclHaskellSrc/TclPrimGhc.hs
-lib/frantk/hugs/TclHaskellSrc/TclPrimImpl.hs
-lib/frantk/hugs/TclHaskellSrc/TclPrimWidgets.hs
-lib/frantk/hugs/TclHaskellSrc/TclTime.NT.hs
-lib/frantk/hugs/TclHaskellSrc/TclTime.hs
-lib/frantk/hugs/TclHaskellSrc/TclTime.independent.hs
-lib/frantk/hugs/TclHaskellSrc/TclTime.linux.hs
-lib/frantk/hugs/TclHaskellSrc/TclTrie.hs
-lib/frantk/hugs/TclHaskellSrc/TclWidgets.hs
-lib/frantk/hugs/TclHaskellSrc/TrieIO.hs
-lib/frantk/hugs/TclHaskellSrc/Utils.hs
-lib/frantk/hugs/TclHaskellSrc/tclhaskell.o
+%%HUGS%%lib/frantk/hugs/FranTkSrc/AbstractInterface.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/BVar.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/BVars.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/CItem.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/CollectionB.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/CollectionBVar.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/Component.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/ComponentWidgets.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/Conf.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/DisplayCItem.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/DisplayPItem.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/DisplaySimple.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/DisplayWidget.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/FM.hs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/FMGhc.hs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/FRPWrap.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/FranTk.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/FranTkConc.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/GFRP.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/GUI.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/GUIDef.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/Group.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/HasInput.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/Identify.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/ListB.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/MItem.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/MapG.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/PileArray.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/PrimWidget.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/RectInfo.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/SetB.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/Style.hs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/TreeIO.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/WH.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/Widget.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/WidgetConf.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/WidgetExports.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/WidgetSet.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/WidgetSetImpl.lhs
+%%HUGS%%lib/frantk/hugs/FranTkSrc/Widgets.lhs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/ConcTcl.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/ExtArray.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/GUIMonad.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/PlacePos.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/Remover.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/Tcl.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclCompatibility.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclCompatibilityGhc.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclCompatibilityGhcSupportsConcurrency.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclConf.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclConfB.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclGUI.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclHandle.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclPrim.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclPrimCore.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclPrimExports.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclPrimGhc.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclPrimImpl.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclPrimWidgets.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclTime.NT.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclTime.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclTime.independent.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclTime.linux.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclTrie.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TclWidgets.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/TrieIO.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/Utils.hs
+%%HUGS%%lib/frantk/hugs/TclHaskellSrc/tclhaskell.o
+%%GHC%%lib/frantk/HSFranTk.o
+%%GHC%%lib/frantk/libHSFranTk.a
+%%GHC%%lib/frantk/imports/AbstractInterface.hi
+%%GHC%%lib/frantk/imports/BPrim.hi
+%%GHC%%lib/frantk/imports/BVar.hi
+%%GHC%%lib/frantk/imports/BVars.hi
+%%GHC%%lib/frantk/imports/BaseTypes.hi
+%%GHC%%lib/frantk/imports/Behavior.hi
+%%GHC%%lib/frantk/imports/BehaviorIO.hi
+%%GHC%%lib/frantk/imports/BehaviorTypes.hi
+%%GHC%%lib/frantk/imports/CItem.hi
+%%GHC%%lib/frantk/imports/CollectionB.hi
+%%GHC%%lib/frantk/imports/CollectionBVar.hi
+%%GHC%%lib/frantk/imports/ColorCore.hi
+%%GHC%%lib/frantk/imports/ColorCoreB.hi
+%%GHC%%lib/frantk/imports/Compatibility.hi
+%%GHC%%lib/frantk/imports/Component.hi
+%%GHC%%lib/frantk/imports/ComponentWidgets.hi
+%%GHC%%lib/frantk/imports/ConcTcl.hi
+%%GHC%%lib/frantk/imports/Conf.hi
+%%GHC%%lib/frantk/imports/Delayed.hi
+%%GHC%%lib/frantk/imports/DisplayCItem.hi
+%%GHC%%lib/frantk/imports/DisplayPItem.hi
+%%GHC%%lib/frantk/imports/DisplaySimple.hi
+%%GHC%%lib/frantk/imports/DisplayWidget.hi
+%%GHC%%lib/frantk/imports/Event.hi
+%%GHC%%lib/frantk/imports/EventPrim.hi
+%%GHC%%lib/frantk/imports/ExtArray.hi
+%%GHC%%lib/frantk/imports/FM.hi
+%%GHC%%lib/frantk/imports/FRPImpl.hi
+%%GHC%%lib/frantk/imports/FRPWrap.hi
+%%GHC%%lib/frantk/imports/Force.hi
+%%GHC%%lib/frantk/imports/FranCore.hi
+%%GHC%%lib/frantk/imports/FranPrim.hi
+%%GHC%%lib/frantk/imports/FranTime.hi
+%%GHC%%lib/frantk/imports/FranTk.hi
+%%GHC%%lib/frantk/imports/FranTkConc.hi
+%%GHC%%lib/frantk/imports/GFRP.hi
+%%GHC%%lib/frantk/imports/GUI.hi
+%%GHC%%lib/frantk/imports/GUIDef.hi
+%%GHC%%lib/frantk/imports/Group.hi
+%%GHC%%lib/frantk/imports/HasInput.hi
+%%GHC%%lib/frantk/imports/Identify.hi
+%%GHC%%lib/frantk/imports/ListB.hi
+%%GHC%%lib/frantk/imports/Listener.hi
+%%GHC%%lib/frantk/imports/ListenerOps.hi
+%%GHC%%lib/frantk/imports/ListenerPrim.hi
+%%GHC%%lib/frantk/imports/MItem.hi
+%%GHC%%lib/frantk/imports/MapG.hi
+%%GHC%%lib/frantk/imports/MutSet.hi
+%%GHC%%lib/frantk/imports/PileArray.hi
+%%GHC%%lib/frantk/imports/PlacePos.hi
+%%GHC%%lib/frantk/imports/Point2.hi
+%%GHC%%lib/frantk/imports/Point2B.hi
+%%GHC%%lib/frantk/imports/Point3.hi
+%%GHC%%lib/frantk/imports/Point3B.hi
+%%GHC%%lib/frantk/imports/PrimWidget.hi
+%%GHC%%lib/frantk/imports/Rect.hi
+%%GHC%%lib/frantk/imports/RectB.hi
+%%GHC%%lib/frantk/imports/RectInfo.hi
+%%GHC%%lib/frantk/imports/Remover.hi
+%%GHC%%lib/frantk/imports/SetB.hi
+%%GHC%%lib/frantk/imports/StaticTypes.hi
+%%GHC%%lib/frantk/imports/TclCompatibility.hi
+%%GHC%%lib/frantk/imports/TclGUI.hi
+%%GHC%%lib/frantk/imports/TclPrim.hi
+%%GHC%%lib/frantk/imports/TclPrimCore.hi
+%%GHC%%lib/frantk/imports/TclPrimImpl.hi
+%%GHC%%lib/frantk/imports/TclPrimWidgets.hi
+%%GHC%%lib/frantk/imports/TclTime.hi
+%%GHC%%lib/frantk/imports/TclTrie.hi
+%%GHC%%lib/frantk/imports/TermE.hi
+%%GHC%%lib/frantk/imports/Transform2.hi
+%%GHC%%lib/frantk/imports/Transform2B.hi
+%%GHC%%lib/frantk/imports/Transform3.hi
+%%GHC%%lib/frantk/imports/Transform3B.hi
+%%GHC%%lib/frantk/imports/TreeIO.hi
+%%GHC%%lib/frantk/imports/TrieIO.hi
+%%GHC%%lib/frantk/imports/Utils.hi
+%%GHC%%lib/frantk/imports/Vector2.hi
+%%GHC%%lib/frantk/imports/Vector2B.hi
+%%GHC%%lib/frantk/imports/Vector3.hi
+%%GHC%%lib/frantk/imports/Vector3B.hi
+%%GHC%%lib/frantk/imports/VectorSpace.hi
+%%GHC%%lib/frantk/imports/VectorSpaceB.hi
+%%GHC%%lib/frantk/imports/WH.hi
+%%GHC%%lib/frantk/imports/Widget.hi
+%%GHC%%lib/frantk/imports/WidgetConf.hi
+%%GHC%%lib/frantk/imports/WidgetExports.hi
+%%GHC%%lib/frantk/imports/WidgetSet.hi
+%%GHC%%lib/frantk/imports/WidgetSetImpl.hi
+%%GHC%%lib/frantk/imports/Widgets.hi
+%%GHC%%lib/frantk/imports/WirePrim.hi
+%%GHC%%lib/frantk/imports/WorkPool.hi
 %%PORTDOCS%%share/doc/frantk/frantk.pdf
 %%PORTDOCS%%@dirrm share/doc/frantk
-@dirrm lib/frantk/hugs/FranTkSrc
-@dirrm lib/frantk/hugs/TclHaskellSrc
-@dirrm lib/frantk/hugs
-@dirrm lib/frantk
+%%HUGS%%@dirrm lib/frantk/hugs/FranTkSrc
+%%HUGS%%@dirrm lib/frantk/hugs/TclHaskellSrc
+%%HUGS%%@dirrm lib/frantk/hugs
+%%GHC%%@dirrm lib/frantk/imports
+%%GHC%%@dirrm lib/frantk
+%%HUGS%%@unexec rmdir %D/lib/frantk || true
+%%GHC%%@unexec ghc-pkg -r FranTk