Update to smlnj-110.45.

"The latest working version (110.45) fixes some installation problems
caused by incompatibilities with GCC 3.3. Earlier, 110.44 brought our
implementation of the Basis library closer to the specification, fixed
several important bugs, and provided support for Mac OS X 10.3
(Panther).  The previous working release (110.43) offered an operational
win32 port, added IntInf support to compiler and Basis library, and also
updated many interfaces of the Basis according to the latest draft of
the specification."

Provided by Jesper Louis Andersen in PR pkg/24586.

Also fixes PR pkg/23480.

5 files changed, 243 insertions, 243 deletions

diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index c12f97880ab..f84d4cec287 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 13:51:15 grant Exp $
-#
+# $NetBSD: Makefile,v 1.7 2004/04/09 23:19:37 snj Exp $
 
 DISTNAME=	boot.${BOX}-unix
 PKGNAME=	smlnj-${SML_VERSION}
@@ -28,7 +27,7 @@ MAINTAINER=	richards+netbsd@CS.Princeton.EDU
 HOMEPAGE=	http://www.smlnj.org/index.html
 COMMENT=	Popular functional language from Bell Labs
 
-SML_VERSION=	110.42
+SML_VERSION=	110.45
 
 # Other mirror sites that generally carry only released versions of SML
 # 	ftp://rodin.stanford.edu/pub/smlnj/release/
@@ -37,6 +36,7 @@ SML_VERSION=	110.42
 
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	smlnj-${SML_VERSION}
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 
 # previous versions of the package had an additional '-'
diff --git a/lang/smlnj/PLIST b/lang/smlnj/PLIST
index 55dd429e683..fecb22c7277 100644
--- a/lang/smlnj/PLIST
+++ b/lang/smlnj/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/07/01 23:10:33 jtb Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/09 23:19:37 snj Exp $
 bin/ml-build
 bin/ml-burg
 bin/ml-lex
