Update to 4.0, from PR 38500. Changes:

* Many WHOIS data updates and translation updates; 4 new translations
* Reset euid and egid to uid and gid before calling the user specified browser
* Added support for libidn
* Added patch to support conversion of whois server output to local charset.
* Changed to GNU GPL v3

Local change: WHOIS servers for some geographical subdomains in .ru and .su TLDs.

OK by wiz@.

6 files changed, 78 insertions, 161 deletions

diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index fc2ad47bd01..554e3c5b8ff 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2006/04/06 03:20:54 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2009/01/09 16:20:20 shattered Exp $
 #
 
-DISTNAME=		jwhois-3.2.2
-PKGREVISION=		19
+DISTNAME=		jwhois-4.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GNU:=jwhois/}
 
@@ -10,9 +9,11 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.gnu.org/software/jwhois/
 COMMENT=		Configurable WHOIS client
 
+#LICENSE=		gnu-gpl-v3
+
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/db
 
 LIBS.SunOS+=		-lnsl -lsocket
@@ -22,13 +23,15 @@ LIBS.SunOS+=		-lnsl -lsocket
 EGDIR=			${PREFIX}/share/examples/jwhois
 CONF_FILES=		${EGDIR}/jwhois.conf.default	\
 			${PKG_SYSCONFDIR}/jwhois.conf
-INFO_FILES=		# PLIST
+INFO_FILES=		YES
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf	\
 		${EGDIR}/jwhois.conf.default
 
+.include "../../devel/libidn/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/PLIST b/net/jwhois/PLIST
index 4cb2d13d72b..c77798e9cd4 100644
--- a/net/jwhois/PLIST
+++ b/net/jwhois/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2009/01/09 16:20:20 shattered Exp $
 bin/jwhois
 info/jwhois.info
 man/man1/jwhois.1
@@ -12,8 +12,11 @@ share/locale/it/LC_MESSAGES/jwhois.mo
 share/locale/nl/LC_MESSAGES/jwhois.mo
 share/locale/pl/LC_MESSAGES/jwhois.mo
 share/locale/pt_BR/LC_MESSAGES/jwhois.mo
+share/locale/ro/LC_MESSAGES/jwhois.mo
 share/locale/ru/LC_MESSAGES/jwhois.mo
+share/locale/rw/LC_MESSAGES/jwhois.mo
 share/locale/sv/LC_MESSAGES/jwhois.mo
 share/locale/tr/LC_MESSAGES/jwhois.mo
+share/locale/vi/LC_MESSAGES/jwhois.mo
 share/locale/zh_TW/LC_MESSAGES/jwhois.mo
 @dirrm share/examples/jwhois
diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo
index 5036a5b3bbd..0bc25a1e222 100644
--- a/net/jwhois/distinfo
+++ b/net/jwhois/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.29 2005/05/24 07:43:07 kleink Exp $
+$NetBSD: distinfo,v 1.30 2009/01/09 16:20:20 shattered 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) = dcb5603f555f34b13d17d4c036d53af499351dda
+SHA1 (jwhois-4.0.tar.gz) = 4bd4a35cb0c2593284e7ef161f533a8184645174
+RMD160 (jwhois-4.0.tar.gz) = 552a61a17c2c4af8c1a5e7cd12e2e0f40d9f7dc8
+Size (jwhois-4.0.tar.gz) = 493007 bytes
+SHA1 (patch-aa) = 40c3b4711bbc7a5b2ef62262a72b98e345f5e292
 SHA1 (patch-ab) = e2b35b66adae6caba8a778194ff0238a31006b0b
-SHA1 (patch-ac) = 1ff97afeaab96982f52597216db449e86bbd0444
+SHA1 (patch-ac) = 3a23d56b9dfd3664d2a5e783f6f349bba1cbfa54
+SHA1 (patch-ad) = d72d60593c8168d2f49c545c6af2d4fafaebd88a
diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa
index 4ddeeaa1765..dee46181494 100644
--- a/net/jwhois/patches/patch-aa
+++ b/net/jwhois/patches/patch-aa
@@ -1,148 +1,45 @@
-$NetBSD: patch-aa,v 1.11 2005/05/24 07:43:08 kleink Exp $
+$NetBSD: patch-aa,v 1.12 2009/01/09 16:20:20 shattered Exp $
 
