diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2002-08-05 07:26:11 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2002-08-05 07:26:11 +0000 |
| commit | 05f2c750e945a5f0c7e774b731ec85ef2574d76c (patch) | |
| tree | 65a1b04847b2daed84e7a0349b6b94fe003ae8a0 | |
| parent | add tcl and tk dependencies (diff) | |
1. Use XlcDL.c from X CVS to help people with Korean or Japanese XIM and GTK+
2. Update PCI IDs and nv driver to include newer nv chipsets
3. Add SHM to XFree86's libc wrapper on bsd to help with nv binary drivers.
4. Fix mouse scrollwheels on -current (new gcc)
Submitted by: [1] Hye-Shik Chang <perky@FreeBSD.org>
[2] Chris Dillon <cdillon@wolves.k12.mo.us>
[3] Matthew N. Dodd <mdodd@freebsd.org>
[4] Ted Lindgreen <ted@sanne.nlnetlabs.nl>
Approved by: mdodd
Notes
Notes:
svn path=/head/; revision=64028
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 6 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/distinfo | 1 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 6 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/distinfo | 1 | ||||
| -rw-r--r-- | x11/XFree86-4-clients/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/Makefile | 12 | ||||
| -rw-r--r-- | x11/XFree86-4-libraries/distinfo | 2 |
7 files changed, 21 insertions, 9 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index 39873a1fb51c..fd7570a48db8 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -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/} @@ -17,6 +17,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 XFREE86_VERSION= 4 diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo index 517a5f166743..91b612a82075 100644 --- a/x11-servers/XFree86-4-Server-snap/distinfo +++ b/x11-servers/XFree86-4-Server-snap/distinfo @@ -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 diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 39873a1fb51c..fd7570a48db8 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -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/} @@ -17,6 +17,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 XFREE86_VERSION= 4 diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo index 517a5f166743..91b612a82075 100644 --- a/x11-servers/XFree86-4-Server/distinfo +++ b/x11-servers/XFree86-4-Server/distinfo @@ -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 diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index fb788f2d52cb..76bb775ef5f3 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -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/} diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index ff379a4ab7bd..2e042030e41b 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -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 @@ 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_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 diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index 6876f69689f1..f4e4f2e67dcb 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -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 |