Update to 1.12

Unbreak for -current

PR:		36139
Submitted by:	maintainer

11 files changed, 76 insertions, 50 deletions

diff --git a/lang/nhc98/files/patch-Makefile b/lang/nhc98/files/patch-Makefile
index e963ec7aca8e..0df5f2df1033 100644
--- a/lang/nhc98/files/patch-Makefile
+++ b/lang/nhc98/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Oct  4 10:21:53 2001
-+++ Makefile	Thu Oct  4 10:22:02 2001
-@@ -148,14 +148,14 @@
+--- Makefile.orig	Fri Mar 15 20:32:19 2002
++++ Makefile	Fri Mar 15 20:33:50 2002
+@@ -143,15 +143,15 @@
  
  TARGDIR= targets
  TARGETS= runtime prelude greencard hp2graph hattools \
@@ -13,16 +13,17 @@
 -	 compiler-nhc compiler-hbc compiler-ghc compiler-$(CC) \
 -	 hmake-nhc hmake-hbc hmake-ghc hmake-$(CC) \
 -	 greencard-nhc greencard-hbc greencard-ghc greencard-$(CC) \
--	 prelude-$(CC) pragma-$(CC)
 +	 traceruntime traceprelude traceprelude-gcc \
 +	 compiler-nhc compiler-hbc compiler-ghc compiler-gcc \
 +	 hmake-nhc hmake-hbc hmake-ghc hmake-gcc \
 +	 greencard-nhc greencard-hbc greencard-ghc greencard-gcc \
+ 	 hat-nhc hat-ghc \
+-	 prelude-$(CC) pragma-$(CC)
 +	 prelude-gcc pragma-gcc
  
- .PHONY: default basic all tracer compiler help config install hattools
+ .PHONY: default basic all tracer compiler help config install hat hattools
  
-@@ -188,8 +188,8 @@
+@@ -185,8 +185,8 @@
  basic-nhc: $(PRAGMA) runtime hmake-nhc greencard-nhc compiler-nhc prelude
  basic-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc compiler-hbc prelude
  basic-ghc: $(PRAGMA) runtime hmake-ghc greencard-ghc compiler-ghc prelude
@@ -31,10 +32,10 @@
 +basic-gcc:   runtime prelude-gcc pragma-gcc compiler-gcc \
 +		 greencard-gcc hmake-gcc
  
- all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer lib/hood.jar
+ all-$(BUILDCOMP): basic-$(BUILDCOMP) heapprofile timeprofile tracer hoodui
  
-@@ -209,9 +209,9 @@
- 		compiler-ghc traceruntime traceprelude hattools
+@@ -206,9 +206,9 @@
+ 		compiler-ghc traceruntime traceprelude hattools hat-ghc
  tracer-hbc: $(PRAGMA) runtime hmake-hbc greencard-hbc \
  		compiler-hbc traceruntime traceprelude hattools
 -tracer-$(CC): runtime prelude-$(CC) pragma-$(CC) compiler-$(CC) \
@@ -46,7 +47,7 @@
  timetraceprofile: timetraceruntime timetraceprelude
  
  $(TARGETS): % : $(TARGDIR)/$(MACHINE)/%
-@@ -324,44 +324,44 @@
+@@ -328,44 +328,44 @@
  	touch $(TARGDIR)/$(MACHINE)/timeprelude
  
  
@@ -100,7 +101,7 @@
 -$(TARGDIR)/$(MACHINE)/hmake-$(CC): $(HMAKEC)
 +	touch $(TARGDIR)/$(MACHINE)/pragma-gcc
 +$(TARGDIR)/$(MACHINE)/hmake-gcc: $(HMAKEC)
- 	cd src/hmake;          $(MAKE) fromC
+ 	cd src/hmake;          $(MAKE) fromC config
  	cd src/interpreter;    $(MAKE) fromC
 -	touch $(TARGDIR)/$(MACHINE)/hmake-$(CC)
 +	touch $(TARGDIR)/$(MACHINE)/hmake-gcc
