add new option -asplain that makes extended autnums be output as simple numbers

instead of in asdot format.

18 files changed, 261 insertions, 39 deletions

diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index a771fa2738a..e6d34179f27 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/08/03 22:43:39 spz Exp $
+# $NetBSD: Makefile,v 1.20 2009/02/14 16:17:06 spz Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.5
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=		net
 MASTER_SITES=	ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
 
diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo
index adf50e40588..88cefe5fdb2 100644
--- a/net/irrtoolset-nox11/distinfo
+++ b/net/irrtoolset-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2008/08/03 22:43:39 spz Exp $
+$NetBSD: distinfo,v 1.19 2009/02/14 16:17:06 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -32,28 +32,35 @@ SHA1 (patch-cp) = 0a43934c17d418e29588ef2ffb77ea1957133fc2
 SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720
 SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68
 SHA1 (patch-cs) = dbd30b057019ae78f753e0d81df8175452d0abda
-SHA1 (patch-ct) = 52dd5f46a91bf313627b9975f186aede822dc7eb
+SHA1 (patch-ct) = fe8a85d7bc3e3871ba67140b7bf756bcdc4d1e45
 SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861
 SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4
-SHA1 (patch-cw) = 9cc60fdf9566a74d810d7d5d36cd44b3ecbfba14
+SHA1 (patch-cw) = 82116da916ae1c364b0188d7991cfb343305c0d7
 SHA1 (patch-cx) = 102a37b057b9a86bb509578d8c46601f068cd760
 SHA1 (patch-cy) = d5761e8fec3c4c591082361ad99ba2c37178de0a
-SHA1 (patch-cz) = 8df488621dbe452720fca277ca60c852a9b55433
-SHA1 (patch-da) = 7269e4e29288a5a2e4d5d33bb17b067b14ff007d
+SHA1 (patch-cz) = acb4b231c1369b9986460949d2caff8cce1a3015
+SHA1 (patch-da) = d6dbf1a503eaf8e2737bc2dfec79590ff5433930
 SHA1 (patch-db) = 8d82cc3825185c19441266f8d4a6860965a250ce
 SHA1 (patch-dc) = b44f42f61e2c81813a0aa4b773ee1bbb6919c2a8
-SHA1 (patch-dd) = dc5ceed77ee5e0a871bc8ea75a5059297e5ec3e9
+SHA1 (patch-dd) = c2657b129e8dd410fa89da69a0596830c13a9860
 SHA1 (patch-de) = 0dccfc915f66c5e35ac0858ebcf5ee85767300be
-SHA1 (patch-df) = 176d2186b72c40334190d5635677104241c06e74
+SHA1 (patch-df) = 44de4b706d9259e6479c23029088f899cd091d35
 SHA1 (patch-dg) = 5f3fe95a69cdf1d3eb13b4e2a3a3fce1f4c53168
 SHA1 (patch-dh) = ce1218fe7d82e3bb5c470cd74b334400aebd1928
-SHA1 (patch-di) = ab0fa75329575141844ff55698a21060c2b62e43
+SHA1 (patch-di) = 294cb20c8327f35a73a8501f9cc24e7acf850a15
 SHA1 (patch-dj) = 25258cbb8e544f0eda9ed6ac4f9f61825266bfdd
 SHA1 (patch-dk) = a1632fa3030ee483c99af5ef039e494295af0b7f
 SHA1 (patch-dl) = 85ab29170a0ce1f82f3058bd58b00c779684fbca
 SHA1 (patch-dm) = 8b881b07a7101a1bc745dda79d7ec87df52e344b
 SHA1 (patch-do) = 8f85b97d5067e08a07fe95cb5a7eae84e9f459e3
-SHA1 (patch-dp) = 3ab3098687a4c2999b20b9910399099a073a28e5
+SHA1 (patch-dp) = 0b5ee0579aab4d112d10e619e7059bf0b5afb7f0
 SHA1 (patch-dq) = 6004e46320b790ac4e1bc4488e3eb327af84299b
-SHA1 (patch-dr) = 1cd08511085634bb465e8a900ff8428262597ffc
+SHA1 (patch-dr) = 3ecae72db6ec932736456d61e2abc53e225b2a5d
 SHA1 (patch-ds) = 1dbe3e743991a28a8e80d48be1bd5d1b890a6f42
