Upgrade to Nov2003 release. Builds fine on alpha and sparc64 now.

Parts submitted by:	Volker Stolz <stolz@i2.informatik.rwth-aachen.de>

3 files changed, 140 insertions, 200 deletions

diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index c8354dd5c6d9..33e98345a406 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hugs98
-PORTVERSION=	200211
+PORTVERSION=	200311
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://cvs.haskell.org/Hugs/downloads/${HUGS_DATE}/
 DISTNAME=	${PORTNAME}-${HUGS_DATE}
@@ -14,22 +14,19 @@ DISTNAME=	${PORTNAME}-${HUGS_DATE}
 MAINTAINER=	obraun@FreeBSD.org
 COMMENT=	An interpreter for the functional programming language Haskell 98
 
-.if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64"
-IGNORE=	"Does not build on ${MACHINE_ARCH}"
-.endif
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
-HUGS_DATE=	Nov2002
+HUGS_DATE=	Nov2003
 USE_REINPLACE=	yes
 USE_BISON=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --enable-ffi
 ALL_TARGET=	default ffihugs
 
-MAN1=		hugs.1
+MAN1=		hugs.1 hugs-package.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^\(install		:: install_notes\)|#\1|' \
+	@${REINPLACE_CMD} -e '/^install		:: install_notes/d ; \
+		/^install		:: install_guide/d' \
 		${WRKSRC}/MkInstal.in
 
 do-configure:
diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index 8950565b2c23..367850436be4 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1 +1 @@
-MD5 (hugs98-Nov2002.tar.gz) = 8d3951d991661045713b612bf539c8c9
+MD5 (hugs98-Nov2003.tar.gz) = 86ed68ada4ff1d455213a851256437fc
diff --git a/lang/hugs/pkg-plist b/lang/hugs/pkg-plist
index db5ad31e734d..fab3d6e18133 100644
--- a/lang/hugs/pkg-plist
+++ b/lang/hugs/pkg-plist
@@ -1,6 +1,7 @@
+bin/ffihugs
 bin/hugs
+bin/hugs-package
 bin/runhugs
-bin/ffihugs
 lib/hugs/demos/AnsiDemo.hs
 lib/hugs/demos/ArrayEx.hs
 lib/hugs/demos/Calendar.hs
@@ -11,6 +12,21 @@ lib/hugs/demos/EvalRed.hs
 lib/hugs/demos/Examples.hs
 lib/hugs/demos/Expr.hs
 lib/hugs/demos/FastSort.hs
+lib/hugs/demos/GLUT/Misc/ExtractContours.hs
+lib/hugs/demos/GLUT/Misc/FogCoordinate.hs
+lib/hugs/demos/GLUT/Misc/Triangulate.hs
+lib/hugs/demos/GLUT/RedBook/BezCurve.hs
+lib/hugs/demos/GLUT/RedBook/BezMesh.hs
+lib/hugs/demos/GLUT/RedBook/BezSurf.hs
+lib/hugs/demos/GLUT/RedBook/Feedback.hs
+lib/hugs/demos/GLUT/RedBook/Fog.hs
+lib/hugs/demos/GLUT/RedBook/Hello.hs
+lib/hugs/demos/GLUT/RedBook/PickDepth.hs
+lib/hugs/demos/GLUT/RedBook/PickSquare.hs
+lib/hugs/demos/GLUT/RedBook/Select.hs
+lib/hugs/demos/GLUT/RedBook/Smooth.hs
+lib/hugs/demos/GLUT/RedBook/Tess.hs
+lib/hugs/demos/GLUT/RedBook/TessWind.hs
 lib/hugs/demos/Gofer.hs
 lib/hugs/demos/Lattice.hs
 lib/hugs/demos/Ldfs.hs
@@ -31,154 +47,11 @@ lib/hugs/demos/prolog/StackEngine.hs
 lib/hugs/demos/prolog/Subst.hs
 lib/hugs/demos/prolog/readme
 lib/hugs/demos/prolog/stdlib
-lib/hugs/include/GreenCard.h
 lib/hugs/include/HsFFI.h
