Update to 110.38, provided by Chris Richards in pkg/15427.

Changes since 110.9.1:
 * Bug fixes, improvements to generated code, and miscellaneous
   user-invisible tweaks too numerous to mention.
 * Autoloaded libraries now load correctly, due to the new
   `CM_PATHCONFIG' mechanism.  Autoloading failed in the package's
   previous version, despite the best effort of the do-install target.
 * New commands `ml-build' and `ml-makedepend'.  The former automates
   the process of building standalone heap images, while the latter
   generates dependencies for traditional makefiles.
 * Major overhaul of the Compilation Manager (CM).  For example, most
   `sources.cm' files now require including `$/basis.cm', as well as
   substituting `$/foo.cm' for `foo.cm' wherever `foo.cm' refers to an
   autoloaded library bundled with the system (e.g. `smlnj-lib.cm').
   For details, see http://www.smlnj.org/NEWS/110.20-README.html, and
   the CM manual at
   http://cm.bell-labs.com/cm/cs/what/smlnj/doc/CM/new.pdf .
 * Reduced virtual memory consumption.
 * Support for running under Mac OS X (Darwin).  Such support is not
   currently reflected in the pkgsrc, however, since I have no way to
   test it.

8 files changed, 316 insertions, 319 deletions

diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index 5c74914ab4a..0e652002105 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -1,24 +1,30 @@
-# $NetBSD: Makefile,v 1.11 2001/10/26 14:26:26 agc Exp $
-# FreeBSD Id: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp
+# $NetBSD: Makefile,v 1.12 2002/07/04 20:24:40 wiz Exp $
+#
 
-DISTNAME=	${SML_VERSION}-bin.${BOX}-unix
-PKGNAME=	smlnj-${SML_VERSION}
+DISTNAME=	boot.${BOX}-unix
+PKGNAME=	sml-nj-${SML_VERSION}
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/${SML_VERSION}/ \
-		ftp://ftp.diku.dk/pub/smlnj/working/${SML_VERSION}/ \
-		ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/${SML_VERSION}/ \
-		ftp://compiler.kaist.ac.kr/pub/sml/working/${SML_VERSION}/
-DISTFILES=	${SML_VERSION}-bin.${BOX}-unix.tar.Z ${SML_VERSION}-cm.tar.Z ${SML_VERSION}-cml.tar.Z \
-		${SML_VERSION}-config.tar.Z ${SML_VERSION}-eXene.tar.Z \
-		${SML_VERSION}-ml-burg.tar.Z ${SML_VERSION}-ml-lex.tar.Z ${SML_VERSION}-ml-yacc.tar.Z \
-		${SML_VERSION}-runtime.tar.Z ${SML_VERSION}-smlnj-c.tar.Z \
-		${SML_VERSION}-smlnj-lib.tar.Z
+		ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/
+DISTFILES=	MLRISC.tgz			\
+		boot.${BOX}-unix.tgz		\
+		cm.tgz				\
+		cml.tgz				\
+		compiler.tgz			\
+		config.tgz			\
+		eXene.tgz			\
+		ml-burg.tgz			\
+		ml-lex.tgz			\
+		ml-yacc.tgz			\
+		runtime.tgz			\
+		smlnj-lib.tgz			\
+		system.tgz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://cm.bell-labs.com/cm/cs/what/smlnj/index.html
 COMMENT=	Popular functional language from Bell Labs
 
-SML_VERSION=	110.9.1
+SML_VERSION=	110.38
 
 # sml-nj also supports hppa, sparc, ppc, mlrisc & alpha
 # pkg support for those platforms, and say, solaris-x86
@@ -29,19 +35,15 @@ ONLY_FOR_PLATFORM=	NetBSD-*-i386 SunOS-*-sparc NetBSD-*-sparc
 # 	ftp://rodin.stanford.edu/pub/smlnj/release/
 # 	ftp://ftp.cl.cam.ac.uk/MIRRORED/smlnj/release/
 # 	ftp://ftp.ntua.gr/pub/lang/smlnj/release/
-# Mirror sites that keep files around in gzipped format
-# 	ftp://flint.cs.yale.edu/pub/smlnj/working/${SML_VERSION}/
 
-DIST_SUBDIR=	sml-nj
+DIST_SUBDIR=	sml-nj-${SML_VERSION}
 WRKSRC=		${WRKDIR}
-EXTRACT_ONLY=	${SML_VERSION}-config.tar.Z
+EXTRACT_ONLY=	config.tgz
 USE_GMAKE=	yes
 
 SML_BASE=	${PREFIX}/lib/sml-nj
 SML_LIBDIR=	${SML_BASE}/lib
 SML_BINDIR=	${SML_BASE}/bin
-SML_SRCDIR=	${SML_BASE}/src
-SML_EXES=	ml-burg ml-lex ml-yacc sml
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -69,31 +71,21 @@ do-build:
 		./config/install.sh
 
 # install target
+# (see ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.38/INSTALL)
 # 1. create installation directories
-# 2. copy the ./bin directory across
-# 3. edit bin/.run_sml to override BIN_DIR
-# 4. copy all .stable files in CM/ directories
-# 5. find all .cm files reachable from $WRKDIR/lib and copy them across
-# 6. copy the aliases in ./lib changing WRKDIR to SML_LIBDIR
-# 7. install links to executables in $PREFIX/bin
+# 2. copy the ./bin and ./lib directories across
+# 3. edit scripts to override BIN_DIR and CM_PATHCONFIG
+# 4. install links to executables in $PREFIX/bin
 do-install:
-	${INSTALL_DATA_DIR} ${SML_BASE} ${SML_BINDIR} ${SML_LIBDIR}
-	${GTAR} -C ${WRKDIR} -cf - bin | ${GTAR} -C ${SML_BASE} -xf -
-	${RM} -f ${SML_BINDIR}/.run-sml
+	${INSTALL_DATA_DIR} ${SML_BASE}
+	(cd ${WRKDIR} && ${PAX} -rw -pam bin lib ${SML_BASE})
+.for script in .link-sml .run-sml ml-build ml-makedepend
+	${RM} -f ${SML_BINDIR}/${script}
 	${SED} -e "s,^BIN_DIR=.*\$$,BIN_DIR=${SML_BINDIR}," \
-		${WRKDIR}/bin/.run-sml > ${SML_BINDIR}/.run-sml
-	${CHMOD} 755 ${SML_BINDIR}/.run-sml
-	cd ${WRKDIR} && ${GTAR} -cf - `${FIND} . -name '*.stable' | \
-		${GREP} CM` | ${GTAR} -C ${SML_BASE} -xf -
-	cd ${WRKDIR} && ${GTAR} -cf - `${FILESDIR}/get-cm ${WRKDIR}` | \
-		${GTAR} -C ${SML_BASE} -xf -
-	for file in ${WRKDIR}/lib/*; do\
-		${SED} -e "s,${WRKDIR},${SML_BASE}," $$file > \
-			${SML_LIBDIR}/`${BASENAME} $$file`; \
-	done
-.for file in ${SML_EXES}
-	-${RM} -f ${PREFIX}/bin/${file}
-	-${LN} -s ${SML_BINDIR}/${file} ${PREFIX}/bin/${file}
+	       -e "s,^exec,CM_PATHCONFIG=${SML_LIBDIR}/pathconfig exec," \
+		${WRKDIR}/bin/${script} > ${SML_BINDIR}/${script}
+	${CHMOD} ${BINMODE} ${SML_BINDIR}/${script}
 .endfor
+	(cd ${PREFIX}/bin && ${LN} -sf ${SML_BINDIR}/* .)
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/sml-nj/PLIST b/lang/sml-nj/PLIST
index d171dcbed9b..c0d046558a8 100644
--- a/lang/sml-nj/PLIST
+++ b/lang/sml-nj/PLIST
@@ -1,162 +1,220 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:57 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/07/04 20:24:40 wiz Exp $
+bin/ml-build
 bin/ml-burg
 bin/ml-lex
+bin/ml-makedepend
 bin/ml-yacc
 bin/sml
-lib/sml-nj/bin/.heap/sml.${BOX}-${OS}
-lib/sml-nj/bin/.heap/ml-yacc.${BOX}-${OS}
-lib/sml-nj/bin/.heap/ml-lex.${BOX}-${OS}
-lib/sml-nj/bin/.heap/ml-burg.${BOX}-${OS}
-lib/sml-nj/bin/.run/run.${BOX}-netbsd
 lib/sml-nj/bin/.arch-n-opsys
+lib/sml-nj/bin/.heap/ml-burg.${BOX}-${OS}
+lib/sml-nj/bin/.heap/ml-lex.${BOX}-${OS}
+lib/sml-nj/bin/.heap/ml-yacc.${BOX}-${OS}
+lib/sml-nj/bin/.heap/sml.${BOX}-${OS}
+lib/sml-nj/bin/.link-sml
 lib/sml-nj/bin/.run-sml
+lib/sml-nj/bin/.run/run.${BOX}-${LOWER_OPSYS}
+lib/sml-nj/bin/ml-build
 lib/sml-nj/bin/ml-burg
 lib/sml-nj/bin/ml-lex
+lib/sml-nj/bin/ml-makedepend
 lib/sml-nj/bin/ml-yacc
 lib/sml-nj/bin/sml
-lib/sml-nj/lib/cml-lib.cm
-lib/sml-nj/lib/cml.cm
-lib/sml-nj/lib/eXene.cm
-lib/sml-nj/lib/html-lib.cm
-lib/sml-nj/lib/ml-yacc-lib.cm
-lib/sml-nj/lib/pp-lib.cm
-lib/sml-nj/lib/reactive-lib.cm
-lib/sml-nj/lib/regexp-lib.cm
-lib/sml-nj/lib/smlnj-lib.cm
-lib/sml-nj/lib/unix-lib.cm
-lib/sml-nj/src/ml-yacc/lib/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/ml-yacc/lib/sources.cm
-lib/sml-nj/src/smlnj-lib/HTML/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/HTML/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/devices/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/PP/devices/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/src/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/PP/src/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/PP/sources.cm
-lib/sml-nj/src/smlnj-lib/Reactive/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/Reactive/sources.cm
-lib/sml-nj/src/smlnj-lib/RegExp/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/RegExp/sources.cm
-lib/sml-nj/src/smlnj-lib/Unix/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/Unix/sources.cm
-lib/sml-nj/src/smlnj-lib/Util/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/Util/sources.cm
-lib/sml-nj/src/cml/cml-lib/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/cml-lib/CM/${BOX}-unix/trace-cml.cm.stable
-lib/sml-nj/src/cml/cml-lib/sources.cm
-lib/sml-nj/src/cml/cml-lib/trace-cml.cm
-lib/sml-nj/src/cml/src/IO/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/IO/sources.cm
-lib/sml-nj/src/cml/src/OS/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/OS/sources.cm
-lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/layer2.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/layer3.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix/layer1.cm.stable
-lib/sml-nj/src/cml/src/Sockets/layer1.cm
-lib/sml-nj/src/cml/src/Sockets/layer2.cm
-lib/sml-nj/src/cml/src/Sockets/layer3.cm
-lib/sml-nj/src/cml/src/Sockets/sources.cm
-lib/sml-nj/src/cml/src/Unix/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/Unix/CM/${BOX}-unix/os.cm.stable
-lib/sml-nj/src/cml/src/Unix/os.cm
-lib/sml-nj/src/cml/src/Unix/sources.cm
-lib/sml-nj/src/cml/src/core-cml/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/core-cml/sources.cm
-lib/sml-nj/src/cml/src/glue/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/glue/sources.cm
-lib/sml-nj/src/cml/src/util/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/util/sources.cm
-lib/sml-nj/src/cml/src/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/sources.cm
-lib/sml-nj/src/eXene/graph-util/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/eXene/graph-util/sources.cm
-lib/sml-nj/src/eXene/lib/CM/${BOX}-unix/base.cm.stable
-lib/sml-nj/src/eXene/lib/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/eXene/lib/base.cm
-lib/sml-nj/src/eXene/lib/sources.cm
-lib/sml-nj/src/eXene/styles/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/eXene/styles/sources.cm
-lib/sml-nj/src/eXene/widgets/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/eXene/widgets/sources.cm
-lib/sml-nj/src/eXene/CM/${BOX}-unix/sources.cm.stable
-lib/sml-nj/src/eXene/sources.cm
-@dirrm lib/sml-nj/bin/.heap
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/ALPHA.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Control.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Graphs.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/HPPA.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/IA32.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Lib.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/MLRISC.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/MLTREE.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/PPC.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/SPARC.cm
+lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix/Visual.cm
+lib/sml-nj/lib/basis.cm/CM/${BOX}-unix/basis.cm
+lib/sml-nj/lib/burg-ext.cm/CM/${BOX}-unix/burg-ext.cm
+lib/sml-nj/lib/cml-lib/CM/${BOX}-unix/smlnj-lib.cm
+lib/sml-nj/lib/cml-lib/CM/${BOX}-unix/trace-cml.cm
+lib/sml-nj/lib/cml/CM/${BOX}-unix/basis.cm
+lib/sml-nj/lib/cml/CM/${BOX}-unix/cml-internal.cm
+lib/sml-nj/lib/cml/CM/${BOX}-unix/cml.cm
+lib/sml-nj/lib/cml/CM/${BOX}-unix/core-cml.cm
+lib/sml-nj/lib/dir-tool.cm/CM/${BOX}-unix/dir-tool.cm
+lib/sml-nj/lib/eXene.cm/CM/${BOX}-unix/eXene.cm
+lib/sml-nj/lib/grm-ext.cm/CM/${BOX}-unix/grm-ext.cm
+lib/sml-nj/lib/html-lib.cm/CM/${BOX}-unix/html-lib.cm
+lib/sml-nj/lib/inet-lib.cm/CM/${BOX}-unix/inet-lib.cm
+lib/sml-nj/lib/lex-ext.cm/CM/${BOX}-unix/lex-ext.cm
+lib/sml-nj/lib/make-tool.cm/CM/${BOX}-unix/make-tool.cm
+lib/sml-nj/lib/ml-yacc-lib.cm/CM/${BOX}-unix/ml-yacc-lib.cm
+lib/sml-nj/lib/mlburg-tool.cm/CM/${BOX}-unix/mlburg-tool.cm
+lib/sml-nj/lib/mllex-tool.cm/CM/${BOX}-unix/mllex-tool.cm
+lib/sml-nj/lib/mlyacc-tool.cm/CM/${BOX}-unix/mlyacc-tool.cm
+lib/sml-nj/lib/noweb-tool.cm/CM/${BOX}-unix/noweb-tool.cm
+lib/sml-nj/lib/nw-ext.cm/CM/${BOX}-unix/nw-ext.cm
+lib/sml-nj/lib/pathconfig
+lib/sml-nj/lib/pgraph.cm/CM/${BOX}-unix/pgraph.cm
+lib/sml-nj/lib/pickle-lib.cm/CM/${BOX}-unix/pickle-lib.cm
+lib/sml-nj/lib/pp-lib.cm/CM/${BOX}-unix/pp-lib.cm
+lib/sml-nj/lib/reactive-lib.cm/CM/${BOX}-unix/reactive-lib.cm
+lib/sml-nj/lib/regexp-lib.cm/CM/${BOX}-unix/regexp-lib.cm
+lib/sml-nj/lib/shell-tool.cm/CM/${BOX}-unix/shell-tool.cm
+lib/sml-nj/lib/smlnj-lib.cm/CM/${BOX}-unix/smlnj-lib.cm
+lib/sml-nj/lib/smlnj/CM/${BOX}-unix/cm.cm
+lib/sml-nj/lib/smlnj/CM/${BOX}-unix/cmb.cm
+lib/sml-nj/lib/smlnj/CM/${BOX}-unix/compiler.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/ALPHA.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/Control.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/Graphs.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/HPPA.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/IA32.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/Lib.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/MLRISC.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/MLTREE.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/PPC.cm
+lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix/SPARC.cm
+lib/sml-nj/lib/smlnj/cm/CM/${BOX}-unix/cm.cm
+lib/sml-nj/lib/smlnj/cm/CM/${BOX}-unix/tools.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/alpha32-unix.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/current.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/hppa-unix.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/ppc-macos.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/ppc-unix.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/sparc-unix.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/x86-unix.cm
+lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix/x86-win32.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/all.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/alpha32.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/compiler.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/current.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/hppa.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/minimal-only.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/minimal.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/ppc.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/sparc.cm
+lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix/x86.cm
+lib/sml-nj/lib/smlnj/init/CM/${BOX}-unix/init.cmi
+lib/sml-nj/lib/smlnj/internal/CM/${BOX}-unix/cm-lib.cm
+lib/sml-nj/lib/smlnj/internal/CM/${BOX}-unix/cm-sig-lib.cm
+lib/sml-nj/lib/smlnj/internal/CM/${BOX}-unix/cm0.cm
+lib/sml-nj/lib/smlnj/internal/CM/${BOX}-unix/intsys.cm
+lib/sml-nj/lib/smlnj/internal/CM/${BOX}-unix/srcpath-lib.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/alpha32.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/basics.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/core.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/debugprof.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/elabdata.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/elaborate.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/execute.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/hppa.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/parser.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/ppc.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/sparc.cm
+lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix/x86.cm
+lib/sml-nj/lib/unix-lib.cm/CM/${BOX}-unix/unix-lib.cm
+@dirrm lib/sml-nj/lib/unix-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/unix-lib.cm/CM
+@dirrm lib/sml-nj/lib/unix-lib.cm
+@dirrm lib/sml-nj/lib/smlnj/viscomp/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/viscomp/CM
+@dirrm lib/sml-nj/lib/smlnj/viscomp
+@dirrm lib/sml-nj/lib/smlnj/internal/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/internal/CM
+@dirrm lib/sml-nj/lib/smlnj/internal
+@dirrm lib/sml-nj/lib/smlnj/init/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/init/CM
+@dirrm lib/sml-nj/lib/smlnj/init
+@dirrm lib/sml-nj/lib/smlnj/compiler/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/compiler/CM
+@dirrm lib/sml-nj/lib/smlnj/compiler
+@dirrm lib/sml-nj/lib/smlnj/cmb/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/cmb/CM
+@dirrm lib/sml-nj/lib/smlnj/cmb
+@dirrm lib/sml-nj/lib/smlnj/cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/cm/CM
+@dirrm lib/sml-nj/lib/smlnj/cm
+@dirrm lib/sml-nj/lib/smlnj/MLRISC/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/MLRISC/CM
+@dirrm lib/sml-nj/lib/smlnj/MLRISC
+@dirrm lib/sml-nj/lib/smlnj/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj/CM
+@dirrm lib/sml-nj/lib/smlnj-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/smlnj-lib.cm/CM
+@dirrm lib/sml-nj/lib/smlnj-lib.cm
+@dirrm lib/sml-nj/lib/smlnj
+@dirrm lib/sml-nj/lib/shell-tool.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/shell-tool.cm/CM
+@dirrm lib/sml-nj/lib/shell-tool.cm
+@dirrm lib/sml-nj/lib/regexp-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/regexp-lib.cm/CM
+@dirrm lib/sml-nj/lib/regexp-lib.cm
+@dirrm lib/sml-nj/lib/reactive-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/reactive-lib.cm/CM
+@dirrm lib/sml-nj/lib/reactive-lib.cm
+@dirrm lib/sml-nj/lib/pp-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/pp-lib.cm/CM
+@dirrm lib/sml-nj/lib/pp-lib.cm
+@dirrm lib/sml-nj/lib/pickle-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/pickle-lib.cm/CM
+@dirrm lib/sml-nj/lib/pickle-lib.cm
+@dirrm lib/sml-nj/lib/pgraph.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/pgraph.cm/CM
+@dirrm lib/sml-nj/lib/pgraph.cm
+@dirrm lib/sml-nj/lib/nw-ext.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/nw-ext.cm/CM
+@dirrm lib/sml-nj/lib/nw-ext.cm
+@dirrm lib/sml-nj/lib/noweb-tool.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/noweb-tool.cm/CM
+@dirrm lib/sml-nj/lib/noweb-tool.cm
+@dirrm lib/sml-nj/lib/mlyacc-tool.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/mlyacc-tool.cm/CM
+@dirrm lib/sml-nj/lib/mlyacc-tool.cm
+@dirrm lib/sml-nj/lib/mllex-tool.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/mllex-tool.cm/CM
+@dirrm lib/sml-nj/lib/mllex-tool.cm
+@dirrm lib/sml-nj/lib/mlburg-tool.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/mlburg-tool.cm/CM
+@dirrm lib/sml-nj/lib/mlburg-tool.cm
+@dirrm lib/sml-nj/lib/ml-yacc-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/ml-yacc-lib.cm/CM
+@dirrm lib/sml-nj/lib/ml-yacc-lib.cm
+@dirrm lib/sml-nj/lib/make-tool.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/make-tool.cm/CM
+@dirrm lib/sml-nj/lib/make-tool.cm
+@dirrm lib/sml-nj/lib/lex-ext.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/lex-ext.cm/CM
+@dirrm lib/sml-nj/lib/lex-ext.cm
+@dirrm lib/sml-nj/lib/inet-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/inet-lib.cm/CM
+@dirrm lib/sml-nj/lib/inet-lib.cm
+@dirrm lib/sml-nj/lib/html-lib.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/html-lib.cm/CM
+@dirrm lib/sml-nj/lib/html-lib.cm
+@dirrm lib/sml-nj/lib/grm-ext.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/grm-ext.cm/CM
+@dirrm lib/sml-nj/lib/grm-ext.cm
+@dirrm lib/sml-nj/lib/eXene.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/eXene.cm/CM
+@dirrm lib/sml-nj/lib/eXene.cm
+@dirrm lib/sml-nj/lib/dir-tool.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/dir-tool.cm/CM
+@dirrm lib/sml-nj/lib/dir-tool.cm
+@dirrm lib/sml-nj/lib/cml/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/cml/CM
+@dirrm lib/sml-nj/lib/cml-lib/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/cml-lib/CM
+@dirrm lib/sml-nj/lib/cml-lib
+@dirrm lib/sml-nj/lib/cml
+@dirrm lib/sml-nj/lib/burg-ext.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/burg-ext.cm/CM
+@dirrm lib/sml-nj/lib/burg-ext.cm
+@dirrm lib/sml-nj/lib/basis.cm/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/basis.cm/CM
+@dirrm lib/sml-nj/lib/basis.cm
+@dirrm lib/sml-nj/lib/SMLNJ-MLRISC/CM/${BOX}-unix
+@dirrm lib/sml-nj/lib/SMLNJ-MLRISC/CM
+@dirrm lib/sml-nj/lib/SMLNJ-MLRISC
+@dirrm lib/sml-nj/lib
 @dirrm lib/sml-nj/bin/.run
+@dirrm lib/sml-nj/bin/.heap
 @dirrm lib/sml-nj/bin
-@dirrm lib/sml-nj/lib
-@dirrm lib/sml-nj/src/ml-yacc/lib/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/ml-yacc/lib/CM
-@dirrm lib/sml-nj/src/ml-yacc/lib
-@dirrm lib/sml-nj/src/ml-yacc
-@dirrm lib/sml-nj/src/smlnj-lib/HTML/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/HTML/CM
-@dirrm lib/sml-nj/src/smlnj-lib/HTML
-@dirrm lib/sml-nj/src/smlnj-lib/PP/devices/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/PP/devices/CM
-@dirrm lib/sml-nj/src/smlnj-lib/PP/devices
-@dirrm lib/sml-nj/src/smlnj-lib/PP/src/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/PP/src/CM
-@dirrm lib/sml-nj/src/smlnj-lib/PP/src
-@dirrm lib/sml-nj/src/smlnj-lib/PP/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/PP/CM
-@dirrm lib/sml-nj/src/smlnj-lib/PP
-@dirrm lib/sml-nj/src/smlnj-lib/Reactive/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/Reactive/CM
-@dirrm lib/sml-nj/src/smlnj-lib/Reactive
-@dirrm lib/sml-nj/src/smlnj-lib/RegExp/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/RegExp/CM
-@dirrm lib/sml-nj/src/smlnj-lib/RegExp
-@dirrm lib/sml-nj/src/smlnj-lib/Unix/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/Unix/CM
-@dirrm lib/sml-nj/src/smlnj-lib/Unix
-@dirrm lib/sml-nj/src/smlnj-lib/Util/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/smlnj-lib/Util/CM
-@dirrm lib/sml-nj/src/smlnj-lib/Util
-@dirrm lib/sml-nj/src/smlnj-lib
-@dirrm lib/sml-nj/src/cml/cml-lib/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/cml-lib/CM
-@dirrm lib/sml-nj/src/cml/cml-lib
-@dirrm lib/sml-nj/src/cml/src/IO/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/IO/CM
-@dirrm lib/sml-nj/src/cml/src/IO
-@dirrm lib/sml-nj/src/cml/src/OS/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/OS/CM
-@dirrm lib/sml-nj/src/cml/src/OS
-@dirrm lib/sml-nj/src/cml/src/Sockets/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/Sockets/CM
-@dirrm lib/sml-nj/src/cml/src/Sockets
-@dirrm lib/sml-nj/src/cml/src/Unix/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/Unix/CM
-@dirrm lib/sml-nj/src/cml/src/Unix
-@dirrm lib/sml-nj/src/cml/src/core-cml/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/core-cml/CM
-@dirrm lib/sml-nj/src/cml/src/core-cml
-@dirrm lib/sml-nj/src/cml/src/glue/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/glue/CM
-@dirrm lib/sml-nj/src/cml/src/glue
-@dirrm lib/sml-nj/src/cml/src/util/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/util/CM
-@dirrm lib/sml-nj/src/cml/src/util
-@dirrm lib/sml-nj/src/cml/src/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/cml/src/CM
-@dirrm lib/sml-nj/src/cml/src
-@dirrm lib/sml-nj/src/cml
-@dirrm lib/sml-nj/src/eXene/graph-util/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/eXene/graph-util/CM
-@dirrm lib/sml-nj/src/eXene/graph-util
-@dirrm lib/sml-nj/src/eXene/lib/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/eXene/lib/CM
-@dirrm lib/sml-nj/src/eXene/lib
-@dirrm lib/sml-nj/src/eXene/styles/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/eXene/styles/CM
-@dirrm lib/sml-nj/src/eXene/styles
-@dirrm lib/sml-nj/src/eXene/widgets/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/eXene/widgets/CM
-@dirrm lib/sml-nj/src/eXene/widgets
-@dirrm lib/sml-nj/src/eXene/CM/${BOX}-unix
-@dirrm lib/sml-nj/src/eXene/CM
-@dirrm lib/sml-nj/src/eXene
-@dirrm lib/sml-nj/src
 @dirrm lib/sml-nj
diff --git a/lang/sml-nj/distinfo b/lang/sml-nj/distinfo
index 26c741513bc..5b8c76d96a7 100644
--- a/lang/sml-nj/distinfo
+++ b/lang/sml-nj/distinfo
@@ -1,28 +1,31 @@
-$NetBSD: distinfo,v 1.3 2001/05/04 12:49:40 agc Exp $
+$NetBSD: distinfo,v 1.4 2002/07/04 20:24:40 wiz Exp $
 
-SHA1 (sml-nj/110.9.1-bin.sparc-unix.tar.Z) = bb13f7b44512cc5981089e8ee182c801fcd1b559
-Size (sml-nj/110.9.1-bin.sparc-unix.tar.Z) = 4122275 bytes
-SHA1 (sml-nj/110.9.1-bin.x86-unix.tar.Z) = 9ef76e50e2e37ed21a20e921fbc65b3fa1eae045
-Size (sml-nj/110.9.1-bin.x86-unix.tar.Z) = 2913567 bytes
-SHA1 (sml-nj/110.9.1-cm.tar.Z) = ccc203b905417d3776f2479c630d598b59855e1d
-Size (sml-nj/110.9.1-cm.tar.Z) = 171095 bytes
-SHA1 (sml-nj/110.9.1-cml.tar.Z) = c79428bc173b90dc37949e5464833882a1736571
-Size (sml-nj/110.9.1-cml.tar.Z) = 182653 bytes
-SHA1 (sml-nj/110.9.1-config.tar.Z) = 7173e38051b23404ac01607ec3713fb7ebf3f265
-Size (sml-nj/110.9.1-config.tar.Z) = 9698 bytes
-SHA1 (sml-nj/110.9.1-eXene.tar.Z) = 41c6e36332fec3e8911b8ac29df41f5affc2adab
-Size (sml-nj/110.9.1-eXene.tar.Z) = 1147843 bytes
-SHA1 (sml-nj/110.9.1-ml-burg.tar.Z) = 017594597ef812337d1c69fb3dd1c2a464be32fc
-Size (sml-nj/110.9.1-ml-burg.tar.Z) = 97985 bytes
-SHA1 (sml-nj/110.9.1-ml-lex.tar.Z) = 8b1ebf1347dbf900add29997d089b817dca591ff
-Size (sml-nj/110.9.1-ml-lex.tar.Z) = 44173 bytes
-SHA1 (sml-nj/110.9.1-ml-yacc.tar.Z) = e33e77ef8807efb3a0894bf75978416aba2b47aa
-Size (sml-nj/110.9.1-ml-yacc.tar.Z) = 154409 bytes
-SHA1 (sml-nj/110.9.1-runtime.tar.Z) = 9b2882904442aa79f74fd7c8a231ad73f0bafda2
-Size (sml-nj/110.9.1-runtime.tar.Z) = 585269 bytes
-SHA1 (sml-nj/110.9.1-smlnj-c.tar.Z) = 114c3a6a9f20f7aec78e8cb4d347800df2890a6f
-Size (sml-nj/110.9.1-smlnj-c.tar.Z) = 104261 bytes
-SHA1 (sml-nj/110.9.1-smlnj-lib.tar.Z) = 6d2f004b04cb6d3cd969879160f3e4a74385cb5e
-Size (sml-nj/110.9.1-smlnj-lib.tar.Z) = 369077 bytes
-SHA1 (patch-ab) = c10fee1cd4b06a656d3d839bfe6435dd2573120d
-SHA1 (patch-ac) = 1edf9fa2e20aae35c672f52363d44ba03282bfd2
+SHA1 (sml-nj-110.38/MLRISC.tgz) = 1ea46480ad86ab0b598863bd7f5b805a52e7a001
+Size (sml-nj-110.38/MLRISC.tgz) = 1146874 bytes
+SHA1 (sml-nj-110.38/boot.x86-unix.tgz) = ac52a183ffbd3b00e267ba0382c4fcc863d53012
+Size (sml-nj-110.38/boot.x86-unix.tgz) = 4775589 bytes
+SHA1 (sml-nj-110.38/cm.tgz) = a52f2ba040305f2963ff85d2397d1c1b07c4310d
+Size (sml-nj-110.38/cm.tgz) = 198979 bytes
+SHA1 (sml-nj-110.38/cml.tgz) = 009641d9b4f580ff60db9e006133cc15fac3c204
+Size (sml-nj-110.38/cml.tgz) = 127535 bytes
+SHA1 (sml-nj-110.38/compiler.tgz) = 0877a0d37d2f4b3bcd8e555f6bb0b1870caa2ddb
+Size (sml-nj-110.38/compiler.tgz) = 678364 bytes
+SHA1 (sml-nj-110.38/config.tgz) = 6bc2df0e989448d67201d5db99202a45827e5ef5
+Size (sml-nj-110.38/config.tgz) = 12274 bytes
+SHA1 (sml-nj-110.38/eXene.tgz) = c4d95de4f931f5d70fb34ddd3f20af65b8408177
+Size (sml-nj-110.38/eXene.tgz) = 693627 bytes
+SHA1 (sml-nj-110.38/ml-burg.tgz) = f2c0c72230477f8becea75fb5ff65f7a1442e1d8
+Size (sml-nj-110.38/ml-burg.tgz) = 31696 bytes
+SHA1 (sml-nj-110.38/ml-lex.tgz) = 0a2a4c605a3e13934b2780cce78d32704aec2ba1
+Size (sml-nj-110.38/ml-lex.tgz) = 32106 bytes
+SHA1 (sml-nj-110.38/ml-yacc.tgz) = ed28c5fce8b618ed421fee368e9e5e5d7bf2936f
+Size (sml-nj-110.38/ml-yacc.tgz) = 95611 bytes
+SHA1 (sml-nj-110.38/runtime.tgz) = ee6f38d80659d2d6ee1ee078491520bf6fd367d4
+Size (sml-nj-110.38/runtime.tgz) = 309652 bytes
+SHA1 (sml-nj-110.38/smlnj-lib.tgz) = ce08159c90d4d941c58a937e2676d751cbb38c15
+Size (sml-nj-110.38/smlnj-lib.tgz) = 238989 bytes
+SHA1 (sml-nj-110.38/system.tgz) = afdff28ad75f078584169ad0b14e7d6d865c0935
+Size (sml-nj-110.38/system.tgz) = 174529 bytes
+SHA1 (patch-aa) = 37ebf69ab1d4160675027310b58190ef568a2704
+SHA1 (patch-ab) = 24ca95b58971758cd803f77f94cf9c6664280fc1
+SHA1 (patch-ac) = b010b0fd5b923ed954023a72dc763e20f8f1b213
diff --git a/lang/sml-nj/files/get-cm b/lang/sml-nj/files/get-cm
deleted file mode 100755
index 88992a05219..00000000000
--- a/lang/sml-nj/files/get-cm
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# usage: get-cm work_dir
-#
-# Find all .cm Group and Library descriptions that are referenced
-# from the top level alias files in $SML_BASE/lib/
-
-# temp file
-tmpfile="${TMP:-/tmp}/chomp$$"
-
-# attempt to change directory to work dir
-cd $1 || exit 1
-work_dir=`pwd`	# get the canonical name for the current directory
-
-trap "rm -f $tmpfile" 0 1 2 3 15
-
-# hack to remove SML comments '(* ... *)' 
-
-strip_comments()
-{
-	# caveat: the following assumes gcc is present ...	
-	gcc -x c -E -P -ansi -DOPSYS_UNIX $1 | awk '{ 
-		line = $0
-		if (match(line, "\\(\\*")) {
-			while (match($0, "\\(\\*")) {
-				if (RSTART > 1) {
-					print substr($0, 0, RSTART-1);
-				}
-				sub("^.*\\(\\*", "");
-				while (!match($0, "\\*\\)")) {
-					getline
-				}
-				$0 = substr($0, RSTART+RLENGTH);
-			}
-		}
-		print
-	}'
-}
-
-# return canonical name for a path with embedded ..'s
-
-canonical()
-{
-	echo $(cd `dirname $1` && pwd)/`basename $1`
-}
-
-# initial list of CM description files
-global_cm_list="$(cat ./lib/*.cm | awk '{ print $2 }')"
-
-set -- $global_cm_list
-
-touch $tmpfile
-
-# process the global list
-while [ $# -ge 1 ]; do
-
-	cm_file="$1"; shift
-	global_cm_list="$*"
-
-	echo $cm_file >> $tmpfile
-
-	cm_dir=`dirname $cm_file`
-	cm_new=$(strip_comments $cm_file | grep '\.cm' | \
-		awk '{ print $1 }')
-
-	# append new CM files to current global list
-	for i in $cm_new; do
-		new_cm_file=$(canonical $cm_dir/$i)
-		if [ -r $new_cm_file ]; then 
-			if ! grep "^$new_cm_file" $tmpfile > /dev/null; then 
-				global_cm_list="$new_cm_file $global_cm_list"
-				echo $new_cm_file >> $tmpfile
-			fi
-		fi
-	done 
-
-	set -- $global_cm_list
-done
-
-# output to stdout
-sort -u < $tmpfile | sed -e "s,^$work_dir/,,"
diff --git a/lang/sml-nj/files/patch-global-names b/lang/sml-nj/files/patch-global-names
index 3c2f845881e..692cf0bda2f 100644
--- a/lang/sml-nj/files/patch-global-names
+++ b/lang/sml-nj/files/patch-global-names
@@ -1,14 +1,5 @@
 --- src/runtime/include/asm-base.h.orig	Fri Dec  3 20:59:31 1999
 +++ src/runtime/include/asm-base.h	Fri Mar  9 14:53:40 2001
-@@ -16,7 +16,7 @@
- #define FALSE	0
- #define TRUE	1
- 
--#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32))
-+#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || (defined(OPSYS_FREEBSD) && !defined(__ELF__)) || (defined(OPSYS_NETBSD) && !defined(__ELF__))|| defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32))
- #  define GLOBALS_HAVE_UNDERSCORE
- #endif
- 
 @@ -36,6 +36,11 @@
  #    define _ASM
  #    include <sys/stack.h>
diff --git a/lang/sml-nj/patches/patch-aa b/lang/sml-nj/patches/patch-aa
new file mode 100644
index 00000000000..9fe89bce485
--- /dev/null
+++ b/lang/sml-nj/patches/patch-aa
@@ -0,0 +1,34 @@
+$NetBSD: patch-aa,v 1.1 2002/07/04 20:24:42 wiz Exp $
+
+--- config/targets.orig	Sun Jan 27 19:18:03 2002
++++ config/targets
+@@ -44,7 +44,7 @@
+ 
+ # build ML-Burg
+ #
+-#TARGETS="$TARGETS ml-burg"
++TARGETS="$TARGETS ml-burg"
+ 
+ # pre-compile and install the remaining components of the SML/NJ library
+ # (everything except smlnj-lib.cm, aka Util, itself)
+@@ -56,17 +56,17 @@
+ # pre-compile and install Concurrent ML, which is a library for message-passing
+ # concurrency.
+ #
+-#TARGETS="$TARGETS cml"
++TARGETS="$TARGETS cml"
+ 
+ # pre-compile and install the CML Library, which provides some useful CML
+ # modules.
+ #
+-#TARGETS="$TARGETS cml-lib"
++TARGETS="$TARGETS cml-lib"
+ 
+ # pre-compile and install eXene, which is a library for X-Windows programming.
+ # EXene requires CML.
+ #
+-#TARGETS="$TARGETS eXene"
++TARGETS="$TARGETS eXene"
+ 
+ # pre-compile and install the C-Kit, which is a library for parsing and
+ # type-checking C programs
diff --git a/lang/sml-nj/patches/patch-ab b/lang/sml-nj/patches/patch-ab
index d2bef7a4baa..54db032a620 100644
--- a/lang/sml-nj/patches/patch-ab
+++ b/lang/sml-nj/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.2 1999/12/08 15:52:59 proff Exp $
+$NetBSD: patch-ab,v 1.3 2002/07/04 20:24:42 wiz Exp $
 
---- config/install.sh.orig	Wed Aug  5 13:43:43 1998
-+++ config/install.sh	Tue Feb  2 12:57:13 1999
-@@ -181,6 +181,12 @@
- if [ "$?" != "0" ]; then
-   exit $?
- fi
+--- config/install.sh.orig	Sun Jan 27 19:18:03 2002
++++ config/install.sh
+@@ -531,6 +531,12 @@
+ # build the run-time system
+ #
+ unpack "run-time" $SRCDIR runtime runtime
 +# we need to patch just before build
 +patch_file="${FILESDIR}/patch-global-names"
 +if [ -f $patch_file ]; then
 +	echo "applying source patches"
 +	$PATCH $PATCH_ARGS < $patch_file
 +fi
- if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
-   cd $SRCDIR/runtime/objs
-   echo "compiling the run-time system"
+ if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+     echo $this: Run-time system already exists.
+ else
diff --git a/lang/sml-nj/patches/patch-ac b/lang/sml-nj/patches/patch-ac
index b6281d0ffb9..c43ebee07c2 100644
--- a/lang/sml-nj/patches/patch-ac
+++ b/lang/sml-nj/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2001/03/20 09:43:22 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2002/07/04 20:24:42 wiz Exp $
 
 --- config/_arch-n-opsys.orig        Fri Oct 20 18:02:25 2000
 +++ config/_arch-n-opsys     Fri Mar  9 14:07:05 2001
-@@ -100,6 +100,7 @@
+@@ -107,6 +107,7 @@
        i486) ARCH=x86;;
        i586) ARCH=x86;;
        i686) ARCH=x86;;