@@ -25,237 +25,238 @@ ${NLFFI}lib/smlnj/bin/ml-nlffigen
 lib/smlnj/bin/ml-yacc
 lib/smlnj/bin/nowhere
 lib/smlnj/bin/sml
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/ALPHA.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Control.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Graphs.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/HPPA.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/IA32.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Lib.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/MLRISC.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/MLTREE.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/PPC.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/SPARC.cm
-lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Visual.cm
-lib/smlnj/lib/basis.cm/CM/${BOX}-unix/basis.cm
-lib/smlnj/lib/burg-ext.cm/CM/${BOX}-unix/burg-ext.cm
-${NLFFI}lib/smlnj/lib/c/CM/${BOX}-unix/c.cm
-${NLFFI}lib/smlnj/lib/c/internals/CM/${BOX}-unix/c-int.cm
-${NLFFI}lib/smlnj/lib/c/memory/CM/${BOX}-unix/memory.cm
-lib/smlnj/lib/ckit-lib.cm/CM/${BOX}-unix/ckit-lib.cm
-lib/smlnj/lib/cml-lib/CM/${BOX}-unix/smlnj-lib.cm
-lib/smlnj/lib/cml-lib/CM/${BOX}-unix/trace-cml.cm
-lib/smlnj/lib/cml/CM/${BOX}-unix/basis.cm
-lib/smlnj/lib/cml/CM/${BOX}-unix/cml-internal.cm
-lib/smlnj/lib/cml/CM/${BOX}-unix/cml.cm
-lib/smlnj/lib/cml/CM/${BOX}-unix/core-cml.cm
-lib/smlnj/lib/controls-lib.cm/CM/${BOX}-unix/controls-lib.cm
-lib/smlnj/lib/dir-tool.cm/CM/${BOX}-unix/dir-tool.cm
-lib/smlnj/lib/eXene.cm/CM/${BOX}-unix/eXene.cm
-lib/smlnj/lib/grm-ext.cm/CM/${BOX}-unix/grm-ext.cm
-lib/smlnj/lib/hash-cons-lib.cm/CM/${BOX}-unix/hash-cons-lib.cm
-lib/smlnj/lib/html-lib.cm/CM/${BOX}-unix/html-lib.cm
-lib/smlnj/lib/inet-lib.cm/CM/${BOX}-unix/inet-lib.cm
-lib/smlnj/lib/lex-ext.cm/CM/${BOX}-unix/lex-ext.cm
-lib/smlnj/lib/make-tool.cm/CM/${BOX}-unix/make-tool.cm
-lib/smlnj/lib/ml-yacc-lib.cm/CM/${BOX}-unix/ml-yacc-lib.cm
-lib/smlnj/lib/mlburg-tool.cm/CM/${BOX}-unix/mlburg-tool.cm
-lib/smlnj/lib/mllex-tool.cm/CM/${BOX}-unix/mllex-tool.cm
-lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/match-compiler.cm
-lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/parser.cm
-lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/pp.cm
-lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/prec-parser.cm
-lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/sml-ast.cm
-lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix/source-map.cm
-lib/smlnj/lib/mlyacc-tool.cm/CM/${BOX}-unix/mlyacc-tool.cm
-lib/smlnj/lib/noweb-tool.cm/CM/${BOX}-unix/noweb-tool.cm
-lib/smlnj/lib/nw-ext.cm/CM/${BOX}-unix/nw-ext.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/ALPHA.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Control.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Graphs.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/HPPA.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/IA32.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Lib.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/MLRISC.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/MLTREE.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/PPC.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/SPARC.cm
+lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix/Visual.cm
+lib/smlnj/lib/basis.cm/.cm/${BOX}-unix/basis.cm
+lib/smlnj/lib/burg-ext.cm/.cm/${BOX}-unix/burg-ext.cm
+${NLFFI}lib/smlnj/lib/c/.cm/${BOX}-unix/c.cm
+${NLFFI}lib/smlnj/lib/c/internals/.cm/${BOX}-unix/c-int.cm
+${NLFFI}lib/smlnj/lib/c/memory/.cm/${BOX}-unix/memory.cm
+lib/smlnj/lib/ckit-lib.cm/.cm/${BOX}-unix/ckit-lib.cm
+lib/smlnj/lib/cml-lib/.cm/${BOX}-unix/smlnj-lib.cm
+lib/smlnj/lib/cml-lib/.cm/${BOX}-unix/trace-cml.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/basis.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/cml-internal.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/cml.cm
+lib/smlnj/lib/cml/.cm/${BOX}-unix/core-cml.cm
+lib/smlnj/lib/controls-lib.cm/.cm/${BOX}-unix/controls-lib.cm
+lib/smlnj/lib/dir-tool.cm/.cm/${BOX}-unix/dir-tool.cm
+lib/smlnj/lib/eXene.cm/.cm/${BOX}-unix/eXene.cm
+lib/smlnj/lib/grm-ext.cm/.cm/${BOX}-unix/grm-ext.cm
+lib/smlnj/lib/hash-cons-lib.cm/.cm/${BOX}-unix/hash-cons-lib.cm
+lib/smlnj/lib/html-lib.cm/.cm/${BOX}-unix/html-lib.cm
+lib/smlnj/lib/inet-lib.cm/.cm/${BOX}-unix/inet-lib.cm
+lib/smlnj/lib/lex-ext.cm/.cm/${BOX}-unix/lex-ext.cm
+lib/smlnj/lib/make-tool.cm/.cm/${BOX}-unix/make-tool.cm
+lib/smlnj/lib/ml-yacc-lib.cm/.cm/${BOX}-unix/ml-yacc-lib.cm
+lib/smlnj/lib/mlburg-tool.cm/.cm/${BOX}-unix/mlburg-tool.cm
+lib/smlnj/lib/mllex-tool.cm/.cm/${BOX}-unix/mllex-tool.cm
+lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/match-compiler.cm
+lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/parser.cm
+lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/pp.cm
+lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/prec-parser.cm
+lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/sml-ast.cm
+lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix/source-map.cm
+lib/smlnj/lib/mlyacc-tool.cm/.cm/${BOX}-unix/mlyacc-tool.cm
+lib/smlnj/lib/noweb-tool.cm/.cm/${BOX}-unix/noweb-tool.cm
+lib/smlnj/lib/nw-ext.cm/.cm/${BOX}-unix/nw-ext.cm
 lib/smlnj/lib/pathconfig