-lib/hugs/lib/Array.hs
-lib/hugs/lib/CPUTime.hs
-lib/hugs/lib/Char.hs
-lib/hugs/lib/Complex.hs
-lib/hugs/lib/Directory.hs
-lib/hugs/lib/IO.hs
-lib/hugs/lib/Ix.hs
-lib/hugs/lib/List.hs
-lib/hugs/lib/Locale.hs
-lib/hugs/lib/Maybe.hs
-lib/hugs/lib/Monad.hs
-lib/hugs/lib/Numeric.hs
-lib/hugs/lib/Prelude.hs
-lib/hugs/lib/Random.hs
-lib/hugs/lib/Ratio.hs
-lib/hugs/lib/System.hs
-lib/hugs/lib/Time.hs
-lib/hugs/lib/exts/Addr.hs
-lib/hugs/lib/exts/Assoc.hs
-lib/hugs/lib/exts/AssocDefaults.hs
-lib/hugs/lib/exts/AssocList.hs
-lib/hugs/lib/exts/BankersQueue.hs
-lib/hugs/lib/exts/BinaryRandList.hs
-lib/hugs/lib/exts/Bits.hs
-lib/hugs/lib/exts/BraunSeq.hs
-lib/hugs/lib/exts/COPYRIGHT.edison
-lib/hugs/lib/exts/CString.hs
-lib/hugs/lib/exts/CTypes.hs
-lib/hugs/lib/exts/CVar.lhs
-lib/hugs/lib/exts/Chan.lhs
-lib/hugs/lib/exts/Channel.lhs
-lib/hugs/lib/exts/ChannelVar.lhs
-lib/hugs/lib/exts/Collection.hs
-lib/hugs/lib/exts/CollectionDefaults.hs
-lib/hugs/lib/exts/CollectionUtils.hs
-lib/hugs/lib/exts/ConcBase.hs
-lib/hugs/lib/exts/Concurrent.lhs
-lib/hugs/lib/exts/Dynamic.lhs
-lib/hugs/lib/exts/EdisonPrelude.hs
-lib/hugs/lib/exts/Exception.hs
-lib/hugs/lib/exts/FiniteMap.lhs
-lib/hugs/lib/exts/Foreign.hs
-lib/hugs/lib/exts/ForeignObj.hs
-lib/hugs/lib/exts/ForeignPtr.hs
-lib/hugs/lib/exts/GetOpt.lhs
-lib/hugs/lib/exts/Html.lhs
-lib/hugs/lib/exts/HtmlBlockTable.lhs
-lib/hugs/lib/exts/HugsStorable.c
-lib/hugs/lib/exts/HugsStorable.hs
-lib/hugs/lib/exts/HugsStorable.so
-lib/hugs/lib/exts/IOExts.hs
-lib/hugs/lib/exts/IORef.lhs
-lib/hugs/lib/exts/Int.hs
-lib/hugs/lib/exts/JoinList.hs
-lib/hugs/lib/exts/LazyPairingHeap.hs
-lib/hugs/lib/exts/LazyST.hs
-lib/hugs/lib/exts/LeftistHeap.hs
-lib/hugs/lib/exts/ListSeq.hs
-lib/hugs/lib/exts/MVar.lhs
-lib/hugs/lib/exts/MarshalAlloc.c
-lib/hugs/lib/exts/MarshalAlloc.hs
-lib/hugs/lib/exts/MarshalAlloc.so
-lib/hugs/lib/exts/MarshalArray.hs
-lib/hugs/lib/exts/MarshalError.hs
-lib/hugs/lib/exts/MarshalUtils.c
-lib/hugs/lib/exts/MarshalUtils.hs
-lib/hugs/lib/exts/MarshalUtils.so
-lib/hugs/lib/exts/Memo.hs
-lib/hugs/lib/exts/Merge.lhs
-lib/hugs/lib/exts/MinHeap.hs
-lib/hugs/lib/exts/MonadCont.lhs
-lib/hugs/lib/exts/MonadEither.lhs
-lib/hugs/lib/exts/MonadError.lhs
-lib/hugs/lib/exts/MonadFix.lhs
-lib/hugs/lib/exts/MonadIdentity.lhs
-lib/hugs/lib/exts/MonadList.lhs
-lib/hugs/lib/exts/MonadRWS.lhs
-lib/hugs/lib/exts/MonadReader.lhs
-lib/hugs/lib/exts/MonadRec.hs
-lib/hugs/lib/exts/MonadState.lhs
-lib/hugs/lib/exts/MonadTrans.lhs
-lib/hugs/lib/exts/MonadWriter.lhs
-lib/hugs/lib/exts/Monoid.lhs
-lib/hugs/lib/exts/MyersStack.hs
-lib/hugs/lib/exts/NumExts.lhs
-lib/hugs/lib/exts/Observe.lhs
-lib/hugs/lib/exts/Parallel.lhs
-lib/hugs/lib/exts/Parsec.hs
-lib/hugs/lib/exts/ParsecChar.hs
-lib/hugs/lib/exts/ParsecCombinator.hs
-lib/hugs/lib/exts/ParsecError.hs
-lib/hugs/lib/exts/ParsecExpr.hs
-lib/hugs/lib/exts/ParsecLanguage.hs
-lib/hugs/lib/exts/ParsecPerm.hs
-lib/hugs/lib/exts/ParsecPos.hs
-lib/hugs/lib/exts/ParsecPrim.hs
-lib/hugs/lib/exts/ParsecToken.hs
-lib/hugs/lib/exts/PatriciaLoMap.hs
-lib/hugs/lib/exts/Pretty.lhs
-lib/hugs/lib/exts/Ptr.hs
-lib/hugs/lib/exts/QSem.lhs
-lib/hugs/lib/exts/QSemN.lhs
-lib/hugs/lib/exts/QuickCheck.hs
-lib/hugs/lib/exts/QuickCheckPoly.hs
-lib/hugs/lib/exts/QuickCheckUtils.hs
-lib/hugs/lib/exts/RandList.hs
-lib/hugs/lib/exts/RevSeq.hs
-lib/hugs/lib/exts/ST.hs
-lib/hugs/lib/exts/SampleVar.lhs
-lib/hugs/lib/exts/Semaphore.lhs
-lib/hugs/lib/exts/Sequence.hs
-lib/hugs/lib/exts/SequenceDefaults.hs
-lib/hugs/lib/exts/Set.lhs
-lib/hugs/lib/exts/ShowFunctions.lhs
-lib/hugs/lib/exts/SimpleQueue.hs
-lib/hugs/lib/exts/SizedSeq.hs
-lib/hugs/lib/exts/SkewHeap.hs
-lib/hugs/lib/exts/SplayHeap.hs
-lib/hugs/lib/exts/Stable.hs
-lib/hugs/lib/exts/StablePtr.hs
-lib/hugs/lib/exts/Storable.hs
-lib/hugs/lib/exts/Storable_aux.c
-lib/hugs/lib/exts/Storable_aux.h
-lib/hugs/lib/exts/TestOrdBag.hs
-lib/hugs/lib/exts/TestOrdSet.hs
-lib/hugs/lib/exts/TestSeq.hs
-lib/hugs/lib/exts/UnbalancedSet.hs
-lib/hugs/lib/exts/Weak.hs
-lib/hugs/lib/exts/Word.hs
-lib/hugs/lib/hugs/AnsiInteract.hs
-lib/hugs/lib/hugs/AnsiScreen.hs
-lib/hugs/lib/hugs/CVHAssert.hs
-lib/hugs/lib/hugs/GenericPrint.hs
-lib/hugs/lib/hugs/HugsDynamic.hs
-lib/hugs/lib/hugs/HugsInternals.hs
-lib/hugs/lib/hugs/HugsLibs.hs
-lib/hugs/lib/hugs/IOExtensions.hs
-lib/hugs/lib/hugs/Interact.hs
-lib/hugs/lib/hugs/ListUtils.hs
-lib/hugs/lib/hugs/Number.hs
-lib/hugs/lib/hugs/OldWeak.hs
-lib/hugs/lib/hugs/ParseLib.hs
-lib/hugs/lib/hugs/Quote.hs
-lib/hugs/lib/hugs/StdLibs.hs
-lib/hugs/lib/hugs/Trace.hs
-lib/hugs/lib/hugs/Trex.hs
+lib/hugs/include/MachDeps.h
+lib/hugs/include/config.h
+lib/hugs/include/platform.h
+lib/hugs/include/template-hsc.h
 lib/hugs/libraries/Array.hs
 lib/hugs/libraries/Bits.hs
 lib/hugs/libraries/CError.hs
