40 files changed, 0 insertions, 967 deletions

diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 292ae190e2f9..c2745e87c318 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -33,7 +33,6 @@
     SUBDIR += cdpd
     SUBDIR += cdpr
     SUBDIR += centreon-clib
-    SUBDIR += cflowd
     SUBDIR += check_logfiles
     SUBDIR += check_multi
     SUBDIR += check_mysql_health
diff --git a/net-mgmt/cflowd/Makefile b/net-mgmt/cflowd/Makefile
deleted file mode 100644
index 8283e9c607c1..000000000000
--- a/net-mgmt/cflowd/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-# Created by: Andreas Klemm <andreas@klemm.gtn.com>
-# $FreeBSD$
-
-PORTNAME=	cflowd
-PORTVERSION=	2.1.b1
-PORTREVISION=	12
-PORTEPOCH=	1
-CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.caida.org/tools/measurement/cflowd/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S|.|-|g}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Flow analysis tool used for analyzing Cisco's NetFlow switching
-
-LIB_DEPENDS=	libArts.so:${PORTSDIR}/net-mgmt/arts++
-
-GNU_CONFIGURE=	yes
-USES=		bison gmake libtool:keepla
-USE_LDCONFIG=	yes
-
-CONFIGURE_ARGS=	--enable-shared --with-artspp=${LOCALBASE}
-
-MANL=		cfdases.l cfdifmatrix.l cfdnets.l cfdnexthops.l \
-		cfdportmatrix.l cfdprotos.l cfdtos.l flowdump.l flowwatch.l
-
-OPTIONS_DEFINE=	FLOWSCAN
-FLOWSCAN_DESC=	FlowScan patch
-
-DEPRECATED=	Unmaintained 10 years, requires dozens of patches, unverifiable
-EXPIRATION_DATE=2014-08-15
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1000000
-BROKEN=		Fails with recent flex/clang/libc++, try net-mgmt/flow-tools
-.endif
-
-.if ${PORT_OPTIONS:MFLOWSCAN}
-PATCH_SITES+=	http://net.doit.wisc.edu/~plonka/cflowd/
-PATCHFILES+=	cflowd-${PORTVERSION:S|.|-|g}-djp.patch
-.endif
-
-post-extract:
-	${CHMOD} -R u+w ${WRKSRC}
-
-post-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|fstream\.h|fstream|' -e 's|iomanip\.h|iomanip|' \
-		-e 's|iostream\.h|iostream|' -e 's|strstream\.h|strstream|'
-
-post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/cflowd.sh \
-		${PREFIX}/etc/rc.d/cflowd-base.sh.sample
-
-.include <bsd.port.mk>
diff --git a/net-mgmt/cflowd/distinfo b/net-mgmt/cflowd/distinfo
deleted file mode 100644
index 1958719b56d3..000000000000
--- a/net-mgmt/cflowd/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (cflowd-2-1-b1.tar.gz) = 6f3fadd1f3dab25443cbeffd1951e3ec6fa0c0f2c650b5a87098cfb0b3e2af6f
-SIZE (cflowd-2-1-b1.tar.gz) = 5571898
-SHA256 (cflowd-2-1-b1-djp.patch) = aa5e0d33ff58fa544857909bb77a964620db085769d049adce619420608f6ea3
-SIZE (cflowd-2-1-b1-djp.patch) = 8134
diff --git a/net-mgmt/cflowd/files/cflowd.sh b/net-mgmt/cflowd/files/cflowd.sh
deleted file mode 100644
index e063398026d4..000000000000
--- a/net-mgmt/cflowd/files/cflowd.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-# rc script for cflowd
-# Andreas Klemm <andreas@FreeBSD.org>, So  25 Mär 2001 12:46:10 CEST
-# $FreeBSD$
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-'start')
-	[ -x $PREFIX/sbin/cflowdmux -a -s $PREFIX/etc/cflowd.conf ] \
-	&& $PREFIX/sbin/cflowdmux $PREFIX/etc/cflowd.conf \
-	&& echo -n " cflowdmux"
-	sleep 2
-	[ -x $PREFIX/sbin/cflowd -a -s $PREFIX/etc/cflowd.conf ] \
-	&& $PREFIX/sbin/cflowd $PREFIX/etc/cflowd.conf \
-	&& echo -n " cflowd"
-	sleep 2
-	[ -x $PREFIX/sbin/cfdcollect -a -s $PREFIX/etc/cfdcollect.conf ] \
-	&& $PREFIX/sbin/cfdcollect $PREFIX/etc/cfdcollect.conf \
-	&& echo -n " cfdcollect"
-	;;
- 
-'stop')
-	for i in cfdcollect cflowd cflowdmux
-	do
-		sleep 2
-		killall -15 $i && echo "graceful shutdown of $i"
-	done
-	;;
-esac
-
-exit 0
diff --git a/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh b/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh
deleted file mode 100644
index 04944850c639..000000000000
--- a/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- apps/cflowdmux/CflowdRawFlowClientList.hh.orig	Fri Aug 29 22:10:51 2003
-+++ apps/cflowdmux/CflowdRawFlowClientList.hh	Fri Aug 29 22:11:03 2003
-@@ -51,6 +51,7 @@
- #include "caida_t.h"
- }
- 
-+using namespace std;
- #include <list>
- 
- //---------------------------------------------------------------------------
diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh
deleted file mode 100644
index a3b7bafbcc18..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- classes/include/CflowdCisco.hh.orig	Fri Aug 29 20:49:59 2003
-+++ classes/include/CflowdCisco.hh	Fri Aug 29 20:53:49 2003
-@@ -48,6 +48,8 @@
- #include "caida_t.h"
- }
- 
-+using namespace std;
-+
- #include "CflowdRawFlow.hh"
- #include "CflowdRawFlowLogger.hh"
- #include "CflowdCiscoFlowInterfaceMap.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh
deleted file mode 100644
index 81d2d1b497a8..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdCollectorMap.hh.orig	Fri Aug 29 21:48:40 2003
-+++ classes/include/CflowdCollectorMap.hh	Fri Aug 29 21:49:10 2003
-@@ -47,6 +47,7 @@
- #include "caida_t.h"
- }
- 
-+using namespace std;
- #include <map>
- 
- #include "CflowdCollector.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh
deleted file mode 100644
index 73a5b121621e..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdFlowFilter.hh.orig	Fri Aug 29 22:06:03 2003
-+++ classes/include/CflowdFlowFilter.hh	Fri Aug 29 22:06:16 2003
-@@ -42,6 +42,7 @@
- #ifndef _CFLOWDFLOWFILTER_HH_
- #define _CFLOWDFLOWFILTER_HH_
- 
-+using namespace std;
- #include <string>
- #include <vector>
- 
diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh
deleted file mode 100644
index 301579739cc2..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdFlowPortList.hh.orig	Fri Aug 29 21:50:14 2003
-+++ classes/include/CflowdFlowPortList.hh	Fri Aug 29 21:50:29 2003
-@@ -48,6 +48,7 @@
- #include "caida_t.h"
- }
- 
-+using namespace std;
- #include <list>
- 
- //---------------------------------------------------------------------------
diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh
deleted file mode 100644
index 624fd85175ba..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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));
--    is.read(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
-+    is.read((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
-     g_CfdArtsPrimitive.ReadIpv4Network(is,this->_dst,sizeof(this->_dst));
--    is.read(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
-+    is.read((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
-     
-     return(is);
-   }
-@@ -263,9 +265,9 @@
-   inline ostream & write(ostream & os) const
-   {
-     g_CfdArtsPrimitive.WriteIpv4Network(os,this->_src,sizeof(this->_src));
--    os.write(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
-+    os.write((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
-     g_CfdArtsPrimitive.WriteIpv4Network(os,this->_dst,sizeof(this->_dst));
--    os.write(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
-+    os.write((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
-     return(os);
-   }
-   
diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh
deleted file mode 100644
index d3e1118f829d..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- classes/include/CflowdRawFlowLogger.hh.orig	Fri Aug 29 21:59:45 2003
-+++ classes/include/CflowdRawFlowLogger.hh	Fri Aug 29 22:00:04 2003
-@@ -42,6 +42,8 @@
- #ifndef _CFLOWDRAWFLOWLOGGER_HH_
- #define _CFLOWDRAWFLOWLOGGER_HH_
- 
-+using namespace std;
-+
- //---------------------------------------------------------------------------
- //  class CflowdRawFlowLogger
- //---------------------------------------------------------------------------
diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh
deleted file mode 100644
index b5352ae38c19..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/include/CflowdVersion.hh.orig	Fri Aug 29 22:04:44 2003
-+++ classes/include/CflowdVersion.hh	Fri Aug 29 22:04:56 2003
-@@ -42,6 +42,7 @@
- #ifndef _CFLOWDVERSION_HH_
- #define _CFLOWDVERSION_HH_
- 
-+using namespace std;
- #include <string>
- 
- //---------------------------------------------------------------------------
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc
deleted file mode 100644
index ea5de5ca0d1f..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- classes/src/CflowdCisco.cc.orig	Fri Aug 29 21:02:38 2003
-+++ classes/src/CflowdCisco.cc	Fri Aug 29 21:12:30 2003
-@@ -699,22 +699,22 @@
-        engineIter != this->FlowEngines().end(); engineIter++) {
-     for (uint8_t aggMethod = 0; aggMethod <= k_CiscoV8FlowExportMaxAggType;
-          aggMethod++) {
--      if ((*engineIter).second.MissedFlows(aggMethod) >
-+      if ((*engineIter).second.MissedFlows((char)aggMethod) >
-           this->_missedFlowsThreshold) {
-         struct in_addr  addrIn;
-         addrIn.s_addr = this->IpAddress();
--        uint64_t totalFlows = ((*engineIter).second.MissedFlows(aggMethod) +
--                               (*engineIter).second.FlowsReceived(aggMethod));
-+        uint64_t totalFlows = ((*engineIter).second.MissedFlows((char)aggMethod) +
-+                               (*engineIter).second.FlowsReceived((char)aggMethod));
-         syslog(LOG_INFO,
-                "[I] missed %u of %u flows from %s"
-                " engine %d agg_method %d (%g%% loss)",
--               (*engineIter).second.MissedFlows(aggMethod),
-+               (*engineIter).second.MissedFlows((char)aggMethod),
-                totalFlows,
-                inet_ntoa(addrIn),
-                (*engineIter).first,
-                aggMethod,
--               ((*engineIter).second.MissedFlows(aggMethod) * 100.0) /
--               totalFlows);
-+               ((*engineIter).second.MissedFlows((char)(aggMethod) * 100.0) /
-+               totalFlows));
-       }
-       (*engineIter).second.MissedFlows(0,aggMethod);
-       (*engineIter).second.FlowsReceived(0,aggMethod);
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc
deleted file mode 100644
index 06aa42814714..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- classes/src/CflowdCiscoFlowEngine.cc.orig	Fri Aug 29 21:13:33 2003
-+++ classes/src/CflowdCiscoFlowEngine.cc	Fri Aug 29 21:17:18 2003
-@@ -43,6 +43,7 @@
- #include "caida_t.h"
- }
- 
-+using namespace std;
- #include <string>
- 
- #include "CflowdCiscoFlowEngine.hh"
-@@ -58,7 +59,7 @@
- //-------------------------------------------------------------------------
- uint32_t CflowdCiscoFlowEngine::SequenceNumber(uint32_t seqNumber,
-                                                uint16_t flowCount,
--                                               uint8_t aggMethod = 0)
-+                                               uint8_t aggMethod )
- {
-   if (aggMethod > k_CiscoV8FlowExportMaxAggType) {
-     syslog(LOG_ERR,
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc
deleted file mode 100644
index 33f4f19ba9d4..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- classes/src/CflowdCiscoMap.cc.orig	Fri Aug 29 21:26:58 2003
-+++ classes/src/CflowdCiscoMap.cc	Fri Aug 29 21:28:13 2003
-@@ -39,6 +39,7 @@
- //    info@caida.org
- //===========================================================================
- 
-+using namespace std;
- #include <string>
- #include <vector>
- 
-@@ -112,7 +113,7 @@
-   }
-         
-   numCiscos = htonl(numCiscos);
--  os.write(&numCiscos,sizeof(numCiscos));
-+  os.write((char *)&numCiscos,sizeof(numCiscos));
-   
-   for (ciscomIter = (*this).begin(); ciscomIter != (*this).end();
-        ciscomIter++) {
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc
deleted file mode 100644
index 736a89066122..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/CflowdCollector.cc.orig	Fri Aug 29 21:47:25 2003
-+++ classes/src/CflowdCollector.cc	Fri Aug 29 21:47:36 2003
-@@ -39,6 +39,7 @@
- //    info@caida.org
- //===========================================================================
- 
-+using namespace std;
- #include <string>
- 
- #include "CflowdCollector.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc
deleted file mode 100644
index 87dce681b4f1..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- classes/src/CflowdNextHopTable.cc.orig	Fri Aug 29 21:52:18 2003
-+++ classes/src/CflowdNextHopTable.cc	Fri Aug 29 21:53:26 2003
-@@ -82,11 +82,11 @@
-     (*this).erase((*this).begin(),(*this).end());
-   }
- 
--  is.read(&numNextHops,sizeof(numNextHops));
-+  is.read((char *)&numNextHops,sizeof(numNextHops));
-   numNextHops = ntohl(numNextHops);
-   
-   for (nextHopNum = 0; nextHopNum < numNextHops; nextHopNum++) {
--    is.read(&nextHop,sizeof(nextHop));
-+    is.read((char *)&nextHop,sizeof(nextHop));
-     nextHopTraffic.read(is);
-     (*this)[nextHop] = nextHopTraffic;
-   }
-@@ -154,12 +154,12 @@
-   
-   numNextHops = (*this).size();
-   numNextHops = htonl(numNextHops);
--  os.write(&numNextHops,sizeof(numNextHops));
-+  os.write((char *)&numNextHops,sizeof(numNextHops));
- 
-   for (nextHopIter = (*this).begin(); nextHopIter != (*this).end();
-        nextHopIter++) {
-     nextHop = (*nextHopIter).first;
--    os.write(&nextHop,sizeof(nextHop));
-+    os.write((char *)&nextHop,sizeof(nextHop));
-     (*nextHopIter).second.write(os);
-   }
-   return(os);
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc
deleted file mode 100644
index d60c99e2a6b0..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- classes/src/CflowdPacketQueue.cc.orig	Fri Aug 29 21:54:26 2003
-+++ classes/src/CflowdPacketQueue.cc	Fri Aug 29 21:58:48 2003
-@@ -54,6 +54,7 @@
- #include <syslog.h>
- #include <assert.h>
- 
-+using namespace std;
- #include "caida_t.h"
- #include "CflowdFlowPdu.h"
-   
-@@ -401,7 +402,7 @@
- //.........................................................................
- //  
- //-------------------------------------------------------------------------
--int CflowdPacketQueue::GetLock(uint8_t bufNum = 0xff)
-+int CflowdPacketQueue::GetLock(uint8_t bufNum)
- {
-   if (bufNum == 0xff)
-     bufNum = this->_currentBuffer;
-@@ -424,7 +425,7 @@
- //.........................................................................
- //  
- //-------------------------------------------------------------------------
--int CflowdPacketQueue::ReleaseLock(uint8_t bufNum = 0xff)
-+int CflowdPacketQueue::ReleaseLock(uint8_t bufNum)
- {
-   if (bufNum == 0xff)
-     bufNum = this->_currentBuffer;
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc
deleted file mode 100644
index e9c91b97b5c6..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- classes/src/CflowdProtocolTable.cc.orig	Fri Aug 29 20:37:48 2003
-+++ classes/src/CflowdProtocolTable.cc	Fri Aug 29 20:39:55 2003
-@@ -82,9 +82,9 @@
-     (*this).erase((*this).begin(),(*this).end());
-   }
- 
--  is.read(&numProtocols,sizeof(numProtocols));
-+  is.read((char *)&numProtocols,sizeof(numProtocols));
-   for (protocolNum = 0; protocolNum < numProtocols; protocolNum++) {
--    is.read(&protocol,sizeof(protocol));
-+    is.read((char *)&protocol,sizeof(protocol));
-     protoTraffic.read(is);
-     (*this)[protocol] = protoTraffic;
-   }
-@@ -151,11 +151,11 @@
-   CflowdProtocolTable::const_iterator  protoIter;
-   
-   numProtocols = (*this).size();
--  os.write(&numProtocols,sizeof(numProtocols));
-+  os.write((char *)&numProtocols,sizeof(numProtocols));
- 
-   for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) {
-     protocol = (*protoIter).first;
--    os.write(&protocol,sizeof(protocol));
-+    os.write((const char *)&protocol,sizeof(protocol));
-     (*protoIter).second.write(os);
-   }
-   return(os);
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc
deleted file mode 100644
index 85b4536529e8..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc
+++ /dev/null
@@ -1,200 +0,0 @@
---- classes/src/CflowdRawFlow.cc.orig	Fri Aug 29 21:18:36 2003
-+++ classes/src/CflowdRawFlow.cc	Fri Aug 29 21:22:55 2003
-@@ -44,6 +44,7 @@
- #include <string.h>
- }
- 
-+using namespace std;
- #include <string>
- 
- #include "CflowdRawFlow.hh"
-@@ -336,82 +337,82 @@
- 
-   this->data._isHostOrder = false;
-   
--  is.read(&(this->data._index),sizeof(this->data._index));
-+  is.read((char *)&(this->data._index),sizeof(this->data._index));
-   if (! is)
-     return(is);
-   flowIndex = ntohl(this->data._index);
- 
-   if (flowIndex & CflowdRawFlow::k_routerMask) {
--    is.read(&(this->data._router),sizeof(this->data._router));
-+    is.read((char *)&(this->data._router),sizeof(this->data._router));
-   }
-   if (flowIndex & CflowdRawFlow::k_srcIpAddrMask) {
--    is.read(&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr));
-+    is.read((char *)&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr));
-   }
-   if (flowIndex & CflowdRawFlow::k_dstIpAddrMask) {
--    is.read(&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr));
-+    is.read((char *)&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr));
-   }
-   if (flowIndex & CflowdRawFlow::k_inputIfIndexMask) {
--    is.read(&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex));
-+    is.read((char *)&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex));
-   }
-   if (flowIndex & CflowdRawFlow::k_outputIfIndexMask) {
--    is.read(&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex));
-+    is.read((char *)&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex));
-   }
-   if (flowIndex & CflowdRawFlow::k_srcPortMask) {
--    is.read(&(this->data._srcPort),sizeof(this->data._srcPort));
-+    is.read((char *)&(this->data._srcPort),sizeof(this->data._srcPort));
-   }
-   if (flowIndex & CflowdRawFlow::k_dstPortMask) {
--    is.read(&(this->data._dstPort),sizeof(this->data._dstPort));
-+    is.read((char *)&(this->data._dstPort),sizeof(this->data._dstPort));
-   }
-   if (flowIndex & CflowdRawFlow::k_pktsMask) {
--    is.read(&(this->data._pkts),sizeof(this->data._pkts));
-+    is.read((char *)&(this->data._pkts),sizeof(this->data._pkts));
-   }
-   if (flowIndex & CflowdRawFlow::k_bytesMask) {
--    is.read(&(this->data._bytes),sizeof(this->data._bytes));
-+    is.read((char *)&(this->data._bytes),sizeof(this->data._bytes));
-   }
-   if (flowIndex & CflowdRawFlow::k_ipNextHopMask) {
--    is.read(&(this->data._ipNextHop),sizeof(this->data._ipNextHop));
-+    is.read((char *)&(this->data._ipNextHop),sizeof(this->data._ipNextHop));
-   }
-   if (flowIndex & CflowdRawFlow::k_startTimeMask) {
--    is.read(&(this->data._startTime),sizeof(this->data._startTime));
-+    is.read((char *)&(this->data._startTime),sizeof(this->data._startTime));
-   }
-   if (flowIndex & CflowdRawFlow::k_endTimeMask) {
--    is.read(&(this->data._endTime),sizeof(this->data._endTime));
-+    is.read((char *)&(this->data._endTime),sizeof(this->data._endTime));
-   }
-   if (flowIndex & CflowdRawFlow::k_protocolMask) {
--    is.read(&(this->data._protocol),sizeof(this->data._protocol));
-+    is.read((char *)&(this->data._protocol),sizeof(this->data._protocol));
-   }
-   if (flowIndex & CflowdRawFlow::k_tosMask) {
--    is.read(&(this->data._tos),sizeof(this->data._tos));
-+    is.read((char *)&(this->data._tos),sizeof(this->data._tos));
-   }
-   if (flowIndex & CflowdRawFlow::k_srcAsMask) {
--    is.read(&(this->data._srcAs),sizeof(this->data._srcAs));
-+    is.read((char *)&(this->data._srcAs),sizeof(this->data._srcAs));
-   }
-   if (flowIndex & CflowdRawFlow::k_dstAsMask) {
--    is.read(&(this->data._dstAs),sizeof(this->data._dstAs));
-+    is.read((char *)&(this->data._dstAs),sizeof(this->data._dstAs));
-   }
-   if (flowIndex & CflowdRawFlow::k_srcMaskLenMask) {
--    is.read(&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen));
-+    is.read((char *)&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen));
-   }
-   if (flowIndex & CflowdRawFlow::k_dstMaskLenMask) {
--    is.read(&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen));
-+    is.read((char *)&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen));
-   }
-   if (flowIndex & CflowdRawFlow::k_tcpFlagsMask) {
--    is.read(&(this->data._tcpFlags),sizeof(this->data._tcpFlags));
-+    is.read((char *)&(this->data._tcpFlags),sizeof(this->data._tcpFlags));
-   }
-   if (flowIndex & CflowdRawFlow::k_inputEncapMask) {
--    is.read(&(this->data._inputEncap),sizeof(this->data._inputEncap));
-+    is.read((char *)&(this->data._inputEncap),sizeof(this->data._inputEncap));
-   }
-   if (flowIndex & CflowdRawFlow::k_outputEncapMask) {
--    is.read(&(this->data._outputEncap),sizeof(this->data._outputEncap));
-+    is.read((char *)&(this->data._outputEncap),sizeof(this->data._outputEncap));
-   }
-   if (flowIndex & CflowdRawFlow::k_peerNextHopMask) {
--    is.read(&(this->data._peerNextHop),sizeof(this->data._peerNextHop));
-+    is.read((char *)&(this->data._peerNextHop),sizeof(this->data._peerNextHop));
-   }
-   if (flowIndex & CflowdRawFlow::k_engineTypeMask) {
--    is.read(&(this->data._engineType),sizeof(this->data._engineType));
-+    is.read((char *)&(this->data._engineType),sizeof(this->data._engineType));
-   }
-   if (flowIndex & CflowdRawFlow::k_engineIdMask) {
--    is.read(&(this->data._engineId),sizeof(this->data._engineId));
-+    is.read((char *)&(this->data._engineId),sizeof(this->data._engineId));
-   }
-   
-   //  convert to host byte order
-@@ -982,56 +983,56 @@
-   
-   rawFlow.ToNetworkByteOrder();
-   
--  os.write(&(dataPtr->_index),sizeof(dataPtr->_index));
-+  os.write((char *)&(dataPtr->_index),sizeof(dataPtr->_index));
- 
-   if (flowIndex & CflowdRawFlow::k_routerMask)
--    os.write(&(dataPtr->_router),sizeof(dataPtr->_router));
-+    os.write((char *)&(dataPtr->_router),sizeof(dataPtr->_router));
-   if (flowIndex & CflowdRawFlow::k_srcIpAddrMask)
--    os.write(&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr));
-+    os.write((char *)&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr));
-   if (flowIndex & CflowdRawFlow::k_dstIpAddrMask)
--    os.write(&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr));
-+    os.write((char *)&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr));
-   if (flowIndex & CflowdRawFlow::k_inputIfIndexMask)
--    os.write(&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex));
-+    os.write((char *)&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex));
-   if (flowIndex & CflowdRawFlow::k_outputIfIndexMask)
--    os.write(&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex));
-+    os.write((char *)&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex));
-   if (flowIndex & CflowdRawFlow::k_srcPortMask)
--    os.write(&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort));
-+    os.write((char *)&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort));
-   if (flowIndex & CflowdRawFlow::k_dstPortMask)
--    os.write(&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort));
-+    os.write((char *)&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort));
-   if (flowIndex & CflowdRawFlow::k_pktsMask)
--    os.write(&(dataPtr->_pkts),sizeof(dataPtr->_pkts));
-+    os.write((char *)&(dataPtr->_pkts),sizeof(dataPtr->_pkts));
-   if (flowIndex & CflowdRawFlow::k_bytesMask)
--    os.write(&(dataPtr->_bytes),sizeof(dataPtr->_bytes));
-+    os.write((char *)&(dataPtr->_bytes),sizeof(dataPtr->_bytes));
-   if (flowIndex & CflowdRawFlow::k_ipNextHopMask)
--    os.write(&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop));
-+    os.write((char *)&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop));
-   if (flowIndex & CflowdRawFlow::k_startTimeMask)
--    os.write(&(dataPtr->_startTime),sizeof(dataPtr->_startTime));
-+    os.write((char *)&(dataPtr->_startTime),sizeof(dataPtr->_startTime));
-   if (flowIndex & CflowdRawFlow::k_endTimeMask)
--    os.write(&(dataPtr->_endTime),sizeof(dataPtr->_endTime));
-+    os.write((char *)&(dataPtr->_endTime),sizeof(dataPtr->_endTime));
-   if (flowIndex & CflowdRawFlow::k_protocolMask)
--    os.write(&(dataPtr->_protocol),sizeof(dataPtr->_protocol));
-+    os.write((char *)&(dataPtr->_protocol),sizeof(dataPtr->_protocol));
-   if (flowIndex & CflowdRawFlow::k_tosMask)
--    os.write(&(dataPtr->_tos),sizeof(dataPtr->_tos));
-+    os.write((char *)&(dataPtr->_tos),sizeof(dataPtr->_tos));
-   if (flowIndex & CflowdRawFlow::k_srcAsMask)
--    os.write(&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs));
-+    os.write((char *)&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs));
-   if (flowIndex & CflowdRawFlow::k_dstAsMask)
--    os.write(&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs));
-+    os.write((char *)&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs));
-   if (flowIndex & CflowdRawFlow::k_srcMaskLenMask)
--    os.write(&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen));
-+    os.write((char *)&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen));
-   if (flowIndex & CflowdRawFlow::k_dstMaskLenMask)
--    os.write(&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen));
-+    os.write((char *)&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen));
-   if (flowIndex & CflowdRawFlow::k_tcpFlagsMask)
--    os.write(&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags));
-+    os.write((char *)&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags));
-   if (flowIndex & CflowdRawFlow::k_inputEncapMask)
--    os.write(&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap));
-+    os.write((char *)&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap));
-   if (flowIndex & CflowdRawFlow::k_outputEncapMask)
--    os.write(&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap));
-+    os.write((char *)&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap));
-   if (flowIndex & CflowdRawFlow::k_peerNextHopMask)
--    os.write(&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop));
-+    os.write((char *)&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop));
-   if (flowIndex & CflowdRawFlow::k_engineTypeMask)
--    os.write(&(dataPtr->_engineType),sizeof(dataPtr->_engineType));
-+    os.write((char *)&(dataPtr->_engineType),sizeof(dataPtr->_engineType));
-   if (flowIndex & CflowdRawFlow::k_engineIdMask)
--    os.write(&(dataPtr->_engineId),sizeof(dataPtr->_engineId));
-+    os.write((char *)&(dataPtr->_engineId),sizeof(dataPtr->_engineId));
-   
-   return(os);
- }
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc
deleted file mode 100644
index d9880ef1758e..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/CflowdRawFlowConverter.cc.orig	Fri Aug 29 21:24:00 2003
-+++ classes/src/CflowdRawFlowConverter.cc	Fri Aug 29 21:24:16 2003
-@@ -43,6 +43,7 @@
- #include <assert.h>
- }
- 
-+using namespace std;
- #include <string>
- 
- #include "CflowdRawFlowConverter.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc
deleted file mode 100644
index 4ac063a72e69..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- classes/src/CflowdTosTable.cc.orig	Fri Aug 29 22:01:28 2003
-+++ classes/src/CflowdTosTable.cc	Fri Aug 29 22:01:52 2003
-@@ -82,9 +82,9 @@
-     (*this).erase((*this).begin(),(*this).end());
-   }
- 
--  is.read(&numToss,sizeof(numToss));
-+  is.read((char *)&numToss,sizeof(numToss));
-   for (tosNum = 0; tosNum < numToss; tosNum++) {
--    is.read(&tos,sizeof(tos));
-+    is.read((char *)&tos,sizeof(tos));
-     protoTraffic.read(is);
-     (*this)[tos] = protoTraffic;
-   }
-@@ -151,11 +151,11 @@
-   CflowdTosTable::const_iterator  protoIter;
-   
-   numToss = (*this).size();
--  os.write(&numToss,sizeof(numToss));
-+  os.write((char *)&numToss,sizeof(numToss));
- 
-   for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) {
-     tos = (*protoIter).first;
--    os.write(&tos,sizeof(tos));
-+    os.write((char *)&tos,sizeof(tos));
-     (*protoIter).second.write(os);
-   }
-   return(os);
diff --git a/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y b/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y
deleted file mode 100644
index 19f5a595becd..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/FlowFilter.y.orig	Fri Aug 29 22:08:43 2003
-+++ classes/src/FlowFilter.y	Fri Aug 29 22:08:51 2003
-@@ -42,6 +42,7 @@
-   
-   #include <math.h>
- 
-+  using namespace std;
-   #include <string>
-   
-   #include "CflowdRawFlow.hh"
diff --git a/net-mgmt/cflowd/files/patch-classes__src__Signal.cc b/net-mgmt/cflowd/files/patch-classes__src__Signal.cc
deleted file mode 100644
index aafc0dc77f59..000000000000
--- a/net-mgmt/cflowd/files/patch-classes__src__Signal.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- classes/src/Signal.cc.orig	Fri Aug 29 21:25:46 2003
-+++ classes/src/Signal.cc	Fri Aug 29 21:25:16 2003
-@@ -8,6 +8,7 @@
- #include <string.h>
- }
- 
-+using namespace std;
- #include <string>
- #include "Signal.hh"
- 
diff --git a/net-mgmt/cflowd/files/patch-classes_include_CflowdAsMatrix.hh b/net-mgmt/cflowd/files/patch-classes_include_CflowdAsMatrix.hh
deleted file mode 100644
index df1c42426a82..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdAsMatrix.hh
+++ /dev/null
@@ -1,31 +0,0 @@
---- classes/include/CflowdAsMatrix.hh.orig	2008-04-08 21:29:31.000000000 +0200
-+++ classes/include/CflowdAsMatrix.hh	2008-04-08 21:31:22.000000000 +0200
-@@ -55,7 +55,9 @@
- #include "CflowdAsMatrixTrafficCounter.hh"
- #include "CflowdRawFlow.hh"
- 
--typedef  map<CflowdAsMatrixKey, CflowdAsMatrixTrafficCounter, less<CflowdAsMatrixKey> >   CflowdAsMatrixMap_t;
-+class iterator;
-+
-+typedef  std::map<CflowdAsMatrixKey, CflowdAsMatrixTrafficCounter, std::less<CflowdAsMatrixKey> >   CflowdAsMatrixMap_t;
- 
- //---------------------------------------------------------------------------
- //  class CflowdAsMatrix : public CflowdAsMatrixMap_t
-@@ -87,7 +89,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 +105,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
deleted file mode 100644
index 9d413c1dd5b0..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdInterfaceMatrix.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 1508d887b683..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdNextHopTable.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index d67d69563b57..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdPortMatrix.hh
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index ed5e2ea19ba7..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdProtocolTable.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 1efb7e5a4549..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdRawFlow.hh
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./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
deleted file mode 100644
index 45c56dfaeb17..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdTosTable.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 0aba707c3973..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdUint16Uint16Key.hh
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./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
deleted file mode 100644
index 566436477056..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_CflowdUint64TrafficCounter.hh
+++ /dev/null
@@ -1,29 +0,0 @@
---- ./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
deleted file mode 100644
index 136675e86c22..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_include_Signal.hh
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index d9a2a37279d5..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_src_CflowdAsMatrix.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
deleted file mode 100644
index b7b504c7a90f..000000000000
--- a/net-mgmt/cflowd/files/patch-classes_src_CflowdRawFlowLogger.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
diff --git a/net-mgmt/cflowd/files/patch-snmp++-classes-include-snmp++_notifyqueue.h b/net-mgmt/cflowd/files/patch-snmp++-classes-include-snmp++_notifyqueue.h
deleted file mode 100644
index b24711a5a8d8..000000000000
--- a/net-mgmt/cflowd/files/patch-snmp++-classes-include-snmp++_notifyqueue.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- snmp++/classes/include/snmp++/notifyqueue.h.orig	2008-04-08 21:30:13.000000000 +0200
-+++ snmp++/classes/include/snmp++/notifyqueue.h	2008-04-08 21:30:29.000000000 +0200
-@@ -94,8 +94,8 @@
- 	       const TargetCollection &notify_targets, 
- 	       const AddressCollection &notify_addresses);
-   ~CNotifyEvent();
--  Snmp * CNotifyEvent::GetId();
--  int CNotifyEvent::notify_filter(const Oid &trapid, 
-+  Snmp * GetId();
-+  int notify_filter(const Oid &trapid, 
- 				  const SnmpTarget &target) const;
-   int Callback(SnmpTarget & target, Pdu & pdu, int status);
- 
diff --git a/net-mgmt/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h b/net-mgmt/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h
deleted file mode 100644
index cabe6ec2fd5c..000000000000
--- a/net-mgmt/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- snmp++/classes/include/snmp++/oid.h.orig	Fri Aug 29 20:00:24 2003
-+++ snmp++/classes/include/snmp++/oid.h	Fri Aug 29 20:00:41 2003
-@@ -57,6 +57,7 @@
- #include <string.h>               // strlen, etc..
- }
- 
-+using namespace std;
- #include <vector>
- 
- #include "smival.h"                // derived class for all values
diff --git a/net-mgmt/cflowd/pkg-descr b/net-mgmt/cflowd/pkg-descr
deleted file mode 100644
index 20e820b354a8..000000000000
--- a/net-mgmt/cflowd/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-cflowd is a flow analysis tool currently used for analyzing Cisco's
-NetFlow enabled switching method.
-
-The current release includes the collections, storage, and basic
-analysis modules for cflowd and for arts++ libraries.
-
-This analysis package permits data collection and analysis by ISPs
-and network engineers in support of capacity planning, trends analysis,
-and characterization of workloads in a network service provider environment.
-
-Other areas where cflowd may prove useful include usage tracking for Web
-hosting, accounting and billing, network planning and analysis, network
-monitoring, developing user profiles, data warehousing and mining,
-as well as security-related investigations.
-
-WWW: http://www.caida.org/tools/measurement/cflowd/
diff --git a/net-mgmt/cflowd/pkg-plist b/net-mgmt/cflowd/pkg-plist
deleted file mode 100644
index 128b0768bfed..000000000000
--- a/net-mgmt/cflowd/pkg-plist
+++ /dev/null
@@ -1,92 +0,0 @@
-bin/cfdases
-bin/cfdifmatrix
-bin/cfdnets
-bin/cfdnexthops
-bin/cfdportmatrix
-bin/cfdprotos
-bin/cfdtos
-bin/flowdump
-bin/flowwatch
-etc/cfdcollect.conf.example
-etc/cflowd.conf.example
-etc/rc.d/cflowd-base.sh.sample
-include/cflowd/CflowdAsMatrix.hh
-include/cflowd/CflowdAsMatrixKey.hh
-include/cflowd/CflowdAsMatrixTrafficCounter.hh
-include/cflowd/CflowdCisco.hh
-include/cflowd/CflowdCiscoFlowEngine.hh
-include/cflowd/CflowdCiscoFlowEngineMap.hh
-include/cflowd/CflowdCiscoFlowInterface.hh
-include/cflowd/CflowdCiscoFlowInterfaceMap.hh
-include/cflowd/CflowdCiscoMap.hh
-include/cflowd/CflowdCollector.hh
-include/cflowd/CflowdCollectorMap.hh
-include/cflowd/CflowdConfig.hh
-include/cflowd/CflowdConfigLex.hh
-include/cflowd/CflowdFlowFilter.hh
-include/cflowd/CflowdFlowPdu.h
-include/cflowd/CflowdFlowPortList.hh
-include/cflowd/CflowdInterfaceInfo.hh
-include/cflowd/CflowdInterfaceMatrix.hh
-include/cflowd/CflowdInterfaceMatrixKey.hh
-include/cflowd/CflowdInterfaceMatrixTrafficCounter.hh
-include/cflowd/CflowdNetMatrix.hh
-include/cflowd/CflowdNetMatrixKey.hh
-include/cflowd/CflowdNetMatrixTrafficCounter.hh
-include/cflowd/CflowdNextHopTable.hh
-include/cflowd/CflowdNextHopTableTrafficCounter.hh
-include/cflowd/CflowdPacketQueue.hh
-include/cflowd/CflowdPortMatrix.hh
-include/cflowd/CflowdPortMatrixKey.hh
-include/cflowd/CflowdPortMatrixTrafficCounter.hh
-include/cflowd/CflowdProtocolTable.hh
-include/cflowd/CflowdProtocolTableTrafficCounter.hh
-include/cflowd/CflowdRawFlow.hh
-include/cflowd/CflowdRawFlowConverter.hh
-include/cflowd/CflowdRawFlowLogger.hh
-include/cflowd/CflowdTableRequest.hh
-include/cflowd/CflowdTosTable.hh
-include/cflowd/CflowdUint16Uint16Key.hh
-include/cflowd/CflowdUint64TrafficCounter.hh
-include/cflowd/CflowdVersion.hh
-include/cflowd/snmp++/address.h
-include/cflowd/snmp++/asn1.h
-include/cflowd/snmp++/collect.h
-include/cflowd/snmp++/counter.h
-include/cflowd/snmp++/ctr64.h
-include/cflowd/snmp++/eventlist.h
-include/cflowd/snmp++/gauge.h
-include/cflowd/snmp++/integer.h
-include/cflowd/snmp++/msec.h
-include/cflowd/snmp++/msgqueue.h
-include/cflowd/snmp++/notifyqueue.h
-include/cflowd/snmp++/octet.h
-include/cflowd/snmp++/oid.h
-include/cflowd/snmp++/oid_def.h
-include/cflowd/snmp++/pdu.h
-include/cflowd/snmp++/smi.h
-include/cflowd/snmp++/smival.h
-include/cflowd/snmp++/snmp_pp.h
-include/cflowd/snmp++/snmperrs.h
-include/cflowd/snmp++/snmpmsg.h
-include/cflowd/snmp++/target.h
-include/cflowd/snmp++/timetick.h
-include/cflowd/snmp++/userdefined.h
-include/cflowd/snmp++/usertimeout.h
-include/cflowd/snmp++/vb.h
-lib/cflowd/libCfd.a
-lib/cflowd/libCfd.la
-lib/cflowd/libCfd.so
-lib/cflowd/libCfd.so.0
-lib/cflowd/libCfd.so.0.0.0
-lib/cflowd/libsnmp++.a
-lib/cflowd/libsnmp++.la
-lib/cflowd/libsnmp++.so
-lib/cflowd/libsnmp++.so.0
-lib/cflowd/libsnmp++.so.0.0.0
-sbin/cfdcollect
-sbin/cflowd
-sbin/cflowdmux
-@dirrm include/cflowd/snmp++
-@dirrm include/cflowd
-@dirrm lib/cflowd