Updated lang/polyml to 5.8.1.

Changes since last version: an option to create a version that supports
32-bit values for the X86/64 platform with a heap size of up to 16Gb.

Otherwise, minor bugfixes and changes.

The package has also been updated to remove some superfluous patches that
have been moved upstream and fix a build problem reported in PR pkg/55569

6 files changed, 20 insertions, 49 deletions

diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index 16fc76ae2d9..657a98464a7 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2020/08/14 00:47:10 dholland Exp $
+# $NetBSD: Makefile,v 1.25 2021/03/05 09:19:58 jaapb Exp $
 
-DISTNAME=	polyml-5.7.1
-PKGREVISION=	1
+DISTNAME=	polyml-5.8.1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=polyml/}
 GITHUB_PROJECT=	polyml
diff --git a/lang/polyml/buildlink3.mk b/lang/polyml/buildlink3.mk
index cf9076c2220..f5f6354ffbd 100644
--- a/lang/polyml/buildlink3.mk
+++ b/lang/polyml/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.1 2019/06/12 19:32:44 alnsn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/03/05 09:19:58 jaapb Exp $
 
 BUILDLINK_TREE+=	polyml
 
 .if !defined(POLYML_BUILDLINK3_MK)
 POLYML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.polyml+=	polyml>=5.7.1
-BUILDLINK_ABI_DEPENDS.polyml+=	polyml>=5.7.1
+BUILDLINK_API_DEPENDS.polyml+=	polyml>=5.8.1
+BUILDLINK_ABI_DEPENDS.polyml+=	polyml>=5.8.1
 BUILDLINK_PKGSRCDIR.polyml?=	../../lang/polyml
 .endif	# POLYML_BUILDLINK3_MK
 
diff --git a/lang/polyml/distinfo b/lang/polyml/distinfo
index 188f1aa3b4f..c4571fda3a1 100644
--- a/lang/polyml/distinfo
+++ b/lang/polyml/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.16 2020/08/14 00:43:24 dholland Exp $
+$NetBSD: distinfo,v 1.17 2021/03/05 09:19:58 jaapb Exp $
 
-SHA1 (polyml-5.7.1.tar.gz) = 454d3827263f514004a2465a2db0cd64ebe6e561
-RMD160 (polyml-5.7.1.tar.gz) = cc0061f191783c4749ef08fee33db4c3a2a269c6
-SHA512 (polyml-5.7.1.tar.gz) = 0b597f2fc9a68b764d4621e4e6b9c69083181bdfae66f53d0033bfc9661b9c42d252a42a72123245e8a55176a673d5343d6dd7936ae806d330b5e2b81f35e4d6
-Size (polyml-5.7.1.tar.gz) = 7218131 bytes
-SHA1 (patch-Makefile.in) = 7108e0f18af8cfa55d1914419e1707084c9b9683
+SHA1 (polyml-5.8.1.tar.gz) = 9050a484169d130bae09ebf9da78ce94f54e8de1
+RMD160 (polyml-5.8.1.tar.gz) = 83b59aee68eb59f07dd34229582581b273a08720
+SHA512 (polyml-5.8.1.tar.gz) = 8701c27a4a84b00529b8ae30ce340a46f45eb12d74a94ff5c5663bbbe79f5723039b96298190ba23bcbde11a26fb2b364d9452f45fdb19576a596e364812416f
+Size (polyml-5.8.1.tar.gz) = 9845209 bytes
+SHA1 (patch-Makefile.in) = a6983b6f30ae674c2139c9eb5be1f4aa0b2a6625
 SHA1 (patch-configure) = 3df85bb0adac4bfd68fffa32c41944f21eaf8c40
 SHA1 (patch-configure.ac) = 63817ba1fd42bae03da67f74b5b97dda32b02118
 SHA1 (patch-libpolyml_elfexport.cpp) = 3dfde6483eca0778504265a8e92cad8ef86d72d3
