- Fix build with gcc34

PR:		ports/111540
Submitted by:	thierry (based on his patch)

14 files changed, 248 insertions, 13 deletions

diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
index 310667ce4c2e..ac793c0edcd1 100644
--- a/net-mgmt/cflowd/Makefile
+++ b/net-mgmt/cflowd/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	2.1.b1
 PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
-MASTER_SITES=	ftp://ftp.caida.org/pub/cflowd/
+MASTER_SITES=	http://www.caida.org/tools/measurement/cflowd/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|g}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,15 +18,10 @@ COMMENT=	Flow analysis tool used for analyzing Cisco's NetFlow switching
 
 LIB_DEPENDS=	Arts.0:${PORTSDIR}/net-mgmt/arts++
 
-BROKEN=		Does not compile
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2007-04-10
-
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 USE_BISON=	yes
 USE_LDCONFIG=	yes
-USE_GCC=	2.95
 
 CONFIGURE_ARGS=	--enable-shared --with-artspp=${LOCALBASE}
 
@@ -42,8 +37,24 @@ PATCH_SITES+=	http://net.doit.wisc.edu/~plonka/cflowd/
 PATCHFILES+=	cflowd-${PORTVERSION:S|.|-|g}-djp.patch
 .endif
 
-post-configure:
-	${REINPLACE_CMD} -e 's/ gcc\* / gcc\* | g\+\+\* /g' ${WRKSRC}/libtool
+post-extract:
+	${CHMOD} -R u+w ${WRKSRC}
+
+post-patch:
+	@${FIND} ${WRKSRC} -type f | ${XARGS}	\
+		${REINPLACE_CMD} -e 's|iostream.h>|iostream>|;s|strstream.h|sstream|'
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS}	\
+		${REINPLACE_CMD} -e '/^LIBTOOL =/s^\$$(top_builddir)/libtool^${LIBTOOL}^'	\
+		-e '/LIBTOOL/ { ;\
+			N ;\
+			/ -o / s|$${LIBTOOL} $${CXX}|$${LIBTOOL} --mode=link $${CXX}| ;\
+			P ;\
+			D ;\
+		}';
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|$${LIBTOOL} $$(CXX)|$${LIBTOOL} --mode=compile $$(CXX)|'		\
+		-e 's|$${LIBTOOL} $${CXX}|$${LIBTOOL} --mode=compile $${CXX}|'		\
+		-e 's|$${LIBTOOL} \.\.|$${LIBTOOL} --mode=install ..|'
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/cflowd.sh \
diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
index 3b3225191b57..624fd85175ba 100644
--- a/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
+++ b/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh
@@ -1,6 +1,17 @@
---- classes/include/CflowdNetMatrixKey.hh.orig	Fri Aug 29 20:35:27 2003
-+++ classes/include/CflowdNetMatrixKey.hh	Fri Aug 29 20:36:00 2003
-@@ -191,9 +191,9 @@
+--- classes/include/CflowdNetMatrixKey.hh.orig	Fri Jun 15 16:36:13 2007
++++ classes/include/CflowdNetMatrixKey.hh	Fri Jun 15 16:45:41 2007
+@@ -53,8 +53,10 @@
+ }
+ 
+ #include <map>
++#include <strstream>
+ 
+ #include "ArtsPrimitive.hh"
++using namespace std;
+ 
+ extern ArtsPrimitive g_CfdArtsPrimitive;
+ 
+@@ -191,9 +193,9 @@
    inline istream & read(istream & is)
    {
      g_CfdArtsPrimitive.ReadIpv4Network(is,this->_src,sizeof(this->_src));
@@ -12,7 +23,7 @@
      
      return(is);
    }
