6 files changed, 35 insertions, 277 deletions

diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 4de12c3bd34a..818ce497455b 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,31 +1,32 @@
 # New ports collection makefile for:	hugs
-# Version required:	1.4 (January 1998)
+# Version required:	Hugs98 (September 1999)
 # Date created:		22 September 1997
 # Whom:			Torsten Teg Grust (Torsten.Grust@uni-konstanz.de)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	hugs-June98-source
-PKGNAME=	hugs-1.4
+DISTNAME=	Hugs98-Sep1999
+PKGNAME=	hugs-98
 CATEGORIES=	lang
-MASTER_SITES=	ftp://haskell.org/pub/haskell/hugs/LATEST/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	ftp://www.cse.ogi.edu/pub/pacsoft/hugs/
 
 MAINTAINER=	Torsten.Grust@uni-konstanz.de
 
-WRKSRC=		${WRKDIR}/hugs/src
+WRKSRC=		${WRKDIR}/hugs98/src
 
 ALL_TARGET=	default
 
 # how to install a directory
 INSTALL_DIR=	${INSTALL} -d -o bin -g bin -m 755
 # where the Hugs documentation (distribution) files live
-HUGS_DOC=	${WRKSRC}/../docs
+HUGS_DOC=	${WRKDIR}/hugs98/docs
 
 MAN1=		hugs.1
 
 post-install:
+	strip ${PREFIX}/bin/hugs
+	strip ${PREFIX}/bin/runhugs
 	${SED} -e "s#Prelude\.hs#lib/&#" \
 	       -e "s#^\.ds LB .*#.ds LB ${PREFIX}/share/hugs#" \
 	       -e "s#^\.ds BN .*#.ds BN ${PREFIX}/bin#" \
diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index f71899937954..acfc6db34ff2 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1 +1 @@
-MD5 (hugs-June98-source.tgz) = 28f42e3b8b44f88fc649b36697ba7b29
+MD5 (Hugs98-Sep1999.tar.gz) = da134de8b755da4675e5e5143c4b1ec4
diff --git a/lang/hugs/pkg-comment b/lang/hugs/pkg-comment
index ab7dd3500df3..3fec1b55703e 100644
--- a/lang/hugs/pkg-comment
+++ b/lang/hugs/pkg-comment
@@ -1 +1 @@
-Nottingham's and Yale's Haskell interpreter and programming environment
+An interpreter for the functional programming language Haskell 98
diff --git a/lang/hugs/pkg-descr b/lang/hugs/pkg-descr
index 528522f838de..7ccf48a65ac9 100644
--- a/lang/hugs/pkg-descr
+++ b/lang/hugs/pkg-descr
@@ -1,17 +1,12 @@
-This is a port of Nottingham's and Yale's new release of Hugs,
-a Haskell interpreter and programming environment for developing
-Haskell programs.
+This is a port of OGI's new release of Hugs, a Haskell interpreter and
+programming environment for developing Haskell programs.
 
-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.
+This release is largely conformant with Haskell 98, including monad
+and record syntax, newtypes, strictness annotations, and modules.  In
+addition, it comes packaged with almost all libraries defined in the
+most recent version of the Haskell 98 Library Report.
 
-Available documentation includes HTML versions of the "Hugs Users
-Manual", the "Haskell 1.4 Report", the "Haskell Library Report" as
-well as a "Gentle Introduction to Haskell".  
+More online information is available from http://www.haskell.org/
 
-WWW: http://www.haskell.org
-
-- Teggy
-Torsten.Grust@uni-konstanz.de
+-- Teggy
+teggy@teggy.org
diff --git a/lang/hugs/pkg-plist b/lang/hugs/pkg-plist
index 20ebe44a2ff1..3788aab214d5 100644
--- a/lang/hugs/pkg-plist
+++ b/lang/hugs/pkg-plist
@@ -5,6 +5,7 @@ share/hugs/lib/Ratio.hs
 share/hugs/lib/Random.hs
 share/hugs/lib/Prelude.hs
 share/hugs/lib/Numeric.hs
+share/hugs/lib/Locale.lhs
 share/hugs/lib/Monad.hs
 share/hugs/lib/Maybe.hs
 share/hugs/lib/List.hs
