Force the use of a C++ compiler to compile C++ source files in a more clean

manner, from feedback in PR 23252.

4 files changed, 38 insertions, 26 deletions

diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 66772632a7b..28fddb1215a 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2003/10/30 15:43:07 agc Exp $
+$NetBSD: distinfo,v 1.6 2003/12/01 16:35:51 ben Exp $
 
 SHA1 (fltk-1.0.11-source.tar.bz2) = daf8593ca6d794ac779cf8e0ec43dd5d275a39ad
 Size (fltk-1.0.11-source.tar.bz2) = 999099 bytes
 SHA1 (patch-aa) = f7da8bfeaf5918a60d42ed87da252ff6cbd0cec0
-SHA1 (patch-ab) = 0421ff36dc2df5977681bb4fcff56b5dbbb29a86
-SHA1 (patch-ac) = 6b6c0f6af35cc0f77a23adaab5a636e660e2ddac
+SHA1 (patch-ab) = 84510f2453d627fa5add785443e8ad0f5bfc794c
+SHA1 (patch-ac) = bc7139dfd49f162d2b7a2ff3d0b088b0cc619717
 SHA1 (patch-ad) = 3d20ba261a675f508a270ef7864626a74ba1a357
 SHA1 (patch-ae) = 4c020ba0ffd321a1d9c0b083698c53dd3e354e0a
-SHA1 (patch-af) = e712aee9aee92bc70b994036d7e7f9b27945b371
+SHA1 (patch-af) = f44d69eda82621e14c395ededfaa64ed3b1ac972
 SHA1 (patch-ag) = c03b860c9506c95f60947a0c08bec677f40d5cc6
 SHA1 (patch-ah) = 0514008f3c66fe8e5533ff01d12d0063b885fc25
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index cd21b23c605..5e8a22b3377 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2001/05/26 06:37:46 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2003/12/01 16:35:51 ben Exp $
 
---- configure.in.orig	Mon May  7 10:34:22 2001
+--- configure.in.orig	2001-05-07 07:34:22.000000000 -0700
 +++ configure.in
-@@ -30,6 +30,9 @@
+@@ -30,6 +30,9 @@ AC_INIT(src/Fl.cxx)
  AC_PROG_RANLIB
  
  LIBNAME="libfltk.a"
@@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.6 2001/05/26 06:37:46 jlam Exp $
  if test "$RANLIB" != ":"; then
    LIBCOMMAND="ar cr"
  else
-@@ -58,8 +61,17 @@
+@@ -58,8 +61,17 @@ AC_ARG_ENABLE(debug, [  --enable-debug  
    DEBUGFLAG="-g "
  fi])
  AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [default=yes]])
@@ -32,7 +32,7 @@ $NetBSD: patch-ab,v 1.6 2001/05/26 06:37:46 jlam Exp $
    PICFLAG=1
    case $uname in
        SunOS* | UNIX_S*)
-@@ -95,7 +107,14 @@
+@@ -95,7 +107,14 @@ if eval "test x$enable_shared = xyes"; t
            DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
  	  ;;
    esac
@@ -48,7 +48,16 @@ $NetBSD: patch-ab,v 1.6 2001/05/26 06:37:46 jlam Exp $
  
  AC_PROG_CC
  AC_PROG_CXX
-@@ -375,7 +394,11 @@
+@@ -262,7 +281,7 @@ MAKEDEPEND="\$(CXX) -M"
+ if test -n "$GXX"; then
+     # Use gcc instead of c++ or g++, since we don't need the C++
+     # library to depend on...
+-    CXX="$CC"
++#    CXX="$CC"
+     CFLAGS="-Wall $CFLAGS"
+     CXXFLAGS="-Wall $CXXFLAGS"
+     if test -z "$DEBUGFLAG"; then
+@@ -375,7 +394,11 @@ CXXFLAGS="$DEBUGFLAG $CXXFLAGS"
  AC_SUBST(DSONAME)
  AC_SUBST(DSOCOMMAND)
  AC_SUBST(LIBNAME)
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
index 2722dfa0f6a..366f63df832 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2003/12/01 16:35:51 ben Exp $
 
---- configure.orig	Mon May  7 10:53:14 2001
+--- configure.orig	2001-05-07 07:53:14.000000000 -0700
 +++ configure
-@@ -18,6 +18,9 @@
+@@ -18,6 +18,9 @@ ac_help="$ac_help
  ac_help="$ac_help
    --enable-shared         turn on shared libraries [default=no]"
  ac_help="$ac_help
@@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $
    --with-x                use the X Window System"
  
  # Initialize some variables set by options.
-@@ -562,6 +565,9 @@
+@@ -562,6 +565,9 @@ fi
  
  
  LIBNAME="libfltk.a"
@@ -22,7 +22,7 @@ $NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $
  if test "$RANLIB" != ":"; then
    LIBCOMMAND="ar cr"
  else
-@@ -600,8 +606,23 @@
+@@ -600,8 +606,23 @@ fi
  # Check whether --enable-shared or --disable-shared was given.
  if test "${enable_shared+set}" = set; then
    enableval="$enable_shared"
@@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $
    PICFLAG=1
    case $uname in
        SunOS* | UNIX_S*)
-@@ -638,13 +659,18 @@
+@@ -638,8 +659,13 @@ if eval "test x$enable_shared = xyes"; t
  	  ;;
    esac
  fi
@@ -62,13 +62,16 @@ $NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $
  
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:648: checking for $ac_word" >&5
-+echo "configure:674: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3220,6 +3246,10 @@
+@@ -3072,7 +3098,7 @@ MAKEDEPEND="\$(CXX) -M"
+ if test -n "$GXX"; then
+     # Use gcc instead of c++ or g++, since we don't need the C++
+     # library to depend on...
+-    CXX="$CC"
++#    CXX="$CC"
+     CFLAGS="-Wall $CFLAGS"
+     CXXFLAGS="-Wall $CXXFLAGS"
+     if test -z "$DEBUGFLAG"; then
+@@ -3220,6 +3246,10 @@ CXXFLAGS="$DEBUGFLAG $CXXFLAGS"
  
  
  
@@ -79,7 +82,7 @@ $NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $
  trap '' 1 2 15
  cat > confcache <<\EOF
  # This file is a shell script that caches the results of configure
-@@ -3369,7 +3399,11 @@
+@@ -3369,7 +3399,11 @@ s%@CAT3EXT@%$CAT3EXT%g
  s%@DSONAME@%$DSONAME%g
  s%@DSOCOMMAND@%$DSOCOMMAND%g
  s%@LIBNAME@%$LIBNAME%g
diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af
index a50920dfc8b..122f66f0ca6 100644
--- a/x11/fltk/patches/patch-af
+++ b/x11/fltk/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.3 2003/10/30 15:43:07 agc Exp $
+$NetBSD: patch-af,v 1.4 2003/12/01 16:35:51 ben Exp $
 
 --- makeinclude.in.orig	Sat Apr 14 07:11:43 2001
 +++ makeinclude.in
@@ -8,7 +8,7 @@ $NetBSD: patch-af,v 1.3 2003/10/30 15:43:07 agc Exp $
  # compiler names:
 -CXX		=@CXX@
 -CC		=@CC@
-+CXX		=$(LIBTOOL) c++
++CXX		=$(LIBTOOL) @CXX@
 +CC		=$(LIBTOOL) @CC@
  MAKEDEPEND	=@MAKEDEPEND@