- Update to 4.8.4

PR:		ports/106498
Submitted by:	Kevin Oberman <oberman@es.net> (maintainer)

51 files changed, 1770 insertions, 38 deletions

diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile
index c091f28eb301..74b312038693 100644
--- a/net-mgmt/irrtoolset/Makefile
+++ b/net-mgmt/irrtoolset/Makefile
@@ -6,39 +6,42 @@
 #
 
 PORTNAME=	irrtoolset
-PORTVERSION=	4.7.3
-PORTREVISION=	1
-CATEGORIES=	net-mgmt tk82
-MASTER_SITES=	ftp://ftp.isc.org/isc/IRRToolSet/${DISTNAME}/ \
-		ftp://ftp.ripe.net/tools/IRRToolSet/${DISTNAME}/
+PORTVERSION=	4.8.4
+CATEGORIES=	net-mgmt
+MASTER_SITES=	${MASTER_SITE_ISC} \
+		ftp://ftp.ripe.net/tools/
+MASTER_SITE_SUBDIR=IRRToolSet/${DISTNAME}
 DISTNAME=	IRRToolSet-${PORTVERSION}
 
 MAINTAINER=	oberman@es.net
 COMMENT=	A suite of routing policy tools to interact with the IRR
 
-LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
+PLIST_FILES=	bin/rpslcheck bin/peval bin/RtConfig
 
 USE_BISON=	yes
 USE_GMAKE=	yes
-USE_GCC=	2.95
 GNU_CONFIGURE=	Yes
-CONFIGURE_ENV=	TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.3:${PREFIX}/include/tk8.3" \
-		TCL_TK_LIBRARY_DIR=${PREFIX}/lib \
-		TCL_LIBRARY=${PREFIX}/lib/tcl8.3 \
-		TK_LIBRARY=${PREFIX}/lib/tk8.3 \
-		LD_TCL_TK_LIBS="-ltk83 -ltcl83"
 CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
 
-MAN1=		CIDRAdvisor.1 Errors.1 RtConfig.1 aoe.1 peval.1 prpath.1 \
-		prtraceroute.1 roe.1 rpslcheck.1
+MAN1=		RtConfig.1 peval.1 rpslcheck.1 IRR-Errors.1
 MAN3=		librpsl.3
 
 .include <bsd.port.pre.mk>
 
+post-extract:
+	@${RM} ${WRKSRC}/man/man1/CIDRAdvisor.1 ${WRKSRC}/man/man1/prpath.1
+	@${RM} ${WRKSRC}/man/man1/prtraceroute.1 ${WRKSRC}/man/man1/?oe.1
+	@${MV} ${WRKSRC}/man/man1/Errors.1 ${WRKSRC}/man/man1/IRR-Errors.1
+
 post-patch:
 	@${SED} -i.orig -e 's|#include <malloc.h>|/* #include <malloc.h> */|' \