@@ -17,74 +18,40 @@ share/hugs/lib/hugs/AnsiInteract.hs
 share/hugs/lib/hugs/Trace.hs
 share/hugs/lib/hugs/StdLibs.hs
 share/hugs/lib/hugs/Sequence.hs
-share/hugs/lib/hugs/Pretty.lhs
 share/hugs/lib/hugs/ParseLib.hs
+share/hugs/lib/hugs/OldWeak.hs
 share/hugs/lib/hugs/Number.hs
 share/hugs/lib/hugs/ListUtils.hs
 share/hugs/lib/hugs/Interact.hs
 share/hugs/lib/hugs/IOExtensions.hs
 share/hugs/lib/hugs/HugsLibs.hs
 share/hugs/lib/hugs/HugsInternals.hs
-share/hugs/lib/hugs/Haskore.hs
-share/hugs/lib/hugs/Graphics.hs
+share/hugs/lib/hugs/HugsDynamic.hs
 share/hugs/lib/hugs/GenericPrint.hs
-share/hugs/lib/hugs/Dynamic.hs
 share/hugs/lib/hugs/CVHAssert.hs
 share/hugs/lib/hugs/AnsiScreen.hs
 share/hugs/lib/hugs/Trex.hs
 share/hugs/lib/exts/Addr.hs
+share/hugs/lib/exts/Weak.hs
+share/hugs/lib/exts/Stable.hs
 share/hugs/lib/exts/Semaphore.lhs
 share/hugs/lib/exts/SampleVar.lhs
-share/hugs/lib/exts/STBase.hs
 share/hugs/lib/exts/ST.hs
+share/hugs/lib/exts/Pretty.lhs
 share/hugs/lib/exts/NumExts.hs
+share/hugs/lib/exts/Memo.hs
 share/hugs/lib/exts/LazyST.hs
 share/hugs/lib/exts/Int.hs
 share/hugs/lib/exts/IOExts.hs
+share/hugs/lib/exts/GetOpt.lhs
 share/hugs/lib/exts/Foreign.hs
+share/hugs/lib/exts/Dynamic.lhs
 share/hugs/lib/exts/Concurrent.lhs
 share/hugs/lib/exts/ConcBase.hs
 share/hugs/lib/exts/ChannelVar.lhs
 share/hugs/lib/exts/Channel.lhs
 share/hugs/lib/exts/Bits.hs
 share/hugs/lib/exts/Word.hs
-share/hugs/lib/Haskore/demos/SelfSim.lhs
-share/hugs/lib/Haskore/demos/HaskoreExamples.lhs
-share/hugs/lib/Haskore/demos/ChildSong6.lhs
-share/hugs/lib/Haskore/docs/basics.html
-share/hugs/lib/Haskore/docs/tutindex.html
-share/hugs/lib/Haskore/docs/testhaskore.html
-share/hugs/lib/Haskore/docs/selfsim.html
-share/hugs/lib/Haskore/docs/related.html
-share/hugs/lib/Haskore/docs/poly.gif
-share/hugs/lib/Haskore/docs/performance.html
-share/hugs/lib/Haskore/docs/intro.html
-share/hugs/lib/Haskore/docs/index.html
-share/hugs/lib/Haskore/docs/hasktomidi.html
-share/hugs/lib/Haskore/docs/haskoreexamples.html
-share/hugs/lib/Haskore/docs/haskore.html
-share/hugs/lib/Haskore/docs/haskore.gif
-share/hugs/lib/Haskore/docs/generalmidi.html
-share/hugs/lib/Haskore/docs/equiv.html
-share/hugs/lib/Haskore/docs/equiv.gif
-share/hugs/lib/Haskore/docs/chords.html
-share/hugs/lib/Haskore/docs/childsong6.html
-share/hugs/lib/Haskore/docs/tutorial.html
-share/hugs/lib/Haskore/src/BasicHaskToMidi.lhs
-share/hugs/lib/Haskore/src/README-Haskore-src.txt
-share/hugs/lib/Haskore/src/Performance.lhs
-share/hugs/lib/Haskore/src/Monads.hs
-share/hugs/lib/Haskore/src/MidiFile.lhs
-share/hugs/lib/Haskore/src/HaskoreUtils.hs
-share/hugs/lib/Haskore/src/HaskoreLoader.lhs
-share/hugs/lib/Haskore/src/HaskToMidi.lhs
-share/hugs/lib/Haskore/src/GeneralMidi.lhs
-share/hugs/lib/Haskore/src/Fractals.hs
-share/hugs/lib/Haskore/src/Chords.lhs
-share/hugs/lib/Haskore/src/Basics.lhs
-share/hugs/lib/Haskore/src/BasicMidifile.lhs
-share/hugs/lib/Haskore/src/TestHaskore.lhs
-share/hugs/lib/Haskore/README-haskore.txt
 share/hugs/demos/prolog/Prolog.hs
 share/hugs/demos/prolog/StackEngine.hs
 share/hugs/demos/prolog/PureEngine.hs
