Upgrade to development version 110.33.

8 files changed, 379 insertions, 341 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index 41272a304184..aa044a6576b0 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -6,17 +6,18 @@
 #
 
 PORTNAME=	smlnj
-PORTVERSION=	110.9.1
+PORTVERSION=	110.33
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.9.1/ \
-		ftp://ftp.diku.dk/pub/smlnj/working/110.9.1/ \
-		ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/110.9.1/ \
-		ftp://compiler.kaist.ac.kr/pub/sml/working/110.9.1/
-DISTFILES=	110.9.1-bin.x86-unix.tar.Z 110.9.1-cm.tar.Z 110.9.1-cml.tar.Z \
-		110.9.1-config.tar.Z 110.9.1-eXene.tar.Z \
-		110.9.1-ml-burg.tar.Z 110.9.1-ml-lex.tar.Z \
-		110.9.1-ml-yacc.tar.Z 110.9.1-runtime.tar.Z \
-		110.9.1-smlnj-c.tar.Z 110.9.1-smlnj-lib.tar.Z
+MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/working/110.33/ \
+		ftp://ftp.diku.dk/pub/smlnj/working/110.33/ \
+		ftp://sunsite.doc.ic.ac.uk/computing/programming/languages/ml/smlnj/working/110.33/ \
+		ftp://compiler.kaist.ac.kr/pub/sml/working/110.33/
+DISTFILES=	boot.x86-unix.tgz compiler.tgz cm.tgz ckit.tgz config.tgz  \
+		ml-burg.tgz ml-lex.tgz \
+		ml-nlffi-lib.tgz ml-nlffigen.tgz \
+		ml-yacc.tgz runtime.tgz \
+		smlnj-lib.tgz system.tgz
+EXTRACT_ONLY=	config.tgz
 
 MAINTAINER=	jkoshy@freebsd.org
 
@@ -27,54 +28,30 @@ MAINTAINER=	jkoshy@freebsd.org
 # Mirror sites that keep files around in gzipped format
 # 	ftp://flint.cs.yale.edu/pub/smlnj/working/110.9.1/
 
-DIST_SUBDIR=	sml-nj
+DIST_SUBDIR=	sml-nj/${PORTVERSION}
 NO_WRKSUBDIR=	yes
-EXTRACT_ONLY=	110.9.1-config.tar.Z
 USE_GMAKE=	yes
+NO_BUILD=	yes
 
 NO_LATEST_LINK=	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