---- example/jwhois.conf.orig	2003-06-30 19:16:45.000000000 +0200
-+++ 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";
-  
- 	#
--	# Redirect IPv6 numbers to the correct host
-+	# Sub-TLA Assignments
-+	# see http://www.iana.org/assignments/ipv6-tla-assignments
-+	#
-+	"^2001:0?[01][A-F0-9][A-F0-9]:.+" = "whois.iana.org";
-+	"^2001:0?[23][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+	"^2001:0?[45][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+	"^2001:0?[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:0?[89][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:0?[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:0?[CD][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+	"^2001:0?[EF][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+	"^2001:1[23][A-F0-9][A-F0-9]:.+" = "whois.lacnic.net";
-+	"^2001:1[45][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:1[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:1[89][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+	"^2001:1[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:1[CD][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:1[EF][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:2[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:3[A-B0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:4[01][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:4[23][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+	"^2001:4[45][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-+	"^2001:4[67][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:4[89][A-F0-9][A-F0-9]:.+" = "whois.arin.net";
-+	"^2001:4[AB][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	"^2001:4[CD][A-F0-9][A-F0-9]:.+" = "whois.ripe.net";
-+	# ...
-+	"^2001:5[A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.ripe.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";
-+	# ...
-+	"^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 +194,7 @@
- 	"\\.ee$" = "whois.eenet.ee";
- 	"\\.eg$" = "whois.ripe.net";
- 	"\\.es$" = "www.nic.es";
--	"\\.fi$" = "cgi.ficora.fi";
-+	"\\.fi$" = "whois.ficora.fi";
- 	"\\.fj$" = "whois.usp.ac.fj";
- 	"\\.fm$" = "www.dot.fm";
- 	"\\.fo$" = "whois.ripe.net";
-@@ -176,7 +223,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 +289,7 @@
- 	"\\.to$" = "whois.tonic.to";
- 	"\\.tr$" = "whois.metu.edu.tr";
- 	"\\.tt$" = "www.nic.tt";
--	"\\.tv$" = "whois.tv";
-+	"\\.tv$" = "whois.nic.tv";
- 	"\\.tw$" = "whois.twnic.net";
- 	"\\.ua$" = "whois.com.ua";
- 	"\\.ug$" = "whois.co.ug";
-@@ -365,12 +412,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";
-+	"83.0.0.0/8" = "whois.ripe.net";
-+	"84.0.0.0/8" = "whois.ripe.net";
-+	"85.0.0.0/8" = "whois.ripe.net";
-+	"86.0.0.0/8" = "whois.ripe.net";
-+	"87.0.0.0/8" = "whois.ripe.net";
-+	"88.0.0.0/8" = "whois.ripe.net";
-+	"124.0.0.0/8" = "whois.apnic.net";
-+	"125.0.0.0/8" = "whois.apnic.net";
-+	"126.0.0.0/8" = "whois.apnic.net";
- 	"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 +551,10 @@
- 		whois-redirect = ".*Whois Server: \\(.*\\)";
- 	}
- 
-+	"whois\\.nic\\.tv" {
-+		whois-redirect = ".*Whois Server: \\(.*\\)";
-+	}
-+
- 	"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 +757,6 @@
- 		form-element = "whois";
- 	}
- 
--	"cgi\\.ficora\\.fi" {
--		http = "true";
--		http-method = "GET";
--		http-action = "/wwwbin/domains.pl";
--		form-element = "search";
--		form-extra = "language=eng";
--	}
--
- 	"whois\\.lacnic\\.net" {
- 		whois-redirect = ".*\\(whois.nic.br\\)";
- 		whois-redirect = ".*\\(whois.registro.br\\)";
-@@ -724,10 +780,10 @@
- 
- #
- # The cache feature is used to provide a local cache with Whois information.
--# By default, the location of the database is /usr/local/var/jwhois.db and the
-+# By default, the location of the database is /var/db/jwhois.db and the
+--- example/jwhois.conf.orig	2007-03-26 09:12:08.000000000 +0000
++++ example/jwhois.conf
+@@ -94,6 +96,7 @@ whois-servers {
+ 	"\\.no\\.com$" = "whois.centralnic.net";
+ 	"\\.qc\\.com$" = "whois.centralnic.net";
+ 	"\\.ru\\.com$" = "whois.centralnic.net";
++	"\\.ru\\.net$" = "whois.relcom.ru";
+ 	"\\.sa\\.com$" = "whois.centralnic.net";
+ 	"\\.se\\.com$" = "whois.centralnic.net";
+ 	"\\.se\\.net$" = "whois.centralnic.net";
+@@ -244,6 +256,9 @@ whois-servers {
+ 	"\\.pw$" = "whois.nic.pw";
+ 	"\\.re$" = "whois.nic.re";
+ 	"\\.ro$" = "whois.rotld.ro";
++	"\\.int.ru$" = "whois.int.ru";
++	"\\.msk.ru$" = "whois.relcom.ru";
++	"\\.spb.ru$" = "whois.relcom.ru";
+ 	"\\.ru$" = "whois.ripn.net";
+ 	"\\.rw$" = "www.nic.rw";
+ 	"\\.sa$" = "saudinic.net.sa";
+@@ -256,6 +271,8 @@ whois-servers {
+ 	"\\.sm$" = "whois.ripe.net";
+ 	"\\.sr$" = "whois.register.sr";
+ 	"\\.st$" = "whois.nic.st";
++	"\\.msk.su$" = "whois.relcom.ru";
++	"\\.spb.su$" = "whois.relcom.ru";
+ 	"\\.su$" = "whois.ripn.net";
+ 	"\\.tc$" = "whois.adamsnames.tc";
+ 	"\\.tf$" = "whois.afnic.fr";
+@@ -490,6 +507,8 @@ cidr-blocks {
+ 	"158.190.0.0/15" = "whois.ripe.net";
+ 	"158.192.0.0/14" = "whois.ripe.net";
+ 	"158.196.0.0/15" = "whois.ripe.net";
++ 	"158.248.0.0/15" = "whois.ripe.net";
++ 	"158.250.0.0/16" = "whois.ripe.net";
+ 	"159.147.0.0/16" = "whois.ripe.net";
+ 	"159.148.0.0/15" = "whois.ripe.net";
+ 	"160.216.0.0/14" = "whois.ripe.net";
+@@ -947,7 +970,7 @@ server-options {
+ # By default, the location of the database is /usr/local/var/jwhois.db and the
  # default expire time is 7 days, but you can change those below.
  #
 -#cachefile = "/var/lib/jwhois.db";
@@ -150,7 +47,7 @@ $NetBSD: patch-aa,v 1.11 2005/05/24 07:43:08 kleink Exp $
  
  #
  # This is the time after which an entry expires from the cache in hours.
-@@ -743,7 +799,7 @@
+@@ -963,7 +986,7 @@ server-options {
  #
  # Path to the browser to use for HTTP servers.
  #
diff --git a/net/jwhois/patches/patch-ac b/net/jwhois/patches/patch-ac
index d0a38ac8af9..6e7e107be57 100644
--- a/net/jwhois/patches/patch-ac
+++ b/net/jwhois/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.11 2005/01/19 16:40:05 tv Exp $
+$NetBSD: patch-ac,v 1.12 2009/01/09 16:20:20 shattered Exp $
 
---- src/regex.c.orig	2005-01-19 11:19:56.000000000 -0500
+--- src/regex.c.orig	2007-02-17 18:33:56.000000000 +0000
 +++ src/regex.c
 @@ -3771,8 +3771,7 @@ re_match_2 (bufp, string1, size1, string
                            regstart[r] = old_regstart[r];
  
                            /* xx why this test?  */
--                          if ((uintptr_t) old_regend[r] >=
--                              (uintptr_t) regstart[r])
+-                          if ((unsigned long int) old_regend[r] >=
+-                              (unsigned long int) regstart[r])
 +                          if (old_regend[r] >= regstart[r])
                              regend[r] = old_regend[r];
                          }     
diff --git a/net/jwhois/patches/patch-ad b/net/jwhois/patches/patch-ad
new file mode 100644
index 00000000000..16859f97c8b
--- /dev/null
+++ b/net/jwhois/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2009/01/09 16:20:20 shattered Exp $
+
+--- src/Makefile.in.orig	2007-06-08 17:46:00.000000000 +0000
++++ src/Makefile.in
+@@ -241,7 +241,7 @@ clean-binPROGRAMS:
+ 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+ jwhois$(EXEEXT): $(jwhois_OBJECTS) $(jwhois_DEPENDENCIES) 
+ 	@rm -f jwhois$(EXEEXT)
+-	$(LINK) $(jwhois_LDFLAGS) $(jwhois_OBJECTS) $(jwhois_LDADD) $(LIBS)
++	$(LINK) $(jwhois_LDFLAGS) $(jwhois_OBJECTS) $(jwhois_LDADD) $(jwhois_LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)