aboutsummaryrefslogtreecommitdiff
path: root/x11/XFree86-4
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2001-08-23 22:36:49 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2001-08-23 22:36:49 +0000
commit11377e20a2bae565a8051816adff33212dd44226 (patch)
treee985d6046fe7682cc04a539f9e09f2f5c9e6361a /x11/XFree86-4
parent63a08ea3d498deb9c824729c5f549f7531974910 (diff)
downloadports-11377e20a2bae565a8051816adff33212dd44226.tar.gz
ports-11377e20a2bae565a8051816adff33212dd44226.zip
Notes
Diffstat (limited to 'x11/XFree86-4')
-rw-r--r--x11/XFree86-4/Makefile2
-rw-r--r--x11/XFree86-4/files/patch-mouse22
2 files changed, 23 insertions, 1 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 5bf5b2329a13..2dcafe7b144a 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 4.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0
diff --git a/x11/XFree86-4/files/patch-mouse b/x11/XFree86-4/files/patch-mouse
new file mode 100644
index 000000000000..314a57f43428
--- /dev/null
+++ b/x11/XFree86-4/files/patch-mouse
@@ -0,0 +1,22 @@
+--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Aug 18 22:47:30 2001
++++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Thu Aug 23 17:13:44 2001
+@@ -1837,8 +1837,6 @@
+ if ((id = stateTab[pMse->emulateState][4][0]) != 0) {
+ xf86PostButtonEvent(pInfo->dev, 0, abs(id), (id >= 0), 0, 0);
+ pMse->emulateState = stateTab[pMse->emulateState][4][2];
+- } else {
+- ErrorF("Got unexpected buttonTimer in state %d\n", pMse->emulateState);
+ }
+
+ xf86UnblockSIGIO (sigstate);
+@@ -1892,11 +1890,6 @@
+ if (stateTab[pMse->emulateState][4][0] != 0) {
+ timer = TimerSet(timer, 0, pMse->emulate3Timeout, buttonTimer,
+ pInfo);
+- } else {
+- if (timer) {
+- TimerFree(timer);
+- timer = NULL;
+- }
+ }
+ }