+MLEXE=	ml-build ml-makedepend sml ml-yacc ml-lex ml-burg ml-nlffigen
 
 # make symlinks to the dist files
 post-extract:
 	cd ${WRKDIR} && ${LN} -sf ${_DISTDIR}/*  .
+	${CP} ${FILESDIR}/targets.customized ${WRKDIR}/config/targets.customized
 
-# The build target needs to run $WRKDIR/config/install.sh
-do-build:
+# The install target attempts to build and install the system
+do-install:
+	${MKDIR} ${PREFIX}/smlnj
 	cd ${WRKDIR} && unset PWD && \
 	FILESDIR="$(FILESDIR)" PATCH="$(PATCH)" PATCH_ARGS="$(PATCH_ARGS)" \
-		./config/install.sh
+	INSTALLDIR="$(PREFIX)/smlnj"	./config/install.sh
 
-# install target
-# 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
-do-install:
-	${MKDIR} ${SML_BASE} ${SML_BINDIR} ${SML_LIBDIR}
-	tar -C ${WRKDIR} -cf - bin | tar -C ${SML_BASE} -xf -
-	${RM} -f ${SML_BINDIR}/.run-sml
-	${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} && tar -cf - `find . -name '*.stable' | ${GREP} CM` | \
-		tar -C ${SML_BASE} -xf -
-	cd ${WRKDIR} && tar -cf - `${SCRIPTDIR}/get-cm ${WRKDIR}` | \
-		tar -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}
-	-${LN} -s ${SML_BINDIR}/${file} ${PREFIX}/bin/${file}
+post-install:
+.for f in $(MLEXE)
+	${LN} -s $(PREFIX)/smlnj/bin/$f $(PREFIX)/bin/$f
 .endfor
 
 .include <bsd.port.mk>
diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo
index 7b0f41725548..20753ce97073 100644
--- a/lang/sml-nj-devel/distinfo
+++ b/lang/sml-nj-devel/distinfo
@@ -1,11 +1,13 @@
-MD5 (sml-nj/110.9.1-bin.x86-unix.tar.Z) = a8d2a792ef392a0ddd8ece325fd4b892
-MD5 (sml-nj/110.9.1-cm.tar.Z) = ee3987dbee99b5f0b59cb09c1a956a0d
-MD5 (sml-nj/110.9.1-cml.tar.Z) = 8c33edee5e75fd18600ef9f0b5b253ae
-MD5 (sml-nj/110.9.1-config.tar.Z) = 7a386efc49ca847745f818dcbe5a36bf
-MD5 (sml-nj/110.9.1-eXene.tar.Z) = 33f16b9d64f2c02f36172e434f29f136
-MD5 (sml-nj/110.9.1-ml-burg.tar.Z) = c25007873fbe1dd6ae68a2f0a54e7089
-MD5 (sml-nj/110.9.1-ml-lex.tar.Z) = acd4a503f087fb0a4a044d3ff6da5d24
-MD5 (sml-nj/110.9.1-ml-yacc.tar.Z) = 478430b7bcaa41f1d3f1cc66055078d7
-MD5 (sml-nj/110.9.1-runtime.tar.Z) = b73c165b4cf445601926f53566a1a589
-MD5 (sml-nj/110.9.1-smlnj-c.tar.Z) = c15c3295fd1a9afd9eb5aa67ae34543f
-MD5 (sml-nj/110.9.1-smlnj-lib.tar.Z) = 53f49d01d3f6c3b4eb175ce07a7c8759
+MD5 (sml-nj/110.33/boot.x86-unix.tgz) = 8ca6ca8b5981fbfb55fb1ed4a10a87a3
+MD5 (sml-nj/110.33/compiler.tgz) = e90432d37da70ab391df70292797909a
+MD5 (sml-nj/110.33/cm.tgz) = 94cfe559204fc783dad5b893ce956f3b
+MD5 (sml-nj/110.33/ckit.tgz) = 61b8c2c05ead8a58860ed4c5f80cf0cf
+MD5 (sml-nj/110.33/config.tgz) = febbec9ae82ad5dae2648b3bf6b28ab3
+MD5 (sml-nj/110.33/ml-burg.tgz) = 395ac54fa03a15df0564865b7854069f
+MD5 (sml-nj/110.33/ml-lex.tgz) = 3da0a002f667e29d2781aa99fdd99122
+MD5 (sml-nj/110.33/ml-nlffi-lib.tgz) = 6edd48687ceb3cfdcfc7cae832f9b24a
+MD5 (sml-nj/110.33/ml-nlffigen.tgz) = 9cb4b36ddf6d50c280267d964c17ebad
+MD5 (sml-nj/110.33/ml-yacc.tgz) = 4e440198a7db006fd76cbad72e699149
+MD5 (sml-nj/110.33/runtime.tgz) = 94294f70cc2e6c27edf3705925aff291
+MD5 (sml-nj/110.33/smlnj-lib.tgz) = 99080e52a31b197cd08e6fb807089871
+MD5 (sml-nj/110.33/system.tgz) = f9144d57279853f60163c1c8ce850120
diff --git a/lang/sml-nj-devel/files/extra-patch-global-names b/lang/sml-nj-devel/files/extra-patch-global-names
index 85d10136ce40..9b5ec3ce29e9 100644
--- a/lang/sml-nj-devel/files/extra-patch-global-names
+++ b/lang/sml-nj-devel/files/extra-patch-global-names
@@ -1,11 +1,11 @@
---- src/runtime/include/asm-base.h--	Thu Aug  6 13:40:30 1998
-+++ src/runtime/include/asm-base.h	Mon Feb  1 15:33:00 1999
+--- src/runtime/include/asm-base.h--	Fri Apr 20 18:56:45 2001
++++ src/runtime/include/asm-base.h	Thu Jun 14 12:49:34 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(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32))
+-#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || defined(OPSYS_FREEBSD) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32) || defined(OPSYS_DARWIN))
++#if (!defined(GLOBALS_HAVE_UNDERSCORE)) && (defined(OPSYS_SUNOS) || (defined(OPSYS_FREEBSD) && !defined(__ELF__)) || defined(OPSYS_NETBSD) || defined(OPSYS_NEXTSTEP) || defined(OPSYS_WIN32) || defined(OPSYS_DARWIN))
  #  define GLOBALS_HAVE_UNDERSCORE
  #endif
  
diff --git a/lang/sml-nj-devel/files/extra-patch-signals b/lang/sml-nj-devel/files/extra-patch-signals
deleted file mode 100644
index 5546f0e4f7e8..000000000000
--- a/lang/sml-nj-devel/files/extra-patch-signals
+++ /dev/null
@@ -1,21 +0,0 @@
-*** src.old/runtime/mach-dep/signal-sysdep.h	Sat Jan 22 18:15:21 2000
---- src/runtime/mach-dep/signal-sysdep.h	Sun Jan 23 01:46:53 2000
-***************
-*** 396,403 ****
-  #  elif defined(OPSYS_FREEBSD)
-      /** x86, FreeBSD **/
-  #    define SIG_FAULT1		SIGFPE
-! #    define INT_DIVZERO(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTDIV_TRAP))
-! #    define INT_OVFLW(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTOVF_TRAP))
-  
-  #    define SIG_GetCode(info, scp)	(info)
-  #    define SIG_GetPC(scp)		((scp)->sc_pc)
---- 396,403 ----
-  #  elif defined(OPSYS_FREEBSD)
-      /** x86, FreeBSD **/
-  #    define SIG_FAULT1		SIGFPE
-! #    define INT_DIVZERO(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTDIV))
-! #    define INT_OVFLW(s, c)	(((s) == SIGFPE) && ((c) == FPE_INTOVF))
-  
-  #    define SIG_GetCode(info, scp)	(info)
-  #    define SIG_GetPC(scp)		((scp)->sc_pc)
diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab
index 6e9c75bb0469..cacfce583402 100644
--- a/lang/sml-nj-devel/files/patch-ab
+++ b/lang/sml-nj-devel/files/patch-ab
@@ -1,21 +1,39 @@
---- config/install.sh.orig	Wed Aug  5 13:43:43 1998
-+++ config/install.sh	Sat Jan 29 20:46:09 2000
-@@ -181,6 +181,18 @@
- if [ "$?" != "0" ]; then
-   exit $?
- fi
-+# we need to patch just before build
-+echo "applying source patches"
-+patch_file="${FILESDIR}/extra-patch-global-names"
-+if [ -f $patch_file ]; then
-+	$PATCH $PATCH_ARGS < $patch_file
-+fi
-+if grep -w FPE_INTDIV /usr/include/machine/trap.h > /dev/null 2>&1; then
-+	patch_file="${FILESDIR}/extra-patch-signals"
-+	if [ -f $patch_file ]; then
-+		$PATCH $PATCH_ARGS < $patch_file
+--- config/install.sh.orig	Wed May 23 03:36:12 2001
++++ config/install.sh	Mon Jun 18 14:40:02 2001
+@@ -408,6 +408,28 @@
+ }
+ 
+ #
++# do_patch patch-file
++# apply a patch file
++do_patch() {
++	patchfile=$FILESDIR/$1
++
++	if [ ! -r $patchfile ]; then
++		echo "$this: !!! patch file $patchfile not found."
++		exit 1;
 +	fi
-+fi
- if [ ! -x $RUNDIR/run.$ARCH-$OPSYS ]; then
-   cd $SRCDIR/runtime/objs
-   echo "compiling the run-time system"
++
++	if [ ! -f $CONFIGDIR/.patch_$1 ]; then 
++		$PATCH $PATCH_ARGS < $patchfile || {\
++			echo "$this: !!! patch file $patchfile failed to patch."
++			exit 1;
++		}
++		echo > $CONFIGDIR/.patch_$1
++	else
++		echo "$this: patch $patchfile already installed."
++	fi
++}
++
++#
+ # create the various sub directories
+ #
+ for dir in $BINDIR $HEAPDIR $RUNDIR $LIBDIR $SRCDIR ; do
+@@ -519,6 +541,7 @@
+ # build the run-time system
+ #
+ unpack "run-time" $SRCDIR runtime runtime
++do_patch extra-patch-global-names
+ if [ -x $RUNDIR/run.$ARCH-$OPSYS ]; then
+     echo $this: Run-time system already exists.
+ else
diff --git a/lang/sml-nj-devel/files/targets.customized b/lang/sml-nj-devel/files/targets.customized
new file mode 100644
index 000000000000..2857f74eca80
--- /dev/null
+++ b/lang/sml-nj-devel/files/targets.customized
@@ -0,0 +1,98 @@
+# targets
+#
+# the following is a list of the targets (in addition to sml) that
+# this shell script can install.  Comment out those that you do not
+# want.  Note that cml-lib requires cml.
+
+#
+# But first, decide where you want to have stable libraries stored.
+# If you set $MOVE_LIBRARIES to true, then the install script will
+# move all libraries out of the source tree and into the $LIBDIR
+# directory.  Thus, you can then delete the entire source tree without
+# losing functionality.  So choose one of these two:
+
+MOVE_LIBRARIES=true
+#MOVE_LIBRARIES=false
+
+# Now let's get started with the target list...
+
+TARGETS=""
+
+# (Always: build the basic sml compiler. This is not reflected in $TARGETS.)
+
+
+# unpack the source code for the SML/NJ compiler; this is not required,
+# unless you are doing compiler hacking, but it may be interesting to look at.
+#
+#TARGETS="$TARGETS src-smlnj"
+
+# build ML-Yacc
+#
+TARGETS="$TARGETS ml-yacc"
+
+# Always: install the pre-compiled ML-Yacc Library; this is necessary
+# to use parsers produced by ML-Yacc, but also to bootstrap the system
+# in the first place.
+
+
+# build ML-Lex
+#
+TARGETS="$TARGETS ml-lex"
+
+# Always: install the pre-compiled SML/NJ Library (necessary to bootstrap).
+
+
+# build 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)
+TARGETS="$TARGETS smlnj-lib"
+
+# pre-compile and install Concurrent ML, which is a library for message-passing
+# concurrency.
+#
+#TARGETS="$TARGETS cml"
+
+# pre-compile and install the CML Library, which provides some useful CML
+# modules.
+#
+#TARGETS="$TARGETS cml-lib"
+
+# pre-compile and install eXene, which is a library for X-Windows programming.
+# EXene requires CML.
+#
+#TARGETS="$TARGETS eXene"
+
+# pre-compile and install the C-Kit, which is a library for parsing and
+# type-checking C programs
+#
+TARGETS="$TARGETS ckit"
+
+# pre-compile and install the ML-NLFFI Library, which is the core of
+# a new foreign function interface (where "foreign" functions are
+# "no longer foreign")
+# This library is necessary to compile and/or run programs that use
+# the new FFI.
+# This preview release currently works only under X86/Linux.
+#
+TARGETS="$TARGETS ml-nlffi-lib"
+
+# build ML-NLFFI-Gen, a program generator tool used in conjunction with
+# the new "NLFFI" foreign function interface.  The tool generates ML
+# glue code from C source code.
+# (Requires ckit!)
+# This preview release currently works only under X86/Linux.
+#
+TARGETS="$TARGETS ml-nlffigen"
+
+# unpack and install the documentation directory.
+#
+#TARGETS="$TARGETS doc"
+
+# Note: autoloading is always enabled.
+#   In order to customize what is being pre-registered for autoloading
+#   edit file "preloads".  You should make sure that it contains at least
+#   "$smlnj/cm.cm".
+#  Also, it is a good idea to have "$/basis.cm" pre-loaded.
diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist
index 6fec3f1eab41..6dbeb17f92e7 100644
--- a/lang/sml-nj-devel/pkg-plist
+++ b/lang/sml-nj-devel/pkg-plist
@@ -1,161 +1,206 @@
-bin/ml-burg
-bin/ml-lex
+bin/ml-build
+bin/ml-makedepend
 bin/ml-yacc