-lib/smlnj/lib/pgraph-util.cm/CM/${BOX}-unix/pgraph-util.cm
-lib/smlnj/lib/pgraph.cm/CM/${BOX}-unix/pgraph.cm
-lib/smlnj/lib/pickle-lib.cm/CM/${BOX}-unix/pickle-lib.cm
-lib/smlnj/lib/pp-lib.cm/CM/${BOX}-unix/pp-lib.cm
-lib/smlnj/lib/reactive-lib.cm/CM/${BOX}-unix/reactive-lib.cm
-lib/smlnj/lib/regexp-lib.cm/CM/${BOX}-unix/regexp-lib.cm
-lib/smlnj/lib/shell-tool.cm/CM/${BOX}-unix/shell-tool.cm
-lib/smlnj/lib/smlnj-lib.cm/CM/${BOX}-unix/smlnj-lib.cm
-lib/smlnj/lib/smlnj/CM/${BOX}-unix/cm.cm
-lib/smlnj/lib/smlnj/CM/${BOX}-unix/cmb.cm
-lib/smlnj/lib/smlnj/CM/${BOX}-unix/compiler.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/ALPHA.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Control.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Graphs.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/HPPA.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/IA32.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Lib.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/MLRISC.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/MLTREE.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/PPC.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/SPARC.cm
-lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix/Visual.cm
-lib/smlnj/lib/smlnj/cm/CM/${BOX}-unix/cm.cm
-lib/smlnj/lib/smlnj/cm/CM/${BOX}-unix/tools.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/alpha32-unix.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/current.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/hppa-unix.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/ppc-macos.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/ppc-unix.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/sparc-unix.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/x86-unix.cm
-lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix/x86-win32.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/all.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/alpha32.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/compiler.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/current.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/hppa.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/minimal-only.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/minimal.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/ppc.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/sparc.cm
-lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix/x86.cm
-lib/smlnj/lib/smlnj/init/CM/${BOX}-unix/init.cmi
-lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/cm-lib.cm
-lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/cm-sig-lib.cm
-lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/cm0.cm
-lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/intsys.cm
-lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix/srcpath-lib.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/alpha32.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/basics.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/core.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/debugprof.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/elabdata.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/elaborate.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/execute.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/hppa.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/parser.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/ppc.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/sparc.cm
-lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix/x86.cm
-lib/smlnj/lib/unix-lib.cm/CM/${BOX}-unix/unix-lib.cm
-@dirrm lib/smlnj/lib/unix-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/unix-lib.cm/CM
+lib/smlnj/lib/pgraph-util.cm/.cm/${BOX}-unix/pgraph-util.cm
+lib/smlnj/lib/pgraph.cm/.cm/${BOX}-unix/pgraph.cm
+lib/smlnj/lib/pickle-lib.cm/.cm/${BOX}-unix/pickle-lib.cm
+lib/smlnj/lib/pp-lib.cm/.cm/${BOX}-unix/pp-lib.cm
+lib/smlnj/lib/reactive-lib.cm/.cm/${BOX}-unix/reactive-lib.cm
+lib/smlnj/lib/regexp-lib.cm/.cm/${BOX}-unix/regexp-lib.cm
+lib/smlnj/lib/shell-tool.cm/.cm/${BOX}-unix/shell-tool.cm
+lib/smlnj/lib/smlnj-lib.cm/.cm/${BOX}-unix/smlnj-lib.cm
+lib/smlnj/lib/smlnj/.cm/${BOX}-unix/cm.cm
+lib/smlnj/lib/smlnj/.cm/${BOX}-unix/cmb.cm
+lib/smlnj/lib/smlnj/.cm/${BOX}-unix/compiler.cm
+lib/smlnj/lib/smlnj/.cm/${BOX}-unix/installer.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/ALPHA.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Control.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Graphs.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/HPPA.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/IA32.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Lib.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/MLRISC.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/MLTREE.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/PPC.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/SPARC.cm
+lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix/Visual.cm
+lib/smlnj/lib/smlnj/cm/.cm/${BOX}-unix/cm.cm
+lib/smlnj/lib/smlnj/cm/.cm/${BOX}-unix/tools.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/alpha32-unix.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/current.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/hppa-unix.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/ppc-macos.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/ppc-unix.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/sparc-unix.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/x86-unix.cm
+lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix/x86-win32.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/all.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/alpha32.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/compiler.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/current.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/hppa.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/minimal-only.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/minimal.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/ppc.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/sparc.cm
+lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix/x86.cm
+lib/smlnj/lib/smlnj/init/.cm/${BOX}-unix/init.cmi
+lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/cm-lib.cm
+lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/cm-sig-lib.cm
+lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/cm0.cm
+lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/intsys.cm
+lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix/srcpath-lib.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/alpha32.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/basics.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/core.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/debugprof.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/elabdata.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/elaborate.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/execute.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/hppa.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/parser.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/ppc.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/sparc.cm
+lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix/x86.cm
+lib/smlnj/lib/unix-lib.cm/.cm/${BOX}-unix/unix-lib.cm
+@dirrm lib/smlnj/lib/unix-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/unix-lib.cm/.cm
 @dirrm lib/smlnj/lib/unix-lib.cm
-@dirrm lib/smlnj/lib/smlnj/viscomp/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/viscomp/CM
+@dirrm lib/smlnj/lib/smlnj/viscomp/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/viscomp/.cm
 @dirrm lib/smlnj/lib/smlnj/viscomp
-@dirrm lib/smlnj/lib/smlnj/internal/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/internal/CM
+@dirrm lib/smlnj/lib/smlnj/internal/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/internal/.cm
 @dirrm lib/smlnj/lib/smlnj/internal
-@dirrm lib/smlnj/lib/smlnj/init/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/init/CM
+@dirrm lib/smlnj/lib/smlnj/init/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/init/.cm
 @dirrm lib/smlnj/lib/smlnj/init
