Fixed HOMEPAGE/SRC_URI. Added patch provided from upstream to fix: 'may crash on 64 bit architectures as well as on those 32 bit architectures that use glibc 2.7'. Thanks Michael Helmling for reporting, bug #154859

Package-Manager: portage-2.1.4.4

4 files changed, 74 insertions, 3 deletions

diff --git a/dev-lang/mosml/ChangeLog b/dev-lang/mosml/ChangeLog
index f2dd025ffe14..29ef4cf1b151 100644
--- a/dev-lang/mosml/ChangeLog
+++ b/dev-lang/mosml/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-lang/mosml
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.8 2007/03/19 00:04:10 kloeri Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/ChangeLog,v 1.9 2008/06/06 01:26:53 darkside Exp $
+
+*mosml-2.01-r1 (06 Jun 2008)
+
+  06 Jun 2008; Jeremy Olexa <darkside@gentoo.org>
+  +files/mosml-2.01-malloc.patch, +mosml-2.01-r1.ebuild:
+  Fixed HOMEPAGE/SRC_URI. Added patch provided from upstream to fix: 'may
+  crash on 64 bit architectures as well as on those 32 bit architectures that
+  use glibc 2.7'. Thanks Michael Helmling for reporting, bug #154859
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove plasmaroo from metadata.xml due to retirement.
diff --git a/dev-lang/mosml/Manifest b/dev-lang/mosml/Manifest
index 5c8d91527ced..390e366279e3 100644
--- a/dev-lang/mosml/Manifest
+++ b/dev-lang/mosml/Manifest
@@ -1,4 +1,6 @@
+AUX mosml-2.01-malloc.patch 688 RMD160 61b3f87ad34235b0ddf502c38286b0bff1bad817 SHA1 706f795aa94668873d93a304014154e1f57c57d8 SHA256 b03324dd9a62ca564cf50cdf300b08c22d03a2b724832f1783a130dce787d823
 DIST mos201src.tar.gz 2314392 RMD160 b2a9582d8c0bfdad2b8a74740e54ab33d3856637 SHA1 eba58486b10f0359fafba488fa1bf366b2aabf8a SHA256 9ec5695358a4aa4702d856c026f3cf0bce77275e8d1318fd90d455a44c46edff
+EBUILD mosml-2.01-r1.ebuild 1214 RMD160 79570a7f838817b1bb8b34a1160c18872f5c91d7 SHA1 b00c4e4020d8aec05e446bf0addbf6f58e03aa1d SHA256 a86615621a50b4bf7dadc134e4cb1a3690da23bcc911112b16b6666252f33f9e
 EBUILD mosml-2.01.ebuild 1089 RMD160 8ab7f12f30490213f156f787ae25e558518d9af1 SHA1 2935c52fd537989224690070c6066e5558bb17d8 SHA256 8e1002c9c3c9ed8889cd01772b5fa39c8872302013ececc81f93c0ad70d6c857
-MISC ChangeLog 1157 RMD160 0e50be5a25a42d6831a77ae488e4e3e8893657aa SHA1 485b84fe1b63733451d5ad47c2979dcb21c031f6 SHA256 ec6abaca91441d3f660ee9bff0313abac62307828d82c9890fc03b1fa561553f
+MISC ChangeLog 1518 RMD160 6f1ff3141880ff4a78f4fff44d412ff2c19b2be6 SHA1 e3148813cec94a02ba42951844189ae2121690b5 SHA256 56f0e7a72a48b18a04252237ce4cef3e07388eefc709aaee550b03707bfff043
 MISC metadata.xml 233 RMD160 d81ec1a0582856aeac5ef3bfec5c80d9850216f6 SHA1 9b94f113e7f382076b1749c2a856e409c96cade3 SHA256 dce03f6cdd96135caf3c971a5ca4a8c916f44532fe8cfb6df88b7bdade407e8b
diff --git a/dev-lang/mosml/files/mosml-2.01-malloc.patch b/dev-lang/mosml/files/mosml-2.01-malloc.patch
new file mode 100644
index 000000000000..3fba15b4d0ab
--- /dev/null
+++ b/dev-lang/mosml/files/mosml-2.01-malloc.patch
@@ -0,0 +1,19 @@
+--- src/runtime/gc_ctrl.c.orig	2000-01-21 04:07:13.000000000 -0600
++++ src/runtime/gc_ctrl.c	2008-03-05 13:20:07.000000000 -0600
+@@ -1,3 +1,7 @@
++/* mosml/src/runtime/gc_ctrl.c
++   Updated 2008-03-05 to prevent malloc from using mmap() 
++*/
++#include <malloc.h>
+ #include "alloc.h"
+ #include "debugger.h"
+ #include "gc.h"
+@@ -191,6 +195,8 @@
+   gc_message ("*** camlrunm: debug mode ***\n", 0);
+ #endif
+   verb_gc = verb;
++  /* Added 2008-03-05 to prevent malloc from using mmap() */
++  mallopt(M_MMAP_MAX, 0);
+   set_minor_heap_size (Bsize_wsize (norm_minsize (minor_size)));
+   major_heap_increment = Bsize_wsize (norm_heapincr (major_incr));
+   percent_free = norm_pfree (percent_fr);
diff --git a/dev-lang/mosml/mosml-2.01-r1.ebuild b/dev-lang/mosml/mosml-2.01-r1.ebuild
new file mode 100644
index 000000000000..ecfb66ed4646
--- /dev/null
+++ b/dev-lang/mosml/mosml-2.01-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mosml/mosml-2.01-r1.ebuild,v 1.1 2008/06/06 01:26:53 darkside Exp $
+
+inherit eutils
+
+S="${WORKDIR}/${PN}/src"
+DESCRIPTION="Moscow ML - a lightweight implementation of Standard ML (SML)"
+SRC_URI="http://www.itu.dk/people/sestoft/mosml/mos201src.tar.gz"
+HOMEPAGE="http://www.itu.dk/people/sestoft/mosml.html"
+LICENSE="GPL-2"
+DEPEND=""
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-malloc.patch" #154859
+}
+
+src_compile() {
+	emake MOSMLHOME=/opt/mosml world || die
+}
+
+src_install () {
+
+	make MOSMLHOME="${D}"/opt/mosml install || die
+	rm "${D}"/opt/mosml/lib/camlrunm # This is a bad symlink
+	echo "#!/opt/mosml/bin/camlrunm" > "${D}"/opt/mosml/lib/header
+
+	dodoc  ../README
+	into   /usr/bin
+	dosym  /opt/mosml/bin/mosml     /usr/bin/mosml
+	dosym  /opt/mosml/bin/mosmlc    /usr/bin/mosmlc
+	dosym  /opt/mosml/bin/mosmllex  /usr/bin/mosmllex
+	dosym  /opt/mosml/bin/mosmlyac  /usr/bin/mosmlyac
+	dosym  /opt/mosml/bin/camlrunm  /usr/bin/camlrunm
+	dosym  /opt/mosml/bin/camlrunm  /opt/mosml/lib/camlrunm
+
+}