+SHA1 (patch-dt) = 19e99c706423936dba31f28840a25055440f3bd1
+SHA1 (patch-du) = 602f913a53a5f274eba4725d6b3b91512fe9b5ac
+SHA1 (patch-dv) = ad1d221e3e272dadde27171fbef0ae1cb23c3ed8
+SHA1 (patch-dw) = a77b3a6875f247db1809e66739f80bf3e82c17f9
+SHA1 (patch-dx) = 32c1b30201af1c4bb58e274d29bbc6ceb04668df
+SHA1 (patch-dy) = 7fb4e6f1e0b41e0ce737cd8ea9bf90b05c6d45f3
+SHA1 (patch-dz) = e9b7e4602cf88df8bf797b3143e91655350ae90f
diff --git a/net/irrtoolset-nox11/patches/patch-ct b/net/irrtoolset-nox11/patches/patch-ct
index 71253f7ff9a..6dac485a62f 100644
--- a/net/irrtoolset-nox11/patches/patch-ct
+++ b/net/irrtoolset-nox11/patches/patch-ct
@@ -1,7 +1,34 @@
-$NetBSD: patch-ct,v 1.1 2007/09/07 21:26:31 spz Exp $
+$NetBSD: patch-ct,v 1.2 2009/02/14 16:17:06 spz Exp $
 
 --- src/rpsl/rpsl/rptype.cc.orig	2006-06-08 17:16:26.000000000 +0200
 +++ src/rpsl/rpsl/rptype.cc
