summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lang/hugs/Makefile7
-rw-r--r--lang/hugs/PLIST25
-rw-r--r--lang/hugs/distinfo11
-rw-r--r--lang/hugs/patches/patch-aa24
-rw-r--r--lang/hugs/patches/patch-ab31
-rw-r--r--lang/hugs/patches/patch-ac12
6 files changed, 17 insertions, 93 deletions
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index 94d132db97d..6410f403718 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2006/09/23 13:36:06 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2006/10/21 11:19:28 uebayasi Exp $
-DISTNAME= hugs98-May2006
+DISTNAME= hugs98-Sep2006
PKGNAME= hugs98-200605
-PKGREVISION= 1
CATEGORIES= lang
-MASTER_SITES= http://cvs.haskell.org/Hugs/downloads/2006-05/
+MASTER_SITES= http://cvs.haskell.org/Hugs/downloads/2006-09/
MAINTAINER= nathanw@mit.edu
HOMEPAGE= http://www.haskell.org/hugs/
diff --git a/lang/hugs/PLIST b/lang/hugs/PLIST
index dbea8d90e95..e1e697c80d1 100644
--- a/lang/hugs/PLIST
+++ b/lang/hugs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/08/01 14:33:59 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/10/21 11:19:28 uebayasi Exp $
bin/cpphs-hugs
bin/ffihugs
bin/hsc2hs-hugs
@@ -75,7 +75,6 @@ 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
@@ -155,7 +154,6 @@ 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
@@ -179,6 +177,7 @@ 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/Map.hs
lib/hugs/packages/Cabal/Distribution/Compat/RawSystem.hs
lib/hugs/packages/Cabal/Distribution/Compat/ReadP.hs
lib/hugs/packages/Cabal/Distribution/Compiler.hs
@@ -241,15 +240,17 @@ 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/Base.hs
+lib/hugs/packages/base/Data/ByteString/Base.so
lib/hugs/packages/base/Data/ByteString/Char8.hs
-lib/hugs/packages/base/Data/ByteString/Char8.so
+lib/hugs/packages/base/Data/ByteString/Fusion.hs
+lib/hugs/packages/base/Data/ByteString/Lazy.hs
+lib/hugs/packages/base/Data/ByteString/Lazy/Char8.hs
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
@@ -328,8 +329,6 @@ 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
@@ -337,9 +336,6 @@ 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
@@ -440,8 +436,8 @@ 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/hsc2hs-0.66/template-hsc.h
-@dirrm share/hsc2hs-0.66
+share/hsc2hs-0.67/template-hsc.h
+@dirrm share/hsc2hs-0.67
@dirrm lib/hugs/programs/hsc2hs
@dirrm lib/hugs/programs/cpphs/Text/ParserCombinators
@dirrm lib/hugs/programs/cpphs/Text
@@ -460,11 +456,9 @@ share/hsc2hs-0.66/template-hsc.h
@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
@@ -478,6 +472,7 @@ share/hsc2hs-0.66/template-hsc.h
@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/Lazy
@dirrm lib/hugs/packages/base/Data/ByteString
@dirrm lib/hugs/packages/base/Data/Array/IO
@dirrm lib/hugs/packages/base/Data/Array
diff --git a/lang/hugs/distinfo b/lang/hugs/distinfo
index 9624dca45b2..ac8eebcd1c7 100644
--- a/lang/hugs/distinfo
+++ b/lang/hugs/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.13 2006/08/01 14:33:59 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2006/10/21 11:19:28 uebayasi Exp $
-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
+SHA1 (hugs98-Sep2006.tar.gz) = bf3fec6b28ab812839d20a6c19d0f39e8190b4cc
+RMD160 (hugs98-Sep2006.tar.gz) = 99b6b88bd7256efa16e97684f265932d29133c40
+Size (hugs98-Sep2006.tar.gz) = 2157369 bytes
diff --git a/lang/hugs/patches/patch-aa b/lang/hugs/patches/patch-aa
deleted file mode 100644
index d4538beb20e..00000000000
--- a/lang/hugs/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2006/08/01 14:33:59 jmmv Exp $
-
---- 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
-
- $(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
-
- $(ROOT).dvi: $(SGML_FILES)
- test -z '$(DOCBOOK2DVI)' || $(DOCBOOK2DVI) $(ROOT).sgml
diff --git a/lang/hugs/patches/patch-ab b/lang/hugs/patches/patch-ab
deleted file mode 100644
index 3f87df052fc..00000000000
--- a/lang/hugs/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2006/08/01 14:33:59 jmmv Exp $
-
---- libraries/Makefile.in.orig 2006-05-15 15:55:11.000000000 +0200
-+++ libraries/Makefile.in
-@@ -54,7 +54,7 @@ all: $(BUILD_DIR)/.stamp
-
- $(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 >$@
-
- $(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
deleted file mode 100644
index 8624490107a..00000000000
--- a/lang/hugs/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2006/08/01 14:33:59 jmmv Exp $
-
---- libraries/tools/convert_libraries.orig 2006-05-08 15:20:29.000000000 +0200
-+++ libraries/tools/convert_libraries
-@@ -165,6 +165,7 @@ build_package() {
- esac
-
- $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" \