summaryrefslogtreecommitdiff
path: root/x11/XFree86
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2000-10-10 10:40:08 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2000-10-10 10:40:08 +0000
commitb746bc4c2353f4090eac8ab7e31a7595ee181807 (patch)
treec8bdab48450e69fc77cf95745522e88512b4191e /x11/XFree86
parentUpdate Vim 5.7 to patchlevel 10. (diff)
Add the latest fixes to PATCHFILES (all related to the s3 driver)
PATCH_DIST_ARGS had to be changed because one of the patchfiles has an incorrect path. This is ok as long as all patches touch files in xc/programs/
Notes
Notes: svn path=/head/; revision=33666
Diffstat (limited to 'x11/XFree86')
-rw-r--r--x11/XFree86/Makefile7
-rw-r--r--x11/XFree86/distinfo5
2 files changed, 9 insertions, 3 deletions
diff --git a/x11/XFree86/Makefile b/x11/XFree86/Makefile
index cc1bb2519373..5889d92e1d52 100644
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 3.3.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
@@ -18,7 +18,8 @@ PATCH_SITES= ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-3.3.6/fixes/ \
ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/3.3.6/fixes/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/fixes/
-PATCHFILES= fix-01-r128
+PATCHFILES= fix-01-r128 fix-04-s3trio3d2x fix-05-s3trio3d fix-06-s3trio3d2x\
+ fix-07-s3trio64v2gx+netfinity fix-08-s3savage_ix+mx
MAINTAINER= jmz@FreeBSD.org
@@ -30,7 +31,7 @@ INSTALLS_SHLIB= yes
ALL_TARGET= World
INSTALL_TARGET= install install.man
DIST_SUBDIR= xc
-PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+PATCH_DIST_ARGS=-p2 -E -d ${WRKDIR}/xc/programs --quiet
SCRIPTS_ENV= OSVERSION=${OSVERSION}
# can't use USE_X_PREFIX here -- it will cause a circular dependency
PREFIX= ${X11BASE}
diff --git a/x11/XFree86/distinfo b/x11/XFree86/distinfo
index d2447f263e37..b38c7e8e2ad3 100644
--- a/x11/XFree86/distinfo
+++ b/x11/XFree86/distinfo
@@ -1,4 +1,9 @@
MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
+MD5 (xc/fix-04-s3trio3d2x) = 75569a9d49bb45b8ecb311ab3f8c2469
+MD5 (xc/fix-05-s3trio3d) = eb8fd33328c8b5fbd0410472339dee44
+MD5 (xc/fix-06-s3trio3d2x) = 79c4e3f340f1df5786649559d09c2378
+MD5 (xc/fix-07-s3trio64v2gx+netfinity) = 6b09cc9b7b3d89f18ea5e9591969b99c
+MD5 (xc/fix-08-s3savage_ix+mx) = 8df8d4b013de9e5f87d028b1bf2415a5
MD5 (xc/Wraphelp.c) = IGNORE