@@ -189,35 +62,38 @@ lib/hugs/libraries/CTypes.hs
 lib/hugs/libraries/Char.hs
 lib/hugs/libraries/Complex.hs
 lib/hugs/libraries/Control/Arrow.hs
+lib/hugs/libraries/Control/Concurrent.hs
 lib/hugs/libraries/Control/Concurrent/Chan.hs
 lib/hugs/libraries/Control/Concurrent/MVar.hs
 lib/hugs/libraries/Control/Concurrent/QSem.hs
 lib/hugs/libraries/Control/Concurrent/QSemN.hs
 lib/hugs/libraries/Control/Concurrent/SampleVar.hs
 lib/hugs/libraries/Control/Exception.hs
+lib/hugs/libraries/Control/Monad.hs
 lib/hugs/libraries/Control/Monad/Cont.hs
 lib/hugs/libraries/Control/Monad/Error.hs
 lib/hugs/libraries/Control/Monad/Fix.hs
 lib/hugs/libraries/Control/Monad/Identity.hs
 lib/hugs/libraries/Control/Monad/List.hs
-lib/hugs/libraries/Control/Monad/Monoid.hs
 lib/hugs/libraries/Control/Monad/RWS.hs
 lib/hugs/libraries/Control/Monad/Reader.hs
