Update to Poly/ML 5.5.2

Most of the changes are bug fixes.  One major fix was to the
intermediate code optimiser reported back in September.
Other changes are the addition of PrettyStringWithWidth and
PrettyLineBreak constructors to the PolyML.pretty datatype,
Thread.Thread.numPhysicalProcessors to return the number of
physical processors and printing ?.t in circumstances where t is
bound to a different type.  The debugger has been extended to
include structures and the arguments to functors.

5 files changed, 15 insertions, 38 deletions

diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index 11ed463e995..15dbc2a65bb 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2014/03/05 22:14:17 asau Exp $
+# $NetBSD: Makefile,v 1.11 2014/09/13 18:23:38 asau Exp $
 
-DISTNAME=	polyml.5.5.1
-PKGNAME=	polyml-5.5.1
-PKGREVISION=	1
+DISTNAME=	polyml.5.5.2
+PKGNAME=	polyml-5.5.2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=polyml/}
 
@@ -18,12 +17,6 @@ USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
 TEST_TARGET=	tests
 
-SUBST_CLASSES+=			fix-rpath-flag
-SUBST_STAGE.fix-rpath-flag=	pre-configure
-SUBST_MESSAGE.fix-rpath-flag=	Fixing RPATH flag.
-SUBST_FILES.fix-rpath-flag=	buildpolyc
-SUBST_SED.fix-rpath-flag=	-e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g'
-
 .include "options.mk"
 
 .include "../../devel/libffi/buildlink3.mk"
diff --git a/lang/polyml/PLIST b/lang/polyml/PLIST
index bb85542212d..b554c6a56f3 100644
--- a/lang/polyml/PLIST
+++ b/lang/polyml/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2013/12/15 18:35:22 asau Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/09/13 18:23:38 asau Exp $
 bin/poly
 bin/polyc
 bin/polyimport
 lib/libpolymain.la
 lib/libpolyml.la
+lib/pkgconfig/polyml.pc
 man/man1/poly.1
 man/man1/polyc.1
 man/man1/polyimport.1
diff --git a/lang/polyml/distinfo b/lang/polyml/distinfo
index 781028ff5dc..b60c3536c81 100644
--- a/lang/polyml/distinfo
+++ b/lang/polyml/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2014/03/05 22:14:17 asau Exp $
+$NetBSD: distinfo,v 1.7 2014/09/13 18:23:38 asau Exp $
 
-SHA1 (polyml.5.5.1.tar.gz) = f5a0d289eb0a891af5ac6e897ccc7718ccf32d89
-RMD160 (polyml.5.5.1.tar.gz) = 504a9e8c064355bcee638a3735f7e97b3f92d03e
-Size (polyml.5.5.1.tar.gz) = 5465794 bytes
-SHA1 (patch-buildpolyc) = 43abf4c7a3545ec3b4de62a216009cc7728da848
-SHA1 (patch-libpolyml_elfexport.cpp) = 7291a7a1410651bee00662feb5f8d74337c14f3a
+SHA1 (polyml.5.5.2.tar.gz) = 8926046162c073d01c1b3bcfc744c63adfafc0d2
+RMD160 (polyml.5.5.2.tar.gz) = 3f345e665fb880d02a086179f31944c04f5df79b
+Size (polyml.5.5.2.tar.gz) = 5599140 bytes
+SHA1 (patch-libpolyml_elfexport.cpp) = ea2ac256feab994cca53cc5400a8a61e3563811c
diff --git a/lang/polyml/patches/patch-buildpolyc b/lang/polyml/patches/patch-buildpolyc
deleted file mode 100644
index f09d31c7c16..00000000000
--- a/lang/polyml/patches/patch-buildpolyc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-buildpolyc,v 1.2 2014/03/05 22:14:17 asau Exp $
-
---- buildpolyc.orig	2013-08-03 12:23:37.000000000 +0000
-+++ buildpolyc
-@@ -15,9 +15,9 @@ link()
- {
-     if [ X"$2" = "X" ]
-     then
--        ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} -lpolymain -lpolyml ${LIBS}
-+        ${LINK} ${EXTRALDFLAGS} $1 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS}
-     else
--        ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} -lpolymain -lpolyml ${LIBS}
-+        ${LINK} ${EXTRALDFLAGS} $1 -o $2 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS}
-     fi
- }
- 
diff --git a/lang/polyml/patches/patch-libpolyml_elfexport.cpp b/lang/polyml/patches/patch-libpolyml_elfexport.cpp
index 5172efb0930..e3775179c38 100644
--- a/lang/polyml/patches/patch-libpolyml_elfexport.cpp
+++ b/lang/polyml/patches/patch-libpolyml_elfexport.cpp
@@ -1,6 +1,6 @@
-$NetBSD: patch-libpolyml_elfexport.cpp,v 1.2 2013/12/15 18:35:23 asau Exp $
+$NetBSD: patch-libpolyml_elfexport.cpp,v 1.3 2014/09/13 18:23:38 asau Exp $
 
---- libpolyml/elfexport.cpp.orig	2013-06-11 11:13:52.000000000 +0000
+--- libpolyml/elfexport.cpp.orig	2013-10-15 16:25:39.000000000 +0000
 +++ libpolyml/elfexport.cpp
 @@ -65,6 +65,13 @@
  #ifdef HAVE_SYS_ELF_AMD64_H
@@ -13,6 +13,6 @@ $NetBSD: patch-libpolyml_elfexport.cpp,v 1.2 2013/12/15 18:35:23 asau Exp $
 +/* Missing definition taken from NetBSD: */
 +#define	R_386_PC32	2
 +#endif
- #ifdef HAVE_STRING_H
- #include <string.h>
- #endif
+ 
+ // Android has the ARM relocation symbol here
+ #ifdef HAVE_ASM_ELF_H