mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

Remove expired ports:

Browse Source 
2014-08-15 www/phpgedview: Superceded by www/webtrees
2014-08-15 graphics/luxrays: No longer needed as luxrender bundles its own verion now
2014-08-15 net-mgmt/cflowd: Unmaintained 10 years, requires dozens of patches, unverifiable
This commit is contained in:
Rene Ladan 2014-08-15 00:23:01 +00:00
parent adcddca1ea
commit 5a97fdb350
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=364877
56 changed files with 3 additions and 2762 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MOVED
View File

@ -6411,3 +6411,6 @@ devel/kyua-atf-compat|devel/kyua|2014-08-14|Upstream merged all components into
devel/kyua-cli|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua
devel/kyua-testers|devel/kyua|2014-08-14|Upstream merged all components into devel/kyua
devel/glib-java||2014-08-14|Has expired: Unmaintained, outdated not depend on
www/phpgedview|www/webtrees|2014-08-15|Has expired: Superceded by www/webtrees
graphics/luxrays||2014-08-15|Has expired: No longer needed as luxrender bundles its own verion now
net-mgmt/cflowd||2014-08-15|Has expired: Unmaintained 10 years, requires dozens of patches, unverifiable

1
graphics/Makefile
View File

@ -566,7 +566,6 @@
SUBDIR += lua-gd
SUBDIR += luminance
SUBDIR += luminance-qt5
SUBDIR += luxrays
SUBDIR += luxrender
SUBDIR += mahotas
SUBDIR += makehuman

36
graphics/luxrays/Makefile
View File