-@@ -263,9 +263,9 @@
+@@ -263,9 +265,9 @@
    inline ostream & write(ostream & os) const
    {
      g_CfdArtsPrimitive.WriteIpv4Network(os,this->_src,sizeof(this->_src));
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdAsMatrix.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdAsMatrix.hh
new file mode 100644
index 000000000000..a99d0dcd6aa4
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdAsMatrix.hh
@@ -0,0 +1,38 @@
+--- ./classes/include/CflowdAsMatrix.hh.orig	Mon Sep 21 18:31:43 1998
++++ ./classes/include/CflowdAsMatrix.hh	Mon Apr  9 14:02:43 2007
+@@ -55,7 +55,7 @@
+ #include "CflowdAsMatrixTrafficCounter.hh"
+ #include "CflowdRawFlow.hh"
+ 
+-typedef  map<CflowdAsMatrixKey, CflowdAsMatrixTrafficCounter, less<CflowdAsMatrixKey> >   CflowdAsMatrixMap_t;
++typedef  std::map<CflowdAsMatrixKey, CflowdAsMatrixTrafficCounter, std::less<CflowdAsMatrixKey> >   CflowdAsMatrixMap_t;
+ 
+ //---------------------------------------------------------------------------
+ //  class CflowdAsMatrix : public CflowdAsMatrixMap_t
+@@ -70,7 +70,7 @@
+ class CflowdAsMatrix : public CflowdAsMatrixMap_t
+ {
+ public:
+-  typedef CflowdAsMatrixMap_t::iterator        iterator;
++  typedef CflowdAsMatrixMap_t::iterator        std::iterator;
+   typedef CflowdAsMatrixMap_t::const_iterator  const_iterator;
+ 
+   //-------------------------------------------------------------------------
+@@ -87,7 +87,7 @@
+   //  Reads the contents of a CflowdAsMatrix from an istream.  Returns
+   //  the istream.
+   //-------------------------------------------------------------------------
+-  istream & read(istream & is);
++  std::istream & read(std::istream & is);
+   
+   //-------------------------------------------------------------------------
+   //                            int read(int fd)
+@@ -103,7 +103,7 @@
+   //  Writes the contents of a CflowdAsMatrix to an ostream.  Returns
+   //  the ostream.
+   //-------------------------------------------------------------------------
+-  ostream & write(ostream & os) const;
++  std::ostream & write(std::ostream & os) const;
+   
+   //-------------------------------------------------------------------------
+   //                         int write(int fd) const
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdInterfaceMatrix.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdInterfaceMatrix.hh
new file mode 100644
index 000000000000..9d413c1dd5b0
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdInterfaceMatrix.hh
@@ -0,0 +1,10 @@
+--- classes/include/CflowdInterfaceMatrix.hh.bak	Mon Sep 21 20:54:27 1998
++++ classes/include/CflowdInterfaceMatrix.hh	Fri Jun 15 16:54:18 2007
+@@ -50,6 +50,7 @@
+ 
+ #include <map>
+ #include <iostream.h>
++using namespace std;
+ 
+ #include "CflowdInterfaceMatrixKey.hh"
+ #include "CflowdInterfaceMatrixTrafficCounter.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdNextHopTable.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdNextHopTable.hh
new file mode 100644
index 000000000000..1508d887b683
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdNextHopTable.hh
@@ -0,0 +1,10 @@
+--- classes/include/CflowdNextHopTable.hh.orig	Fri Jun 15 16:54:56 2007
++++ classes/include/CflowdNextHopTable.hh	Fri Jun 15 16:58:39 2007
+@@ -52,6 +52,7 @@
+ }
+ 
+ #include <map>
++using namespace std;
+ 
+ #include "ArtsPrimitive.hh"
+ #include "CflowdNextHopTableTrafficCounter.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdPortMatrix.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdPortMatrix.hh
new file mode 100644
index 000000000000..d67d69563b57
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdPortMatrix.hh
@@ -0,0 +1,11 @@
+--- classes/include/CflowdPortMatrix.hh.orig	Fri Jun 15 16:36:13 2007
++++ classes/include/CflowdPortMatrix.hh	Fri Jun 15 16:47:35 2007
+@@ -51,6 +51,8 @@
+ 
+ #include <map>
+ #include <iostream.h>
++#include <strstream>
++using namespace std;
+ 
+ #include "CflowdPortMatrixKey.hh"
+ #include "CflowdPortMatrixTrafficCounter.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdProtocolTable.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdProtocolTable.hh
new file mode 100644
index 000000000000..ed5e2ea19ba7
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdProtocolTable.hh
@@ -0,0 +1,10 @@
+--- classes/include/CflowdProtocolTable.hh.orig	Fri Jun 15 16:49:35 2007
++++ classes/include/CflowdProtocolTable.hh	Fri Jun 15 16:52:00 2007
+@@ -50,6 +50,7 @@
+ }
+ 
+ #include <map>
++using namespace std;
+ 
+ #include "ArtsPrimitive.hh"
+ #include "CflowdProtocolTableTrafficCounter.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdRawFlow.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdRawFlow.hh
new file mode 100644
index 000000000000..1efb7e5a4549
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdRawFlow.hh
@@ -0,0 +1,29 @@
+--- ./classes/include/CflowdRawFlow.hh.orig	Tue Feb 29 20:32:20 2000
++++ ./classes/include/CflowdRawFlow.hh	Mon Apr  9 00:33:03 2007
+@@ -1016,7 +1016,7 @@
+   //.........................................................................
+   //  Reads a flow from an istream.  Returns the istream.
+   //-------------------------------------------------------------------------
+-  istream & Read(istream & is);
++  std::istream & Read(std::istream & is);
+ 
+   //-------------------------------------------------------------------------
+   //                            int Read(int fd)
+@@ -1033,7 +1033,7 @@
+   //.........................................................................
+   //  Writes a flow to an ostream.  Returns the ostream.
+   //-------------------------------------------------------------------------
+-  ostream & Write(ostream & os) const;
++  std::ostream & Write(std::ostream & os) const;
+ 
+   //-------------------------------------------------------------------------
+   //                            int Write(int fd) const
+@@ -1062,7 +1062,7 @@
+   //  CflowdRawFlow object to an ostream in a human-readable form.
+   //  Returns the ostream.
+   //-------------------------------------------------------------------------
+-  friend ostream& operator << (ostream& os,
++  friend std::ostream& operator << (std::ostream& os,
+                                const CflowdRawFlow & flow);
+ 
+   //-------------------------------------------------------------------------
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdTosTable.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdTosTable.hh
new file mode 100644
index 000000000000..45c56dfaeb17
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdTosTable.hh
@@ -0,0 +1,10 @@
+--- classes/include/CflowdTosTable.hh.orig	Fri Jun 15 17:03:50 2007
++++ classes/include/CflowdTosTable.hh	Fri Jun 15 17:06:19 2007
+@@ -50,6 +50,7 @@
+ }
+ 
+ #include <map>
++using namespace std;
+ 
+ #include "ArtsPrimitive.hh"
+ #include "CflowdTosTableTrafficCounter.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdUint16Uint16Key.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdUint16Uint16Key.hh
new file mode 100644
index 000000000000..0aba707c3973
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdUint16Uint16Key.hh
@@ -0,0 +1,28 @@
+--- ./classes/include/CflowdUint16Uint16Key.hh.orig	Wed Aug 11 18:11:35 1999
++++ ./classes/include/CflowdUint16Uint16Key.hh	Mon Apr  9 00:03:09 2007
+@@ -52,6 +52,7 @@
+ }
+ 
+ #include <map>
++#include <iostream>
+ 
+ #include "ArtsPrimitive.hh"
+ 
+@@ -136,7 +137,7 @@
+   //.........................................................................
+   //  Reads the key from an istream.  Returns the istream.
+   //-------------------------------------------------------------------------
+-  inline istream & read(istream & is)
++  inline std::istream & read(std::istream & is)
+   {
+     g_CfdArtsPrimitive.ReadUint16(is,this->_src,sizeof(this->_src));
+     g_CfdArtsPrimitive.ReadUint16(is,this->_dst,sizeof(this->_dst));
+@@ -177,7 +178,7 @@
+   //.........................................................................
+   //  Writes the key to an ostream.  Returns the ostream.
+   //-------------------------------------------------------------------------
+-  inline ostream & write(ostream & os) const
++  inline std::ostream & write(std::ostream & os) const
+   {
+     g_CfdArtsPrimitive.WriteUint16(os,this->_src,sizeof(this->_src));
+     g_CfdArtsPrimitive.WriteUint16(os,this->_dst,sizeof(this->_dst));
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdUint64TrafficCounter.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdUint64TrafficCounter.hh
new file mode 100644
index 000000000000..566436477056
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_CflowdUint64TrafficCounter.hh
@@ -0,0 +1,29 @@
+--- ./classes/include/CflowdUint64TrafficCounter.hh.orig	Sun Feb  7 19:43:03 1999
++++ ./classes/include/CflowdUint64TrafficCounter.hh	Mon Apr  9 00:17:53 2007
+@@ -49,6 +49,8 @@
+ #include "caida_t.h"
+ }
+ 
++#include <iostream>
++
+ #include "ArtsPrimitive.hh"
+ 
+ extern ArtsPrimitive g_CfdArtsPrimitive;
+@@ -147,7 +149,7 @@
+   //.........................................................................
+   //  Reads the counter from an istream.  Returns the istream.
+   //-------------------------------------------------------------------------
+-  inline istream & read(istream & is)
++  inline std::istream & read(std::istream & is)
+   {
+     g_CfdArtsPrimitive.ReadUint64(is,this->_pkts,sizeof(this->_pkts));
+     g_CfdArtsPrimitive.ReadUint64(is,this->_bytes,sizeof(this->_bytes));
+@@ -190,7 +192,7 @@
+   //.........................................................................
+   //  Writes the counter to an ostream.  Returns the ostream.
+   //-------------------------------------------------------------------------
+-  inline ostream & write(ostream & os) const
++  inline std::ostream & write(std::ostream & os) const
+   {
+     g_CfdArtsPrimitive.WriteUint64(os,this->_pkts,sizeof(this->_pkts));
+     g_CfdArtsPrimitive.WriteUint64(os,this->_bytes,sizeof(this->_bytes));
diff --git a/net-mgmt/cflowd/files/patch-classes_include_Signal.hh b/net-mgmt/cflowd/files/patch-classes_include_Signal.hh
new file mode 100644
index 000000000000..136675e86c22
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_include_Signal.hh
@@ -0,0 +1,10 @@
+--- classes/include/Signal.hh.orig	Fri Jun 15 18:25:43 2007
++++ classes/include/Signal.hh	Fri Jun 15 18:29:48 2007
+@@ -47,6 +47,7 @@
+ #include <signal.h>
+ }
+ 
++using namespace std;
+ typedef struct sigaction sigactStruct;
+ 
+ //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/net-mgmt/cflowd/files/patch-classes_src_CflowdAsMatrix.cc b/net-mgmt/cflowd/files/patch-classes_src_CflowdAsMatrix.cc
new file mode 100644
index 000000000000..d9a2a37279d5
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_src_CflowdAsMatrix.cc
@@ -0,0 +1,18 @@
+--- classes/src/CflowdAsMatrix.cc.orig	Fri Jun 15 16:36:13 2007
++++ classes/src/CflowdAsMatrix.cc	Fri Jun 15 16:40:38 2007
+@@ -41,6 +41,7 @@
+ 
+ #include <string>
+ #include <strstream.h>
++#include <strstream>
+ 
+ #include "ArtsPrimitive.hh"
+ #include "CflowdAsMatrix.hh"
+@@ -50,6 +51,7 @@
+                                    CflowdRawFlow::k_pktsMask|\
+                                    CflowdRawFlow::k_bytesMask)
+ 
++using namespace std;
+ static const string rcsid = "@(#) $Name: cflowd-2-1-b1 $ $Id: CflowdAsMatrix.cc,v 1.16 1999/02/19 02:20:04 dwm Exp $";
+ 
+ ArtsPrimitive g_CfdArtsPrimitive;
diff --git a/net-mgmt/cflowd/files/patch-classes_src_CflowdRawFlowLogger.cc b/net-mgmt/cflowd/files/patch-classes_src_CflowdRawFlowLogger.cc
new file mode 100644
index 000000000000..b7b504c7a90f
--- /dev/null
+++ b/net-mgmt/cflowd/files/patch-classes_src_CflowdRawFlowLogger.cc
@@ -0,0 +1,10 @@
+--- classes/src/CflowdRawFlowLogger.cc.orig	Wed Dec 23 00:35:57 1998
++++ classes/src/CflowdRawFlowLogger.cc	Fri Jun 15 17:02:44 2007
+@@ -64,6 +64,7 @@
+ 
+ #include <string>
+ #include <strstream.h>
++#include <strstream>
+ 
+ #include "CflowdRawFlow.hh"
+ #include "CflowdRawFlowLogger.hh"