Upgrade to v110.57.

Submitted by:	Johannes 5 Joemann <joemann@beefree.free.de> [MAINTAINER]

4 files changed, 102 insertions, 87 deletions

diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile
index d94ee9f6317c..394017ab8cb8 100644
--- a/lang/sml-nj-devel/Makefile
+++ b/lang/sml-nj-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	smlnj
-PORTVERSION=	110.54
+PORTVERSION=	110.57
 CATEGORIES=	lang
 MASTER_SITES=	http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \
 		ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/
diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo
index e1f837f7b750..22e437f8a16d 100644
--- a/lang/sml-nj-devel/distinfo
+++ b/lang/sml-nj-devel/distinfo
@@ -1,54 +1,54 @@
-MD5 (sml-nj/110.54/config.tgz) = 738d5704fab95306eef77ef80ebe62ff
-SHA256 (sml-nj/110.54/config.tgz) = c9b6d52420a4314b8911e36f60d0c83a16078c8cf9bc848adee5ed317db86f34
-SIZE (sml-nj/110.54/config.tgz) = 14335
-MD5 (sml-nj/110.54/runtime.tgz) = e2e307e84d05d024f94fb6d7f36460b8
-SHA256 (sml-nj/110.54/runtime.tgz) = 21508801ed436e04715ca916bb3e3db4ebaef31478a5bbbe5922f6eaf3df251a
-SIZE (sml-nj/110.54/runtime.tgz) = 313373
-MD5 (sml-nj/110.54/boot.x86-unix.tgz) = e85a3bc17bfacadeecd655c30297072e
-SHA256 (sml-nj/110.54/boot.x86-unix.tgz) = 3f7adffe9a8ccd86cb2e1f290a3ffca90d925014c52999fd287cc4731d3e0f73
-SIZE (sml-nj/110.54/boot.x86-unix.tgz) = 5414260
-MD5 (sml-nj/110.54/ml-yacc.tgz) = 22d9c3b25ff5b6c460ecb4121284bf11
-SHA256 (sml-nj/110.54/ml-yacc.tgz) = 777161e6abdac7c3bf8997feedf61081ed9d154960e455cb24563aebc7e347b5
-SIZE (sml-nj/110.54/ml-yacc.tgz) = 94941
-MD5 (sml-nj/110.54/ml-lex.tgz) = 416c039fa775cfd734eaca36028893df
-SHA256 (sml-nj/110.54/ml-lex.tgz) = dd5fb407593dca6bcc9404a1071addf6d2c0f890a8517096aff53884985f5da5
-SIZE (sml-nj/110.54/ml-lex.tgz) = 32384
-MD5 (sml-nj/110.54/smlnj-lib.tgz) = 2501128af31dd3765185f5373ba3fe31
-SHA256 (sml-nj/110.54/smlnj-lib.tgz) = 8fb9f5ce7e8658e22607978f32a8e89962fc2331b9449eb34e9a13727d8e8975
-SIZE (sml-nj/110.54/smlnj-lib.tgz) = 220809
-MD5 (sml-nj/110.54/cml.tgz) = 270cadf6bd7e2d8982f35aa2b604f609
-SHA256 (sml-nj/110.54/cml.tgz) = 8b43f3c4f2e2e5db724292e8caeb48e828cfa4a1bd6717929f7a5c617a45412b
-SIZE (sml-nj/110.54/cml.tgz) = 104098
-MD5 (sml-nj/110.54/MLRISC.tgz) = 76b059befa77cf5b17b8a31b0998cf11
-SHA256 (sml-nj/110.54/MLRISC.tgz) = 6284cfb92fe04742bff71f10547b0881db7394c86a2e88e9d7794c0c68aebbf1
-SIZE (sml-nj/110.54/MLRISC.tgz) = 1226182
-MD5 (sml-nj/110.54/ckit.tgz) = f24209a140a4eaeec7cc8610aebe52fc
-SHA256 (sml-nj/110.54/ckit.tgz) = 21f9320faa04fa865d92d0c29844dbc575260a43ea37310c9857e12334c5ade0
-SIZE (sml-nj/110.54/ckit.tgz) = 168161
-MD5 (sml-nj/110.54/ml-burg.tgz) = 78900547fc70f2a9c0c7b412a526f6b7
-SHA256 (sml-nj/110.54/ml-burg.tgz) = e36ac07a842c06d9a1422cd84d1b3f24704e4fde7d8692841b9cc09b42b30fd6
-SIZE (sml-nj/110.54/ml-burg.tgz) = 31550
-MD5 (sml-nj/110.54/ml-nlffi-lib.tgz) = 8a181d18daa2e6302cc3f74fdff7f05e
-SHA256 (sml-nj/110.54/ml-nlffi-lib.tgz) = 2cf94e73d5dcfe6ac12871296ca4cb9ddeb8b75ea696967bcf3aa57032b2794a
-SIZE (sml-nj/110.54/ml-nlffi-lib.tgz) = 44214
-MD5 (sml-nj/110.54/ml-nlffigen.tgz) = 10a13239ef4ccc36fbc1c5e60f5c6255
-SHA256 (sml-nj/110.54/ml-nlffigen.tgz) = f57c3da63dd0dc620a4423545dba0c3346f638aef52a6e16f444c755ffbf512f
-SIZE (sml-nj/110.54/ml-nlffigen.tgz) = 29495
-MD5 (sml-nj/110.54/smlnj-c.tgz) = df27f8316e6fb906eaf0b0d45708a16d
-SHA256 (sml-nj/110.54/smlnj-c.tgz) = d46537f4e0891c8d8f17472969ddc7064718a8ff53c1f8ee00d8febdb8e93ebd
-SIZE (sml-nj/110.54/smlnj-c.tgz) = 10535
-MD5 (sml-nj/110.54/eXene.tgz) = 75c6ca41681854ef602728cb0ad4eed6
-SHA256 (sml-nj/110.54/eXene.tgz) = 085ca27c10ddafcff285d40fa8161edbe520feafd7e3494d7440f5b6f5a7afb9
-SIZE (sml-nj/110.54/eXene.tgz) = 695218
-MD5 (sml-nj/110.54/cm.tgz) = b67415228b7c7c32cd4f312d3d054d81
-SHA256 (sml-nj/110.54/cm.tgz) = 6e29edd52293e2ac09db16d121591d8ae3104e5740c4c9dfe6fa63b3cb7f55c7
-SIZE (sml-nj/110.54/cm.tgz) = 206167
-MD5 (sml-nj/110.54/compiler.tgz) = 70c1d9c8f3c3da6b925265a40eb040e6
-SHA256 (sml-nj/110.54/compiler.tgz) = 1d5ac6d34e34dccdbe3482ac62ab9f3e49ec2e9c0ecc0639b8ecac2098417752
-SIZE (sml-nj/110.54/compiler.tgz) = 736638
-MD5 (sml-nj/110.54/system.tgz) = 1af45e2ceac5072db50dad085447a5aa
-SHA256 (sml-nj/110.54/system.tgz) = 62ada45809c3263a59d80624ba23a7d5effef0d89b018c0e884708ecf1f809c1
-SIZE (sml-nj/110.54/system.tgz) = 218726
-MD5 (sml-nj/110.54/tools.tgz) = 5afb8bc43de838d2268271f395da7001
-SHA256 (sml-nj/110.54/tools.tgz) = 8fd0feefe481ecbbc6f8fa36b700a9dc40288b33288af9e38054489ed469ec44
-SIZE (sml-nj/110.54/tools.tgz) = 3854
+MD5 (sml-nj/110.57/config.tgz) = a0f556961bc93fb63fc8cc38813e8659
+SHA256 (sml-nj/110.57/config.tgz) = 1e2bfdc300d92bcfe43591430fa2e330b79192ed8f3159b5e6c5fd8b8231a19c
+SIZE (sml-nj/110.57/config.tgz) = 14424
+MD5 (sml-nj/110.57/runtime.tgz) = 3e5bc506dffdbd93c004b33ae12ff49e
+SHA256 (sml-nj/110.57/runtime.tgz) = 8d0b31abc24f25e567e99b99f394a21fc83c3d97b8b3269b7a97418a6f84e9f0
+SIZE (sml-nj/110.57/runtime.tgz) = 313742
+MD5 (sml-nj/110.57/boot.x86-unix.tgz) = 4af368d68bd472c35bc5aa83f9a59f34
+SHA256 (sml-nj/110.57/boot.x86-unix.tgz) = f85d238a7ac124d169c71f28b0b4329e656265adcf64ceaed4986f531c3afb63
+SIZE (sml-nj/110.57/boot.x86-unix.tgz) = 5416104
+MD5 (sml-nj/110.57/ml-yacc.tgz) = b06c5be6d557751616fa430e421bf706
+SHA256 (sml-nj/110.57/ml-yacc.tgz) = b582630dafff89a4c3566820cd26931f88026cc7c9890eea66a316535e109268
+SIZE (sml-nj/110.57/ml-yacc.tgz) = 95234
+MD5 (sml-nj/110.57/ml-lex.tgz) = 25d64f79f7de8e41d37911cdabad89b3
+SHA256 (sml-nj/110.57/ml-lex.tgz) = e388c750f62f215bef4e7af664d85f261c2b9acc980ada2fc50a7ccfa8b84df9
+SIZE (sml-nj/110.57/ml-lex.tgz) = 32410
+MD5 (sml-nj/110.57/smlnj-lib.tgz) = e32800489430b8f598f849ab1524aac7
+SHA256 (sml-nj/110.57/smlnj-lib.tgz) = 839851cb96641b7b82a8d3b768a42e5f6c5f61664e08d7c1ba8ac11138b58ce0
+SIZE (sml-nj/110.57/smlnj-lib.tgz) = 226978
+MD5 (sml-nj/110.57/cml.tgz) = 6b23cc3b33465511ef9cca46cea5d9ab
+SHA256 (sml-nj/110.57/cml.tgz) = 7c3f70a3776c95fb528d0f1a795599bafa5438a5e75db41ef1b3f8492e455f0a
+SIZE (sml-nj/110.57/cml.tgz) = 104136
+MD5 (sml-nj/110.57/MLRISC.tgz) = 3f0b6ff18038e0cbc08b317169917206
+SHA256 (sml-nj/110.57/MLRISC.tgz) = 0e9ab13b6555a5fb10c41fc54db3560308c55593f4c2bb59b449241c11fef141
+SIZE (sml-nj/110.57/MLRISC.tgz) = 1225850
+MD5 (sml-nj/110.57/ckit.tgz) = 78530579023597067deabac1e3109afa
+SHA256 (sml-nj/110.57/ckit.tgz) = c9d6b7c587f6803403ab6fc945156a4cb502811eacbc9e5ed656428aa1e7b923
+SIZE (sml-nj/110.57/ckit.tgz) = 168167
+MD5 (sml-nj/110.57/ml-burg.tgz) = cbbf80c5cb007e83eb63a5cd94977b68
+SHA256 (sml-nj/110.57/ml-burg.tgz) = 037f60a03e8175966f3e88f8fdff280726010a7f4336be5ccb4c5b0b0271c18a
+SIZE (sml-nj/110.57/ml-burg.tgz) = 31547
+MD5 (sml-nj/110.57/ml-nlffi-lib.tgz) = 3bb54918075534506b3d01a722c37aca
+SHA256 (sml-nj/110.57/ml-nlffi-lib.tgz) = 95c3a67848884571b56ff4f818aa3b931f5b0ba60ec37fcc210567a87af4ac16
+SIZE (sml-nj/110.57/ml-nlffi-lib.tgz) = 44212
+MD5 (sml-nj/110.57/ml-nlffigen.tgz) = 62b30439b8d2be80c2db995dbb51dbaa
+SHA256 (sml-nj/110.57/ml-nlffigen.tgz) = bbdbda357653e21327c5f1a7ccf69aa411f7d7d6777c9f7a60251fe077bfc8bc
+SIZE (sml-nj/110.57/ml-nlffigen.tgz) = 29495
+MD5 (sml-nj/110.57/smlnj-c.tgz) = c438ab652699c7d5afbd89f45be90486
+SHA256 (sml-nj/110.57/smlnj-c.tgz) = db5297463563b4e2884d2ee87b6fbb460a4e6fc9cc178049e7880bc84374097a
+SIZE (sml-nj/110.57/smlnj-c.tgz) = 10537
+MD5 (sml-nj/110.57/eXene.tgz) = 656508ff3828344e7e6b59e3429f0f19
+SHA256 (sml-nj/110.57/eXene.tgz) = 13d46babaffda4153cf324a91e8a38e666ad0dc762eab6a6a6eed81530400544
+SIZE (sml-nj/110.57/eXene.tgz) = 705649
+MD5 (sml-nj/110.57/cm.tgz) = 7c286667e8be55a33287b02b1b4aa2d5
+SHA256 (sml-nj/110.57/cm.tgz) = 5d8bcd0c5d0ea3a75b4d2554f61030b4131b22932e2a6c1f98a3bcbdff00cf10
+SIZE (sml-nj/110.57/cm.tgz) = 206226
+MD5 (sml-nj/110.57/compiler.tgz) = 7dba6d725648414733f11b8a1292c86e
+SHA256 (sml-nj/110.57/compiler.tgz) = dc68762bf022ae050ff2b8c88a0d377bcca0e8d3dcd7d2f0272304213d43dc02
+SIZE (sml-nj/110.57/compiler.tgz) = 736854
+MD5 (sml-nj/110.57/system.tgz) = 3a15e19305803ca5dbc3d4d28c278b53
+SHA256 (sml-nj/110.57/system.tgz) = 3929cb046f3cd88a0d9d563076e503bab88a498c4cc4d447b94b67b7f354567a
+SIZE (sml-nj/110.57/system.tgz) = 220290
+MD5 (sml-nj/110.57/tools.tgz) = d96d685bdc258c55b15844faf057166f
+SHA256 (sml-nj/110.57/tools.tgz) = 793f0455c06143d5e99dbf69981b44f0defb75d9c62fb03fef43f46b1b3ab5c3
+SIZE (sml-nj/110.57/tools.tgz) = 3917
diff --git a/lang/sml-nj-devel/files/patch-config::install.sh b/lang/sml-nj-devel/files/patch-config_install.sh
index 9e8a5b0cae3b..1dc0668ef961 100644
--- a/lang/sml-nj-devel/files/patch-config::install.sh
+++ b/lang/sml-nj-devel/files/patch-config_install.sh
@@ -1,5 +1,5 @@
---- config/install.sh.orig	Wed May 18 18:59:22 2005
-+++ config/install.sh	Mon May 30 19:46:41 2005
+--- config/install.sh.orig	Sun Nov 20 06:32:27 2005
++++ config/install.sh	Thu Jan 12 15:13:59 2006
 @@ -18,6 +18,8 @@
      nolib=false
  fi