+lib/hugs/libraries/Control/Monad/ST.hs
 lib/hugs/libraries/Control/Monad/ST/Lazy.hs
 lib/hugs/libraries/Control/Monad/ST/Strict.hs
-lib/hugs/libraries/Control/Monad/ST.hs
 lib/hugs/libraries/Control/Monad/State.hs
 lib/hugs/libraries/Control/Monad/Trans.hs
 lib/hugs/libraries/Control/Monad/Writer.hs
-lib/hugs/libraries/Control/Monad.hs
 lib/hugs/libraries/Control/Parallel.hs
+lib/hugs/libraries/Data/Array.hs
 lib/hugs/libraries/Data/Array/Base.hs
+lib/hugs/libraries/Data/Array/Diff.hs
 lib/hugs/libraries/Data/Array/IArray.hs
 lib/hugs/libraries/Data/Array/IO.hs
+lib/hugs/libraries/Data/Array/IO/Internals.hs
 lib/hugs/libraries/Data/Array/MArray.hs
 lib/hugs/libraries/Data/Array/ST.hs
 lib/hugs/libraries/Data/Array/Storable.hs
-lib/hugs/libraries/Data/Array.hs
+lib/hugs/libraries/Data/Array/Unboxed.hs
 lib/hugs/libraries/Data/Bits.hs
 lib/hugs/libraries/Data/Bool.hs
 lib/hugs/libraries/Data/Char.hs
@@ -225,47 +101,59 @@ lib/hugs/libraries/Data/Complex.hs
 lib/hugs/libraries/Data/Dynamic.hs
 lib/hugs/libraries/Data/Either.hs
 lib/hugs/libraries/Data/FiniteMap.hs
+lib/hugs/libraries/Data/Graph.hs
+lib/hugs/libraries/Data/HashTable.hs
 lib/hugs/libraries/Data/IORef.hs
 lib/hugs/libraries/Data/Int.hs
 lib/hugs/libraries/Data/Ix.hs
 lib/hugs/libraries/Data/List.hs
 lib/hugs/libraries/Data/Maybe.hs
+lib/hugs/libraries/Data/Monoid.hs
+lib/hugs/libraries/Data/PackedString.hs
 lib/hugs/libraries/Data/Ratio.hs
+lib/hugs/libraries/Data/STRef.hs
 lib/hugs/libraries/Data/STRef/Lazy.hs
 lib/hugs/libraries/Data/STRef/Strict.hs
-lib/hugs/libraries/Data/STRef.hs
 lib/hugs/libraries/Data/Set.hs
+lib/hugs/libraries/Data/Tree.hs
 lib/hugs/libraries/Data/Tuple.hs
+lib/hugs/libraries/Data/Typeable.hs
 lib/hugs/libraries/Data/Unique.hs
 lib/hugs/libraries/Data/Word.hs
+lib/hugs/libraries/Debug/QuickCheck.hs
 lib/hugs/libraries/Debug/QuickCheck/Poly.hs
 lib/hugs/libraries/Debug/QuickCheck/Utils.hs
-lib/hugs/libraries/Debug/QuickCheck.hs
 lib/hugs/libraries/Debug/Trace.hs
 lib/hugs/libraries/Directory.hs
+lib/hugs/libraries/Foreign.hs
+lib/hugs/libraries/Foreign/C.hs
 lib/hugs/libraries/Foreign/C/Error.hs
 lib/hugs/libraries/Foreign/C/Error.so
 lib/hugs/libraries/Foreign/C/String.hs
 lib/hugs/libraries/Foreign/C/Types.hs
-lib/hugs/libraries/Foreign/C/TypesISO.hs
-lib/hugs/libraries/Foreign/C.hs
 lib/hugs/libraries/Foreign/ForeignPtr.hs
+lib/hugs/libraries/Foreign/Marshal.hs
 lib/hugs/libraries/Foreign/Marshal/Alloc.hs
 lib/hugs/libraries/Foreign/Marshal/Alloc.so
 lib/hugs/libraries/Foreign/Marshal/Array.hs
 lib/hugs/libraries/Foreign/Marshal/Error.hs
+lib/hugs/libraries/Foreign/Marshal/Pool.hs
 lib/hugs/libraries/Foreign/Marshal/Utils.hs
 lib/hugs/libraries/Foreign/Marshal/Utils.so
 lib/hugs/libraries/Foreign/Ptr.hs
 lib/hugs/libraries/Foreign/StablePtr.hs
 lib/hugs/libraries/Foreign/Storable.hs
