58/8-60/8 -> APNIC; ride today's PKGREVISION bump.

2 files changed, 21 insertions, 15 deletions

diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo
index e9859b3d53e..e4f9fefc03d 100644
--- a/net/jwhois/distinfo
+++ b/net/jwhois/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2005/04/11 15:38:16 taca Exp $
+$NetBSD: distinfo,v 1.26 2005/04/11 16:07:05 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) = 5d7c81419712d12a3de318f0ba1a84934d0e5acc
+SHA1 (patch-aa) = 2d4e620af848c8d0589201328f3c987625d446fa
 SHA1 (patch-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b
 SHA1 (patch-ac) = 1ff97afeaab96982f52597216db449e86bbd0444
diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa
index d553592c87a..5c21bc92373 100644
--- a/net/jwhois/patches/patch-aa
+++ b/net/jwhois/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca Exp $
-
---- example/jwhois.conf.orig	2003-07-01 02:16:45.000000000 +0900
-+++ example/jwhois.conf
-@@ -55,7 +55,42 @@ whois-servers {
+--- example/jwhois.conf.orig	2003-06-30 19:16:45.000000000 +0200
++++ example/jwhois.conf	2005-04-11 18:02:28.000000000 +0200
+@@ -55,7 +55,42 @@
  	"^[0-9]+\\.[0-9]+\\.[0-9]+/[0-9]+-[0-9]+$" = "whois.nic.br";
   
  	#
@@ -46,7 +44,7 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca Exp $
  	#
  	".*:.*" = "whois.6bone.net";
  
-@@ -147,7 +182,7 @@ whois-servers {
+@@ -147,7 +182,7 @@
  	"\\.ee$" = "whois.eenet.ee";
  	"\\.eg$" = "whois.ripe.net";
  	"\\.es$" = "www.nic.es";
@@ -55,7 +53,7 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca Exp $
  	"\\.fj$" = "whois.usp.ac.fj";
  	"\\.fm$" = "www.dot.fm";
  	"\\.fo$" = "whois.ripe.net";
-@@ -176,7 +211,7 @@ whois-servers {
+@@ -176,7 +211,7 @@
  	"\\.it$" = "whois.nic.it";
  	"\\.je$" = "whois.isles.net";
  	"\\.jp$" {
@@ -64,7 +62,7 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca Exp $
  		query-format = "$* /e";
  	}
  	"\\.kg$" = "whois.domain.kg";
-@@ -242,7 +277,7 @@ whois-servers {
+@@ -242,7 +277,7 @@
  	"\\.to$" = "whois.tonic.to";
  	"\\.tr$" = "whois.metu.edu.tr";
  	"\\.tt$" = "www.nic.tt";
@@ -73,7 +71,15 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca Exp $
  	"\\.tw$" = "whois.twnic.net";
  	"\\.ua$" = "whois.com.ua";
  	"\\.ug$" = "whois.co.ug";
-@@ -371,6 +406,15 @@ cidr-blocks {
+@@ -366,11 +401,23 @@
+ 
+ 	"24.232.0.0/16" = "whois.lacnic.net";
+ 	"43.0.0.0/8" = "whois.v6nic.net";
++	"58.0.0.0/8" = "whois.apnic.net";
++	"59.0.0.0/8" = "whois.apnic.net";
++	"60.0.0.0/8" = "whois.apnic.net";
+ 	"61.0.0.0/8" = "whois.apnic.net";
+ 	"62.0.0.0/8" = "whois.ripe.net";
  	"80.0.0.0/8" = "whois.ripe.net";
  	"81.0.0.0/8" = "whois.ripe.net";
  	"82.0.0.0/8" = "whois.ripe.net";
@@ -89,7 +95,7 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca 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 +535,10 @@ server-options {
+@@ -491,6 +538,10 @@
  		whois-redirect = ".*Whois Server: \\(.*\\)";
  	}
  
@@ -100,7 +106,7 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca 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 +741,6 @@ server-options {
+@@ -693,14 +744,6 @@
  		form-element = "whois";
  	}
  
@@ -115,7 +121,7 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca Exp $
  	"whois\\.lacnic\\.net" {
  		whois-redirect = ".*\\(whois.nic.br\\)";
  		whois-redirect = ".*\\(whois.registro.br\\)";
-@@ -724,10 +764,10 @@ server-options {
+@@ -724,10 +767,10 @@
  
  #
  # The cache feature is used to provide a local cache with Whois information.
@@ -128,7 +134,7 @@ $NetBSD: patch-aa,v 1.7 2005/04/11 15:38:16 taca Exp $
  
  #
  # This is the time after which an entry expires from the cache in hours.
-@@ -743,7 +783,7 @@ server-options {
+@@ -743,7 +786,7 @@
  #
  # Path to the browser to use for HTTP servers.
  #