Instead of hardcoding 'gcc' as the c++ compiler (not g++ but gcc), use

AC_PROG_CXX to find a c++ compiler.  This fixes building with sunpro.
The result seems to run ok.  Patches submitted upstream.

6 files changed, 73 insertions, 3 deletions

diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index 0bce205f085..84ea91e4e9f 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2006/09/09 02:41:55 obache Exp $
+# $NetBSD: Makefile,v 1.43 2007/01/16 17:13:37 dmcmahill Exp $
 #
 
 DISTNAME=		qcad-2.0.5.0-1-community.src
@@ -12,7 +12,7 @@ PKGNAME=		qcad-2.0.5.0
 COMMENT=		2D CAD system
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		autoconf gmake
 USE_LANGUAGES=		c c++
 
 CONFIGURE_DIRS=		fparser dxflib
@@ -37,6 +37,10 @@ SUBST_FILES.paths+=	qcad/src/qc_applicationwindow.cpp
 SUBST_SED.paths=	-e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=	-e 's,@QTDIR@,${QTDIR},g'
 
+post-patch:
+	cd ${WRKSRC}/fparser && autoconf
+	cd ${WRKSRC}/dxflib && autoconf
+
 # Just setting BUILD_DIRS would be adequate if qcad could be built with
 # "prepare all" in each module, one by one.  But qcad needs all modules to
 # be prepare'd before any can be all'd, so prepare them here in a separate
diff --git a/cad/qcad/distinfo b/cad/qcad/distinfo
index 570434cdee0..854d9852901 100644
--- a/cad/qcad/distinfo
+++ b/cad/qcad/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2006/06/22 14:51:44 joerg Exp $
+$NetBSD: distinfo,v 1.17 2007/01/16 17:13:37 dmcmahill Exp $
 
 SHA1 (qcad-2.0.5.0-1-community.src.tar.gz) = aff563389d1285740f6bf7e28f93b8df0f902e0c
 RMD160 (qcad-2.0.5.0-1-community.src.tar.gz) = 85f0b6d3c1edaa0c19494436413521316e803429
@@ -6,3 +6,7 @@ Size (qcad-2.0.5.0-1-community.src.tar.gz) = 4470033 bytes
 SHA1 (patch-aa) = ca5744c2bc24735db1d671c797470d7a324d83ef
 SHA1 (patch-ab) = c72f33035d2d7b0aefd9b193028ef8a6df459d1a
 SHA1 (patch-ac) = 1ec6dc9f9fead0c1c5fd5576d91001e8ccbead56
+SHA1 (patch-ad) = 288dee3134e6a33260570d43840712964d21cc2b
+SHA1 (patch-ae) = a64cc70c6cf13b87ed1f95ebd1859f5f0319cf2f
+SHA1 (patch-af) = a7716a53b6c61624b5fc538582a701551d30a11d
+SHA1 (patch-ag) = bc9eebab94d5c2ab8dcc7896f0a092f4a21e88e5
diff --git a/cad/qcad/patches/patch-ad b/cad/qcad/patches/patch-ad
new file mode 100644
index 00000000000..f2a28af0f19
--- /dev/null
+++ b/cad/qcad/patches/patch-ad
@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.4 2007/01/16 17:13:37 dmcmahill Exp $
+
+Use a c++ compiler for c++ code instead of hardcoding gcc as a c++
+compiler.  Reported to ribbonsoft [2007-01-16 dmcmahill].
+
+--- fparser/Makefile.in.orig	2005-11-22 06:47:11.000000000 -0500
++++ fparser/Makefile.in
+@@ -25,7 +25,7 @@ INCDIR = $(DESTDIR)/$(PREFIX)/include/fp
+ SHELL = /bin/sh
+ 
+ CC           = @CC@
+-CXX          = gcc
++CXX          = @CXX@
+ CFLAGS       = -I./src @CFLAGS@ @DEFS@
+ INSTALL      = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
diff --git a/cad/qcad/patches/patch-ae b/cad/qcad/patches/patch-ae
new file mode 100644
index 00000000000..2fc567895ef
--- /dev/null
+++ b/cad/qcad/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.3 2007/01/16 17:13:37 dmcmahill Exp $
+
+Find a c++ compiler for c++ code instead of hardcoding gcc as a c++
+compiler.  Reported to ribbonsoft [2007-01-16 dmcmahill].
+
+--- fparser/configure.in.orig	2005-11-22 06:47:11.000000000 -0500
++++ fparser/configure.in
+@@ -21,6 +21,7 @@ esac
+ #
+ AC_PROG_CC
+ AC_PROG_CPP
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_CHECK_PROG(FIND, find, find, :)
+ AC_CHECK_PROG(MAKEDEPEND, makedepend, makedepend, :)
diff --git a/cad/qcad/patches/patch-af b/cad/qcad/patches/patch-af
new file mode 100644
index 00000000000..393153b1910
--- /dev/null
+++ b/cad/qcad/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.4 2007/01/16 17:13:37 dmcmahill Exp $
+
+Use a c++ compiler for c++ code instead of hardcoding gcc as a c++
+compiler.  Reported to ribbonsoft [2007-01-16 dmcmahill].
+
+--- dxflib/Makefile.in.orig	2005-11-22 06:46:56.000000000 -0500
++++ dxflib/Makefile.in
+@@ -26,7 +26,7 @@ INCDIR = @prefix@/include/dxflib
+ SHELL = /bin/sh
+ 
+ CC           = @CC@
+-CXX          = gcc
++CXX          = @CXX@
+ CFLAGS       = -I./src @CFLAGS@ @DEFS@
+ INSTALL      = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
diff --git a/cad/qcad/patches/patch-ag b/cad/qcad/patches/patch-ag
new file mode 100644
index 00000000000..da92fa008e1
--- /dev/null
+++ b/cad/qcad/patches/patch-ag
@@ -0,0 +1,15 @@
+$NetBSD: patch-ag,v 1.1 2007/01/16 17:13:37 dmcmahill Exp $
+
+Find a c++ compiler for c++ code instead of hardcoding gcc as a c++
+compiler.  Reported to ribbonsoft [2007-01-16 dmcmahill].
+
+--- dxflib/configure.in.orig	2005-11-22 06:46:56.000000000 -0500
++++ dxflib/configure.in
+@@ -21,6 +21,7 @@ esac
+ #
+ AC_PROG_CC
+ AC_PROG_CPP
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_CHECK_PROG(FIND, find, find, :)
+ AC_CHECK_PROG(MAKEDEPEND, makedepend, makedepend, :)