@@ -38,7 +38,7 @@
  this=$0
  
  
-@@ -308,7 +332,12 @@
+@@ -307,7 +331,12 @@
  # the name of the bin files directory
  #
  BOOT_ARCHIVE=boot.$ARCH-unix
@@ -52,7 +52,7 @@
  
  #
  # build the run-time system
-@@ -317,6 +346,11 @@
+@@ -316,6 +345,11 @@
      vsay $this: Run-time system already exists.
  else
      "$CONFIGDIR"/unpack "$ROOT" runtime
@@ -64,7 +64,7 @@
      cd "$SRCDIR"/runtime/objs
      echo $this: Compiling the run-time system.
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-@@ -325,7 +359,7 @@
+@@ -324,7 +358,7 @@
  	if [ -f runx.$ARCH-$OPSYS ]; then
  	    mv runx.$ARCH-$OPSYS "$RUNDIR"
  	fi
@@ -73,16 +73,16 @@
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -351,7 +385,7 @@
+@@ -350,7 +384,7 @@
  	complain "$this !!! Unable to re-create heap image (sml.$HEAP_SUFFIX)."
      fi
  else
 -    "$CONFIGDIR"/unpack "$ROOT" "$BOOT_ARCHIVE"
 +    [ -n "$RECOMPILEDIR" ] || "$CONFIGDIR"/unpack "$ROOT" "$BOOT_ARCHIVE"
  
