pkg/47822: x11/modular-xorg-server 1.12.4 DragonFly x86_64 xf86_OSlib.h:284:27: fatal error: machine/mouse.h

[davshao%gmail.com@localhost]

>Number:         47822
>Category:       pkg
>Synopsis:       x11/modular-xorg-server 1.12.4 DragonFly x86_64 
>xf86_OSlib.h:284:27: fatal error: machine/mouse.h
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri May 17 05:30:00 +0000 2013
>Originator:     David Shao
>Release:        DragonFly 3.5-DEVELOPMENT x86_64
>Organization:
>Environment:
DragonFly 3.5-DEVELOPMENT x86_64
>Description:
x11/modular-xorg-server 1.12.4 does not build on DragonFly 3.5-DEVELOPMENT 
x86_64, apparently because some time ago mouse.h was moved.  The build fails 
with error:

/usr/pkg/bin/gmake  all-am
gmake[5]: Entering directory 
`/usr/pkgsrc/x11/modular-xorg-server/work/xorg-server-1.12.4/hw/xfree86/common'
  CC       xf86Configure.lo
In file included from xf86Configure.c:32:0:
../../../hw/xfree86/os-support/xf86_OSlib.h:284:27: fatal error: 
machine/mouse.h: No such file or directory
compilation terminated.
gmake[5]: *** [xf86Configure.lo] Error 1
gmake[5]: Leaving directory 
`/usr/pkgsrc/x11/modular-xorg-server/work/xorg-server-1.12.4/hw/xfree86/common'
gmake[4]: *** [all] Error 2
>How-To-Repeat:

>Fix:
The following patch allows modular-xorg-server to at least build.  It's 
functionality is untested as many other packages need to be rebuilt.

diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo
index e6da765..f57ab71 100644
--- a/x11/modular-xorg-server/distinfo
+++ b/x11/modular-xorg-server/distinfo
@@ -4,3 +4,4 @@ SHA1 (xorg-server-1.12.4.tar.bz2) = 
6d616874f9c7677bda08dc073c03f83e78fbc585
 RMD160 (xorg-server-1.12.4.tar.bz2) = 4907b5dc42efd6b3fb6bf9d64f1441080a6a6983
 Size (xorg-server-1.12.4.tar.bz2) = 5444761 bytes
 SHA1 (patch-configure) = 031bc0accf1dd71ed687e7aac3fcc9498cb06784
+SHA1 (patch-hw_xfree86_os-support_xf86__OSlib.h) = 
9b40513919bffc09b07a4c7dffe34b598c75a108
diff --git 
a/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_xf86__OSlib.h 
b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_xf86__OSlib.h
new file mode 100644
index 0000000..8bb9301
--- /dev/null
+++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_os-support_xf86__OSlib.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- hw/xfree86/os-support/xf86_OSlib.h.orig    2013-05-17 04:51:58.801201000 
+0000
++++ hw/xfree86/os-support/xf86_OSlib.h
+@@ -279,6 +279,8 @@ struct pcvtid {
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || 
defined(__DragonFly__)
+ #if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
+ #include <sys/mouse.h>
++#elif defined (__DragonFly__)
++#include <sys/mouse.h>
+ #else
+ #undef MOUSE_GETINFO
+ #include <machine/mouse.h>