diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2003-01-24 04:14:16 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2003-01-24 04:14:16 +0000 |
| commit | a0f7fe90a025ffba298357bc66e1bfc3b77e6dd3 (patch) | |
| tree | 3445b9fb21734ce57a2218b66d78ddeb66723500 /x11/XFree86-4-libraries | |
| parent | Make the struct huffentry public so that global variables (diff) | |
[1] Fix missing symbols in i810 driver
[2] Fix xdm on Alpha by using NetBSD's version of Wraphelp.c
[3] Report buttons 7 and when using sysmouse protocol
[4] Fix missing symbols in r128 driver.
[5] Reset /usr/X11R6/bin/X to Xwrapper-4 after install if Xwrapper-4 exists.
PR: [1] i386/44203
[2] ports/43664
[3] ports/43232
Notes
Notes:
svn path=/head/; revision=73898
Diffstat (limited to 'x11/XFree86-4-libraries')
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 6 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/distinfo | 2 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/files/patch-mouse.c | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index cec3c622040e..c41ec2b3cda4 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -7,7 +7,7 @@ PORTNAME= libraries PORTVERSION= 4.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= 4.2.0/:x \ anholt/:local PKGNAMEPREFIX= XFree86- DISTFILES= X420src-1.tgz:x \ - Wraphelp.gz:local + Wraphelp2.gz:local EXTRACT_ONLY= X420src-1.tgz PATCH_SITES= ${MASTER_SITE_LOCAL} @@ -104,7 +104,7 @@ PLIST_SUB+= XTHRSTUB:="" .endif post-extract: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \ + ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c post-patch: diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index e4832d764bce..fde56e7c7696 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1,3 +1,3 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f -MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 +MD5 (xc/Wraphelp2.gz) = bd1910492087442288d885412e2e5535 MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274 diff --git a/x11/XFree86-4-libraries/files/patch-mouse.c b/x11/XFree86-4-libraries/files/patch-mouse.c index 321c1699f712..11f7a5464154 100644 --- a/x11/XFree86-4-libraries/files/patch-mouse.c +++ b/x11/XFree86-4-libraries/files/patch-mouse.c @@ -1,11 +1,13 @@ ---- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Wed Dec 19 08:05:22 2001 -+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Fri Aug 2 15:35:01 2002 -@@ -1505,7 +1505,7 @@ +--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Wed Dec 19 16:05:22 2001 ++++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Thu Jan 9 22:48:18 2003 +@@ -1505,8 +1505,8 @@ dy = - ((char)(pBuf[2]) + (char)(pBuf[4])); /* FreeBSD sysmouse sends additional data bytes */ if (pMse->protoPara[4] >= 8) { - dz = ((char)(pBuf[5] << 1) + (char)(pBuf[6] << 1)) / 2; +- buttons |= (int)(~pBuf[7] & 0x07) << 3; + dz = ((signed char)(pBuf[5] << 1) + (signed char)(pBuf[6] << 1)) >> 1; - buttons |= (int)(~pBuf[7] & 0x07) << 3; ++ buttons |= (int)(~pBuf[7] & 0x7f) << 3; } break; + |