@@ -94,34 +61,9 @@ share/hugs/demos/prolog/CombParse.hs
 share/hugs/demos/prolog/AndorraEngine.hs
 share/hugs/demos/prolog/readme
 share/hugs/demos/prolog/stdlib
-share/hugs/demos/cgi/Assoc.hs
-share/hugs/demos/cgi/hello_HTML.cgi
-share/hugs/demos/cgi/greetings.txt
-share/hugs/demos/cgi/greetings.cgi
-share/hugs/demos/cgi/envpassed.cgi
-share/hugs/demos/cgi/download_papers.cgi
-share/hugs/demos/cgi/counter.cgi
-share/hugs/demos/cgi/Wrapper.hs
-share/hugs/demos/cgi/UrlEncoded.hs
-share/hugs/demos/cgi/TextPlain.hs
-share/hugs/demos/cgi/PrettyHTML.hs
-share/hugs/demos/cgi/Pretty.hs
-share/hugs/demos/cgi/Parsing.hs
-share/hugs/demos/cgi/Mime.hs
-share/hugs/demos/cgi/HTMLWizard.hs
-share/hugs/demos/cgi/HTML.hs
-share/hugs/demos/cgi/Greetings.hs
-share/hugs/demos/cgi/DownloadPapers.hs
-share/hugs/demos/cgi/Demos.hs
-share/hugs/demos/cgi/Counter.hs
-share/hugs/demos/cgi/Common.hs
-share/hugs/demos/cgi/CgiOut.hs
-share/hugs/demos/cgi/hello_plain.cgi
-share/hugs/demos/cgi/README
 share/hugs/demos/AnsiDemo.hs
 share/hugs/demos/Stack.hs
 share/hugs/demos/Say.hs
-share/hugs/demos/Random.hs
 share/hugs/demos/Queens.hs
 share/hugs/demos/Minsrand.hs
 share/hugs/demos/Mersenne.hs
@@ -140,196 +82,16 @@ share/hugs/demos/CommaInt.lhs
 share/hugs/demos/Calendar.hs
 share/hugs/demos/ArrayEx.hs
 share/hugs/demos/Tree.hs
