Attachment 19895 Details for Bug 35244 – endeavour.diff

[patch] endeavour.diff

endeavour.diff (text/plain), 2.75 KB, created by Miguel Mendez on 2002-02-23 15:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miguel Mendez

Created: 2002-02-23 15:50:01 UTC

Size: 2.75 KB

patch

obsolete

>diff -ruN endeavour.old/Makefile endeavour/Makefile
>--- endeavour.old/Makefile	Fri Jun 15 14:42:35 2001
>+++ endeavour/Makefile	Sat Feb 23 16:30:13 2002
>@@ -26,6 +26,12 @@
> 		LIBS="`imlib-config --libs` -lXpm" \
> 		LIB_DIRS="-L${X11BASE}/lib"
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${OSVERSION} < 440003 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500027
>+CFLAGS+=	-DNEED_STRCASESTR
>+.endif
>+
> pre-patch:
> 	@${PERL} -pi -e 's|make |\$$$MAKE$ |g' ${WRKSRC}/Makefile
> 	@find ${WRKSRC}/endeavour -type f | xargs ${PERL} -pi -e \
>@@ -37,4 +43,4 @@
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/endeavour/endeavour ${PREFIX}/bin
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.post.mk>
>diff -ruN endeavour.old/files/patch-endeavour::string.cpp endeavour/files/patch-endeavour::string.cpp
>--- endeavour.old/files/patch-endeavour::string.cpp	Tue Jan 29 21:32:39 2002
>+++ endeavour/files/patch-endeavour::string.cpp	Sat Feb 23 16:27:45 2002
>@@ -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 -ruN endeavour.old/files/patch-include::string.h endeavour/files/patch-include::string.h
>--- endeavour.old/files/patch-include::string.h	Tue Jan 29 21:32:39 2002
>+++ endeavour/files/patch-include::string.h	Sat Feb 23 16:38:17 2002
>@@ -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);

Actions: View | Diff

Attachments on bug 35244: 19895