Attachment #19895 for bug #35244

View | Details | Raw Unified | Return to bug 35244
Collapse All | Expand All

Lines 26-31 Link Here

(-)endeavour/Makefile (-1 / +7 lines)
26	LIBS="`imlib-config --libs` -lXpm" \	26	LIBS="`imlib-config --libs` -lXpm" \
27	LIB_DIRS="-L${X11BASE}/lib"	27	LIB_DIRS="-L${X11BASE}/lib"
28		28
		29	.include <bsd.port.pre.mk>
		30
		31	.if ${OSVERSION} < 440003 \|\| ${OSVERSION} >= 500000 && ${OSVERSION} < 500027
		32	CFLAGS+= -DNEED_STRCASESTR
		33	.endif
		34
29	pre-patch:	35	pre-patch:
30	@${PERL} -pi -e 's\|make \|\$$$MAKE$ \|g' ${WRKSRC}/Makefile	36	@${PERL} -pi -e 's\|make \|\$$$MAKE$ \|g' ${WRKSRC}/Makefile
31	@find ${WRKSRC}/endeavour -type f \| xargs ${PERL} -pi -e \	37	@find ${WRKSRC}/endeavour -type f \| xargs ${PERL} -pi -e \
Lines 37-40 Link Here
37	do-install:	43	do-install:
38	${INSTALL_PROGRAM} ${WRKSRC}/endeavour/endeavour ${PREFIX}/bin	44	${INSTALL_PROGRAM} ${WRKSRC}/endeavour/endeavour ${PREFIX}/bin
39		45
40	.include <bsd.port.mk>	46	.include <bsd.port.post.mk>




--- 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);
+#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 +221,7 @@
  *	Case insensitive version of strstr(). Returns the pointer to
  *	needle in haystack if found or NULL on no match.
  */
+#ifdef NEED_STRCASESTR
 const char *strcasestr(const char *haystack, const char *needle)
 {
 	const char *strptr1, *strptr2, *strptr3;
@@ -276,7 +279,7 @@
 
         return(NULL);
 }

Lines 1-10 Link Here

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

Return to bug 35244

Lines 1-23 Link Here

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