-		${WRKSRC}/src/irr/birdwhoisc.cc
+	${WRKSRC}/src/irr/birdwhoisc.cc
+	@${RM} ${WRKSRC}/man/man1/*.orig
+
+ALL_TARGET=	depend all
 
-aLL_TARGET=	depend all
+.if ${OSVERSION} < 500000
+BROKEN=		Does not compile on 4.x
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/net-mgmt/irrtoolset/distinfo b/net-mgmt/irrtoolset/distinfo
index 206bb0330c44..cbf3b596df97 100644
--- a/net-mgmt/irrtoolset/distinfo
+++ b/net-mgmt/irrtoolset/distinfo
@@ -1,3 +1,3 @@
-MD5 (IRRToolSet-4.7.3.tar.gz) = fcf8305464c8ae5886c41dcb8d85e53d
-SHA256 (IRRToolSet-4.7.3.tar.gz) = 2bf694ced2c031716662599ffbbb0a31b4bd6ba13e91ba2b9cf1e7da58abcf42
-SIZE (IRRToolSet-4.7.3.tar.gz) = 774250
+MD5 (IRRToolSet-4.8.4.tar.gz) = d93fbaa58b9f9d6a6456c1d76645bd59
+SHA256 (IRRToolSet-4.8.4.tar.gz) = 8bf469c3813536ac9b619bd111a482bb10b613e74ab6957013ed001f748b2c3b
+SIZE (IRRToolSet-4.8.4.tar.gz) = 976139
diff --git a/net-mgmt/irrtoolset/files/patch-man-man1-RtConfig.1 b/net-mgmt/irrtoolset/files/patch-man-man1-RtConfig.1
new file mode 100644
index 000000000000..3ee81c43436c
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-man-man1-RtConfig.1
@@ -0,0 +1,11 @@
+--- man/man1/RtConfig.1.orig	Sun Oct  1 04:23:32 2006
++++ man/man1/RtConfig.1	Thu Dec  7 14:09:06 2006
+@@ -587,7 +587,7 @@
+ .PP
+ For more error descriptions, please see
+ .B
+-Errors 
++IRR-Errors 
+ manual page.
+ .SH AUTHORS AND CONTRIBUTORS
+ Cengiz Alaettinoglu <cengiz@isi.edu>
diff --git a/net-mgmt/irrtoolset/files/patch-man-man1-peval.1 b/net-mgmt/irrtoolset/files/patch-man-man1-peval.1
new file mode 100644
index 000000000000..9cc345ffef46
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-man-man1-peval.1
@@ -0,0 +1,20 @@
+--- man/man1/peval.1.orig	Sun Oct  1 04:23:32 2006
++++ man/man1/peval.1	Thu Dec  7 14:07:34 2006
+@@ -199,7 +199,7 @@
+ Unknown protocol!
+ .RS
+ .PP
+-Connection to IRR server failed. This can be caused by various reasons, please see Errors manpage, IRR Communication errors.
++Connection to IRR server failed. This can be caused by various reasons, please see IRR-Errors manpage, IRR Communication errors.
+ .PP
+ .RE
+ ***Error: badly formed filter.
+@@ -210,7 +210,7 @@
+ .RE
+ For more error descriptions, please see 
+ .B
+-Errors manual page.
++IRR-Errors manual page.
+ .SH AUTHORS
+ Cengiz Alaettinoglu <cengiz@isi.edu>
+ .PP
diff --git a/net-mgmt/irrtoolset/files/patch-man-man1-rpslcheck.1 b/net-mgmt/irrtoolset/files/patch-man-man1-rpslcheck.1
new file mode 100644
index 000000000000..fe9992d00ad0
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-man-man1-rpslcheck.1
@@ -0,0 +1,11 @@
+--- man/man1/rpslcheck.1.orig	Thu Jun  8 08:16:26 2006
++++ man/man1/rpslcheck.1	Thu Dec  7 14:06:40 2006
+@@ -143,7 +143,7 @@
+ .RE
+ For more error descriptions, please see
+ .B
+-Errors
++IRR-Errors
+ manual page.
+ .SH AUTHORS
+ Cengiz Alaettinoglu <cengiz@isi.edu>
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-configure b/net-mgmt/irrtoolset/files/patch-src-Core-configure
new file mode 100644
index 000000000000..7f7ba6a67b2e
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-configure
@@ -0,0 +1,15 @@
+--- src/Core/configure.orig	2006-03-22 22:27:49.000000000 +0000
++++ src/Core/configure
+@@ -1362,6 +1362,12 @@ _ACEOF
+       bsdi* )
+               EXTRA_LIBS="-lipc"
+       ;;
++      dragonfly*)
++	      cat >>confdefs.h <<\_ACEOF
++#define HOST_OS_IS_FREEBSD 1
++_ACEOF
++      ;;
++      
+       freebsd* )
+ 	      EXTRA_INCLUDE_DIRS="-I/usr/local/lib/g++-include"
+ 	      cat >>confdefs.h <<\_ACEOF
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-gnu-ACG.cc b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-ACG.cc
new file mode 100644
index 000000000000..ee9404d0704e
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-ACG.cc
@@ -0,0 +1,96 @@
+--- src/Core/gnu/ACG.cc.orig	2002-03-27 12:32:59.000000000 +0100
++++ src/Core/gnu/ACG.cc
+@@ -123,7 +123,7 @@ static int randomStateTable[][3] = {
+ //
+ 
+ #define RANDOM_PERM_SIZE 64
+-_G_uint32_t randomPermutations[RANDOM_PERM_SIZE] = {
++uint32_t randomPermutations[RANDOM_PERM_SIZE] = {
+ 0xffffffff, 0x00000000,  0x00000000,  0x00000000,  // 3210
+ 0x0000ffff, 0x00ff0000,  0x00000000,  0xff000000,  // 2310
+ 0xff0000ff, 0x0000ff00,  0x00000000,  0x00ff0000,  // 3120
+@@ -149,7 +149,7 @@ _G_uint32_t randomPermutations[RANDOM_PE
+ //	SEED_TABLE_SIZE must be a power of 2
+ //
+ #define SEED_TABLE_SIZE 32
+-static _G_uint32_t seedTable[SEED_TABLE_SIZE] = {
++static uint32_t seedTable[SEED_TABLE_SIZE] = {
+ 0xbdcc47e5, 0x54aea45d, 0xec0df859, 0xda84637b,
+ 0xc8c6cb4f, 0x35574b01, 0x28260b7d, 0x0d07fdbf,
+ 0x9faaeeb0, 0x613dd169, 0x5ce2d818, 0x85b9e706,
+@@ -171,15 +171,15 @@ static _G_uint32_t seedTable[SEED_TABLE_
+ // LC_C = result of a long trial & error series = 3907864577
+ //
+ 
+-static const _G_uint32_t LC_A = 66049;
+-static const _G_uint32_t LC_C = 3907864577u;
+-static inline _G_uint32_t LCG(_G_uint32_t x)
++static const uint32_t LC_A = 66049;
++static const uint32_t LC_C = 3907864577u;
++static inline uint32_t LCG(uint32_t x)
+ {
+     return( x * LC_A + LC_C );
+ }
+ 
+ 
+-ACG::ACG(_G_uint32_t seed, int size)
++ACG::ACG(uint32_t seed, int size)
+ {
+     register int l;
+     initialSeed = seed;
+@@ -205,7 +205,7 @@ ACG::ACG(_G_uint32_t seed, int size)
+     //	Allocate the state table & the auxillary table in a single malloc
+     //
+     
+-    state = new _G_uint32_t[stateSize + auxSize];
++    state = new uint32_t[stateSize + auxSize];
+     auxState = &state[stateSize];
+ 
+     reset();
+@@ -217,7 +217,7 @@ ACG::ACG(_G_uint32_t seed, int size)
+ void
+ ACG::reset()
+ {
+-    register _G_uint32_t u;
++    register uint32_t u;
+ 
+     if (initialSeed < SEED_TABLE_SIZE) {
+ 	u = seedTable[ initialSeed ];
+@@ -247,7 +247,7 @@ ACG::reset()
+     
+     lcgRecurr = u;
+     
+-    assert(sizeof(double) == 2 * sizeof(_G_int32_t));
++    assert(sizeof(double) == 2 * sizeof(int32_t));
+ }
+ 
+ ACG::~ACG()
+@@ -261,16 +261,16 @@ ACG::~ACG()
+ //	Returns 32 bits of random information.
+ //
+ 
+-_G_uint32_t
++uint32_t
+ ACG::asLong()
+ {
+-    _G_uint32_t result = state[k] + state[j];
++    uint32_t result = state[k] + state[j];
+     state[k] = result;
+     j = (j <= 0) ? (stateSize-1) : (j-1);
+     k = (k <= 0) ? (stateSize-1) : (k-1);
+     
+     short int auxIndex = (result >> 24) & (auxSize - 1);
+-    register _G_uint32_t auxACG = auxState[auxIndex];
++    register uint32_t auxACG = auxState[auxIndex];
+     auxState[auxIndex] = lcgRecurr = LCG(lcgRecurr);
+     
+     //
+@@ -278,7 +278,7 @@ ACG::asLong()
+     // do not want to run off the end of the permutation table.
+     // This insures that we have always got four entries left.
+     //
+-    register _G_uint32_t *perm = & randomPermutations[result & 0x3c];
++    register uint32_t *perm = & randomPermutations[result & 0x3c];
+     
+     result =  *(perm++) & auxACG;
+     result |= *(perm++) & ((auxACG << 24)
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-gnu-ACG.h b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-ACG.h
new file mode 100644
index 000000000000..3c12db892a22
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-ACG.h
@@ -0,0 +1,35 @@
+--- src/Core/gnu/ACG.h.orig	2002-03-27 12:32:59.000000000 +0100
++++ src/Core/gnu/ACG.h
+@@ -42,26 +42,26 @@ Foundation, 59 Temple Place - Suite 330,
+ 
+ class ACG : public RNG {
+ 
+-    _G_uint32_t initialSeed;	// used to reset generator
++    uint32_t initialSeed;	// used to reset generator
+     int initialTableEntry;
+ 
+-    _G_uint32_t *state;
+-    _G_uint32_t *auxState;
++    uint32_t *state;
++    uint32_t *auxState;
+     short stateSize;
+     short auxSize;
+-    _G_uint32_t lcgRecurr;
++    uint32_t lcgRecurr;
+     short j;
+     short k;
+ 
+ protected:
+ 
+ public:
+-    ACG(_G_uint32_t seed = 0, int size = 55);
++    ACG(uint32_t seed = 0, int size = 55);
+     virtual ~ACG();
+     //
+     // Return a long-words word of random bits
+     //
+-    virtual _G_uint32_t asLong();
++    virtual uint32_t asLong();
+     virtual void reset();
+ };
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-gnu-MLCG.cc b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-MLCG.cc
new file mode 100644
index 000000000000..c66b125c4151
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-MLCG.cc
@@ -0,0 +1,52 @@
+--- src/Core/gnu/MLCG.cc.orig	2002-03-27 12:32:59.000000000 +0100
++++ src/Core/gnu/MLCG.cc
+@@ -25,7 +25,7 @@ Foundation, 59 Temple Place - Suite 330,
+ 
+ #define SEED_TABLE_SIZE 32
+ 
+-static _G_int32_t seedTable[SEED_TABLE_SIZE] = {
++static int32_t seedTable[SEED_TABLE_SIZE] = {
+ 0xbdcc47e5, 0x54aea45d, 0xec0df859, 0xda84637b,
+ 0xc8c6cb4f, 0x35574b01, 0x28260b7d, 0x0d07fdbf,
+ 0x9faaeeb0, 0x613dd169, 0x5ce2d818, 0x85b9e706,
+@@ -36,7 +36,7 @@ static _G_int32_t seedTable[SEED_TABLE_S
+ 0xb89cff2b, 0x12164de1, 0xa865168d, 0x32b56cdf
+ };
+ 
+-MLCG::MLCG(_G_int32_t seed1, _G_int32_t seed2)
++MLCG::MLCG(int32_t seed1, int32_t seed2)
+ {
+     initialSeedOne = seed1;
+     initialSeedTwo = seed2;
+@@ -46,8 +46,8 @@ MLCG::MLCG(_G_int32_t seed1, _G_int32_t 
+ void
+ MLCG::reset()
+ {
+-    _G_int32_t seed1 = initialSeedOne;
+-    _G_int32_t seed2 = initialSeedTwo;
++    int32_t seed1 = initialSeedOne;
++    int32_t seed2 = initialSeedTwo;
+ 
+     //
+     //	Most people pick stupid seed numbers that do not have enough
+@@ -79,9 +79,9 @@ MLCG::reset()
+     seedTwo = (seedTwo % 2147483397) + 1;
+ }
+ 
+-_G_uint32_t MLCG::asLong()
++uint32_t MLCG::asLong()
+ {
+-    _G_int32_t k = seedOne % 53668;
++    int32_t k = seedOne % 53668;
+ 
+     seedOne = 40014 * (seedOne-k * 53668) - k * 12211;
+     if (seedOne < 0) {
+@@ -94,7 +94,7 @@ _G_uint32_t MLCG::asLong()
+ 	seedTwo += 2147483399;
+     }
+ 
+-    _G_int32_t z = seedOne - seedTwo;
++    int32_t z = seedOne - seedTwo;
+     if (z < 1) {
+ 	z += 2147483562;
+     }
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-gnu-MLCG.h b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-MLCG.h
new file mode 100644
index 000000000000..82157eb973dc
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-MLCG.h
@@ -0,0 +1,74 @@
+--- src/Core/gnu/MLCG.h.orig	2002-03-27 12:32:59.000000000 +0100
++++ src/Core/gnu/MLCG.h
+@@ -29,55 +29,55 @@ Foundation, 59 Temple Place - Suite 330,
+ //
+ 
+ class MLCG : public RNG {
+-    _G_int32_t initialSeedOne;
+-    _G_int32_t initialSeedTwo;
+-    _G_int32_t seedOne;
+-    _G_int32_t seedTwo;
++    int32_t initialSeedOne;
++    int32_t initialSeedTwo;
++    int32_t seedOne;
++    int32_t seedTwo;
+ 
+ protected:
+ 
+ public:
+-    MLCG(_G_int32_t seed1 = 0, _G_int32_t seed2 = 1);
++    MLCG(int32_t seed1 = 0, int32_t seed2 = 1);
+     //
+     // Return a long-words word of random bits
+     //
+-    virtual _G_uint32_t asLong();
++    virtual uint32_t asLong();
+     virtual void reset();
+-    _G_int32_t seed1();
+-    void seed1(_G_int32_t);
+-    _G_int32_t seed2();
+-    void seed2(_G_int32_t);
+-    void reseed(_G_int32_t, _G_int32_t);
++    int32_t seed1();
++    void seed1(int32_t);
++    int32_t seed2();
++    void seed2(int32_t);
++    void reseed(int32_t, int32_t);
+ };
+ 
+-inline _G_int32_t
++inline int32_t
+ MLCG::seed1()
+ {
+     return(seedOne);
+ }
+ 
+ inline void
+-MLCG::seed1(_G_int32_t s)
++MLCG::seed1(int32_t s)
+ {
+     initialSeedOne = s;
+     reset();
+ }
+ 
+-inline _G_int32_t
++inline int32_t
+ MLCG::seed2()
+ {
+     return(seedTwo);
+ }
+ 
+ inline void
+-MLCG::seed2(_G_int32_t s)
++MLCG::seed2(int32_t s)
+ {
+     initialSeedTwo = s;
+     reset();
+ }
+ 
+ inline void
+-MLCG::reseed(_G_int32_t s1, _G_int32_t s2)
++MLCG::reseed(int32_t s1, int32_t s2)
+ {
+     initialSeedOne = s1;
+     initialSeedTwo = s2;
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-gnu-RNG.cc b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-RNG.cc
new file mode 100644
index 000000000000..dd97daa6449e
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-RNG.cc
@@ -0,0 +1,11 @@
+--- src/Core/gnu/RNG.cc.orig	2002-03-27 12:32:59.000000000 +0100
++++ src/Core/gnu/RNG.cc
+@@ -40,7 +40,7 @@ RNG::RNG()
+   if (!initialized)
+   {
+ 
+-	assert (sizeof(double) == 2 * sizeof(_G_uint32_t)); 
++	assert (sizeof(double) == 2 * sizeof(uint32_t)); 
+ 
+ 	//
+ 	//	The following is a hack that I attribute to
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-gnu-RNG.h b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-RNG.h
new file mode 100644
index 000000000000..b1d99f7bdabb
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-RNG.h
@@ -0,0 +1,34 @@
+--- src/Core/gnu/RNG.h.orig	2002-03-27 12:32:59.000000000 +0100
++++ src/Core/gnu/RNG.h
+@@ -21,18 +21,19 @@ Foundation, 59 Temple Place - Suite 330,
+ #pragma interface
+ #endif
+ 
++#include <sys/types.h>
+ #include <assert.h>
+ #include <math.h>
+-#include <_G_config.h>
++#include <config.h>
+ 
+ union PrivateRNGSingleType {		   	// used to access floats as unsigneds
+     float s;
+-    _G_uint32_t u;
++    uint32_t u;
+ };
+ 
+ union PrivateRNGDoubleType {		   	// used to access doubles as unsigneds
+     double d;
+-    _G_uint32_t u[2];
++    uint32_t u[2];
+ };
+ 
+ //
+@@ -46,7 +47,7 @@ public:
+     //
+     // Return a long-words word of random bits
+     //
+-    virtual _G_uint32_t asLong() = 0;
++    virtual uint32_t asLong() = 0;
+     virtual void reset() = 0;
+     //
+     // Return random bits converted to either a float or a double
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-gnu-std.h b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-std.h
new file mode 100644
index 000000000000..6840ad27d86f
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-gnu-std.h
@@ -0,0 +1,20 @@
+--- src/Core/gnu/std.h.orig	2002-03-27 12:32:59.000000000 +0100
++++ src/Core/gnu/std.h
+@@ -19,7 +19,7 @@ Foundation, 59 Temple Place - Suite 330,
+ #ifndef _std_h
+ #define _std_h 1
+ 
+-#include <_G_config.h>
++#include <config.h>
+ #include <cstddef>
+ #include <cstdlib>
+ #include <cstring>
+@@ -31,7 +31,7 @@ Foundation, 59 Temple Place - Suite 330,
+ 
+ extern "C" {
+ #ifndef HAVE_STRINGS_H
+-int strcasecmp _G_ARGS((const char*, const char*));
++int strcasecmp __P((const char*, const char*));
+ #endif // HAVE_STRINGS_H
+ }
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-util-Buffer.cc b/net-mgmt/irrtoolset/files/patch-src-Core-util-Buffer.cc
new file mode 100644
index 000000000000..dd27d4ef0c8b
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-util-Buffer.cc
@@ -0,0 +1,14 @@
+--- src/Core/util/Buffer.cc.orig	2004-07-30 12:58:10.000000000 +0200
++++ src/Core/util/Buffer.cc
+@@ -36,7 +36,11 @@
+ #include <cassert>
+ #include <iomanip>
+ #include <cctype>
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-util-Buffer.hh b/net-mgmt/irrtoolset/files/patch-src-Core-util-Buffer.hh
new file mode 100644
index 000000000000..153d9be99acc
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-util-Buffer.hh
@@ -0,0 +1,14 @@
+--- src/Core/util/Buffer.hh.orig	2004-07-30 12:58:10.000000000 +0200
++++ src/Core/util/Buffer.hh
+@@ -30,7 +30,11 @@
+ 
+ #include <cstdlib>
+ #include <cstring>
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ extern "C" {
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-util-debug.hh b/net-mgmt/irrtoolset/files/patch-src-Core-util-debug.hh
new file mode 100644
index 000000000000..10e2e7f692d0
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-util-debug.hh
@@ -0,0 +1,14 @@
+--- src/Core/util/debug.hh.orig	2002-04-09 13:48:45.000000000 +0200
++++ src/Core/util/debug.hh
+@@ -75,7 +75,11 @@
+ 
+ #include "config.h"
+ #ifdef DEBUG
++#if (__GNUC__ > 2)
++#include <iostream>
++#else
+ #include <iostream.h>
++#endif
+ 
+ #define DBG_ERR             1
+ #define DBG_INFO            2 
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-util-rusage.cc b/net-mgmt/irrtoolset/files/patch-src-Core-util-rusage.cc
new file mode 100644
index 000000000000..8fbb15aba01a
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-util-rusage.cc
@@ -0,0 +1,40 @@
+--- src/Core/util/rusage.cc.orig	2004-07-30 12:58:10.000000000 +0200
++++ src/Core/util/rusage.cc
+@@ -52,7 +52,11 @@
+ //  Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU>
+ 
+ #include "config.h"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ #include "rusage.hh"
+ #include <iomanip>
+ 
+@@ -83,7 +87,6 @@ extern "C" {
+ #endif
+ }
+ 
+-
+ double tv2f(timeval &tv)
+ /* Converts a timeval into a double giving the time in seconds. */
+ {
+@@ -114,7 +117,7 @@ ostream& operator<<(ostream& stream, Rus
+     stime = tv2f(self.ru_stime) - ru.last_stime;
+     rtime = tv2f(end_time)      - ru.last_rtime;
+ 
+-    stream << fixed << setprecision(2);
++    stream << setiosflags(ostream::fixed) << setprecision(2);
+     stream <<  "     times:    "
+            << utime << " "
+            << stime << " "
+@@ -137,7 +140,7 @@ ostream& operator<<(ostream& stream, Rus
+     stream << "     vo/nv cs: "
+            << self.ru_nvcsw << " "
+            << self.ru_nivcsw << endl;
+-    stream << scientific << setprecision(0);
++    stream << setiosflags(ostream::scientific) << setprecision(0);
+     return stream;
+ }
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-Core-util-rusage.hh b/net-mgmt/irrtoolset/files/patch-src-Core-util-rusage.hh
new file mode 100644
index 000000000000..fd7833b4a401
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-Core-util-rusage.hh
@@ -0,0 +1,14 @@
+--- src/Core/util/rusage.hh.orig	2004-07-30 12:58:10.000000000 +0200
++++ src/Core/util/rusage.hh
+@@ -56,7 +56,11 @@
+ #define RUSAGE_H
+ 
+ #include "config.h"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ class Rusage {
+ private:
diff --git a/net-mgmt/irrtoolset/files/patch-src-RtConfig-command.y.cc b/net-mgmt/irrtoolset/files/patch-src-RtConfig-command.y.cc
new file mode 100644
index 000000000000..1b31294ce516
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-RtConfig-command.y.cc
@@ -0,0 +1,14 @@
+--- src/RtConfig/command.y.cc.orig	2004-07-30 12:58:11.000000000 +0200
++++ src/RtConfig/command.y.cc
+@@ -114,7 +114,11 @@
+ 
+ #include "config.h"
+ 
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ #include <cstring>
+ #include <cstdlib>
+ #include <cctype>
diff --git a/net-mgmt/irrtoolset/files/patch-src-RtConfig-f_cisco.cc b/net-mgmt/irrtoolset/files/patch-src-RtConfig-f_cisco.cc
new file mode 100644
index 000000000000..ba4ee17eb440
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-RtConfig-f_cisco.cc
@@ -0,0 +1,11 @@
+--- src/RtConfig/f_cisco.cc.orig	2004-07-30 12:58:11.000000000 +0200
++++ src/RtConfig/f_cisco.cc
+@@ -1810,7 +1810,7 @@ void CiscoConfig::exportGroup(ASt asno, 
+      sprintf(mapName, mapNameFormat, asno, mapCount++);
+      for (fa = common_list->head(); fa && !last; fa = common_list->next(fa)) {
+        ne = NormalExpression::evaluate(new FilterAFI((ItemAFI *) afi->dup(), fa->filter), ~0);
+-       last = print(ne, fa->action, IMPORT, (ItemAFI *) afi);;
++       last = print(ne, fa->action, EXPORT, (ItemAFI *) afi);;
+        delete ne;
+      }
+    }
diff --git a/net-mgmt/irrtoolset/files/patch-src-config.h.in b/net-mgmt/irrtoolset/files/patch-src-config.h.in
new file mode 100644
index 000000000000..2eaeb2232108
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-config.h.in
@@ -0,0 +1,15 @@
+--- src/config.h.in.orig    2002-04-09 13:48:44.000000000 +0200
++++ src/config.h.in
+@@ -224,4 +224,11 @@
+ #include <typeinfo>
+ #endif /* __cplusplus */
+ 
++#ifndef __P
++# if defined __cplusplus || defined __STDC__
++#  define __P(args) args
++# else
++#  define __P(args) ()
++# endif
++#endif
+ #endif   /* CONFIG_H */
+
diff --git a/net-mgmt/irrtoolset/files/patch-src-gnug++-BitSet.cc b/net-mgmt/irrtoolset/files/patch-src-gnug++-BitSet.cc
new file mode 100644
index 000000000000..567cd4943dea
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-gnug++-BitSet.cc
@@ -0,0 +1,45 @@
+--- src/gnug++/BitSet.cc.orig	2004-07-30 12:58:11.000000000 +0200
++++ src/gnug++/BitSet.cc
+@@ -30,7 +30,11 @@ Foundation, 59 Temple Place - Suite 330,
+ #include <new>
+ #include <builtin.h>
+ #include <string>
++#if (__GNUC__ > 2)
+ #include <sstream>
++#else
++#include <strstream.h>
++#endif
+ 
+ using namespace std;
+ 
+@@ -895,8 +899,11 @@ const char* BitSettoa(const BitSet& x, c
+   trim(x.rep);
+   int wrksiz = (x.rep->len + 1) * BITSETBITS + 2;
+   char* fmtbase = (char *) _libgxx_fmtq.alloc(wrksiz);
+-  //ostrstream stream(fmtbase, wrksiz);
++#if (__GNUC__ > 2)
+   std::ostringstream stream(fmtbase, ios_base::out | ios_base::trunc);
++#else
++  ostrstream stream(fmtbase, wrksiz);
++#endif
+   
+   x.printon(stream, f, t, star);
+   stream << ends;
+@@ -1043,11 +1050,17 @@ BitSet atoBitSet(const char* s, char f, 
+ 
+ ostream& operator<<(ostream& s, const BitSet& x)
+ {
++#if (__GNUC__ > 2)
+     ostream::sentry opfx(s);
+ 
+     if (opfx) {
+         x.printon(s);
+     }
++#else
++	if (s.opfx()) {
++		x.printon(s);
++	}
++#endif
+     return s;
+ }
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-gnug++-std.h b/net-mgmt/irrtoolset/files/patch-src-gnug++-std.h
new file mode 100644
index 000000000000..4d57a1b4b838
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-gnug++-std.h
@@ -0,0 +1,23 @@
+--- src/gnug++/std.h.orig	2002-03-27 12:32:57.000000000 +0100
++++ src/gnug++/std.h
+@@ -19,7 +19,7 @@ Foundation, 59 Temple Place - Suite 330,
+ #ifndef _std_h
+ #define _std_h 1
+ 
+-#include <_G_config.h>
++#include <config.h>
+ #include <cstddef>
+ #include <cstdlib>
+ #include <cstring>
+@@ -28,8 +28,10 @@ Foundation, 59 Temple Place - Suite 330,
+ #include <cerrno>
+ #include <fcntl.h>
+ 
++#ifndef HAVE_STRINGS_H
+ extern "C" {
+-int strcasecmp _G_ARGS((const char*, const char*));
++int strcasecmp __P((const char*, const char*));
+ }
++#endif
+ 
+ #endif 
diff --git a/net-mgmt/irrtoolset/files/patch-src-irr-autnum.hh b/net-mgmt/irrtoolset/files/patch-src-irr-autnum.hh
new file mode 100644
index 000000000000..60cbef4b53d7
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-irr-autnum.hh
@@ -0,0 +1,12 @@
+--- src/irr/autnum.hh.orig	2005-02-26 11:41:12.000000000 +0100
++++ src/irr/autnum.hh
+@@ -334,7 +334,7 @@ protected:
+ 	  }
+ 	else
+ 	  {
+-	  cerr << "Internal Error!" << endl;
++	  std::cerr << "Internal Error!" << std::endl;
+ 	  abort();
+ 	  }
+     return false;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-Filter.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-Filter.cc
new file mode 100644
index 000000000000..bba5a2f5091f
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-Filter.cc
@@ -0,0 +1,14 @@
+--- src/normalform/Filter.cc.orig	2004-07-30 12:58:12.000000000 +0200
++++ src/normalform/Filter.cc
+@@ -54,7 +54,11 @@
+ #include "config.h"
+ #include "Filter.hh"
+ #include "util/debug.hh"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-Filter.hh b/net-mgmt/irrtoolset/files/patch-src-normalform-Filter.hh
new file mode 100644
index 000000000000..b1566d848d8f
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-Filter.hh
@@ -0,0 +1,14 @@
+--- src/normalform/Filter.hh.orig	2004-07-30 12:58:12.000000000 +0200
++++ src/normalform/Filter.hh
+@@ -55,7 +55,11 @@
+ #define FILTER_H
+ 
+ #include "config.h"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ extern "C" {
+ #include <sys/types.h>
+ }
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-FilterOfASPath.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-FilterOfASPath.cc
new file mode 100644
index 000000000000..60c36fec52f3
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-FilterOfASPath.cc
@@ -0,0 +1,14 @@
+--- src/normalform/FilterOfASPath.cc.orig	2004-07-30 12:58:12.000000000 +0200
++++ src/normalform/FilterOfASPath.cc
+@@ -55,7 +55,11 @@
+ #include "util/debug.hh"
+ #include "FilterOfASPath.hh"
+ #include <cstdio>
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-FilterOfCommunity.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-FilterOfCommunity.cc
new file mode 100644
index 000000000000..481e709ff1b4
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-FilterOfCommunity.cc
@@ -0,0 +1,14 @@
+--- src/normalform/FilterOfCommunity.cc.orig	2004-07-30 12:58:12.000000000 +0200
++++ src/normalform/FilterOfCommunity.cc
+@@ -55,7 +55,11 @@
+ #include "config.h"
+ #include "FilterOfCommunity.hh"
+ #include "util/debug.hh"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-RadixSet.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-RadixSet.cc
new file mode 100644
index 000000000000..546d66ba4911
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-RadixSet.cc
@@ -0,0 +1,11 @@
+--- src/normalform/RadixSet.cc.orig	2004-07-30 12:58:13.000000000 +0200
++++ src/normalform/RadixSet.cc
+@@ -878,7 +878,7 @@ ostream& operator<<(ostream& o, const Ra
+       	       need_comma = true;
+       	    o << int2quad(buffer, addr) << "/" << leng << "^" << n << "-" << m;
+       	 } // end of for loop
+-      } else { // not a compressed point
++      } else { // not a compressed print
+        	 RadixSet::PrefixIterator itr(&set);
+ 	       for (bool flag = itr.first(addr, leng); flag; flag = itr.next(addr, leng)) {
+            if (need_comma)
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfIPv6Prefix.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfIPv6Prefix.cc
new file mode 100644
index 000000000000..842afac6f07a
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfIPv6Prefix.cc
@@ -0,0 +1,14 @@
+--- src/normalform/SetOfIPv6Prefix.cc.orig	2004-07-30 12:58:13.000000000 +0200
++++ src/normalform/SetOfIPv6Prefix.cc
+@@ -58,7 +58,11 @@
+ #include "SetOfIPv6Prefix.hh"
+ #include <cstdio>
+ #include <cassert>
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfPrefix.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfPrefix.cc
new file mode 100644
index 000000000000..482818ea992e
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfPrefix.cc
@@ -0,0 +1,14 @@
+--- src/normalform/SetOfPrefix.cc.orig	2004-07-30 12:58:13.000000000 +0200
++++ src/normalform/SetOfPrefix.cc
+@@ -59,7 +59,11 @@
+ #include <cstdio>
+ #include <cassert>
+ #include "rpsl/prefix.hh"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfSymbol.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfSymbol.cc
new file mode 100644
index 000000000000..8a3efd74ded6
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-SetOfSymbol.cc
@@ -0,0 +1,14 @@
+--- src/normalform/SetOfSymbol.cc.orig	2004-07-30 12:58:13.000000000 +0200
++++ src/normalform/SetOfSymbol.cc
+@@ -51,7 +51,11 @@
+ //
+ //  Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU>
+ 
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ #include <cstdio>
+ #include <cassert>
+ #include "config.h"
diff --git a/net-mgmt/irrtoolset/files/patch-src-normalform-SymbolConjunct.cc b/net-mgmt/irrtoolset/files/patch-src-normalform-SymbolConjunct.cc
new file mode 100644
index 000000000000..42c0061530e6
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-normalform-SymbolConjunct.cc
@@ -0,0 +1,14 @@
+--- src/normalform/SymbolConjunct.cc.orig	2004-07-30 12:58:13.000000000 +0200
++++ src/normalform/SymbolConjunct.cc
+@@ -53,7 +53,11 @@
+ 
+ #include "config.h"
+ #include "SymbolConjunct.hh"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-gnu-std.h b/net-mgmt/irrtoolset/files/patch-src-rpsl-gnu-std.h
new file mode 100644
index 000000000000..233f46e757b9
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-gnu-std.h
@@ -0,0 +1,23 @@
+--- src/rpsl/gnu/std.h.orig	2002-03-27 12:33:00.000000000 +0100
++++ src/rpsl/gnu/std.h
+@@ -19,7 +19,7 @@ Foundation, 59 Temple Place - Suite 330,
+ #ifndef _std_h
+ #define _std_h 1
+ 
+-#include <_G_config.h>
++#include <config.h>
+ #include <cstddef>
+ #include <cstdlib>
+ #include <cstring>
+@@ -28,8 +28,10 @@ Foundation, 59 Temple Place - Suite 330,
+ #include <cerrno>
+ #include <fcntl.h>
+ 
++#ifndef HAVE_STRINGS_H
+ extern "C" {
+-int strcasecmp _G_ARGS((const char*, const char*));
++int strcasecmp __P((const char*, const char*));
+ }
++#endif // HAVE_STRINGS_H
+ 
+ #endif 
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-object.cc b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-object.cc
new file mode 100644
index 000000000000..20b9bf4bb034
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-object.cc
@@ -0,0 +1,14 @@
+--- src/rpsl/rpsl/object.cc.orig	2004-07-30 12:58:14.000000000 +0200
++++ src/rpsl/rpsl/object.cc
+@@ -52,7 +52,11 @@
+ //  Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU>
+ 
+ #include "config.h"
++#if (__GNUC__ > 2)
+ #include <istream>
++#else
++#include <istream.h>
++#endif
+ #include <cstdio>
+ #include <sstream>
+ #include <fstream>
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-prefix.cc b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-prefix.cc
new file mode 100644
index 000000000000..b127afc81f4b
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-prefix.cc
@@ -0,0 +1,28 @@
+--- src/rpsl/rpsl/prefix.cc.orig	2004-07-30 12:58:14.000000000 +0200
++++ src/rpsl/rpsl/prefix.cc
+@@ -1216,10 +1216,13 @@ void MPPrefixRanges::except(MPPrefixRang
+    assign(result.begin(), result.end());
+ }
+ 
++// contains methods rewritten by spz according to hint from Hagen Boehm
+ bool MPPrefixRanges::contains(IPAddr ip) const {
+    MPPrefixRanges::const_iterator p;
+    for (p = begin(); p != end(); ++p) {
+-     if (p->ipv4 && (p->ipv4->get_ipaddr() == ip.get_ipaddr())) 
++     if (p->ipv4
++		&& p->ipv4->get_ipaddr() == ip.get_ipaddr()
++		&& p->ipv4->get_length() == ip.get_length() )
+        return true;
+    }
+    return false;
+@@ -1228,7 +1231,9 @@ bool MPPrefixRanges::contains(IPAddr ip)
+ bool MPPrefixRanges::contains(IPv6Addr ip) const {
+    MPPrefixRanges::const_iterator p;
+    for (p = begin(); p != end(); ++p) {
+-     if (p->ipv6 && (*(p->ipv6->get_ipaddr()) == *(ip.get_ipaddr())) )
++     if (p->ipv6
++		&& p->ipv6->get_ipaddr() == ip.get_ipaddr()
++		&& p->ipv6->get_length() == ip.get_length() )
+        return true;
+    }
+    return false;
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-prefix.hh b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-prefix.hh
new file mode 100644
index 000000000000..d503c265f59e
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-prefix.hh
@@ -0,0 +1,14 @@
+--- src/rpsl/rpsl/prefix.hh.orig	2004-07-30 12:58:14.000000000 +0200
++++ src/rpsl/rpsl/prefix.hh
+@@ -59,7 +59,11 @@
+ #include <sys/types.h>
+ #include <vector>
+ #include <sstream>
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ typedef unsigned long long int       ip_v6word_t;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rangelist.cc b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rangelist.cc
new file mode 100644
index 000000000000..2408cbe61e13
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rangelist.cc
@@ -0,0 +1,14 @@
+--- src/rpsl/rpsl/rangelist.cc.orig	2004-07-30 12:58:14.000000000 +0200
++++ src/rpsl/rpsl/rangelist.cc
+@@ -53,7 +53,11 @@
+ 
+ #include "config.h"
+ #include "rangelist.hh"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-regexp.cc b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-regexp.cc
new file mode 100644
index 000000000000..dd16a623ee6f
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-regexp.cc
@@ -0,0 +1,14 @@
+--- src/rpsl/rpsl/regexp.cc.orig	2004-07-30 12:58:14.000000000 +0200
++++ src/rpsl/rpsl/regexp.cc
+@@ -56,7 +56,11 @@
+ #include "regexp.hh"
+ #include <cstring>
+ #include "symbols.hh"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_attr.hh b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_attr.hh
new file mode 100644
index 000000000000..b6baab134984
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_attr.hh
@@ -0,0 +1,189 @@
+--- src/rpsl/rpsl/rpsl_attr.hh.orig	2004-07-30 12:58:15.000000000 +0200
++++ src/rpsl/rpsl/rpsl_attr.hh
+@@ -131,7 +131,7 @@ public:
+       return "Attr";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "(*** Need more work here ***)" << endl;
++      INDENT(indent); os << "(*** Need more work here ***)" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -311,7 +311,7 @@ public:
+       return "AttrAttr";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-     INDENT(indent); os << "_name = \"" << name() << "\"" << endl;
++     INDENT(indent); os << "_name = \"" << name() << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -370,7 +370,7 @@ public:
+       return "AttrClass";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "(*** Need more work here ***)" << endl;
++      INDENT(indent); os << "(*** Need more work here ***)" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -400,9 +400,9 @@ public:
+       return "AttrGeneric";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "type" << endl;
++      INDENT(indent); os << "type" << std::endl;
+       type->printClass(os, indent + 2);
+-      INDENT(indent); os << "items (" << items->className() << " *)" << endl;
++      INDENT(indent); os << "items (" << items->className() << " *)" << std::endl;
+       items->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -583,7 +583,7 @@ public:
+       return "AttrProtocol";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "name = \"" << name << "\"" << endl;
++      INDENT(indent); os << "name = \"" << name << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -620,19 +620,19 @@ public:
+       return "AttrImport";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "fromProt" << endl;
++      INDENT(indent); os << "fromProt" << std::endl;
+       if (fromProt) 
+ 	 fromProt->printClass(os, indent + 2);
+       else {
+-	 INDENT(indent); os << "  NULL" << endl;
++	 INDENT(indent); os << "  NULL" << std::endl;
+       }
+-      INDENT(indent); os << "intoProt" << endl;
++      INDENT(indent); os << "intoProt" << std::endl;
+       if (intoProt) 
+ 	 intoProt->printClass(os, indent + 2);
+       else {
+-	 INDENT(indent); os << "  NULL" << endl;
++	 INDENT(indent); os << "  NULL" << std::endl;
+       }
+-      INDENT(indent); os << "policy (" << policy->className() << " *)" << endl;
++      INDENT(indent); os << "policy (" << policy->className() << " *)" << std::endl;
+       policy->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -668,19 +668,19 @@ public:
+       return "AttrExport";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "fromProt" << endl;
++      INDENT(indent); os << "fromProt" << std::endl;
+       if (fromProt) 
+ 	 fromProt->printClass(os, indent + 2);
+       else {
+-	 INDENT(indent); os << "  NULL" << endl;
++	 INDENT(indent); os << "  NULL" << std::endl;
+       }
+-      INDENT(indent); os << "intoProt" << endl;
++      INDENT(indent); os << "intoProt" << std::endl;
+       if (intoProt) 
+ 	 intoProt->printClass(os, indent + 2);
+       else {
+-	 INDENT(indent); os << "  NULL" << endl;
++	 INDENT(indent); os << "  NULL" << std::endl;
+       }
+-      INDENT(indent); os << "policy (" << policy->className() << " *)" << endl;
++      INDENT(indent); os << "policy (" << policy->className() << " *)" << std::endl;
+       policy->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -725,11 +725,11 @@ public:
+       return "AttrDefault";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "peering (PolicyPeering *)" << endl;
++      INDENT(indent); os << "peering (PolicyPeering *)" << std::endl;
+       peering->printClass(os, indent + 2);
+-      INDENT(indent); os << "action (PolicyActionList *)" << endl;
++      INDENT(indent); os << "action (PolicyActionList *)" << std::endl;
+       action->printClass(os, indent + 2);
+-      INDENT(indent); os << "filter (Filter *)" << endl;
++      INDENT(indent); os << "filter (Filter *)" << std::endl;
+       filter->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -757,7 +757,7 @@ public:
+       return "AttrFilter";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "filter (Filter *)" << endl;
++      INDENT(indent); os << "filter (Filter *)" << std::endl;
+       filter->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -785,7 +785,7 @@ public:
+       return "AttrMPPeval";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "mp-peval (Filter *)" << endl;
++      INDENT(indent); os << "mp-peval (Filter *)" << std::endl;
+       filter->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -815,7 +815,7 @@ public:
+       return "AttrPeering";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "peering (PolicyPeering *)" << endl;
++      INDENT(indent); os << "peering (PolicyPeering *)" << std::endl;
+       peering->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -852,9 +852,9 @@ public:
+       // ??? This causes a lot of warning mesg right now
+       // It's hard to fix since it involves modification to
+       // hundred of places across the whole src tree
+-      //     os << "ifaddr = " << ifaddr << endl;
++      //     os << "ifaddr = " << ifaddr << std::endl;
+       os << "(*** Need to fix const declaration in the extraction operator ***)"
+-	 << endl;
++	 << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -922,9 +922,9 @@ public:
+       // ??? This causes a lot of warning mesg right now
+       // It's hard to fix since it involves modification to
+       // hundred of places across the whole src tree
+-      //     os << "ifaddr = " << ifaddr << endl;
++      //     os << "ifaddr = " << ifaddr << std::endl;
+       os << "(*** Need to fix const declaration in the extraction operator ***)"
+-   << endl;
++   << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -960,15 +960,15 @@ public:
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+       // For rp_attr
+-      INDENT(indent); os << "rp_attr" << endl;
+-      INDENT(indent); os << "  _name = \"" << "\"" << endl;
+-      INDENT(indent); os << "  methods (RPMethod *)" << endl;
+-      INDENT(indent); os << "    _name = \"" << "\"" << endl;
++      INDENT(indent); os << "rp_attr" << std::endl;
++      INDENT(indent); os << "  _name = \"" << "\"" << std::endl;
++      INDENT(indent); os << "  methods (RPMethod *)" << std::endl;
++      INDENT(indent); os << "    _name = \"" << "\"" << std::endl;
+       // For rp_method
+-      INDENT(indent); os << "rp_method" << endl;
+-      INDENT(indent); os << "  _name = \"" << "\"" << endl;
++      INDENT(indent); os << "rp_method" << std::endl;
++      INDENT(indent); os << "  _name = \"" << "\"" << std::endl;
+       // For rp_args
+-      INDENT(indent); os << "args (ItemList *)" << endl;
++      INDENT(indent); os << "args (ItemList *)" << std::endl;
+       args->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_filter.cc b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_filter.cc
new file mode 100644
index 000000000000..596dc69d9e71
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_filter.cc
@@ -0,0 +1,14 @@
+--- src/rpsl/rpsl/rpsl_filter.cc.orig	2004-07-30 12:58:15.000000000 +0200
++++ src/rpsl/rpsl/rpsl_filter.cc
+@@ -52,7 +52,11 @@
+ //  Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU>
+ 
+ #include "config.h"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ #include <cstdio>
+ #include "rpsl_filter.hh"
+ #include "rpsl_attr.hh"
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_filter.hh b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_filter.hh
new file mode 100644
index 000000000000..7a968234f5bb
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_filter.hh
@@ -0,0 +1,231 @@
+--- src/rpsl/rpsl/rpsl_filter.hh.orig	2005-08-25 12:41:52.000000000 +0200
++++ src/rpsl/rpsl/rpsl_filter.hh
+@@ -92,8 +92,8 @@
+    virtual Filter* dup() const = 0;
+ #ifdef DEBUG
+    virtual const char *className(void) const = 0;
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "(*** Need more work here ***)" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); print(os); os << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -125,10 +125,10 @@
+    virtual const char *className(void) const {
+       return "FilterOR";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "f1 (" << f1->className() << " *)" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "f1 (" << f1->className() << " *)" << std::endl;
+       f1->printClass(os, indent + 2);
+-      INDENT(indent); os << "f2 (" << f2->className() << " *)" << endl;
++      INDENT(indent); os << "f2 (" << f2->className() << " *)" << std::endl;
+       f2->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -157,10 +157,10 @@
+    virtual const char *className(void) const {
+       return "FilterAND";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "f1" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "f1" << std::endl;
+       f1->printClass(os, indent + 2);
+-      INDENT(indent); os << "f2" << endl;
++      INDENT(indent); os << "f2" << std::endl;
+       f2->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -186,8 +186,8 @@
+    virtual const char *className(void) const {
+       return "FilterNOT";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "f1 (NOT)" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "f1 (NOT)" << std::endl;
+       f1->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -216,10 +216,10 @@
+    virtual const char *className(void) const {
+       return "FilterEXCEPT";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "f1" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "f1" << std::endl;
+       f1->printClass(os, indent + 2);
+-      INDENT(indent); os << "f2" << endl;
++      INDENT(indent); os << "f2" << std::endl;
+       f2->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -256,8 +256,8 @@
+    virtual const char *className(void) const {
+       return "FilterMS";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "f1 (" << f1->className() << " *)" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "f1 (" << f1->className() << " *)" << std::endl;
+       f1->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -279,8 +279,8 @@
+    virtual const char *className(void) const {
+       return "FilterASNO";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "asno = " << asno << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "asno = " << asno << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -301,8 +301,8 @@
+    virtual const char *className(void) const {
+       return "FilterASNAME";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "asname = \"" << asname << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "asname = \"" << asname << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -323,8 +323,8 @@
+    virtual const char *className(void) const {
+       return "FilterRSNAME";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "rsname = \"" << rsname << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "rsname = \"" << rsname << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -345,8 +345,8 @@
+    virtual const char *className(void) const {
+       return "FilterRTRSNAME";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "rtrsname = \"" << rtrsname << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "rtrsname = \"" << rtrsname << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -368,7 +368,7 @@
+       return "FilterFLTRNAME";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "fltrname = \"" << fltrname << "\"" << endl;
++      INDENT(indent); os << "fltrname = \"" << fltrname << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -386,8 +386,8 @@
+    virtual const char *className(void) const {
+       return "FilterANY";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "ANY" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "ANY" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -405,8 +405,8 @@
+    virtual const char *className(void) const {
+       return "FilterPeerAS";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "peerAS" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "peerAS" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -432,8 +432,8 @@
+    virtual const char *className(void) const {
+       return "FilterASPath";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "re = ..." << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "re = ..." << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -452,8 +452,8 @@
+    virtual const char *className(void) const {
+       return "FilterPRFXList";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << *this << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << *this << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -477,8 +477,8 @@
+    virtual const char *className(void) const {
+       return "FilterMPPRFXList";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << *this << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); print(os); os << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -516,8 +516,8 @@
+    virtual const char *className(void) const {
+       return "FilterAFI";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << *this << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << *this << std::endl;
+    }
+ #endif // DEBUG
+ 
+@@ -554,17 +554,17 @@
+    virtual const char *className(void) const {
+       return "FilterRPAttribute";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
++   virtual void printClass(std::ostream &os, int indent) const {
+       // For rp_attr
+-      INDENT(indent); os << "rp_attr" << endl;
+-      INDENT(indent); os << "  _name = \"" << "\"" << endl;
+-      INDENT(indent); os << "  methods (RPMethod *)" << endl;
+-      INDENT(indent); os << "    _name = \"" << "\"" << endl;
++      INDENT(indent); os << "rp_attr" << std::endl;
++      INDENT(indent); os << "  _name = \"" << "\"" << std::endl;
++      INDENT(indent); os << "  methods (RPMethod *)" << std::endl;
++      INDENT(indent); os << "    _name = \"" << "\"" << std::endl;
+       // For rp_method
+-      INDENT(indent); os << "rp_method" << endl;
+-      INDENT(indent); os << "  _name = \"" << "\"" << endl;
++      INDENT(indent); os << "rp_method" << std::endl;
++      INDENT(indent); os << "  _name = \"" << "\"" << std::endl;
+       // For rp_args
+-      INDENT(indent); os << "args (ItemList *)" << endl;
++      INDENT(indent); os << "args (ItemList *)" << std::endl;
+       args->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -722,7 +722,7 @@
+       return "FilterRouterName";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "name = \"" << name << "\"" << endl;
++      INDENT(indent); os << "name = \"" << name << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_item.hh b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_item.hh
new file mode 100644
index 000000000000..a51a46373ba4
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_item.hh
@@ -0,0 +1,299 @@
+--- src/rpsl/rpsl/rpsl_item.hh.orig	2004-07-30 12:58:15.000000000 +0200
++++ src/rpsl/rpsl/rpsl_item.hh
+@@ -100,8 +100,8 @@ public:
+    virtual Buffer *bufferize(Buffer *buf = NULL, bool lcase = false) const = 0;
+ #ifdef DEBUG
+    virtual const char *className(void) const = 0;
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "(*** Need more work here ***)" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "(*** Need more work here ***)" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -131,8 +131,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemASNO";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "asno = " << asno << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "asno = " << asno << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -188,8 +188,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemFilter";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "filter = " << filter << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "filter = " << filter << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -213,8 +213,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemINT";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "i = " << i << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "i = " << i << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -238,8 +238,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemTimeStamp";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "stamp = " << stamp << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "stamp = " << stamp << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -263,8 +263,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemREAL";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "real = " << real << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "real = " << real << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -295,8 +295,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemSTRING";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "string = \"" << string << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "string = \"" << string << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -326,8 +326,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemBLOB";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "blob = \"" << blob << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "blob = \"" << blob << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -358,8 +358,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemBUFFER";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "buffer = \"" << buffer << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "buffer = \"" << buffer << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -391,7 +391,7 @@ public:
+       return "ItemIPV4";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "ipv4 = \"" << *ipv4 << "\"" << endl;
++      INDENT(indent); os << "ipv4 = \"" << *ipv4 << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -424,8 +424,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemPRFXV4";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "prfxv4 = \"" << *prfxv4 << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "prfxv4 = \"" << *prfxv4 << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -460,8 +460,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemPRFXV4Range";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "prfxv4 = \"" << *prfxv4 << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "prfxv4 = \"" << *prfxv4 << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -493,8 +493,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemIPV6";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "ipv6 = \"" << *ipv6 << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "ipv6 = \"" << *ipv6 << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -526,8 +526,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemPRFXV6";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "prfxv6 = \"" << *prfxv6 << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "prfxv6 = \"" << *prfxv6 << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -563,8 +563,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemPRFXV6Range";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "prfxrangev6 = \"" << *prfxv6 << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "prfxrangev6 = \"" << *prfxv6 << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -596,8 +596,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemAFI";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "afi = \"" << *afi << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "afi = \"" << *afi << "\"" << std::endl;
+    }
+ #endif // DEBUG
+    int operator==(ItemAFI &af) {
+@@ -642,10 +642,10 @@ public:
+    virtual const char *className(void) const {
+       return "ItemConnection";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "ip   = \"" << *ip  << "\"" << endl;
+-      INDENT(indent); os << "host = \"" << host << "\"" << endl;
+-      INDENT(indent); os << "port = \"" << port << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "ip   = \"" << *ip  << "\"" << std::endl;
++      INDENT(indent); os << "host = \"" << host << "\"" << std::endl;
++      INDENT(indent); os << "port = \"" << port << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -667,8 +667,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemSID";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "name (SymID) = \"" << name << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "name (SymID) = \"" << name << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -718,8 +718,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemBOOLEAN";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "i = " << i << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "i = " << i << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -754,8 +754,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemWORD";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "word = \"" << word << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "word = \"" << word << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -782,8 +782,8 @@ public:
+    virtual const char *className(void) const {
+       return "ItemEMAIL";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "email = \"" << email << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "email = \"" << email << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -805,7 +805,7 @@ public:
+    virtual const char *className(void) const {
+       return "ItemFREETEXT";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
++   virtual void printClass(std::ostream &os, int indent) const {
+       INDENT(indent); os << "\"";
+ #define DISPLAYFREETEXTLENGTH  63
+       if (length > DISPLAYFREETEXTLENGTH) {
+@@ -813,7 +813,7 @@ public:
+ 	strncpy(buf, text, DISPLAYFREETEXTLENGTH - 3);
+ 	buf[DISPLAYFREETEXTLENGTH - 3] = 0;
+ 	strcat(buf, "...");
+-	os << buf << endl;
++	os << buf << std::endl;
+       } else {
+ 	for (int i = 0; i < length; i++) {
+ 	  char ch = *(text + i);
+@@ -823,7 +823,7 @@ public:
+ 	    os << ch;
+         }
+       }
+-      os << "\"" << endl;
++      os << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -902,9 +902,9 @@ public:
+    virtual const char *className(void) const {
+       return "ItemList";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
++   virtual void printClass(std::ostream &os, int indent) const {
+      for (Item *item = head(); item; item = next(item)) {
+-        INDENT(indent); os << item->className() << endl;
++        INDENT(indent); os << item->className() << std::endl;
+         item->printClass(os, indent + 2);
+      }
+    }
+@@ -935,9 +935,9 @@ public:
+    virtual const char *className(void) const {
+       return "ItemRange";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "begin = \"" << "\"" << endl;
+-      INDENT(indent); os << "end = \"" << "\"" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "begin = \"" << "\"" << std::endl;
++      INDENT(indent); os << "end = \"" << "\"" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -968,9 +968,9 @@ public:
+    virtual const char *className(void) const {
+       return "ItemSequence";
+    }
+-   virtual void printClass(ostream &os, int indent) const {
++   virtual void printClass(std::ostream &os, int indent) const {
+      for (Item *item = head(); item; item = next(item)) {
+-        INDENT(indent); os << item->className() << endl;
++        INDENT(indent); os << item->className() << std::endl;
+         item->printClass(os, indent + 2);
+      }
+    }
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_policy.cc b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_policy.cc
new file mode 100644
index 000000000000..93c8e2465ee1
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_policy.cc
@@ -0,0 +1,14 @@
+--- src/rpsl/rpsl/rpsl_policy.cc.orig	2004-07-30 12:58:15.000000000 +0200
++++ src/rpsl/rpsl/rpsl_policy.cc
+@@ -55,7 +55,11 @@
+ #include <cstdio>
+ #include "rpsl_policy.hh"
+ #include "rpsl_attr.hh"
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ 
+ using namespace std;
+ 
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_policy.hh b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_policy.hh
new file mode 100644
index 000000000000..c21d73056776
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-rpsl_policy.hh
@@ -0,0 +1,89 @@
+--- src/rpsl/rpsl/rpsl_policy.hh.orig	2004-07-30 12:58:15.000000000 +0200
++++ src/rpsl/rpsl/rpsl_policy.hh
+@@ -91,8 +91,8 @@ public:
+ 
+ #ifdef DEBUG
+    virtual const char *className(void) const = 0;
+-   virtual void printClass(ostream &os, int indent) const {
+-      INDENT(indent); os << "(*** Need more work here ***)" << endl;
++   virtual void printClass(std::ostream &os, int indent) const {
++      INDENT(indent); os << "(*** Need more work here ***)" << std::endl;
+    }
+ #endif // DEBUG
+ };
+@@ -170,15 +170,15 @@ public:
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+       // For rp_attr
+-      INDENT(indent); os << "rp_attr" << endl;
+-      INDENT(indent); os << "  _name = \"" << "\"" << endl;
+-      INDENT(indent); os << "  methods (RPMethod *)" << endl;
+-      INDENT(indent); os << "    _name = \"" << "\"" << endl;
++      INDENT(indent); os << "rp_attr" << std::endl;
++      INDENT(indent); os << "  _name = \"" << "\"" << std::endl;
++      INDENT(indent); os << "  methods (RPMethod *)" << std::endl;
++      INDENT(indent); os << "    _name = \"" << "\"" << std::endl;
+       // For rp_method
+-      INDENT(indent); os << "rp_method" << endl;
+-      INDENT(indent); os << "  _name = \"" << "\"" << endl;
++      INDENT(indent); os << "rp_method" << std::endl;
++      INDENT(indent); os << "  _name = \"" << "\"" << std::endl;
+       // For rp_args
+-      INDENT(indent); os << "args (ItemList *)" << endl;
++      INDENT(indent); os << "args (ItemList *)" << std::endl;
+       args->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -231,9 +231,9 @@ public:
+       return "PolicyPeeringAction";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "peering (PolicyPeering *)" << endl;
++      INDENT(indent); os << "peering (PolicyPeering *)" << std::endl;
+       peering->printClass(os, indent + 2);
+-      INDENT(indent); os << "action (PolicyActionList *)" << endl;
++      INDENT(indent); os << "action (PolicyActionList *)" << std::endl;
+       action->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -265,14 +265,14 @@ public:
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+       // Action
+-      INDENT(indent); os << "peeringActionList" << endl;
++      INDENT(indent); os << "peeringActionList" << std::endl;
+       for (PolicyPeeringAction *pc = peeringActionList->head(); 
+ 	   pc;
+ 	   pc = peeringActionList->next(pc)) {
+ 	 pc->printClass(os, indent + 2);
+       }
+       // Filter
+-      INDENT(indent); os << "filter (Filter *)" << endl;
++      INDENT(indent); os << "filter (Filter *)" << std::endl;
+       filter->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -327,9 +327,9 @@ public:
+       return "PolicyRefine";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "left" << endl;
++      INDENT(indent); os << "left" << std::endl;
+       left->printClass(os, indent + 2);
+-      INDENT(indent); os << "right" << endl;
++      INDENT(indent); os << "right" << std::endl;
+       right->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
+@@ -358,9 +358,9 @@ public:
+       return "PolicyExcept";
+    }
+    virtual void printClass(std::ostream &os, int indent) const {
+-      INDENT(indent); os << "left" << endl;
++      INDENT(indent); os << "left" << std::endl;
+       left->printClass(os, indent + 2);
+-      INDENT(indent); os << "right" << endl;
++      INDENT(indent); os << "right" << std::endl;
+       right->printClass(os, indent + 2);
+    }
+ #endif // DEBUG
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-schema.cc b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-schema.cc
new file mode 100644
index 000000000000..b849e7b9a73b
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpsl-rpsl-schema.cc
@@ -0,0 +1,14 @@
+--- src/rpsl/rpsl/schema.cc.orig	2004-07-30 12:58:15.000000000 +0200
++++ src/rpsl/rpsl/schema.cc
+@@ -53,7 +53,11 @@
+ 
+ #include "config.h"
+ 
++#if (__GNUC__ > 2)
+ #include <ostream>
++#else
++#include <ostream.h>
++#endif
+ #include <cstring>
+ #include <cstdio>
+ #include "gnu/std.h"
diff --git a/net-mgmt/irrtoolset/files/patch-src-rpslcheck-rpslcheck.cc b/net-mgmt/irrtoolset/files/patch-src-rpslcheck-rpslcheck.cc
new file mode 100644
index 000000000000..9ec56126beb3
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-rpslcheck-rpslcheck.cc
@@ -0,0 +1,48 @@
+--- src/rpslcheck/rpslcheck.cc.orig	2004-07-30 12:58:15.000000000 +0200
++++ src/rpslcheck/rpslcheck.cc
+@@ -129,12 +129,12 @@ void init_and_set_options (int argc, cha
+    IRR::handleEnvironmentVariables(envp);
+ 
+    if (ParseArgv(&argc, argv, argTable, ARGV_NO_LEFTOVERS) != ARGV_OK) {
+-      cerr << endl;
++      std::cerr << std::endl;
+       exit(1);
+    }
+ 
+    if (! (irr = IRR::newClient())) {
+-      cerr << "Unknown protocol!" << endl;
++      std::cerr << "Unknown protocol!" << std::endl;
+       exit(1);
+    }
+ 
+@@ -166,7 +166,7 @@ main(int argc, char **argv, char **envp)
+ 	  myAS = atoi(opt_my_as + 2);
+ 	  const AutNum *autnum = irr->getAutNum(myAS);
+           if (!autnum)	{
+-          	cerr << "Error: no object for AS " << myAS << endl;
++          	std::cerr << "Error: no object for AS " << myAS << std::endl;
+ 		exit(1);
+ 	  }
+ 	  o = new Object((Object &) *autnum);
+@@ -180,10 +180,10 @@ main(int argc, char **argv, char **envp)
+        }
+ 
+           if (opt_echo && code)
+-             cout << *o;
++             std::cout << *o;
+ 
+           if (!o->has_error && code)
+-          cout << "Congratulations no errors were found" << endl;
++          std::cout << "Congratulations no errors were found" << std::endl;
+ 
+ 	  delete o;
+ 
+@@ -197,7 +197,7 @@ main(int argc, char **argv, char **envp)
+       schema.printClassStats();
+ 
+    if (opt_prompt)
+-      cout << endl;
++      std::cout << std::endl;
+ 
+    if (opt_rusage)
+       clog << ru;
diff --git a/net-mgmt/irrtoolset/files/patch-src-util-debug.cc b/net-mgmt/irrtoolset/files/patch-src-util-debug.cc
new file mode 100644
index 000000000000..5abc67ba954d
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-util-debug.cc
@@ -0,0 +1,11 @@
+--- src/util/debug.cc.orig	2002-04-09 13:48:49.000000000 +0200
++++ src/util/debug.cc
+@@ -108,7 +108,7 @@ void Abort() {
+ }
+ 
+ void copy_constructor(char *p) {
+-   cerr << "Copy constructor called for " << p << "\n";
++   std::cerr << "Copy constructor called for " << p << std::endl;
+ }
+ 
+ #endif /* DEBUG */
diff --git a/net-mgmt/irrtoolset/files/patch-src-util-debug.hh b/net-mgmt/irrtoolset/files/patch-src-util-debug.hh
new file mode 100644
index 000000000000..7cb862312340
--- /dev/null
+++ b/net-mgmt/irrtoolset/files/patch-src-util-debug.hh
@@ -0,0 +1,14 @@
+--- src/util/debug.hh.orig	2002-04-09 13:48:49.000000000 +0200
++++ src/util/debug.hh
+@@ -75,7 +75,11 @@
+ 
+ #include "config.h"
+ #ifdef DEBUG
++#if (__GNUC__ > 2)
++#include <iostream>
++#else
+ #include <iostream.h>
++#endif
+ 
+ #define DBG_ERR             1
+ #define DBG_INFO            2 
diff --git a/net-mgmt/irrtoolset/pkg-descr b/net-mgmt/irrtoolset/pkg-descr
index 34dc5fe99427..4f99bbe66645 100644
--- a/net-mgmt/irrtoolset/pkg-descr
+++ b/net-mgmt/irrtoolset/pkg-descr
@@ -7,17 +7,6 @@ RtConfig	routing policies analyzer and router configuration tool
 
 peval		a low-level policy evaluation tool
 
-roe		route object editor
-
-CIDRAdvisor	suggests safe cidr aggregates
-
-aoe		autonomous system object editor
-
-prpath		enumerates a list of patchs between ASes and destinations
-
-prtraceroute	prints route and policy information packets take to a
-		network	host
-
 rpslcheck	sytax checks the aut-num policy for an AS. 	
 
 WWW: http://www.isc.org/index.pl?/sw/IRRToolSet/
diff --git a/net-mgmt/irrtoolset/pkg-plist b/net-mgmt/irrtoolset/pkg-plist
deleted file mode 100644
index be6868193bc0..000000000000
--- a/net-mgmt/irrtoolset/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/rpslcheck
-bin/peval
-bin/prpath
-bin/RtConfig
-bin/CIDRAdvisor
-bin/roe
-bin/aoe
-bin/prtraceroute