Date: Tue, 29 Jan 2002 17:23:30 +0100 (CET) From: Miguel Mendez <flynn@energyhq.homeip.net> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/34413: Unbreak port: x11-fm/endeavour Message-ID: <200201291623.g0TGNU423383@energyhq.homeip.net>
next in thread | raw e-mail | index | archive | help
>Number: 34413
>Category: ports
>Synopsis: Unbreak port: x11-fm/endeavour
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 29 08:30:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Miguel Mendez
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
Help an orphan port today, Inc
>Environment:
System: FreeBSD kajsa.energyhq.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Mon Jan 28 14:53:51 CET 2002 root@kajsa.energyhq.org:/usr/obj/usr/src/sys/KAJSA i386
>Description:
x11-fm/endeavour is broken, this patch fixes compile issues
(strcasestr and another minor thing)
>How-To-Repeat:
>Fix:
--- endeavour.diff begins here ---
diff -ruN endeavour.old/files/patch-endeavour::endeavour.h endeavour/files/patch-endeavour::endeavour.h
--- endeavour.old/files/patch-endeavour::endeavour.h Thu Jan 1 01:00:00 1970
+++ endeavour/files/patch-endeavour::endeavour.h Tue Jan 29 17:01:48 2002
@@ -0,0 +1,11 @@
+--- endeavour/endeavour.h.orig Tue Jan 29 16:59:42 2002
++++ endeavour/endeavour.h Tue Jan 29 17:01:10 2002
+@@ -1462,7 +1462,7 @@
+
+
+ /* In timming.c */
+-extern long MilliTime(void);
++// extern long MilliTime(void);
+
+
+ /* In timmer.c */
diff -ruN endeavour.old/files/patch-endeavour::string.cpp endeavour/files/patch-endeavour::string.cpp
--- endeavour.old/files/patch-endeavour::string.cpp Thu Jan 1 01:00:00 1970
+++ endeavour/files/patch-endeavour::string.cpp Tue Jan 29 17:12:24 2002
@@ -0,0 +1,28 @@
+--- 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 @@
+ #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);
+ int strpfx(const char *str, const char *pfx);
+ int strcasepfx(const char *str, const char *pfx);
+ void strtoupper(char *s);
+@@ -219,6 +219,7 @@
+ * Case insensitive version of strstr(). Returns the pointer to
+ * needle in haystack if found or NULL on no match.
+ */
++#ifndef __FreeBSD__
+ const char *strcasestr(const char *haystack, const char *needle)
+ {
+ const char *strptr1, *strptr2, *strptr3;
+@@ -276,7 +277,7 @@
+
+ return(NULL);
+ }
+-
++#endif
+ /*
+ * Returns 1 if pfx is a prefix of str.
+ *
diff -ruN endeavour.old/files/patch-include::string.h endeavour/files/patch-include::string.h
--- endeavour.old/files/patch-include::string.h Thu Jan 1 01:00:00 1970
+++ endeavour/files/patch-include::string.h Tue Jan 29 16:57:44 2002
@@ -0,0 +1,12 @@
+--- include/string.h.orig Tue Jan 29 16:54:50 2002
++++ include/string.h Tue Jan 29 16:55:21 2002
+@@ -24,7 +24,9 @@
+ extern int strcasecmp(const char *s1, const char *s2);
+ #endif
+ extern const char *strseekblank(const char *s);
++#ifndef __FreeBSD__
+ extern const char *strcasestr(const char *haystack, const char *needle);
++#endif
+ extern int strpfx(const char *str, const char *pfx);
+ extern int strcasepfx(const char *str, const char *pfx);
+ extern void strtoupper(char *s);
--- endeavour.diff ends here ---
>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?200201291623.g0TGNU423383>