Just use the C++ compiler for linking.

3 files changed, 75 insertions, 7 deletions

diff --git a/x11/fltk2/distinfo b/x11/fltk2/distinfo
index 13a01b9f976..6558be9a352 100644
--- a/x11/fltk2/distinfo
+++ b/x11/fltk2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2013/02/17 15:03:01 prlw1 Exp $
+$NetBSD: distinfo,v 1.7 2013/04/30 22:31:52 joerg Exp $
 
 SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5
 RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f
 Size (fltk-2.0.x-r6129.tar.bz2) = 2593617 bytes
 SHA1 (patch-aa) = 344311614b787f1e7b42bde06f2eeee9dc9459e8
-SHA1 (patch-ab) = bf71acd8c34f2dedbe3e9ace6662db151dcf6240
-SHA1 (patch-ac) = 5fdd8cfe380b6eb2b25f62f809e256e5c0f5dede
+SHA1 (patch-ab) = 80d69520729a397d7b7f03d8ad9cd6a4b7759660
+SHA1 (patch-ac) = 0c745b7e6da652ca8a7827c1ba0cb80d3e3e7ce8
 SHA1 (patch-ad) = 21e2f9cb1406c989a83cac37a9ce39ee462f6088
 SHA1 (patch-ae) = 8711184bfcbc2882d115e06cb9716c37349b04c3
 SHA1 (patch-af) = ff5648e8c6b935bccb77a8afe09d247f3313c76a
diff --git a/x11/fltk2/patches/patch-ab b/x11/fltk2/patches/patch-ab
index 634427f0a07..02bde2244a8 100644
--- a/x11/fltk2/patches/patch-ab
+++ b/x11/fltk2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2013/04/30 22:31:52 joerg Exp $
 
---- configure.in.orig	2008-05-16 18:07:02.000000000 +0200
+--- configure.in.orig	2007-07-24 11:25:53.000000000 +0000
 +++ configure.in
 @@ -685,7 +685,7 @@ case $uname in
  
@@ -11,3 +11,35 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
  	  AC_CHECK_HEADER(X11/extensions/XShm.h, AC_DEFINE(USE_XSHM),,
  	    [#include <X11/Xlib.h>])
  	fi
+@@ -812,31 +812,6 @@ if test -n "$GCC"; then
+     # Previous versions of GCC do not have the reliance on the stdc++
+     # or g++ libraries, so the extra supc++ library is not needed.
+ 
+-    AC_MSG_CHECKING(if libsupc++ is required)
+-
+-    SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
+-    case "$SUPC" in
+-    	libsupc++.a*)
+-	    # Library not found, so this is and older GCC...
+-	    AC_MSG_RESULT(no)
+-	    ;;
+-	*)
+-            # This is gcc 3.x, and it knows of libsupc++, so we need it
+-	case "$uname" in
+-	    # do not add for Darwin as it is already linked with it
+-	    Darwin*)
+-	    ;;
+-	    *)
+-            LIBS="$LIBS -lsupc++"
+-            AC_MSG_RESULT(yes)
+-	    ;;
+-	esac
+-    esac
+-
+-    if test x$uname != xDarwin; then
+-        CXX="$CC"
+-    fi
+-
+     AC_ARG_ENABLE(exceptions, [  --enable-exceptions     turn on GCC exceptions (default=yes)])
+     if test x$enable_exceptions != xno; then
+         AC_DEFINE(HAVE_EXCEPTIONS)
diff --git a/x11/fltk2/patches/patch-ac b/x11/fltk2/patches/patch-ac
index 18bfd2db635..d0315faa5d1 100644
--- a/x11/fltk2/patches/patch-ac
+++ b/x11/fltk2/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2013/04/30 22:31:52 joerg Exp $
 
---- configure.orig	2008-05-16 18:07:17.000000000 +0200
+--- configure.orig	2008-05-16 08:01:24.000000000 +0000
 +++ configure
 @@ -11085,7 +11085,7 @@ if test "${enable_xshm+set}" = set; then
    enableval=$enable_xshm;
@@ -11,3 +11,39 @@ $NetBSD: patch-ac,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
  	  { echo "$as_me:$LINENO: checking for X11/extensions/XShm.h" >&5
  echo $ECHO_N "checking for X11/extensions/XShm.h... $ECHO_C" >&6; }
  if test "${ac_cv_header_X11_extensions_XShm_h+set}" = set; then
+@@ -11735,35 +11735,6 @@ if test -n "$GCC"; then
+     #
+     # Previous versions of GCC do not have the reliance on the stdc++
+     # or g++ libraries, so the extra supc++ library is not needed.
+-
+-    { echo "$as_me:$LINENO: checking if libsupc++ is required" >&5
+-echo $ECHO_N "checking if libsupc++ is required... $ECHO_C" >&6; }
+-
+-    SUPC="`$CXX -print-file-name=libsupc++.a 2>/dev/null`"
+-    case "$SUPC" in
+-    	libsupc++.a*)
+-	    # Library not found, so this is and older GCC...
+-	    { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-	    ;;
+-	*)
+-            # This is gcc 3.x, and it knows of libsupc++, so we need it
+-	case "$uname" in
+-	    # do not add for Darwin as it is already linked with it
+-	    Darwin*)
+-	    ;;
+-	    *)
+-            LIBS="$LIBS -lsupc++"
+-            { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-	    ;;
+-	esac
+-    esac
+-
+-    if test x$uname != xDarwin; then
+-        CXX="$CC"
+-    fi
+-
+     # Check whether --enable-exceptions was given.
+ if test "${enable_exceptions+set}" = set; then
+   enableval=$enable_exceptions;