diff options
author | Joseph Koshy <jkoshy@FreeBSD.org> | 2005-06-02 08:08:41 +0000 |
---|---|---|
committer | Joseph Koshy <jkoshy@FreeBSD.org> | 2005-06-02 08:08:41 +0000 |
commit | a7af751bf2f7d9015d66f7837128732868572742 (patch) | |
tree | b3dd164787ea8f57238fcdda6288b49ae2c04fc4 /lang/sml-nj-devel | |
parent | Upgrade to verison 1.2, which doesn't crash if you click on a mailbox (diff) |
Update to v110.54.
Submitted by: Johannes 5 Joemann <joemann@beefree.free.de>
Notes
Notes:
svn path=/head/; revision=136660
Diffstat (limited to 'lang/sml-nj-devel')
-rw-r--r-- | lang/sml-nj-devel/Makefile | 14 | ||||
-rw-r--r-- | lang/sml-nj-devel/distinfo | 70 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-config::_arch-n-opsys | 12 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-config::install.sh | 42 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-config_allsources | 7 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/patch-config_unpack | 12 | ||||
-rw-r--r-- | lang/sml-nj-devel/files/plist-everything | 4 | ||||
-rw-r--r-- | lang/sml-nj-devel/pkg-plist | 5 |
8 files changed, 91 insertions, 75 deletions
diff --git a/lang/sml-nj-devel/Makefile b/lang/sml-nj-devel/Makefile index 399c2d2c63b8..d94ee9f6317c 100644 --- a/lang/sml-nj-devel/Makefile +++ b/lang/sml-nj-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= smlnj -PORTVERSION= 110.52 +PORTVERSION= 110.54 CATEGORIES= lang MASTER_SITES= http://smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ \ ftp://mirror.free.de/http/smlnj.cs.uchicago.edu/dist/working/${PORTVERSION}/ @@ -17,12 +17,12 @@ DISTFILES+= boot.x86-unix.tgz #.elif (${ARCH} == "alpha") #DISTFILES+= boot.alpha32-unix.tgz .endif -DISTFILES+= ml-yacc.tgz ml-lex.tgz smlnj-lib.tgz cml.tgz MLRISC.tgz +DISTFILES+= ml-yacc.tgz ml-lex.tgz smlnj-lib.tgz cml.tgz MLRISC.tgz ckit.tgz .if defined(WITH_EVERYTHING) || defined(WITH_RECOMPILE) DISTFILES+= ml-burg.tgz \ - ckit.tgz ml-nlffi-lib.tgz ml-nlffigen.tgz smlnj-c.tgz \ + ml-nlffi-lib.tgz ml-nlffigen.tgz smlnj-c.tgz \ eXene.tgz \ - cm.tgz compiler.tgz system.tgz + cm.tgz compiler.tgz system.tgz tools.tgz .endif EXTRACT_ONLY= config.tgz @@ -105,7 +105,8 @@ do-configure: # removing targets.customized. See "do-build" below. .if defined(WITH_RECOMPILE) ( ${ECHO_CMD} "request ml-yacc" && \ - ${ECHO_CMD} "request ml-lex" ) \ + ${ECHO_CMD} "request ml-lex" && \ + ${ECHO_CMD} "request src-smlnj" ) \ > "${WRKDIR}/config/targets.customized" .endif .endif @@ -131,12 +132,10 @@ MLRUNTIMEPATCHES!= cd ${FILESDIR} && \ ( ${LS} do-patch-src::runtime::* 2> ${AUXDEVNULL} || \ ${TRUE} ) .if defined(WITH_EVERYTHING) -MLSOURCEUNPACKTARGETS= cm compiler mlrisc smlnj-lib system MLSOURCEPATCHES!= cd ${FILESDIR} && \ ( ${LS} do-patch-src::* 2> ${AUXDEVNULL} || \ ${TRUE} ) .else -MLSOURCEUNPACKTARGETS= MLSOURCEPATCHES= .endif @@ -144,7 +143,6 @@ do-build: cd ${WRKDIR} && unset PWD && \ FILESDIR="${FILESDIR}" PATCH="${PATCH}" PATCH_ARGS="${PATCH_ARGS}" \ MLNORUNTIMECLEAN=yes \ - MLSOURCEUNPACKTARGETS="${MLSOURCEUNPACKTARGETS}" \ MLRUNTIMEPATCHES="${MLRUNTIMEPATCHES}" \ MLSOURCEPATCHES="${MLSOURCEPATCHES}" ./config/install.sh .if defined(WITH_RECOMPILE) diff --git a/lang/sml-nj-devel/distinfo b/lang/sml-nj-devel/distinfo index 736646aaed34..b833914f1d24 100644 --- a/lang/sml-nj-devel/distinfo +++ b/lang/sml-nj-devel/distinfo @@ -1,34 +1,36 @@ -MD5 (sml-nj/110.52/MLRISC.tgz) = 6adf1991b60f0c3f1f1733b9051a16ef -SIZE (sml-nj/110.52/MLRISC.tgz) = 1226048 -MD5 (sml-nj/110.52/boot.x86-unix.tgz) = 1f48da28eac0b7f0926c71ef75fbaf6e -SIZE (sml-nj/110.52/boot.x86-unix.tgz) = 5396111 -MD5 (sml-nj/110.52/ckit.tgz) = d0c75ee35422333155856b577b87ec91 -SIZE (sml-nj/110.52/ckit.tgz) = 168202 -MD5 (sml-nj/110.52/cm.tgz) = ca0079c52cd8c9fdccfe5564550a27eb -SIZE (sml-nj/110.52/cm.tgz) = 206130 -MD5 (sml-nj/110.52/cml.tgz) = 92231d1464e69c5c96915af70270ca00 -SIZE (sml-nj/110.52/cml.tgz) = 103772 -MD5 (sml-nj/110.52/compiler.tgz) = 6a31f2e1ce4f679778b8988cd5850b4f -SIZE (sml-nj/110.52/compiler.tgz) = 734087 -MD5 (sml-nj/110.52/config.tgz) = 95fc1334f160dea6d26b7f0794214896 -SIZE (sml-nj/110.52/config.tgz) = 13471 -MD5 (sml-nj/110.52/eXene.tgz) = f0a94cb8b8dd4dc66d980c10a5a7fd5b -SIZE (sml-nj/110.52/eXene.tgz) = 695316 -MD5 (sml-nj/110.52/ml-burg.tgz) = 52a8a3597e7640248d3f3d3e9ac7d9b2 -SIZE (sml-nj/110.52/ml-burg.tgz) = 31560 -MD5 (sml-nj/110.52/ml-lex.tgz) = 901e3f69defbcc0007691c9d1ceab681 -SIZE (sml-nj/110.52/ml-lex.tgz) = 32391 -MD5 (sml-nj/110.52/ml-nlffi-lib.tgz) = a5273804f900a1e4030360fc9ddf4411 -SIZE (sml-nj/110.52/ml-nlffi-lib.tgz) = 42637 -MD5 (sml-nj/110.52/ml-nlffigen.tgz) = 023509ba46833c6b52184f2590d32ff3 -SIZE (sml-nj/110.52/ml-nlffigen.tgz) = 29419 -MD5 (sml-nj/110.52/ml-yacc.tgz) = 06c3c7b10db4bde721cf6a6be5d4795c -SIZE (sml-nj/110.52/ml-yacc.tgz) = 95073 -MD5 (sml-nj/110.52/runtime.tgz) = 759c2233e125902bb912beec95677edd -SIZE (sml-nj/110.52/runtime.tgz) = 323791 -MD5 (sml-nj/110.52/smlnj-c.tgz) = 10f19c4f41134f974397cd90fae66d99 -SIZE (sml-nj/110.52/smlnj-c.tgz) = 10538 -MD5 (sml-nj/110.52/smlnj-lib.tgz) = cd94ffb77bb6a409b58bf74a5388b9a0 -SIZE (sml-nj/110.52/smlnj-lib.tgz) = 223963 -MD5 (sml-nj/110.52/system.tgz) = f758d8b8f11f4123db43c496451541cf -SIZE (sml-nj/110.52/system.tgz) = 218121 +MD5 (sml-nj/110.54/MLRISC.tgz) = 76b059befa77cf5b17b8a31b0998cf11 +SIZE (sml-nj/110.54/MLRISC.tgz) = 1226182 +MD5 (sml-nj/110.54/boot.x86-unix.tgz) = e85a3bc17bfacadeecd655c30297072e +SIZE (sml-nj/110.54/boot.x86-unix.tgz) = 5414260 +MD5 (sml-nj/110.54/ckit.tgz) = f24209a140a4eaeec7cc8610aebe52fc +SIZE (sml-nj/110.54/ckit.tgz) = 168161 +MD5 (sml-nj/110.54/cm.tgz) = b67415228b7c7c32cd4f312d3d054d81 +SIZE (sml-nj/110.54/cm.tgz) = 206167 +MD5 (sml-nj/110.54/cml.tgz) = 270cadf6bd7e2d8982f35aa2b604f609 +SIZE (sml-nj/110.54/cml.tgz) = 104098 +MD5 (sml-nj/110.54/compiler.tgz) = 70c1d9c8f3c3da6b925265a40eb040e6 +SIZE (sml-nj/110.54/compiler.tgz) = 736638 +MD5 (sml-nj/110.54/config.tgz) = 738d5704fab95306eef77ef80ebe62ff +SIZE (sml-nj/110.54/config.tgz) = 14335 +MD5 (sml-nj/110.54/eXene.tgz) = 75c6ca41681854ef602728cb0ad4eed6 +SIZE (sml-nj/110.54/eXene.tgz) = 695218 +MD5 (sml-nj/110.54/ml-burg.tgz) = 78900547fc70f2a9c0c7b412a526f6b7 +SIZE (sml-nj/110.54/ml-burg.tgz) = 31550 +MD5 (sml-nj/110.54/ml-lex.tgz) = 416c039fa775cfd734eaca36028893df +SIZE (sml-nj/110.54/ml-lex.tgz) = 32384 +MD5 (sml-nj/110.54/ml-nlffi-lib.tgz) = 8a181d18daa2e6302cc3f74fdff7f05e +SIZE (sml-nj/110.54/ml-nlffi-lib.tgz) = 44214 +MD5 (sml-nj/110.54/ml-nlffigen.tgz) = 10a13239ef4ccc36fbc1c5e60f5c6255 +SIZE (sml-nj/110.54/ml-nlffigen.tgz) = 29495 +MD5 (sml-nj/110.54/ml-yacc.tgz) = 22d9c3b25ff5b6c460ecb4121284bf11 +SIZE (sml-nj/110.54/ml-yacc.tgz) = 94941 +MD5 (sml-nj/110.54/runtime.tgz) = e2e307e84d05d024f94fb6d7f36460b8 +SIZE (sml-nj/110.54/runtime.tgz) = 313373 +MD5 (sml-nj/110.54/smlnj-c.tgz) = df27f8316e6fb906eaf0b0d45708a16d +SIZE (sml-nj/110.54/smlnj-c.tgz) = 10535 +MD5 (sml-nj/110.54/smlnj-lib.tgz) = 2501128af31dd3765185f5373ba3fe31 +SIZE (sml-nj/110.54/smlnj-lib.tgz) = 220809 +MD5 (sml-nj/110.54/system.tgz) = 1af45e2ceac5072db50dad085447a5aa +SIZE (sml-nj/110.54/system.tgz) = 218726 +MD5 (sml-nj/110.54/tools.tgz) = 5afb8bc43de838d2268271f395da7001 +SIZE (sml-nj/110.54/tools.tgz) = 3854 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 1daf1a7f4070..36dd80841a37 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 fac94fbc3734..9e8a5b0cae3b 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 000000000000..0445636cfda5 --- /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 000000000000..5da9469a6eaa --- /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 11e1c4b06765..619aac327668 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 diff --git a/lang/sml-nj-devel/pkg-plist b/lang/sml-nj-devel/pkg-plist index 4989bb7b015b..507b6d407346 100644 --- a/lang/sml-nj-devel/pkg-plist +++ b/lang/sml-nj-devel/pkg-plist @@ -10,6 +10,7 @@ smlnj/bin/.heap/sml.%%MLARCH%%-bsd smlnj/bin/.link-sml smlnj/bin/.run/run.%%MLARCH%%-freebsd smlnj/bin/.run-sml +smlnj/bin/heap2exec smlnj/bin/ml-build smlnj/bin/ml-lex smlnj/bin/ml-makedepend @@ -31,6 +32,7 @@ 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 smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml-internal.cm smlnj/lib/cml/.cm/%%MLARCH%%-unix/cml.cm @@ -129,6 +131,9 @@ smlnj/lib/unix-lib.cm/.cm/%%MLARCH%%-unix/unix-lib.cm @dirrm smlnj/lib/burg-ext.cm/.cm/%%MLARCH%%-unix @dirrm smlnj/lib/burg-ext.cm/.cm @dirrm smlnj/lib/burg-ext.cm +@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/cml/.cm/%%MLARCH%%-unix @dirrm smlnj/lib/cml/.cm @dirrm smlnj/lib/cml |