-@dirrm lib/smlnj/lib/smlnj/compiler/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/compiler/CM
+@dirrm lib/smlnj/lib/smlnj/compiler/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/compiler/.cm
 @dirrm lib/smlnj/lib/smlnj/compiler
-@dirrm lib/smlnj/lib/smlnj/cmb/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/cmb/CM
+@dirrm lib/smlnj/lib/smlnj/cmb/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/cmb/.cm
 @dirrm lib/smlnj/lib/smlnj/cmb
-@dirrm lib/smlnj/lib/smlnj/cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/cm/CM
+@dirrm lib/smlnj/lib/smlnj/cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/cm/.cm
 @dirrm lib/smlnj/lib/smlnj/cm
-@dirrm lib/smlnj/lib/smlnj/MLRISC/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/MLRISC/CM
+@dirrm lib/smlnj/lib/smlnj/MLRISC/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/MLRISC/.cm
 @dirrm lib/smlnj/lib/smlnj/MLRISC
-@dirrm lib/smlnj/lib/smlnj/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj/CM
-@dirrm lib/smlnj/lib/smlnj-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/smlnj-lib.cm/CM
+@dirrm lib/smlnj/lib/smlnj/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj/.cm
+@dirrm lib/smlnj/lib/smlnj-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/smlnj-lib.cm/.cm
 @dirrm lib/smlnj/lib/smlnj-lib.cm
 @dirrm lib/smlnj/lib/smlnj
-@dirrm lib/smlnj/lib/shell-tool.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/shell-tool.cm/CM
+@dirrm lib/smlnj/lib/shell-tool.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/shell-tool.cm/.cm
 @dirrm lib/smlnj/lib/shell-tool.cm
-@dirrm lib/smlnj/lib/regexp-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/regexp-lib.cm/CM
+@dirrm lib/smlnj/lib/regexp-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/regexp-lib.cm/.cm
 @dirrm lib/smlnj/lib/regexp-lib.cm
-@dirrm lib/smlnj/lib/reactive-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/reactive-lib.cm/CM
+@dirrm lib/smlnj/lib/reactive-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/reactive-lib.cm/.cm
 @dirrm lib/smlnj/lib/reactive-lib.cm
-@dirrm lib/smlnj/lib/pp-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/pp-lib.cm/CM
+@dirrm lib/smlnj/lib/pp-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/pp-lib.cm/.cm
 @dirrm lib/smlnj/lib/pp-lib.cm
-@dirrm lib/smlnj/lib/pickle-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/pickle-lib.cm/CM
+@dirrm lib/smlnj/lib/pickle-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/pickle-lib.cm/.cm
 @dirrm lib/smlnj/lib/pickle-lib.cm
-@dirrm lib/smlnj/lib/pgraph.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/pgraph.cm/CM
+@dirrm lib/smlnj/lib/pgraph.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/pgraph.cm/.cm
 @dirrm lib/smlnj/lib/pgraph.cm
-@dirrm lib/smlnj/lib/pgraph-util.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/pgraph-util.cm/CM
+@dirrm lib/smlnj/lib/pgraph-util.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/pgraph-util.cm/.cm
 @dirrm lib/smlnj/lib/pgraph-util.cm
-@dirrm lib/smlnj/lib/nw-ext.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/nw-ext.cm/CM
+@dirrm lib/smlnj/lib/nw-ext.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/nw-ext.cm/.cm
 @dirrm lib/smlnj/lib/nw-ext.cm
-@dirrm lib/smlnj/lib/noweb-tool.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/noweb-tool.cm/CM
+@dirrm lib/smlnj/lib/noweb-tool.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/noweb-tool.cm/.cm
 @dirrm lib/smlnj/lib/noweb-tool.cm
-@dirrm lib/smlnj/lib/mlyacc-tool.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/mlyacc-tool.cm/CM
+@dirrm lib/smlnj/lib/mlyacc-tool.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/mlyacc-tool.cm/.cm
 @dirrm lib/smlnj/lib/mlyacc-tool.cm
-@dirrm lib/smlnj/lib/mlrisc-tools/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/mlrisc-tools/CM
+@dirrm lib/smlnj/lib/mlrisc-tools/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/mlrisc-tools/.cm
 @dirrm lib/smlnj/lib/mlrisc-tools
-@dirrm lib/smlnj/lib/mllex-tool.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/mllex-tool.cm/CM
+@dirrm lib/smlnj/lib/mllex-tool.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/mllex-tool.cm/.cm
 @dirrm lib/smlnj/lib/mllex-tool.cm
-@dirrm lib/smlnj/lib/mlburg-tool.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/mlburg-tool.cm/CM
+@dirrm lib/smlnj/lib/mlburg-tool.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/mlburg-tool.cm/.cm
 @dirrm lib/smlnj/lib/mlburg-tool.cm
