Update jwhois to 2.4.1. Update taken from PR#10772 by Wolfgang Rupprecht

<wolfgang@wsrcc.com> with substantial modifications.
Changes from version 2.1:

 * Made it possible to use queries of the type foo@HOST
 * Lots of information added to the example configuration file
 * Fixed a nasty bug that sometimes caused two extra bytes of output
   to be appended
 * Fixed the sample jwhois.conf
 * Added distribution of debian/ and macros/
 * Support for redirection of a query to another server based on
   returned content from another
 * Support for cache functionality
 * Bugfixes for little-endian machines
 * Configuration parser rewritten -- you must now use \\ to get a
   single \.
 * ${datadir} no longer searched for global configuration file
 * i18n support added
 * Must enclose struct foo in "
 * Support for specifying CIDR blocks in the configuration file.
 * More advanced features added to the configuration file.
 * Port number separated from host names and IP numbers with space
   instead of colon in configuration file.
 * Support for IPv6 hosts

8 files changed, 128 insertions, 58 deletions

diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile
index bdb260e4084..8159b2eb114 100644
--- a/net/jwhois/Makefile
+++ b/net/jwhois/Makefile
@@ -1,19 +1,31 @@
-# $NetBSD: Makefile,v 1.2 2000/01/20 15:24:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/08/12 06:29:12 jlam Exp $
 #
 
-DISTNAME=	jwhois-2.1
-CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.coyote.org/pub/jwhois/
+DISTNAME=		jwhois-2.4.1
+CATEGORIES=		net
+MASTER_SITES=		${MASTER_SITE_GNU:=jwhois/}
 
-MAINTAINER=	kim@tac.nyc.ny.us
-HOMEPAGE=	http://www.coyote.org/jwhois/
+MAINTAINER=		packages@netbsd.org
+HOMEPAGE=		http://www.gnu.org/software/jwhois/
 
