1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-21 20:38:45 +00:00

Upgrade to version 4.01

This commit is contained in:
Jean-Marc Zucconi 2000-07-03 17:33:14 +00:00
parent c4609c2259
commit 733bf07408
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=30141
6 changed files with 1265 additions and 50 deletions

View File

@ -6,14 +6,14 @@
#
PORTNAME= XFree86
PORTVERSION= 4.0
PORTVERSION= 4.01
CATEGORIES= x11
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
DISTFILES= X400src-1.tgz X400src-2.tgz
MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.01/source/ \
ftp://ftp.freesoftware.com/pub/XFree86/4.01/source/ \
ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.01/source/ \
ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.01/source/ \
ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.01/source/
DISTFILES= X401src-1.tgz X401src-2.tgz
MAINTAINER= jmz@FreeBSD.org
@ -64,7 +64,7 @@ pre-fetch:
MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \
ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
EXTRACT_ONLY= X400src-1.tgz X400src-2.tgz
EXTRACT_ONLY= X401src-1.tgz X401src-2.tgz
DISTFILES+= Wraphelp.c
IGNOREFILES= Wraphelp.c
.endif

View File

@ -1,3 +1,3 @@
MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
MD5 (xc/X400src-2.tgz) = ad5f7461adb6b2646f9a9c48ad93f6da
MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
MD5 (xc/X401src-2.tgz) = a3363a076f355ddbba68c7f0557438ff
MD5 (xc/Wraphelp.c) = IGNORE

View File

@ -17,14 +17,3 @@
#endif
#ifndef PreIncDir
@@ -463,8 +463,9 @@
/*
* A hack to work around an optimisation problem with the compiler on
* FreeBSD 4.0-current in late 1999/early 2000.
+ * (and FreeBSD 5.0-current in early 2000)
*/
-#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0
+#if (OSMajorVersion == 4 || OSMajorVersion == 5) && OSMinorVersion == 0 && OSTeenyVersion == 0
#define FreeBSDGccOptBug
#endif

View File

@ -1,15 +0,0 @@
--- programs/Xserver/xkb/ddxLoad.c~ 1999/12/05 01:22:09
+++ programs/Xserver/xkb/ddxLoad.c 2000/05/24 15:08:12
@@ -237,6 +237,13 @@
sprintf(keymap,"server-%s",display);
}
else {
+ if (strlen(names->keymap) > PATH_MAX - 1) {
+#ifdef DEBUG
+ ErrorF("name of keymap (%s) exceeds max length\n",
+ names->keymap);
+#endif
+ return False;
+ }
strcpy(keymap,names->keymap);
}

View File

@ -1,11 +0,0 @@
diff -ru programs/xterm/charproc.c.orig programs/xterm/charproc.c
--- programs/xterm/charproc.c.orig Wed Mar 1 01:21:00 2000
+++ programs/xterm/charproc.c Fri Mar 3 03:53:46 2000
@@ -4307,6 +4310,7 @@
wnew->screen.Acolors[i] = request->screen.Acolors[i];
#if OPT_COLOR_RES
TRACE(("Acolors[%d] = %s\n", i, request->screen.Acolors[i].resource));
+ wnew->screen.Acolors[i].mode = False;
if (strcmp(wnew->screen.Acolors[i].resource, XtDefaultForeground))
color_ok = True;
#else

File diff suppressed because it is too large Load Diff