-@dirrm lib/smlnj/lib/ml-yacc-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/ml-yacc-lib.cm/CM
+@dirrm lib/smlnj/lib/ml-yacc-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/ml-yacc-lib.cm/.cm
 @dirrm lib/smlnj/lib/ml-yacc-lib.cm
-@dirrm lib/smlnj/lib/make-tool.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/make-tool.cm/CM
+@dirrm lib/smlnj/lib/make-tool.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/make-tool.cm/.cm
 @dirrm lib/smlnj/lib/make-tool.cm
-@dirrm lib/smlnj/lib/lex-ext.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/lex-ext.cm/CM
+@dirrm lib/smlnj/lib/lex-ext.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/lex-ext.cm/.cm
 @dirrm lib/smlnj/lib/lex-ext.cm
-@dirrm lib/smlnj/lib/inet-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/inet-lib.cm/CM
+@dirrm lib/smlnj/lib/inet-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/inet-lib.cm/.cm
 @dirrm lib/smlnj/lib/inet-lib.cm
-@dirrm lib/smlnj/lib/html-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/html-lib.cm/CM
+@dirrm lib/smlnj/lib/html-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/html-lib.cm/.cm
 @dirrm lib/smlnj/lib/html-lib.cm
-@dirrm lib/smlnj/lib/hash-cons-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/hash-cons-lib.cm/CM
+@dirrm lib/smlnj/lib/hash-cons-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/hash-cons-lib.cm/.cm
 @dirrm lib/smlnj/lib/hash-cons-lib.cm
-@dirrm lib/smlnj/lib/grm-ext.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/grm-ext.cm/CM
+@dirrm lib/smlnj/lib/grm-ext.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/grm-ext.cm/.cm
 @dirrm lib/smlnj/lib/grm-ext.cm
-@dirrm lib/smlnj/lib/eXene.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/eXene.cm/CM
+@dirrm lib/smlnj/lib/eXene.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/eXene.cm/.cm
 @dirrm lib/smlnj/lib/eXene.cm
-@dirrm lib/smlnj/lib/dir-tool.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/dir-tool.cm/CM
+@dirrm lib/smlnj/lib/dir-tool.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/dir-tool.cm/.cm
 @dirrm lib/smlnj/lib/dir-tool.cm
-@dirrm lib/smlnj/lib/controls-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/controls-lib.cm/CM
+@dirrm lib/smlnj/lib/controls-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/controls-lib.cm/.cm
 @dirrm lib/smlnj/lib/controls-lib.cm
-@dirrm lib/smlnj/lib/cml/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/cml/CM
-@dirrm lib/smlnj/lib/cml-lib/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/cml-lib/CM
+@dirrm lib/smlnj/lib/cml/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/cml/.cm
+@dirrm lib/smlnj/lib/cml-lib/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/cml-lib/.cm
 @dirrm lib/smlnj/lib/cml-lib
 @dirrm lib/smlnj/lib/cml
-@dirrm lib/smlnj/lib/ckit-lib.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/ckit-lib.cm/CM
+@dirrm lib/smlnj/lib/ckit-lib.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/ckit-lib.cm/.cm
 @dirrm lib/smlnj/lib/ckit-lib.cm
-${NLFFI}@dirrm lib/smlnj/lib/c/memory/CM/${BOX}-unix
-${NLFFI}@dirrm lib/smlnj/lib/c/memory/CM
+${NLFFI}@dirrm lib/smlnj/lib/c/memory/.cm/${BOX}-unix
+${NLFFI}@dirrm lib/smlnj/lib/c/memory/.cm
 ${NLFFI}@dirrm lib/smlnj/lib/c/memory
-${NLFFI}@dirrm lib/smlnj/lib/c/internals/CM/${BOX}-unix
-${NLFFI}@dirrm lib/smlnj/lib/c/internals/CM
+${NLFFI}@dirrm lib/smlnj/lib/c/internals/.cm/${BOX}-unix
+${NLFFI}@dirrm lib/smlnj/lib/c/internals/.cm
 ${NLFFI}@dirrm lib/smlnj/lib/c/internals
-${NLFFI}@dirrm lib/smlnj/lib/c/CM/${BOX}-unix
-${NLFFI}@dirrm lib/smlnj/lib/c/CM
+${NLFFI}@dirrm lib/smlnj/lib/c/.cm/${BOX}-unix
+${NLFFI}@dirrm lib/smlnj/lib/c/.cm
 ${NLFFI}@dirrm lib/smlnj/lib/c
-@dirrm lib/smlnj/lib/burg-ext.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/burg-ext.cm/CM
+@dirrm lib/smlnj/lib/burg-ext.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/burg-ext.cm/.cm
 @dirrm lib/smlnj/lib/burg-ext.cm
