pkg/44015: x11/modular-xorg-server fails to build

[tuxillo%dragonflybsd.org@localhost]

>Number:         44015
>Category:       pkg
>Synopsis:       x11/modular-xorg-server fails to build
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Oct 30 11:40:01 +0000 2010
>Originator:     Antonio Huete Jimenez
>Release:        N/A
>Organization:
DragonFlyBSD
>Environment:
DragonFly dfbsdx86 2.9-DEVELOPMENT DragonFly v2.9.0.87.g01741-DEVELOPMENT #5: 
Sat Oct 30 01:59:03 CEST 2010     
antonioh@dfbsdx86:/usr/obj/home/source/dfbsd/sys/GENERIC_SMP  i386

>Description:
After changing the location of mouse.h from machine/mouse.h to sys/mouse.h, 
Xorg build don't find that header thus failing to build.
>How-To-Repeat:
Simply make the package under DFBSD 2.9
>Fix:
diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index c9df377..29c6677 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -4,6 +4,7 @@ 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) = e9eb4c4729fd5832c3a3f25dac4cba7d445de680
 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 0000000..770d3ef
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-ac
@@ -0,0 +1,11 @@
+--- 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) && (__DragonFl
+ #     include <sys/mouse.h>
+ #    else
+ #     undef MOUSE_GETINFO