aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2006-05-03 08:12:21 +0000
committerEric Anholt <anholt@FreeBSD.org>2006-05-03 08:12:21 +0000
commit27b683e97975846ddf2d0e1d973e3c35cfbdd6aa (patch)
tree8c455fcc0ad95f1082a7ad7b98555a5247f9d75d /x11-servers
parent9200d9071b7ced087b9a1dd5dc845d0dc953e3fd (diff)
downloadports-27b683e97975846ddf2d0e1d973e3c35cfbdd6aa.tar.gz
ports-27b683e97975846ddf2d0e1d973e3c35cfbdd6aa.zip
Notes
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-dmx/Makefile1
-rw-r--r--x11-servers/xorg-printserver/Makefile1
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-servers/xorg-server/Makefile.inc1
-rw-r--r--x11-servers/xorg-server/files/patch-mitri.c25
-rw-r--r--x11-servers/xorg-vfbserver/Makefile1
6 files changed, 30 insertions, 1 deletions
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 7736c02191a8..88ce07b4c0c4 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xorg-dmx
PORTVERSION= 6.9.0
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile
index c4240238dcbf..02a66623e678 100644
--- a/x11-servers/xorg-printserver/Makefile
+++ b/x11-servers/xorg-printserver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xorg-printserver
PORTVERSION= 6.9.0
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 781330f2d00f..7b6818824b85 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-server
PORTVERSION= 6.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc
index d7abe96318f4..1c5223b55c63 100644
--- a/x11-servers/xorg-server/Makefile.inc
+++ b/x11-servers/xorg-server/Makefile.inc
@@ -44,6 +44,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c \
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-mitri.c \
${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \
${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c
diff --git a/x11-servers/xorg-server/files/patch-mitri.c b/x11-servers/xorg-server/files/patch-mitri.c
new file mode 100644
index 000000000000..8c4ef0f57101
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-mitri.c
@@ -0,0 +1,25 @@
+Index: render/mitri.c
+===================================================================
+RCS file: /cvs/xorg/xserver/xorg/render/mitri.c,v
+retrieving revision 1.5
+diff -u -r1.5 mitri.c
+--- programs/Xserver/render/mitri.c 3 Jul 2005 07:02:08 -0000 1.5
++++ programs/Xserver/render/mitri.c 18 Apr 2006 22:34:08 -0000
+@@ -145,7 +145,7 @@
+ if (npoint < 3)
+ return;
+ ntri = npoint - 2;
+- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+ if (!tris)
+ return;
+ for (tri = tris; npoint >= 3; npoint--, points++, tri++)
+@@ -177,7 +177,7 @@
+ if (npoint < 3)
+ return;
+ ntri = npoint - 2;
+- tris = ALLOCATE_LOCAL (ntri & sizeof (xTriangle));
++ tris = ALLOCATE_LOCAL (ntri * sizeof (xTriangle));
+ if (!tris)
+ return;
+ first = points++;
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 010e67bfdcd5..cc25ddddc9bd 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -7,6 +7,7 @@
PORTNAME= xorg-vfbserver
PORTVERSION= 6.9.0
+PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src