Date: Sat, 09 Feb 2002 18:29:11 +0900 From: Makoto Matsushita <matusita@jp.FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Cc: Jason Harris <jharris@widomaker.com> Subject: ports/34751: [MAINTAINER-UPDATE] ports/net/jwhois Message-ID: <20020209182911D.matusita@jp.FreeBSD.org>
next in thread | raw e-mail | index | archive | help
>Number: 34751
>Category: ports
>Synopsis: [MAINTAINER-UPDATE] ports/net/jwhois
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 09 01:30:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Makoto Matsushita
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
Japan FreeBSD Users' Group / The FreeBSD Project
>Environment:
FreeBSD 5-current/4-stable
>Description:
jwhois 3.1.0 was released. Unfortunately, after jwhois 3.1.0
is out, two fix is applied to jwhois CVS repository. jwhois
3.1.0 doesn't usable without this patch, especially for .dk
users.
Attached patch updates ports/net/jwhois to 3.1.0. Please be
careful that this patch adds TWO FILES, files/patch-ac and
files/patch-3.1.0-fix, to this ports.
I should say thank you to Jason Harris <jharris@widomaker.com>;
without his help this patch cannot be made.
>How-To-Repeat:
cd /usr/ports/net/jwhois
patch < thisfile
make
make install
make package
(or what you want)
>Fix:
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/jwhois/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 12 Nov 2001 03:41:09 -0000 1.5
+++ Makefile 9 Feb 2002 09:20:53 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= jwhois
-PORTVERSION= 3.0.1
+PORTVERSION= 3.1.0
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= jwhois
@@ -22,6 +22,7 @@
INSTALL_TARGET= install-strip
+MANLANG= "" sv
MAN1= jwhois.1
post-install:
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/jwhois/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 12 Nov 2001 03:41:09 -0000 1.3
+++ distinfo 9 Feb 2002 09:20:53 -0000
@@ -1 +1 @@
-MD5 (jwhois-3.0.1.tar.gz) = 036186fda42ecd6363bbbeba895b07b7
+MD5 (jwhois-3.1.0.tar.gz) = b33c23aeec9093ef5efaf1a97d69135c
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/jwhois/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist 2 Apr 2001 05:29:06 -0000 1.3
+++ pkg-plist 9 Feb 2002 09:20:53 -0000
@@ -5,6 +5,8 @@
@unexec install-info --delete %D/info/jwhois.info %D/info/dir
info/jwhois.info
@exec install-info %D/info/jwhois.info %D/info/dir
+share/locale/es/LC_MESSAGES/jwhois.mo
+share/locale/fr/LC_MESSAGES/jwhois.mo
share/locale/ru/LC_MESSAGES/jwhois.mo
share/locale/sv/LC_MESSAGES/jwhois.mo
@unexec rmdir %D/share/locale/*/LC_MESSAGES 2>/dev/null || true
@@ -13,3 +15,4 @@
@unexec rm -f %D/var/jwhois/jwhois.db 2>/dev/null || true
@unexec rmdir %D/var/jwhois 2>/dev/null || true
@unexec rmdir %D/var 2>/dev/null || true
+@unexec rmdir -p %D/man/sv/man1 2>/dev/null || true
--- /dev/null Sat Feb 9 18:18:52 2002
+++ files/patch-ac Sat Feb 9 18:08:02 2002
@@ -0,0 +1,11 @@
+--- Makefile.in.dist Thu Jan 10 03:50:32 2002
++++ Makefile.in Sat Feb 9 18:07:56 2002
+@@ -99,7 +99,7 @@
+ sgid = @sgid@
+
+ EXTRA_DIST = include/*.h example/jwhois.conf macros/*.m4 jwhois.spec.in jwhois.spec
+-SUBDIRS = doc intl src example @POSUB@
++SUBDIRS = doc intl src @POSUB@
+ subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- /dev/null Sat Feb 9 18:18:52 2002
+++ files/patch-3.1.0-fix Sat Feb 9 17:45:37 2002
@@ -0,0 +1,48 @@
+Index: example/jwhois.conf
+===================================================================
+RCS file: /cvsroot/jwhois/jwhois/example/jwhois.conf,v
+retrieving revision 1.54
+retrieving revision 1.55
+diff -u -r1.54 -r1.55
+--- example/jwhois.conf 8 Dec 2001 17:34:25 -0000 1.54
++++ example/jwhois.conf 13 Jan 2002 14:57:22 -0000 1.55
+@@ -391,8 +391,9 @@
+ "www\\.dk-hostmaster\\.dk" {
+ http = "true";
+ http-method = "GET";
+- http-action = "/perl/Whois.pl";
++ http-action = "/scripts/whois.php";
+ form-element = "query";
++ form-extra = "lang=en";
+ }
+
+ "www\\.nic\\.es" {
+Index: src/rwhois.c
+===================================================================
+RCS file: /cvsroot/jwhois/jwhois/src/rwhois.c,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
+--- src/rwhois.c 5 Jan 2002 23:41:30 -0000 1.11
++++ src/rwhois.c 6 Feb 2002 17:32:07 -0000 1.12
+@@ -414,7 +414,7 @@
+ int
+ rwhois_parse_line(const char *reply, char **text)
+ {
+- char *capab, *tmpptr;
++ char *tmpptr;
+
+ tmpptr = (char *)strchr(reply, '\n');
+ if (tmpptr)
+@@ -427,9 +427,10 @@
+ }
+ if (strncasecmp(reply, "%rwhois", 7) == 0)
+ {
+- capab = (char *)strchr(reply, ':')+1;
++ char *capab = (char *)strchr(reply, ':');
+ if (!capab)
+ return REP_ERROR;
++ capab++; /* skip past first : */
+ tmpptr = (char *)strchr(capab, ':');
+ if (!tmpptr)
+ return REP_ERROR;
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020209182911D.matusita>