diff options
| author | ijliao <ijliao@FreeBSD.org> | 2002-09-17 21:46:31 +0800 |
|---|---|---|
| committer | ijliao <ijliao@FreeBSD.org> | 2002-09-17 21:46:31 +0800 |
| commit | 410cbba3af1e49e69a89e2ed22f582948deac32d (patch) | |
| tree | 404f23593a604f9611d0f7b2952025e93efd0ea8 /x11-fm | |
| parent | 42c4ac62519c8731d489f18bdc1f21cec67584e1 (diff) | |
| download | freebsd-ports-gnome-410cbba3af1e49e69a89e2ed22f582948deac32d.tar.gz freebsd-ports-gnome-410cbba3af1e49e69a89e2ed22f582948deac32d.tar.zst freebsd-ports-gnome-410cbba3af1e49e69a89e2ed22f582948deac32d.zip | |
fix for strcasestr problem
PR: 35244
Submitted by: Miguel Mendez <flynn@energyhq.homeip.net>
Diffstat (limited to 'x11-fm')
| -rw-r--r-- | x11-fm/endeavour/Makefile | 8 | ||||
| -rw-r--r-- | x11-fm/endeavour/files/patch-endeavour::string.cpp | 17 | ||||
| -rw-r--r-- | x11-fm/endeavour/files/patch-include::string.h | 6 |
3 files changed, 19 insertions, 12 deletions
diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile index a4b1fefe2e78..420ed3b8ac47 100644 --- a/x11-fm/endeavour/Makefile +++ b/x11-fm/endeavour/Makefile @@ -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> diff --git a/x11-fm/endeavour/files/patch-endeavour::string.cpp b/x11-fm/endeavour/files/patch-endeavour::string.cpp index d3a40a9304af..d5c969386ad4 100644 --- a/x11-fm/endeavour/files/patch-endeavour::string.cpp +++ b/x11-fm/endeavour/files/patch-endeavour::string.cpp @@ -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); } diff --git a/x11-fm/endeavour/files/patch-include::string.h b/x11-fm/endeavour/files/patch-include::string.h index 5a3899ab5b9e..c1d10238e0a5 100644 --- a/x11-fm/endeavour/files/patch-include::string.h +++ b/x11-fm/endeavour/files/patch-include::string.h @@ -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); |