3 files changed, 111 insertions, 77 deletions

diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index e5dd4c70564f..f36d652e576d 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -3,13 +3,14 @@
 # Date created:		22 September 1997
 # Whom:			Torsten Teg Grust (Torsten.Grust@uni-konstanz.de)
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/11/24 00:10:18 fenner Exp $
 #
 
-DISTNAME=	hugs
-PKGNAME=	hugs-1.4
+DISTNAME=	hugs-January1998-source
+PKGNAME=	hugs-1.4-01-1998
 CATEGORIES=	lang
-MASTER_SITES=	ftp://haskell.org/pub/haskell/hugs/BETA/
+MASTER_SITES=	ftp://haskell.org/pub/haskell/hugs/January1998/
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	Torsten.Grust@uni-konstanz.de
 
@@ -42,9 +43,9 @@ post-install:
 	${INSTALL_DIR} ${PREFIX}/share/doc/hugs
 	${INSTALL_DATA} ${HUGS_DOC}/README ${PREFIX}/share/doc/hugs
 	${INSTALL_DATA} ${HUGS_DOC}/*.html ${PREFIX}/share/doc/hugs
-.for DOC in haskell-report-1.4 haskell-library-1.4 manual tutorial-1.4
-	${INSTALL_DIR} ${PREFIX}/share/doc/hugs/${DOC}-html
-	${INSTALL_DATA} ${HUGS_DOC}/${DOC}-html/* ${PREFIX}/share/doc/hugs/${DOC}-html
+.for DOC in manual-html haskore-html libs-html report library tutorial
+	${INSTALL_DIR} ${PREFIX}/share/doc/hugs/${DOC}
+	${INSTALL_DATA} ${HUGS_DOC}/${DOC}/* ${PREFIX}/share/doc/hugs/${DOC}
 .endfor
 .endif
 
diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index 0e9343ef6d46..7e182d5bbbc3 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1 +1 @@
-MD5 (hugs.tar.gz) = 176ad1fc7c3c90e3f19a2d52953afa7e
+MD5 (hugs-January1998-source.tgz) = 6744078690cd8ecd4cb01ebe5eb1969d
diff --git a/lang/hugs/pkg-plist b/lang/hugs/pkg-plist
index 57a8e29d92f2..d2a7d9bee82c 100644
--- a/lang/hugs/pkg-plist
+++ b/lang/hugs/pkg-plist
@@ -3,47 +3,58 @@ bin/runhugs
 man/man1/hugs.1.gz
 share/doc/hugs/README
 share/doc/hugs/graphics.html
-share/doc/hugs/haskell-library-1.4-html/array.html
-share/doc/hugs/haskell-library-1.4-html/char.html
-share/doc/hugs/haskell-library-1.4-html/complex.html
-share/doc/hugs/haskell-library-1.4-html/cputime.html
-share/doc/hugs/haskell-library-1.4-html/directory.html
-share/doc/hugs/haskell-library-1.4-html/index.html
-share/doc/hugs/haskell-library-1.4-html/introduction.html
-share/doc/hugs/haskell-library-1.4-html/io.html
-share/doc/hugs/haskell-library-1.4-html/ix.html
-share/doc/hugs/haskell-library-1.4-html/libindex.html
-share/doc/hugs/haskell-library-1.4-html/list.html
-share/doc/hugs/haskell-library-1.4-html/locale.html
-share/doc/hugs/haskell-library-1.4-html/maybe.html
-share/doc/hugs/haskell-library-1.4-html/monad.html
-share/doc/hugs/haskell-library-1.4-html/numeric.html
-share/doc/hugs/haskell-library-1.4-html/random.html
-share/doc/hugs/haskell-library-1.4-html/ratio.html
-share/doc/hugs/haskell-library-1.4-html/system.html
-share/doc/hugs/haskell-library-1.4-html/time.html
-share/doc/hugs/haskell-library-1.4-html/title.gif
-share/doc/hugs/haskell-report-1.4-html/basic.html
-share/doc/hugs/haskell-report-1.4-html/class-fig.gif
-share/doc/hugs/haskell-report-1.4-html/decls.html
-share/doc/hugs/haskell-report-1.4-html/derived.html
-share/doc/hugs/haskell-report-1.4-html/exps.html
-share/doc/hugs/haskell-report-1.4-html/haskell.html
-share/doc/hugs/haskell-report-1.4-html/index.html
-share/doc/hugs/haskell-report-1.4-html/index14.html
-share/doc/hugs/haskell-report-1.4-html/intro.html
-share/doc/hugs/haskell-report-1.4-html/io-13.html
-share/doc/hugs/haskell-report-1.4-html/lambda.gif
-share/doc/hugs/haskell-report-1.4-html/lexemes.html
-share/doc/hugs/haskell-report-1.4-html/literate.html
-share/doc/hugs/haskell-report-1.4-html/modules.html
-share/doc/hugs/haskell-report-1.4-html/pragmas.html
-share/doc/hugs/haskell-report-1.4-html/preface-13.html
-share/doc/hugs/haskell-report-1.4-html/prelude-index.html
-share/doc/hugs/haskell-report-1.4-html/standard-prelude.html
-share/doc/hugs/haskell-report-1.4-html/syntax-iso.html
-share/doc/hugs/haskell-report-1.4-html/title.gif
+share/doc/hugs/haskore-html/basics.html
+share/doc/hugs/haskore-html/childsong6.html
+share/doc/hugs/haskore-html/chords.html
+share/doc/hugs/haskore-html/equiv.gif
+share/doc/hugs/haskore-html/equiv.html
+share/doc/hugs/haskore-html/generalmidi.html
+share/doc/hugs/haskore-html/haskore.gif
+share/doc/hugs/haskore-html/haskore.html
+share/doc/hugs/haskore-html/haskoreexamples.html
+share/doc/hugs/haskore-html/hasktomidi.html
+share/doc/hugs/haskore-html/index.html
+share/doc/hugs/haskore-html/index.html~
+share/doc/hugs/haskore-html/intro.html
+share/doc/hugs/haskore-html/performance.html
+share/doc/hugs/haskore-html/poly.gif
+share/doc/hugs/haskore-html/related.html
+share/doc/hugs/haskore-html/selfsim.html
+share/doc/hugs/haskore-html/testhaskore.html
+share/doc/hugs/haskore-html/tutindex.html
+share/doc/hugs/haskore-html/tutorial.html
 share/doc/hugs/index.html
+share/doc/hugs/library/array.html
+share/doc/hugs/library/char.html
+share/doc/hugs/library/complex.html
+share/doc/hugs/library/cputime.html
+share/doc/hugs/library/directory.html
+share/doc/hugs/library/index.html
+share/doc/hugs/library/introduction.html
+share/doc/hugs/library/io.html
+share/doc/hugs/library/ix.html
+share/doc/hugs/library/libindex.html
+share/doc/hugs/library/list.html
+share/doc/hugs/library/locale.html
+share/doc/hugs/library/maybe.html
+share/doc/hugs/library/monad.html
+share/doc/hugs/library/numeric.html
+share/doc/hugs/library/random.html
+share/doc/hugs/library/ratio.html
+share/doc/hugs/library/system.html
+share/doc/hugs/library/time.html
+share/doc/hugs/library/title.gif
+share/doc/hugs/libs-html/libs-1.html
+share/doc/hugs/libs-html/libs-10.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.html
 share/doc/hugs/manual-html/back.gif
 share/doc/hugs/manual-html/contents.gif
 share/doc/hugs/manual-html/forward.gif
@@ -115,26 +126,46 @@ 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/up.gif
+share/doc/hugs/report/basic.html
+share/doc/hugs/report/class-fig.gif
+share/doc/hugs/report/decls.html
+share/doc/hugs/report/derived.html
+share/doc/hugs/report/exps.html
+share/doc/hugs/report/haskell.html
+share/doc/hugs/report/index.html
+share/doc/hugs/report/index14.html
+share/doc/hugs/report/intro.html
+share/doc/hugs/report/io-13.html
+share/doc/hugs/report/lambda.gif
+share/doc/hugs/report/lexemes.html
+share/doc/hugs/report/literate.html
+share/doc/hugs/report/modules.html
+share/doc/hugs/report/pragmas.html
+share/doc/hugs/report/preface-13.html
+share/doc/hugs/report/prelude-index.html
+share/doc/hugs/report/standard-prelude.html
+share/doc/hugs/report/syntax-iso.html
+share/doc/hugs/report/title.gif
 share/doc/hugs/server.html
-share/doc/hugs/tutorial-1.4-html/arrays.html
-share/doc/hugs/tutorial-1.4-html/classes.html
-share/doc/hugs/tutorial-1.4-html/end.html
-share/doc/hugs/tutorial-1.4-html/fig1.gif
-share/doc/hugs/tutorial-1.4-html/fig2.gif
-share/doc/hugs/tutorial-1.4-html/fig3.gif
-share/doc/hugs/tutorial-1.4-html/functions.html
-share/doc/hugs/tutorial-1.4-html/goodies.html
-share/doc/hugs/tutorial-1.4-html/haskell-tutorial.html
-share/doc/hugs/tutorial-1.4-html/index.html
-share/doc/hugs/tutorial-1.4-html/indextutorial.html
-share/doc/hugs/tutorial-1.4-html/intro.html
-share/doc/hugs/tutorial-1.4-html/io.html
-share/doc/hugs/tutorial-1.4-html/modules.html
-share/doc/hugs/tutorial-1.4-html/moretypes.html
-share/doc/hugs/tutorial-1.4-html/patterns.html
-share/doc/hugs/tutorial-1.4-html/pitfalls.html
-share/doc/hugs/tutorial-1.4-html/stdclasses.html
-share/doc/hugs/tutorial-1.4-html/title.gif
+share/doc/hugs/tutorial/arrays.html
+share/doc/hugs/tutorial/classes.html
+share/doc/hugs/tutorial/end.html
+share/doc/hugs/tutorial/fig1.gif
+share/doc/hugs/tutorial/fig2.gif
+share/doc/hugs/tutorial/fig3.gif
+share/doc/hugs/tutorial/functions.html
+share/doc/hugs/tutorial/goodies.html
+share/doc/hugs/tutorial/haskell-tutorial.html
+share/doc/hugs/tutorial/index.html
+share/doc/hugs/tutorial/indextutorial.html
+share/doc/hugs/tutorial/intro.html
+share/doc/hugs/tutorial/io.html
+share/doc/hugs/tutorial/modules.html
+share/doc/hugs/tutorial/moretypes.html
+share/doc/hugs/tutorial/patterns.html
+share/doc/hugs/tutorial/pitfalls.html
+share/doc/hugs/tutorial/stdclasses.html
+share/doc/hugs/tutorial/title.gif
 share/hugs/demos/AnsiDemo.hs
 share/hugs/demos/ArrayEx.hs
 share/hugs/demos/Calendar.hs
@@ -273,19 +304,21 @@ share/hugs/lib/hugs/Sequence.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/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
+@dirrm share/hugs/lib/hugs
 @dirrm share/hugs/lib
-@dirrm share/hugs/demos/prolog
-@dirrm share/hugs/demos/cgi
-@dirrm share/hugs/demos
 @dirrm share/hugs
-@dirrm share/doc/hugs/haskell-report-1.4-html
-@dirrm share/doc/hugs/haskell-library-1.4-html
-@dirrm share/doc/hugs/manual-html
-@dirrm share/doc/hugs/tutorial-1.4-html
-@dirrm share/doc/hugs