Index: x11/XFree86-4-clients/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-clients/Makefile,v retrieving revision 1.100 diff -u -r1.100 Makefile --- x11/XFree86-4-clients/Makefile 2 Aug 2002 02:57:04 -0000 1.100 +++ x11/XFree86-4-clients/Makefile 2 Aug 2002 07:55:14 -0000 @@ -7,7 +7,7 @@ PORTNAME= clients PORTVERSION= 4.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} Index: x11/XFree86-4-libraries/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/Makefile,v retrieving revision 1.108 diff -u -r1.108 Makefile --- x11/XFree86-4-libraries/Makefile 2 Aug 2002 02:57:07 -0000 1.108 +++ x11/XFree86-4-libraries/Makefile 2 Aug 2002 07:49:19 -0000 @@ -7,7 +7,7 @@ PORTNAME= libraries PORTVERSION= 4.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -17,10 +17,12 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz -PATCH_SITES= ${MASTER_SITE_XFREE:S/source//g} -PATCH_SITE_SUBDIR= ${PORTVERSION}/fixes -PATCHFILES= 4.2.0-xlib-i18n-module.patch \ - 4.2.0-libGLU-bad-extern.patch +PATCH_SITES= ${MASTER_SITE_XFREE:S/source//g:S/$/:x/} \ + ${MASTER_SITE_LOCAL:S/$/:patch420/} +PATCH_SITE_SUBDIR= ${PORTVERSION}/fixes/:x \ + anholt/patches-4.2.0/:patch420 +PATCHFILES= patch-XlcDL.c:patch420 \ + 4.2.0-libGLU-bad-extern.patch:x PATCH_DIST_STRIP= -p1 MAINTAINER= anholt@freebsd.org Index: x11/XFree86-4-libraries/distinfo =================================================================== RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/distinfo,v retrieving revision 1.32 diff -u -r1.32 distinfo --- x11/XFree86-4-libraries/distinfo 2 Aug 2002 02:57:07 -0000 1.32 +++ x11/XFree86-4-libraries/distinfo 2 Aug 2002 07:53:53 -0000 @@ -1,4 +1,4 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 -MD5 (xc/4.2.0-xlib-i18n-module.patch) = 19a91692fdb4fa3d2797f57beebee34a +MD5 (xc/patch-XlcDL.c) = 1cd40d140e6900c48ff806fa53ee85f0 MD5 (xc/4.2.0-libGLU-bad-extern.patch) = 2d5c738854c7cc0378ae457b09a029f4 Index: x11/XFree86-4-libraries/files/patch-mouse.c =================================================================== RCS file: x11/XFree86-4-libraries/files/patch-mouse.c diff -N x11/XFree86-4-libraries/files/patch-mouse.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/XFree86-4-libraries/files/patch-mouse.c 2 Aug 2002 22:37:27 -0000 @@ -0,0 +1,11 @@ +--- 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 @@ + 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; ++ dz = ((signed char)(pBuf[5] << 1) + (signed char)(pBuf[6] << 1)) >> 1; + buttons |= (int)(~pBuf[7] & 0x07) << 3; + } + break; Index: x11/XFree86-4-libraries/files/patch-sysvipc =================================================================== RCS file: x11/XFree86-4-libraries/files/patch-sysvipc diff -N x11/XFree86-4-libraries/files/patch-sysvipc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ x11/XFree86-4-libraries/files/patch-sysvipc 2 Aug 2002 07:29:24 -0000 @@ -0,0 +1,34 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig Fri Aug 2 00:27:08 2002 ++++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile Fri Aug 2 00:28:25 2002 +@@ -62,6 +62,10 @@ + MTRRDEFINES = -DHAS_MTRR_BUILTIN + #endif + ++#if defined(FreeBSDArchitecture) ++SYSVIPCDEFINES = -DHAVE_SYSV_IPC ++#endif ++ + #if UsbMouseSupport + USBMOUSEDEFINES1 = -DUSBMOUSE_SUPPORT + #if !HasLibUsb +@@ -142,7 +146,7 @@ + #endif + + DEFINES = $(CONSDEFINES) $(APDEFINES) $(IOPERMDEFINES) $(RESDEFINES) \ +- $(MTRRDEFINES) $(USBMOUSEDEFINES) ++ $(MTRRDEFINES) $(USBMOUSEDEFINES) $(SYSVIPCDEFINES) + + #if defined(AlphaArchitecture) + SpecialObjectRule(bsd_ev56.o, bsd_ev56.c, -mcpu=ev56) +--- programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c.orig Fri Aug 2 00:25:26 2002 ++++ programs/Xserver/hw/xfree86/os-support/shared/libc_wrapper.c Fri Aug 2 00:25:48 2002 +@@ -1879,7 +1879,9 @@ + + if (xf86shmflg & XF86SHM_RDONLY) shmflg |= SHM_RDONLY; + if (xf86shmflg & XF86SHM_RND) shmflg |= SHM_RND; ++#ifdef SHM_REMAP + if (xf86shmflg & XF86SHM_REMAP) shmflg |= SHM_REMAP; ++#endif + + return shmat(id,addr,shmflg); + } Index: x11-servers/XFree86-4-Server/Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v retrieving revision 1.115 diff -u -r1.115 Makefile --- x11-servers/XFree86-4-Server/Makefile 2 Aug 2002 02:57:24 -0000 1.115 +++ x11-servers/XFree86-4-Server/Makefile 2 Aug 2002 21:22:23 -0000 @@ -7,7 +7,7 @@ PORTNAME= Server PORTVERSION= 4.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -16,6 +16,10 @@ PKGNAMEPREFIX= XFree86- DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz:x Wraphelp.gz:local EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz + +PATCH_SITES= ${MASTER_SITE_LOCAL} +PATCH_SITE_SUBDIR= anholt/patches-4.2.0/ +PATCHFILES= patch-nvchips MAINTAINER= anholt@freebsd.org Index: x11-servers/XFree86-4-Server/distinfo =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/distinfo,v retrieving revision 1.36 diff -u -r1.36 distinfo --- x11-servers/XFree86-4-Server/distinfo 2 Aug 2002 02:57:24 -0000 1.36 +++ x11-servers/XFree86-4-Server/distinfo 2 Aug 2002 21:22:32 -0000 @@ -1,3 +1,4 @@ MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f MD5 (xc/Wraphelp.gz) = 7ee30e397359e8d64ab23f29aa551659 MD5 (xc/freebsd-glide3headers.tar.gz) = 2bb614c909898a17c05e43e60cfb8e3b +MD5 (xc/patch-nvchips) = 595728cae6c49f074c7a245dea6cd1ef