-USE_GTEXINFO=	yes
+BUILD_DEPENDS+=		autoreconf:../../devel/autoconf
+DEPENDS+=		gettext>=0.10.35nb1:../../devel/gettext
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--sysconfdir=/etc
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--sysconfdir=/etc
+CONFIGURE_ARGS+=	--localstatedir=/var/db
+CONFIGURE_ARGS+=	--with-cache
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+CPPFLAGS+=		-I${LOCALBASE}/include		# libintl.h
+
+INFO_FILES=		jwhois.info
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf ${PREFIX}/share
+	${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf ${PREFIX}/share/examples
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/jwhois/files/md5 b/net/jwhois/files/md5
index 61743680938..b6f95462aa1 100644
--- a/net/jwhois/files/md5
+++ b/net/jwhois/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/10/05 14:17:15 kim Exp $
+$NetBSD: md5,v 1.2 2000/08/12 06:29:13 jlam Exp $
 
-MD5 (jwhois-2.1.tar.gz) = b4f65b438a888f6052ca4c90343426c1
+MD5 (jwhois-2.4.1.tar.gz) = ca4716c2a8eea8d1f11a61d928397637
diff --git a/net/jwhois/files/patch-sum b/net/jwhois/files/patch-sum
index 4b91540cb02..f47b0d0f21a 100644
--- a/net/jwhois/files/patch-sum
+++ b/net/jwhois/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/10/05 14:17:15 kim Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/12 06:29:14 jlam Exp $
 
-MD5 (patch-aa) = 7adf18ff739bd45cb7b51947808dbe50
-MD5 (patch-ab) = e0ed27d641bb1773157c24115eb5835b
+MD5 (patch-aa) = b46f2aa12b0189096c16602de05d6fa7
+MD5 (patch-ab) = bc4ef2ae99c175dbce715cd100e2f4f1
diff --git a/net/jwhois/patches/patch-aa b/net/jwhois/patches/patch-aa
index 6507f80b93b..38be034672c 100644
--- a/net/jwhois/patches/patch-aa
+++ b/net/jwhois/patches/patch-aa
@@ -1,29 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/10/05 14:17:15 kim Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/12 06:29:14 jlam Exp $
 
---- src/jwhois.c.orig	Sun Sep 26 06:03:17 1999
-+++ src/jwhois.c	Tue Oct  5 09:48:03 1999
-@@ -138,6 +138,7 @@
- {
-   struct jconfig *j;
-   struct re_pattern_buffer	rpb;
-+  struct servent *sp = NULL;
-   char *error, *host = DEFAULTHOST, *ret, *tmphost;
-   int ind, port;
+--- example/jwhois.conf.orig	Tue Jan 25 10:19:58 2000
++++ example/jwhois.conf	Fri Aug 11 23:50:21 2000
+@@ -209,10 +209,10 @@
  
-@@ -165,7 +166,15 @@
-     }
-   jconfig_end();
-   
--  port = htons(IPPORT_WHOIS);
-+#ifndef IPPORT_WHOIS
-+# define IPPORT_WHOIS 43
-+#endif
-+
-+  if ((sp = getservbyname("whois", "tcp")) == NULL)
-+    port = htons(IPPORT_WHOIS);
-+  else
-+    port = sp->s_port;
-+
-   if (strchr(host, ':'))
-     {
-       tmphost = (char *)strchr(host, ':');
+ #
+ # 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
+ # default expire time is 7 days, but you can change those below.
+ #
+-#cachefile = "/var/lib/jwhois.db";
++#cachefile = "/var/db/jwhois.db";
+ 
+ #
+ # This is the time after which an entry expires from the cache in hours.
diff --git a/net/jwhois/patches/patch-ab b/net/jwhois/patches/patch-ab
index 65d1120f2f0..a28a922a1f1 100644
--- a/net/jwhois/patches/patch-ab
+++ b/net/jwhois/patches/patch-ab
@@ -1,15 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 1999/10/05 14:17:15 kim Exp $
+$NetBSD: patch-ab,v 1.2 2000/08/12 06:29:15 jlam Exp $
 
---- doc/jwhois.texi.orig	Sun Sep 26 05:42:39 1999
-+++ doc/jwhois.texi	Tue Oct  5 10:04:34 1999
-@@ -4,6 +4,10 @@
- @settitle jwhois, Whois client
- @c %**end of header
- 
-+@direntry
-+* jwhois: (jwhois).	Whois client.
-+@end direntry
+--- configure.in.orig	Tue Jan 25 10:24:22 2000
++++ configure.in	Fri Aug 11 23:49:43 2000
+@@ -60,6 +60,12 @@
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ AM_GNU_GETTEXT
++
++dnl NetBSD: set DATADIRNAME to "share"
++DATADIRNAME="share"
++INTLDEPS=
++INTLLIBS="-lintl"
 +
- @c This file has the new style title page commands.
- @c Run `makeinfo' rather than `texinfo-format-buffer'.
+ AC_PATH_PROG(CHGRP, chgrp, $PATH:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/libexec)
+ AC_PATH_PROG(CHMOD, chmod, $PATH:/bin:/usr/bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/libexec)
  
diff --git a/net/jwhois/pkg/DEINSTALL b/net/jwhois/pkg/DEINSTALL
new file mode 100644
index 00000000000..be36a165514
--- /dev/null
+++ b/net/jwhois/pkg/DEINSTALL
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2000/08/12 06:29:18 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+DEINSTALL)
+	;;
+POST-DEINSTALL)
+	CONF=/etc/jwhois.conf
+	DBCACHE=/var/db/jwhois.db
+
+	cat << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove the
+following files:
+
+	${CONF}
+	${DBCACHE}
+===========================================================================
+EOF
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/net/jwhois/pkg/INSTALL b/net/jwhois/pkg/INSTALL
new file mode 100644
index 00000000000..52ae5f617f3
--- /dev/null
+++ b/net/jwhois/pkg/INSTALL
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2000/08/12 06:29:18 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+POST-INSTALL)
+	EXAMPLE_DIR=${PKG_PREFIX}/share/examples
+	INSTALL_DATA="/usr/bin/install -c -o root -g wheel -m 0644"
+	CONF=/etc/jwhois.conf
+
+	INSTALL_CACHE="/usr/bin/install -c -o root -g nogroup -m 0664 /dev/null"
+	DBCACHE=/var/db/jwhois.db
+
+	conf=`basename ${CONF}`
+	if [ ! -f ${CONF} ]
+	then
+		echo "Installing example ${conf} in /etc..."
+		${INSTALL_DATA} ${EXAMPLE_DIR}/${conf} ${CONF}
+	fi
+
+	if [ ! -f ${DBCACHE} ]
+	then
+		echo "Creating empty cache file ${DBCACHE}..."
+		${INSTALL_CACHE} ${DBCACHE}
+	fi
+	;;
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/net/jwhois/pkg/PLIST b/net/jwhois/pkg/PLIST
index 476392a0f4a..7054d4345b8 100644
--- a/net/jwhois/pkg/PLIST
+++ b/net/jwhois/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/10/05 14:17:15 kim Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/12 06:29:19 jlam Exp $
 bin/jwhois
-@unexec install-info --delete %D/info/jwhois.info %D/info/dir
+@unexec	install-info --delete %D/info/jwhois.info %D/info/dir
 info/jwhois.info
-@exec install-info %D/info/jwhois.info %D/info/dir
+@exec	install-info %D/info/jwhois.info %D/info/dir
 man/man1/jwhois.1
-share/jwhois.conf
+share/examples/jwhois.conf
+share/locale/sv/LC_MESSAGES/jwhois.mo