-lib/hugs/libraries/Foreign.hs
 lib/hugs/libraries/ForeignPtr.hs
 lib/hugs/libraries/Hugs/Array.hs
+lib/hugs/libraries/Hugs/Bits.hs
+lib/hugs/libraries/Hugs/ByteArray.hs
 lib/hugs/libraries/Hugs/CVHAssert.hs
 lib/hugs/libraries/Hugs/Char.hs
 lib/hugs/libraries/Hugs/ConcBase.hs
+lib/hugs/libraries/Hugs/Directory.hs
+lib/hugs/libraries/Hugs/Dynamic.hs
 lib/hugs/libraries/Hugs/Exception.hs
+lib/hugs/libraries/Hugs/ForeignPtr.hs
 lib/hugs/libraries/Hugs/GenericPrint.hs
 lib/hugs/libraries/Hugs/IO.hs
 lib/hugs/libraries/Hugs/IOArray.hs
@@ -276,8 +164,9 @@ lib/hugs/libraries/Hugs/Internals.hs
 lib/hugs/libraries/Hugs/LazyST.hs
 lib/hugs/libraries/Hugs/Memo.hs
 lib/hugs/libraries/Hugs/Numeric.hs
-lib/hugs/libraries/Hugs/Observe.lhs
+lib/hugs/libraries/Hugs/Observe.hs
 lib/hugs/libraries/Hugs/Prelude.hs
+lib/hugs/libraries/Hugs/Ptr.hs
 lib/hugs/libraries/Hugs/Quote.hs
 lib/hugs/libraries/Hugs/ST.hs
 lib/hugs/libraries/Hugs/Stable.hs
@@ -285,11 +174,12 @@ lib/hugs/libraries/Hugs/StablePtr.hs
 lib/hugs/libraries/Hugs/Storable.hs
 lib/hugs/libraries/Hugs/Storable.so
 lib/hugs/libraries/Hugs/System.hs
-lib/hugs/libraries/Hugs/Trace.hs
+lib/hugs/libraries/Hugs/Time.hs
 lib/hugs/libraries/Hugs/Trex.hs
 lib/hugs/libraries/Hugs/Weak.hs
 lib/hugs/libraries/Hugs/Word.hs
 lib/hugs/libraries/IO.hs
+lib/hugs/libraries/Int.hs
 lib/hugs/libraries/Ix.hs
 lib/hugs/libraries/Language/Haskell/Lexer.hs
 lib/hugs/libraries/Language/Haskell/ParseMonad.hs
@@ -297,7 +187,6 @@ lib/hugs/libraries/Language/Haskell/ParseUtils.hs
 lib/hugs/libraries/Language/Haskell/Parser.hs
 lib/hugs/libraries/Language/Haskell/Pretty.hs
 lib/hugs/libraries/Language/Haskell/Syntax.hs
-lib/hugs/libraries/Language/Haskell/THSyntax.hs
 lib/hugs/libraries/List.hs
 lib/hugs/libraries/Locale.hs
 lib/hugs/libraries/MarshalAlloc.hs
@@ -306,6 +195,12 @@ lib/hugs/libraries/MarshalError.hs
 lib/hugs/libraries/MarshalUtils.hs
 lib/hugs/libraries/Maybe.hs
 lib/hugs/libraries/Monad.hs
+lib/hugs/libraries/Network.hs
+lib/hugs/libraries/Network/BSD.hs
+lib/hugs/libraries/Network/BSD.so
+lib/hugs/libraries/Network/CGI.hs
+lib/hugs/libraries/Network/Socket.hs
+lib/hugs/libraries/Network/Socket.so
 lib/hugs/libraries/Network/URI.hs
 lib/hugs/libraries/Numeric.hs
 lib/hugs/libraries/Prelude.hs
@@ -314,25 +209,57 @@ lib/hugs/libraries/Random.hs
 lib/hugs/libraries/Ratio.hs
 lib/hugs/libraries/StablePtr.hs
 lib/hugs/libraries/Storable.hs
+lib/hugs/libraries/System.hs
 lib/hugs/libraries/System/CPUTime.hs
 lib/hugs/libraries/System/Cmd.hs
 lib/hugs/libraries/System/Console/GetOpt.hs
 lib/hugs/libraries/System/Directory.hs
 lib/hugs/libraries/System/Environment.hs
 lib/hugs/libraries/System/Exit.hs
+lib/hugs/libraries/System/IO.hs
 lib/hugs/libraries/System/IO/Error.hs
 lib/hugs/libraries/System/IO/Unsafe.hs