diff --git a/lang/nhc98/files/patch-include::Array.hi b/lang/nhc98/files/patch-include::Array.hi
index 30613af20c78..e69de29bb2d1 100644
--- a/lang/nhc98/files/patch-include::Array.hi
+++ b/lang/nhc98/files/patch-include::Array.hi
@@ -1,12 +0,0 @@
-diff -ruN include.bak/Array.hi include/Array.hi
---- include.bak/Array.hi	Tue Sep 18 12:50:40 2001
-+++ include/Array.hi	Fri Dec 21 23:25:13 2001
-@@ -113,7 +113,7 @@
- {-# NEED _tupleRange #-}
- _tupleRange{-# 3 #-}::(Ix a) => (a -> (a -> ([(a -> b)] -> [b])));
- 
--{-# NEED {Ix range index inRange} #-}
-+{-# NEED {Ix range index inRange rangeSize} #-}
- class (Prelude.Ord a) => Ix a where {
-   range{-# 1 #-}::((a,a) -> [a]);
-   index{-# 2 #-}::((a,a) -> (a -> Prelude.Int));
diff --git a/lang/nhc98/files/patch-include::localmalloc.h b/lang/nhc98/files/patch-include::localmalloc.h
new file mode 100644
index 000000000000..67a3ad4abe3e
--- /dev/null
+++ b/lang/nhc98/files/patch-include::localmalloc.h
@@ -0,0 +1,9 @@
+--- include/localmalloc.h.orig	Sun Mar 17 21:18:36 2002
++++ include/localmalloc.h	Sun Mar 17 21:18:55 2002
+@@ -1,5 +1,5 @@
+ #if defined(__APPLE__)
+ #include <sys/malloc.h>
+ #else
+-#include <malloc.h>
++#include <stdlib.h>
+ #endif
diff --git a/lang/nhc98/files/patch-script::confhat b/lang/nhc98/files/patch-script::confhat
new file mode 100644
index 000000000000..b117588b0dfb
--- /dev/null
+++ b/lang/nhc98/files/patch-script::confhat
@@ -0,0 +1,9 @@
+--- script/confhat.orig	Wed Mar 20 12:03:42 2002
++++ script/confhat	Wed Mar 20 12:35:43 2002
+@@ -14,5 +14,5 @@
+ 
+ cp -p lib/$MACHINE/libHShat.a $GHCLIBDIR
+ cp -p lib/hat/*.hi lib/hat/*.hx $GHCINCDIR/hat
+-ghc-pkg --remove-package=hat || /bin/true
++ghc-pkg --remove-package=hat || /usr/bin/true
+ ghc-pkg --add-package <lib/hat/hat-package.conf
diff --git a/lang/nhc98/files/patch-script::harch b/lang/nhc98/files/patch-script::harch
new file mode 100644
index 000000000000..b9da4628cebd
--- /dev/null
+++ b/lang/nhc98/files/patch-script::harch
@@ -0,0 +1,13 @@
+--- script/harch.orig	Tue Mar 19 13:20:39 2002
++++ script/harch	Tue Mar 19 13:22:26 2002
+@@ -13,8 +13,8 @@
+ 
+ if uname >/dev/null 2>&1
+ then
+-  if uname -p >/dev/null 2>&1
+-  then PROCESSOR=`uname -p`
++  if uname -m >/dev/null 2>&1
++  then PROCESSOR=`uname -m`
+     case "$PROCESSOR" in
+     unknown|*\ *)
+       PROCESSOR=`uname -m`
diff --git a/lang/nhc98/files/patch-src::greencard::Makefile b/lang/nhc98/files/patch-src::greencard::Makefile
index 090ba9b4bfea..51d95c1effb8 100644
--- a/lang/nhc98/files/patch-src::greencard::Makefile
+++ b/lang/nhc98/files/patch-src::greencard::Makefile
@@ -1,6 +1,5 @@
-diff -ruN src.bak/greencard/Makefile src/greencard/Makefile
---- src.bak/greencard/Makefile	Tue May 29 16:22:46 2001
-+++ src/greencard/Makefile	Mon Jun 18 16:31:45 2001
+--- src/greencard/Makefile.orig	Fri Mar 15 21:04:02 2002
++++ src/greencard/Makefile	Fri Mar 15 21:06:49 2002
 @@ -34,7 +34,7 @@
  
  
diff --git a/lang/nhc98/files/patch-src::hat::lib::Makefile b/lang/nhc98/files/patch-src::hat::lib::Makefile
new file mode 100644
index 000000000000..a1811991c92a
--- /dev/null
+++ b/lang/nhc98/files/patch-src::hat::lib::Makefile
@@ -0,0 +1,11 @@
+--- src/hat/lib/Makefile.orig	Fri Mar 15 21:03:40 2002
++++ src/hat/lib/Makefile	Fri Mar 15 21:06:25 2002
+@@ -41,7 +41,7 @@
+ all: $(OBJDIR) $(TARGET)
+ install: install-$(HC)
+ install-ghc: $(OBJDIR) $(TARGET)
+-	mkdir $(LIBDIR)/hat || /bin/true
++	mkdir $(LIBDIR)/hat || /usr/bin/true
+ 	$(INSTALL) *.hi *.hx hat-package.conf $(LIBDIR)/hat
+ install-nhc98: $(OBJDIR) $(TARGET)
+ 	$(INSTALL) *.hi *.hx $(INCDIR)
diff --git a/lang/nhc98/files/patch-src::hmake::Makefile b/lang/nhc98/files/patch-src::hmake::Makefile
index 26c10028866e..b3ce1c62e625 100644
--- a/lang/nhc98/files/patch-src::hmake::Makefile
+++ b/lang/nhc98/files/patch-src::hmake::Makefile
@@ -1,7 +1,6 @@
-diff -ruN src.bak/hmake/Makefile src/hmake/Makefile
---- src.bak/hmake/Makefile	Tue May 29 16:29:07 2001
-+++ src/hmake/Makefile	Mon Jun 18 16:32:21 2001
-@@ -48,7 +48,7 @@
+--- src/hmake/Makefile.orig	Fri Mar 15 21:04:20 2002
++++ src/hmake/Makefile	Fri Mar 15 21:07:06 2002
+@@ -63,7 +63,7 @@
  	strip $@
  
  $(OBJDIR):
@@ -9,4 +8,4 @@ diff -ruN src.bak/hmake/Makefile src/hmake/Makefile
 +	mkdir -p $(OBJDIR) || /usr/bin/true
  $(OBJS): $(OBJDIR)/%.$O : %.hs
  	$(HC) $(HFLAGS) -c -o $@ $<
- $(CPPOBJS) $(OBJDIR)/Older.$O: $(OBJDIR)/%.$O : %.hs
+ $(CPPOBJS) $(OBJDIR)/Older.$O $(OBJDIR)/MkConfig.$O: $(OBJDIR)/%.$O : %.hs
diff --git a/lang/nhc98/files/patch-src::hp2graph::Makefile b/lang/nhc98/files/patch-src::hp2graph::Makefile
index 218c9a0c12b3..109f73ad8ca6 100644
--- a/lang/nhc98/files/patch-src::hp2graph::Makefile
+++ b/lang/nhc98/files/patch-src::hp2graph::Makefile
@@ -1,6 +1,5 @@
-diff -ruN src.bak/hp2graph/Makefile src/hp2graph/Makefile
---- src.bak/hp2graph/Makefile	Mon Oct 11 13:50:38 1999
-+++ src/hp2graph/Makefile	Mon Jun 18 16:32:04 2001
+--- src/hp2graph/Makefile.orig	Fri Mar 15 21:04:12 2002
++++ src/hp2graph/Makefile	Fri Mar 15 21:06:58 2002
 @@ -31,7 +31,7 @@
  
  
diff --git a/lang/nhc98/files/patch-src::prelude::Makefile b/lang/nhc98/files/patch-src::prelude::Makefile
index 4c18f7422a2a..3ab026678c81 100644
--- a/lang/nhc98/files/patch-src::prelude::Makefile
+++ b/lang/nhc98/files/patch-src::prelude::Makefile
@@ -1,7 +1,6 @@
-diff -ruN src.bak/prelude/Makefile src/prelude/Makefile
---- src.bak/prelude/Makefile	Mon Jun  4 12:40:41 2001
-+++ src/prelude/Makefile	Mon Jun 18 16:31:24 2001
-@@ -80,7 +80,7 @@
+--- src/prelude/Makefile.orig	Fri Mar 15 21:03:48 2002
++++ src/prelude/Makefile	Fri Mar 15 21:06:41 2002
+@@ -79,7 +79,7 @@
  	mkdir -p ${OBJDIR}
  
  ${OBJDIRS}: ${OBJDIR}/% :
@@ -10,7 +9,7 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile
  
  
  ifeq "${TPROF}" ""
-@@ -326,9 +326,9 @@
+@@ -328,9 +328,9 @@
  
  
  ${OBJDIR}:
@@ -20,5 +19,5 @@ diff -ruN src.bak/prelude/Makefile src/prelude/Makefile
 -	mkdir -p $@ || /bin/true
 +	mkdir -p $@ || /usr/bin/true
  
- ${ARCHIVE}: ${OBJDIR} ${OBJDIRS} ${SUBDIRSMK}
- 	rm -f $@
+ ifeq "${TPROF}" ""
+ 
diff --git a/lang/nhc98/files/patch-src::runtime::Makefile b/lang/nhc98/files/patch-src::runtime::Makefile
index 46b71c9c6ad8..dfcbe2d97ee0 100644
--- a/lang/nhc98/files/patch-src::runtime::Makefile
+++ b/lang/nhc98/files/patch-src::runtime::Makefile
@@ -1,16 +1,15 @@
-diff -ruN src.bak/runtime/Makefile src/runtime/Makefile
---- src.bak/runtime/Makefile	Thu Dec 16 11:58:42 1999
-+++ src/runtime/Makefile	Mon Jun 18 16:30:56 2001
-@@ -9,7 +9,7 @@
+--- src/runtime/Makefile.orig	Fri Mar 15 21:03:33 2002
++++ src/runtime/Makefile	Fri Mar 15 21:06:15 2002
+@@ -13,7 +13,7 @@
+   SUF=.${CFG}
+ endif
  
- LD = ld
- LDFLAGS = -r
 -TRUE = /bin/true
 +TRUE = /usr/bin/true
- CC = gcc
- AR = ar
+ LDFLAGS = -r
  ARFLAGS = r
-@@ -48,7 +48,7 @@
+ 
+@@ -51,7 +51,7 @@
  	mkdir -p ${OBJDIR}
  
  ${OBJDIRS}: ${OBJDIR}/% :