@ -1,36 +0,0 @@
# Created by: Natacha Porté <natbsd@instinctive.eu>
# $FreeBSD$
PORTNAME= luxrays
PORTVERSION= 1.2.1
PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://src.luxrender.net/luxrays/archive/
DISTNAME= ${HG_NODEID}
DIST_SUBDIR= luxrender
MAINTAINER= ports@FreeBSD.org
COMMENT= Accelerate the ray intersection process by using GPUs
LICENSE= GPLv3
BUILD_DEPENDS= ${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs
DEPRECATED= No longer needed as luxrender bundles its own verion now
EXPIRATION_DATE=2014-08-15
HG_NODEID= 475fbf15f0ca
USES= bison cmake tar:bzip2
USE_GL= glew glut
WRKSRC= ${WRKDIR}/luxrays-${HG_NODEID}
CMAKE_ARGS= -DLUXRAYS_DISABLE_OPENCL:BOOL=ON
NO_STAGE= yes
do-install:
(cd ${WRKSRC}/include && ${COPYTREE_SHARE} . ${PREFIX}/include)
${INSTALL_DATA} ${WRKSRC}/lib/libluxrays.a ${PREFIX}/lib
.include <bsd.port.mk>

2
graphics/luxrays/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (luxrender/475fbf15f0ca.tar.bz2) = 6643669befeb3c607fcd80ab82979a47fbbb60da97246bbfabe536d13dedfe8f
SIZE (luxrender/475fbf15f0ca.tar.bz2) = 55765775

11
graphics/luxrays/files/patch-CMakeLists.txt
View File

@ -1,11 +0,0 @@
--- CMakeLists.txt.orig 2013-08-04 12:25:45.415147716 +0200
+++ CMakeLists.txt 2013-08-04 12:26:52.319147148 +0200
@@ -142,7 +142,7 @@
message(WARNING "SLG2 requires OpenCL support, not building")
endif(NOT LUXRAYS_DISABLE_OPENCL)
- add_subdirectory(samples/smallluxgpu3)
+ # add_subdirectory(samples/smallluxgpu3)
endif(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND)

16
graphics/luxrays/files/patch-include-luxrays-core-geometry-frame.h
View File

@ -1,16 +0,0 @@
--- include/luxrays/core/geometry/frame.h.orig 2013-08-04 12:00:53.496371213 +0200
+++ include/luxrays/core/geometry/frame.h 2013-08-04 12:01:10.695167535 +0200
@@ -44,11 +44,11 @@
SetFromZ(z);
}
- Frame(const Normal &z) {
+ Frame(const luxrays::Normal &z) {
SetFromZ(Vector(z));
}
- void SetFromZ(const Normal &z) {
+ void SetFromZ(const luxrays::Normal &z) {
SetFromZ(Vector(z));
}

8
graphics/luxrays/files/patch-samples-benchsimple-CMakeLists.txt
View File

@ -1,8 +0,0 @@
--- samples/benchsimple/CMakeLists.txt.orig 2013-08-04 12:21:54.850147165 +0200
+++ samples/benchsimple/CMakeLists.txt 2013-08-04 12:22:17.696646898 +0200
@@ -23,4 +23,4 @@
link_directories (${LuxRays_LIB_DIR})
add_executable(benchsimple benchsimple.cpp)
-target_link_libraries(benchsimple luxrays)
+target_link_libraries(benchsimple luxrays pthread)

11
graphics/luxrays/pkg-descr
View File

@ -1,11 +0,0 @@
LuxRays is library dedicated to accelerate the ray intersection process by
using GPUs.
Uses a Data Parallel Model: it doesn't reduce the time spent to trace a single
ray but it is able to trace many thousands of rays in parallel.
Supports Hybrid CPU/GPU mode where only the ray intersection task is off load
to the GPUs while everything else run on the CPU and can be written with usual
tools and languages.
WWW: http://www.luxrender.net/wiki/LuxRays

79
graphics/luxrays/pkg-plist
View File

@ -1,79 +0,0 @@
include/luxrays/accelerators/bvhaccel.h
include/luxrays/accelerators/mqbvhaccel.h
include/luxrays/accelerators/qbvhaccel.h
include/luxrays/cfg.h
include/luxrays/core/accelerator.h
include/luxrays/core/context.h
include/luxrays/core/dataset.h
include/luxrays/core/device.h
include/luxrays/core/epsilon.h
include/luxrays/core/geometry/bbox.h
include/luxrays/core/geometry/bsphere.h
include/luxrays/core/geometry/frame.h
include/luxrays/core/geometry/frame.h.orig
include/luxrays/core/geometry/matrix4x4.h
include/luxrays/core/geometry/normal.h
include/luxrays/core/geometry/point.h
include/luxrays/core/geometry/ray.h
include/luxrays/core/geometry/raybuffer.h
include/luxrays/core/geometry/transform.h
include/luxrays/core/geometry/triangle.h
include/luxrays/core/geometry/uv.h
include/luxrays/core/geometry/vector.h
include/luxrays/core/geometry/vector_normal.h
include/luxrays/core/intersectiondevice.h
include/luxrays/core/trianglemesh.h
include/luxrays/core/utils.h
include/luxrays/core/virtualdevice.h
include/luxrays/kernels/kernels.h
include/luxrays/luxrays.h
include/luxrays/opencl/device.h
include/luxrays/opencl/intersectiondevice.h
include/luxrays/opencl/opencl.h
include/luxrays/opencl/utils.h
include/luxrays/utils/convtest/convtest.h
include/luxrays/utils/convtest/pdiff/lpyramid.h
include/luxrays/utils/convtest/pdiff/metric.h
include/luxrays/utils/core/atomic.h
include/luxrays/utils/core/exttrianglemesh.h
include/luxrays/utils/core/mc.h
include/luxrays/utils/core/randomgen.h
include/luxrays/utils/core/spectrum.h
include/luxrays/utils/film/film.h
include/luxrays/utils/film/filter.h
include/luxrays/utils/film/framebuffer.h
include/luxrays/utils/film/tonemapping.h
include/luxrays/utils/plymesh/LICENSE
include/luxrays/utils/plymesh/rply.h
include/luxrays/utils/properties.h
include/luxrays/utils/sampler/sampler.h
include/luxrays/utils/sdl/bsdf.h
include/luxrays/utils/sdl/bsdfevents.h
include/luxrays/utils/sdl/camera.h
include/luxrays/utils/sdl/data/rgbD65_32.h
include/luxrays/utils/sdl/data/rgbE_32.h
include/luxrays/utils/sdl/data/sun_spect.h
include/luxrays/utils/sdl/data/xyzbasis.h
include/luxrays/utils/sdl/extmeshcache.h
include/luxrays/utils/sdl/light.h
include/luxrays/utils/sdl/material.h
include/luxrays/utils/sdl/scene.h
include/luxrays/utils/sdl/sdl.h
include/luxrays/utils/sdl/spd.h
include/luxrays/utils/sdl/texmap.h
lib/libluxrays.a
@dirrm include/luxrays/utils/sdl/data
@dirrm include/luxrays/utils/sdl
@dirrm include/luxrays/utils/sampler
@dirrm include/luxrays/utils/plymesh
@dirrm include/luxrays/utils/film
@dirrm include/luxrays/utils/core
@dirrm include/luxrays/utils/convtest/pdiff
@dirrm include/luxrays/utils/convtest
@dirrm include/luxrays/utils
@dirrm include/luxrays/opencl
@dirrm include/luxrays/kernels
@dirrm include/luxrays/core/geometry
@dirrm include/luxrays/core
@dirrm include/luxrays/accelerators
@dirrm include/luxrays

1
net-mgmt/Makefile
View File

@ -33,7 +33,6 @@
SUBDIR += cdpd
SUBDIR += cdpr
SUBDIR += centreon-clib
SUBDIR += cflowd
SUBDIR += check_logfiles
SUBDIR += check_multi
SUBDIR += check_mysql_health

56
net-mgmt/cflowd/Makefile
View File

@ -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>

4
net-mgmt/cflowd/distinfo
View File

@ -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

36
net-mgmt/cflowd/files/cflowd.sh
View File

@ -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

10
net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh
View File

@ -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>
//---------------------------------------------------------------------------

11
net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh
View File

@ -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"

10
net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh
View File

@ -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"

10
net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh
View File

@ -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>

10
net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh
View File

@ -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>
//---------------------------------------------------------------------------

37
net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh
View File

@ -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);
}

