summaryrefslogtreecommitdiff
path: root/x11/modular-xorg-server
diff options
context:
space:
mode:
authorwiz <wiz>2010-10-31 23:43:08 +0000
committerwiz <wiz>2010-10-31 23:43:08 +0000
commitb446777dad1c1bc9cae2a24d554f971bce61b353 (patch)
tree5fe9c4d7fcbaa35bb7984bdf1edf830f413ffc46 /x11/modular-xorg-server
parent8b31f0faabae46ebe7b0ec6434dfcdee211f52d9 (diff)
downloadpkgsrc-b446777dad1c1bc9cae2a24d554f971bce61b353.tar.gz
Fix build on DragonFly, from Antonio Huete Jimenez in PR 44015.
Diffstat (limited to 'x11/modular-xorg-server')
-rw-r--r--x11/modular-xorg-server/distinfo3
-rw-r--r--x11/modular-xorg-server/patches/patch-ac15
2 files changed, 17 insertions, 1 deletions
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index f2ba43606f5..9bf3b692603 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.42 2010/06/27 10:43:01 tnn Exp $
+$NetBSD: distinfo,v 1.43 2010/10/31 23:43:08 wiz Exp $
SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6
RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a
Size (xorg-server-1.6.5.tar.bz2) = 4678406 bytes
SHA1 (patch-ab) = c65457bf58b7504375b31512c743c9f1a5dcdde0
+SHA1 (patch-ac) = ab74f292949196e878458afa2e354c73f4d9fd3f
SHA1 (patch-af) = 722d4679d3386c9a02e1c45a1aa355658ccc2908
SHA1 (patch-aj) = 84ff5c6215d0b62734cf26e78394a70afe2b7007
SHA1 (patch-ak) = df6d3b2172254e1f9d44eb40144cad5ed29a7d1d
diff --git a/x11/modular-xorg-server/patches/patch-ac b/x11/modular-xorg-server/patches/patch-ac
new file mode 100644
index 00000000000..5fb14d0d463
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.6 2010/10/31 23:43:08 wiz Exp $
+
+Fix build on DragonFly after header moved.
+
+--- hw/xfree86/os-support/xf86_OSlib.h.orig 2010-10-30 02:24:29 +0200
++++ hw/xfree86/os-support/xf86_OSlib.h 2010-10-30 02:25:03 +0200
+@@ -346,7 +346,7 @@
+ # include <dev/wscons/wsdisplay_usl_io.h>
+ # endif /* WSCONS_SUPPORT */
+ # if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+-# if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
++# if (defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)) || (defined(__DragonFly_version) && (__DragonFly_version >= 200900))
+ # include <sys/mouse.h>
+ # else
+ # undef MOUSE_GETINFO