Incorporate today's allocation of 2400:0000::/19 to APNIC, bringing

us to jwhois-3.2.2nb18.

3 files changed, 18 insertions, 16 deletions

diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 7578defb73a..34e6402a6e2 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2005/04/19 21:05:27 kleink Exp $
+# $NetBSD: Makefile,v 1.54 2005/05/24 07:43:07 kleink Exp $
 #
 
 DISTNAME=		jwhois-3.2.2
-PKGREVISION=		17
+PKGREVISION=		18
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=jwhois/}
 
diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo
index 27f09c1a148..5036a5b3bbd 100644
--- a/net/jwhois/distinfo
+++ b/net/jwhois/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2005/04/19 21:05:27 kleink Exp $
+$NetBSD: distinfo,v 1.29 2005/05/24 07:43:07 kleink Exp $
 
 SHA1 (jwhois-3.2.2.tar.gz) = ca69b017e19d378affd7cdc3a980f2209cb1caab
 RMD160 (jwhois-3.2.2.tar.gz) = 5fac4e9e03ded5618b5d58d38d72e8863518ba2f
 Size (jwhois-3.2.2.tar.gz) = 385390 bytes
-SHA1 (patch-aa) = 4848f9d5930e8fcc98e835caff0f9bc9330f828e
+SHA1 (patch-aa) = dcb5603f555f34b13d17d4c036d53af499351dda
 SHA1 (patch-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b
 SHA1 (patch-ac) = 1ff97afeaab96982f52597216db449e86bbd0444
diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa
index e5c09c5bcaf..4ddeeaa1765 100644
--- a/net/jwhois/patches/patch-aa
+++ b/net/jwhois/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
+$NetBSD: patch-aa,v 1.11 2005/05/24 07:43:08 kleink Exp $
 
 --- example/jwhois.conf.orig	2003-06-30 19:16:45.000000000 +0200
-+++ example/jwhois.conf	2005-04-19 22:59:57.000000000 +0200
-@@ -55,7 +55,52 @@
++++ example/jwhois.conf	2005-05-24 09:40:34.000000000 +0200
+@@ -55,7 +55,54 @@
  	"^[0-9]+\\.[0-9]+\\.[0-9]+/[0-9]+-[0-9]+$" = "whois.nic.br";
   
  	#
@@ -37,10 +37,12 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
 +	# ...
 +	"^2001:5[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
 +	# ...
-+	"^2001:[89A][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
++	"^2001:[89][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
 +	# ...
 +	"^2003:[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
 +	# ...
++	"^2400:[0?1][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
++	# ...
 +	"^2600:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
 +	# ...
 +	"^2604:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
@@ -56,7 +58,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  	#
  	".*:.*" = "whois.6bone.net";
  
-@@ -147,7 +192,7 @@
+@@ -147,7 +194,7 @@
  	"\\.ee$" = "whois.eenet.ee";
  	"\\.eg$" = "whois.ripe.net";
  	"\\.es$" = "www.nic.es";
@@ -65,7 +67,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  	"\\.fj$" = "whois.usp.ac.fj";
  	"\\.fm$" = "www.dot.fm";
  	"\\.fo$" = "whois.ripe.net";
-@@ -176,7 +221,7 @@
+@@ -176,7 +223,7 @@
  	"\\.it$" = "whois.nic.it";
  	"\\.je$" = "whois.isles.net";
  	"\\.jp$" {
@@ -74,7 +76,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  		query-format = "$* /e";
  	}
  	"\\.kg$" = "whois.domain.kg";
-@@ -242,7 +287,7 @@
+@@ -242,7 +289,7 @@
  	"\\.to$" = "whois.tonic.to";
  	"\\.tr$" = "whois.metu.edu.tr";
  	"\\.tt$" = "www.nic.tt";
@@ -83,7 +85,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  	"\\.tw$" = "whois.twnic.net";
  	"\\.ua$" = "whois.com.ua";
  	"\\.ug$" = "whois.co.ug";
-@@ -365,12 +410,25 @@
+@@ -365,12 +412,25 @@
  	"211.192.0.0/13" = "whois.nic.or.kr";
  
  	"24.232.0.0/16" = "whois.lacnic.net";
@@ -109,7 +111,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  	"150.217.0.0/16" = "whois.ripe.net";
  	"151.3.0.0/16" = "whois.ripe.net";
  	"151.4.0.0/15" = "whois.ripe.net";
-@@ -491,6 +549,10 @@
+@@ -491,6 +551,10 @@
  		whois-redirect = ".*Whois Server: \\(.*\\)";
  	}
  
@@ -120,7 +122,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  	"whois\\.apnic\\.net" {
  		whois-redirect = ".*http://\\(whois\\.nic\\.or\\.kr\\)/";
  		whois-redirect = ".*at \\([Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\)";
-@@ -693,14 +755,6 @@
+@@ -693,14 +757,6 @@
  		form-element = "whois";
  	}
  
@@ -135,7 +137,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  	"whois\\.lacnic\\.net" {
  		whois-redirect = ".*\\(whois.nic.br\\)";
  		whois-redirect = ".*\\(whois.registro.br\\)";
-@@ -724,10 +778,10 @@
+@@ -724,10 +780,10 @@
  
  #
  # The cache feature is used to provide a local cache with Whois information.
@@ -148,7 +150,7 @@ $NetBSD: patch-aa,v 1.10 2005/04/19 21:05:27 kleink Exp $
  
  #
  # This is the time after which an entry expires from the cache in hours.
-@@ -743,7 +797,7 @@
+@@ -743,7 +799,7 @@
  #
  # Path to the browser to use for HTTP servers.
  #