Update to v110.54.

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

5 files changed, 44 insertions, 33 deletions

diff --git a/lang/sml-nj-devel/files/patch-config::_arch-n-opsys b/lang/sml-nj-devel/files/patch-config::_arch-n-opsys
index 1daf1a7..36dd808 100644
--- a/lang/sml-nj-devel/files/patch-config::_arch-n-opsys
+++ b/lang/sml-nj-devel/files/patch-config::_arch-n-opsys
@@ -1,9 +1,9 @@
---- config/_arch-n-opsys.orig	Mon Oct 27 15:46:57 2003
-+++ config/_arch-n-opsys	Fri Nov 28 22:47:10 2003
-@@ -101,6 +101,7 @@
-       i486) ARCH=x86;;
-       i586) ARCH=x86;;
-       i686) ARCH=x86;;
+--- config/_arch-n-opsys.orig	Fri May  6 05:10:32 2005
++++ config/_arch-n-opsys	Sat May 28 18:00:11 2005
+@@ -95,6 +95,7 @@
+     HEAP_OPSYS=bsd
+     case `uname -m` in
+       *86) ARCH=x86;;
 +      alpha) ARCH=alpha32;;
        *) exit 1;;
      esac
diff --git a/lang/sml-nj-devel/files/patch-config::install.sh b/lang/sml-nj-devel/files/patch-config::install.sh
index fac94fb..9e8a5b0 100644
--- a/lang/sml-nj-devel/files/patch-config::install.sh
+++ b/lang/sml-nj-devel/files/patch-config::install.sh
@@ -1,15 +1,15 @@
---- config/install.sh.orig	Wed Dec 15 00:23:38 2004
-+++ config/install.sh	Thu Dec 16 04:30:19 2004
-@@ -12,6 +12,8 @@
- # Author: Matthias Blume (blume@tti-c.org)
- #
+--- config/install.sh.orig	Wed May 18 18:59:22 2005
++++ config/install.sh	Mon May 30 19:46:41 2005
+@@ -18,6 +18,8 @@
+     nolib=false
+ fi
  
 +[ -n "$RECOMPILEDIR" ] && echo "RECOMPILEDIR=$RECOMPILEDIR"
 +
  if [ x${INSTALL_QUIETLY} = xtrue ] ; then
      export CM_VERBOSE
      CM_VERBOSE=false
-@@ -32,6 +34,28 @@
+@@ -38,6 +40,28 @@
      exit 1
  }
  
@@ -38,7 +38,7 @@
  this=$0
  
  
-@@ -300,7 +324,12 @@
+@@ -308,7 +332,12 @@
  # the name of the bin files directory
  #
  BOOT_ARCHIVE=boot.$ARCH-unix
@@ -52,7 +52,7 @@
  
  #
  # build the run-time system
-@@ -309,12 +338,17 @@
+@@ -317,6 +346,11 @@
      vsay $this: Run-time system already exists.
  else
      "$CONFIGDIR"/unpack "$ROOT" runtime
@@ -64,36 +64,32 @@
      cd "$SRCDIR"/runtime/objs
      echo $this: Compiling the run-time system.
      $MAKE -f mk.$ARCH-$OPSYS $EXTRA_DEFS
-     if [ -x run.$ARCH-$OPSYS ]; then
- 	mv run.$ARCH-$OPSYS "$RUNDIR"
+@@ -325,7 +359,7 @@
+ 	if [ -f runx.$ARCH-$OPSYS ]; then
+ 	    mv runx.$ARCH-$OPSYS "$RUNDIR"
+ 	fi
 -	$MAKE MAKE=$MAKE clean
 +	[ "$MLNORUNTIMECLEAN" ] || $MAKE MAKE=$MAKE clean
      else
  	complain "$this: !!! Run-time system build failed for some reason."
      fi
-@@ -331,7 +365,7 @@
-     export CM_DIR_ARC
-     CM_DIR_ARC=$ORIG_CM_DIR_ARC
+@@ -351,7 +385,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
  
-@@ -400,5 +434,18 @@
- else
-     complain "$this: !!! Installation of libraries and programs failed."
+@@ -422,5 +456,12 @@
+ 	complain "$this: !!! Installation of libraries and programs failed."
+     fi
  fi
 +
-+# extract required sources
-+[ -n "$MLSOURCEUNPACKTARGETS" ] && \
-+for t in $MLSOURCEUNPACKTARGETS
-+do
-+	"$CONFIGDIR"/unpack "$ROOT" $t
-+done
 +# apply source patches
 +[ -n "$MLSOURCEPATCHES" ] && \
-+for p in "$MLSOURCEPATCHES"
++for p in $MLSOURCEPATCHES
 +do
 +	do_patch $p
 +done
diff --git a/lang/sml-nj-devel/files/patch-config_allsources b/lang/sml-nj-devel/files/patch-config_allsources
new file mode 100644
index 0000000..0445636
--- /dev/null
+++ b/lang/sml-nj-devel/files/patch-config_allsources
@@ -0,0 +1,7 @@
+--- config/allsources.orig	Tue May 11 18:36:07 2004
++++ config/allsources	Wed Mar  9 23:16:54 2005
+@@ -23,3 +23,4 @@
+ mlrisc
+ mlrisc-tools
+ smlnj-c
++tools
diff --git a/lang/sml-nj-devel/files/patch-config_unpack b/lang/sml-nj-devel/files/patch-config_unpack
new file mode 100644
index 0000000..5da9469
--- /dev/null
+++ b/lang/sml-nj-devel/files/patch-config_unpack
@@ -0,0 +1,12 @@
+--- config/unpack.orig	Sat Jan 15 00:53:18 2005
++++ config/unpack	Wed Mar  9 23:12:31 2005
+@@ -283,6 +283,9 @@
+       heap2asm)
+ 	unpack "Heap->ASM tool" "$SRCDIR" heap2asm heap2asm
+ 	;;
++      tools)
++	unpack "(profiling) tools" "$SRCDIR" tools tools
++	;;
+       doc)
+ 	echo Package doc is currently unavailable.
+ 	# unpack Doc $ROOT doc doc
diff --git a/lang/sml-nj-devel/files/plist-everything b/lang/sml-nj-devel/files/plist-everything
index 11e1c4b..619aac3 100644
--- a/lang/sml-nj-devel/files/plist-everything
+++ b/lang/sml-nj-devel/files/plist-everything
@@ -10,7 +10,6 @@ smlnj/bin/nowhere
 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/eXene.cm/.cm/%%MLARCH%%-unix/eXene.cm
 smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/match-compiler.cm
 smlnj/lib/mlrisc-tools/.cm/%%MLARCH%%-unix/parser.cm
@@ -31,9 +30,6 @@ smlnj/lib/pgraph-util.cm/.cm/%%MLARCH%%-unix/pgraph-util.cm
 @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/mlrisc-tools/.cm/%%MLARCH%%-unix
 @dirrm smlnj/lib/mlrisc-tools/.cm
 @dirrm smlnj/lib/mlrisc-tools