[pkgsrc/trunk]: pkgsrc/x11 Fix sysmouse handling on DragonFly, mostly garbage...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cd5c4fabece4
branches:  trunk
changeset: 507441:cd5c4fabece4
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 01 20:21:59 2006 +0000

description:
Fix sysmouse handling on DragonFly, mostly garbage arrived. Thanks for
Simon Schubert to point out the right file.
Fix ATI driver option to not include the theatre module, if disabled.
Shown by Robert Sebastian Gerus during testing of the first fix.
Bump revision of xorg-server.

diffstat:

 x11/xorg-libs/distinfo         |   4 ++--
 x11/xorg-libs/patches/patch-av |  39 +++++++++++++++++++++++++++++++++++++--
 x11/xorg-server/Makefile       |   4 ++--
 x11/xorg-server/PLIST          |   8 ++++----
 4 files changed, 45 insertions(+), 10 deletions(-)

diffs (105 lines):

diff -r 08fc73470a47 -r cd5c4fabece4 x11/xorg-libs/distinfo
--- a/x11/xorg-libs/distinfo    Wed Feb 01 19:27:52 2006 +0000
+++ b/x11/xorg-libs/distinfo    Wed Feb 01 20:21:59 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2006/01/23 22:54:44 joerg Exp $
+$NetBSD: distinfo,v 1.32 2006/02/01 20:21:59 joerg Exp $
 
 SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
 RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
@@ -29,7 +29,7 @@
 SHA1 (patch-as) = 492de38023ab7babebe0db8ab700d76e5f2b8a8b
 SHA1 (patch-at) = de62c6d1eedda14bac4344978b18065d46de3efd
 SHA1 (patch-au) = 3b76dbc381190ef18957a5af73208a72df687151
-SHA1 (patch-av) = 052de5919a40751062a008d6f590872f84284d9f
+SHA1 (patch-av) = bfcdb21557e8e6f8c24399ad0077b75d4a5215c6
 SHA1 (patch-aw) = 4289ec24e811efd6f74acca6c6842ee5f77cc5f7
 SHA1 (patch-ay) = 4403bc18ab13f582e4a36d6f873bbd7aaaceacf5
 SHA1 (patch-az) = a236a896e4e58f0d21d5745fb4b452300f2b77c6
diff -r 08fc73470a47 -r cd5c4fabece4 x11/xorg-libs/patches/patch-av
--- a/x11/xorg-libs/patches/patch-av    Wed Feb 01 19:27:52 2006 +0000
+++ b/x11/xorg-libs/patches/patch-av    Wed Feb 01 20:21:59 2006 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-av,v 1.3 2006/01/18 23:53:06 xtraeme Exp $
+$NetBSD: patch-av,v 1.4 2006/02/01 20:21:59 joerg Exp $
 
---- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.orig   2006-01-06 17:17:03.000000000 +0000
+--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.orig   2005-11-08 06:33:29.000000000 +0000
 +++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h
 @@ -445,7 +445,7 @@ extern int errno;
  /* Kernel of *BSD                                                         */
@@ -11,3 +11,38 @@
  
  # include <sys/param.h>
  # if defined(__FreeBSD_version) && !defined(__FreeBSD_kernel_version)
+@@ -470,11 +470,11 @@ extern int errno;
+ #   endif
+ #   ifdef SYSCONS_SUPPORT
+ #    define COMPAT_SYSCONS
+-#    if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
++#    if defined(__NetBSD__) || defined(__OpenBSD__)
+ #     include <machine/console.h>
+ #    else
+-#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#        if (__FreeBSD_kernel_version >= 410000)
++#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++#        if defined(__DragonFly__)  || (__FreeBSD_kernel_version >= 410000)
+ #          include <sys/consio.h>
+ #          include <sys/kbio.h>
+ #        else
+@@ -488,7 +488,7 @@ extern int errno;
+ #   if defined(PCVT_SUPPORT)
+ #    if !defined(SYSCONS_SUPPORT)
+       /* no syscons, so include pcvt specific header file */
+-#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++#     if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #      include <machine/pcvt_ioctl.h>
+ #     else
+ #      if defined(__NetBSD__) || defined(__OpenBSD__)
+@@ -511,8 +511,8 @@ extern int errno;
+ #    include <dev/wscons/wsconsio.h>
+ #    include <dev/wscons/wsdisplay_usl_io.h>
+ #   endif /* WSCONS_SUPPORT */
+-#   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+-#    if (__FreeBSD_kernel_version >= 500013)
++#   if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
++#    if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013)
+ #     include <sys/mouse.h>
+ #    else
+ #     undef MOUSE_GETINFO
diff -r 08fc73470a47 -r cd5c4fabece4 x11/xorg-server/Makefile
--- a/x11/xorg-server/Makefile  Wed Feb 01 19:27:52 2006 +0000
+++ b/x11/xorg-server/Makefile  Wed Feb 01 20:21:59 2006 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2006/01/24 07:33:02 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2006/02/01 20:21:59 joerg Exp $
 
 DISTNAME=      ${DISTFILES}
 PKGNAME=       xorg-server-${XORG_VER}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG}
 DISTFILES=     X11R${XORG_VER}-src1.tar.gz \
diff -r 08fc73470a47 -r cd5c4fabece4 x11/xorg-server/PLIST
--- a/x11/xorg-server/PLIST     Wed Feb 01 19:27:52 2006 +0000
+++ b/x11/xorg-server/PLIST     Wed Feb 01 20:21:59 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/01/21 04:08:23 hira Exp $
+@comment $NetBSD: PLIST,v 1.8 2006/02/01 20:21:59 joerg Exp $
 ${X11ROOT_PREFIX}/bin/X
 ${X11ROOT_PREFIX}/bin/Xnest
 ${X11ROOT_PREFIX}/bin/Xprt
@@ -1126,9 +1126,9 @@
 ${X11ROOT_PREFIX}/lib/modules/multimedia/tda8425_drv.so
 ${X11ROOT_PREFIX}/lib/modules/multimedia/tda9850_drv.so
 ${X11ROOT_PREFIX}/lib/modules/multimedia/tda9885_drv.so
-${X11ROOT_PREFIX}/lib/modules/multimedia/theatre200_drv.so
-${X11ROOT_PREFIX}/lib/modules/multimedia/theatre_detect_drv.so
-${X11ROOT_PREFIX}/lib/modules/multimedia/theatre_drv.so
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/multimedia/theatre200_drv.so
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/multimedia/theatre_detect_drv.so
+${CARDDRIVER.xorg-server-ati}${X11ROOT_PREFIX}/lib/modules/multimedia/theatre_drv.so
 ${X11ROOT_PREFIX}/lib/modules/multimedia/uda1380_drv.so
 ${X11ROOT_PREFIX}/lib/modules/libafb.so
 ${X11ROOT_PREFIX}/lib/modules/libcfb.so