Clean up CXXFLAGS. Fix compilation with gcc-4.1.x.

6 files changed, 68 insertions, 10 deletions

diff --git a/devel/ecos-tools/Makefile b/devel/ecos-tools/Makefile
index b1f7acd5cc2f..308226b32f04 100644
--- a/devel/ecos-tools/Makefile
+++ b/devel/ecos-tools/Makefile
@@ -16,9 +16,8 @@ DISTNAME=	ecos-tools.${SNAPDATE}
 MAINTAINER=	tg@FreeBSD.org
 COMMENT=	Configuration tools for the eCos embedded OS
 
-LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
-
 USE_BZIP2=	yes
+USE_TCL_BUILD=	yes
 USE_WX=		2.4
 WRKSRC=		${WRKDIR}/infra-build
 GNU_CONFIGURE=	yes
@@ -31,9 +30,11 @@ SNAPDATE=	20040125
 
 ECOSSRCDIR=	${WRKDIR}/ecos/host
 CFGTOOL_WRKSRC=	${WRKDIR}/configtool-build
-CFGTOOL_MAKE_ENV=	WX_CONFIG=${WX_CONFIG} \
-			ECOSSRCDIR=${ECOSSRCDIR} \
-			INSTALLDIR=${PREFIX}
+CFGTOOL_MAKE_ENV= ${MAKE_ENV} \
+		CXX=${CXX} \
+		WX_CONFIG=${WX_CONFIG} \
+		ECOSSRCDIR=${ECOSSRCDIR} \
+		INSTALLDIR=${PREFIX}
 CFGTOOL_MAKEFILE=	${ECOSSRCDIR}/tools/configtool/standalone/wxwin/makefile.gnu
 CFGTOOL_ALL_TARGET=
 
diff --git a/devel/ecos-tools/files/patch-host::libcdl::configure b/devel/ecos-tools/files/patch-host::libcdl::configure
index 5774cc3606bb..fcf14b0e3aa8 100644
--- a/devel/ecos-tools/files/patch-host::libcdl::configure
+++ b/devel/ecos-tools/files/patch-host::libcdl::configure
@@ -1,7 +1,16 @@
 $FreeBSD$
 
---- ../ecos/host/libcdl/configure~	Wed Feb 12 18:22:31 2003
-+++ ../ecos/host/libcdl/configure	Sat Feb 21 19:13:54 2004
+--- ../ecos/host/libcdl/configure.orig	Wed Feb 12 18:22:31 2003
++++ ../ecos/host/libcdl/configure	Tue Mar 27 19:35:42 2007
+@@ -1534,7 +1534,7 @@
+ 
+         if test "${GCC}" = "yes" ; then
+         ecos_CFLAGS="${ecos_CFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
+-        ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual"
++        ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wcast-qual -Woverloaded-virtual"
+     elif test "${MSVC}" = "yes" ; then
+         ecos_CFLAGS="${ecos_CFLAGS} -nologo -W3"
+         ecos_CXXFLAGS="${ecos_CXXFLAGS} -nologo -W3 -GR -GX"
 @@ -1968,64 +1968,6 @@
  		{ echo "configure: error: ${tclconfig}/tclConfig.sh does not define TCL_LIB_SPEC" 1>&2; exit 1; }
  	    fi
diff --git a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::common::configure b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::common::configure
index 7663a8a4f05f..8fb93b815577 100644
--- a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::common::configure
+++ b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::common::configure
@@ -1,5 +1,16 @@
---- ../ecos/host/tools/configtool/standalone/common/configure~	Wed Mar 10 16:13:37 2004
-+++ ../ecos/host/tools/configtool/standalone/common/configure	Wed Mar 10 16:08:55 2004
+$FreeBSD$
+
+--- ../ecos/host/tools/configtool/standalone/common/configure.orig	Wed Feb 12 18:22:46 2003
++++ ../ecos/host/tools/configtool/standalone/common/configure	Tue Mar 27 19:37:15 2007
+@@ -1502,7 +1502,7 @@
+ 
+         if test "${GCC}" = "yes" ; then
+         ecos_CFLAGS="${ecos_CFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
+-        ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Woverloaded-virtual"
++        ecos_CXXFLAGS="${ecos_CXXFLAGS} -pipe -Wall -Wpointer-arith -Wcast-qual -Woverloaded-virtual"
+     elif test "${MSVC}" = "yes" ; then
+         ecos_CFLAGS="${ecos_CFLAGS} -nologo -W3"
+         ecos_CXXFLAGS="${ecos_CXXFLAGS} -nologo -W3 -GR -GX"
 @@ -2076,61 +2076,6 @@
  
  	    	    possibles=`echo ${possibles} | sed -e 's,tcl,tk,g'`