11
net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh
View File

@ -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
//---------------------------------------------------------------------------

10
net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh
View File

@ -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>
//---------------------------------------------------------------------------

31
net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc
View File

@ -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);

19
net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc
View File

@ -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,

19
net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc
View File

@ -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++) {

10
net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc
View File

@ -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"

31
net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc
View File

@ -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);

28
net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc
View File

@ -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;

28
net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc
View File

@ -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);

200
net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc
View File

@ -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);
}

10
net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc
View File

@ -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"

28
net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc
View File

@ -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);

10
net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y
View File

@ -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"

10
net-mgmt/cflowd/files/patch-classes__src__Signal.cc
View File

@ -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"

31
net-mgmt/cflowd/files/patch-classes_include_CflowdAsMatrix.hh
View File

@ -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

10
net-mgmt/cflowd/files/patch-classes_include_CflowdInterfaceMatrix.hh
View File

@ -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"

10
net-mgmt/cflowd/files/patch-classes_include_CflowdNextHopTable.hh
View File

@ -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"

11
net-mgmt/cflowd/files/patch-classes_include_CflowdPortMatrix.hh
View File

@ -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"

10
net-mgmt/cflowd/files/patch-classes_include_CflowdProtocolTable.hh
View File

@ -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"

29
net-mgmt/cflowd/files/patch-classes_include_CflowdRawFlow.hh
View File

@ -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);
//-------------------------------------------------------------------------

10
net-mgmt/cflowd/files/patch-classes_include_CflowdTosTable.hh
View File

@ -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"

28
net-mgmt/cflowd/files/patch-classes_include_CflowdUint16Uint16Key.hh
View File

@ -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));

29
net-mgmt/cflowd/files/patch-classes_include_CflowdUint64TrafficCounter.hh
View File

@ -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));

10
net-mgmt/cflowd/files/patch-classes_include_Signal.hh
View File

@ -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;
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

18
net-mgmt/cflowd/files/patch-classes_src_CflowdAsMatrix.cc
View File

@ -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;

10
net-mgmt/cflowd/files/patch-classes_src_CflowdRawFlowLogger.cc
View File

@ -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"

13
net-mgmt/cflowd/files/patch-snmp++-classes-include-snmp++_notifyqueue.h
View File

@ -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);

10
net-mgmt/cflowd/files/patch-snmp++::classes::include::snmp++::oid.h
View File

@ -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

16
net-mgmt/cflowd/pkg-descr
View File

@ -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/

92
net-mgmt/cflowd/pkg-plist
View File

@ -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

1
www/Makefile
View File

@ -1431,7 +1431,6 @@
SUBDIR += php55-tidy
SUBDIR += phpbb
SUBDIR += phpbb3
SUBDIR += phpgedview
SUBDIR += phpgroupware
SUBDIR += phpmp
SUBDIR += phpmustache

59
www/phpgedview/Makefile
View File

