5 files changed, 22 insertions, 115 deletions

diff --git a/lang/sml-nj-devel/files/do-patch-src-makeml b/lang/sml-nj-devel/files/do-patch-src-makeml
index bdc33ed2951d..8be80ccde9de 100644
--- a/lang/sml-nj-devel/files/do-patch-src-makeml
+++ b/lang/sml-nj-devel/files/do-patch-src-makeml
@@ -1,5 +1,5 @@
---- src/system/makeml.orig	Wed Apr 18 17:43:09 2001
-+++ src/system/makeml	Wed Aug 15 18:36:30 2001
+--- src/system/makeml.orig	Fri May 17 22:48:38 2002
++++ src/system/makeml	Thu May 23 02:25:57 2002
 @@ -6,7 +6,9 @@
  twoup=`pwd`
  cd $here
@@ -15,9 +15,9 @@
  # ... unless it was already set at the time we run this script.
  #
  
--CM_PATHCONFIG_DEFAULT=${CM_PATHCONFIG_DEFAULT:-$twoup/lib/pathconfig}
-+CM_PATHCONFIG_DEFAULT=${CM_PATHCONFIG_DEFAULT:-$INSTALLROOT/lib/pathconfig}
- export CM_PATHCONFIG_DEFAULT
+-CM_PATHCONFIG=${CM_PATHCONFIG:-$twoup/lib/pathconfig}
++CM_PATHCONFIG=${CM_PATHCONFIG:-$INSTALLROOT/lib/pathconfig}
+ export CM_PATHCONFIG
  
  #
  # use the arch-n-opsys script to determine the ARCH/OS if possible
diff --git a/lang/sml-nj-devel/files/optional-patch-flint-access b/lang/sml-nj-devel/files/optional-patch-flint-access
index 3119f7e09729..8469e964adb0 100644
--- a/lang/sml-nj-devel/files/optional-patch-flint-access
+++ b/lang/sml-nj-devel/files/optional-patch-flint-access
@@ -1,25 +1,3 @@
---- src/cm/cm-lib.cm.orig	Fri Feb  8 21:02:55 2002
-+++ src/cm/cm-lib.cm	Thu Feb 28 02:38:24 2002
-@@ -14,6 +14,8 @@
- 	structure Sharing
- 	signature TOOLS
- 	structure Subst
-+	(* required by Backend.Compile.elaborate: *)
-+	structure UniquePid
- is
- 	$/basis.cm
- 	$/smlnj-lib.cm
---- src/cm/compile/uniquepid.sml.orig	Fri Feb  8 21:02:55 2002
-+++ src/cm/compile/uniquepid.sml	Thu Feb 28 03:07:33 2002
-@@ -17,7 +17,7 @@
-     type triplet = { staticPid: pid, fingerprint: pid, pepper: string }
- in    
- structure UniquePid :> sig
--    type info
-+    type info = triplet option
-     val reset : unit -> unit
-     val getInfo : GeneralParams.info -> SrcPath.file -> info
-     val uniquepid : info -> pid -> pid * string
 --- src/compiler/core.cm.orig	Fri Dec 14 22:01:23 2001
 +++ src/compiler/core.cm	Thu Feb 28 02:43:48 2002
 @@ -81,6 +81,26 @@
@@ -49,31 +27,3 @@
  is
  
  TopLevel/environ/environ.sig
---- src/system/smlnj/internal/intsys.cm.orig	Thu Sep 13 17:19:18 2001
-+++ src/system/smlnj/internal/intsys.cm	Thu Feb 28 05:54:57 2002
-@@ -32,7 +32,7 @@
- 	$smlnj/init/init.cmi : cm
- 
- 	$/basis.cm
--	$smlnj/viscomp/core.cm
-+	$smlnj/viscomp/core_flint.cm
- 
- 	(* need access to CM's "init" function *)
- 	$smlnj/internal/cm0.cm
---- src/system/smlnj/viscomp/core_flint.cm.orig	Thu Feb 28 03:06:08 2002
-+++ src/system/smlnj/viscomp/core_flint.cm	Thu Feb 28 03:46:52 2002
-@@ -0,0 +1,14 @@
-+(*
-+ * Just a quick hack to avoid a cyclic dependency between
-+ * cm/cm-lib.cm and compiler/core.cm. This happens because
-+ * Compiler.elaborate requires cm's structure UniquePid,
-+ * and we need Compiler.elaborate to generate FLINT terms.
-+ * -5- 20020228
-+ *)
-+
-+Library
-+	library($smlnj/viscomp/core.cm)
-+	structure UniquePid
-+is
-+	$smlnj/viscomp/core.cm
-+	$smlnj/internal/cm-lib.cm
diff --git a/lang/sml-nj-devel/files/patch-ab b/lang/sml-nj-devel/files/patch-ab
index 0ea33ef5bdf3..cac586c50abb 100644
--- a/lang/sml-nj-devel/files/patch-ab
+++ b/lang/sml-nj-devel/files/patch-ab
@@ -1,48 +1,6 @@
---- config/install.sh.orig	Fri Feb 15 23:17:39 2002
-+++ config/install.sh	Wed Feb 20 03:36:14 2002
-@@ -92,6 +92,17 @@
-     return 0
- }
- 
-+isin() {
-+    tested_x=$1
-+    shift
-+    for set_y in "$@" ; do
-+	if [ ${tested_x} = ${set_y} ] ; then
-+	    return 0
-+	fi
-+    done
-+    return 1
-+}
-+
- require() {
-     require_who=$1
-     shift
-@@ -105,8 +116,10 @@
- }
- 
- onepass() {
--    while read depline ; do
--	require $depline
-+    while read depwho depon ; do
-+	if isin $depwho ${TARGETS} ; then
-+		require $depwho $depon
-+	fi
-     done
- }
- 
-@@ -123,9 +136,7 @@
- #
- NEWTARGETS=""
- for t in ${ALLTARGETS} ; do
--    if isnotin $t ${TARGETS} ; then
--	:
--    else
-+    if isin $t ${TARGETS} ; then
- 	NEWTARGETS="$NEWTARGETS $t"
-     fi
- done
-@@ -552,6 +563,28 @@
+--- config/install.sh.orig	Fri May 17 22:48:36 2002
++++ config/install.sh	Thu May 23 01:40:27 2002
+@@ -550,6 +550,28 @@
  ######################################################################
  
  #