diff --git a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
index a2cf829bb235..714046e20518 100644
--- a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
+++ b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::makefile.gnu
@@ -1,7 +1,7 @@
 $FreeBSD$
 
 --- ../ecos/host/tools/configtool/standalone/wxwin/makefile.gnu.orig	Wed May 14 14:20:15 2003
-+++ ../ecos/host/tools/configtool/standalone/wxwin/makefile.gnu	Mon Nov 17 11:44:38 2003
++++ ../ecos/host/tools/configtool/standalone/wxwin/makefile.gnu	Tue Mar 27 20:06:32 2007
 @@ -6,23 +6,20 @@
  #   cd emptydir
  #   make -f /path/to/this/makefile WXDIR=/path/to/wx/installation INSTALLDIR=/path/to/ecos/tools [ ECOSSRCDIR=/path/to/ecos/tools/src ] [ TCLDIR=/path/to/tcl/installation ] [ DEBUG=1 ]
@@ -41,3 +41,12 @@ $FreeBSD$
    EXTRAOBJECTS=
  endif
  
+@@ -98,7 +95,7 @@
+  $(CTBUILDDIR)/TestResource.o
+ 
+ # Compilers
+-CC          = c++
++CC          = $(CXX)
+ RESCOMP     = windres
+ 
+ .SUFFIXES: .o .cpp .cxx
diff --git a/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::propertywin.h b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::propertywin.h
new file mode 100644
index 000000000000..a2dcd3a88258
--- /dev/null
+++ b/devel/ecos-tools/files/patch-host::tools::configtool::standalone::wxwin::propertywin.h
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+--- ../ecos/host/tools/configtool/standalone/wxwin/propertywin.h.orig	Sat Jun  2 00:16:30 2001
++++ ../ecos/host/tools/configtool/standalone/wxwin/propertywin.h	Tue Mar 27 20:35:41 2007
+@@ -93,8 +93,8 @@
+     int m_nFirstProperty;
+     ecConfigItem *m_pti;
+ 
+-    static const std::string ecPropertyListCtrl::visible_properties [];
+-	static const wxChar* sm_fieldTypeImage[ecMAXFIELDTYPE];
++    static const std::string visible_properties [];
++    static const wxChar* sm_fieldTypeImage[ecMAXFIELDTYPE];
+ };
+ 
+ 
diff --git a/devel/ecos-tools/files/patch-host::tools::ecostest::common::eCosTest.h b/devel/ecos-tools/files/patch-host::tools::ecostest::common::eCosTest.h
new file mode 100644
index 000000000000..7988a21055a6
--- /dev/null
+++ b/devel/ecos-tools/files/patch-host::tools::ecostest::common::eCosTest.h
@@ -0,0 +1,13 @@
+$FreeBSD$
+
+--- ../ecos/host/tools/ecostest/common/eCosTest.h.orig	Tue Apr 18 23:51:58 2000
++++ ../ecos/host/tools/ecostest/common/eCosTest.h	Tue Mar 27 20:31:41 2007
+@@ -199,7 +199,7 @@
+   bool GetSizes();
+ 
+   // Connect to a test server
+-  static ServerStatus CeCosTest::Connect (LPCTSTR pszHostPort, CeCosSocket *&pSock, const ExecutionParameters &e,String &strInfo,Duration dTimeout=10*1000);
++  static ServerStatus Connect (LPCTSTR pszHostPort, CeCosSocket *&pSock, const ExecutionParameters &e,String &strInfo,Duration dTimeout=10*1000);
+ 
+   // Log some output.  The accumulated output can be retrieved using Output()
+   void Log (LPCTSTR  const pszFormat,...);