+@@ -254,7 +254,7 @@ Item *RPTypeWord::typeCast(const Item  *
+ 	 return new ItemWORD(strdup("false"));
+    if (typeid(*item) == typeid(ItemASNO)) {
+       char buffer[64];
+-      sprintf(buffer, "AS%d", ((ItemASNO *) item)->asno);
++      asnum_string(buffer, ((ItemASNO *) item)->asno);
+       return new ItemWORD(strdup(buffer));
+    }
+ 
+@@ -285,7 +285,7 @@ Item *RPTypeBlob::typeCast(const Item  *
+ 	 return new ItemBLOB(strdup("false"));
+    if (typeid(*item) == typeid(ItemASNO)) {
+       char buffer[64];
+-      sprintf(buffer, "AS%d", ((ItemASNO *) item)->asno);
++      asnum_string(buffer, ((ItemASNO *) item)->asno);
+       return new ItemWORD(strdup(buffer));
+    }
+ 
+@@ -367,7 +367,7 @@ Item *RPTypeEnum::typeCast(const Item  *
+ 	 w = new ItemWORD(strdup("false"));
+    if (typeid(*item) == typeid(ItemASNO)) {
+       char buffer[64];
+-      sprintf(buffer, "AS%d", ((ItemASNO *) item)->asno);
++      asnum_string(buffer, ((ItemASNO *) item)->asno);
+       w = new ItemWORD(strdup(buffer));
+    }
+ 
 @@ -388,8 +388,7 @@ bool RPTypeBoolean::validate(const Item 
  ////////////////////////////// RPTypeASNumber ////////////////////
  
diff --git a/net/irrtoolset-nox11/patches/patch-cw b/net/irrtoolset-nox11/patches/patch-cw
index 711739bd056..223de8313d6 100644
--- a/net/irrtoolset-nox11/patches/patch-cw
+++ b/net/irrtoolset-nox11/patches/patch-cw
@@ -1,4 +1,4 @@
-$NetBSD: patch-cw,v 1.1 2007/09/07 21:26:32 spz Exp $
+$NetBSD: patch-cw,v 1.2 2009/02/14 16:17:06 spz Exp $
 
 --- src/rpsl/rpsl/rpsl_item.cc.orig	2006-06-08 17:16:26.000000000 +0200
 +++ src/rpsl/rpsl/rpsl_item.cc
@@ -9,7 +9,7 @@ $NetBSD: patch-cw,v 1.1 2007/09/07 21:26:32 spz Exp $
 -   out << "AS" << asno;
 +   char buffer[64];
 +   asnum_string(buffer, asno);
-+   out << "AS" << buffer;
++   out << buffer;
     return out;
  }
  
diff --git a/net/irrtoolset-nox11/patches/patch-cz b/net/irrtoolset-nox11/patches/patch-cz
index 93d6e1ac0cc..2a7ffafa7b8 100644
--- a/net/irrtoolset-nox11/patches/patch-cz
+++ b/net/irrtoolset-nox11/patches/patch-cz
@@ -1,14 +1,16 @@
-$NetBSD: patch-cz,v 1.1 2007/09/07 21:26:32 spz Exp $
+$NetBSD: patch-cz,v 1.2 2009/02/14 16:17:06 spz Exp $
 
---- src/rpsl/rpsl/rpsl_asnum.hh.orig	2007-09-07 22:05:27.000000000 +0200
+--- src/rpsl/rpsl/rpsl_asnum.hh.orig	2009-02-13 22:35:13.000000000 +0100
 +++ src/rpsl/rpsl/rpsl_asnum.hh
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,15 @@
 +#ifndef ASNUM_HH
 +#define ASNUM_HH 1
 +
++extern bool opt_asdot;
++
 +inline int asnum_string(char *buf, unsigned int asno)
 +{
-+   if (asno > 65535)
++   if (asno > 65535 && opt_asdot)
 +      return sprintf(buf, "AS%d.%d", asno>>16, asno&0xffff);
 +   else
 +      return sprintf(buf, "AS%d", asno);
diff --git a/net/irrtoolset-nox11/patches/patch-da b/net/irrtoolset-nox11/patches/patch-da
index 1fb34655ba7..1d7b8fbc776 100644
--- a/net/irrtoolset-nox11/patches/patch-da
+++ b/net/irrtoolset-nox11/patches/patch-da
@@ -1,8 +1,26 @@
-$NetBSD: patch-da,v 1.1 2007/09/07 21:26:33 spz Exp $
+$NetBSD: patch-da,v 1.2 2009/02/14 16:17:06 spz Exp $
 
 --- src/aoe/aoe.cc.orig	2002-04-09 13:48:46.000000000 +0200
 +++ src/aoe/aoe.cc
-@@ -275,7 +275,7 @@ TclList &operator<<(TclList &tl, List<AS
+@@ -106,6 +106,7 @@ Rusage ru(clog, &opt_rusage);
+ char *opt_my_as  = NULL;
+ char *opt_rcfile = NULL;
+ char *display    = NULL;
++bool opt_asdot   = true;
+ ASt myAS         = 0;
+ 
+ 
+@@ -153,6 +154,9 @@ void init_and_set_options (int argc, cha
+ 
+       IRR_COMMAND_LINE_OPTIONS,
+ 
++      {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot,
++       "print AS numbers in asplain format."},
++
+       // aoe specific arguments
+       {"-as",  ARGV_STRING,     (char *)NULL, (char *) &opt_my_as,
+        "AS number of the aut-num object to use"},
+@@ -275,7 +279,7 @@ TclList &operator<<(TclList &tl, List<AS
  	pcASPeer;
  	pcASPeer = lh.next(pcASPeer))
        {
@@ -11,7 +29,7 @@ $NetBSD: patch-da,v 1.1 2007/09/07 21:26:33 spz Exp $
        switch (pcASPeer->getType())
  	 {
  	 case dASPeerFromIRR:
-@@ -662,8 +662,8 @@ int ListPeer::command(int argc, char *ar
+@@ -662,8 +666,8 @@ int ListPeer::command(int argc, char *ar
     ASt tPeerAS      = pcApp->getASPeerNo(iPeerASIndex);
     
     char pzcMyAS[16], pzcPeerAS[16];
@@ -22,7 +40,7 @@ $NetBSD: patch-da,v 1.1 2007/09/07 21:26:33 spz Exp $
  
     // Setup $PeerAS properly
     if (!pcApp->evalf("set PeerAS %s", pzcPeerAS)) return TCL_ERROR;
-@@ -1093,7 +1093,7 @@ AoeApplication::AoeApplication(char *pzc
+@@ -1093,7 +1097,7 @@ AoeApplication::AoeApplication(char *pzc
     pcPolicyShowButton(NULL),
     pcStatusLine(NULL)
  {
diff --git a/net/irrtoolset-nox11/patches/patch-dd b/net/irrtoolset-nox11/patches/patch-dd
index da0b9e82f37..09e48d8bd01 100644
--- a/net/irrtoolset-nox11/patches/patch-dd
+++ b/net/irrtoolset-nox11/patches/patch-dd
@@ -1,4 +1,4 @@
-$NetBSD: patch-dd,v 1.1 2007/09/07 21:26:33 spz Exp $
+$NetBSD: patch-dd,v 1.2 2009/02/14 16:17:06 spz Exp $
 
 --- src/roe/route-list.cc.orig	2002-06-18 13:00:11.000000000 +0200
 +++ src/roe/route-list.cc
@@ -18,7 +18,7 @@ $NetBSD: patch-dd,v 1.1 2007/09/07 21:26:33 spz Exp $
 -      sprintf(line + strlen(line), "  %s:AS%d", p->db, p->as);
 +   for (p = vr->db_as_l.head(); p; p = vr->db_as_l.next(p)) {
 +      asnum_string(buf, p->as);
-+	  sprintf(line + strlen(line), "  %s:%s", p->db, buf);
++      sprintf(line + strlen(line), "  %s:%s", p->db, buf);
 +   }
  
     return line;
@@ -38,8 +38,8 @@ $NetBSD: patch-dd,v 1.1 2007/09/07 21:26:33 spz Exp $
     if (registered_routes->isEmpty()) {
 -     tcl_Eval("showWarning { No route for AS%d}", as);
 +     char buf[64];
-+	 asnum_string(buf, as);
-+	 tcl_Eval("showWarning { No route for %s}", buf);
++     asnum_string(buf, as);
++     tcl_Eval("showWarning { No route for %s}", buf);
       return;
     }
  
diff --git a/net/irrtoolset-nox11/patches/patch-df b/net/irrtoolset-nox11/patches/patch-df
index ff1f06737f7..964e8ec3d85 100644
--- a/net/irrtoolset-nox11/patches/patch-df
+++ b/net/irrtoolset-nox11/patches/patch-df
@@ -1,8 +1,16 @@
-$NetBSD: patch-df,v 1.1 2007/09/07 21:26:33 spz Exp $
+$NetBSD: patch-df,v 1.2 2009/02/14 16:17:06 spz Exp $
 
 --- src/prtraceroute/prtraceroute.cc.orig	2002-04-09 13:48:47.000000000 +0200
 +++ src/prtraceroute/prtraceroute.cc
-@@ -171,6 +171,7 @@ main (int argc, char **argv, char **envp
+@@ -103,6 +103,7 @@
+ extern IRR * irr;  // defined in irr.cc
+ 
+ int  opt_rusage         = 0;
++int  opt_asdot          = true;
+ 
+ int policy_flag = 1;
+ int nflag = 0;
+@@ -171,6 +172,7 @@ main (int argc, char **argv, char **envp
    ICMPProbeReply reply;		    // wait for incoming icmp's
    Timer t1, t2;
    int ttl, got_there = 0, unreachable = 0;
@@ -10,7 +18,7 @@ $NetBSD: patch-df,v 1.1 2007/09/07 21:26:33 spz Exp $
  
    printf ("prtraceroute to %s (%s), %d hops max, %d byte packets\n",
            dst, dstip->getIpaddr(), max_ttl, datalen);
-@@ -192,7 +193,8 @@ main (int argc, char **argv, char **envp
+@@ -192,7 +194,8 @@ main (int argc, char **argv, char **envp
              ipAddr *ipaddr = new ipAddr (newaddr);
              if (policy_flag) {
                path.addHop(ipaddr, ttl);
@@ -20,7 +28,17 @@ $NetBSD: patch-df,v 1.1 2007/09/07 21:26:33 spz Exp $
              }
              if (!nflag) {
                printf (" %s (%s)", ipaddr->getName(),
-@@ -690,6 +692,7 @@ Path::process_policies()  {
+@@ -401,6 +404,9 @@ init_and_set_options (int argc, char **a
+ 
+       IRR_COMMAND_LINE_OPTIONS,
+ 
++      {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot,
++       "print AS numbers in asplain format."},
++
+       // prtraceroute specific arguments
+       {"-g", ARGV_FUNC, (char *)gFlag, (char *)NULL,
+        "Gateway"},
+@@ -690,6 +696,7 @@ Path::process_policies()  {
    const AutNum * autnum;
    
    char test[80];
@@ -28,7 +46,7 @@ $NetBSD: patch-df,v 1.1 2007/09/07 21:26:33 spz Exp $
    
    actiondictionary = new ActionDictionary;
  
-@@ -796,7 +799,8 @@ Path::process_policies()  {
+@@ -796,7 +803,8 @@ Path::process_policies()  {
    for (i = last_ttl; i >= 0; i--) {
      if (hops[i] != NULL) {
        //cout << i << "   AS" << getHopAS(i) << " ";
diff --git a/net/irrtoolset-nox11/patches/patch-di b/net/irrtoolset-nox11/patches/patch-di
index 745523fdf33..3b8918c226d 100644
--- a/net/irrtoolset-nox11/patches/patch-di
+++ b/net/irrtoolset-nox11/patches/patch-di
@@ -1,6 +1,6 @@
-$NetBSD: patch-di,v 1.1 2007/09/07 21:26:34 spz Exp $
+$NetBSD: patch-di,v 1.2 2009/02/14 16:17:06 spz Exp $
 
---- src/irr/birdwhoisc.cc.orig	2007-09-07 22:15:31.000000000 +0200
+--- src/irr/birdwhoisc.cc.orig	2006-10-09 18:05:14.000000000 +0200
 +++ src/irr/birdwhoisc.cc
 @@ -429,7 +429,11 @@ int BirdWhoisClient::getSourceOrigin(cha
  	AttrGenericIterator<ItemASNO> itrOrigin(itrObject, "origin");
diff --git a/net/irrtoolset-nox11/patches/patch-dp b/net/irrtoolset-nox11/patches/patch-dp
index 1b009279299..102742847da 100644
--- a/net/irrtoolset-nox11/patches/patch-dp
+++ b/net/irrtoolset-nox11/patches/patch-dp
@@ -1,8 +1,18 @@
-$NetBSD: patch-dp,v 1.1 2008/03/08 11:00:35 spz Exp $
+$NetBSD: patch-dp,v 1.2 2009/02/14 16:17:06 spz Exp $
 
 --- man/man1/peval.1.orig	2006-10-01 13:23:32.000000000 +0200
 +++ man/man1/peval.1
-@@ -199,7 +199,7 @@ Fails if couldn't evaluate the filter to
+@@ -137,6 +137,9 @@ Do not expand anything.
+ Do a prior symbolic evaluation, then do the expansions and then
+ re-evaluate.
+ This may be faster for some policies.
++.IP \-asplain
++Print AS numbers as asplain, i.e. as unstructured number;
++default is to use the more human readable asdot format.
+ .IP -compressed
+ Print prefix lists using the more specific operators. 
+ Otherwise,
+@@ -199,7 +202,7 @@ Fails if couldn't evaluate the filter to
  Unknown protocol!
  .RS
  .PP
@@ -11,7 +21,7 @@ $NetBSD: patch-dp,v 1.1 2008/03/08 11:00:35 spz Exp $
  .PP
  .RE
  ***Error: badly formed filter.
-@@ -210,7 +210,7 @@ syntax error in RPSL filter specificatio
+@@ -210,7 +213,7 @@ syntax error in RPSL filter specificatio
  .RE
  For more error descriptions, please see 
  .B
diff --git a/net/irrtoolset-nox11/patches/patch-dr b/net/irrtoolset-nox11/patches/patch-dr
index 2e7aca70200..14c285b7647 100644
--- a/net/irrtoolset-nox11/patches/patch-dr
+++ b/net/irrtoolset-nox11/patches/patch-dr
@@ -1,8 +1,18 @@
-$NetBSD: patch-dr,v 1.1 2008/03/08 11:00:35 spz Exp $
+$NetBSD: patch-dr,v 1.2 2009/02/14 16:17:06 spz Exp $
 
 --- man/man1/RtConfig.1.orig	2006-10-01 13:23:32.000000000 +0200
 +++ man/man1/RtConfig.1
-@@ -587,7 +587,7 @@ Unimplemented method for this rp_attribu
+@@ -128,6 +128,9 @@ In older Cisco IOS versions, 
+ in-bound route maps did not support ip access-list matches.
+ Use of this option causes RtConfig to use distribute-lists to overcome
+ this limitation.
++.IP \-asplain
++Print AS numbers as asplain, i.e. as unstructured number;
++default is to use the more human readable asdot format.
+ .IP \-disable_access_list_cache
+ RtConfig caches the access-lists (and in the future ip as-path
+ access-lists and route-maps) that it generates so that the same
+@@ -587,7 +590,7 @@ Unimplemented method for this rp_attribu
  .PP
  For more error descriptions, please see
  .B
diff --git a/net/irrtoolset-nox11/patches/patch-dt b/net/irrtoolset-nox11/patches/patch-dt
new file mode 100644
index 00000000000..fc77d0c7c73
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dt
@@ -0,0 +1,22 @@
+$NetBSD: patch-dt,v 1.1 2009/02/14 16:17:06 spz Exp $
+
+--- src/roe/roe.cc.orig	2002-04-09 13:48:48.000000000 +0200
++++ src/roe/roe.cc
+@@ -99,6 +99,7 @@ char *opt_rcfile       = ".roerc";
+ char opt_default_rcfile[256] = "";
+ char *display  = NULL;
+ char *geometry = NULL;
++bool opt_asdot = true;
+ ASt myAS;
+ 
+ 
+@@ -138,6 +139,9 @@ void init_and_set_options (int argc, cha
+ 
+       IRR_COMMAND_LINE_OPTIONS,
+ 
++      {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot,
++       "print AS numbers in asplain format."},
++
+       // roe specific arguments
+       {"-as",  ARGV_STRING,    (char *) NULL,    (char *) &opt_my_as,
+        "AS number of the aut-num object to use."},
diff --git a/net/irrtoolset-nox11/patches/patch-du b/net/irrtoolset-nox11/patches/patch-du
new file mode 100644
index 00000000000..bd9d3ef8198
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-du
@@ -0,0 +1,22 @@
+$NetBSD: patch-du,v 1.1 2009/02/14 16:17:06 spz Exp $
+
+--- src/peval/peval.cc.orig	2006-06-08 17:16:26.000000000 +0200
++++ src/peval/peval.cc
+@@ -98,6 +98,7 @@ Rusage ru(clog, &opt_rusage);
+ char *opt_prompt                 = "peval> ";
+ int  opt_expand                  = EXPAND_ALL;
+ int  opt_symbolic                = 0;
++bool opt_asdot                   = true;
+ 
+ const int SIZE = 8*1024;
+ char base[SIZE] = "peval: ";
+@@ -228,6 +229,9 @@ void init_and_set_options (int argc, cha
+ 
+       IRR_COMMAND_LINE_OPTIONS,
+ 
++      {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot,
++       "print AS numbers in asplain format."},
++
+       // peval specific arguments
+       {"-symbolic",  ARGV_CONSTANT, (char *)1, (char *)&opt_symbolic, 
+        "Symbolic"},
diff --git a/net/irrtoolset-nox11/patches/patch-dv b/net/irrtoolset-nox11/patches/patch-dv
new file mode 100644
index 00000000000..443692b4ace
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dv
@@ -0,0 +1,22 @@
+$NetBSD: patch-dv,v 1.1 2009/02/14 16:17:06 spz Exp $
+
+--- src/RtConfig/RtConfig.cc.orig	2006-10-01 13:23:32.000000000 +0200
++++ src/RtConfig/RtConfig.cc
+@@ -85,6 +85,7 @@ bool opt_rusage                  = false
+ Rusage ru(clog, &opt_rusage);
+ 
+ char *opt_prompt                 = "RtConfig> ";
++bool opt_asdot                   = true;
+ 
+ bool         RtConfig::supressMartians          = false;
+ int          RtConfig::preferenceCeiling        = 1000;
+@@ -182,6 +183,9 @@ void init_and_set_options (int argc, cha
+      
+      IRR_COMMAND_LINE_OPTIONS,
+ 
++     {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot,
++      "print AS numbers in asplain format."},
++
+      {"-config", ARGV_FUNC, (char *) &select_config_format, (char *) NULL, 
+       "Configuration format (junos, cisco, bcc, gated or rsd)"},
+      {"-no_match_ip_inbound", ARGV_BOOL, 
diff --git a/net/irrtoolset-nox11/patches/patch-dw b/net/irrtoolset-nox11/patches/patch-dw
new file mode 100644
index 00000000000..f9e86e96c63
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dw
@@ -0,0 +1,22 @@
+$NetBSD: patch-dw,v 1.1 2009/02/14 16:17:06 spz Exp $
+
+--- src/rpslcheck/rpslcheck.cc.orig	2007-02-09 20:46:31.000000000 +0100
++++ src/rpslcheck/rpslcheck.cc
+@@ -72,6 +72,7 @@ bool opt_stats                   = false
+ bool opt_rusage                  = false;
+ char *opt_prompt                 = "rpslcheck> ";
+ bool opt_echo                    = false;
++bool opt_asdot                   = true;
+ char *opt_my_as			 = NULL;
+ #ifdef DEBUG
+ bool opt_debug_rpsl              = false;
+@@ -106,6 +107,9 @@ void init_and_set_options (int argc, cha
+      
+      IRR_COMMAND_LINE_OPTIONS,
+ 
++     {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot,
++      "print AS numbers in asplain format."},
++
+      {"-rusage", ARGV_BOOL, (char *) NULL,           (char *) &opt_rusage,
+       "On termination print resource usage"},
+      {"-stats", ARGV_BOOL, (char *) NULL,            (char *) &opt_stats,
diff --git a/net/irrtoolset-nox11/patches/patch-dx b/net/irrtoolset-nox11/patches/patch-dx
new file mode 100644
index 00000000000..2d1081e5391
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dx
@@ -0,0 +1,14 @@
+$NetBSD: patch-dx,v 1.1 2009/02/14 16:17:06 spz Exp $
+
+--- man/man1/aoe.1.orig	2002-07-02 14:41:49.000000000 +0200
++++ man/man1/aoe.1
+@@ -137,6 +137,9 @@ database server or parsing policy object
+ .RS
+ .IP "\-as <as-no>"
+ Gets aut-num object for <as-no>. 
++.IP \-asplain
++Print AS numbers as asplain, i.e. as unstructured number;
++default is to use the more human readable asdot format.
+ .IP "-rcfile <resource filename>"
+ .IP "\-display <X Windows Display Specification>"
+ .RE
diff --git a/net/irrtoolset-nox11/patches/patch-dy b/net/irrtoolset-nox11/patches/patch-dy
new file mode 100644
index 00000000000..f3391a0b2fa
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dy
@@ -0,0 +1,14 @@
+$NetBSD: patch-dy,v 1.1 2009/02/14 16:17:07 spz Exp $
+
+--- man/man1/roe.1.orig	2002-07-02 14:41:50.000000000 +0200
++++ man/man1/roe.1
+@@ -115,6 +115,9 @@ database server or parsing policy object
+ .RS
+ .IP "\-as <as-no>"
+ Lists routes of <as-no>. 
++.IP \-asplain
++Print AS numbers as asplain, i.e. as unstructured number;
++default is to use the more human readable asdot format.
+ .IP "-rcfile <resource filename>"
+ .IP "\-display <X Windows Display Specification>"
+ .IP "\-geometry <X Windows Geometry Specification>"
diff --git a/net/irrtoolset-nox11/patches/patch-dz b/net/irrtoolset-nox11/patches/patch-dz
new file mode 100644
index 00000000000..7f3edf528df
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dz
@@ -0,0 +1,14 @@
+$NetBSD: patch-dz,v 1.1 2009/02/14 16:17:07 spz Exp $
+
+--- man/man1/prtraceroute.1.orig	2002-07-02 14:41:50.000000000 +0200
++++ man/man1/prtraceroute.1
+@@ -133,6 +133,9 @@ Consider the sources specified in the co
+ If an object is defined in multiple sources in <source-list>,
+ pmatch uses the definition first encountered in <source-list>
+ from left to right.
++.IP \-asplain
++Print AS numbers as asplain, i.e. as unstructured number;
++default is to use the more human readable asdot format.
+ .RE
+ .SH ENVIRONMENT VARIABLES
+ .RS