-@dirrm lib/smlnj/lib/basis.cm/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/basis.cm/CM
+@dirrm lib/smlnj/lib/basis.cm/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/basis.cm/.cm
 @dirrm lib/smlnj/lib/basis.cm
-@dirrm lib/smlnj/lib/SMLNJ-MLRISC/CM/${BOX}-unix
-@dirrm lib/smlnj/lib/SMLNJ-MLRISC/CM
+@dirrm lib/smlnj/lib/SMLNJ-MLRISC/.cm/${BOX}-unix
+@dirrm lib/smlnj/lib/SMLNJ-MLRISC/.cm
 @dirrm lib/smlnj/lib/SMLNJ-MLRISC
 @dirrm lib/smlnj/lib
 @dirrm lib/smlnj/bin/.run
diff --git a/lang/smlnj/distinfo b/lang/smlnj/distinfo
index 715a994e11c..6922c0b2d3c 100644
--- a/lang/smlnj/distinfo
+++ b/lang/smlnj/distinfo
@@ -1,42 +1,38 @@
-$NetBSD: distinfo,v 1.6 2003/07/02 19:57:35 jtb Exp $
+$NetBSD: distinfo,v 1.7 2004/04/09 23:19:37 snj Exp $
 
-SHA1 (smlnj-110.42/MLRISC.tgz) = 55055ed06f7dd2ef178ef365c018f0f38f740528
-Size (smlnj-110.42/MLRISC.tgz) = 1173187 bytes
-SHA1 (smlnj-110.42/boot.ppc-unix.tgz) = 50c12d123cbb953283cc01308bda94ba6a004f10
-Size (smlnj-110.42/boot.ppc-unix.tgz) = 5063945 bytes
-SHA1 (smlnj-110.42/boot.sparc-unix.tgz) = d90361e8de683bde9f2ce76d5a3fdc0b9bcf7b1f
-Size (smlnj-110.42/boot.sparc-unix.tgz) = 5216813 bytes
-SHA1 (smlnj-110.42/boot.x86-unix.tgz) = 7e85b25459886179be0bcb949cd489f62c0a5424
-Size (smlnj-110.42/boot.x86-unix.tgz) = 5147025 bytes
-SHA1 (smlnj-110.42/ckit.tgz) = f47599df014c9c6dcd02c0bfcc0fad5d1409451b
-Size (smlnj-110.42/ckit.tgz) = 168000 bytes
-SHA1 (smlnj-110.42/cm.tgz) = c102131e974e91426bab1cc30005f8e02f7622b6
-Size (smlnj-110.42/cm.tgz) = 202633 bytes
-SHA1 (smlnj-110.42/cml.tgz) = 61f20116032d284a0d2eecd5f14de5378ff4ea6d
-Size (smlnj-110.42/cml.tgz) = 128485 bytes
-SHA1 (smlnj-110.42/compiler.tgz) = fbde2959e05c04333131450d152a6ac5890b2867
-Size (smlnj-110.42/compiler.tgz) = 704669 bytes
-SHA1 (smlnj-110.42/config.tgz) = f7c1b75019c274872d599b9f5a42ce0ee1926c24
-Size (smlnj-110.42/config.tgz) = 13660 bytes
-SHA1 (smlnj-110.42/eXene.tgz) = e213539308047636da34a82fbcc7d59a8f03ea7a
-Size (smlnj-110.42/eXene.tgz) = 695431 bytes
-SHA1 (smlnj-110.42/ml-burg.tgz) = 8c69fd51f7eb86b941883fa7c309b7e54baf28ea
-Size (smlnj-110.42/ml-burg.tgz) = 31696 bytes
-SHA1 (smlnj-110.42/ml-lex.tgz) = 524714f95cd014e55624e9d1b270a77100f28cd1
-Size (smlnj-110.42/ml-lex.tgz) = 32108 bytes
-SHA1 (smlnj-110.42/ml-nlffi-lib.tgz) = 5222ccdc1d9737360a0ce60b05137b476282e9f3
-Size (smlnj-110.42/ml-nlffi-lib.tgz) = 33645 bytes
-SHA1 (smlnj-110.42/ml-nlffigen.tgz) = d3e0e064dfd0fd3c12bda72e098224ebea180a6a
-Size (smlnj-110.42/ml-nlffigen.tgz) = 28836 bytes
-SHA1 (smlnj-110.42/ml-yacc.tgz) = ff4a077099a6f8d2bb8b32a64c9ef45e89358346
-Size (smlnj-110.42/ml-yacc.tgz) = 95608 bytes
-SHA1 (smlnj-110.42/runtime.tgz) = 913b2c4ca3edea2fd7fcc09c482665fb92e5f540
-Size (smlnj-110.42/runtime.tgz) = 313057 bytes
-SHA1 (smlnj-110.42/smlnj-lib.tgz) = c48a8e19d4a14799d7596ce896f4a2040fe1c2bf
-Size (smlnj-110.42/smlnj-lib.tgz) = 251230 bytes
-SHA1 (smlnj-110.42/system.tgz) = 0b9f61052a6413ac1d391a6b7ddf903875d192ff
-Size (smlnj-110.42/system.tgz) = 177548 bytes
-SHA1 (patch-aa) = 370fc94462f60fcf1b28ddad2266311b19d92eca
+SHA1 (smlnj-110.45/MLRISC.tgz) = 0ff9ca7a5b333c012c5b366ced1eb1dddd7c3b74
+Size (smlnj-110.45/MLRISC.tgz) = 1221377 bytes
+SHA1 (smlnj-110.45/boot.x86-unix.tgz) = c00baadd2ff344555333e967aabbf365c27a1c5f
+Size (smlnj-110.45/boot.x86-unix.tgz) = 5298523 bytes
+SHA1 (smlnj-110.45/ckit.tgz) = b4fa2f50edfcae9d1898fa2024c6dd0b5de82d55
+Size (smlnj-110.45/ckit.tgz) = 168194 bytes
+SHA1 (smlnj-110.45/cm.tgz) = 9840a5d7bbdc8ab02feca5e7baebc40fd227a8dd
+Size (smlnj-110.45/cm.tgz) = 203716 bytes
+SHA1 (smlnj-110.45/cml.tgz) = 77afbfcae5282f7af329b3783e98c93443bc8d5a
+Size (smlnj-110.45/cml.tgz) = 103556 bytes
+SHA1 (smlnj-110.45/compiler.tgz) = 51c4276e8ae9bcd7cf950f95a8b44739fa698ddd
+Size (smlnj-110.45/compiler.tgz) = 729559 bytes
+SHA1 (smlnj-110.45/config.tgz) = 0fecf02221c6f2ad61d22b3e00fb797eea6bbc0d
+Size (smlnj-110.45/config.tgz) = 12918 bytes
+SHA1 (smlnj-110.45/eXene.tgz) = 4a884474902f66574c1507dff18776a615ded0d7
+Size (smlnj-110.45/eXene.tgz) = 695211 bytes
+SHA1 (smlnj-110.45/ml-burg.tgz) = e15acc8cd4efd13b25105a3806f038b51318dc84
+Size (smlnj-110.45/ml-burg.tgz) = 31547 bytes
+SHA1 (smlnj-110.45/ml-lex.tgz) = 92965b27b9454b89b99d35eaa3c256c4f0d08e72
+Size (smlnj-110.45/ml-lex.tgz) = 32382 bytes
+SHA1 (smlnj-110.45/ml-nlffi-lib.tgz) = ddf29a6f717bb1908092ae205945c2e7a45300bf
+Size (smlnj-110.45/ml-nlffi-lib.tgz) = 33758 bytes
+SHA1 (smlnj-110.45/ml-nlffigen.tgz) = 2d6cd5a14a1e13ad98fec46021044ec4d2fb0ab4
+Size (smlnj-110.45/ml-nlffigen.tgz) = 29070 bytes
+SHA1 (smlnj-110.45/ml-yacc.tgz) = 4c4681e341abd61fa10135ca3c3b82fe1658075e
+Size (smlnj-110.45/ml-yacc.tgz) = 95048 bytes
+SHA1 (smlnj-110.45/runtime.tgz) = 9daccd5e07c96d0fdc9c7f387710adbbd496431d
+Size (smlnj-110.45/runtime.tgz) = 315758 bytes
+SHA1 (smlnj-110.45/smlnj-lib.tgz) = 06af70565a50a85b8f041de03b3859ca261b975e
+Size (smlnj-110.45/smlnj-lib.tgz) = 217129 bytes
+SHA1 (smlnj-110.45/system.tgz) = 7040c01a5af6d0b7efdcd88efd97e905bfaf0af8
+Size (smlnj-110.45/system.tgz) = 207344 bytes
+SHA1 (patch-aa) = 52d0e7fdb888e753e351d74ed77655e8e0c6afd7
 SHA1 (patch-ab) = 3d5946b2d72dee255159afe6fb25240f8fa7e306
 SHA1 (patch-ac) = 7b3ea837db260542d1477ccbe0dba24c6afbc1e2
 SHA1 (patch-ad) = a406bde2f6f7e2d93d652135b94aefd4b7aca494
