mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-27 00:57:50 +00:00
Fix build on 5.x and fix build with new X headers.
Reported by: pointyhat via kris
This commit is contained in:
parent
3eccd9c351
commit
29be1c9451
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=113689
@ -47,10 +47,6 @@ PLIST_SUB= NLS=""
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${OSVERSION} >= 502112
|
||||
BROKEN= "Does not compile on FreeBSD >= 5.x"
|
||||
.endif
|
||||
|
||||
pre-everything::
|
||||
.if !defined(WITH_MOTIF)
|
||||
@${ECHO_MSG}
|
||||
|
@ -1,6 +1,19 @@
|
||||
--- src/eval.c.org Sat Jul 19 13:42:11 2003
|
||||
+++ src/eval.c Sat Jul 19 13:47:43 2003
|
||||
@@ -565,7 +565,7 @@
|
||||
--- src/eval.c.orig Wed Jul 14 23:06:00 2004
|
||||
+++ src/eval.c Wed Jul 14 23:11:06 2004
|
||||
@@ -78,7 +78,11 @@
|
||||
RETSIGTYPE math_sig ();
|
||||
#endif
|
||||
|
||||
-int fls (long);
|
||||
+#if __FreeBSD_version < 502112
|
||||
+int local_fls (long);
|
||||
+#define fls local_fls
|
||||
+#endif
|
||||
+
|
||||
#ifdef SMALLEVAL
|
||||
int __to_flt (struct value *);
|
||||
int __to_int (struct value *);
|
||||
@@ -565,7 +569,7 @@
|
||||
case CONST_NINF:
|
||||
case CONST_NAN:
|
||||
p->type = TYP_FLT;
|
||||
@ -9,3 +22,12 @@
|
||||
break;
|
||||
|
||||
case VAR:
|
||||
@@ -1540,7 +1544,7 @@
|
||||
}
|
||||
|
||||
int
|
||||
-fls (num)
|
||||
+local_fls (num)
|
||||
long num;
|
||||
{
|
||||
int ret = 1;
|
||||
|
10
math/oleo/files/patch-src::io-x11.c
Normal file
10
math/oleo/files/patch-src::io-x11.c
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/io-x11.c.orig Wed Jul 14 23:14:24 2004
|
||||
+++ src/io-x11.c Wed Jul 14 23:14:28 2004
|
||||
@@ -34,7 +34,6 @@
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <sys/param.h>
|
||||
-#define NeedFunctionPrototypes 0
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
10
math/oleo/files/patch-src::xrdb.c
Normal file
10
math/oleo/files/patch-src::xrdb.c
Normal file
@ -0,0 +1,10 @@
|
||||
--- src/xrdb.c.orig Wed Jul 14 23:30:28 2004
|
||||
+++ src/xrdb.c Wed Jul 14 23:30:29 2004
|
||||
@@ -57,7 +57,6 @@
|
||||
/* This should be included before the X include files; otherwise, we get
|
||||
warnings about redefining NULL under BSD 4.3. */
|
||||
#include <sys/param.h>
|
||||
-#define NeedFunctionPrototypes 0
|
||||
#include <X11/X.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
Loading…
Reference in New Issue
Block a user