kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix for strcasestr problem

Browse source 
PR:		35244
Submitted by:	Miguel Mendez <flynn@energyhq.homeip.net>
This commit is contained in:
Ying-Chieh Liao 2002-09-17 13:46:31 +00:00
parent 6ae0d6f013
commit 353e269ea7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=66508
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
x11-fm/endeavour/Makefile
View file

@ -28,6 +28,12 @@ MAKE_ARGS= PREFIX="${PREFIX}" CC="${CC}" CPP="${CXX}" \
LIBS="`imlib-config --libs` -lXpm" \
LIB_DIRS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 440003 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500027
CFLAGS+= -DNEED_STRCASESTR
.endif
pre-patch:
@${REINPLACE_CMD} -e 's|make |\$$\(MAKE\) |g' ${WRKSRC}/Makefile
@${FIND} ${WRKSRC}/endeavour -type f | ${XARGS} ${REINPLACE_CMD} -e \
@ -39,4 +45,4 @@ pre-patch:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/endeavour/endeavour ${PREFIX}/bin
.include <bsd.port.mk>
.include <bsd.port.post.mk>

17
x11-fm/endeavour/files/patch-endeavour::string.cpp
View file

@ -1,23 +1,24 @@
--- endeavour/string.cpp.orig Tue Jan 29 17:05:25 2002
+++ endeavour/string.cpp Tue Jan 29 17:11:26 2002
@@ -35,7 +35,7 @@
--- endeavour/string.cpp.orig Sat Feb 23 16:24:43 2002
+++ endeavour/string.cpp Sat Feb 23 16:27:03 2002
@@ -35,7 +35,9 @@
#endif /* __MSW__ */
const char *strseekblank(const char *s);
-const char *strcasestr(const char *haystack, const char *needle);
+// const char *strcasestr(const char *haystack, const char *needle);
+#ifdef NEED_STRCASESTR
const char *strcasestr(const char *haystack, const char *needle);
+#endif
int strpfx(const char *str, const char *pfx);
int strcasepfx(const char *str, const char *pfx);
void strtoupper(char *s);
@@ -219,6 +219,7 @@
@@ -219,6 +221,7 @@
* Case insensitive version of strstr(). Returns the pointer to
* needle in haystack if found or NULL on no match.
*/
+#ifndef __FreeBSD__
+#ifdef NEED_STRCASESTR
const char *strcasestr(const char *haystack, const char *needle)
{
const char *strptr1, *strptr2, *strptr3;
@@ -276,7 +277,7 @@
@@ -276,7 +279,7 @@
return(NULL);
}

6
x11-fm/endeavour/files/patch-include::string.h
View file

@ -1,10 +1,10 @@
--- include/string.h.orig Tue Jan 29 16:54:50 2002
+++ include/string.h Tue Jan 29 16:55:21 2002
--- include/string.h.orig Sat Feb 23 16:37:45 2002
+++ include/string.h Sat Feb 23 16:37:48 2002
@@ -24,7 +24,9 @@
extern int strcasecmp(const char *s1, const char *s2);
#endif
extern const char *strseekblank(const char *s);
+#ifndef __FreeBSD__
+#ifdef NEED_STRCASESTR
extern const char *strcasestr(const char *haystack, const char *needle);
+#endif
extern int strpfx(const char *str, const char *pfx);