-share/doc/hugs/libs-html/libs.html
-share/doc/hugs/libs-html/libs-10.html
-share/doc/hugs/libs-html/libs-11.html
-share/doc/hugs/libs-html/libs-12.html
-share/doc/hugs/libs-html/libs-13.html
-share/doc/hugs/libs-html/libs-2.html
-share/doc/hugs/libs-html/libs-3.html
-share/doc/hugs/libs-html/libs-4.html
-share/doc/hugs/libs-html/libs-5.html
-share/doc/hugs/libs-html/libs-6.html
-share/doc/hugs/libs-html/libs-7.html
-share/doc/hugs/libs-html/libs-8.html
-share/doc/hugs/libs-html/libs-9.html
-share/doc/hugs/libs-html/libs-1.html
-share/doc/hugs/haskore-html/index.html~
-share/doc/hugs/haskore-html/equiv.gif
-share/doc/hugs/haskore-html/haskore.gif
-share/doc/hugs/haskore-html/poly.gif
-share/doc/hugs/haskore-html/intro.html
-share/doc/hugs/haskore-html/haskore.html
-share/doc/hugs/haskore-html/basics.html
-share/doc/hugs/haskore-html/performance.html
-share/doc/hugs/haskore-html/hasktomidi.html
-share/doc/hugs/haskore-html/chords.html
-share/doc/hugs/haskore-html/equiv.html
-share/doc/hugs/haskore-html/related.html
-share/doc/hugs/haskore-html/testhaskore.html
-share/doc/hugs/haskore-html/haskoreexamples.html
-share/doc/hugs/haskore-html/childsong6.html
-share/doc/hugs/haskore-html/selfsim.html
-share/doc/hugs/haskore-html/generalmidi.html
-share/doc/hugs/haskore-html/tutorial.html
-share/doc/hugs/haskore-html/tutindex.html
-share/doc/hugs/haskore-html/index.html
-share/doc/hugs/library/libindex.html
-share/doc/hugs/library/index.html
-share/doc/hugs/library/introduction.html
-share/doc/hugs/library/ratio.html
-share/doc/hugs/library/complex.html
-share/doc/hugs/library/numeric.html
-share/doc/hugs/library/ix.html
-share/doc/hugs/library/array.html
-share/doc/hugs/library/list.html
-share/doc/hugs/library/maybe.html
-share/doc/hugs/library/char.html
-share/doc/hugs/library/monad.html
-share/doc/hugs/library/io.html
-share/doc/hugs/library/directory.html
-share/doc/hugs/library/system.html
-share/doc/hugs/library/time.html
-share/doc/hugs/library/locale.html
-share/doc/hugs/library/cputime.html
-share/doc/hugs/library/random.html
-share/doc/hugs/library/title.gif
-share/doc/hugs/tutorial/intro.html
-share/doc/hugs/tutorial/fig2.gif
-share/doc/hugs/tutorial/fig3.gif
-share/doc/hugs/tutorial/title.gif
-share/doc/hugs/tutorial/index.html
-share/doc/hugs/tutorial/goodies.html
-share/doc/hugs/tutorial/functions.html
-share/doc/hugs/tutorial/patterns.html
-share/doc/hugs/tutorial/classes.html
-share/doc/hugs/tutorial/moretypes.html
-share/doc/hugs/tutorial/io.html
-share/doc/hugs/tutorial/stdclasses.html
-share/doc/hugs/tutorial/modules.html
-share/doc/hugs/tutorial/pitfalls.html
-share/doc/hugs/tutorial/arrays.html
-share/doc/hugs/tutorial/end.html
-share/doc/hugs/tutorial/haskell-tutorial.html
-share/doc/hugs/tutorial/indextutorial.html
-share/doc/hugs/tutorial/fig1.gif
-share/doc/hugs/report/prelude-index.html
-share/doc/hugs/report/lambda.gif
-share/doc/hugs/report/title.gif
-share/doc/hugs/report/index.html
-share/doc/hugs/report/preface-13.html
-share/doc/hugs/report/intro.html
-share/doc/hugs/report/lexemes.html
-share/doc/hugs/report/exps.html
-share/doc/hugs/report/decls.html
-share/doc/hugs/report/modules.html
-share/doc/hugs/report/basic.html
-share/doc/hugs/report/io-13.html
-share/doc/hugs/report/standard-prelude.html
-share/doc/hugs/report/syntax-iso.html
-share/doc/hugs/report/literate.html
-share/doc/hugs/report/derived.html
-share/doc/hugs/report/pragmas.html
-share/doc/hugs/report/haskell.html
-share/doc/hugs/report/index14.html
-share/doc/hugs/report/class-fig.gif
-share/doc/hugs/manual-html/up.gif
-share/doc/hugs/manual-html/manual10.html
-share/doc/hugs/manual-html/manual11.html
-share/doc/hugs/manual-html/manual12.html
-share/doc/hugs/manual-html/manual13.html
-share/doc/hugs/manual-html/manual14.html
-share/doc/hugs/manual-html/manual15.html
-share/doc/hugs/manual-html/manual16.html
-share/doc/hugs/manual-html/manual17.html
-share/doc/hugs/manual-html/manual18.html
-share/doc/hugs/manual-html/manual19.html
-share/doc/hugs/manual-html/manual2.html
-share/doc/hugs/manual-html/manual20.html
-share/doc/hugs/manual-html/manual21.html
-share/doc/hugs/manual-html/manual22.html
-share/doc/hugs/manual-html/manual23.html
-share/doc/hugs/manual-html/manual24.html
-share/doc/hugs/manual-html/manual25.html
-share/doc/hugs/manual-html/manual26.html
-share/doc/hugs/manual-html/manual27.html
-share/doc/hugs/manual-html/manual28.html
-share/doc/hugs/manual-html/manual29.html
-share/doc/hugs/manual-html/manual3.html
-share/doc/hugs/manual-html/manual30.html
-share/doc/hugs/manual-html/manual31.html
-share/doc/hugs/manual-html/manual32.html
-share/doc/hugs/manual-html/manual33.html
-share/doc/hugs/manual-html/manual34.html
-share/doc/hugs/manual-html/manual35.html
-share/doc/hugs/manual-html/manual36.html
-share/doc/hugs/manual-html/manual37.html
-share/doc/hugs/manual-html/manual38.html
-share/doc/hugs/manual-html/manual39.html
-share/doc/hugs/manual-html/manual4.html
-share/doc/hugs/manual-html/manual40.html
-share/doc/hugs/manual-html/manual41.html
-share/doc/hugs/manual-html/manual42.html
-share/doc/hugs/manual-html/manual43.html
-share/doc/hugs/manual-html/manual44.html
-share/doc/hugs/manual-html/manual45.html
-share/doc/hugs/manual-html/manual46.html
-share/doc/hugs/manual-html/manual47.html
-share/doc/hugs/manual-html/manual48.html
-share/doc/hugs/manual-html/manual49.html
-share/doc/hugs/manual-html/manual5.html
-share/doc/hugs/manual-html/manual50.html
-share/doc/hugs/manual-html/manual51.html
-share/doc/hugs/manual-html/manual52.html
-share/doc/hugs/manual-html/manual53.html
-share/doc/hugs/manual-html/manual54.html
-share/doc/hugs/manual-html/manual55.html
-share/doc/hugs/manual-html/manual56.html
-share/doc/hugs/manual-html/manual57.html
-share/doc/hugs/manual-html/manual58.html
-share/doc/hugs/manual-html/manual59.html
-share/doc/hugs/manual-html/manual6.html
-share/doc/hugs/manual-html/manual60.html
-share/doc/hugs/manual-html/manual61.html
-share/doc/hugs/manual-html/manual62.html
-share/doc/hugs/manual-html/manual63.html
-share/doc/hugs/manual-html/manual64.html
-share/doc/hugs/manual-html/manual7.html
-share/doc/hugs/manual-html/manual8.html
-share/doc/hugs/manual-html/manual9.html
-share/doc/hugs/manual-html/manual_contents.html
-share/doc/hugs/manual-html/manual_fcontents.html
-share/doc/hugs/manual-html/back.gif
-share/doc/hugs/manual-html/contents.gif
-share/doc/hugs/manual-html/forward.gif
-share/doc/hugs/manual-html/logo.gif
-share/doc/hugs/manual-html/manual1.html
-share/doc/hugs/hugs.1
-share/doc/hugs/graphics.html
-share/doc/hugs/TREX
-share/doc/hugs/README
 share/doc/hugs/windows-notes.txt
 share/doc/hugs/Makefile
 share/doc/hugs/server.tex
 share/doc/hugs/server.html
