Apply patches from Joerg Sonnerberger to fix some misc problems, like

imake problems with audio/nas and the mouse issues seen on
DragonFlyBSD, this closes PR pkg/30418.

5 files changed, 46 insertions, 5 deletions

diff --git a/x11/xorg-imake/distinfo b/x11/xorg-imake/distinfo
index ddeb0bd94a1..7b0fe193c04 100644
--- a/x11/xorg-imake/distinfo
+++ b/x11/xorg-imake/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/05/23 19:14:14 xtraeme Exp $
+$NetBSD: distinfo,v 1.14 2005/06/07 02:43:26 xtraeme Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -13,8 +13,9 @@ SHA1 (patch-ad) = 7843332769ee47bc8a52a9adb1047b1a637af71b
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
 SHA1 (patch-af) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ag) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
-SHA1 (patch-ah) = 6960406211ab12eff3044db477c22833c9eaa488
+SHA1 (patch-ah) = 4500a20f369f186c90cb7b0b02cb1ba49e552b34
 SHA1 (patch-ai) = eb3853e360dd5e05ca5978791734bcba5541b162
 SHA1 (patch-aj) = 58594b376a62a584c0bc7f056e512fe8700d558e
 SHA1 (patch-ak) = c7e83c91d5192b5bd9e40c5b3ae3501900487a9f
 SHA1 (patch-al) = 14701767d5719cb2a47d2b828e69cffc1a6063bc
+SHA1 (patch-am) = 3686fea856a19acd3631c07f3ebfc9d2df1f12ec
diff --git a/x11/xorg-imake/patches/patch-ah b/x11/xorg-imake/patches/patch-ah
index 54ca49272ba..e93ad318ddb 100644
--- a/x11/xorg-imake/patches/patch-ah
+++ b/x11/xorg-imake/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 2004/11/15 11:15:42 hira Exp $
+$NetBSD: patch-ah,v 1.3 2005/06/07 02:43:26 xtraeme Exp $
 
 --- config/cf/Imake.cf.orig	2004-08-12 06:14:01.000000000 +0900
 +++ config/cf/Imake.cf	2004-11-09 20:01:31.000000000 +0900
@@ -13,7 +13,7 @@ $NetBSD: patch-ah,v 1.2 2004/11/15 11:15:42 hira Exp $
  #endif /* NetBSD */
  
  /* Systems based on kernel of NetBSD */
-@@ -253,7 +257,23 @@
+@@ -253,7 +257,24 @@
  #define KNetBSDArchitecture
  #endif
  
@@ -22,6 +22,7 @@ $NetBSD: patch-ah,v 1.2 2004/11/15 11:15:42 hira Exp $
 +# define MacroIncludeFile <DragonFly.cf>
 +# define MacroFile DragonFly.cf
 +# undef __DragonFly__
++# define DragonFlyArchitecture
 +# define FreeBSDArchitecture
 +# define KFreeBSDArchitecture
 +# ifdef __i386__
diff --git a/x11/xorg-imake/patches/patch-am b/x11/xorg-imake/patches/patch-am
new file mode 100644
index 00000000000..624786525b9
--- /dev/null
+++ b/x11/xorg-imake/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2005/06/07 02:43:26 xtraeme Exp $
+
+--- config/cf/bsdLib.rules.orig	2005-06-01 18:09:09.000000000 +0200
++++ config/cf/bsdLib.rules
+@@ -229,7 +229,7 @@ LintLibReferences(varname,libname,libsou
+  * InstallSharedLibrary - generate rules to install the shared library.
+  * NOTE: file must be executable, hence "INSTBINFLAGS"
+  */
+-#ifndef FreeBSDArchitecture
++#if !defined(FreeBSDArchitecture) || defined(DragonFlyArchitecture)
+ INSTALLMINORREV = true
+ #else
+ INSTALLMINORREV = false
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 04e3a7fdccf..4504a5094ed 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2005/05/23 19:14:15 xtraeme Exp $
+$NetBSD: distinfo,v 1.21 2005/06/07 02:43:26 xtraeme Exp $
 
 SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
 RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -44,3 +44,4 @@ SHA1 (patch-bh) = 1d356a2e1a885476ed8e55f3e9db0fd5744772a5
 SHA1 (patch-bi) = 4afc732ca451004b600c431ef76956d64317654c
 SHA1 (patch-bj) = 263336947f34b98c054b75dba204756c8b8f488f
 SHA1 (patch-bk) = e8b5eca5ce2d3acc77797f16f956dfc9a2fcacc8
+SHA1 (patch-bl) = 061ef890491cc131e70c6329a30c9f28a301df92
diff --git a/x11/xorg-libs/patches/patch-bl b/x11/xorg-libs/patches/patch-bl
new file mode 100644
index 00000000000..3e25586fab7
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bl
@@ -0,0 +1,25 @@
+$NetBSD: patch-bl,v 1.1 2005/06/07 02:43:26 xtraeme Exp $
+
+--- programs/Xserver/hw/xfree86/common/xf86Xinput.c.orig	2005-05-16 23:20:56.000000000 +0900
++++ programs/Xserver/hw/xfree86/common/xf86Xinput.c	2005-05-16 23:23:25.000000000 +0900
+@@ -932,15 +932,10 @@
+ 		    /* modeled from xf86Events.c */
+ 		    if (device->ptrfeed->ctrl.threshold) {
+ 			if ((abs(dx) + abs(dy)) >= device->ptrfeed->ctrl.threshold) {
+-			    local->dxremaind = ((float)dx * (float)(device->ptrfeed->ctrl.num)) /
+-			        (float)(device->ptrfeed->ctrl.den) + local->dxremaind;
+-			    valuator[0] = (int)local->dxremaind;
+-			    local->dxremaind = local->dxremaind - (float)valuator[0];
+-			    
+-			    local->dyremaind = ((float)dy * (float)(device->ptrfeed->ctrl.num)) /
+-			        (float)(device->ptrfeed->ctrl.den) + local->dyremaind;
+-			    valuator[1] = (int)local->dyremaind;
+-			    local->dyremaind = local->dyremaind - (float)valuator[1];
++			    valuator[0] = (dx * device->ptrfeed->ctrl.num) /
++					   device->ptrfeed->ctrl.den;
++			    valuator[1] = (dy * device->ptrfeed->ctrl.num) /
++					   device->ptrfeed->ctrl.den;
+ 			}
+ 		    }
+ 		    else if (dx || dy) {
+