-     fish "$ROOT"/"$BOOT_FILES"/basis.cm
+     fish "$ROOT"/"$BOOT_FILES"/smlnj/basis
  
-@@ -422,5 +456,12 @@
+@@ -421,5 +455,12 @@
  	complain "$this: !!! Installation of libraries and programs failed."
      fi
  fi
diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist
index 507b6d407346..c48ee536217d 100644
--- a/lang/sml-nj-devel/pkg-plist
+++ b/lang/sml-nj-devel/pkg-plist
@@ -16,6 +16,12 @@ smlnj/bin/ml-lex
 smlnj/bin/ml-makedepend
 smlnj/bin/ml-yacc
 smlnj/bin/sml
+smlnj/lib/SMLNJ-BASIS/.cm/%%MLARCH%%-unix/basis.cm
+smlnj/lib/SMLNJ-LIB/Controls/.cm/%%MLARCH%%-unix/controls-lib.cm
+smlnj/lib/SMLNJ-LIB/HTML/.cm/%%MLARCH%%-unix/html-lib.cm
+smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix/pp-lib.cm
+smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix/smlnj-lib.cm
+smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/ALPHA.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Control.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Graphs.cm
@@ -30,7 +36,6 @@ smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Peephole.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/RA.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/SPARC.cm
 smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix/Visual.cm