+bin/ml-lex
+bin/ml-burg
+bin/ml-nlffigen
 bin/sml
-lib/sml-nj/bin/.heap/sml.x86-bsd
-lib/sml-nj/bin/.heap/ml-yacc.x86-bsd
-lib/sml-nj/bin/.heap/ml-lex.x86-bsd
-lib/sml-nj/bin/.heap/ml-burg.x86-bsd
-lib/sml-nj/bin/.run/run.x86-freebsd
-lib/sml-nj/bin/.arch-n-opsys
-lib/sml-nj/bin/.run-sml
-lib/sml-nj/bin/ml-burg
-lib/sml-nj/bin/ml-lex
-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/x86-unix/sources.cm.stable
-lib/sml-nj/src/ml-yacc/lib/sources.cm
-lib/sml-nj/src/smlnj-lib/HTML/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/HTML/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/devices/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/PP/devices/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/src/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/PP/src/sources.cm
-lib/sml-nj/src/smlnj-lib/PP/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/PP/sources.cm
-lib/sml-nj/src/smlnj-lib/Reactive/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/Reactive/sources.cm
-lib/sml-nj/src/smlnj-lib/RegExp/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/RegExp/sources.cm
-lib/sml-nj/src/smlnj-lib/Unix/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/Unix/sources.cm
-lib/sml-nj/src/smlnj-lib/Util/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/smlnj-lib/Util/sources.cm
-lib/sml-nj/src/cml/cml-lib/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/cml-lib/CM/x86-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/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/IO/sources.cm
-lib/sml-nj/src/cml/src/OS/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/OS/sources.cm
-lib/sml-nj/src/cml/src/Sockets/CM/x86-unix/layer2.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/x86-unix/layer3.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/Sockets/CM/x86-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/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/Unix/CM/x86-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/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/core-cml/sources.cm
-lib/sml-nj/src/cml/src/glue/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/glue/sources.cm
-lib/sml-nj/src/cml/src/util/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/util/sources.cm
-lib/sml-nj/src/cml/src/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/cml/src/sources.cm
-lib/sml-nj/src/eXene/graph-util/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/eXene/graph-util/sources.cm
-lib/sml-nj/src/eXene/lib/CM/x86-unix/base.cm.stable
-lib/sml-nj/src/eXene/lib/CM/x86-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/x86-unix/sources.cm.stable
-lib/sml-nj/src/eXene/styles/sources.cm
-lib/sml-nj/src/eXene/widgets/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/eXene/widgets/sources.cm
-lib/sml-nj/src/eXene/CM/x86-unix/sources.cm.stable
-lib/sml-nj/src/eXene/sources.cm
-@dirrm lib/sml-nj/bin/.heap
-@dirrm lib/sml-nj/bin/.run
-@dirrm lib/sml-nj/bin
-@dirrm lib/sml-nj/lib
-@dirrm lib/sml-nj/src/ml-yacc/lib/CM/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-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/x86-unix
-@dirrm lib/sml-nj/src/eXene/lib/CM
-@dirrm lib/sml-nj/src/eXene/lib
-@dirrm lib/sml-nj/src/eXene/styles/CM/x86-unix
-@dirrm lib/sml-nj/src/eXene/styles/CM
-@dirrm lib/sml-nj/src/eXene/styles
-@dirrm lib/sml-nj/src/eXene/widgets/CM/x86-unix
-@dirrm lib/sml-nj/src/eXene/widgets/CM
-@dirrm lib/sml-nj/src/eXene/widgets
-@dirrm lib/sml-nj/src/eXene/CM/x86-unix
-@dirrm lib/sml-nj/src/eXene/CM
-@dirrm lib/sml-nj/src/eXene
-@dirrm lib/sml-nj/src
-@dirrm lib/sml-nj
+smlnj/bin/.heap/sml.x86-bsd
+smlnj/bin/.heap/ml-yacc.x86-bsd
+smlnj/bin/.heap/ml-lex.x86-bsd
+smlnj/bin/.heap/ml-burg.x86-bsd
+smlnj/bin/.heap/ml-nlffigen.x86-bsd
+smlnj/bin/.run/run.x86-freebsd
+smlnj/bin/.arch-n-opsys
+smlnj/bin/.run-sml
+smlnj/bin/.link-sml
+smlnj/bin/ml-build
+smlnj/bin/ml-makedepend
+smlnj/bin/sml
+smlnj/bin/ml-yacc
+smlnj/bin/ml-lex
+smlnj/bin/ml-burg
+smlnj/bin/ml-nlffigen
+smlnj/lib/pathconfig
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/ALPHA.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/Control.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/HPPA.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/IA32.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/Lib.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/MLRISC.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/MLTREE.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/PPC.cm
+smlnj/lib/SMLNJ-MLRISC/CM/x86-unix/SPARC.cm
+smlnj/lib/basis.cm/CM/x86-unix/basis.cm
+smlnj/lib/burg-ext.cm/CM/x86-unix/burg-ext.cm
+smlnj/lib/dir-tool.cm/CM/x86-unix/dir-tool.cm
+smlnj/lib/grm-ext.cm/CM/x86-unix/grm-ext.cm
+smlnj/lib/html-lib.cm/CM/x86-unix/html-lib.cm
+smlnj/lib/lex-ext.cm/CM/x86-unix/lex-ext.cm
+smlnj/lib/make-tool.cm/CM/x86-unix/make-tool.cm
+smlnj/lib/ml-yacc-lib.cm/CM/x86-unix/ml-yacc-lib.cm
+smlnj/lib/mlburg-tool.cm/CM/x86-unix/mlburg-tool.cm
+smlnj/lib/mllex-tool.cm/CM/x86-unix/mllex-tool.cm
+smlnj/lib/mlyacc-tool.cm/CM/x86-unix/mlyacc-tool.cm
+smlnj/lib/noweb-tool.cm/CM/x86-unix/noweb-tool.cm
+smlnj/lib/nw-ext.cm/CM/x86-unix/nw-ext.cm
+smlnj/lib/pickle-lib.cm/CM/x86-unix/pickle-lib.cm
+smlnj/lib/pp-lib.cm/CM/x86-unix/pp-lib.cm
+smlnj/lib/shell-tool.cm/CM/x86-unix/shell-tool.cm
+smlnj/lib/smlnj/CM/x86-unix/cm.cm
+smlnj/lib/smlnj/CM/x86-unix/cmb.cm
+smlnj/lib/smlnj/CM/x86-unix/compiler.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/ALPHA.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/Control.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/HPPA.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/IA32.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/Lib.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/MLRISC.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/MLTREE.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/PPC.cm
+smlnj/lib/smlnj/MLRISC/CM/x86-unix/SPARC.cm
+smlnj/lib/smlnj/cm/CM/x86-unix/cm.cm
+smlnj/lib/smlnj/cm/CM/x86-unix/tools.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/alpha32-unix.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/current.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/hppa-unix.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/ppc-macos.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/ppc-unix.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/sparc-unix.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/x86-unix.cm
+smlnj/lib/smlnj/cmb/CM/x86-unix/x86-win32.cm
+smlnj/lib/smlnj/compiler/CM/x86-unix/all.cm
+smlnj/lib/smlnj/compiler/CM/x86-unix/alpha32.cm
+smlnj/lib/smlnj/compiler/CM/x86-unix/current.cm
+smlnj/lib/smlnj/compiler/CM/x86-unix/hppa.cm
+smlnj/lib/smlnj/compiler/CM/x86-unix/ppc.cm
+smlnj/lib/smlnj/compiler/CM/x86-unix/sparc.cm
+smlnj/lib/smlnj/compiler/CM/x86-unix/x86.cm
+smlnj/lib/smlnj/init/CM/x86-unix/init.cmi
+smlnj/lib/smlnj/internal/CM/x86-unix/cm-lib.cm
+smlnj/lib/smlnj/internal/CM/x86-unix/cm-sig-lib.cm
+smlnj/lib/smlnj/internal/CM/x86-unix/host-compiler-0.cm
+smlnj/lib/smlnj/internal/CM/x86-unix/intsys.cm
+smlnj/lib/smlnj/internal/CM/x86-unix/srcpath-lib.cm
+smlnj/lib/smlnj/viscomp/CM/x86-unix/alpha32.cm
+smlnj/lib/smlnj/viscomp/CM/x86-unix/core.cm
+smlnj/lib/smlnj/viscomp/CM/x86-unix/hppa.cm
+smlnj/lib/smlnj/viscomp/CM/x86-unix/ppc.cm
+smlnj/lib/smlnj/viscomp/CM/x86-unix/sparc.cm
+smlnj/lib/smlnj/viscomp/CM/x86-unix/x86.cm
+smlnj/lib/smlnj-lib.cm/CM/x86-unix/smlnj-lib.cm
+smlnj/lib/unix-lib.cm/CM/x86-unix/unix-lib.cm
+smlnj/lib/inet-lib.cm/CM/x86-unix/inet-lib.cm
+smlnj/lib/regexp-lib.cm/CM/x86-unix/regexp-lib.cm
+smlnj/lib/reactive-lib.cm/CM/x86-unix/reactive-lib.cm
+smlnj/lib/ckit-lib.cm/CM/x86-unix/ckit-lib.cm
+smlnj/lib/memory.cm/CM/x86-unix/memory.cm
+smlnj/lib/c-int.cm/CM/x86-unix/c-int.cm
+smlnj/lib/c.cm/CM/x86-unix/c.cm
+@dirrm smlnj/bin/.heap
+@dirrm smlnj/bin/.run
+@dirrm smlnj/bin
+@dirrm smlnj/lib/SMLNJ-MLRISC/CM/x86-unix
+@dirrm smlnj/lib/SMLNJ-MLRISC/CM
+@dirrm smlnj/lib/SMLNJ-MLRISC
+@dirrm smlnj/lib/basis.cm/CM/x86-unix
+@dirrm smlnj/lib/basis.cm/CM
+@dirrm smlnj/lib/basis.cm
+@dirrm smlnj/lib/burg-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/burg-ext.cm/CM
+@dirrm smlnj/lib/burg-ext.cm
+@dirrm smlnj/lib/dir-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/dir-tool.cm/CM
+@dirrm smlnj/lib/dir-tool.cm
+@dirrm smlnj/lib/grm-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/grm-ext.cm/CM
+@dirrm smlnj/lib/grm-ext.cm
+@dirrm smlnj/lib/html-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/html-lib.cm/CM
+@dirrm smlnj/lib/html-lib.cm
+@dirrm smlnj/lib/lex-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/lex-ext.cm/CM
+@dirrm smlnj/lib/lex-ext.cm
+@dirrm smlnj/lib/make-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/make-tool.cm/CM
+@dirrm smlnj/lib/make-tool.cm
+@dirrm smlnj/lib/ml-yacc-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/ml-yacc-lib.cm/CM
+@dirrm smlnj/lib/ml-yacc-lib.cm
+@dirrm smlnj/lib/mlburg-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/mlburg-tool.cm/CM
+@dirrm smlnj/lib/mlburg-tool.cm
+@dirrm smlnj/lib/mllex-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/mllex-tool.cm/CM
+@dirrm smlnj/lib/mllex-tool.cm
+@dirrm smlnj/lib/mlyacc-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/mlyacc-tool.cm/CM
+@dirrm smlnj/lib/mlyacc-tool.cm
+@dirrm smlnj/lib/noweb-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/noweb-tool.cm/CM
+@dirrm smlnj/lib/noweb-tool.cm
+@dirrm smlnj/lib/nw-ext.cm/CM/x86-unix
+@dirrm smlnj/lib/nw-ext.cm/CM
+@dirrm smlnj/lib/nw-ext.cm
+@dirrm smlnj/lib/pickle-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/pickle-lib.cm/CM
+@dirrm smlnj/lib/pickle-lib.cm
+@dirrm smlnj/lib/pp-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/pp-lib.cm/CM
+@dirrm smlnj/lib/pp-lib.cm
+@dirrm smlnj/lib/shell-tool.cm/CM/x86-unix
+@dirrm smlnj/lib/shell-tool.cm/CM
+@dirrm smlnj/lib/shell-tool.cm
+@dirrm smlnj/lib/smlnj/CM/x86-unix
+@dirrm smlnj/lib/smlnj/CM
+@dirrm smlnj/lib/smlnj/MLRISC/CM/x86-unix
+@dirrm smlnj/lib/smlnj/MLRISC/CM
+@dirrm smlnj/lib/smlnj/MLRISC
+@dirrm smlnj/lib/smlnj/cm/CM/x86-unix
+@dirrm smlnj/lib/smlnj/cm/CM
+@dirrm smlnj/lib/smlnj/cm
+@dirrm smlnj/lib/smlnj/cmb/CM/x86-unix
+@dirrm smlnj/lib/smlnj/cmb/CM
+@dirrm smlnj/lib/smlnj/cmb
+@dirrm smlnj/lib/smlnj/compiler/CM/x86-unix
+@dirrm smlnj/lib/smlnj/compiler/CM
+@dirrm smlnj/lib/smlnj/compiler
+@dirrm smlnj/lib/smlnj/init/CM/x86-unix
+@dirrm smlnj/lib/smlnj/init/CM
+@dirrm smlnj/lib/smlnj/init
+@dirrm smlnj/lib/smlnj/internal/CM/x86-unix
+@dirrm smlnj/lib/smlnj/internal/CM
+@dirrm smlnj/lib/smlnj/internal
+@dirrm smlnj/lib/smlnj/viscomp/CM/x86-unix
+@dirrm smlnj/lib/smlnj/viscomp/CM
+@dirrm smlnj/lib/smlnj/viscomp
+@dirrm smlnj/lib/smlnj
+@dirrm smlnj/lib/smlnj-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/smlnj-lib.cm/CM
+@dirrm smlnj/lib/smlnj-lib.cm
+@dirrm smlnj/lib/unix-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/unix-lib.cm/CM
+@dirrm smlnj/lib/unix-lib.cm
+@dirrm smlnj/lib/inet-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/inet-lib.cm/CM
+@dirrm smlnj/lib/inet-lib.cm
+@dirrm smlnj/lib/regexp-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/regexp-lib.cm/CM
+@dirrm smlnj/lib/regexp-lib.cm
+@dirrm smlnj/lib/reactive-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/reactive-lib.cm/CM
+@dirrm smlnj/lib/reactive-lib.cm
+@dirrm smlnj/lib/ckit-lib.cm/CM/x86-unix
+@dirrm smlnj/lib/ckit-lib.cm/CM
+@dirrm smlnj/lib/ckit-lib.cm
+@dirrm smlnj/lib/memory.cm/CM/x86-unix
+@dirrm smlnj/lib/memory.cm/CM
+@dirrm smlnj/lib/memory.cm
+@dirrm smlnj/lib/c-int.cm/CM/x86-unix
+@dirrm smlnj/lib/c-int.cm/CM
+@dirrm smlnj/lib/c-int.cm
+@dirrm smlnj/lib/c.cm/CM/x86-unix
+@dirrm smlnj/lib/c.cm/CM
+@dirrm smlnj/lib/c.cm
+@dirrm smlnj/lib
+@dirrm smlnj
diff --git a/lang/sml-nj-devel/scripts/get-cm b/lang/sml-nj-devel/scripts/get-cm
deleted file mode 100644
index 88992a05219f..000000000000
--- a/lang/sml-nj-devel/scripts/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/,,"