-lib/hugs/libraries/System/IO.hs
+lib/hugs/libraries/System/Info.hs
 lib/hugs/libraries/System/Locale.hs
+lib/hugs/libraries/System/Mem.hs
 lib/hugs/libraries/System/Mem/StableName.hs
 lib/hugs/libraries/System/Mem/Weak.hs
-lib/hugs/libraries/System/Mem.hs
+lib/hugs/libraries/System/Posix.hs
+lib/hugs/libraries/System/Posix/Directory.hs
+lib/hugs/libraries/System/Posix/Directory.so
+lib/hugs/libraries/System/Posix/DynamicLinker.hs
+lib/hugs/libraries/System/Posix/DynamicLinker/Module.hs
+lib/hugs/libraries/System/Posix/DynamicLinker/Prim.hs
+lib/hugs/libraries/System/Posix/DynamicLinker/Prim.so
+lib/hugs/libraries/System/Posix/Env.hs
+lib/hugs/libraries/System/Posix/Env.so
+lib/hugs/libraries/System/Posix/Files.hs
+lib/hugs/libraries/System/Posix/Files.so
+lib/hugs/libraries/System/Posix/IO.hs
+lib/hugs/libraries/System/Posix/Internals.hs
+lib/hugs/libraries/System/Posix/Internals.so
+lib/hugs/libraries/System/Posix/Process.hs
+lib/hugs/libraries/System/Posix/Process.so
+lib/hugs/libraries/System/Posix/Resource.hs
+lib/hugs/libraries/System/Posix/Resource.so
+lib/hugs/libraries/System/Posix/Signals.hs
+lib/hugs/libraries/System/Posix/Signals.so
+lib/hugs/libraries/System/Posix/Temp.hs
+lib/hugs/libraries/System/Posix/Temp.so
+lib/hugs/libraries/System/Posix/Terminal.hs
+lib/hugs/libraries/System/Posix/Terminal.so
+lib/hugs/libraries/System/Posix/Time.hs
+lib/hugs/libraries/System/Posix/Time.so
 lib/hugs/libraries/System/Posix/Types.hs
+lib/hugs/libraries/System/Posix/Unistd.hs
+lib/hugs/libraries/System/Posix/Unistd.so
+lib/hugs/libraries/System/Posix/User.hs
+lib/hugs/libraries/System/Posix/User.so
 lib/hugs/libraries/System/Random.hs
 lib/hugs/libraries/System/Time.hs
-lib/hugs/libraries/System.hs
-lib/hugs/libraries/Text/Html/BlockTable.hs
 lib/hugs/libraries/Text/Html.hs
+lib/hugs/libraries/Text/Html/BlockTable.hs
+lib/hugs/libraries/Text/ParserCombinators/Parsec.hs
 lib/hugs/libraries/Text/ParserCombinators/Parsec/Char.hs
 lib/hugs/libraries/Text/ParserCombinators/Parsec/Combinator.hs
 lib/hugs/libraries/Text/ParserCombinators/Parsec/Error.hs
@@ -342,16 +269,19 @@ lib/hugs/libraries/Text/ParserCombinators/Parsec/Perm.hs
 lib/hugs/libraries/Text/ParserCombinators/Parsec/Pos.hs
 lib/hugs/libraries/Text/ParserCombinators/Parsec/Prim.hs
 lib/hugs/libraries/Text/ParserCombinators/Parsec/Token.hs
-lib/hugs/libraries/Text/ParserCombinators/Parsec.hs
-lib/hugs/libraries/Text/PrettyPrint/HughesPJ.hs
+lib/hugs/libraries/Text/ParserCombinators/ReadP.hs
+lib/hugs/libraries/Text/ParserCombinators/ReadPrec.hs
 lib/hugs/libraries/Text/PrettyPrint.hs
+lib/hugs/libraries/Text/PrettyPrint/HughesPJ.hs
 lib/hugs/libraries/Text/Read.hs
+lib/hugs/libraries/Text/Read/Lex.hs
+lib/hugs/libraries/Text/Regex.hs
 lib/hugs/libraries/Text/Regex/Posix.hs
 lib/hugs/libraries/Text/Regex/Posix.so
-lib/hugs/libraries/Text/Regex.hs
-lib/hugs/libraries/Text/Show/Functions.hs
 lib/hugs/libraries/Text/Show.hs
+lib/hugs/libraries/Text/Show/Functions.hs
 lib/hugs/libraries/Time.hs