@@ -47,7 +43,7 @@ SHA1 (patch-ah) = 4d1f861cf18424db18fbcd19fd2e123b9a0a5247
 SHA1 (patch-ai) = dfb45b2c7d59bcd9230edb30d5dfffd4dab5782e
 SHA1 (patch-aj) = 24bbb65b02e97bec7673dccbf07fce9853c94984
 SHA1 (patch-ak) = 55738c10e5adc6b99d909a784f256b24e250990e
-SHA1 (patch-al) = f2492a36e670dcf2332b01b5769d51dc33a9f609
+SHA1 (patch-al) = 9a1026bfdca0e3a0332a323ae1a294ff1dc86b4b
 SHA1 (patch-am) = 06d8cb145217c46ada440e0d3e7420ea99651064
 SHA1 (patch-an) = d6e1a75d5fb68423ce3181622de919c2337db2e7
 SHA1 (patch-ao) = 1c66024c5949269291cbf6f815baf6162db47d31
diff --git a/lang/smlnj/patches/patch-aa b/lang/smlnj/patches/patch-aa
index 0b1cf7ffa9b..88772aeab11 100644
--- a/lang/smlnj/patches/patch-aa
+++ b/lang/smlnj/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/03/21 22:54:39 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2004/04/09 23:19:37 snj Exp $
 