-smlnj/lib/basis.cm/.cm/%%MLARCH%%-unix/basis.cm
 smlnj/lib/burg-ext.cm/.cm/%%MLARCH%%-unix/burg-ext.cm
 smlnj/lib/ckit-lib.cm/.cm/%%MLARCH%%-unix/ckit-lib.cm
 smlnj/lib/cml/.cm/%%MLARCH%%-unix/basis.cm
@@ -39,15 +44,12 @@ smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml.cm
 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/controls-lib.cm/.cm/%%MLARCH%%-unix/controls-lib.cm
 smlnj/lib/dir-tool.cm/.cm/%%MLARCH%%-unix/dir-tool.cm
 smlnj/lib/grm-ext.cm/.cm/%%MLARCH%%-unix/grm-ext.cm
 smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix/hash-cons-lib.cm
-smlnj/lib/html-lib.cm/.cm/%%MLARCH%%-unix/html-lib.cm
 smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix/inet-lib.cm
 smlnj/lib/lex-ext.cm/.cm/%%MLARCH%%-unix/lex-ext.cm
 smlnj/lib/make-tool.cm/.cm/%%MLARCH%%-unix/make-tool.cm
-smlnj/lib/ml-yacc-lib.cm/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
 smlnj/lib/mlburg-tool.cm/.cm/%%MLARCH%%-unix/mlburg-tool.cm
 smlnj/lib/mllex-tool.cm/.cm/%%MLARCH%%-unix/mllex-tool.cm
 smlnj/lib/mlyacc-tool.cm/.cm/%%MLARCH%%-unix/mlyacc-tool.cm