+lib/hugs/libraries/Word.hs
 lib/hugs/oldlib/Addr.hs
 lib/hugs/oldlib/AnsiInteract.hs
 lib/hugs/oldlib/AnsiScreen.hs
@@ -360,9 +290,11 @@ lib/hugs/oldlib/Arrow.hs
 lib/hugs/oldlib/Assoc.hs
 lib/hugs/oldlib/AssocDefaults.hs
 lib/hugs/oldlib/AssocList.hs
+lib/hugs/oldlib/BSD.hs
 lib/hugs/oldlib/BankersQueue.hs
 lib/hugs/oldlib/BinaryRandList.hs
 lib/hugs/oldlib/BraunSeq.hs
+lib/hugs/oldlib/CGI.lhs
 lib/hugs/oldlib/COPYRIGHT.edison
 lib/hugs/oldlib/CTypesISO.hs
 lib/hugs/oldlib/CVHAssert.hs
@@ -375,6 +307,7 @@ lib/hugs/oldlib/CollectionDefaults.hs
 lib/hugs/oldlib/CollectionUtils.hs
 lib/hugs/oldlib/ConcBase.hs
 lib/hugs/oldlib/Concurrent.lhs
+lib/hugs/oldlib/DiffArray.hs
 lib/hugs/oldlib/Dynamic.hs
 lib/hugs/oldlib/EdisonPrelude.hs
 lib/hugs/oldlib/Exception.hs
@@ -382,17 +315,20 @@ lib/hugs/oldlib/FiniteMap.lhs
 lib/hugs/oldlib/ForeignObj.hs
 lib/hugs/oldlib/GenericPrint.hs
 lib/hugs/oldlib/GetOpt.lhs
+lib/hugs/oldlib/HsLexer.hs
+lib/hugs/oldlib/HsParseMonad.hs
+lib/hugs/oldlib/HsParseUtils.hs
+lib/hugs/oldlib/HsParser.hs
+lib/hugs/oldlib/HsPretty.hs
+lib/hugs/oldlib/HsSyn.hs
 lib/hugs/oldlib/Html.lhs
 lib/hugs/oldlib/HtmlBlockTable.lhs
-lib/hugs/oldlib/HugsDynamic.hs
 lib/hugs/oldlib/HugsInternals.hs
 lib/hugs/oldlib/HugsLibs.hs
-lib/hugs/oldlib/HugsStorable.hs
 lib/hugs/oldlib/IArray.hs
 lib/hugs/oldlib/IOExtensions.hs
 lib/hugs/oldlib/IOExts.hs
 lib/hugs/oldlib/IORef.hs
-lib/hugs/oldlib/Int.hs
 lib/hugs/oldlib/Interact.hs
 lib/hugs/oldlib/JoinList.hs
 lib/hugs/oldlib/LazyPairingHeap.hs
@@ -402,7 +338,6 @@ lib/hugs/oldlib/ListSeq.hs
 lib/hugs/oldlib/ListUtils.hs
 lib/hugs/oldlib/MVar.lhs
 lib/hugs/oldlib/Memo.hs
-lib/hugs/oldlib/Merge.lhs
 lib/hugs/oldlib/MinHeap.hs
 lib/hugs/oldlib/MonadCont.lhs
 lib/hugs/oldlib/MonadEither.lhs
@@ -417,9 +352,11 @@ lib/hugs/oldlib/MonadTrans.lhs
 lib/hugs/oldlib/MonadWriter.lhs
 lib/hugs/oldlib/Monoid.lhs
 lib/hugs/oldlib/MyersStack.hs
+lib/hugs/oldlib/NativeInfo.hs
 lib/hugs/oldlib/NumExts.lhs
 lib/hugs/oldlib/Number.hs
 lib/hugs/oldlib/Observe.hs
+lib/hugs/oldlib/PackedString.lhs
 lib/hugs/oldlib/Parallel.lhs
 lib/hugs/oldlib/ParseLib.hs
 lib/hugs/oldlib/Parsec.hs
@@ -441,6 +378,7 @@ lib/hugs/oldlib/QuickCheckPoly.hs
 lib/hugs/oldlib/QuickCheckUtils.hs
 lib/hugs/oldlib/Quote.hs
 lib/hugs/oldlib/RandList.hs
+lib/hugs/oldlib/RegexString.lhs
 lib/hugs/oldlib/RevSeq.hs
 lib/hugs/oldlib/ST.hs
 lib/hugs/oldlib/SampleVar.lhs
@@ -452,6 +390,7 @@ lib/hugs/oldlib/ShowFunctions.hs
 lib/hugs/oldlib/SimpleQueue.hs
 lib/hugs/oldlib/SizedSeq.hs
 lib/hugs/oldlib/SkewHeap.hs
