Pullup ticket 463 - requested by Takahiro Kambe

jwhois update

Revisions pulled up:
- pkgsrc/net/jwhois/Makefile		1.50, 1.52-1.53
- pkgsrc/net/jwhois/distinfo		1.25-1.28
- pkgsrc/net/jwhois/patches/patch-aa	1.7-1.10

   Module Name:		pkgsrc
   Committed By:	taca
   Date:		Mon Apr 11 15:38:16 UTC 2005

   Modified Files:
   	pkgsrc/net/jwhois: Makefile distinfo
   	pkgsrc/net/jwhois/patches: patch-aa

   Log Message:
   Change whois server for jp domain; whois.nic.ad.jp => whois.jprs.jp.
   (whois.nic.ad.jp is still valid for IP address.)

   Bump PKGREVISION.
---
   Module Name:		pkgsrc
   Committed By:	kleink
   Date:		Mon Apr 11 16:07:06 UTC 2005

   Modified Files:
   	pkgsrc/net/jwhois: distinfo
   	pkgsrc/net/jwhois/patches: patch-aa

   Log Message:
   58/8-60/8 -> APNIC; ride today's PKGREVISION bump.
---
   Module Name:		pkgsrc
   Committed By:	kleink
   Date:		Wed Apr 13 23:04:00 UTC 2005

   Modified Files:
   	pkgsrc/net/jwhois: Makefile distinfo
   	pkgsrc/net/jwhois/patches: patch-aa

   Log Message:
   Update to jwhois-3.2.2nb16: 41/8 allocated to AfriNIC.
---
   Module Name:		pkgsrc
   Committed By:	kleink
   Date:		Tue Apr 19 21:05:27 UTC 2005

   Modified Files:
   	pkgsrc/net/jwhois: Makefile distinfo
   	pkgsrc/net/jwhois/patches: patch-aa

   Log Message:
   Upgrade to jwhois-3.2.2nb17, incorporating today's allocations:
   	2A00:0000::/21        RIPE NCC
   	2600:0000::/22        ARIN
   	2604:0000::/22        ARIN
   	2608:0000::/22        ARIN
   	260C:0000::/22        ARIN

3 files changed, 44 insertions, 15 deletions

diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index b5ebb4e2199..03809cc49b6 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2005/01/29 18:10:05 kim Exp $
+# $NetBSD: Makefile,v 1.49.2.1 2005/04/21 16:46:20 salo Exp $
 #
 
 DISTNAME=		jwhois-3.2.2
-PKGREVISION=		14
+PKGREVISION=		17
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=jwhois/}
 
diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo
index 133bc207c01..a2919ad6b8d 100644
--- a/net/jwhois/distinfo
+++ b/net/jwhois/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2005/02/24 12:13:51 agc Exp $
+$NetBSD: distinfo,v 1.24.2.1 2005/04/21 16:46:20 salo 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) = 29c57efce17b6c821d550ae65f8e741ca9b308ca
+SHA1 (patch-aa) = 4848f9d5930e8fcc98e835caff0f9bc9330f828e
 SHA1 (patch-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b
 SHA1 (patch-ac) = 1ff97afeaab96982f52597216db449e86bbd0444
diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa
index e8e212c2a25..6cde29cdc3c 100644
--- a/net/jwhois/patches/patch-aa
+++ b/net/jwhois/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim Exp $
+$NetBSD: patch-aa,v 1.6.2.1 2005/04/21 16:46:20 salo Exp $
 
---- example/jwhois.conf.orig	2003-06-30 13:16:45.000000000 -0400
-+++ example/jwhois.conf	2005-01-29 12:36:50.000000000 -0500
-@@ -55,7 +55,42 @@
+--- 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 @@
  	"^[0-9]+\\.[0-9]+\\.[0-9]+/[0-9]+-[0-9]+$" = "whois.nic.br";
   
  	#
@@ -40,13 +40,23 @@ $NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim Exp $
 +	"^2001:[89A][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";
++	# ...
++	"^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";
++	# ...
++	"^2608:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
++	# ...
++	"^260C:0[0?1-3][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
++	# ...
++	"^2A00:0[0-7][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
 +
 +	#
 +	# Historical IPv6 catch-all
  	#
  	".*:.*" = "whois.6bone.net";
  
-@@ -147,7 +182,7 @@
+@@ -147,7 +192,7 @@
  	"\\.ee$" = "whois.eenet.ee";
  	"\\.eg$" = "whois.ripe.net";
  	"\\.es$" = "www.nic.es";
@@ -55,7 +65,16 @@ $NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim Exp $
  	"\\.fj$" = "whois.usp.ac.fj";
  	"\\.fm$" = "www.dot.fm";
  	"\\.fo$" = "whois.ripe.net";
-@@ -242,7 +277,7 @@
+@@ -176,7 +221,7 @@
+ 	"\\.it$" = "whois.nic.it";
+ 	"\\.je$" = "whois.isles.net";
+ 	"\\.jp$" {
+-		whois-server = "whois.nic.ad.jp";
++		whois-server = "whois.jprs.jp";
+ 		query-format = "$* /e";
+ 	}
+ 	"\\.kg$" = "whois.domain.kg";
+@@ -242,7 +287,7 @@
  	"\\.to$" = "whois.tonic.to";
  	"\\.tr$" = "whois.metu.edu.tr";
  	"\\.tt$" = "www.nic.tt";
@@ -64,7 +83,17 @@ $NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim Exp $
  	"\\.tw$" = "whois.twnic.net";
  	"\\.ua$" = "whois.com.ua";
  	"\\.ug$" = "whois.co.ug";
-@@ -371,6 +406,15 @@
+@@ -365,12 +410,25 @@
+ 	"211.192.0.0/13" = "whois.nic.or.kr";
+ 
+ 	"24.232.0.0/16" = "whois.lacnic.net";
++	"41.0.0.0/8" = "whois.afrinic.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";
@@ -80,7 +109,7 @@ $NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim 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 @@
+@@ -491,6 +549,10 @@
  		whois-redirect = ".*Whois Server: \\(.*\\)";
  	}
  
@@ -91,7 +120,7 @@ $NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim 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 @@
+@@ -693,14 +755,6 @@
  		form-element = "whois";
  	}
  
@@ -106,7 +135,7 @@ $NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim Exp $
  	"whois\\.lacnic\\.net" {
  		whois-redirect = ".*\\(whois.nic.br\\)";
  		whois-redirect = ".*\\(whois.registro.br\\)";
-@@ -724,10 +764,10 @@
+@@ -724,10 +778,10 @@
  
  #
  # The cache feature is used to provide a local cache with Whois information.
@@ -119,7 +148,7 @@ $NetBSD: patch-aa,v 1.6 2005/01/29 17:45:35 kim Exp $
  
  #
  # This is the time after which an entry expires from the cache in hours.
-@@ -743,7 +783,7 @@
+@@ -743,7 +797,7 @@
  #
  # Path to the browser to use for HTTP servers.
  #