summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/hugs/DESCR39
-rw-r--r--lang/hugs/Makefile37
-rw-r--r--lang/hugs/PLIST693
-rw-r--r--lang/hugs/distinfo15
-rwxr-xr-xlang/hugs/files/configure7
-rw-r--r--lang/hugs/patches/patch-aa44
-rw-r--r--lang/hugs/patches/patch-ab42
-rw-r--r--lang/hugs/patches/patch-ac31
-rw-r--r--lang/hugs/patches/patch-ad13
9 files changed, 602 insertions, 319 deletions
diff --git a/lang/hugs/DESCR b/lang/hugs/DESCR
index 65e76ebf67f..c958942f66a 100644
--- a/lang/hugs/DESCR
+++ b/lang/hugs/DESCR
@@ -1,19 +1,22 @@
-The Nottingham and Yale Haskell interpreter and programming environment.
+Hugs 98 is a functional programming system based on Haskell 98, the de
+facto standard for non-strict functional programming languages. Hugs 98
+provides an almost complete implementation of Haskell 98, including:
- Nottingham and Yale are pleased to announce a new release of Hugs,
- a Haskell interpreter and programming environment for developing
- cool Haskell programs. Sources and binaries are freely available
- by anonymous FTP and on the World-Wide Web.
-
- This release is largely conformant with Haskell 1.4, including
- monad and record syntax, newtypes, strictness annotations, and
- modules. In addition, it comes packaged with the libraries defined
- in the most recent version of the Haskell Library Report and with
- extension libraries which are compatible with GHC 3.0.
-
- Hugs is best used as a Haskell program development system: it boasts
- extremely fast compilation, supports incremental compilation, and
- has the convenience of an interactive interpreter (within which one
- can move from module to module to test different portions of a
- program). However, being an interpreter, it does not nearly match
- the run-time performance of, for example, GHC or HBC.
+* Lazy evaluation, higher order functions, and pattern matching.
+* A wide range of built-in types, from characters to bignums, and lists
+ to functions, with comprehensive facilities for defining new datatypes
+ and type synonyms.
+* An advanced polymorphic type system with type and constructor class
+ overloading.
+* All of the features of the Haskell 98 expression and pattern syntax
+ including lambda, case, conditional and let expressions, list
+ comprehensions, do-notation, operator sections, and wildcard,
+ irrefutable and `as' patterns.
+* An implementation of the Haskell 98 primitives for monadic I/O, with
+ support for simple interactive programs, access to text files,
+ handle-based I/O, and exception handling.
+* An almost complete implementation of the Haskell module system.
+ Hugs 98 also supports a number of advanced and experimental extensions
+ including multi-parameter classes, extensible records, rank-2
+ polymorphism, existentials, scoped type variables, and restricted
+ type synonyms.
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 27d71a9bac3..578e3a7a9c7 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,33 +1,24 @@
-# $NetBSD: Makefile,v 1.32 2005/11/03 22:35:53 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2006/08/01 14:33:59 jmmv Exp $
-DISTNAME= hugs98-Dec2001
-PKGNAME= hugs98-200112
-PKGREVISION= 2
+DISTNAME= hugs98-May2006
+PKGNAME= hugs98-200605
CATEGORIES= lang
-MASTER_SITES= http://cvs.haskell.org/Hugs/downloads/
+MASTER_SITES= http://cvs.haskell.org/Hugs/downloads/2006-05/
MAINTAINER= nathanw@mit.edu
HOMEPAGE= http://www.haskell.org/hugs/
-COMMENT= Nottingham and Yale Haskell interpreter and programming environment
+COMMENT= Functional programming system based on Haskell 98
GNU_CONFIGURE= yes
-CONFIGURE_DIRS= src/unix
-CONFIGURE_ARGS+= --with-readline
-BUILD_DIRS= src
-BUILD_TARGET= default
+USE_TOOLS+= gmake
-.include "../../mk/bsd.prefs.mk"
+CONFIGURE_ARGS+= --build=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+= --target=${MACHINE_GNU_PLATFORM:Q}
-.if ${OPSYS} == "Darwin"
-# Trick it into not checking if symbols have leading underscores,
-# since the dlcompat layer expects you to not be that clever.
-CONFIGURE_ENV+= ac_cv_header_nlist_h=no
-.endif
-
-INSTALLATION_DIRS= man/man1
-
-post-install:
- ${INSTALL_MAN} ${WRKSRC}/docs/hugs.1 ${PREFIX}/man/man1/hugs.1
-
-.include "../../devel/readline/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+
+# The default -O2 breaks the interpreter producing strange internal errors
+# at run time.
+.if !empty(CC_VERSION:Mgcc-4*)
+CFLAGS+= -O0
+.endif
diff --git a/lang/hugs/PLIST b/lang/hugs/PLIST
index 3c099856250..dbea8d90e95 100644
--- a/lang/hugs/PLIST
+++ b/lang/hugs/PLIST
@@ -1,195 +1,504 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/09 02:59:14 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/08/01 14:33:59 jmmv Exp $
+bin/cpphs-hugs
+bin/ffihugs
+bin/hsc2hs-hugs
bin/hugs
bin/runhugs
+lib/hugs/Credits
+lib/hugs/License
+lib/hugs/Readme
+lib/hugs/demos/AnsiDemo.hs
+lib/hugs/demos/ArrayEx.hs
+lib/hugs/demos/Cabal/DefaultSetup.lhs
+lib/hugs/demos/Cabal/hapax.hs
+lib/hugs/demos/Calendar.hs
+lib/hugs/demos/CommaInt.lhs
+lib/hugs/demos/Demos.hs
+lib/hugs/demos/Eliza.hs
+lib/hugs/demos/EvalRed.hs
+lib/hugs/demos/Examples.hs
+lib/hugs/demos/Expr.hs
+lib/hugs/demos/FastSort.hs
+lib/hugs/demos/Gofer.hs
+lib/hugs/demos/Lattice.hs
+lib/hugs/demos/Ldfs.hs
+lib/hugs/demos/Literate.lhs
+lib/hugs/demos/Makefile.in
+lib/hugs/demos/Matrix.hs
+lib/hugs/demos/Mersenne.hs
+lib/hugs/demos/Minsrand.hs
+lib/hugs/demos/Queens.hs
+lib/hugs/demos/Say.hs
+lib/hugs/demos/Stack.hs
+lib/hugs/demos/Tree.hs
+lib/hugs/demos/prolog/AndorraEngine.hs
+lib/hugs/demos/prolog/CombParse.hs
+lib/hugs/demos/prolog/Main.hs
+lib/hugs/demos/prolog/Prolog.hs
+lib/hugs/demos/prolog/PureEngine.hs
+lib/hugs/demos/prolog/StackEngine.hs
+lib/hugs/demos/prolog/Subst.hs
+lib/hugs/demos/prolog/readme
+lib/hugs/demos/prolog/stdlib
+lib/hugs/docs/ffi-notes.txt
+lib/hugs/docs/libraries-notes.txt
+lib/hugs/docs/machugs-notes.txt
+lib/hugs/docs/server.html
+lib/hugs/docs/server.tex
+lib/hugs/docs/winhugs-notes.txt
+lib/hugs/include/HsFFI.h
+lib/hugs/oldlib/Addr.hs
+lib/hugs/oldlib/AnsiInteract.hs
+lib/hugs/oldlib/AnsiScreen.hs
+lib/hugs/oldlib/ArrayBase.hs
+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/CVHAssert.hs
+lib/hugs/oldlib/CVar.lhs
+lib/hugs/oldlib/Chan.lhs
+lib/hugs/oldlib/Channel.lhs
+lib/hugs/oldlib/ChannelVar.lhs
+lib/hugs/oldlib/Collection.hs
+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
+lib/hugs/oldlib/FiniteMap.lhs
+lib/hugs/oldlib/ForeignObj.hs
+lib/hugs/oldlib/GenericPrint.hs
+lib/hugs/oldlib/GetOpt.lhs
+lib/hugs/oldlib/GraphicsCore.hs
+lib/hugs/oldlib/GraphicsUtils.hs
+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/HugsInternals.hs
+lib/hugs/oldlib/HugsLibs.hs
+lib/hugs/oldlib/IArray.hs
+lib/hugs/oldlib/IOExtensions.hs
+lib/hugs/oldlib/IOExts.hs
+lib/hugs/oldlib/IORef.hs
+lib/hugs/oldlib/Interact.hs
+lib/hugs/oldlib/JoinList.hs
+lib/hugs/oldlib/LazyPairingHeap.hs
+lib/hugs/oldlib/LazyST.hs
+lib/hugs/oldlib/LeftistHeap.hs
+lib/hugs/oldlib/ListSeq.hs
+lib/hugs/oldlib/ListUtils.hs
+lib/hugs/oldlib/MVar.lhs
+lib/hugs/oldlib/Memo.hs
+lib/hugs/oldlib/MinHeap.hs
+lib/hugs/oldlib/MonadCont.lhs
+lib/hugs/oldlib/MonadEither.lhs
+lib/hugs/oldlib/MonadError.lhs
+lib/hugs/oldlib/MonadFix.lhs
+lib/hugs/oldlib/MonadIdentity.lhs
+lib/hugs/oldlib/MonadList.lhs
+lib/hugs/oldlib/MonadRWS.lhs
+lib/hugs/oldlib/MonadReader.lhs
+lib/hugs/oldlib/MonadState.lhs
+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/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
+lib/hugs/oldlib/ParsecChar.hs
+lib/hugs/oldlib/ParsecCombinator.hs
+lib/hugs/oldlib/ParsecError.hs
+lib/hugs/oldlib/ParsecExpr.hs
+lib/hugs/oldlib/ParsecLanguage.hs
+lib/hugs/oldlib/ParsecPerm.hs
+lib/hugs/oldlib/ParsecPos.hs
+lib/hugs/oldlib/ParsecPrim.hs
+lib/hugs/oldlib/ParsecToken.hs
+lib/hugs/oldlib/PatriciaLoMap.hs
+lib/hugs/oldlib/PosixDB.lhs
+lib/hugs/oldlib/PosixFiles.lhs
+lib/hugs/oldlib/PosixIO.lhs
+lib/hugs/oldlib/PosixTTY.lhs
+lib/hugs/oldlib/Pretty.lhs
+lib/hugs/oldlib/QSem.lhs
+lib/hugs/oldlib/QSemN.lhs
+lib/hugs/oldlib/QuickCheck.hs
+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/SOEGraphics.hs
+lib/hugs/oldlib/ST.hs
+lib/hugs/oldlib/SampleVar.lhs
+lib/hugs/oldlib/Semaphore.lhs
+lib/hugs/oldlib/Sequence.hs
+lib/hugs/oldlib/SequenceDefaults.hs
+lib/hugs/oldlib/Set.lhs
+lib/hugs/oldlib/ShowFunctions.hs
+lib/hugs/oldlib/SimpleQueue.hs
+lib/hugs/oldlib/SizedSeq.hs
+lib/hugs/oldlib/SkewHeap.hs
+lib/hugs/oldlib/Socket.lhs
+lib/hugs/oldlib/SocketPrim.hs
+lib/hugs/oldlib/SplayHeap.hs
+lib/hugs/oldlib/Stable.hs
+lib/hugs/oldlib/StableName.hs
+lib/hugs/oldlib/StdLibs.hs
+lib/hugs/oldlib/StorableArray.hs
+lib/hugs/oldlib/TestOrdBag.hs
+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/packages/Cabal/Distribution/Compat/Directory.hs
+lib/hugs/packages/Cabal/Distribution/Compat/Exception.hs
+lib/hugs/packages/Cabal/Distribution/Compat/FilePath.hs
+lib/hugs/packages/Cabal/Distribution/Compat/RawSystem.hs
+lib/hugs/packages/Cabal/Distribution/Compat/ReadP.hs
+lib/hugs/packages/Cabal/Distribution/Compiler.hs
+lib/hugs/packages/Cabal/Distribution/Extension.hs
+lib/hugs/packages/Cabal/Distribution/GetOpt.hs
+lib/hugs/packages/Cabal/Distribution/InstalledPackageInfo.hs
+lib/hugs/packages/Cabal/Distribution/License.hs
+lib/hugs/packages/Cabal/Distribution/Make.hs
+lib/hugs/packages/Cabal/Distribution/Package.hs
+lib/hugs/packages/Cabal/Distribution/PackageDescription.hs
+lib/hugs/packages/Cabal/Distribution/ParseUtils.hs
+lib/hugs/packages/Cabal/Distribution/PreProcess.hs
+lib/hugs/packages/Cabal/Distribution/PreProcess/Unlit.hs
+lib/hugs/packages/Cabal/Distribution/Program.hs
+lib/hugs/packages/Cabal/Distribution/Setup.hs
+lib/hugs/packages/Cabal/Distribution/Simple.hs
+lib/hugs/packages/Cabal/Distribution/Simple/Build.hs
+lib/hugs/packages/Cabal/Distribution/Simple/Configure.hs
+lib/hugs/packages/Cabal/Distribution/Simple/GHC.hs
+lib/hugs/packages/Cabal/Distribution/Simple/GHCPackageConfig.hs
+lib/hugs/packages/Cabal/Distribution/Simple/Hugs.hs
+lib/hugs/packages/Cabal/Distribution/Simple/Install.hs
+lib/hugs/packages/Cabal/Distribution/Simple/JHC.hs
+lib/hugs/packages/Cabal/Distribution/Simple/LocalBuildInfo.hs
+lib/hugs/packages/Cabal/Distribution/Simple/NHC.hs
+lib/hugs/packages/Cabal/Distribution/Simple/Register.hs
+lib/hugs/packages/Cabal/Distribution/Simple/SrcDist.hs
+lib/hugs/packages/Cabal/Distribution/Simple/Utils.hs
+lib/hugs/packages/Cabal/Distribution/Version.hs
+lib/hugs/packages/Cabal/LICENSE
+lib/hugs/packages/Cabal/Language/Haskell/Extension.hs
+lib/hugs/packages/Cabal/Paths_Cabal.hs
+lib/hugs/packages/Cabal/copyright
+lib/hugs/packages/base/Control/Applicative.hs
+lib/hugs/packages/base/Control/Arrow.hs
+lib/hugs/packages/base/Control/Concurrent.hs
+lib/hugs/packages/base/Control/Concurrent/Chan.hs
+lib/hugs/packages/base/Control/Concurrent/MVar.hs
+lib/hugs/packages/base/Control/Concurrent/QSem.hs
+lib/hugs/packages/base/Control/Concurrent/QSemN.hs
+lib/hugs/packages/base/Control/Concurrent/SampleVar.hs
+lib/hugs/packages/base/Control/Exception.hs
+lib/hugs/packages/base/Control/Monad.hs
+lib/hugs/packages/base/Control/Monad/Fix.hs
+lib/hugs/packages/base/Control/Monad/Instances.hs
+lib/hugs/packages/base/Control/Monad/ST.hs
+lib/hugs/packages/base/Control/Monad/ST/Lazy.hs
+lib/hugs/packages/base/Control/Monad/ST/Strict.hs
+lib/hugs/packages/base/Control/Parallel.hs
+lib/hugs/packages/base/Data/Array.hs
+lib/hugs/packages/base/Data/Array/Base.hs
+lib/hugs/packages/base/Data/Array/Diff.hs
+lib/hugs/packages/base/Data/Array/IArray.hs
+lib/hugs/packages/base/Data/Array/IO.hs
+lib/hugs/packages/base/Data/Array/IO/Internals.hs
+lib/hugs/packages/base/Data/Array/MArray.hs
+lib/hugs/packages/base/Data/Array/ST.hs
+lib/hugs/packages/base/Data/Array/Storable.hs
+lib/hugs/packages/base/Data/Array/Unboxed.hs
+lib/hugs/packages/base/Data/Bits.hs
+lib/hugs/packages/base/Data/Bool.hs
+lib/hugs/packages/base/Data/ByteString.hs
+lib/hugs/packages/base/Data/ByteString.so
+lib/hugs/packages/base/Data/ByteString/Char8.hs
+lib/hugs/packages/base/Data/ByteString/Char8.so
+lib/hugs/packages/base/Data/Char.hs
+lib/hugs/packages/base/Data/Complex.hs
+lib/hugs/packages/base/Data/Dynamic.hs
+lib/hugs/packages/base/Data/Either.hs
+lib/hugs/packages/base/Data/Eq.hs
+lib/hugs/packages/base/Data/FiniteMap.hs
+lib/hugs/packages/base/Data/Fixed.hs
+lib/hugs/packages/base/Data/Foldable.hs
+lib/hugs/packages/base/Data/FunctorM.hs
+lib/hugs/packages/base/Data/Graph.hs
+lib/hugs/packages/base/Data/HashTable.hs
+lib/hugs/packages/base/Data/IORef.hs
+lib/hugs/packages/base/Data/Int.hs
+lib/hugs/packages/base/Data/IntMap.hs
+lib/hugs/packages/base/Data/IntSet.hs
+lib/hugs/packages/base/Data/Ix.hs
+lib/hugs/packages/base/Data/List.hs
+lib/hugs/packages/base/Data/Map.hs
+lib/hugs/packages/base/Data/Maybe.hs
+lib/hugs/packages/base/Data/Monoid.hs
+lib/hugs/packages/base/Data/Ord.hs
+lib/hugs/packages/base/Data/PackedString.hs
+lib/hugs/packages/base/Data/Queue.hs
+lib/hugs/packages/base/Data/Ratio.hs
+lib/hugs/packages/base/Data/STRef.hs
+lib/hugs/packages/base/Data/STRef/Lazy.hs
+lib/hugs/packages/base/Data/STRef/Strict.hs
+lib/hugs/packages/base/Data/Sequence.hs
+lib/hugs/packages/base/Data/Set.hs
+lib/hugs/packages/base/Data/Traversable.hs
+lib/hugs/packages/base/Data/Tree.hs
+lib/hugs/packages/base/Data/Tuple.hs
+lib/hugs/packages/base/Data/Typeable.hs
+lib/hugs/packages/base/Data/Unique.hs
+lib/hugs/packages/base/Data/Version.hs
+lib/hugs/packages/base/Data/Word.hs
+lib/hugs/packages/base/Debug/Trace.hs
+lib/hugs/packages/base/Foreign.hs
+lib/hugs/packages/base/Foreign/C.hs
+lib/hugs/packages/base/Foreign/C/Error.hs
+lib/hugs/packages/base/Foreign/C/Error.so
+lib/hugs/packages/base/Foreign/C/String.hs
+lib/hugs/packages/base/Foreign/C/Types.hs
+lib/hugs/packages/base/Foreign/ForeignPtr.hs
+lib/hugs/packages/base/Foreign/Marshal.hs
+lib/hugs/packages/base/Foreign/Marshal/Alloc.hs
+lib/hugs/packages/base/Foreign/Marshal/Alloc.so
+lib/hugs/packages/base/Foreign/Marshal/Array.hs
+lib/hugs/packages/base/Foreign/Marshal/Error.hs
+lib/hugs/packages/base/Foreign/Marshal/Pool.hs
+lib/hugs/packages/base/Foreign/Marshal/Utils.hs
+lib/hugs/packages/base/Foreign/Marshal/Utils.so
+lib/hugs/packages/base/Foreign/Ptr.hs
+lib/hugs/packages/base/Foreign/Ptr.so
+lib/hugs/packages/base/Foreign/StablePtr.hs
+lib/hugs/packages/base/Foreign/Storable.hs
+lib/hugs/packages/base/LICENSE
+lib/hugs/packages/base/Numeric.hs
+lib/hugs/packages/base/Paths_base.hs
+lib/hugs/packages/base/Prelude.hs
+lib/hugs/packages/base/System/CPUTime.hs
+lib/hugs/packages/base/System/Cmd.hs
+lib/hugs/packages/base/System/Console/GetOpt.hs
+lib/hugs/packages/base/System/Directory.hs
+lib/hugs/packages/base/System/Directory/Internals.hs
+lib/hugs/packages/base/System/Environment.hs
+lib/hugs/packages/base/System/Exit.hs
+lib/hugs/packages/base/System/IO.hs
+lib/hugs/packages/base/System/IO/Error.hs
+lib/hugs/packages/base/System/IO/Unsafe.hs
+lib/hugs/packages/base/System/Info.hs
+lib/hugs/packages/base/System/Locale.hs
+lib/hugs/packages/base/System/Mem.hs
+lib/hugs/packages/base/System/Mem/StableName.hs
+lib/hugs/packages/base/System/Mem/Weak.hs
+lib/hugs/packages/base/System/Posix/Internals.hs
+lib/hugs/packages/base/System/Posix/Internals.so
+lib/hugs/packages/base/System/Posix/Signals.hs
+lib/hugs/packages/base/System/Posix/Signals.so
+lib/hugs/packages/base/System/Posix/Types.hs
+lib/hugs/packages/base/System/Process/Internals.hs
+lib/hugs/packages/base/System/Process/Internals.so
+lib/hugs/packages/base/System/Random.hs
+lib/hugs/packages/base/System/Time.hs
+lib/hugs/packages/base/Text/Html.hs
+lib/hugs/packages/base/Text/Html/BlockTable.hs
+lib/hugs/packages/base/Text/ParserCombinators/ReadP.hs
+lib/hugs/packages/base/Text/ParserCombinators/ReadPrec.hs
+lib/hugs/packages/base/Text/PrettyPrint.hs
+lib/hugs/packages/base/Text/PrettyPrint/HughesPJ.hs
+lib/hugs/packages/base/Text/Printf.hs
+lib/hugs/packages/base/Text/Read.hs
+lib/hugs/packages/base/Text/Read/Lex.hs
+lib/hugs/packages/base/Text/Regex.hs
+lib/hugs/packages/base/Text/Regex/Posix.hs
+lib/hugs/packages/base/Text/Regex/Posix.so
+lib/hugs/packages/base/Text/Show.hs
+lib/hugs/packages/base/Text/Show/Functions.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/CppIfdef.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/HashDefine.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/MacroPass.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/Options.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/Position.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/ReadFirst.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/RunCpphs.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/SymTab.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs/Tokenise.hs
+lib/hugs/packages/cpphs/Language/Preprocessor/Unlit.hs
+lib/hugs/packages/cpphs/Paths_cpphs.hs
+lib/hugs/packages/cpphs/Text/ParserCombinators/HuttonMeijer.hs
+lib/hugs/packages/haskell98/Array.hs
+lib/hugs/packages/haskell98/Bits.hs
+lib/hugs/packages/haskell98/CError.hs
+lib/hugs/packages/haskell98/CForeign.hs
+lib/hugs/packages/haskell98/CPUTime.hs
+lib/hugs/packages/haskell98/CString.hs
+lib/hugs/packages/haskell98/CTypes.hs
+lib/hugs/packages/haskell98/Char.hs
+lib/hugs/packages/haskell98/Complex.hs
+lib/hugs/packages/haskell98/Directory.hs
+lib/hugs/packages/haskell98/ForeignPtr.hs
+lib/hugs/packages/haskell98/IO.hs
+lib/hugs/packages/haskell98/Int.hs
+lib/hugs/packages/haskell98/Ix.hs
+lib/hugs/packages/haskell98/LICENSE
+lib/hugs/packages/haskell98/List.hs
+lib/hugs/packages/haskell98/Locale.hs
+lib/hugs/packages/haskell98/MarshalAlloc.hs
+lib/hugs/packages/haskell98/MarshalArray.hs
+lib/hugs/packages/haskell98/MarshalError.hs
+lib/hugs/packages/haskell98/MarshalUtils.hs
+lib/hugs/packages/haskell98/Maybe.hs
+lib/hugs/packages/haskell98/Monad.hs
+lib/hugs/packages/haskell98/Paths_haskell98.hs
+lib/hugs/packages/haskell98/Ptr.hs
+lib/hugs/packages/haskell98/Random.hs
+lib/hugs/packages/haskell98/Ratio.hs
+lib/hugs/packages/haskell98/StablePtr.hs
+lib/hugs/packages/haskell98/Storable.hs
+lib/hugs/packages/haskell98/System.hs
+lib/hugs/packages/haskell98/Time.hs
+lib/hugs/packages/haskell98/Word.hs
+lib/hugs/packages/hugsbase/Hugs.hs
+lib/hugs/packages/hugsbase/Hugs/Array.hs
+lib/hugs/packages/hugsbase/Hugs/Bits.hs
+lib/hugs/packages/hugsbase/Hugs/ByteArray.hs
+lib/hugs/packages/hugsbase/Hugs/CVHAssert.hs
+lib/hugs/packages/hugsbase/Hugs/Char.hs
+lib/hugs/packages/hugsbase/Hugs/ConcBase.hs
+lib/hugs/packages/hugsbase/Hugs/Directory.hs
+lib/hugs/packages/hugsbase/Hugs/Dynamic.hs
+lib/hugs/packages/hugsbase/Hugs/Exception.hs
+lib/hugs/packages/hugsbase/Hugs/ForeignPtr.hs
+lib/hugs/packages/hugsbase/Hugs/GenericPrint.hs
+lib/hugs/packages/hugsbase/Hugs/IO.hs
+lib/hugs/packages/hugsbase/Hugs/IOArray.hs
+lib/hugs/packages/hugsbase/Hugs/IOExts.hs
+lib/hugs/packages/hugsbase/Hugs/IORef.hs
+lib/hugs/packages/hugsbase/Hugs/Int.hs
+lib/hugs/packages/hugsbase/Hugs/Internals.hs
+lib/hugs/packages/hugsbase/Hugs/LazyST.hs
+lib/hugs/packages/hugsbase/Hugs/Memo.hs
+lib/hugs/packages/hugsbase/Hugs/Numeric.hs
+lib/hugs/packages/hugsbase/Hugs/Observe.hs
+lib/hugs/packages/hugsbase/Hugs/Prelude.hs
+lib/hugs/packages/hugsbase/Hugs/Ptr.hs
+lib/hugs/packages/hugsbase/Hugs/Quote.hs
+lib/hugs/packages/hugsbase/Hugs/ST.hs
+lib/hugs/packages/hugsbase/Hugs/Stable.hs
+lib/hugs/packages/hugsbase/Hugs/StablePtr.hs
+lib/hugs/packages/hugsbase/Hugs/Storable.hs
+lib/hugs/packages/hugsbase/Hugs/Storable.so
+lib/hugs/packages/hugsbase/Hugs/System.hs
+lib/hugs/packages/hugsbase/Hugs/Time.hs
+lib/hugs/packages/hugsbase/Hugs/Trex.hs
+lib/hugs/packages/hugsbase/Hugs/Weak.hs
+lib/hugs/packages/hugsbase/Hugs/Word.hs
+lib/hugs/packages/hugsbase/Paths_hugsbase.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/CppIfdef.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/HashDefine.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/MacroPass.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/Options.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/Position.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/ReadFirst.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/RunCpphs.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/SymTab.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs/Tokenise.hs
+lib/hugs/programs/cpphs/Language/Preprocessor/Unlit.hs
+lib/hugs/programs/cpphs/Main.hs
+lib/hugs/programs/cpphs/Paths_cpphs.hs
+lib/hugs/programs/cpphs/Text/ParserCombinators/HuttonMeijer.hs
+lib/hugs/programs/hsc2hs/Main.hs
+lib/hugs/programs/hsc2hs/Paths_hsc2hs.hs
man/man1/hugs.1
-share/hugs/Credits
-share/hugs/License
-share/hugs/Readme
-share/hugs/demos/AnsiDemo.hs
-share/hugs/demos/ArrayEx.hs
-share/hugs/demos/Calendar.hs
-share/hugs/demos/CommaInt.lhs
-share/hugs/demos/Demos.hs
-share/hugs/demos/Eliza.hs
-share/hugs/demos/EvalRed.hs
-share/hugs/demos/Examples.hs
-share/hugs/demos/Expr.hs
-share/hugs/demos/FastSort.hs
-share/hugs/demos/Gofer.hs
-share/hugs/demos/Lattice.hs
-share/hugs/demos/Ldfs.hs
-share/hugs/demos/Literate.lhs
-share/hugs/demos/Matrix.hs
-share/hugs/demos/Mersenne.hs
-share/hugs/demos/Minsrand.hs
-share/hugs/demos/Queens.hs
-share/hugs/demos/Say.hs
-share/hugs/demos/Stack.hs
-share/hugs/demos/Tree.hs
-share/hugs/demos/prolog/AndorraEngine.hs
-share/hugs/demos/prolog/CombParse.hs
-share/hugs/demos/prolog/Main.hs
-share/hugs/demos/prolog/Prolog.hs
-share/hugs/demos/prolog/PureEngine.hs
-share/hugs/demos/prolog/StackEngine.hs
-share/hugs/demos/prolog/Subst.hs
-share/hugs/demos/prolog/readme
-share/hugs/demos/prolog/stdlib
-share/hugs/docs/ffi-notes.txt
-share/hugs/docs/machugs-notes.txt
-share/hugs/docs/mdo-notes.txt
-share/hugs/docs/observe-notes.txt
-share/hugs/docs/server.html
-share/hugs/docs/server.tex
-share/hugs/docs/winhugs-notes.txt
-share/hugs/docs/zipcomp-notes.txt
-share/hugs/include/GreenCard.h
-share/hugs/lib/Array.hs
-share/hugs/lib/CPUTime.hs
-share/hugs/lib/Char.hs
-share/hugs/lib/Complex.hs
-share/hugs/lib/Directory.hs
-share/hugs/lib/IO.hs
-share/hugs/lib/Ix.hs
-share/hugs/lib/List.hs
-share/hugs/lib/Locale.hs
-share/hugs/lib/Locale.lhs
-share/hugs/lib/Maybe.hs
-share/hugs/lib/Monad.hs
-share/hugs/lib/Numeric.hs
-share/hugs/lib/Prelude.hs
-share/hugs/lib/Random.hs
-share/hugs/lib/Ratio.hs
-share/hugs/lib/System.hs
-share/hugs/lib/Time.hs
-share/hugs/lib/exts/Addr.hs
-share/hugs/lib/exts/Assoc.hs
-share/hugs/lib/exts/AssocDefaults.hs
-share/hugs/lib/exts/AssocList.hs
-share/hugs/lib/exts/BankersQueue.hs
-share/hugs/lib/exts/BinaryRandList.hs
-share/hugs/lib/exts/Bits.hs
-share/hugs/lib/exts/BraunSeq.hs
-share/hugs/lib/exts/COPYRIGHT.edison
-share/hugs/lib/exts/CVar.lhs
-share/hugs/lib/exts/Chan.lhs
-share/hugs/lib/exts/Channel.lhs
-share/hugs/lib/exts/ChannelVar.lhs
-share/hugs/lib/exts/Collection.hs
-share/hugs/lib/exts/CollectionDefaults.hs
-share/hugs/lib/exts/CollectionUtils.hs
-share/hugs/lib/exts/ConcBase.hs
-share/hugs/lib/exts/Concurrent.lhs
-share/hugs/lib/exts/Dynamic.lhs
-share/hugs/lib/exts/EdisonPrelude.hs
-share/hugs/lib/exts/Exception.hs
-share/hugs/lib/exts/FiniteMap.lhs
-share/hugs/lib/exts/Foreign.hs
-share/hugs/lib/exts/GetOpt.lhs
-share/hugs/lib/exts/Haskell2Xml.hs
-share/hugs/lib/exts/Html.lhs
-share/hugs/lib/exts/HtmlBlockTable.lhs
-share/hugs/lib/exts/IOExts.hs
-share/hugs/lib/exts/IORef.lhs
-share/hugs/lib/exts/Int.hs
-share/hugs/lib/exts/IsPrefixOf.hs
-share/hugs/lib/exts/IsSuffixOf.hs
-share/hugs/lib/exts/JoinList.hs
-share/hugs/lib/exts/LazyPairingHeap.hs
-share/hugs/lib/exts/LazyST.hs
-share/hugs/lib/exts/LeftistHeap.hs
-share/hugs/lib/exts/ListSeq.hs
-share/hugs/lib/exts/MVar.lhs
-share/hugs/lib/exts/Memo.hs
-share/hugs/lib/exts/Merge.lhs
-share/hugs/lib/exts/MinHeap.hs
-share/hugs/lib/exts/MonadCont.lhs
-share/hugs/lib/exts/MonadEither.lhs
-share/hugs/lib/exts/MonadError.lhs
-share/hugs/lib/exts/MonadFix.lhs
-share/hugs/lib/exts/MonadIdentity.lhs
-share/hugs/lib/exts/MonadList.lhs
-share/hugs/lib/exts/MonadRWS.lhs
-share/hugs/lib/exts/MonadReader.lhs
-share/hugs/lib/exts/MonadRec.hs
-share/hugs/lib/exts/MonadState.lhs
-share/hugs/lib/exts/MonadTrans.lhs
-share/hugs/lib/exts/MonadWriter.lhs
-share/hugs/lib/exts/Monoid.lhs
-share/hugs/lib/exts/MyersStack.hs
-share/hugs/lib/exts/NumExts.lhs
-share/hugs/lib/exts/Observe.lhs
-share/hugs/lib/exts/Parallel.lhs
-share/hugs/lib/exts/ParseSTLib.hs
-share/hugs/lib/exts/Parsec.hs
-share/hugs/lib/exts/ParsecChar.hs
-share/hugs/lib/exts/ParsecCombinator.hs
-share/hugs/lib/exts/ParsecError.hs
-share/hugs/lib/exts/ParsecExpr.hs
-share/hugs/lib/exts/ParsecLanguage.hs
-share/hugs/lib/exts/ParsecPerm.hs
-share/hugs/lib/exts/ParsecPos.hs
-share/hugs/lib/exts/ParsecPrim.hs
-share/hugs/lib/exts/ParsecToken.hs
-share/hugs/lib/exts/PatriciaLoMap.hs
-share/hugs/lib/exts/Pretty.lhs
-share/hugs/lib/exts/QSem.lhs
-share/hugs/lib/exts/QSemN.lhs
-share/hugs/lib/exts/QuickCheck.hs
-share/hugs/lib/exts/QuickCheckPoly.hs
-share/hugs/lib/exts/QuickCheckUtils.hs
-share/hugs/lib/exts/RandList.hs
-share/hugs/lib/exts/RevSeq.hs
-share/hugs/lib/exts/ST.hs
-share/hugs/lib/exts/SampleVar.lhs
-share/hugs/lib/exts/Semaphore.lhs
-share/hugs/lib/exts/Sequence.hs
-share/hugs/lib/exts/SequenceDefaults.hs
-share/hugs/lib/exts/Set.lhs
-share/hugs/lib/exts/ShowFunctions.lhs
-share/hugs/lib/exts/SimpleQueue.hs
-share/hugs/lib/exts/SizedSeq.hs
-share/hugs/lib/exts/SkewHeap.hs
-share/hugs/lib/exts/SplayHeap.hs
-share/hugs/lib/exts/Stable.hs
-share/hugs/lib/exts/TestOrdBag.hs
-share/hugs/lib/exts/TestOrdSet.hs
-share/hugs/lib/exts/TestSeq.hs
-share/hugs/lib/exts/UnbalancedSet.hs
-share/hugs/lib/exts/Weak.hs
-share/hugs/lib/exts/Word.hs
-share/hugs/lib/exts/Xml2Haskell.hs
-share/hugs/lib/exts/XmlCombinators.hs
-share/hugs/lib/exts/XmlHtmlGen.hs
-share/hugs/lib/exts/XmlHtmlPP.hs
-share/hugs/lib/exts/XmlHtmlParse.hs
-share/hugs/lib/exts/XmlLex.hs
-share/hugs/lib/exts/XmlLib.hs
-share/hugs/lib/exts/XmlPP.hs
-share/hugs/lib/exts/XmlParse.hs
-share/hugs/lib/exts/XmlTypes.hs
-share/hugs/lib/hugs/AnsiInteract.hs
-share/hugs/lib/hugs/AnsiScreen.hs
-share/hugs/lib/hugs/CVHAssert.hs
-share/hugs/lib/hugs/GenericPrint.hs
-share/hugs/lib/hugs/HugsDynamic.hs
-share/hugs/lib/hugs/HugsInternals.hs
-share/hugs/lib/hugs/HugsLibs.hs
-share/hugs/lib/hugs/IOExtensions.hs
-share/hugs/lib/hugs/Interact.hs
-share/hugs/lib/hugs/ListUtils.hs
-share/hugs/lib/hugs/Number.hs
-share/hugs/lib/hugs/OldWeak.hs
-share/hugs/lib/hugs/ParseLib.hs
-share/hugs/lib/hugs/Quote.hs
-share/hugs/lib/hugs/StdLibs.hs
-share/hugs/lib/hugs/Trace.hs
-share/hugs/lib/hugs/Trex.hs
-@dirrm share/hugs/lib/hugs
-@dirrm share/hugs/lib/exts
-@dirrm share/hugs/lib
-@dirrm share/hugs/include
-@dirrm share/hugs/docs
-@dirrm share/hugs/demos/prolog
-@dirrm share/hugs/demos
-@dirrm share/hugs
+share/hsc2hs-0.66/template-hsc.h
+@dirrm share/hsc2hs-0.66
+@dirrm lib/hugs/programs/hsc2hs
+@dirrm lib/hugs/programs/cpphs/Text/ParserCombinators
+@dirrm lib/hugs/programs/cpphs/Text
+@dirrm lib/hugs/programs/cpphs/Language/Preprocessor/Cpphs
+@dirrm lib/hugs/programs/cpphs/Language/Preprocessor
+@dirrm lib/hugs/programs/cpphs/Language
+@dirrm lib/hugs/programs/cpphs
+@dirrm lib/hugs/programs
+@dirrm lib/hugs/packages/hugsbase/Hugs
+@dirrm lib/hugs/packages/hugsbase
+@dirrm lib/hugs/packages/haskell98
+@dirrm lib/hugs/packages/cpphs/Text/ParserCombinators
+@dirrm lib/hugs/packages/cpphs/Text
+@dirrm lib/hugs/packages/cpphs/Language/Preprocessor/Cpphs
+@dirrm lib/hugs/packages/cpphs/Language/Preprocessor
+@dirrm lib/hugs/packages/cpphs/Language
+@dirrm lib/hugs/packages/cpphs
+@dirrm lib/hugs/packages/base/Text/Show
+@dirrm lib/hugs/packages/base/Text/Regex
+@dirrm lib/hugs/packages/base/Text/Read
+@dirrm lib/hugs/packages/base/Text/PrettyPrint
+@dirrm lib/hugs/packages/base/Text/ParserCombinators
+@dirrm lib/hugs/packages/base/Text/Html
+@dirrm lib/hugs/packages/base/Text
+@dirrm lib/hugs/packages/base/System/Process
+@dirrm lib/hugs/packages/base/System/Posix
+@dirrm lib/hugs/packages/base/System/Mem
+@dirrm lib/hugs/packages/base/System/IO
+@dirrm lib/hugs/packages/base/System/Directory
+@dirrm lib/hugs/packages/base/System/Console
+@dirrm lib/hugs/packages/base/System
+@dirrm lib/hugs/packages/base/Foreign/Marshal
+@dirrm lib/hugs/packages/base/Foreign/C
+@dirrm lib/hugs/packages/base/Foreign
+@dirrm lib/hugs/packages/base/Debug
+@dirrm lib/hugs/packages/base/Data/STRef
+@dirrm lib/hugs/packages/base/Data/ByteString
+@dirrm lib/hugs/packages/base/Data/Array/IO
+@dirrm lib/hugs/packages/base/Data/Array
+@dirrm lib/hugs/packages/base/Data
+@dirrm lib/hugs/packages/base/Control/Monad/ST
+@dirrm lib/hugs/packages/base/Control/Monad
+@dirrm lib/hugs/packages/base/Control/Concurrent
+@dirrm lib/hugs/packages/base/Control
+@dirrm lib/hugs/packages/base
+@dirrm lib/hugs/packages/Cabal/Language/Haskell
+@dirrm lib/hugs/packages/Cabal/Language
+@dirrm lib/hugs/packages/Cabal/Distribution/Simple
+@dirrm lib/hugs/packages/Cabal/Distribution/PreProcess
+@dirrm lib/hugs/packages/Cabal/Distribution/Compat
+@dirrm lib/hugs/packages/Cabal/Distribution
+@dirrm lib/hugs/packages/Cabal
+@dirrm lib/hugs/packages
+@dirrm lib/hugs/oldlib
+@dirrm lib/hugs/include
+@dirrm lib/hugs/docs
+@dirrm lib/hugs/demos/prolog
+@dirrm lib/hugs/demos/Cabal
+@dirrm lib/hugs/demos
+@dirrm lib/hugs
diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index 508025a3e19..9624dca45b2 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.12 2005/11/03 22:35:53 rillig Exp $
+$NetBSD: distinfo,v 1.13 2006/08/01 14:33:59 jmmv Exp $
-SHA1 (hugs98-Dec2001.tar.gz) = 0980e3bbd21a6f5bc8ab1658a90be2a4dec35007
-RMD160 (hugs98-Dec2001.tar.gz) = c10c5279ef4f06b753750dca7854791e5664b314
-Size (hugs98-Dec2001.tar.gz) = 821812 bytes
-SHA1 (patch-aa) = 91c3ac30eb7b89e7866ed69711a067849bd2b279
-SHA1 (patch-ab) = 0c5f3f41048c4220726b3c95cc88e1a4a8be19c8
-SHA1 (patch-ac) = 4e4826187298b36c38397ba3578753ab5535ee27
-SHA1 (patch-ad) = c39e30d9b46605c69b17fdd4a5ac0846e821f463
+SHA1 (hugs98-May2006.tar.gz) = f154b74384edab87cbbe09732ab282f3ead7f70c
+RMD160 (hugs98-May2006.tar.gz) = 47093aca3ae54ae8c7d3eb437076fc3cc9e294fb
+Size (hugs98-May2006.tar.gz) = 2741149 bytes
+SHA1 (patch-aa) = cee5271c5c1811c3d7dd0038b72534e566e6772f
+SHA1 (patch-ab) = db04b2f40eed7855346b215da55b7dde7339b9be
+SHA1 (patch-ac) = 7abcf8426a8103ce60df82c7ab1c608116981bd9
diff --git a/lang/hugs/files/configure b/lang/hugs/files/configure
deleted file mode 100755
index 4f8a0003547..00000000000
--- a/lang/hugs/files/configure
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: configure,v 1.2 1998/08/07 11:09:03 agc Exp $
-#
-
-cd unix
-exec ./configure $*
diff --git a/lang/hugs/patches/patch-aa b/lang/hugs/patches/patch-aa
index 5225e01326c..d4538beb20e 100644
--- a/lang/hugs/patches/patch-aa
+++ b/lang/hugs/patches/patch-aa
@@ -1,26 +1,24 @@
-$NetBSD: patch-aa,v 1.5 2005/11/03 22:35:53 rillig Exp $
+$NetBSD: patch-aa,v 1.6 2006/08/01 14:33:59 jmmv Exp $
---- src/MkInstal.in.orig Tue Feb 29 05:29:00 2000
-+++ src/MkInstal.in Tue May 22 02:32:45 2001
-@@ -10,8 +10,8 @@
- # multiple files at once.
- ################################################################
+--- docs/users_guide/Makefile.in.orig 2006-04-28 14:24:16.000000000 +0200
++++ docs/users_guide/Makefile.in
+@@ -78,12 +78,13 @@ pdf: $(ROOT).pdf
+ htmlhelp: $(ROOT).chm
--INSTALL = unix/install-sh
--INSTALL_DATA = /bin/cp
-+INSTALL_PROGRAM= ${BSD_INSTALL_PROGRAM}
-+INSTALL_DATA= ${BSD_INSTALL_DATA}
+ $(HTML): $(SGML_FILES) $(DSL_FILE) $(CSS_FILE)
+- $(RM) -r $(ROOT)
+- mkdir $(ROOT)
+- $(CP) $(CSS_FILE) $(ROOT)
+- $(CP) $(IMAGE) $(ROOT)
+- test -z '$(DOCBOOK2HTML)' || \
+- $(DOCBOOK2HTML) --dsl $(DSL_FILE) $(ROOT).sgml
++ if test -n '$(DOCBOOK2HTML)'; then \
++ $(RM) -r $(ROOT); \
++ mkdir $(ROOT); \
++ $(CP) $(CSS_FILE) $(ROOT); \
++ $(CP) $(IMAGE) $(ROOT); \
++ $(DOCBOOK2HTML) --dsl $(DSL_FILE) $(ROOT).sgml; \
++ fi
- install :: install_bin install_lib # the bare minimum
- install :: install_libs # lotsa libraries
-@@ -22,8 +22,8 @@
-
- install_bin :: hugs$(EXE) runhugs$(EXE)
- $(INSTALL) -d $(bindir)
-- $(INSTALL) hugs$(EXE) $(bindir)
-- $(INSTALL) runhugs$(EXE) $(bindir)
-+ $(INSTALL_PROGRAM) hugs$(EXE) $(bindir)
-+ $(INSTALL_PROGRAM) runhugs$(EXE) $(bindir)
-
- install_lib ::
- $(INSTALL) -d $(hugsdir)/lib
+ $(ROOT).dvi: $(SGML_FILES)
+ test -z '$(DOCBOOK2DVI)' || $(DOCBOOK2DVI) $(ROOT).sgml
diff --git a/lang/hugs/patches/patch-ab b/lang/hugs/patches/patch-ab
index d8a6452480f..3f87df052fc 100644
--- a/lang/hugs/patches/patch-ab
+++ b/lang/hugs/patches/patch-ab
@@ -1,17 +1,31 @@
-$NetBSD: patch-ab,v 1.3 2005/11/03 22:35:53 rillig Exp $
+$NetBSD: patch-ab,v 1.4 2006/08/01 14:33:59 jmmv Exp $
---- src/prelude.h.orig Thu May 27 23:29:25 1999
-+++ src/prelude.h Sat May 20 04:06:55 2000
-@@ -566,10 +566,12 @@
- * eval, print loop
- */
+--- libraries/Makefile.in.orig 2006-05-15 15:55:11.000000000 +0200
++++ libraries/Makefile.in
+@@ -54,7 +54,7 @@ all: $(BUILD_DIR)/.stamp
-+#ifndef __NetBSD__
- #ifdef m68k /* global registers on an m68k */
- #define GLOBALfst asm("a4")
- #define GLOBALsnd asm("a5")
- #define GLOBALsp asm("a3")
-+#endif
- #endif
+ $(BUILD_DIR)/.stamp: bootlib/.stamp $(INCLUDES) $(CPPHS_FILE) $(HSC2HS_FILE) $(CONVERT)
+ $(RM) -r $(BUILD_DIR)/oldlib
+- cd ..; HOST='$(HOST)' libraries/$(CONVERT) fptools hugsdir
++ cd ..; HOST='$(HOST)' PREFIX='$(prefix)' libraries/$(CONVERT) fptools hugsdir
+ echo timestamp for libraries >$@
- #ifdef sparc /* global registers on a sparc */
+ $(HSC2HS): $(BUILD_DIR)/programs/hsc2hs/Main.hs
+@@ -69,7 +69,7 @@ $(HSC2HS).bat: $(BUILD_DIR)/programs/hsc
+ echo '%rootdir%/src/runhugs -98 -P%rootdir%/libraries/bootlib %rootdir%/hugsdir/programs/hsc2hs/Main.hs -I%rootdir%/hugsdir/include -t%rootdir%/hsc2hs/template-hsc.h %*') >$@
+
+ $(BUILD_DIR)/programs/hsc2hs/Main.hs: $(HSC2HS_SRC)/Main.hs $(BOOTLIB) $(INCLUDES) $(CPPHS_FILE)
+- cd $(HSC2HS_SRC); $(HUGS_SETUP) configure --verbose --hugs --scratchdir=$(BUILD_DIR) --with-compiler=../src/ffihugs --with-cpphs="../libraries/tools/cpphs$(BAT)"
++ cd $(HSC2HS_SRC); $(HUGS_SETUP) configure --prefix=$(prefix) --verbose --hugs --scratchdir=$(BUILD_DIR) --with-compiler=../src/ffihugs --with-cpphs="../libraries/tools/cpphs$(BAT)"
+ cd $(HSC2HS_SRC); $(HUGS_SETUP) build --verbose
+ $(RM) -r $(BUILD_DIR)/autogen
+
+@@ -85,7 +85,7 @@ $(CPPHS).bat: $(BUILD_DIR)/programs/cpph
+ echo '%rootdir%/src/runhugs -P%rootdir%/libraries/bootlib %rootdir%/hugsdir/programs/cpphs/Main.hs %*') >$@
+
+ $(BUILD_DIR)/programs/cpphs/Main.hs: $(BOOTLIB) $(INCLUDES)
+- cd $(CPPHS_SRC); $(HUGS_SETUP) configure --verbose --hugs --scratchdir=$(BUILD_DIR)/packages/cpphs --with-compiler=../src/ffihugs
++ cd $(CPPHS_SRC); $(HUGS_SETUP) configure --prefix=$(prefix) --verbose --hugs --scratchdir=$(BUILD_DIR)/packages/cpphs --with-compiler=../src/ffihugs
+ cd $(CPPHS_SRC); $(HUGS_SETUP) build --verbose
+ $(RM) -r $(BUILD_DIR)/packages/cpphs/autogen
+ mkdir -p $(BUILD_DIR)/programs
diff --git a/lang/hugs/patches/patch-ac b/lang/hugs/patches/patch-ac
index f42de4d800b..8624490107a 100644
--- a/lang/hugs/patches/patch-ac
+++ b/lang/hugs/patches/patch-ac
@@ -1,23 +1,12 @@
-$NetBSD: patch-ac,v 1.4 2005/11/03 22:35:53 rillig Exp $
+$NetBSD: patch-ac,v 1.5 2006/08/01 14:33:59 jmmv Exp $
---- src/unix/configure.orig Sat Dec 15 16:20:04 2001
-+++ src/unix/configure Fri Mar 15 15:01:38 2002
-@@ -4608,8 +4608,8 @@
- -Wno-parentheses \
- "
+--- libraries/tools/convert_libraries.orig 2006-05-08 15:20:29.000000000 +0200
++++ libraries/tools/convert_libraries
+@@ -165,6 +165,7 @@ build_package() {
+ esac
--CFLAGS="-g"
--OPTFLAGS="-O2"
-+test -z "$CFLAGS" && CFLAGS="-g"
-+test -z "$OPTFLAGS" && OPTFLAGS="-O2"
-
- case "`uname -s`" in
- Darwin) CFLAGS="$CFLAGS -no-cpp-precomp"; LDFLAGS="$LDFLAGS -flat_namespace" ;;
-@@ -4630,6 +4630,7 @@
- fi
-
- if test "$enable_debug" = yes; then
-+ CFLAGS="$CFLAGS -g"
- OPTFLAGS=""
- else
- DEBUGFLAGS=""
+ $HugsSetup configure --verbose --hugs \
++ --prefix=${PREFIX} \
+ --scratchdir="$top_dir/$target_dir" \
+ --with-hsc2hs="$top_dir/libraries/tools/hsc2hs$bat" \
+ --with-cpphs="$top_dir/libraries/tools/cpphs$bat" \
diff --git a/lang/hugs/patches/patch-ad b/lang/hugs/patches/patch-ad
deleted file mode 100644
index 24669482c9a..00000000000
--- a/lang/hugs/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2005/11/03 22:35:53 rillig Exp $
-
---- src/input.c.orig
-+++ src/input.c
-@@ -313,7 +313,7 @@
- static char *lineBuffer = NULL; /* getline() does the initial allocation */
- #else
- #define LINEBUFFER_SIZE 1000
--static char lineBuffer[LINEBUFFER_SIZE];
-+static signed char lineBuffer[LINEBUFFER_SIZE];
- #endif
- static int lineLength = 0;
- static int inCodeBlock = FALSE; /* Inside \begin{code}..\end{code} */