diff options
| author | Dejan Lesjak <lesi@FreeBSD.org> | 2005-06-15 02:40:03 +0000 |
|---|---|---|
| committer | Dejan Lesjak <lesi@FreeBSD.org> | 2005-06-15 02:40:03 +0000 |
| commit | 2552b8e5f9c2bef21e6add3686f7c04684f0622f (patch) | |
| tree | d96c4fd406b1cc73c9f477f27eacd5184bbe21b0 /x11-servers/XFree86-4-Server/files/patch-Xext-saver.c | |
| parent | Mark these ports IGNORE on XFree86, due to libGL incompatibility and the (diff) | |
Upgrade to XFree86 4.5.0.
Ports changes:
- Drop dependency on x11/wrapper. X server already contains this code
(programs/Xserver/os/utils.c rev. 3.58).
- Install default SecurityPolicy with XFree86-4-libraries, thus avoiding
plists and who-owns-what complications between different fooServer ports.
Copy default file to real one if that doesn't exist and remove both upon
uninstall if they are the same.
- Revert change to Imake.rules rev. 3.132 in devel/imake-4 port, since
couple of ports break with this change
(devel/imake-4/files/patch-Imake.rules)
- Add grehans patches for PPC [1]
- Several of directories that were previously in /etc/mtree/BSD.x11-4.dist
were moved to respective ports pkg-plists
PR: [1] 78345, 78346, 78348, 78352, 78353, 78354, 78355, 78356
Notes
Notes:
svn path=/head/; revision=137466
Diffstat (limited to 'x11-servers/XFree86-4-Server/files/patch-Xext-saver.c')
| -rw-r--r-- | x11-servers/XFree86-4-Server/files/patch-Xext-saver.c | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c b/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c deleted file mode 100644 index ca124eacf985..000000000000 --- a/x11-servers/XFree86-4-Server/files/patch-Xext-saver.c +++ /dev/null @@ -1,43 +0,0 @@ -Index: programs/Xserver/Xext/saver.c -=================================================================== -RCS file: /cvs/xc/programs/Xserver/Xext/saver.c,v -retrieving revision 3.8 -retrieving revision 3.8.2.1 -diff -u -u -r3.8 -r3.8.2.1 ---- programs/Xserver/Xext/saver.c 17 Nov 2003 22:20:26 -0000 3.8 -+++ programs/Xserver/Xext/saver.c 2 Mar 2004 19:39:48 -0000 3.8.2.1 -@@ -27,7 +27,7 @@ - * Author: Keith Packard, MIT X Consortium - */ - --/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8 2003/11/17 22:20:26 dawes Exp $ */ -+/* $XFree86: xc/programs/Xserver/Xext/saver.c,v 3.8.2.1 2004/03/02 19:39:48 dawes Exp $ */ - - #define NEED_REPLIES - #define NEED_EVENTS -@@ -810,7 +810,7 @@ - DepthPtr pDepth; - WindowOptPtr ancwopt; - unsigned long *pVlist; -- unsigned long *values = 0; -+ unsigned long *values = 0, *save = 0; - unsigned long tmask, imask; - unsigned long val; - Pixmap pixID; -@@ -938,6 +938,7 @@ - ret = BadAlloc; - goto bail; - } -+ save = values; - pAttr->screen = pScreen; - pAttr->client = client; - pAttr->x = stuff->x; -@@ -1166,7 +1167,7 @@ - bail: - CheckScreenPrivate (pScreen); - xfree (pAttr); -- xfree (values); -+ xfree (save); - return ret; - } - |