-share/doc/hugs/index.html
 share/doc/hugs/hugs.man
-share/doc/hugs/hugs.hlp
-@dirrm share/doc/hugs/haskore-html
-@dirrm share/doc/hugs/library
-@dirrm share/doc/hugs/libs-html
-@dirrm share/doc/hugs/manual-html
-@dirrm share/doc/hugs/report
-@dirrm share/doc/hugs/tutorial
-@dirrm share/doc/hugs
-@dirrm share/hugs/demos/cgi
-@dirrm share/hugs/demos/prolog
-@dirrm share/hugs/demos
-@dirrm share/hugs/lib/Haskore/demos
-@dirrm share/hugs/lib/Haskore/docs
-@dirrm share/hugs/lib/Haskore/src
-@dirrm share/hugs/lib/Haskore
-@dirrm share/hugs/lib/exts
+share/doc/hugs/hugs.1
 @dirrm share/hugs/lib/hugs
+@dirrm share/hugs/lib/exts
 @dirrm share/hugs/lib
+@dirrm share/hugs/demos/prolog
+@dirrm share/hugs/demos
 @dirrm share/hugs
+@dirrm share/doc/hugs
diff --git a/lang/hugs/scripts/configure b/lang/hugs/scripts/configure
index 90e708646cc4..81491988a366 100644
--- a/lang/hugs/scripts/configure
+++ b/lang/hugs/scripts/configure
@@ -1,3 +1,3 @@
-#! /bin/sh
+#!/bin/sh
 cd ${WRKSRC}/unix
-CFLAGS=-O2 ./configure --with-readline
+./configure --with-readline