@@ -71,7 +29,7 @@
  # create the various sub directories
  #
  for dir in $BINDIR $HEAPDIR $RUNDIR $LIBDIR $SRCDIR ; do
-@@ -668,7 +701,7 @@
+@@ -666,7 +688,7 @@
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
      if [ -x run.$ARCH-$OPSYS ]; then
  	mv run.$ARCH-$OPSYS $RUNDIR
@@ -80,7 +38,7 @@
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -732,6 +765,8 @@
+@@ -730,6 +752,8 @@
  	do
  	    unpack $src $ROOT/src $src $src
          done
diff --git a/lang/sml-nj-devel/files/plist-everything b/lang/sml-nj-devel/files/plist-everything
index 36f585c7f633..1b9ed3df7299 100644
--- a/lang/sml-nj-devel/files/plist-everything
+++ b/lang/sml-nj-devel/files/plist-everything
@@ -7,8 +7,9 @@ smlnj/bin/.heap/nowhere.%%MLARCH%%-bsd
 smlnj/bin/ml-burg
 smlnj/bin/ml-nlffigen
 smlnj/bin/nowhere
-smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix/c-int.cm
-smlnj/lib/c.cm/CM/%%MLARCH%%-unix/c.cm
+smlnj/lib/c/CM/%%MLARCH%%-unix/c.cm
+smlnj/lib/c/internals/CM/%%MLARCH%%-unix/c-int.cm
+smlnj/lib/c/memory/CM/%%MLARCH%%-unix/memory.cm
 smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix/ckit-lib.cm
 smlnj/lib/cml/CM/%%MLARCH%%-unix/basis.cm
 smlnj/lib/cml/CM/%%MLARCH%%-unix/cml-internal.cm
@@ -17,7 +18,6 @@ smlnj/lib/cml/CM/%%MLARCH%%-unix/core-cml.cm
 smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/smlnj-lib.cm
 smlnj/lib/cml-lib/CM/%%MLARCH%%-unix/trace-cml.cm
 smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix/eXene.cm
-smlnj/lib/memory.cm/CM/%%MLARCH%%-unix/memory.cm
 smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/match-compiler.cm
 smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/parser.cm
 smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix/pp.cm
@@ -34,18 +34,18 @@ smlnj/lib/pgraph-util.cm/CM/%%MLARCH%%-unix/pgraph-util.cm
 @dirrm smlnj/lib/eXene.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/eXene.cm/CM
 @dirrm smlnj/lib/eXene.cm
-@dirrm smlnj/lib/c-int.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/c-int.cm/CM
-@dirrm smlnj/lib/c-int.cm
-@dirrm smlnj/lib/c.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/c.cm/CM
-@dirrm smlnj/lib/c.cm
+@dirrm smlnj/lib/c/memory/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/memory/CM
+@dirrm smlnj/lib/c/memory
+@dirrm smlnj/lib/c/internals/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/internals/CM
+@dirrm smlnj/lib/c/internals
+@dirrm smlnj/lib/c/CM/%%MLARCH%%-unix
+@dirrm smlnj/lib/c/CM
+@dirrm smlnj/lib/c
 @dirrm smlnj/lib/ckit-lib.cm/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/ckit-lib.cm/CM
 @dirrm smlnj/lib/ckit-lib.cm
-@dirrm smlnj/lib/memory.cm/CM/%%MLARCH%%-unix
-@dirrm smlnj/lib/memory.cm/CM
-@dirrm smlnj/lib/memory.cm
 @dirrm smlnj/lib/mlrisc-tools/CM/%%MLARCH%%-unix
 @dirrm smlnj/lib/mlrisc-tools/CM
 @dirrm smlnj/lib/mlrisc-tools
diff --git a/lang/sml-nj-devel/files/plist-flint b/lang/sml-nj-devel/files/plist-flint
deleted file mode 100644
index 6081641f6be7..000000000000
--- a/lang/sml-nj-devel/files/plist-flint
+++ /dev/null
@@ -1 +0,0 @@
-smlnj/lib/smlnj/viscomp/CM/%%MLARCH%%-unix/core_flint.cm