7 files changed, 154 insertions, 100 deletions

diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index 0557492b9a05..0f503a0c6acf 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	jwhois
-PORTVERSION=	3.2.3
-PORTREVISION=	3
+PORTVERSION=	4.0
+#PORTREVISION=	0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	jwhois
diff --git a/net/jwhois/distinfo b/net/jwhois/distinfo
index 201739039c9e..ed760f4370da 100644
--- a/net/jwhois/distinfo
+++ b/net/jwhois/distinfo
@@ -1,3 +1,3 @@
-MD5 (jwhois-3.2.3.tar.gz) = 1232661cebd79a9772f416599d3f5929
-SHA256 (jwhois-3.2.3.tar.gz) = ada17cb751ec09f91d4f22938bf9a83e7cc548f2cfce09fcc00101c142583f24
-SIZE (jwhois-3.2.3.tar.gz) = 430792
+MD5 (jwhois-4.0.tar.gz) = 977d0ba90ee058a7998c94d933fc9546
+SHA256 (jwhois-4.0.tar.gz) = fa9bb86782b915c6d730bb723f876dc9b345a617db375aaf3416ec22553cd64e
+SIZE (jwhois-4.0.tar.gz) = 493007
diff --git a/net/jwhois/files/jwhois.conf b/net/jwhois/files/jwhois.conf
index 0d5da58cfad7..44cc67e4721c 100644
--- a/net/jwhois/files/jwhois.conf
+++ b/net/jwhois/files/jwhois.conf
@@ -23,6 +23,7 @@ whois-servers {
 	# of regular expressions.  See below for the definition of cidr-blocks.
 	#
 	"\\([0-9]+\\.\\)+[0-9]+" = "struct cidr-blocks";
+	"^[0-9A-Fa-f]+:[0-9A-Fa-f:.]*\\(/[0-9]+\\)?$" = "struct cidr6-blocks";
 	"^CORE-[0-9]+$" = "struct handles";
 	"^CO[CH]O-[0-9]+$" = "struct handles";
 	".*-[A-Z]+$" = "struct handles";
@@ -58,45 +59,6 @@ whois-servers {
 	# Japanese NIC handles
 	#
 	"^[A-Z]+[0-9]+JP$" = "whois.nic.ad.jp";
- 
-	#
-	# 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:[89A][A-F0-9][A-F0-9][A-F0-9]:.+" = "whois.apnic.net";
-
-	#
-	# Historical IPv6 catch-all
-	#
-	".*:.*" = "whois.6bone.net";
-
 	#
 	# If your host and network supports it, you can also specify IPv6
 	# addresses in the server field.
@@ -112,6 +74,10 @@ whois-servers {
 	# default = "whois-servers";
 
 	#
+	# Sub-TLA Assignments
+	#
+
+	#
 	# Pseudo-ccTLDs must be listed above gTLDs
 	#
  	"\\.ae\\.org$" = "whois.centralnic.net";
@@ -141,6 +107,7 @@ whois-servers {
 	"\\.ac$" = "whois.nic.ac";
 	"\\.ae$" = "whois.uaenic.ae";
 	"\\.aero$" = "whois.aero";
+	"\\.af$" = "whois.nic.af";
 	"\\.ag$" = "whois.nic.ag";
 	"\\.ai$" = "whois.offshore.ai";
 	"\\.al$" = "whois.ripe.net";
@@ -157,9 +124,10 @@ whois-servers {
 	"\\.az$" = "whois.ripe.net";
 	"\\.ba$" = "whois.ripe.net";
 	"\\.be$" = "whois.dns.be";
-	"\\.bg$" = "whois.digsys.bg";
+	"\\.bg$" = "whois.register.bg";
 	"\\.bi$" = "www.nic.bi";
 	"\\.biz$" = "whois.neulevel.biz";
+	"\\.bj$" = "whois.nic.bj";
 	"\\.bm$" = "rwhois.ibl.bm 4321";
 	"\\.br$" = "whois.nic.br";
 	"\\.bv$" = "whois.ripe.net";
@@ -171,6 +139,7 @@ whois-servers {
 	"\\.cd$" = "whois.nic.cd";
 	"\\.cg$" = "www.nic.cg";
 	"\\.ch$" = "whois.nic.ch";
+	"\\.ci$" = "whois.nic.ci";
 	"\\.ck$" = "whois.nic.ck";
 	"\\.cl$" = "whois.nic.cl";
 	"\\.edu\\.cn$" = "whois.edu.cn";
@@ -183,8 +152,12 @@ whois-servers {
 	"\\.cx$" = "whois.nic.cx";
 	"\\.cy$" = "whois.ripe.net";
 	"\\.cz$" = "whois.nic.cz";
-	"\\.de$" = "whois.denic.de";
+	"\\.de$" {
+		whois-server = "whois.denic.de";
+		query-format = "-C UTF-8 -T dn,ace $*";
+	}
 	"\\.dk$" = "whois.dk-hostmaster.dk";
+	"\\.dm$" = "whois.nic.dm";
 	"\\.do$" = "whois.nic.do";
 	"\\.dz$" = "whois.ripe.net";
 	"\\.ec$" = "www.nic.ec";
@@ -202,8 +175,9 @@ whois-servers {
 	"\\.gov$" = "whois.nic.gov";
 	"\\.gg$" = "whois.isles.net";
 	"\\.gm$" = "whois.ripe.net";
+	"\\.gp$" = "whois.nic.gp";
 	"\\.gr$" = "whois.ripe.net";
-	"\\.gs$" = "whois.adamsnames.tc";
+	"\\.gs$" = "203.119.12.22";
 	"\\.gt$" = "www.gt";
 	"\\.hk$" = "whois.hkdnr.net.hk";
 	"\\.hm$" = "whois.registry.hm";
@@ -217,7 +191,7 @@ whois-servers {
 	"\\.int$" = "whois.iana.org";
 	"\\.io$" = "www.io.io";
 	"\\.ir$" = "whois.nic.ir";
-	"\\.im$" = "www.nic.im";
+	"\\.im$" = "whois.nic.im";
 	"\\.is$" = "whois.isnic.is";
 	"\\.it$" = "whois.nic.it";
 	"\\.je$" = "whois.isles.net";
@@ -226,6 +200,7 @@ whois-servers {
 		query-format = "$* /e";
 	}
 	"\\.kg$" = "whois.domain.kg";
+	"\\.ki$" = "whois.nic.ki";
 	"\\.kr$" = "whois.krnic.net";
 	"\\.kz$" = "whois.nic.kz";
 	"\\.la$" = "whois.nic.la";
@@ -235,12 +210,15 @@ whois-servers {
 	"\\.lt$" = "whois.domreg.lt";
 	"\\.lu$" = "whois.dns.lu";
 	"\\.lv$" = "whois.nic.lv";
+	"\\.ly$" = "whois.nic.ly";
 	"\\.ma$" = "whois.ripe.net";
 	"\\.mil$" = "whois.nic.mil";
 	"\\.mk$" = "whois.ripe.net";
 	"\\.mm$" = "whois.nic.mm";
+	"\\.mobi$" = "whois.dotmobiregistry.net";
 	"\\.ms$" = "whois.adamsnames.tc";
 	"\\.mt$" = "www.um.edu.mt";
+	"\\.mu$" = "whois.nic.mu";
 	"\\.museum$" = "whois.museum";
 	"\\.mw$" = "www.tarsus.net";
 	"\\.mx$" = "whois.nic.mx";
@@ -260,14 +238,16 @@ whois-servers {
 	"\\.pe$" = "whois.nic.pe";
 	"\\.pk$" = "pknic.net.pk";
 	"\\.pl$" = "whois.dns.pl";
+	"\\.pm$" = "whois.nic.pm";
 	"\\.pro$" = "whois.registrypro.pro";
 	"\\.pt$" = "whois.dns.pt";
 	"\\.pw$" = "whois.nic.pw";
+	"\\.re$" = "whois.nic.re";
 	"\\.ro$" = "whois.rotld.ro";
 	"\\.ru$" = "whois.ripn.net";
 	"\\.rw$" = "www.nic.rw";
 	"\\.sa$" = "saudinic.net.sa";
-	"\\.se$" = "www.nic-se.se"; # "whois.nic-se.se";
+	"\\.se$" = "whois.iis.se";
 	"\\.sg$" = "whois.nic.net.sg";
 	"\\.sh$" = "whois.nic.sh";
 	"\\.si$" = "whois.arnes.si";
@@ -278,17 +258,18 @@ whois-servers {
 	"\\.st$" = "whois.nic.st";
 	"\\.su$" = "whois.ripn.net";
 	"\\.tc$" = "whois.adamsnames.tc";
-	"\\.tf$" = "whois.adamsnames.tc";
+	"\\.tf$" = "whois.afnic.fr";
 	"\\.tg$" = "www.nic.tg";
 	"\\.th$" = "whois.thnic.net";
 	"\\.tj$" = "whois.nic.tj";
 	"\\.tk$" = "whois.dot.tk";
+	"\\.tl$" = "whois.nic.tl";
 	"\\.tm$" = "whois.nic.tm";
 	"\\.tn$" = "whois.ripe.net";
 	"\\.to$" = "whois.tonic.to";
-	"\\.tr$" = "whois.metu.edu.tr";
+	"\\.tr$" = "whois.nic.tr";
 	"\\.tt$" = "www.nic.tt";
-	"\\.tv$" = "whois.tv";
+	"\\.tv$" = "whois.nic.tv";
 	"\\.tw$" = "whois.twnic.net";
 	"\\.ua$" = "whois.com.ua";
 	"\\.ug$" = "whois.co.ug";
@@ -301,12 +282,14 @@ whois-servers {
 	"\\.uy$" = "www.rau.edu.uy"; # is a whois server
 	"\\.uz$" = "www.noc.uz";
 	"\\.va$" = "whois.ripe.net";
-	"\\.ve$" = "rwhois.nic.ve 4321";
+	"\\.ve$" = "whois.nic.ve";
 	"\\.vi$" = "www.nic.vi";
 	"\\.vg$" = "whois.adamsnames.tc";
 	"\\.vn$" = "www.vnnic.net.vn";
 	"\\.vu$" = "www.vunic.vu";
+	"\\.wf$" = "whois.nic.wf";
 	"\\.ws$" = "whois.worldsite.ws";
+	"\\.yt$" = "whois.nic.yt";
 	"\\.yu$" = "whois.ripe.net";
 	"\\.ac\\.za$" = "whois.ac.za";
 	"\\.org\\.za$" = "rwhois.org.za 4321";
@@ -416,6 +399,7 @@ cidr-blocks {
 
 	"24.132.0.0/16" = "whois.ripe.net";
 	"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";
@@ -428,6 +412,10 @@ cidr-blocks {
 	"81.91.224.0/20" = "whois.afrinic.net";
 	"81.192.0.0/16" = "whois.afrinic.net";
 	"81.0.0.0/8" = "whois.ripe.net";
+	"82.101.128.0/18" = "whois.afrinic.net";
+        "82.201.128.0/17" = "whois.afrinic.net";
+        "82.201.160.0/19" = "whois.afrinic.net";
+        "82.201.224.0/19" = "whois.afrinic.net"; 
 	"82.0.0.0/8" = "whois.ripe.net";
 	"83.0.0.0/8" = "whois.ripe.net";
 	"84.36.0.0/17" = "whois.afrinic.net";
@@ -436,6 +424,15 @@ cidr-blocks {
 	"86.0.0.0/8" = "whois.ripe.net";
 	"87.0.0.0/8" = "whois.ripe.net";
 	"88.0.0.0/8" = "whois.ripe.net";
+        "89.0.0.0/8" = "whois.ripe.net";
+        "90.0.0.0/8" = "whois.ripe.net";
+        "91.0.0.0/8" = "whois.ripe.net"; 
+        "121.0.0.0/8" = "whois.apnic.net";
+        "122.0.0.0/8" = "whois.apnic.net";
+        "123.0.0.0/8" = "whois.apnic.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"; 
 	"129.132.0.0/16" = "whois.ripe.net";
 	"129.177.0.0/16" = "whois.ripe.net";
 	"129.187.0.0/16" = "whois.ripe.net";
@@ -522,6 +519,9 @@ cidr-blocks {
 	"169.208.0.0/16" = "whois.apnic.net";
 	"171.16.0.0/12" = "whois.ripe.net";
 	"171.32.0.0/15" = "whois.ripe.net";
+        "189.0.0.0/8" = "whois.lacnic.net";
+        "190.0.0.0/8" = "whois.lacnic.net";
+        "196.0.0.0/8" = "whois.afrinic.net"; 
 	"192.16.192.0/24" = "whois.ripe.net";
 	"192.114.0.0/15" = "whois.ripe.net";
 	"192.116.0.0/15" = "whois.ripe.net";
@@ -546,8 +546,8 @@ cidr-blocks {
 	"192.164.0.0/16" = "whois.ripe.net";
 	"193.0.0.0/8" = "whois.ripe.net";
 	"194.0.0.0/8" = "whois.ripe.net";
-	"195.0.0.0/8" = "whois.ripe.net";
 	"195.166.224.0/19" = "whois.afrinic.net";
+	"195.0.0.0/8" = "whois.ripe.net";
 	"196.2.96.0/19" = "whois.afrinic.net";
 	"196.2.128.0/17" = "whois.afrinic.net";
 	"196.200.0.0/13" = "whois.afrinic.net";
@@ -575,6 +575,67 @@ cidr-blocks {
 }
 
 #
+# See http://www.iana.org/assignments/ipv6-unicast-address-assignments
+#
+cidr6-blocks {
+	type = cidr6;
+
+	"2001:0000::/23" = "whois.iana.org";
+	"2001:0200::/23" = "whois.apnic.net";
+	"2001:0400::/23" = "whois.arin.net";
+	"2001:0600::/23" = "whois.ripe.net";
+	"2001:0800::/23" = "whois.ripe.net";
+	"2001:0A00::/23" = "whois.ripe.net";
+	"2001:0C00::/23" = "whois.apnic.net";
+	"2001:0E00::/23" = "whois.apnic.net";
+	"2001:1200::/23" = "whois.lacnic.net";
+	"2001:1400::/23" = "whois.ripe.net";
+	"2001:1600::/23" = "whois.ripe.net";
+	"2001:1800::/23" = "whois.arin.net";
+	"2001:1A00::/23" = "whois.ripe.net";
+	"2001:1C00::/23" = "whois.ripe.net";
+	"2001:1E00::/23" = "whois.ripe.net";
+	"2001:2000::/20" = "whois.ripe.net";
+	"2001:3000::/21" = "whois.ripe.net";
+	"2001:3800::/22" = "whois.ripe.net";
+	"2001:4000::/23" = "whois.ripe.net";
+	"2001:4200::/23" = "whois.arin.net";
+	"2001:4400::/23" = "whois.apnic.net";
+	"2001:4600::/23" = "whois.ripe.net";
+	"2001:4800::/23" = "whois.arin.net";
+	"2001:4A00::/23" = "whois.ripe.net";
+	"2001:4C00::/23" = "whois.ripe.net";
+	"2001:5000::/20" = "whois.ripe.net";
+	"2001:8000::/19" = "whois.apnic.net";
+	"2001:A000::/20" = "whois.apnic.net";
+	"2001:B000::/20" = "whois.apnic.net";
+
+	"2003:0000::/18" = "whois.ripe.net";
+
+	"2400:0000::/19" = "whois.apnic.net";
+	"2400:2000::/19" = "whois.apnic.net";
+	"2400:4000::/21" = "whois.apnic.net";
+	"2404:0000::/23" = "whois.apnic.net";
+
+	"2600:0000::/22" = "whois.arin.net";
+	"2604:0000::/22" = "whois.arin.net";
+	"2608:0000::/22" = "whois.arin.net";
+	"260C:0000::/22" = "whois.arin.net";
+	"2610:0000::/23" = "whois.arin.net";
+
+	"2800:0000::/23" = "whois.lacnic.net";
+
+	"2A00:0000::/21" = "whois.ripe.net";
+	"2A01:0000::/16" = "whois.ripe.net";
+
+	#
+	# Experimental IPv6 network 6bone (RFC2471)
+	# Phaseout at Jun, 6 2006 (RFC3701)
+	#
+	"3FFE::/16" = "whois.6bone.net";
+}
+
+#
 # Handles for the various registries.
 #
 handles {
@@ -678,13 +739,6 @@ server-options {
 		form-element = "Domain";			# <input> element
 	}
 
-	"www\\.nic-se\\.se" {
-		http = "true";
-		http-method = "GET";
-		http-action = "/cgi-bin/whois/www-to-whois";
-		form-element = "domain";
-	}
-
 	"www\\.nic\\.es" {
 		http = "true";
 		http-method = "POST";
@@ -790,7 +844,7 @@ server-options {
 	"pknic\\.net\\.pk" {
 		http = "true";
 		http-method = "POST";
-		http-action = ":443/cgi-bin/pknic-db/display.html";
+		http-action = "/cgi-bin/pknic-db/display.html";
 		form-element = "name";
 	}
 
@@ -849,13 +903,6 @@ server-options {
 		whois-redirect = ".* \\([Rr]+[Ww][Hh][Oo][Ii][Ss]\\.[A-Za-z]*\\.[Nn][Ee][Tt]\\) port \\([0-9]*\\)";
 	}
 
-	"www\\.nic\\.im" {
-		http = "true";
-		http-method = "GET";
-		http-action = "/scripts/imreg/domenq.asp";
-		form-element = "domain";
-	}
-
 	"www\\.nic\\.ar" {
 		http = "true";
 		http-method = "POST";
@@ -873,14 +920,30 @@ server-options {
 	"whois\\.denic\\.de" {
 		whois-server = "whois.denic.de";
 		query-format = "-C UTF-8 -T dn,ace $*";
+		answer-charset = "UTF-8";
 	}
 	"whois\\.nic\\.ad\\.jp" {
 		query-format = "$*/e";
 	}
+	"whois\\.nic\\.ch" {
+		answer-charset = "UTF-8";
+	}
+	"whois\\.nic\\.li" {
+		answer-charset = "UTF-8";
+	}
+	"whois\\.centralnic\\.*" {
+                whois-redirect = ".*Whois Server: \\(.*\\)";
+        }
+	".*\\.verisign-grs\\.com" {
+		whois-redirect = ".*Whois Server: \\(.*\\)";
+	}
 }
 
 #
 # The cache feature is used to provide a local cache with Whois information.
+# Note that the cache feature might have been disabled at compile time and
+# thus not be available on this system.
+#
 # 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.
 #
diff --git a/net/jwhois/files/patch-aa b/net/jwhois/files/patch-aa
deleted file mode 100644
index fa44556d25a5..000000000000
--- a/net/jwhois/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.dist	Wed Sep 26 05:41:17 2001
-+++ po/Makefile.in.in	Mon Nov 12 11:29:29 2001
-@@ -23,7 +23,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = @datadir@
--localedir = $(datadir)/locale
-+localedir = @localedir@
- gettextsrcdir = $(datadir)/gettext/po
- 
- INSTALL = @INSTALL@
diff --git a/net/jwhois/files/patch-ac b/net/jwhois/files/patch-ac
index 9b8fce8648e8..a2a9bdd28382 100644
--- a/net/jwhois/files/patch-ac
+++ b/net/jwhois/files/patch-ac
@@ -1,11 +1,11 @@
---- Makefile.in.dist	Thu Nov 10 16:40:08 2005
-+++ Makefile.in	Thu Nov 10 16:40:27 2005
-@@ -174,7 +174,7 @@
+--- Makefile.in.dist	2007-07-01 17:58:12.000000000 +0900
++++ Makefile.in	2008-05-26 13:42:47.000000000 +0900
+@@ -224,7 +224,7 @@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
- EXTRA_DIST = m4/ChangeLog config.rpath include/*.h example/jwhois.conf m4/*.m4 jwhois.spec.in jwhois.spec debian/*
--SUBDIRS = doc src example po
-+SUBDIRS = doc src po
- ACLOCAL_AMFLAGS = -I m4
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ EXTRA_DIST = config.rpath  m4/ChangeLog config.rpath include/*.h example/jwhois.conf m4/*.m4 jwhois.spec.in jwhois.spec
+-SUBDIRS = m4 doc gl src example po
++SUBDIRS = m4 doc gl src po
+ AM_CPPFLAGS = -I$(top_srcdir)/gl
+ LDADD = lib/libgnu.a
+ ACLOCAL_AMFLAGS = -I m4 -I gl/m4
diff --git a/net/jwhois/files/patch-ad b/net/jwhois/files/patch-ad
index 62a8c2cacf25..35d16e1f1c13 100644
--- a/net/jwhois/files/patch-ad
+++ b/net/jwhois/files/patch-ad
@@ -1,10 +1,10 @@
---- src/Makefile.in.dist	Sun Jul 10 03:52:02 2005
-+++ src/Makefile.in	Thu Nov 10 16:54:24 2005
-@@ -61,6 +61,7 @@
- 	jwhois-http.$(OBJEXT)
- jwhois_OBJECTS = $(am_jwhois_OBJECTS)
- jwhois_LDADD = $(LDADD)
+--- src/Makefile.in.dist	2007-07-01 17:56:14.000000000 +0900
++++ src/Makefile.in	2008-05-26 13:46:50.000000000 +0900
+@@ -231,6 +231,7 @@
+          -DLOCALEDIR="\"$(localedir)\""
+ 
+ jwhois_LDADD = $(top_srcdir)/gl/libgnu.a
 +jwhois_LDFLAGS = $(LDFLAGS) $(LTLIBINTL)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
+ AM_CFLAGS = $(jwhois_CFLAGS)
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl -I$(top_srcdir)/gl
+ all: all-am
diff --git a/net/jwhois/pkg-plist b/net/jwhois/pkg-plist
index eb1d00673ee5..f7edc204179d 100644
--- a/net/jwhois/pkg-plist
+++ b/net/jwhois/pkg-plist
@@ -18,10 +18,12 @@ etc/jwhois.conf.sample
 %%NLS%%share/locale/vi/LC_MESSAGES/jwhois.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/jwhois.mo
 @exec mkdir -p %D/var/jwhois 2>/dev/null || true
+@exec chown :nogroup %D/var/jwhois
+@exec chmod g+w %D/var/jwhois
 @unexec rm -f %D/var/jwhois/jwhois.db 2>/dev/null || true
 @dirrmtry var/jwhois
 @dirrmtry var
 @dirrmtry man/sv/man1
 @dirrmtry man/sv
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES
-@unexec rmdir %D/share/locale/rw
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/share/locale/rw 2>/dev/null || true