Update to Poly/ML 5.6.

Changes include major improvements of FFI.

3 files changed, 10 insertions, 50 deletions

diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index ebccc7a6c51..cddcc55ade1 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2014/09/29 00:55:00 asau Exp $
+# $NetBSD: Makefile,v 1.15 2016/03/01 19:50:10 asau Exp $
 
-DISTNAME=	polyml.5.5.2
-PKGNAME=	polyml-5.5.2
-PKGREVISION=	3
+DISTNAME=	polyml.5.6
+PKGNAME=	polyml-5.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=polyml/}
 
@@ -12,6 +11,8 @@ COMMENT=	Poly/ML is an implementation of Standard ML
 
 # ONLY_FOR_PLATFORM=	*-*-i386 *-*-x86_64 *-*-sparc *-*-powerpc
 
+WRKSRC=		$(WRKDIR)/$(PKGNAME_NOREV)
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-system-libffi
 USE_LIBTOOL=	yes
@@ -20,18 +21,6 @@ TEST_TARGET=	tests
 
 PKGCONFIG_OVERRIDE=	libpolyml/polyml.pc.in
 
-SUBST_CLASSES+=		rpath
-SUBST_SED.rpath=	-e s';-L@libdir@;-L@libdir@ ${COMPILER_RPATH_FLAG}@libdir@;g'
-SUBST_FILES.rpath=	libpolyml/polyml.pc.in
-SUBST_STAGE.rpath=	pre-configure
-SUBST_MESSAGE.rpath=	Adding RPATH flag to pkg-config file.
-
-SUBST_CLASSES+=		compiler-rpath
-SUBST_SED.compiler-rpath=	-e s';@COMPILER_RPATH_FLAG@;${COMPILER_RPATH_FLAG};g'
-SUBST_FILES.compiler-rpath=	polyc.in
-SUBST_STAGE.compiler-rpath=	pre-configure
-SUBST_MESSAGE.compiler-rpath=	Adding RPATH flag to compiler wrapper.
-
 .include "options.mk"
 
 .include "../../devel/libffi/buildlink3.mk"
diff --git a/lang/polyml/distinfo b/lang/polyml/distinfo
index 2dc9a8957fe..5bbd24e3918 100644
--- a/lang/polyml/distinfo
+++ b/lang/polyml/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.11 2015/12/29 23:34:54 dholland Exp $
+$NetBSD: distinfo,v 1.12 2016/03/01 19:50:10 asau Exp $
 
-SHA1 (polyml.5.5.2.tar.gz) = 8926046162c073d01c1b3bcfc744c63adfafc0d2
-RMD160 (polyml.5.5.2.tar.gz) = 3f345e665fb880d02a086179f31944c04f5df79b
-SHA512 (polyml.5.5.2.tar.gz) = 248c2a38c4691898bc1243a041f4683bf227d9c8a98c6c3545af2a8a3249ed5ed96f33f90cb2dede8809b42f33c0557650147302cfe046a5fba965ccd93cbc5b
-Size (polyml.5.5.2.tar.gz) = 5599140 bytes
+SHA1 (polyml.5.6.tar.gz) = e7d6b774156f7d02c16b57cede70042c15853d4c
+RMD160 (polyml.5.6.tar.gz) = 12daec948db8dc4a45197d4c713545726b5b9858
+SHA512 (polyml.5.6.tar.gz) = cd4f25c225831dec512f7136dfda4ba31abd6939d9e8e0cacdb6d48212488b56ba5969c76e76fcbfcfa83d015a67d9cf62457286086f3c2b3f7914a7939d7b59
+Size (polyml.5.6.tar.gz) = 6066166 bytes
 SHA1 (patch-configure) = 3df85bb0adac4bfd68fffa32c41944f21eaf8c40
 SHA1 (patch-configure.ac) = 63817ba1fd42bae03da67f74b5b97dda32b02118
 SHA1 (patch-libpolyml_elfexport.cpp) = 3dfde6483eca0778504265a8e92cad8ef86d72d3
-SHA1 (patch-polyc.in) = 03b928b657c56a433aa5a438f3cb835ca912f265
diff --git a/lang/polyml/patches/patch-polyc.in b/lang/polyml/patches/patch-polyc.in
deleted file mode 100644
index c00f7a24a33..00000000000
--- a/lang/polyml/patches/patch-polyc.in
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-polyc.in,v 1.3 2015/12/29 23:34:54 dholland Exp $
-
-Programs with C++ code need to link with the C++ compiler.
-Use and honor COMPILER_RPATH_FLAG.
-
---- polyc.in.orig	2014-05-11 11:16:37.000000000 +0000
-+++ polyc.in
-@@ -2,7 +2,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- BINDIR=@bindir@
--LINK=@CC@
-+LINK=@CXX@
- LIBDIR=@libdir@
- LIBS="@LIBS@ @FFI_LIBS@"
- CFLAGS="@CFLAGS@"
-@@ -34,9 +34,9 @@ link()
- {
-     if [ X"$2" = "X" ]
-     then
--        ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -L${LIBDIR} -lpolymain -lpolyml ${LIBS}
-+        ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS}
-     else
--        ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -o $2 -L${LIBDIR} -lpolymain -lpolyml ${LIBS}
-+        ${LINK} ${EXTRALDFLAGS} ${CFLAGS} $1 -o $2 -L${LIBDIR} @COMPILER_RPATH_FLAG@${LIBDIR} -lpolymain -lpolyml ${LIBS}
-     fi
- }
-