@ -1,59 +0,0 @@
# Created by: Hubert Tournier <hubert@frbsd.org>
# $FreeBSD$
PORTNAME= phpGedView
PORTVERSION= 4.2.3
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME:tl}/1%20PhpGedView/PhpGedView%20v${PORTVERSION}
DISTNAME= ${PORTNAME:S/p/P/}-basic-${PORTVERSION}
MAINTAINER= fbsd@opal.com
COMMENT= Online genealogy viewer
DEPRECATED= Superceded by www/webtrees
EXPIRATION_DATE=2014-08-15
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
EXTRACT_AFTER_ARGS= -d ${WRKSRC}
USES= zip:infozip
USE_PHP= calendar dom gd pcre session xml
NO_BUILD= yes
SUB_FILES= pkg-message pkg-deinstall
DISTATE= config.php config_download.php config_gedcom.php
OPTIONS_MULTI= DB
OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE
OPTIONS_DEFAULT= SQLITE
DB_DESC= Data storage
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMYSQL}
USE_MYSQL= yes
USE_PHP += pdo_mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
USE_PGSQL= yes
USE_PHP += pdo_pgsql
.endif
.if ${PORT_OPTIONS:MSQLITE}
USE_PHP += pdo_sqlite
.endif
post-extract:
.for f in ${DISTATE}
@${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}-dist
.endfor
do-install:
@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}
@${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/index ${STAGEDIR}${WWWDIR}/media
@${CHMOD} -R u+w ${STAGEDIR}${WWWDIR}/index ${STAGEDIR}${WWWDIR}/media
@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/index ${WWWDIR}/media' >>${TMPPLIST}
@${ECHO_CMD} '@exec ${CHMOD} -R u+w ${WWWDIR}/index ${WWWDIR}/media' >>${TMPPLIST}
.include <bsd.port.mk>

2
www/phpgedview/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (PhpGedView-basic-4.2.3.zip) = cea5810208c15634d5b2aa0081f56196cb70354975f3bea2ff4de918bf3a597e
SIZE (PhpGedView-basic-4.2.3.zip) = 5803041

17
www/phpgedview/files/pkg-deinstall.in
View File

@ -1,17 +0,0 @@
#!/bin/sh
case "$2" in
POST-DEINSTALL)
if [ -d %%WWWDIR%%/index ]; then
cat <<!
=======================================
There is a PhpGedView database in %%WWWDIR%%/index.
If you are completely uninstalling PhpGedView, please delete this directory
and %%WWWDIR%% by hand.
You may want to save your GEDCOM file(s) from this directory first.
=======================================
!
fi
;;
esac

49
www/phpgedview/files/pkg-message.in
View File

@ -1,49 +0,0 @@
************************************************************************
For initial installation with Apache, you should:
1. Add the following to your Apache configuration, and restart the
server:
Alias /phpGedView %%WWWDIR%%/
### Add the AcceptPathInfo directive only for Apache 2.0.30
### or later.
AcceptPathInfo On
<Directory %%WWWDIR%%>
AllowOverride None
Order Allow,Deny
Allow from all
</Directory>
2. Visit your phpGedView site with a browser (i.e.,
http://your.server.com/phpGedView/)
and you should be taken to the install script, which will lead you
through setting up phpGedView, creating an admin account, etc.
************************************************************************
If you are upgrading from phpGedView 4.1.x, you will need to manually
take care of the following:
1. Back-up your three configuration files, copy in the new ones, and
then merge your local changes into the new ones:
cd %%WWWDIR%%
for x in config.php config_download.php config_gedcom.php; do
mv $x $x-4.1.x
cp $x-dist $x
diff $x-4.1.x $x
.. edit as appropriate ..
done
2. When you first access phpGedView 4.2 you may see errors about
missing SQL database field "i_sex" and it will warn you that your
GEDCOM is not imported, even though it was before under 4.1.x. If
this happens, you will need to re-import your GEDCOM data. Click on
"Import" then follow the dialog "erase old data and replace with new".
Be sure to back up your old database and GEDCOM file first.
************************************************************************

7
www/phpgedview/pkg-descr
View File

@ -1,7 +0,0 @@
PhpGedView parses GEDCOM 5.5 genealogy files and displays them on the
Internet in a format similar to desktop programs. All it requires to
run is a PHP enabled web server and a gedcom file. You can easily
customize it by using one of the provided themes or by modifying them
to meet your own needs.
WWW: http://phpgedview.net/

1496
www/phpgedview/pkg-plist
View File

File diff suppressed because it is too large Load Diff