-SHA1 (patch-libpolyml_polyffi.cpp) = 2a0ae4ce0e0d1238e79c629b27d4fc4e5363e1c7
-SHA1 (patch-modules_IntInfAsInt_Makefile.in) = f29e43ce8b832abdef73dce1d50a3b3e4db821ba
diff --git a/lang/polyml/patches/patch-Makefile.in b/lang/polyml/patches/patch-Makefile.in
index ede8cca3270..0aa92956120 100644
--- a/lang/polyml/patches/patch-Makefile.in
+++ b/lang/polyml/patches/patch-Makefile.in
@@ -1,15 +1,18 @@
-$NetBSD: patch-Makefile.in,v 1.1 2020/08/14 00:43:24 dholland Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2021/03/05 09:19:58 jaapb Exp $
 
-It's not enough to disable ASLR on the output executable. You also
-need to disable it on the thing that gets run during the build.
-
---- Makefile.in~	2017-11-18 13:45:15.000000000 +0000
+--- Makefile.in.orig	2020-07-17 08:44:22.000000000 +0000
 +++ Makefile.in
-@@ -579,6 +579,7 @@ poly$(EXEEXT): $(poly_OBJECTS) $(poly_DE
+@@ -592,10 +592,13 @@ clean-binPROGRAMS:
+ poly$(EXEEXT): $(poly_OBJECTS) $(poly_DEPENDENCIES) $(EXTRA_poly_DEPENDENCIES) 
+ 	@rm -f poly$(EXEEXT)
+ 	$(AM_V_CCLD)$(poly_LINK) $(poly_OBJECTS) $(poly_LDADD) $(LIBS)
++	paxctl +am .libs/poly$(EXEEXT) || true
+ 
  polyimport$(EXEEXT): $(polyimport_OBJECTS) $(polyimport_DEPENDENCIES) $(EXTRA_polyimport_DEPENDENCIES) 
  	@rm -f polyimport$(EXEEXT)
  	$(AM_V_CCLD)$(polyimport_LINK) $(polyimport_OBJECTS) $(polyimport_LDADD) $(LIBS)
 +	paxctl +am .libs/polyimport$(EXEEXT) || true
++
  install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
  	@list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
diff --git a/lang/polyml/patches/patch-libpolyml_polyffi.cpp b/lang/polyml/patches/patch-libpolyml_polyffi.cpp
deleted file mode 100644
index d5bb8dd4e2c..00000000000
--- a/lang/polyml/patches/patch-libpolyml_polyffi.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-libpolyml_polyffi.cpp,v 1.1 2020/08/13 23:49:20 dholland Exp $
-
-Fix build failure on amd64 with current libffi.
-
---- libpolyml/polyffi.cpp~	2017-11-18 13:45:15.000000000 +0000
-+++ libpolyml/polyffi.cpp
-@@ -109,7 +109,9 @@ static struct _abiTable { const char *ab
- #elif defined(X86_WIN64)
-     {"win64", FFI_WIN64},
- #elif defined(X86_ANY)
-+#if !defined(X86_64)
-     {"sysv", FFI_SYSV},
-+#endif
-     {"unix64", FFI_UNIX64},
- #endif
-     { "default", FFI_DEFAULT_ABI}
diff --git a/lang/polyml/patches/patch-modules_IntInfAsInt_Makefile.in b/lang/polyml/patches/patch-modules_IntInfAsInt_Makefile.in
deleted file mode 100644
index d33ad8c4094..00000000000
--- a/lang/polyml/patches/patch-modules_IntInfAsInt_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-modules_IntInfAsInt_Makefile.in,v 1.1 2017/09/15 23:51:05 asau Exp $
-
---- modules/IntInfAsInt/Makefile.in.orig	2017-03-22 17:51:06.000000000 +0000
-+++ modules/IntInfAsInt/Makefile.in
-@@ -452,7 +452,7 @@ clean-local:
- 
- install-exec-local:
- 	$(mkdir_p) $(DESTDIR)$(moduledir)
--	$(INSTALL_PROGRAM) IntInfAsInt $(DESTDIR)$(moduledir)
-+	$(INSTALL_DATA) IntInfAsInt $(DESTDIR)$(moduledir)
- 
- uninstall-local:
- 	-rm -f $(DESTDIR)$(moduledir)/IntInfAsInt