@@ -56,7 +58,6 @@ smlnj/lib/nw-ext.cm/.cm/%%MLARCH%%-unix/nw-ext.cm
 smlnj/lib/pathconfig
 smlnj/lib/pgraph.cm/.cm/%%MLARCH%%-unix/pgraph.cm
 smlnj/lib/pickle-lib.cm/.cm/%%MLARCH%%-unix/pickle-lib.cm
-smlnj/lib/pp-lib.cm/.cm/%%MLARCH%%-unix/pp-lib.cm
 smlnj/lib/reactive-lib.cm/.cm/%%MLARCH%%-unix/reactive-lib.cm
 smlnj/lib/regexp-lib.cm/.cm/%%MLARCH%%-unix/regexp-lib.cm
 smlnj/lib/shell-tool.cm/.cm/%%MLARCH%%-unix/shell-tool.cm
@@ -75,6 +76,7 @@ smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/MLTREE.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/PPC.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/SPARC.cm
 smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix/Visual.cm
+smlnj/lib/smlnj/basis/.cm/%%MLARCH%%-unix/basis.cm
 smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/cm.cm
 smlnj/lib/smlnj/cm/.cm/%%MLARCH%%-unix/tools.cm
 smlnj/lib/smlnj/cmb/.cm/%%MLARCH%%-unix/alpha32-unix.cm
