Update the XFree86 3.3.6 port to:

- contain the released Rage128 patch (but unfortunately this does not solve all problems with this card under FreeBSD) - fix the release date "January 1999" --> "January 2000" - make it possible to build a package (PLIST problem: lib/X11/doc/BetaReport is not installed with 3.3.6) PR: ports/16626 Submitted by: Udo Schweigert <ust@cert.siemens.de>
svn path=/head/; revision=25645
2000-02-10 15:51:05 +00:00 · 2000-02-10 15:51:05 +00:00 · c72e6d240a · 2021-03-31 03:12:20 +00:00
commit c72e6d240a
parent c6e27288e4
24 changed files with 78 additions and 9 deletions
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@ -16,6 +16,13 @@ MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
 DISTFILES=	X336src-1.tgz X336src-2.tgz

+PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
+		ftp://xfree86.cdrom.com/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	
+
 MAINTAINER=	jmz@FreeBSD.org

 IS_INTERACTIVE=	yes	# configure script asks questions
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@ -1,3 +1,4 @@
 MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
 MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
+MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@ -591,7 +591,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@ -16,6 +16,13 @@ MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
 DISTFILES=	X336src-1.tgz X336src-2.tgz

+PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
+		ftp://xfree86.cdrom.com/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	
+
 MAINTAINER=	jmz@FreeBSD.org

 IS_INTERACTIVE=	yes	# configure script asks questions
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@ -1,3 +1,4 @@
 MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
 MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
+MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@ -591,7 +591,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@ -16,6 +16,13 @@ MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
 DISTFILES=	X336src-1.tgz X336src-2.tgz

+PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
+		ftp://xfree86.cdrom.com/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	
+
 MAINTAINER=	jmz@FreeBSD.org

 IS_INTERACTIVE=	yes	# configure script asks questions
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@ -1,3 +1,4 @@
 MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
 MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
+MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@ -591,7 +591,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@ -16,6 +16,13 @@ MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
 DISTFILES=	X336src-1.tgz X336src-2.tgz

+PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
+		ftp://xfree86.cdrom.com/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	
+
 MAINTAINER=	jmz@FreeBSD.org

 IS_INTERACTIVE=	yes	# configure script asks questions
--- a/x11/XFree86-4-libraries/distinfo
+++ b/x11/XFree86-4-libraries/distinfo
@ -1,3 +1,4 @@
 MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
 MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
+MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11/XFree86-4-libraries/files/patch-d
+++ b/x11/XFree86-4-libraries/files/patch-d
@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/xf86Version.h.orig	Sat Jan  8 19:24:57 2000
+++ programs/Xserver/hw/xfree86/xf86Version.h	Wed Feb  9 16:44:53 2000
+@@ -19,6 +19,6 @@
+ 			XF86_VERSION_BETA,			\
+ 			XF86_VERSION_ALPHA)
+ 
+-#define XF86_DATE	"January 8 1999"
+#define XF86_DATE	"January 8 2000"
+ 
+ /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
--- a/x11/XFree86-4-libraries/pkg-plist
+++ b/x11/XFree86-4-libraries/pkg-plist
@ -591,7 +591,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@ -16,6 +16,13 @@ MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
 DISTFILES=	X336src-1.tgz X336src-2.tgz

+PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
+		ftp://xfree86.cdrom.com/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	
+
 MAINTAINER=	jmz@FreeBSD.org

 IS_INTERACTIVE=	yes	# configure script asks questions
--- a/x11/XFree86-4/distinfo
+++ b/x11/XFree86-4/distinfo
@ -1,3 +1,4 @@
 MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
 MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
+MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11/XFree86-4/files/patch-d
+++ b/x11/XFree86-4/files/patch-d
@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/xf86Version.h.orig	Sat Jan  8 19:24:57 2000
+++ programs/Xserver/hw/xfree86/xf86Version.h	Wed Feb  9 16:44:53 2000
+@@ -19,6 +19,6 @@
+ 			XF86_VERSION_BETA,			\
+ 			XF86_VERSION_ALPHA)
+ 
+-#define XF86_DATE	"January 8 1999"
+#define XF86_DATE	"January 8 2000"
+ 
+ /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
--- a/x11/XFree86-4/pkg-plist
+++ b/x11/XFree86-4/pkg-plist
@ -591,7 +591,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
@ -584,7 +584,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11/XFree86/Makefile
+++ b/x11/XFree86/Makefile
@ -16,6 +16,13 @@ MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.6/source/ \
 		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.6/source/
 DISTFILES=	X336src-1.tgz X336src-2.tgz

+PATCH_SITES=	ftp://ftp.xfree.org/pub/XFree86/3.3.6/fixes/ \
+		ftp://xfree86.cdrom.com/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	
+
 MAINTAINER=	jmz@FreeBSD.org

 IS_INTERACTIVE=	yes	# configure script asks questions
--- a/x11/XFree86/distinfo
+++ b/x11/XFree86/distinfo
@ -1,3 +1,4 @@
 MD5 (xc/X336src-1.tgz) = bbfa360d10ce91ab37f24f197a31b485
 MD5 (xc/X336src-2.tgz) = 897daa223b5b67b8314ed8835cc17539
+MD5 (xc/fix-01-r128) = a62387e13b970c5a83e9a0822c30344f
 MD5 (xc/Wraphelp.c) = IGNORE
--- a/x11/XFree86/files/patch-d
+++ b/x11/XFree86/files/patch-d
@ -0,0 +1,10 @@
+--- programs/Xserver/hw/xfree86/xf86Version.h.orig	Sat Jan  8 19:24:57 2000
+++ programs/Xserver/hw/xfree86/xf86Version.h	Wed Feb  9 16:44:53 2000
+@@ -19,6 +19,6 @@
+ 			XF86_VERSION_BETA,			\
+ 			XF86_VERSION_ALPHA)
+ 
+-#define XF86_DATE	"January 8 1999"
+#define XF86_DATE	"January 8 2000"
+ 
+ /* $XConsortium: xf86Version.h /main/78 1996/10/28 05:42:10 kaleb $ */
--- a/x11/XFree86/pkg-plist
+++ b/x11/XFree86/pkg-plist
@ -591,7 +591,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11/XFree86/pkg-plist.alpha
+++ b/x11/XFree86/pkg-plist.alpha
@ -584,7 +584,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors
--- a/x11/XFree86/pkg-plist.pc98
+++ b/x11/XFree86/pkg-plist.pc98
@ -589,7 +589,6 @@ lib/X11/config/xf86site.def
 lib/X11/config/xfree86.cf
 lib/X11/doc/AccelCards
 lib/X11/doc/BUILD
-lib/X11/doc/BetaReport
 lib/X11/doc/COPYRIGHT
 lib/X11/doc/Devices
 lib/X11/doc/Monitors