+lib/hugs/oldlib/SocketPrim.hs
 lib/hugs/oldlib/SplayHeap.hs
 lib/hugs/oldlib/Stable.hs
 lib/hugs/oldlib/StableName.hs
@@ -462,34 +401,36 @@ lib/hugs/oldlib/TestOrdSet.hs
 lib/hugs/oldlib/TestSeq.hs
 lib/hugs/oldlib/Trace.hs
 lib/hugs/oldlib/Trex.hs
+lib/hugs/oldlib/URI.hs
 lib/hugs/oldlib/UnbalancedSet.hs
 lib/hugs/oldlib/Unique.lhs
 lib/hugs/oldlib/Weak.hs
-lib/hugs/oldlib/Word.hs
-%%PORTDOCS%%share/doc/hugs98/editor-notes.txt
-%%PORTDOCS%%share/doc/hugs98/ffi-notes.txt
-%%PORTDOCS%%share/doc/hugs98/libraries-notes.txt
-%%PORTDOCS%%share/doc/hugs98/machugs-notes.txt
-%%PORTDOCS%%share/doc/hugs98/mdo-notes.txt
-%%PORTDOCS%%share/doc/hugs98/observe-notes.txt
-%%PORTDOCS%%share/doc/hugs98/options.txt
-%%PORTDOCS%%share/doc/hugs98/winhugs-notes.txt
-%%PORTDOCS%%share/doc/hugs98/zipcomp-notes.txt
-%%PORTDOCS%%share/doc/hugs98/server.tex
-%%PORTDOCS%%share/doc/hugs98/server.html
-%%PORTDOCS%%share/doc/hugs98/Credits
-%%PORTDOCS%%share/doc/hugs98/License
-%%PORTDOCS%%share/doc/hugs98/Readme
-%%PORTDOCS%%@dirrm share/doc/hugs98
+lib/hugs/tools/Package.hs
+lib/hugs/tools/ParsePkgConf.hs
+lib/hugs/tools/get_pkg_field
+%%PORTDOCS%%%%DOCSDIR%%/Credits
+%%PORTDOCS%%%%DOCSDIR%%/License
+%%PORTDOCS%%%%DOCSDIR%%/Readme
+%%PORTDOCS%%%%DOCSDIR%%/ffi-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/libraries-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/machugs-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/packages.txt
+%%PORTDOCS%%%%DOCSDIR%%/server.html
+%%PORTDOCS%%%%DOCSDIR%%/server.tex
+%%PORTDOCS%%%%DOCSDIR%%/win32-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/winhugs-notes.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/hugs/demos/GLUT/Misc
+@dirrm lib/hugs/demos/GLUT/RedBook
+@dirrm lib/hugs/demos/GLUT
 @dirrm lib/hugs/demos/prolog
 @dirrm lib/hugs/demos
 @dirrm lib/hugs/include
-@dirrm lib/hugs/lib/exts
-@dirrm lib/hugs/lib/hugs
 @dirrm lib/hugs/libraries/Control/Concurrent
 @dirrm lib/hugs/libraries/Control/Monad/ST
 @dirrm lib/hugs/libraries/Control/Monad
 @dirrm lib/hugs/libraries/Control
+@dirrm lib/hugs/libraries/Data/Array/IO
 @dirrm lib/hugs/libraries/Data/Array
 @dirrm lib/hugs/libraries/Data/STRef
 @dirrm lib/hugs/libraries/Data
@@ -505,16 +446,18 @@ lib/hugs/oldlib/Word.hs
 @dirrm lib/hugs/libraries/System/Console
 @dirrm lib/hugs/libraries/System/IO
 @dirrm lib/hugs/libraries/System/Mem
+@dirrm lib/hugs/libraries/System/Posix/DynamicLinker
 @dirrm lib/hugs/libraries/System/Posix
 @dirrm lib/hugs/libraries/System
 @dirrm lib/hugs/libraries/Text/Html
 @dirrm lib/hugs/libraries/Text/ParserCombinators/Parsec
 @dirrm lib/hugs/libraries/Text/ParserCombinators
 @dirrm lib/hugs/libraries/Text/PrettyPrint
+@dirrm lib/hugs/libraries/Text/Read
 @dirrm lib/hugs/libraries/Text/Regex
 @dirrm lib/hugs/libraries/Text/Show
 @dirrm lib/hugs/libraries/Text
 @dirrm lib/hugs/libraries
 @dirrm lib/hugs/oldlib
-@dirrm lib/hugs/lib
+@dirrm lib/hugs/tools
 @dirrm lib/hugs