Use C++ frontend to link the code.

This makes the package build and function on FreeBSD 10 with Clang.

5 files changed, 66 insertions, 3 deletions

diff --git a/lang/polyml/Makefile b/lang/polyml/Makefile
index 34222ca3ef0..d5f0ba7c315 100644
--- a/lang/polyml/Makefile
+++ b/lang/polyml/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2014/09/23 15:13:23 asau Exp $
+# $NetBSD: Makefile,v 1.13 2014/09/24 09:47:41 asau Exp $
 
 DISTNAME=	polyml.5.5.2
 PKGNAME=	polyml-5.5.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=polyml/}
 
diff --git a/lang/polyml/distinfo b/lang/polyml/distinfo
index b60c3536c81..ff6682dd501 100644
--- a/lang/polyml/distinfo
+++ b/lang/polyml/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.7 2014/09/13 18:23:38 asau Exp $
+$NetBSD: distinfo,v 1.8 2014/09/24 09:47:41 asau Exp $
 
 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-configure) = b4445154d87f11296164cb3fb44d02f1e2fd5553
+SHA1 (patch-configure.ac) = 5754c03783c97ff9ccd09d4a35b743f169ed966f
 SHA1 (patch-libpolyml_elfexport.cpp) = ea2ac256feab994cca53cc5400a8a61e3563811c
+SHA1 (patch-polyc.in) = c3014946eb18f2aadea327d2501922f824aa4e1d
diff --git a/lang/polyml/patches/patch-configure b/lang/polyml/patches/patch-configure
new file mode 100644
index 00000000000..c31dbc26d4f
--- /dev/null
+++ b/lang/polyml/patches/patch-configure
@@ -0,0 +1,31 @@
+$NetBSD: patch-configure,v 1.1 2014/09/24 09:47:41 asau Exp $
+
+--- configure.orig	2014-05-09 10:11:45.000000000 +0000
++++ configure
+@@ -17107,7 +17107,7 @@ if test "x$ac_cv_lib_gcc_main" = xyes; t
+ #define HAVE_LIBGCC 1
+ _ACEOF
+ 
+-  LIBS="-lgcc $LIBS"
++#  LIBS="-lgcc $LIBS"
+ 
+ fi
+ 
+@@ -17146,7 +17146,7 @@ if test "x$ac_cv_lib_gcc_s_main" = xyes;
+ #define HAVE_LIBGCC_S 1
+ _ACEOF
+ 
+-  LIBS="-lgcc_s $LIBS"
++#  LIBS="-lgcc_s $LIBS"
+ 
+ fi
+ 
+@@ -17185,7 +17185,7 @@ if test "x$ac_cv_lib_stdcpp_main" = xyes
+ #define HAVE_LIBSTDC__ 1
+ _ACEOF
+ 
+-  LIBS="-lstdc++ $LIBS"
++#  LIBS="-lstdc++ $LIBS"
+ 
+ fi
+ 
diff --git a/lang/polyml/patches/patch-configure.ac b/lang/polyml/patches/patch-configure.ac
new file mode 100644
index 00000000000..42166a73cf3
--- /dev/null
+++ b/lang/polyml/patches/patch-configure.ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.ac,v 1.1 2014/09/24 09:47:41 asau Exp $
+
+--- configure.ac.orig	2014-05-09 10:05:32.000000000 +0000
++++ configure.ac
+@@ -94,11 +94,6 @@ AM_PROG_AS
+ # Activate large file mode if needed
+ AC_SYS_LARGEFILE
+ 
+-# Checks for libraries.
+-AC_CHECK_LIB(gcc, main)
+-AC_CHECK_LIB(gcc_s, main)
+-AC_CHECK_LIB(stdc++, main)
+-
+ # These can sometimes be in the standard libraries
+ AC_SEARCH_LIBS([dlopen], [dl dld])
+ AC_SEARCH_LIBS([floor], [m])
diff --git a/lang/polyml/patches/patch-polyc.in b/lang/polyml/patches/patch-polyc.in
new file mode 100644
index 00000000000..a13ec722b57
--- /dev/null
+++ b/lang/polyml/patches/patch-polyc.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-polyc.in,v 1.1 2014/09/24 09:47:41 asau Exp $
+
+--- 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@"