---- config/targets.orig	Thu Oct 10 12:02:10 2002
+--- config/targets.orig	2003-11-04 18:50:53.000000000 +0100
 +++ config/targets
-@@ -41,7 +41,7 @@ request ml-lex
+@@ -38,7 +38,7 @@ request ml-lex
  
  # build ML-Burg
  #
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 22:54:39 wiz Exp $
  
  # pre-compile and install the remaining components of the SML/NJ library
  # (everything except smlnj-lib.cm, aka Util, itself)
-@@ -50,7 +50,7 @@ request smlnj-lib
+@@ -47,7 +47,7 @@ request smlnj-lib
  
  # pre-compile and install CM "portable graph" utility library
  #
@@ -20,13 +20,16 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 22:54:39 wiz Exp $
  
  # pre-compile and install Concurrent ML, which is a library for message-passing
  # concurrency.
-@@ -65,12 +65,12 @@ request cml-lib
+@@ -62,7 +62,7 @@ request cml-lib
  # pre-compile and install eXene, which is a library for X-Windows programming.
  # EXene requires CML.
  #
 -#request eXene
 +request eXene
  
+ # pre-compile (certain) parts of MLRISC that are not already part of the SML/NJ
+ # compiler itself
+@@ -72,7 +72,7 @@ request mlrisc
  # pre-compile and install the C-Kit, which is a library for parsing and
  # type-checking C programs
  #
@@ -35,7 +38,7 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 22:54:39 wiz Exp $
  
  # pre-compile and install the ML-NLFFI Library, which is the core of
  # a new foreign function interface (where "foreign" functions are
-@@ -79,7 +79,7 @@ request cml-lib
+@@ -81,7 +81,7 @@ request mlrisc
  # the new FFI.
  # This preview release currently works only under X86/Linux.
  #
@@ -44,7 +47,7 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 22:54:39 wiz Exp $
  
  # build ML-NLFFI-Gen, a program generator tool used in conjunction with
  # the new "NLFFI" foreign function interface.  The tool generates ML
-@@ -87,13 +87,13 @@ request cml-lib
+@@ -89,13 +89,13 @@ request mlrisc
  # (Requires ckit!)
  # This preview release currently works only under X86/Linux.
  #
@@ -60,7 +63,7 @@ $NetBSD: patch-aa,v 1.2 2003/03/21 22:54:39 wiz Exp $
  
  # Build and install the 'nowhere' program translator.
  # This tool translates programs with conditional patterns (where clauses) 
-@@ -101,7 +101,7 @@ request cml-lib
+@@ -103,7 +103,7 @@ request mlrisc
  # (bad) documentation.
  # (Requires the mlrisc-tools library!)
  #
diff --git a/lang/smlnj/patches/patch-al b/lang/smlnj/patches/patch-al
index 8eedd40b24a..07b1400bb10 100644
--- a/lang/smlnj/patches/patch-al
+++ b/lang/smlnj/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2003/03/21 22:54:42 wiz Exp $
+$NetBSD: patch-al,v 1.2 2004/04/09 23:19:37 snj Exp $
 
---- src/runtime/objs/mk.x86-netbsd.orig	Mon Nov  6 16:41:04 2000
+--- src/runtime/objs/mk.x86-netbsd.orig	2004-01-31 15:24:42.000000000 +0100
 +++ src/runtime/objs/mk.x86-netbsd
 @@ -9,7 +9,7 @@ MAKE =		gmake
  
@@ -8,6 +8,6 @@ $NetBSD: patch-al,v 1.1 2003/03/21 22:54:42 wiz Exp $
  CC =		gcc -ansi
 -CFLAGS =	-O2
 +CFLAGS =	@CFLAGS@
- CPP =		gcc -x c -E -P -ansi
+ CPP =		gcc -x assembler-with-cpp -E -P
  #CPP =		/usr/bin/cpp -P