aboutsummaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorarved <arved@FreeBSD.org>2002-11-22 03:00:38 +0800
committerarved <arved@FreeBSD.org>2002-11-22 03:00:38 +0800
commiteceb3c8ee23f6155013b7831399f83ba20cc672b (patch)
tree048ae8cdfce24b64c4211606e32762e2c99a265b /graphics
parent91b3d835f3aecf355887ebada6cc0a1b7d6062da (diff)
downloadfreebsd-ports-gnome-eceb3c8ee23f6155013b7831399f83ba20cc672b.tar.gz
freebsd-ports-gnome-eceb3c8ee23f6155013b7831399f83ba20cc672b.tar.zst
freebsd-ports-gnome-eceb3c8ee23f6155013b7831399f83ba20cc672b.zip
Unbreak on -CURRENT.
PR: 45546 Submitted by: bento, JY <leafy@leafy.idv.tw>
Diffstat (limited to 'graphics')
-rw-r--r--graphics/ImageMagick/files/patch-mi12
-rw-r--r--graphics/ImageMagick/files/patch-xwindow.c19
2 files changed, 19 insertions, 12 deletions
diff --git a/graphics/ImageMagick/files/patch-mi b/graphics/ImageMagick/files/patch-mi
index 0fa34280f113..6cc6540e31c1 100644
--- a/graphics/ImageMagick/files/patch-mi
+++ b/graphics/ImageMagick/files/patch-mi
@@ -5,15 +5,3 @@
-#include <sys/ipc.h>
-#include <sys/shm.h>
#include <X11/extensions/XShm.h>
---- magick/xwindow.c Thu Oct 17 10:08:02 2002
-+++ magick/xwindow.c Thu Oct 17 10:11:42 2002
-@@ -58,4 +58,11 @@
- #include "xwindow.h"
- #if defined(HasX11)
-+#if defined(HasSharedMemory)
-+#include <machine/param.h>
-+//typedef unsigned short ushort; /* needed for sys/ipc.h at the moment */
-+#include <sys/types.h>
-+#include <sys/ipc.h>
-+#include <sys/shm.h>
-+#endif
diff --git a/graphics/ImageMagick/files/patch-xwindow.c b/graphics/ImageMagick/files/patch-xwindow.c
new file mode 100644
index 000000000000..782a0a09b9cc
--- /dev/null
+++ b/graphics/ImageMagick/files/patch-xwindow.c
@@ -0,0 +1,19 @@
+--- magick/xwindow.c.old Sun Nov 24 15:07:53 2002
++++ magick/xwindow.c Sun Nov 24 15:08:16 2002
+@@ -57,6 +57,16 @@
+ #include "log.h"
+ #include "utility.h"
+ #include "version.h"
++#if defined(HasSharedMemory)
++#include <machine/param.h>
++
++#if __FreeBSD__ >= 5
++typedef unsigned short ushort; /* needed for sys/ipc.h at the moment */
++#endif
++#include <sys/types.h>
++#include <sys/ipc.h>
++#include <sys/shm.h>
++#endif
+ #include "xwindow.h"
+ #if defined(HasX11)
+