Date: Thu, 17 Jan 2002 06:08:27 -0800 (PST) From: tetsushi nakai <tnakai@yo.rim.or.jp> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/33991: fix build problem and update of japanese/xdvi-vflib Message-ID: <200201171408.g0HE8R260577@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 33991
>Category: ports
>Synopsis: fix build problem and update of japanese/xdvi-vflib
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Jan 17 06:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: tetsushi nakai
>Release: 5.0 Current and 4.5 PRERELEASE
>Organization:
>Environment:
>Description:
Update japanese patch version
1.03 -> 1.04
and fix ports build problem
strcasestr and strnstr function redefinition error fix
(taken from libwww-5.3.2 source)
>How-To-Repeat:
>Fix:
diff -ruN xdvik-vflib.old/Makefile xdvik-vflib/Makefile
--- xdvik-vflib.old/Makefile Sat Mar 10 05:52:20 2001
+++ xdvik-vflib/Makefile Thu Jan 17 00:28:36 2002
@@ -7,6 +7,7 @@
PORTNAME= xdvik-vflib
PORTVERSION= 22.15
+PORTREVISION= 1
CATEGORIES= japanese print
MASTER_SITES= ftp://ftp.appi.keio.ac.jp/pub/xdvi/ \
ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/xdvik-22/ \
@@ -26,7 +27,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
@@ -149,6 +150,12 @@
${ECHO} "* or, after installation, please change *"; \
${ECHO} "* ${PREFIX}/libexec/xdviprint. *"; \
${ECHO} "**************************************************************")
+
+pre-patch:
+.for i in FTP.c Host.c String.c String.h
+ @${PERL} -pi -e 's|strcasestr|HTStrCaseStr|g' \
+ ${WRKSRC}/libs/libwww/HT${i}
+.endfor
pre-build:
@(cd ${WRKSRC} ; find . -name '*.orig' -exec ${RM} -f {} \;)
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-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; */
+
>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?200201171408.g0HE8R260577>