IRRToolSet is a suite of policy analysis tools to operate with

routing policies in RPSL [RFC 2622] format, registered in an
Internet Routing Registry(IRR). The main goal of the project is
to make routing information more convenient and useful for
network engineers, by providing tools for automated router configuration,
routing policies analysis, and maintenance.

24 files changed, 934 insertions, 0 deletions

diff --git a/net/irrtoolset-nox11/DESCR b/net/irrtoolset-nox11/DESCR
new file mode 100644
index 00000000000..04d667a0b88
--- /dev/null
+++ b/net/irrtoolset-nox11/DESCR
@@ -0,0 +1,13 @@
+IRRToolSet is a suite of policy analysis tools to operate with
+routing policies in RPSL [RFC 2622] format, registered in an
+Internet Routing Registry(IRR). The main goal of the project is
+to make routing information more convenient and useful for
+network engineers, by providing tools for automated router configuration,
+routing policies analysis, and maintenance.
+
+This package contains the programs RtConfig, CIDRAdvisor, peval, prtraceroute,
+prpath and rpslcheck (aka prcheck). It doesn't try to build aoe and roe,
+which want TCL/TK (and X).
+
+IRRToolSet started life as RAToolSet from ISI.edu, was then kept by RIPE NCC
+for a while, and lately transferred to ISC.
diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
new file mode 100644
index 00000000000..4c92257a3eb
--- /dev/null
+++ b/net/irrtoolset-nox11/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+#
+
+DISTNAME=		IRRToolSet-4.8.2
+CATEGORIES=		net
+MASTER_SITES=		ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.2/
+
+MAINTAINER=		spz@NetBSD.org
+HOMEPAGE=		http://www.isc.org/index.pl?/sw/IRRToolSet/
+COMMENT=		The Internet Routing Registry Toolset - client to IRRd
+
+USE_BUILDLINK3=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+
+CONFIGURE_ARGS+=        --without-x
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/net/irrtoolset-nox11/PLIST b/net/irrtoolset-nox11/PLIST
new file mode 100644
index 00000000000..85860d482b1
--- /dev/null
+++ b/net/irrtoolset-nox11/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+bin/RtConfig
+bin/peval
+bin/rpslcheck
+man/man1/CIDRAdvisor.1
+man/man1/Errors.1
+man/man1/RtConfig.1
+man/man1/aoe.1
+man/man1/peval.1
+man/man1/prpath.1
+man/man1/prtraceroute.1
+man/man1/roe.1
+man/man1/rpslcheck.1
+man/man3/librpsl.3
diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo
new file mode 100644
index 00000000000..f434a9cb05f
--- /dev/null
+++ b/net/irrtoolset-nox11/distinfo
@@ -0,0 +1,24 @@
+$NetBSD: distinfo,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+SHA1 (IRRToolSet-4.8.2.tar.gz) = f60a03cb6585503f1ef0b8b7c0a2ce7c39ce999c
+Size (IRRToolSet-4.8.2.tar.gz) = 953222 bytes
+SHA1 (patch-aa) = 1bc20efb77ef9a58bd3aa32b621e7319328db199
+SHA1 (patch-ab) = ab64a710fbe8bccffabddaa1fd214854cf706155
+SHA1 (patch-ac) = cf2807899f68ec0081833087389e5691c99b94a5
+SHA1 (patch-ad) = c64247afcd20fe9e94d165dd731852346ffbfe7c
+SHA1 (patch-ae) = ac445b00790ce0180df627cf4cb5a7f34cabd847
+SHA1 (patch-af) = b028851cc246f0e2119aac61cdfa113fd914ac4d
+SHA1 (patch-ag) = d7eef2f41932977650ed3cd68fe0bf852745d444
+SHA1 (patch-ah) = 8641120cfd49797d4fd2fca53a7f11f04c8fb5b4
+SHA1 (patch-ai) = ec16a78eb24c0a78846bfa370ca11fba09b60f0c
+SHA1 (patch-aj) = bdd8215f482ea203a3387345640b87b421fbfe82
+SHA1 (patch-ak) = 4a47bfdb462b2ec0beaa8dce028be569bc1d4e1e
+SHA1 (patch-al) = 83ee86276245a4431f963d8b6db8feb04598a5ad
+SHA1 (patch-am) = 2f4201b78809849403df63400bb503b134128774
+SHA1 (patch-an) = de98b8d1a60538e8802063679e772104b2df4461
+SHA1 (patch-ao) = 6a9e0bb9552281b0424b5538096a0e2e6af54841
+SHA1 (patch-ap) = 0a87688c453d7576cdaa3dbef1b51c0fb6e8396a
+SHA1 (patch-aq) = a284f9fdacdedc50ee74acded9e4b21dca98de21
+SHA1 (patch-ar) = e3a5beff29dfef654c700116ec593bf401e289b1
+SHA1 (patch-as) = 920af485b7bcc83e95d1923186b46b7a3b16ac97
+SHA1 (patch-at) = ac1f4e401f82bcdea3550ec42621ffa6ff73f06c
diff --git a/net/irrtoolset-nox11/patches/patch-aa b/net/irrtoolset-nox11/patches/patch-aa
new file mode 100644
index 00000000000..d99e7aed9a0
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ab b/net/irrtoolset-nox11/patches/patch-ab
new file mode 100644
index 00000000000..4ee0630b5fa
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ab
@@ -0,0 +1,37 @@
+$NetBSD: patch-ab,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ac b/net/irrtoolset-nox11/patches/patch-ac
new file mode 100644
index 00000000000..d1611ff1f30
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ac
@@ -0,0 +1,76 @@
+$NetBSD: patch-ac,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ad b/net/irrtoolset-nox11/patches/patch-ad
new file mode 100644
index 00000000000..8362e3de4bc
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ad
@@ -0,0 +1,36 @@
+$NetBSD: patch-ad,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ae b/net/irrtoolset-nox11/patches/patch-ae
new file mode 100644
index 00000000000..c84aaf43e70
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-af b/net/irrtoolset-nox11/patches/patch-af
new file mode 100644
index 00000000000..6f2aec68752
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-af
@@ -0,0 +1,25 @@
+$NetBSD: patch-af,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ag b/net/irrtoolset-nox11/patches/patch-ag
new file mode 100644
index 00000000000..600529927dc
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ag
@@ -0,0 +1,98 @@
+$NetBSD: patch-ag,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ah b/net/irrtoolset-nox11/patches/patch-ah
new file mode 100644
index 00000000000..45192376059
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ah
@@ -0,0 +1,25 @@
+$NetBSD: patch-ah,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ai b/net/irrtoolset-nox11/patches/patch-ai
new file mode 100644
index 00000000000..38eb54880dd
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ai
@@ -0,0 +1,54 @@
+$NetBSD: patch-ai,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-aj b/net/irrtoolset-nox11/patches/patch-aj
new file mode 100644
index 00000000000..84c43d02d5d
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- 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/irrtoolset-nox11/patches/patch-ak b/net/irrtoolset-nox11/patches/patch-ak
new file mode 100644
index 00000000000..2a1655fbd62
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ak
@@ -0,0 +1,191 @@
+$NetBSD: patch-ak,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/Core/util/List.hh.orig	2004-07-30 12:58:10.000000000 +0200
++++ src/Core/util/List.hh
+@@ -164,7 +164,7 @@ public:
+ 	ListIterator (const const_ListIterator<T>& cit) : const_ListIterator<T>(cit.list_, cit.ptr_) {}
+ 	ListIterator (const List<T> &l, ListNode *p=0) : const_ListIterator<T>(l, p?p:l.forw) {}
+ 
+-	operator T* () const { return (ptr_==(ListNode*)list_) ? 0 : (T*)ptr_; }
++	operator T* () const { return (const_ListIterator<T>::ptr_==(ListNode*)const_ListIterator<T>::list_) ? 0 : (T*)const_ListIterator<T>::ptr_; }
+ 	T* operator-> () const { return (T*)const_ListIterator<T>::operator->(); }
+ 	ListIterator& operator++ () { // prefix ++
+ 		const_ListIterator<T>::operator++();
+@@ -185,9 +185,9 @@ public:
+ 
+ 	const_ListSearchIterator& operator++ () { // prefix ++
+ 		for (const_ListIterator<T>::operator++();
+-		     ptr_!=(ListNode*)list_;
++		     const_ListIterator<T>::ptr_!=(ListNode*)const_ListIterator<T>::list_;
+ 		     const_ListIterator<T>::operator++()) {
+-			if (((T*)ptr_)->isKey(key_)) break;
++			if (((T*)const_ListIterator<T>::ptr_)->isKey(key_)) break;
+ 		}
+ 		return *this;
+ 	}
+@@ -212,7 +212,7 @@ public:
+ 		: const_ListSearchIterator<T, Key>(k, l, p?p:(ListNode*)&l) {}
+ 	
+ 
+-	operator T* () const { return (ptr_==(ListNode*)list_) ? 0 : (T*)ptr_; }
++	operator T* () const { return (const_ListIterator<T>::ptr_==(ListNode*)const_ListIterator<T>::list_) ? 0 : (T*)const_ListIterator<T>::ptr_; }
+ 	T* operator-> () const { return (T*)const_ListIterator<T>::operator->(); }
+ 	ListSearchIterator& operator++ () { // prefix ++
+ 		const_ListSearchIterator<T,Key>::operator++();
+@@ -407,11 +407,11 @@ public:
+ 	 *      (A1 A2 A3) and (A4 B C), where A1==A2==A3==A4,
+ 	 *  will be equal. 
+ 	 */
+-      if (length != b.length)
++      if (List<T>::length != b.length)
+ 	 return false;
+ 
+       ListNode *e, *e2;
+-      for (e = forw; e != (ListNode*)this; e = e->forw) {
++      for (e = List<T>::forw; e != (ListNode*)this; e = e->forw) {
+ 	 for (e2 = b.forw; e2 != (const ListNode*) &b; e2 = e2->forw)
+ 	    if (*(T*)e == *(T*)e2)
+ 	       break;
+@@ -451,31 +451,31 @@ public:
+      
+    void insertSorted(T *t) {
+       ListNode *e;
+-      for (e = forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw)
++      for (e = List<T>::forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw)
+ 	 ;
+ 
+       if (e != (ListNode*)this)
+ 	 t->__link__(e->back, e);
+       else
+-	 t->__link__(back, this);
++	 t->__link__(List<T>::back, this);
+ 
+-      length++;
++      List<T>::length++;
+    }
+ 
+    bool insertSortedNoDups(T *t) {
+       ListNode *e;
+-      for (e = forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw)
++      for (e = List<T>::forw; e != (ListNode*)this && (*(T*)e < *t); e = e->forw)
+ 	 ;
+       
+       if (e != (ListNode*)this) {
+ 	 if (!(*(T*)e == *t)) {
+ 	    t->__link__(e->back, e);
+-	    length++;
++	    List<T>::length++;
+ 	    return true;
+ 	 }
+       } else {
+-	 t->__link__(back, this);
+-	 length++;
++	 t->__link__(List<T>::back, this);
++	 List<T>::length++;
+ 	    return true;
+       }
+       return false;
+@@ -484,7 +484,7 @@ public:
+    // do a sorted merge
+    void splice(SortedList& l) {
+       ListNode *t;
+-      ListNode *e = forw;
++      ListNode *e = List<T>::forw;
+       while (!l.isEmpty()) {
+ 	 t = l.forw;
+ 	 t->__unlink__();
+@@ -495,16 +495,16 @@ public:
+ 	 if (e != (ListNode*)this)
+ 	    t->__link__(e->back, e);
+ 	 else
+-	    t->__link__(back, this);
++	    t->__link__(List<T>::back, this);
+       }
+ 
+-      length += l.length;
++      List<T>::length += l.length;
+    }
+ 
+    // do a sorted merge
+    void splice(List<T>& l) {
+       ListNode *t;
+-      ListNode *e = forw;
++      ListNode *e = List<T>::forw;
+       while (!l.isEmpty()) {
+ 	 t = l.forw;
+ 	 t->__unlink__();
+@@ -514,7 +514,7 @@ public:
+    // sorted merge no dups
+    void spliceNoDups(SortedList& l) {
+       ListNode *t;
+-      ListNode *e = forw;
++      ListNode *e = List<T>::forw;
+       while (!l.isEmpty()) {
+    t = l.forw;
+    t->__unlink__();
+@@ -527,16 +527,16 @@ public:
+         t->__link__(e->back, e);
+    }
+    else
+-      t->__link__(back, this);
++      t->__link__(List<T>::back, this);
+       }
+ 
+-      length += l.length;
++      List<T>::length += l.length;
+    }
+   
+   
+ 
+    T* find(const T &t) const {
+-      for (ListNode *e = forw; e != (const ListNode*)this; e = e->forw)
++      for (ListNode *e = List<T>::forw; e != (const ListNode*)this; e = e->forw)
+ 	 if (*(T*)e == t)
+ 		 return (T*)e;
+ 	 else if (!(*(T*)e < t))
+@@ -572,37 +572,37 @@ public:
+    }
+ 
+    WRRListIterator& operator++ () { // prefix ++
+-      ListNode *position = ptr_;
++      ListNode *position = ListIterator<T>::ptr_;
+ 
+       for (ListIterator<T>::operator++ (); 
+ 	   *this; 
+ 	   ListIterator<T>::operator++ ())
+-	 if ((*uniform_)() < ((T *) ptr_)->weight())
++	 if ((*uniform_)() < ((T *) ListIterator<T>::ptr_)->weight())
+ 	    return *this;
+ 
+       // we do this twice to handle circular queue
+       for (ListIterator<T>::operator++ (); 
+-	   ptr_ != position; 
++	   ListIterator<T>::ptr_ != position; 
+ 	   ListIterator<T>::operator++ ())
+-	 if ((*uniform_)() < ((T *) ptr_)->weight())
++	 if ((*uniform_)() < ((T *) ListIterator<T>::ptr_)->weight())
+ 	    return *this;
+       return *this;
+    }
+ 
+    WRRListIterator& operator-- () { // prefix --
+-      ListNode *position = ptr_;
++      ListNode *position = ListIterator<T>::ptr_;
+ 
+       for (ListIterator<T>::operator-- (); 
+ 	   *this; 
+ 	   ListIterator<T>::operator-- ())
+-	 if ((*uniform_)() < ((T *) ptr_)->weight())
++	 if ((*uniform_)() < ((T *) ListIterator<T>::ptr_)->weight())
+ 	    return *this;
+ 
+       // we do this twice to handle circular queue
+       for (ListIterator<T>::operator-- (); 
+-	   ptr_ != position; 
++	   ListIterator<T>::ptr_ != position; 
+ 	   ListIterator<T>::operator-- ())
+-	 if ((*uniform_)() < ((T *) ptr_)->weight())
++	 if ((*uniform_)() < ((T *) ListIterator<T>::ptr_)->weight())
+ 	    return *this;
+       return *this;
+    }
diff --git a/net/irrtoolset-nox11/patches/patch-al b/net/irrtoolset-nox11/patches/patch-al
new file mode 100644
index 00000000000..31ea4728d87
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- 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;
+@@ -348,7 +348,7 @@ public:
+       peerAS(_peerAS) {
+ 	// Has to be called here again in order to get things right!
+ 	// It's not perfect but it works
+-	first();	
++	AttrIterator<AttrType>::first();	
+    }
+ };
+ 
diff --git a/net/irrtoolset-nox11/patches/patch-am b/net/irrtoolset-nox11/patches/patch-am
new file mode 100644
index 00000000000..7b4fd6bc6e7
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-am
@@ -0,0 +1,74 @@
+$NetBSD: patch-am,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/normalform/IPv6RadixSet.hh.orig	2004-07-30 12:58:12.000000000 +0200
++++ src/normalform/IPv6RadixSet.hh
+@@ -74,7 +74,8 @@ extern ip_v6word_t ipv6bits[];
+ 
+ class IPv6RadixTree {
+ public:
+-   friend class Iterator {
++   friend class Iterator;
++   class Iterator {
+    private:
+       const IPv6RadixTree* last;
+       const IPv6RadixTree* root;
+@@ -152,7 +153,8 @@ class IPv6RadixSet {
+ public:
+    static bool compressedPrint;
+ 
+-   friend class Iterator {
++   friend class Iterator;
++   class Iterator {
+    private:
+       IPv6RadixTree::Iterator itr;
+       const IPv6RadixTree *now;     // points to current node during iteration
+@@ -163,7 +165,8 @@ public:
+       bool next(ipv6_addr_t &_addr, u_int &_leng, ipv6_addr_t &rngs);
+    };
+ 
+-   friend class SortedIterator {
++   friend class SortedIterator;
++   class SortedIterator {
+    private:
+       class PrefixLNode : public ListNode {
+       public:
+@@ -187,7 +190,8 @@ public:
+       bool next(ipv6_addr_t &_addr, u_int &_leng, ipv6_addr_t &_rngs);
+    };
+ 
+-   friend class PrefixIterator {
++   friend class PrefixIterator;
++   class PrefixIterator {
+    private:
+       IPv6RadixTree::Iterator itr;
+       const IPv6RadixTree *current;
+@@ -204,7 +208,8 @@ public:
+       bool next(ipv6_addr_t &_addr, u_int &_leng);
+    };
+ 
+-   friend class SortedPrefixIterator {
++   friend class SortedPrefixIterator;
++   class SortedPrefixIterator {
+    private:
+       class PrefixLNode : public ListNode {
+       public:
+@@ -227,7 +232,8 @@ public:
+       bool next(ipv6_addr_t &_addr, u_int &_leng);
+    };
+ 
+-   friend class PrefixRangeIterator {
++   friend class PrefixRangeIterator;
++   class PrefixRangeIterator {
+    private:
+       IPv6RadixTree::Iterator itr;
+       const IPv6RadixTree *current;
+@@ -260,7 +266,8 @@ public:
+ */
+    };
+ 
+-   friend class SortedPrefixRangeIterator {
++   friend class SortedPrefixRangeIterator;
++   class SortedPrefixRangeIterator {
+    private:
+       class PrefixLNode : public ListNode {
+       public:
diff --git a/net/irrtoolset-nox11/patches/patch-an b/net/irrtoolset-nox11/patches/patch-an
new file mode 100644
index 00000000000..9066872ef37
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-an
@@ -0,0 +1,74 @@
+$NetBSD: patch-an,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/normalform/RadixSet.hh.orig	2004-07-30 12:58:13.000000000 +0200
++++ src/normalform/RadixSet.hh
+@@ -76,7 +76,8 @@ extern FixedSizeAllocator RadixTreeAlloc
+ 
+ class RadixTree {
+ public:
+-   friend class Iterator {
++   friend class Iterator;
++   class Iterator {
+    private:
+       const RadixTree* last;
+       const RadixTree* root;
+@@ -155,7 +156,8 @@ class RadixSet {
+ public:
+    static bool compressedPrint;
+ 
+-   friend class Iterator {
++   friend class Iterator;
++   class Iterator {
+    private:
+       RadixTree::Iterator itr;
+       const RadixTree *now;     // points to current node during iteration
+@@ -166,7 +168,8 @@ public:
+       bool next(u_int &_addr, u_int &_leng, u_int64_t &rngs);
+    };
+ 
+-   friend class SortedIterator {
++   friend class SortedIterator;
++   class SortedIterator {
+    private:
+       class PrefixLNode : public ListNode {
+       public:
+@@ -189,7 +192,8 @@ public:
+       bool next(u_int &_addr, u_int &_leng, u_int64_t &_rngs);
+    };
+ 
+-   friend class PrefixIterator {
++   friend class PrefixIterator;
++   class PrefixIterator {
+    private:
+       RadixTree::Iterator itr;
+       const RadixTree *current;
+@@ -206,7 +210,8 @@ public:
+       bool next(u_int &_addr, u_int &_leng);
+    };
+ 
+-   friend class SortedPrefixIterator {
++   friend class SortedPrefixIterator;
++   class SortedPrefixIterator {
+    private:
+       class PrefixLNode : public ListNode {
+       public:
+@@ -228,7 +233,8 @@ public:
+       bool next(u_int &_addr, u_int &_leng);
+    };
+ 
+-   friend class PrefixRangeIterator {
++   friend class PrefixRangeIterator;
++   class PrefixRangeIterator {
+    private:
+       RadixTree::Iterator itr;
+       const RadixTree *current;
+@@ -259,7 +265,8 @@ public:
+       }
+    };
+ 
+-   friend class SortedPrefixRangeIterator {
++   friend class SortedPrefixRangeIterator;
++   class SortedPrefixRangeIterator {
+    private:
+       class PrefixLNode : public ListNode {
+       public:
diff --git a/net/irrtoolset-nox11/patches/patch-ao b/net/irrtoolset-nox11/patches/patch-ao
new file mode 100644
index 00000000000..48a1fba5d04
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ao
@@ -0,0 +1,17 @@
+$NetBSD: patch-ao,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/util/Stack.hh.orig	2005-02-26 11:50:00.000000000 +0100
++++ src/util/Stack.hh
+@@ -100,9 +100,9 @@ class BoundedStack : BoundedQueue<TYPE> 
+ public:
+    BoundedStack(int size) : BoundedQueue<TYPE>(size) {}
+    void push(TYPE elt) { enq(elt); }
+-   TYPE pop() { return q[--last]; }
+-   int getPosition() { return last; }
+-   void setPosition(int pos) { last = pos; }
++   TYPE pop() { return BoundedQueue<TYPE>::q[--BoundedQueue<TYPE>::last]; }
++   int getPosition() { return BoundedQueue<TYPE>::last; }
++   void setPosition(int pos) { BoundedQueue<TYPE>::last = pos; }
+    void clear() {
+       BoundedQueue<TYPE>::clear();
+    }
diff --git a/net/irrtoolset-nox11/patches/patch-ap b/net/irrtoolset-nox11/patches/patch-ap
new file mode 100644
index 00000000000..e4d938c7931
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/normalform/NE.cc.orig	2004-07-30 12:58:12.000000000 +0200
++++ src/normalform/NE.cc
+@@ -355,7 +355,10 @@ NormalExpression *NormalExpression::eval
+    if (typeid(*ptree) == typeid(FilterAFI)) {
+    
+       ne = evaluate(((FilterAFI *) ptree)->f, peerAS, expand);
+-      ne->restrict((FilterAFI *) ptree);
++/* patch NE.cc-20040805.patch by RIPE NCC, but pkgsrc'ified */
++      if ((ne->singleton_flag == NormalTerm::PRFX) ||
++          (ne->singleton_flag == NormalTerm::IPV6_PRFX))
++         ne->restrict((FilterAFI *) ptree);
+       Debug(Channel(DBG_NOT) << "op1: " << *ne << "\n");
+       Debug(Channel(DBG_NOT) << "afi: " << *ne << "\n");
+       return ne;
diff --git a/net/irrtoolset-nox11/patches/patch-aq b/net/irrtoolset-nox11/patches/patch-aq
new file mode 100644
index 00000000000..2082f2595ae
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1.1.1 2005/02/28 12:37:29 spz Exp $
+
+--- src/rpsl/gnu/PrefixRange.Plex.h.orig	2002-03-27 12:33:00.000000000 +0100
++++ src/rpsl/gnu/PrefixRange.Plex.h
+@@ -288,7 +288,7 @@ inline  PrefixRange* PrefixRangeIChunk::
+ 
+ inline  int  PrefixRangeIChunk:: index_of(const PrefixRange* p) const
+ {
+-  return ((int)p - (int)data) / sizeof(PrefixRange) + base;
++  return (p - data) + base;
+ }
+ 
+ inline  int  PrefixRangeIChunk:: possible_index(int i) const
diff --git a/net/irrtoolset-nox11/patches/patch-ar b/net/irrtoolset-nox11/patches/patch-ar
new file mode 100644
index 00000000000..72689357d16
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/gnug++/unsigned.Plex.h.orig	2002-03-27 12:32:57.000000000 +0100
++++ src/gnug++/unsigned.Plex.h
+@@ -288,7 +288,7 @@ inline  unsigned* unsignedIChunk:: point
+ 
+ inline  int  unsignedIChunk:: index_of(const unsigned* p) const
+ {
+-  return ((int)p - (int)data) / sizeof(unsigned) + base;
++  return (p - data) + base;
+ }
+ 
+ inline  int  unsignedIChunk:: possible_index(int i) const
diff --git a/net/irrtoolset-nox11/patches/patch-as b/net/irrtoolset-nox11/patches/patch-as
new file mode 100644
index 00000000000..a3fce685f16
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-as
@@ -0,0 +1,29 @@
+$NetBSD: patch-as,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/irr/cache.hh.orig	2002-04-09 13:48:47.000000000 +0200
++++ src/irr/cache.hh
+@@ -77,13 +77,13 @@ public:
+    Cache(void) : CacheKeyCacheValueAVLMap(cDefaultValue) {}
+    // Add stuff into cache 
+    bool add(K aKey, V aValue) {
+-      (*this)[(CacheKey)aKey] = CacheValue(aValue);
++      (*this)[(CacheKey)(intptr_t)aKey] = CacheValue(aValue);
+       return true;
+    }
+    ~Cache(void) { clear(); }
+    // Retrieve stuff from cache
+    bool query(K aKey, V &arValue) {
+-      CacheValue *pcValue = &(*this)[(CacheKey)aKey];
++      CacheValue *pcValue = &(*this)[(CacheKey)(intptr_t)aKey];
+       // if not found, it always return default value: cDefaultValue
+       // we never increase count of default value, so, it's safe to determine
+       // cache miss by just checking the reference count to see if it's 0
+@@ -97,7 +97,7 @@ public:
+ 	 return false;
+    }
+    void nullify(K aKey) {
+-      CacheValue *pcValue = &(*this)[(CacheKey)aKey];
++      CacheValue *pcValue = &(*this)[(CacheKey)(intptr_t)aKey];
+       pcValue->pvData = NULL;
+    }
+    // Override the function on the base class
diff --git a/net/irrtoolset-nox11/patches/patch-at b/net/irrtoolset-nox11/patches/patch-at
new file mode 100644
index 00000000000..280aec6090e
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+
+--- src/rpsl/gnu/SymID.VHSet.cc.orig	2002-03-27 12:33:00.000000000 +0100
++++ src/rpsl/gnu/SymID.VHSet.cc
+@@ -174,7 +174,7 @@ Pix SymIDVHSet::first() const
+ void SymIDVHSet::next(Pix& i) const
+ {
+   if (i == 0) return;
+-  unsigned int pos = ((unsigned)i - (unsigned)tab) / sizeof(SymID) + 1;
++  unsigned int pos = ((SymID *)i - tab) + 1;
+   for (; pos < size; ++pos)
+     if (status[pos] == VALIDCELL)
+     {