@@ -102,6 +104,10 @@ smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix/cm0.cm
 smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix/intsys.cm
 smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix/smlnj-version.cm
 smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix/srcpath-lib.cm
+smlnj/lib/smlnj/ml-yacc/.cm/%%MLARCH%%-unix/ml-yacc-lib.cm
+smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/controls-lib.cm
+smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/pp-lib.cm
+smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix/smlnj-lib.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/alpha32.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/basics.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/core.cm
@@ -114,7 +120,6 @@ smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/parser.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/ppc.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/sparc.cm
 smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix/x86.cm
-smlnj/lib/smlnj-lib.cm/.cm/%%MLARCH%%-unix/smlnj-lib.cm
 smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/back-trace.cm
 smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/coverage.cm
 smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix/plugins.cm
@@ -122,12 +127,28 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/bin/.heap
 @dirrm smlnj/bin/.run
 @dirrm smlnj/bin
+@dirrm smlnj/lib/SMLNJ-BASIS/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/SMLNJ-BASIS/.cm
+@dirrm smlnj/lib/SMLNJ-BASIS
+@dirrm smlnj/lib/SMLNJ-LIB/Controls/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/SMLNJ-LIB/Controls/.cm
+@dirrm smlnj/lib/SMLNJ-LIB/Controls
+@dirrm smlnj/lib/SMLNJ-LIB/HTML/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/SMLNJ-LIB/HTML/.cm
+@dirrm smlnj/lib/SMLNJ-LIB/HTML
+@dirrm smlnj/lib/SMLNJ-LIB/PP/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/SMLNJ-LIB/PP/.cm
+@dirrm smlnj/lib/SMLNJ-LIB/PP
+@dirrm smlnj/lib/SMLNJ-LIB/Util/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/SMLNJ-LIB/Util/.cm
+@dirrm smlnj/lib/SMLNJ-LIB/Util
+@dirrm smlnj/lib/SMLNJ-LIB
+@dirrm smlnj/lib/SMLNJ-ML-YACC-LIB/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/SMLNJ-ML-YACC-LIB/.cm
+@dirrm smlnj/lib/SMLNJ-ML-YACC-LIB
 @dirrm smlnj/lib/SMLNJ-MLRISC/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/SMLNJ-MLRISC/.cm
 @dirrm smlnj/lib/SMLNJ-MLRISC
-@dirrm smlnj/lib/basis.cm/.cm/%%MLARCH%%-unix
-@dirrm smlnj/lib/basis.cm/.cm
-@dirrm smlnj/lib/basis.cm
 @dirrm smlnj/lib/burg-ext.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/burg-ext.cm/.cm
 @dirrm smlnj/lib/burg-ext.cm
