From owner-ports-jp@jp.FreeBSD.org Wed Jan 16 07:09:26 2002
Received: (from daemon@localhost)
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) id g0FM9Qb06434;
	Wed, 16 Jan 2002 07:09:26 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from serio.al.rim.or.jp (serio.al.rim.or.jp [202.247.191.123])
	by castle.jp.FreeBSD.org (8.11.6+3.4W/8.11.3) with ESMTP/inet id g0FM9Qm06429
	for <ports-jp@jp.FreeBSD.org>; Wed, 16 Jan 2002 07:09:26 +0900 (JST)
	(envelope-from tnakai@yo.rim.or.jp)
Received: from mail2.rim.or.jp
	by serio.al.rim.or.jp (3.7W/HMX-13) id HAA29339
	for <ports-jp@jp.FreeBSD.org>; Wed, 16 Jan 2002 07:09:25 +0900 (JST)
Received: from miyu.takamagahara.net.yo.rim.or.jp (tcatgi002233.adsl.ppp.infoweb.ne.jp [61.210.68.233]) by mail2.rim.or.jp (8.9.3/3.7W)
	id HAA02314 for <ports-jp@jp.FreeBSD.org>; Wed, 16 Jan 2002 07:09:24 +0900 (JST)
Message-Id: <200201152209.HAA02314@mail2.rim.or.jp>
To: ports-jp@jp.FreeBSD.org
References: <sa6lmf450hb.wl@ring.myn.rcast.u-tokyo.ac.jp>
MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu")
Content-Type: text/plain; charset=ISO-2022-JP
From: tnakai@yo.rim.or.jp (tnakai@yo.rim.or.jp)
Date: 16 Jan 2002 07:09:17 +0900
In-Reply-To: <sa6lmf450hb.wl@ring.myn.rcast.u-tokyo.ac.jp>
 (Hiroharu Tamaru's message of "Sat, 12 Jan 2002 01:14:08 +0900")
Lines: 138
User-Agent: T-gnus/6.14.6 (based on Gnus v5.8.8) (revision 04) SEMI/1.13.7 (Awazu) FLIM/1.13.2 (Kasanui) Emacs/20.7 (i386--freebsd) MULE/4.0 (HANANOEN)
Reply-To: ports-jp@jp.FreeBSD.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+011218
X-Sequence: ports-jp 12176
Subject: [ports-jp 12176] Re: japanese/xdvik-vflib* fails to build
Errors-To: owner-ports-jp@jp.FreeBSD.org
Sender: owner-ports-jp@jp.FreeBSD.org
X-Originator: tnakai@miyu.takamagahara.net

$BCf0f(B@yo.rim$B$G$9!%(B

>>>>> $B;~9o(B Sat, 12 Jan 2002 01:14:08 +0900$B$K(B
       Hiroharu Tamaru <tamaru@myn.rcast.u-tokyo.ac.jp> $B$5$s$O8@$$$^$7$?!#(B

> $B$3$s$K$A$O!#ED4]$H?=$7$^$9!#(B

> japansese/xdvik-vflib* port $B$,(B RELENG_4 $B$G$N(B build $B$K(B fail $B$9$k$h$&$J(B
> $B$N$GJs9p$7$^$9!#(B

> fail $B$9$k8D=j$O(B libs/libwww/ $B$NCf$N$$$/$D$+$N(B file $B$G!"860x$O!"(B


> $B$I$&$9$k$N$,$$$$$+$o$+$i$J$+$C$?$N$G!"$H$j$"$($:(B libwww $BFb$r$=$l$>$l(B
> strcaststr2, strnstr2 $B$J$I$HL>A0$r$+$($F$d$C$?$H$3$m$H$j$"$($:!"(B
> compile $B$ODL$C$F!";H$($F$$$^$9(B(libwww $BFb$N5!G=$r;H$&$G$"$m$&(B dvi file 
> $B$,<j85$K$J$$$N$G$=$NItJ,$r;n$7$?$o$1$G$O$"$j$^$;$s$,(B)$B!#(B

ports/www/libwww $B$N%=!<%9$K9g$o$;$k7A$G(Bpatch$B$rEv$F$k$h$&$K$7$?=$@5$r;\(B
$B$7$?$b$N$r:G8e$K$D$1$^$9!%(B

$B2C$($F!$F|K\8l%Q%C%A$N%P!<%8%g%s$r>e$2$F$"$j$^$9!%(B

$BLdBj$,$J$1$l$P!$L@F|(Bsend-pr$B$7$^$9!%(B

-- 
Tetsushi Nakai

diff -ruN xdvik-vflib.old/Makefile xdvik-vflib/Makefile
--- xdvik-vflib.old/Makefile	Sat Mar 10 05:52:20 2001
+++ xdvik-vflib/Makefile	Wed Jan 16 06:59:06 2002
@@ -26,7 +26,7 @@
 		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/xdvi/ \
 		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	asami/LOCAL_PORTS
-PATCHFILES=	${DISTNAME}-j1.03.patch.gz
+PATCHFILES=	${DISTNAME}-j1.04.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	inagaki@tg.rim.or.jp
diff -ruN xdvik-vflib.old/distinfo xdvik-vflib/distinfo
--- xdvik-vflib.old/distinfo	Thu Nov 18 08:50:34 1999
+++ xdvik-vflib/distinfo	Wed Jan 16 06:59:12 2002
@@ -1,2 +1,2 @@
 MD5 (xdvik/xdvik-22.15.tar.gz) = 2052b671e87c9d41ea8ef5fb7aafeb5e
-MD5 (xdvik/xdvik-22.15-j1.03.patch.gz) = 06071006a05c23be2817a722dc9b1852
+MD5 (xdvik/xdvik-22.15-j1.04.patch.gz) = 0d38b63b06779c66ebbe638457ccc1ba
diff -ruN xdvik-vflib.old/files/patch-HTFTP.c xdvik-vflib/files/patch-HTFTP.c
--- xdvik-vflib.old/files/patch-HTFTP.c	Thu Jan  1 09:00:00 1970
+++ xdvik-vflib/files/patch-HTFTP.c	Wed Jan 16 06:59:28 2002
@@ -0,0 +1,11 @@
+--- xdvik-22.15/libs/libwww/HTFTP.c.orig	Wed Jan 16 06:22:07 2002
++++ xdvik-22.15/libs/libwww/HTFTP.c	Wed Jan 16 06:23:00 2002
+@@ -257,7 +257,7 @@
+ 	StrAllocCopy(me->ctrl->reply, ptr);
+ /* begin _GM_ */
+ /* Note: libwww bug ID: GM3 */
+-	if ( (reply == 530) && (strcasestr(me->buffer, "already") != NULL) ) {
++	if ( (reply == 530) && (HTStrCaseStr(me->buffer, "already") != NULL) ) {
+ 	    me->ctrl->alreadyLoggedIn = YES;
+ 	} else {
+ 	    me->ctrl->alreadyLoggedIn = NO;
diff -ruN xdvik-vflib.old/files/patch-HTHost.c xdvik-vflib/files/patch-HTHost.c
--- xdvik-vflib.old/files/patch-HTHost.c	Thu Jan  1 09:00:00 1970
+++ xdvik-vflib/files/patch-HTHost.c	Wed Jan 16 06:59:28 2002
@@ -0,0 +1,11 @@
+--- xdvik-22.15/libs/libwww/HTHost.c.orig	Wed Jan 16 06:22:20 2002
++++ xdvik-22.15/libs/libwww/HTHost.c	Wed Jan 16 06:23:39 2002
+@@ -645,7 +645,7 @@
+     if (host && unit) {
+ #if 0
+ 	if (host->range_units) {
+-	    char * start = strcasestr(host->range_units, "none");
++	    char * start = HTStrCaseStr(host->range_units, "none");
+ 
+ 	    /*
+ 	    **  Check that "none" is infact a token. It could be part of some
diff -ruN xdvik-vflib.old/files/patch-HTReader.c xdvik-vflib/files/patch-HTReader.c
--- xdvik-vflib.old/files/patch-HTReader.c	Thu Jan  1 09:00:00 1970
+++ xdvik-vflib/files/patch-HTReader.c	Wed Jan 16 06:59:28 2002
@@ -0,0 +1,27 @@
+--- xdvik-22.15/libs/libwww/HTReader.c.orig	Tue Jan 19 17:56:33 1999
++++ xdvik-22.15/libs/libwww/HTReader.c	Wed Jan 16 06:36:58 2002
+@@ -60,6 +60,7 @@
+     return HT_ERROR;
+ }
+ 
++#ifdef FIND_SIGNATURE
+ /*	Push data from a socket down a stream
+ **	-------------------------------------
+ **
+@@ -76,7 +77,7 @@
+ **     		HT_WOULD_BLOCK	if read or write would block
+ **		HT_PAUSE	if stream is paused
+ */
+-char * strnstr(char * haystack, int *pLen, char * needle)
++PRIVATE char * strnstr(char * haystack, int *pLen, char * needle)
+ {
+     int found = 0;
+     int need = strlen(needle);
+@@ -94,6 +95,7 @@
+     *pLen = 0;
+     return NULL;
+ }
++#endif
+ 
+ /* int DebugBufferSize = INPUT_BUFFER_SIZE; */
+ 
diff -ruN xdvik-vflib.old/files/patch-HTString.c xdvik-vflib/files/patch-HTString.c
--- xdvik-vflib.old/files/patch-HTString.c	Thu Jan  1 09:00:00 1970
+++ xdvik-vflib/files/patch-HTString.c	Wed Jan 16 06:59:28 2002
@@ -0,0 +1,11 @@
+--- xdvik-22.15/libs/libwww/HTString.c.orig	Wed Jan 16 06:19:06 2002
++++ xdvik-22.15/libs/libwww/HTString.c	Wed Jan 16 06:20:42 2002
+@@ -59,7 +59,7 @@
+ /*
+ ** strcasestr(s1,s2) -- like strstr(s1,s2) but case-insensitive.
+ */
+-PUBLIC char * strcasestr (char * s1, char * s2)
++PUBLIC char * HTStrCaseStr (char * s1, char * s2)
+ {
+     char * ptr = s1;
+ 
diff -ruN xdvik-vflib.old/files/patch-HTString.h xdvik-vflib/files/patch-HTString.h
--- xdvik-vflib.old/files/patch-HTString.h	Thu Jan  1 09:00:00 1970
+++ xdvik-vflib/files/patch-HTString.h	Wed Jan 16 06:59:28 2002
@@ -0,0 +1,11 @@
+--- xdvik-22.15/libs/libwww/HTString.h.orig	Wed Jan 16 06:19:02 2002
++++ xdvik-22.15/libs/libwww/HTString.h	Wed Jan 16 06:21:13 2002
+@@ -107,7 +107,7 @@
+ This works like strstr() but is not case-sensitive.
+ */
+ 
+-extern char * strcasestr (char * s1, char * s2);
++extern char * HTStrCaseStr (char * s1, char * s2);
+ 
+ /*
+ .