@@ -140,9 +161,6 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/cml-lib/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/cml-lib/.cm
 @dirrm smlnj/lib/cml-lib
-@dirrm smlnj/lib/controls-lib.cm/.cm/%%MLARCH%%-unix
-@dirrm smlnj/lib/controls-lib.cm/.cm
-@dirrm smlnj/lib/controls-lib.cm
 @dirrm smlnj/lib/dir-tool.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/dir-tool.cm/.cm
 @dirrm smlnj/lib/dir-tool.cm
@@ -152,9 +170,6 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/hash-cons-lib.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/hash-cons-lib.cm/.cm
 @dirrm smlnj/lib/hash-cons-lib.cm
-@dirrm smlnj/lib/html-lib.cm/.cm/%%MLARCH%%-unix
-@dirrm smlnj/lib/html-lib.cm/.cm
-@dirrm smlnj/lib/html-lib.cm
 @dirrm smlnj/lib/inet-lib.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/inet-lib.cm/.cm
 @dirrm smlnj/lib/inet-lib.cm
@@ -164,9 +179,6 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/make-tool.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/make-tool.cm/.cm
 @dirrm smlnj/lib/make-tool.cm
-@dirrm smlnj/lib/ml-yacc-lib.cm/.cm/%%MLARCH%%-unix
-@dirrm smlnj/lib/ml-yacc-lib.cm/.cm
-@dirrm smlnj/lib/ml-yacc-lib.cm
 @dirrm smlnj/lib/mlburg-tool.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/mlburg-tool.cm/.cm
 @dirrm smlnj/lib/mlburg-tool.cm
@@ -188,9 +200,6 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/pickle-lib.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/pickle-lib.cm/.cm
 @dirrm smlnj/lib/pickle-lib.cm
-@dirrm smlnj/lib/pp-lib.cm/.cm/%%MLARCH%%-unix
-@dirrm smlnj/lib/pp-lib.cm/.cm
-@dirrm smlnj/lib/pp-lib.cm
 @dirrm smlnj/lib/reactive-lib.cm/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/reactive-lib.cm/.cm
 @dirrm smlnj/lib/reactive-lib.cm
@@ -202,6 +211,9 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/shell-tool.cm
 @dirrm smlnj/lib/smlnj/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/.cm
+@dirrm smlnj/lib/smlnj/basis/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/smlnj/basis/.cm
+@dirrm smlnj/lib/smlnj/basis
 @dirrm smlnj/lib/smlnj/MLRISC/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/MLRISC/.cm
 @dirrm smlnj/lib/smlnj/MLRISC
@@ -220,13 +232,16 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm
 @dirrm smlnj/lib/smlnj/internal/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/internal/.cm
 @dirrm smlnj/lib/smlnj/internal
+@dirrm smlnj/lib/smlnj/ml-yacc/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/smlnj/ml-yacc/.cm
+@dirrm smlnj/lib/smlnj/ml-yacc
+@dirrm smlnj/lib/smlnj/smlnj-lib/.cm/%%MLARCH%%-unix
+@dirrm smlnj/lib/smlnj/smlnj-lib/.cm
+@dirrm smlnj/lib/smlnj/smlnj-lib
 @dirrm smlnj/lib/smlnj/viscomp/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj/viscomp/.cm
 @dirrm smlnj/lib/smlnj/viscomp
 @dirrm smlnj/lib/smlnj
-@dirrm smlnj/lib/smlnj-lib.cm/.cm/%%MLARCH%%-unix
-@dirrm smlnj/lib/smlnj-lib.cm/.cm
-@dirrm smlnj/lib/smlnj-lib.cm
 @dirrm smlnj/lib/smlnj-tdp/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/smlnj-tdp/.cm
 @dirrm smlnj/lib/smlnj-tdp