aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorDejan Lesjak <lesi@FreeBSD.org>2006-01-21 18:55:08 +0000
committerDejan Lesjak <lesi@FreeBSD.org>2006-01-21 18:55:08 +0000
commit627b13b9fb97420506f6646d7a236c73bef052be (patch)
tree3bab1b8b8fbfbed6b284a0fec8d66b3896124ce4 /x11-servers
parentfb2517d43db5f5adbb236eed6b7e7b7d27f86ff2 (diff)
downloadports-627b13b9fb97420506f6646d7a236c73bef052be.tar.gz
ports-627b13b9fb97420506f6646d7a236c73bef052be.zip
Notes
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-dmx/Makefile2
-rw-r--r--x11-servers/xorg-dmx/distinfo12
-rw-r--r--x11-servers/xorg-dmx/files/patch-dmx.c15
-rw-r--r--x11-servers/xorg-dmx/files/patch-dmxextension.c11
-rw-r--r--x11-servers/xorg-fontserver/Makefile2
-rw-r--r--x11-servers/xorg-fontserver/distinfo12
-rw-r--r--x11-servers/xorg-nestserver/Makefile2
-rw-r--r--x11-servers/xorg-nestserver/distinfo12
-rw-r--r--x11-servers/xorg-nestserver/scripts/configure1
-rw-r--r--x11-servers/xorg-printserver/Makefile3
-rw-r--r--x11-servers/xorg-printserver/distinfo12
-rw-r--r--x11-servers/xorg-printserver/pkg-plist69
-rw-r--r--x11-servers/xorg-printserver/scripts/configure1
-rw-r--r--x11-servers/xorg-server/Makefile9
-rw-r--r--x11-servers/xorg-server/Makefile.inc13
-rw-r--r--x11-servers/xorg-server/distinfo12
-rw-r--r--x11-servers/xorg-server/files/BSD.x11-xorg.dist526
-rw-r--r--x11-servers/xorg-server/files/patch-CAN-2005-2495183
-rw-r--r--x11-servers/xorg-server/files/patch-Cards22
-rw-r--r--x11-servers/xorg-server/files/patch-Imake.cf15
-rw-r--r--x11-servers/xorg-server/files/patch-Pci.h11
-rw-r--r--x11-servers/xorg-server/files/patch-alpha_video.c11
-rw-r--r--x11-servers/xorg-server/files/patch-atimobility73
-rw-r--r--x11-servers/xorg-server/files/patch-bus-Imakefile18
-rw-r--r--x11-servers/xorg-server/files/patch-compiler.h11
-rw-r--r--x11-servers/xorg-server/files/patch-dix-events.c42
-rw-r--r--x11-servers/xorg-server/files/patch-elfloader.c35
-rw-r--r--x11-servers/xorg-server/files/patch-kbd.c36
-rw-r--r--x11-servers/xorg-server/files/patch-loader.c13
-rw-r--r--x11-servers/xorg-server/files/patch-man-Imakefile12
-rw-r--r--x11-servers/xorg-server/files/patch-mouse.c13
-rw-r--r--x11-servers/xorg-server/files/patch-nv_hw.c22
-rw-r--r--x11-servers/xorg-server/files/patch-os-Imakefile11
-rw-r--r--x11-servers/xorg-server/files/patch-os-support-Imakefile10
-rw-r--r--x11-servers/xorg-server/files/patch-pc98kbd40
-rw-r--r--x11-servers/xorg-server/files/patch-radeon_driver.c28
-rw-r--r--x11-servers/xorg-server/files/patch-savage-pci-id87
-rw-r--r--x11-servers/xorg-server/files/patch-servermd.h11
-rw-r--r--x11-servers/xorg-server/files/patch-xf86OSmouse.h11
-rw-r--r--x11-servers/xorg-server/files/patch-xf86Pci.h16
-rw-r--r--x11-servers/xorg-server/files/patch-xfree86-Imakefile12
-rw-r--r--x11-servers/xorg-server/files/patch-xkbout.c10
-rw-r--r--x11-servers/xorg-server/files/patch-xorgconfig.c12
-rw-r--r--x11-servers/xorg-server/pkg-plist220
-rw-r--r--x11-servers/xorg-vfbserver/Makefile2
-rw-r--r--x11-servers/xorg-vfbserver/distinfo12
-rw-r--r--x11-servers/xorg-vfbserver/scripts/configure1
47 files changed, 271 insertions, 1443 deletions
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index 9f17e4e7540b..7736c02191a8 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-dmx
-PORTVERSION= 6.8.2
+PORTVERSION= 6.9.0
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-dmx/distinfo b/x11-servers/xorg-dmx/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11-servers/xorg-dmx/distinfo
+++ b/x11-servers/xorg-dmx/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SHA256 (xorg/X11R6.8.2-src1.tar.gz) = 0868eb61f3a6af7e858494416cc3b1291d7ab602a6d69ec40bdf7e4fdecbcc5e
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
-SHA256 (xorg/X11R6.8.2-src3.tar.gz) = d295a304a014d96857f9acfb4b1a4b954462e476639623f05cfd839af9447e49
-SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
+MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
+MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
+SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
+SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
diff --git a/x11-servers/xorg-dmx/files/patch-dmx.c b/x11-servers/xorg-dmx/files/patch-dmx.c
new file mode 100644
index 000000000000..d29155b81c81
--- /dev/null
+++ b/x11-servers/xorg-dmx/files/patch-dmx.c
@@ -0,0 +1,15 @@
+--- programs/Xserver/Xext/dmx.c.orig Mon Jan 16 07:43:55 2006
++++ programs/Xserver/Xext/dmx.c Mon Jan 16 07:44:29 2006
+@@ -57,10 +57,10 @@
+ #include "opaque.h"
+
+ #include "dmxextension.h"
+-#include <X11/extensions/dmxproto.h>
++#include "dmxproto.h"
+
+ #define _DMX_SERVER_
+-#include <X11/extensions/dmxext.h>
++#include "dmxext.h"
+
+ #ifdef PANORAMIX
+ #include "panoramiX.h"
diff --git a/x11-servers/xorg-dmx/files/patch-dmxextension.c b/x11-servers/xorg-dmx/files/patch-dmxextension.c
new file mode 100644
index 000000000000..0664e3005004
--- /dev/null
+++ b/x11-servers/xorg-dmx/files/patch-dmxextension.c
@@ -0,0 +1,11 @@
+--- programs/Xserver/hw/dmx/dmxextension.c.orig Mon Jan 16 07:48:33 2006
++++ programs/Xserver/hw/dmx/dmxextension.c Mon Jan 16 07:51:33 2006
+@@ -62,7 +62,7 @@
+
+ #include "windowstr.h"
+ #include "inputstr.h" /* For DeviceIntRec */
+-#include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */
++#include "dmxproto.h" /* For DMX_BAD_* */
+ #include "cursorstr.h"
+
+ /* The default font is declared in dix/globals.c, but is not included in
diff --git a/x11-servers/xorg-fontserver/Makefile b/x11-servers/xorg-fontserver/Makefile
index 9fa395eb2d84..39dc521a8057 100644
--- a/x11-servers/xorg-fontserver/Makefile
+++ b/x11-servers/xorg-fontserver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-fontserver
-PORTVERSION= 6.8.2
+PORTVERSION= 6.9.0
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
diff --git a/x11-servers/xorg-fontserver/distinfo b/x11-servers/xorg-fontserver/distinfo
index 84a1e50f968a..1785b7d2df7e 100644
--- a/x11-servers/xorg-fontserver/distinfo
+++ b/x11-servers/xorg-fontserver/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SHA256 (xorg/X11R6.8.2-src1.tar.gz) = 0868eb61f3a6af7e858494416cc3b1291d7ab602a6d69ec40bdf7e4fdecbcc5e
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src2.tar.gz) = b6f011b3131e442b8dab85d443d9a56f
-SHA256 (xorg/X11R6.8.2-src2.tar.gz) = 8d5bf0a442eb706fe71f029606d4340afc8c05208a50dee20193378c2e25a4de
-SIZE (xorg/X11R6.8.2-src2.tar.gz) = 5974936
+MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
+MD5 (xorg/X11R6.9.0-src2.tar.gz) = f49a0993d89038a46556720688450479
+SHA256 (xorg/X11R6.9.0-src2.tar.gz) = 848289b323d6193ac03ca001f41aa3cdf9cfd129cfbda1c5add209d5c18a8e4c
+SIZE (xorg/X11R6.9.0-src2.tar.gz) = 6056976
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index e1d1fcd0bb07..45482a4378e4 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-nestserver
-PORTVERSION= 6.8.2
+PORTVERSION= 6.9.0
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-nestserver/distinfo b/x11-servers/xorg-nestserver/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11-servers/xorg-nestserver/distinfo
+++ b/x11-servers/xorg-nestserver/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SHA256 (xorg/X11R6.8.2-src1.tar.gz) = 0868eb61f3a6af7e858494416cc3b1291d7ab602a6d69ec40bdf7e4fdecbcc5e
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
-SHA256 (xorg/X11R6.8.2-src3.tar.gz) = d295a304a014d96857f9acfb4b1a4b954462e476639623f05cfd839af9447e49
-SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
+MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
+MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
+SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
+SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
diff --git a/x11-servers/xorg-nestserver/scripts/configure b/x11-servers/xorg-nestserver/scripts/configure
index b3d181fc51d9..f1867eda5fad 100644
--- a/x11-servers/xorg-nestserver/scripts/configure
+++ b/x11-servers/xorg-nestserver/scripts/configure
@@ -17,5 +17,6 @@ echo "#define BuildXF86DRI NO" >> $LOCALDEF
echo "#define UseInstalledPrograms YES" >> $LOCALDEF
echo "#define UseInstalledLibraries YES" >> $LOCALDEF
echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+echo "#define InstallSecurityConfig NO" >> $LOCALDEF
sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile
index 4656f0b0be19..c4240238dcbf 100644
--- a/x11-servers/xorg-printserver/Makefile
+++ b/x11-servers/xorg-printserver/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-printserver
-PORTVERSION= 6.8.2
-PORTREVISION= 2
+PORTVERSION= 6.9.0
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-printserver/distinfo b/x11-servers/xorg-printserver/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11-servers/xorg-printserver/distinfo
+++ b/x11-servers/xorg-printserver/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SHA256 (xorg/X11R6.8.2-src1.tar.gz) = 0868eb61f3a6af7e858494416cc3b1291d7ab602a6d69ec40bdf7e4fdecbcc5e
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
-SHA256 (xorg/X11R6.8.2-src3.tar.gz) = d295a304a014d96857f9acfb4b1a4b954462e476639623f05cfd839af9447e49
-SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
+MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
+MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
+SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
+SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
diff --git a/x11-servers/xorg-printserver/pkg-plist b/x11-servers/xorg-printserver/pkg-plist
index b56c25c2f962..cc697f7b6d54 100644
--- a/x11-servers/xorg-printserver/pkg-plist
+++ b/x11-servers/xorg-printserver/pkg-plist
@@ -214,9 +214,11 @@ lib/X11/xserver/C/print/models/SPSPARC2/fonts/Times-Roman.pmf
lib/X11/xserver/C/print/models/SPSPARC2/model-config
lib/X11/xserver/POSIX
lib/X11/xserver/README
-lib/X11/xserver/SecurityPolicy
+lib/X11/xserver/af
lib/X11/xserver/af_ZA
lib/X11/xserver/af_ZA.iso88591
+lib/X11/xserver/af_ZA.utf8
+lib/X11/xserver/afrikaans
lib/X11/xserver/ar
lib/X11/xserver/ar_AE
lib/X11/xserver/ar_AE.iso88596
@@ -279,10 +281,17 @@ lib/X11/xserver/bg_BG
lib/X11/xserver/bg_BG.ISO8859-5
lib/X11/xserver/bg_BG.cp1251
lib/X11/xserver/bg_BG.utf8
+lib/X11/xserver/bn_IN.UTF-8
+lib/X11/xserver/bn_IN.utf8
lib/X11/xserver/bokmal
lib/X11/xserver/br_FR
lib/X11/xserver/br_FR.iso88591
+lib/X11/xserver/bs
lib/X11/xserver/bs_BA
+lib/X11/xserver/bs_BA.ISO-8859-2
+lib/X11/xserver/bs_BA.ISO8859-2
+lib/X11/xserver/bs_BA.ISO_8859-2
+lib/X11/xserver/bs_BA.UTF-8
lib/X11/xserver/bs_BA.iso88592
lib/X11/xserver/ca
lib/X11/xserver/ca.ISO8859-1
@@ -546,6 +555,8 @@ lib/X11/xserver/gl_ES.iso88591
lib/X11/xserver/gl_ES.iso885915@euro
lib/X11/xserver/gl_ES.utf8
lib/X11/xserver/gl_ES@euro
+lib/X11/xserver/gu_IN.UTF-8
+lib/X11/xserver/gu_IN.utf8
lib/X11/xserver/gv_GB
lib/X11/xserver/gv_GB.iso88591
lib/X11/xserver/he
@@ -622,6 +633,9 @@ lib/X11/xserver/korean
lib/X11/xserver/korean.euc
lib/X11/xserver/kw_GB
lib/X11/xserver/kw_GB.iso88591
+lib/X11/xserver/ky_KG
+lib/X11/xserver/ky_KG.UTF-8
+lib/X11/xserver/ky_KG.utf8
lib/X11/xserver/lithuanian
lib/X11/xserver/lt
lib/X11/xserver/lt.ISO8859-13
@@ -648,6 +662,7 @@ lib/X11/xserver/mt_MT
lib/X11/xserver/mt_MT.iso88593
lib/X11/xserver/nb_NO
lib/X11/xserver/nb_NO.ISO-8859-1
+lib/X11/xserver/ndebele
lib/X11/xserver/nl
lib/X11/xserver/nl.ISO8859-1
lib/X11/xserver/nl.ISO8859-15
@@ -675,8 +690,18 @@ lib/X11/xserver/no_NO.ISO8859-1@nynorsk
lib/X11/xserver/no_NO.iso88591
lib/X11/xserver/no_NO.utf8
lib/X11/xserver/norwegian
+lib/X11/xserver/nr
+lib/X11/xserver/nr_ZA
+lib/X11/xserver/nr_ZA.iso88591
+lib/X11/xserver/nr_ZA.utf8
+lib/X11/xserver/nso
+lib/X11/xserver/nso_ZA
+lib/X11/xserver/nso_ZA.iso885915
+lib/X11/xserver/nso_ZA.utf8
lib/X11/xserver/oc_FR
lib/X11/xserver/oc_FR.iso88591
+lib/X11/xserver/pa_IN.UTF-8
+lib/X11/xserver/pa_IN.utf8
lib/X11/xserver/pl_PL
lib/X11/xserver/pl_PL.ISO8859-2
lib/X11/xserver/pl_PL.UTF-8
@@ -728,12 +753,20 @@ lib/X11/xserver/ru_UA.koi8u
lib/X11/xserver/russian
lib/X11/xserver/se_NO
lib/X11/xserver/se_NO.utf8
+lib/X11/xserver/sepedi
+lib/X11/xserver/sesotho
+lib/X11/xserver/setswana
lib/X11/xserver/sh
lib/X11/xserver/sh.ISO8859-2
lib/X11/xserver/sh_BA.ISO8859-2@bosnia
lib/X11/xserver/sh_YU
lib/X11/xserver/sh_YU.iso88592
lib/X11/xserver/sh_YU.utf8
+lib/X11/xserver/si
+lib/X11/xserver/si_LK
+lib/X11/xserver/si_LK.UTF8
+lib/X11/xserver/sinhala
+lib/X11/xserver/siswati
lib/X11/xserver/sk
lib/X11/xserver/sk.ISO8859-2
lib/X11/xserver/sk_SK
@@ -760,6 +793,14 @@ lib/X11/xserver/sr_YU.iso88592
lib/X11/xserver/sr_YU.iso88595@cyrillic
lib/X11/xserver/sr_YU.utf8
lib/X11/xserver/sr_YU@cyrillic
+lib/X11/xserver/ss
+lib/X11/xserver/ss_ZA
+lib/X11/xserver/ss_ZA.iso88591
+lib/X11/xserver/ss_ZA.utf8
+lib/X11/xserver/st
+lib/X11/xserver/st_ZA
+lib/X11/xserver/st_ZA.iso88591
+lib/X11/xserver/st_ZA.utf8
lib/X11/xserver/su
lib/X11/xserver/su.ISO8859-1
lib/X11/xserver/sv
@@ -795,6 +836,10 @@ lib/X11/xserver/th_TH.utf8
lib/X11/xserver/thai
lib/X11/xserver/tl_PH
lib/X11/xserver/tl_PH.iso88591
+lib/X11/xserver/tn
+lib/X11/xserver/tn_ZA
+lib/X11/xserver/tn_ZA.iso885915
+lib/X11/xserver/tn_ZA.utf8
lib/X11/xserver/tr
lib/X11/xserver/tr.ISO8859-9
lib/X11/xserver/tr_TR
@@ -802,6 +847,11 @@ lib/X11/xserver/tr_TR.ISO8859-9
lib/X11/xserver/tr_TR.UTF-8
lib/X11/xserver/tr_TR.iso88599
lib/X11/xserver/tr_TR.utf8
+lib/X11/xserver/ts
+lib/X11/xserver/ts_ZA
+lib/X11/xserver/ts_ZA.iso88591
+lib/X11/xserver/ts_ZA.utf8
+lib/X11/xserver/tsonga
lib/X11/xserver/turkish
lib/X11/xserver/uk_UA
lib/X11/xserver/uk_UA.koi8u
@@ -810,6 +860,10 @@ lib/X11/xserver/ur_PK
lib/X11/xserver/ur_PK.utf8
lib/X11/xserver/uz_UZ
lib/X11/xserver/uz_UZ.iso88591
+lib/X11/xserver/ve
+lib/X11/xserver/ve_ZA
+lib/X11/xserver/ve_ZA.utf8
+lib/X11/xserver/venda
lib/X11/xserver/vi_VN
lib/X11/xserver/vi_VN.tcvn
lib/X11/xserver/vi_VN.utf8
@@ -817,6 +871,11 @@ lib/X11/xserver/wa_BE
lib/X11/xserver/wa_BE.iso88591
lib/X11/xserver/wa_BE.iso885915@euro
lib/X11/xserver/wa_BE@euro
+lib/X11/xserver/xh
+lib/X11/xserver/xh_ZA
+lib/X11/xserver/xh_ZA.iso88591
+lib/X11/xserver/xh_ZA.utf8
+lib/X11/xserver/xhosa
lib/X11/xserver/yi_US
lib/X11/xserver/yi_US.cp1255
lib/X11/xserver/zh
@@ -871,6 +930,11 @@ lib/X11/xserver/zh_TW.UTF-8@zhuyin
lib/X11/xserver/zh_TW.big5
lib/X11/xserver/zh_TW.euctw
lib/X11/xserver/zh_TW.utf8
+lib/X11/xserver/zu
+lib/X11/xserver/zu_ZA
+lib/X11/xserver/zu_ZA.iso88591
+lib/X11/xserver/zu_ZA.utf8
+lib/X11/xserver/zulu
@dirrm lib/X11/xserver/C/print/attributes
@dirrm lib/X11/xserver/C/print/ddx-config/raster
@dirrm lib/X11/xserver/C/print/ddx-config
@@ -889,7 +953,8 @@ lib/X11/xserver/zh_TW.utf8
@dirrm lib/X11/xserver/C/print/models/HPLJ4family
@dirrm lib/X11/xserver/C/print/models
@dirrm lib/X11/xserver/C/print
+@dirrm lib/X11/xserver/C
@dirrm lib/X11/xserver/en_US/print/attributes
@dirrm lib/X11/xserver/en_US/print
@dirrm lib/X11/xserver/en_US
-@dirrm lib/X11/xserver/C
+@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true
diff --git a/x11-servers/xorg-printserver/scripts/configure b/x11-servers/xorg-printserver/scripts/configure
index 0050bb81abfc..16aed24afb92 100644
--- a/x11-servers/xorg-printserver/scripts/configure
+++ b/x11-servers/xorg-printserver/scripts/configure
@@ -16,5 +16,6 @@ echo "#define BuildXF86DRI NO" >> $LOCALDEF
echo "#define UseInstalledPrograms YES" >> $LOCALDEF
echo "#define UseInstalledLibraries YES" >> $LOCALDEF
echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+echo "#define InstallSecurityConfig NO" >> $LOCALDEF
sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 77687d270a0c..be20706fa6c6 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= xorg-server
-PORTVERSION= 6.8.2
-PORTREVISION= 7
+PORTVERSION= 6.9.0
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
@@ -131,8 +130,7 @@ PLIST_SUB+= I386=""
MAN1+= scanpci.1
MAN4+= i740.4x \
nsc.4x \
- via.4x \
- vmware.4x
+ via.4x
.else
PLIST_SUB+= I386="@comment "
.endif
@@ -147,7 +145,8 @@ MAN4+= apm.4x \
neomagic.4x \
sis.4x \
trident.4x \
- tseng.4x
+ tseng.4x \
+ vmware.4x
.else
PLIST_SUB+= AMD64_I386="@comment "
.endif
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc
index 97d8db3bd96e..0ef287420193 100644
--- a/x11-servers/xorg-server/Makefile.inc
+++ b/x11-servers/xorg-server/Makefile.inc
@@ -17,7 +17,6 @@ WRKSRC?= ${WRKDIR}/xc
USE_X_PREFIX?= no
PREFIX?= ${X11BASE}
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
-MTREE_FILE= ${PORTSDIR}/x11-servers/xorg-server/files/BSD.x11-xorg.dist
EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/*
USE_IMAKE= YES
@@ -43,16 +42,8 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-atimobility \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-pc98kbd \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-radeon_driver.c \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c \
- ${PORTSDIR}/x11-servers/xorg-server/files/patch-xorgconfig.c
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \
+ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c
.if !target(do-configure)
do-configure:
diff --git a/x11-servers/xorg-server/distinfo b/x11-servers/xorg-server/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11-servers/xorg-server/distinfo
+++ b/x11-servers/xorg-server/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SHA256 (xorg/X11R6.8.2-src1.tar.gz) = 0868eb61f3a6af7e858494416cc3b1291d7ab602a6d69ec40bdf7e4fdecbcc5e
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
-SHA256 (xorg/X11R6.8.2-src3.tar.gz) = d295a304a014d96857f9acfb4b1a4b954462e476639623f05cfd839af9447e49
-SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
+MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
+MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
+SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
+SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
diff --git a/x11-servers/xorg-server/files/BSD.x11-xorg.dist b/x11-servers/xorg-server/files/BSD.x11-xorg.dist
deleted file mode 100644
index ef9eefd8ad6f..000000000000
--- a/x11-servers/xorg-server/files/BSD.x11-xorg.dist
+++ /dev/null
@@ -1,526 +0,0 @@
-# $FreeBSD: /tmp/pcvs/ports/x11-servers/xorg-server/files/Attic/BSD.x11-xorg.dist,v 1.3 2005-06-15 02:42:12 lesi Exp $
-#
-# Please see the file src/etc/mtree/README before making changes to this file.
-#
-
-/set type=dir uname=root gname=wheel mode=0755
-.
- bin
- ..
- etc
- rc.d
- ..
- ..
- include
- X11
- PEX5
- ..
- Xft
- ..
- bitmaps
- ..
- pixmaps
- ..
- ..
- bitmaps
- ..
- freetype2
- freetype
- cache
- ..
- config
- ..
- internal
- ..
- ..
- ..
- ..
- info
- ..
- lib
- X11
- XF86Setup
- pics
- ..
- scripts
- ..
- tcllib
- ..
- ..
- app-defaults
- ..
- etc
- ..
- fonts
- local
- ..
- ..
- lbxproxy
- ..
- xserver
- ..
- ..
- aout
- ..
- modules
- codeconv
- ..
- dri
- ..
- ..
- ..
- libdata
- pkgconfig
- ..
- ..
- libexec
- ..
- man
-/set uname=man
- cat1
- ..
- cat2
- ..
- cat3
- ..
- cat4
- ..
- cat5
- ..
- cat6
- ..
- cat7
- ..
- cat8
- ..
- cat9
- ..
- catl
- ..
- catn
- ..
- ja uname=root
- cat1
- ..
- cat2
- ..
- cat3
- ..
- cat4
- ..
- cat5
- ..
- cat6
- ..
- cat7
- ..
- cat8
- ..
- cat9
- ..
- catl
- ..
- catn
- ..
-/set uname=root
- man1
- ..
- man2
- ..
- man3
- ..
- man4
- ..
- man5
- ..
- man6
- ..
- man7
- ..
- man8
- ..
- man9
- ..
- manl
- ..
- mann
- ..
- ..
- man1
- ..
- man2
- ..
- man3
- ..
- man4
- ..
- man5
- ..
- man6
- ..
- man7
- ..
- man8
- ..
- man9
- ..
- manl
- ..
- mann
- ..
- ..
- share
- aclocal
- ..
- doc
- ja
- ..
- ..
- examples
- ..
- locale
- af
- LC_MESSAGES
- ..
- ..
- am
- LC_MESSAGES
- ..
- ..
- ar
- LC_MESSAGES
- ..
- ..
- az
- LC_MESSAGES
- ..
- ..
- be
- LC_MESSAGES
- ..
- ..
- bg
- LC_MESSAGES
- ..
- ..
- bn
- LC_MESSAGES
- ..
- ..
- bs
- LC_MESSAGES
- ..
- ..
- ca
- LC_MESSAGES
- ..
- ..
- cs
- LC_MESSAGES
- ..
- ..
- cy
- LC_MESSAGES
- ..
- ..
- da
- LC_MESSAGES
- ..
- ..
- de
- LC_MESSAGES
- ..
- ..
- de_AT
- LC_MESSAGES
- ..
- ..
- el
- LC_MESSAGES
- ..
- ..
- en
- LC_MESSAGES
- ..
- ..
- en_AU
- LC_MESSAGES
- ..
- ..
- en_CA
- LC_MESSAGES
- ..
- ..
- en_GB
- LC_MESSAGES
- ..
- ..
- eo
- LC_MESSAGES
- ..
- ..
- es
- LC_MESSAGES
- ..
- ..
- es_ES
- LC_MESSAGES
- ..
- ..
- es_MX
- LC_MESSAGES
- ..
- ..
- et
- LC_MESSAGES
- ..
- ..
- eu
- LC_MESSAGES
- ..
- ..
- fa
- LC_MESSAGES
- ..
- ..
- fa_IR
- LC_MESSAGES
- ..
- ..
- fi
- LC_MESSAGES
- ..
- ..
- fr
- LC_MESSAGES
- ..
- ..
- fr_FR
- LC_MESSAGES
- ..
- ..
- ga
- LC_MESSAGES
- ..
- ..
- gl
- LC_MESSAGES
- ..
- ..
- gu
- LC_MESSAGES
- ..
- ..
- he
- LC_MESSAGES
- ..
- ..
- hi
- LC_MESSAGES
- ..
- ..
- hr
- LC_MESSAGES
- ..
- ..
- hu
- LC_MESSAGES
- ..
- ..
- id
- LC_MESSAGES
- ..
- ..
- is
- LC_MESSAGES
- ..
- ..
- it
- LC_MESSAGES
- ..
- ..
- ja
- LC_MESSAGES
- ..
- ..
- ka
- LC_MESSAGES
- ..
- ..
- kn
- LC_MESSAGES
- ..
- ..
- ko
- LC_MESSAGES
- ..
- ..
- li
- LC_MESSAGES
- ..
- ..
- lt
- LC_MESSAGES
- ..
- ..
- lv
- LC_MESSAGES
- ..
- ..
- mk
- LC_MESSAGES
- ..
- ..
- ml
- LC_MESSAGES
- ..
- ..
- mn
- LC_MESSAGES
- ..
- ..
- ms
- LC_MESSAGES
- ..
- ..
- mt
- LC_MESSAGES
- ..
- ..
- nb
- LC_MESSAGES
- ..
- ..
- ne
- LC_MESSAGES
- ..
- ..
- nl
- LC_MESSAGES
- ..
- ..
- nn
- LC_MESSAGES
- ..
- ..
- no
- LC_MESSAGES
- ..
- ..
- or
- LC_MESSAGES
- ..
- ..
- pa
- LC_MESSAGES
- ..
- ..
- pl
- LC_MESSAGES
- ..
- ..
- pt
- LC_MESSAGES
- ..
- ..
- pt_BR
- LC_MESSAGES
- ..
- ..
- pt_PT
- LC_MESSAGES
- ..
- ..
- ro
- LC_MESSAGES
- ..
- ..
- ru
- LC_MESSAGES
- ..
- ..
- sk
- LC_MESSAGES
- ..
- ..
- sl
- LC_MESSAGES
- ..
- ..
- sq
- LC_MESSAGES
- ..
- ..
- sr
- LC_MESSAGES
- ..
- ..
- sr@Latn
- LC_MESSAGES
- ..
- ..
- sv
- LC_MESSAGES
- ..
- ..
- ta
- LC_MESSAGES
- ..
- ..
- tg
- LC_MESSAGES
- ..
- ..
- th
- LC_MESSAGES
- ..
- ..
- tk
- LC_MESSAGES
- ..
- ..
- tr
- LC_MESSAGES
- ..
- ..
- uk
- LC_MESSAGES
- ..
- ..
- uz
- LC_MESSAGES
- ..
- ..
- wa
- LC_MESSAGES
- ..
- ..
- vi
- LC_MESSAGES
- ..
- ..
- zh
- LC_MESSAGES
- ..
- ..
- zh_CN
- LC_MESSAGES
- ..
- ..
- zh_CN.GB2312
- LC_MESSAGES
- ..
- ..
- zh_TW
- LC_MESSAGES
- ..
- ..
- zh_TW.Big5
- LC_MESSAGES
- ..
- ..
- ..
- pixmaps
- ..
- ..
-..
diff --git a/x11-servers/xorg-server/files/patch-CAN-2005-2495 b/x11-servers/xorg-server/files/patch-CAN-2005-2495
deleted file mode 100644
index 3f39cffb2217..000000000000
--- a/x11-servers/xorg-server/files/patch-CAN-2005-2495
+++ /dev/null
@@ -1,183 +0,0 @@
---- programs/Xserver/afb/afbpixmap.c.orig Fri Apr 23 20:59:39 2004
-+++ programs/Xserver/afb/afbpixmap.c Sun Sep 18 04:56:02 2005
-@@ -73,10 +73,14 @@
- int depth;
- {
- PixmapPtr pPixmap;
-- int datasize;
-- int paddedWidth;
-+ size_t datasize;
-+ size_t paddedWidth;
-
- paddedWidth = BitmapBytePad(width);
-+
-+ if (paddedWidth > 32767 || height > 32767 || depth > 4)
-+ return NullPixmap;
-+
- datasize = height * paddedWidth * depth;
- pPixmap = AllocatePixmap(pScreen, datasize);
- if (!pPixmap)
---- programs/Xserver/cfb/cfbpixmap.c.orig Fri Apr 23 21:00:12 2004
-+++ programs/Xserver/cfb/cfbpixmap.c Sun Sep 18 04:56:02 2005
-@@ -70,10 +70,13 @@
- int depth;
- {
- PixmapPtr pPixmap;
-- int datasize;
-- int paddedWidth;
-+ size_t datasize;
-+ size_t paddedWidth;
-
- paddedWidth = PixmapBytePad(width, depth);
-+
-+ if (paddedWidth / 4 > 32767 || height > 32767)
-+ return NullPixmap;
- datasize = height * paddedWidth;
- pPixmap = AllocatePixmap(pScreen, datasize);
- if (!pPixmap)
---- programs/Xserver/dix/dispatch.c.orig Mon Dec 13 02:23:05 2004
-+++ programs/Xserver/dix/dispatch.c Sun Sep 18 04:56:02 2005
-@@ -1506,6 +1506,23 @@
- client->errorValue = 0;
- return BadValue;
- }
-+ if (stuff->width > 32767 || stuff->height > 32767)
-+ {
-+ /* It is allowed to try and allocate a pixmap which is larger than
-+ * 32767 in either dimension. However, all of the framebuffer code
-+ * is buggy and does not reliably draw to such big pixmaps, basically
-+ * because the Region data structure operates with signed shorts
-+ * for the rectangles in it.
-+ *
-+ * Furthermore, several places in the X server computes the
-+ * size in bytes of the pixmap and tries to store it in an
-+ * integer. This integer can overflow and cause the allocated size
-+ * to be much smaller.
-+ *
-+ * So, such big pixmaps are rejected here with a BadAlloc
-+ */
-+ return BadAlloc;
-+ }
- if (stuff->depth != 1)
- {
- pDepth = pDraw->pScreen->allowedDepths;
---- programs/Xserver/dix/pixmap.c.orig Fri Apr 23 21:04:44 2004
-+++ programs/Xserver/dix/pixmap.c Sun Sep 18 04:56:02 2005
-@@ -126,6 +126,9 @@
- unsigned size;
- int i;
-
-+ if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
-+ return NullPixmap;
-+
- pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
- if (!pPixmap)
- return NullPixmap;
---- programs/Xserver/fb/fbpixmap.c.orig Mon Aug 9 05:40:50 2004
-+++ programs/Xserver/fb/fbpixmap.c Sun Sep 18 04:56:02 2005
-@@ -32,12 +32,14 @@
- fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
- {
- PixmapPtr pPixmap;
-- int datasize;
-- int paddedWidth;
-+ size_t datasize;
-+ size_t paddedWidth;
- int adjust;
- int base;
-
- paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
-+ if (paddedWidth / 4 > 32767 || height > 32767)
-+ return NullPixmap;
- datasize = height * paddedWidth;
- #ifdef PIXPRIV
- base = pScreen->totalPixmapSize;
---- programs/Xserver/hw/xfree86/xaa/xaaInit.c.orig Fri Jul 30 22:30:56 2004
-+++ programs/Xserver/hw/xfree86/xaa/xaaInit.c Sun Sep 18 04:56:02 2005
-@@ -498,6 +498,9 @@
- XAAPixmapPtr pPriv;
- PixmapPtr pPix = NULL;
- int size = w * h;
-+
-+ if (w > 32767 || h > 32767)
-+ return NullPixmap;
-
- if (!infoRec->offscreenDepthsInitialized)
- XAAInitializeOffscreenDepths (pScreen);
---- programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c.orig Fri Apr 23 21:54:17 2004
-+++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c Sun Sep 18 04:56:02 2005
-@@ -85,7 +85,7 @@
- int depth ;
- {
- register PixmapPtr pPixmap = (PixmapPtr)NULL;
-- int size ;
-+ size_t size ;
-
- TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ;
-
-@@ -93,6 +93,10 @@
- return (PixmapPtr) NULL ;
-
- size = PixmapBytePad(width, depth);
-+
-+ if (size / 4 > 32767 || height > 32767)
-+ return (PixmapPtr) NULL ;
-+
- pPixmap = AllocatePixmap (pScreen, (height * size));
-
- if ( !pPixmap )
---- programs/Xserver/ilbm/ilbmpixmap.c.orig Fri Apr 23 21:54:22 2004
-+++ programs/Xserver/ilbm/ilbmpixmap.c Sun Sep 18 04:56:02 2005
-@@ -75,10 +75,12 @@
- int depth;
- {
- PixmapPtr pPixmap;
-- int datasize;
-- int paddedWidth;
-+ size_t datasize;
-+ size_t paddedWidth;
-
- paddedWidth = BitmapBytePad(width);
-+ if (paddedWidth > 32767 || height > 32767 || depth > 4)
-+ return NullPixmap;
- datasize = height * paddedWidth * depth;
- pPixmap = AllocatePixmap(pScreen, datasize);
- if (!pPixmap)
---- programs/Xserver/iplan2p4/iplpixmap.c.orig Fri Apr 23 21:54:24 2004
-+++ programs/Xserver/iplan2p4/iplpixmap.c Sun Sep 18 04:56:02 2005
-@@ -74,12 +74,14 @@
- int depth;
- {
- PixmapPtr pPixmap;
-- int datasize;
-- int paddedWidth;
-+ size_t datasize;
-+ size_t paddedWidth;
- int ipad=INTER_PLANES*2 - 1;
-
- paddedWidth = PixmapBytePad(width, depth);
- paddedWidth = (paddedWidth + ipad) & ~ipad;
-+ if (paddedWidth / 4 > 32767 || height > 32767)
-+ return NullPixmap;
- datasize = height * paddedWidth;
- pPixmap = AllocatePixmap(pScreen, datasize);
- if (!pPixmap)
---- programs/Xserver/mfb/mfbpixmap.c.orig Fri Nov 14 17:48:57 2003
-+++ programs/Xserver/mfb/mfbpixmap.c Sun Sep 18 04:56:02 2005
-@@ -72,12 +72,14 @@
- int depth;
- {
- PixmapPtr pPixmap;
-- int datasize;
-- int paddedWidth;
-+ size_t datasize;
-+ size_t paddedWidth;
-
- if (depth != 1)
- return NullPixmap;
- paddedWidth = BitmapBytePad(width);
-+ if (paddedWidth / 4 > 32767 || height > 32767)
-+ return NullPixmap;
- datasize = height * paddedWidth;
- pPixmap = AllocatePixmap(pScreen, datasize);
- if (!pPixmap)
diff --git a/x11-servers/xorg-server/files/patch-Cards b/x11-servers/xorg-server/files/patch-Cards
deleted file mode 100644
index 4dd51083b3e7..000000000000
--- a/x11-servers/xorg-server/files/patch-Cards
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: programs/Xserver/hw/xfree86/xf86config/Cards
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf86config/Cards,v
-retrieving revision 1.2
-diff -u -r1.2 Cards
---- programs/Xserver/hw/xfree86/xf86config/Cards 23 Apr 2004 19:54:19 -0000 1.2
-+++ programs/Xserver/hw/xfree86/xf86config/Cards 13 Jun 2005 07:34:09 -0000
-@@ -2865,12 +2865,12 @@
- # 3Dfx
- NAME Voodoo Banshee (generic)
- SERVER SVGA
--CHIPSET Voodo Banshee
-+CHIPSET 3dfx Banshee
- DRIVER tdfx
-
- NAME Voodoo3 (generic)
- SERVER SVGA
--CHIPSET Voodoo3
-+CHIPSET 3dfx Voodoo3
- DRIVER tdfx
-
- NAME Elsa Victory II
diff --git a/x11-servers/xorg-server/files/patch-Imake.cf b/x11-servers/xorg-server/files/patch-Imake.cf
deleted file mode 100644
index 14f519aa9a16..000000000000
--- a/x11-servers/xorg-server/files/patch-Imake.cf
+++ /dev/null
@@ -1,15 +0,0 @@
---- config/cf/Imake.cf.orig Wed Jan 19 20:53:39 2005
-+++ config/cf/Imake.cf Wed Jan 19 20:55:09 2005
-@@ -282,6 +282,10 @@
- # undef __amd64__
- # undef __x86_64__
- # endif
-+# ifdef __powerpc__
-+# define PpcArchitecture
-+# undef __powerpc__
-+# endif
- #endif /* __FreeBSD__ */
-
- /* Systems based on kernel of FreeBSD */
-
-
diff --git a/x11-servers/xorg-server/files/patch-Pci.h b/x11-servers/xorg-server/files/patch-Pci.h
deleted file mode 100644
index 9a9be743bc6e..000000000000
--- a/x11-servers/xorg-server/files/patch-Pci.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bus/Pci.h.orig Thu Jan 20 06:51:21 2005
-+++ programs/Xserver/hw/xfree86/os-support/bus/Pci.h Thu Jan 20 06:52:09 2005
-@@ -285,7 +285,7 @@
- # define ARCH_PCI_INIT linuxPciInit
- # define INCLUDE_XF86_MAP_PCI_MEM
- # define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */
--# elif defined(__OpenBSD__)
-+# elif defined(__FreeBSD__) || defined(__OpenBSD__)
- # define ARCH_PCI_INIT freebsdPciInit
- # define INCLUDE_XF86_MAP_PCI_MEM
- # define INCLUDE_XF86_NO_DOMAIN
diff --git a/x11-servers/xorg-server/files/patch-alpha_video.c b/x11-servers/xorg-server/files/patch-alpha_video.c
deleted file mode 100644
index 15ff05b7c4a0..000000000000
--- a/x11-servers/xorg-server/files/patch-alpha_video.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Sep 1 21:05:09 2004
-+++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Sep 1 21:06:52 2004
-@@ -487,7 +487,7 @@
- writeSparse32(int Value, pointer Base, register unsigned long Offset);
-
- #ifdef __FreeBSD__
--extern int sysarch(int, char *);
-+extern int sysarch(int, void *);
- #endif
-
- struct parms {
diff --git a/x11-servers/xorg-server/files/patch-atimobility b/x11-servers/xorg-server/files/patch-atimobility
deleted file mode 100644
index dd024a46cc9a..000000000000
--- a/x11-servers/xorg-server/files/patch-atimobility
+++ /dev/null
@@ -1,73 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/ati/atimode.c.orig Fri Apr 23 19:26:46 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/atimode.c Sun Feb 13 05:55:05 2005
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.18 2004/01/05 16:42:03 tsi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */
- /*
- * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
-@@ -646,7 +646,7 @@
- SetBits(pMode->CrtcVDisplay, CRTC_V_DISP);
- pATIHW->crtc_v_sync_strt_wid =
- SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) |
-- SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID);
-+ SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA);
- if (pMode->Flags & V_NVSYNC)
- pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL;
- }
---- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c.orig Wed Dec 15 07:58:15 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c Sun Feb 13 05:55:05 2005
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.74 2003/12/22 17:48:09 tsi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */
- /*
- * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
-@@ -1902,10 +1902,10 @@
- VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP);
- VSyncStart =
- GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT);
-- VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) |
-- GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID);
-+ VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) |
-+ GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA);
- if (VSyncStart > VSyncEnd)
-- VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1;
-+ VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1;
- VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL);
-
- VBlankStart = (VDisplay & ~0x03FFU) |
-@@ -2177,7 +2177,7 @@
- if ((pATIHW->horz_stretching &
- (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) !=
- (HORZ_STRETCH_EN | AUTO_HORZ_RATIO))
-- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-+ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
- "Inconsistent panel horizontal dimension:"
- " %d and %d.\n", pATI->LCDHorizontal, HDisplay);
- HDisplay = pATI->LCDHorizontal;
-@@ -2193,7 +2193,7 @@
- {
- if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) ||
- !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO))
-- xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-+ xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
- "Inconsistent panel vertical dimension: %d and %d.\n",
- pATI->LCDVertical, VDisplay);
- VDisplay = pATI->LCDVertical;
---- programs/Xserver/hw/xfree86/drivers/ati/atiregs.h.orig Fri Jul 23 05:36:14 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/atiregs.h Sun Feb 13 05:55:05 2005
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.24 2003/04/23 21:51:30 tsi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */
- /*
- * Copyright 1994 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
- *
-@@ -551,6 +551,7 @@
- #define CRTC_V_SYNC_STRT 0x000007fful
- /* ? 0x0000f800ul */
- #define CRTC_V_SYNC_WID 0x001f0000ul
-+#define CRTC_V_SYNC_END_VGA 0x000f0000ul
- #define CRTC_V_SYNC_POL 0x00200000ul
- /* ? 0xffc00000ul */
- #define CRTC_VLINE_CRNT_VLINE IOPortTag(0x04u, 0x04u)
diff --git a/x11-servers/xorg-server/files/patch-bus-Imakefile b/x11-servers/xorg-server/files/patch-bus-Imakefile
deleted file mode 100644
index c5f62ec48a41..000000000000
--- a/x11-servers/xorg-server/files/patch-bus-Imakefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/bus/Imakefile.orig Thu Jan 20 03:43:03 2005
-+++ programs/Xserver/hw/xfree86/os-support/bus/Imakefile Thu Jan 20 03:46:40 2005
-@@ -66,6 +66,13 @@
- PCIDRVRSRC = netbsdPci.c
- PCIDRVROBJ = netbsdPci.o
-
-+#elif defined(FreeBSDArchitecture) && defined(PpcArchitecture)
-+
-+XCOMM FreeBSD/PowerPC PCI driver (using /dev/pci)
-+
-+PCIDRVRSRC = freebsdPci.c
-+PCIDRVROBJ = freebsdPci.o
-+
- #elif defined(PpcArchitecture)
-
- XCOMM PowerPC PCI drivers
-
-
diff --git a/x11-servers/xorg-server/files/patch-compiler.h b/x11-servers/xorg-server/files/patch-compiler.h
deleted file mode 100644
index 2b350252c97e..000000000000
--- a/x11-servers/xorg-server/files/patch-compiler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/common/compiler.h.orig Fri Jan 21 03:19:16 2005
-+++ programs/Xserver/hw/xfree86/common/compiler.h Fri Jan 21 03:20:03 2005
-@@ -1068,7 +1068,7 @@
- # define write_mem_barrier() /* NOP */
- # endif /* __arm32__ */
-
--# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)) && defined(__powerpc__)
-+# elif (defined(Lynx) || defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
-
- # ifndef MAP_FAILED
- # define MAP_FAILED ((void *)-1)
diff --git a/x11-servers/xorg-server/files/patch-dix-events.c b/x11-servers/xorg-server/files/patch-dix-events.c
deleted file mode 100644
index 1270ee6dbde2..000000000000
--- a/x11-servers/xorg-server/files/patch-dix-events.c
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: programs/Xserver/dix/events.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/dix/events.c,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -u -r1.16 -r1.17
---- programs/Xserver/dix/events.c 15 Jul 2005 05:48:29 -0000 1.16
-+++ programs/Xserver/dix/events.c 25 Aug 2005 22:11:04 -0000 1.17
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.16 2005/07/15 05:48:29 kem Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.17 2005/08/25 22:11:04 anholt Exp $ */
- /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
- /************************************************************
-
-@@ -675,7 +675,9 @@
- (sprite.current->bits->yhot != cursor->bits->yhot))
- XineramaCheckPhysLimits(cursor, FALSE);
- (*sprite.screen->DisplayCursor)(sprite.screen, cursor);
-+ FreeCursor(sprite.current, (Cursor)0);
- sprite.current = cursor;
-+ sprite.current->refcnt++;
- }
- }
-
-@@ -930,7 +932,9 @@
- (ScreenPtr)NULL);
- (*sprite.hotPhys.pScreen->DisplayCursor) (sprite.hotPhys.pScreen,
- cursor);
-+ FreeCursor(sprite.current, (Cursor)0);
- sprite.current = cursor;
-+ sprite.current->refcnt++;
- }
- }
-
-@@ -2184,6 +2188,7 @@
- #endif
- sprite.win = win;
- sprite.current = wCursor (win);
-+ sprite.current->refcnt++;
- spriteTraceGood = 1;
- ROOT = win;
- (*pScreen->CursorLimits) (
diff --git a/x11-servers/xorg-server/files/patch-elfloader.c b/x11-servers/xorg-server/files/patch-elfloader.c
deleted file mode 100644
index d1942e55e8a5..000000000000
--- a/x11-servers/xorg-server/files/patch-elfloader.c
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: programs/Xserver/hw/xfree86/loader/elfloader.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v
-retrieving revision 1.3
-retrieving revision 1.4
-diff -u -u -r1.3 -r1.4
---- programs/Xserver/hw/xfree86/loader/elfloader.c 30 Oct 2004 20:33:43 -0000 1.3
-+++ programs/Xserver/hw/xfree86/loader/elfloader.c 9 Nov 2004 15:58:41 -0000 1.4
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.3 2004/10/30 20:33:43 alanc Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.4 2004/11/09 15:58:41 ajax Exp $ */
- /* $XFree86: xc/programs/Xserver/hw/xfree86/loader/elfloader.c,v 1.61tsi Exp $ */
-
- /*
-@@ -1609,6 +1609,20 @@
- break;
- }
-
-+ case R_ALPHA_SREL32:
-+ {
-+ dest32 = (unsigned int *)(secp + rel->r_offset);
-+ symval += rel->r_addend;
-+ symval -= (unsigned long) dest32;
-+ if ((long)symval >= 0x80000000
-+ || (long)symval < -(long)0x80000000)
-+ FatalError("R_ALPHA_SREL32 overflow for %s: %lx\n",
-+ ElfGetSymbolName(elffile, ELF_R_SYM(rel->r_info)),
-+ symval);
-+ *dest32 = symval;
-+ break;
-+ }
-+
- #endif /* alpha */
- #if defined(__mc68000__)
- case R_68K_32:
diff --git a/x11-servers/xorg-server/files/patch-kbd.c b/x11-servers/xorg-server/files/patch-kbd.c
deleted file mode 100644
index 92b84d149863..000000000000
--- a/x11-servers/xorg-server/files/patch-kbd.c
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: programs/Xserver/hw/xfree86/input/keyboard/kbd.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v
-retrieving revision 1.15
-retrieving revision 1.16
-diff -u -r1.15 -r1.16
---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c 11 Jul 2005 02:38:00 -0000 1.15
-+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c 13 Jul 2005 12:30:04 -0000 1.16
-@@ -553,6 +553,19 @@
- if (xf86inSuspend)
- return;
-
-+ if (pKbd->sunKbd) {
-+ /*
-+ * XXX XXX XXX:
-+ *
-+ * I really don't know what's wrong here, but passing the real
-+ * scanCode offsets by one from XKB's point of view.
-+ *
-+ * (ecd@skynet.be, 980405)
-+ */
-+ scanCode--;
-+ goto sunKeyboards;
-+ }
-+
- /*
- * First do some special scancode remapping ...
- */
-@@ -616,6 +629,7 @@
- }
- #endif
-
-+sunKeyboards:
- /*
- * Now map the scancodes to real X-keycodes ...
- */
diff --git a/x11-servers/xorg-server/files/patch-loader.c b/x11-servers/xorg-server/files/patch-loader.c
deleted file mode 100644
index f68744ce35fc..000000000000
--- a/x11-servers/xorg-server/files/patch-loader.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- programs/Xserver/hw/xfree86/loader/loader.c.orig Tue Feb 22 06:58:18 2005
-+++ programs/Xserver/hw/xfree86/loader/loader.c Tue Feb 22 06:59:09 2005
-@@ -552,8 +552,8 @@
- FatalError("\n_LoaderFileToMem() read() failed: %s\n",
- strerror(errno));
-
--# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__)) \
-- && defined(__powerpc__)
-+# if (defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) \
-+ || defined(__FreeBSD__)) && defined(__powerpc__)
- /*
- * Keep the instruction cache in sync with changes in the
- * main memory.
diff --git a/x11-servers/xorg-server/files/patch-man-Imakefile b/x11-servers/xorg-server/files/patch-man-Imakefile
deleted file mode 100644
index 182741ccc44c..000000000000
--- a/x11-servers/xorg-server/files/patch-man-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/Xserver/hw/xfree86/doc/man/Imakefile.orig Sat May 8 23:04:29 2004
-+++ programs/Xserver/hw/xfree86/doc/man/Imakefile Sat May 8 23:04:33 2004
-@@ -15,7 +15,9 @@
-
- #endif
-
-+#if 0
- InstallManPageLong(XF86VM,$(MANDIR),XF86VidMode)
- #if ExpandManNames
- InstallManPageAliases(XF86VidMode,$(MANDIR),XF86VidModeQueryExtension XF86VidModeQueryVersion XF86VidModeGetModeLine XF86VidModeGetAllModeLines XF86VidModeDeleteModeLine XF86VidModeModModeLine XF86VidModeSwitchMode XF86VidModeSwitchToMode XF86VidModeLockModeSwitch XF86VidModeGetMonitor XF86VidModeGetViewPort XF86VidModeSetViewPort XF86VidModeValidateModeLine XF86VidModeSetClientVersion XF86VidModeGetDotClocks XF86VidModeGetGamma XF86VidModeSetGamma XF86VidModeSetGammaRamp XF86VidModeGetGammaRamp XF86VidModeGetGammaRampSize XF86VidModeGetPermissions)
-+#endif
- #endif
diff --git a/x11-servers/xorg-server/files/patch-mouse.c b/x11-servers/xorg-server/files/patch-mouse.c
deleted file mode 100644
index 745ea92c5dbb..000000000000
--- a/x11-servers/xorg-server/files/patch-mouse.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Jan 29 06:57:55 2005
-+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Sat Jan 29 06:59:03 2005
-@@ -1501,8 +1501,8 @@
-
- case PROT_SYSMOUSE: /* sysmouse */
- buttons = (~pBuf[0]) & 0x07;
-- dx = (char)(pBuf[1]) + (char)(pBuf[3]);
-- dy = - ((char)(pBuf[2]) + (char)(pBuf[4]));
-+ dx = (signed char)(pBuf[1]) + (signed char)(pBuf[3]);
-+ dy = - ((signed char)(pBuf[2]) + (signed char)(pBuf[4]));
- /* FreeBSD sysmouse sends additional data bytes */
- if (pMse->protoPara[4] >= 8) {
- /*
diff --git a/x11-servers/xorg-server/files/patch-nv_hw.c b/x11-servers/xorg-server/files/patch-nv_hw.c
deleted file mode 100644
index bd3a12b8aa3b..000000000000
--- a/x11-servers/xorg-server/files/patch-nv_hw.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c.orig Sat Oct 8 20:13:06 2005
-+++ programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c Sat Oct 8 20:14:53 2005
-@@ -915,7 +915,7 @@
- RIVA_HW_STATE *state
- )
- {
-- int i;
-+ int i, j;
-
- pNv->PMC[0x0140/4] = 0x00000000;
- pNv->PMC[0x0200/4] = 0xFFFF00FF;
-@@ -1162,6 +1162,10 @@
- pNv->PGRAPH[0x008C/4] = 0x60de8051;
- pNv->PGRAPH[0x0090/4] = 0x00008000;
- pNv->PGRAPH[0x0610/4] = 0x00be3c5f;
-+
-+ j = pNv->REGS[0x1540/4] & 0xff;
-+ for(i = 0; !(j & 1); j >>= 1, i++);
-+ pNv->PGRAPH[0x5000/4] = i;
-
- if((pNv->Chipset & 0xfff0) == 0x0040) {
- pNv->PGRAPH[0x09b0/4] = 0x83280fff;
diff --git a/x11-servers/xorg-server/files/patch-os-Imakefile b/x11-servers/xorg-server/files/patch-os-Imakefile
deleted file mode 100644
index 5251895774ad..000000000000
--- a/x11-servers/xorg-server/files/patch-os-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/os/Imakefile.orig Sat May 8 18:00:52 2004
-+++ programs/Xserver/os/Imakefile Sat May 8 18:01:08 2004
-@@ -132,7 +132,7 @@
- $(RANDOM_DEFINES)
- INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \
- -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \
-- -I$(TOP)/lib/Xau -I../lbx Krb5Includes
-+ -I$(TOP)/lib/Xau -I../lbx Krb5Includes -I$(INCROOT)/X11
- DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \
- $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines
- LINTLIBS = ../dix/llib-ldix.ln
diff --git a/x11-servers/xorg-server/files/patch-os-support-Imakefile b/x11-servers/xorg-server/files/patch-os-support-Imakefile
deleted file mode 100644
index fab8641dacac..000000000000
--- a/x11-servers/xorg-server/files/patch-os-support-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Thu Jan 20 03:30:38 2005
-+++ programs/Xserver/hw/xfree86/os-support/Imakefile Thu Jan 20 03:31:37 2005
-@@ -15,6 +15,7 @@
- (defined(SunArchitecture) && defined(SparcArchitecture)) || \
- (defined(KFreeBSDArchitecture) && defined(AlphaArchitecture)) || \
- (defined(KFreeBSDArchitecture) && defined(Sparc64Architecture)) || \
-+ (defined(KFreeBSDArchitecture) && defined(PpcArchitecture)) || \
- (defined(KNetBSDArchitecture) && defined(AlphaArchitecture)) || \
- (defined(KNetBSDArchitecture) && defined(PpcArchitecture)) || \
- (defined(KNetBSDArchitecture) && defined(SparcArchitecture)) || \
diff --git a/x11-servers/xorg-server/files/patch-pc98kbd b/x11-servers/xorg-server/files/patch-pc98kbd
deleted file mode 100644
index 5b41887944da..000000000000
--- a/x11-servers/xorg-server/files/patch-pc98kbd
+++ /dev/null
@@ -1,40 +0,0 @@
---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig Tue Feb 8 17:48:07 2005
-+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c Tue Feb 8 17:48:52 2005
-@@ -595,10 +595,13 @@
- * they need to get the same key code as the base key on the same
- * physical keyboard key.
- */
-- if (scanCode == KEY_SysReqest)
-- scanCode = KEY_Print;
-- else if (scanCode == KEY_Break)
-- scanCode = KEY_Pause;
-+ /* PC98 keyboards however don't need this */
-+ if (!xf86IsPc98()) {
-+ if (scanCode == KEY_SysReqest)
-+ scanCode = KEY_Print;
-+ else if (scanCode == KEY_Break)
-+ scanCode = KEY_Pause;
-+ }
- #endif
-
- /*
---- programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c.orig Tue Feb 8 18:14:07 2005
-+++ programs/Xserver/hw/xfree86/os-support/shared/at_scancode.c Tue Feb 8 18:14:12 2005
-@@ -43,6 +43,9 @@
- case KEY_Prefix1:
- pKbd->scanPrefix = *scanCode; /* special prefixes */
- return TRUE;
-+ }
-+ if (!xf86IsPc98()) {
-+ switch (*scanCode) {
- case 0x59: *scanCode = KEY_0x59; break;
- case 0x5a: *scanCode = KEY_0x5A; break;
- case 0x5b: *scanCode = KEY_0x5B; break;
-@@ -71,6 +74,7 @@
- case 0x74: *scanCode = KEY_0x74; break;
- case 0x75: *scanCode = KEY_0x75; break;
- case 0x76: *scanCode = KEY_0x76; break;
-+ }
- }
- break;
- case KEY_Prefix0:
diff --git a/x11-servers/xorg-server/files/patch-radeon_driver.c b/x11-servers/xorg-server/files/patch-radeon_driver.c
deleted file mode 100644
index 862b3c9283d1..000000000000
--- a/x11-servers/xorg-server/files/patch-radeon_driver.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig Tue Nov 8 01:15:59 2005
-+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c Tue Nov 8 01:15:37 2005
-@@ -938,6 +938,9 @@ static RADEONMonitorType RADEONDisplayDD
- MonType = MT_NONE;
- }
-
-+ OUTREG(info->DDCReg, INREG(info->DDCReg) &
-+ ~(RADEON_GPIO_EN_0 | RADEON_GPIO_EN_1));
-+
- if (*MonInfo) {
- if ((*MonInfo)->rawData[0x14] & 0x80) {
- /* Note some laptops have a DVI output that uses internal TMDS,
-@@ -2284,6 +2287,7 @@ static Bool RADEONPreInitConfig(ScrnInfo
- case PCI_CHIP_RV370_5464:
- info->IsMobility = TRUE;
- case PCI_CHIP_RV370_5B60:
-+ case PCI_CHIP_RV370_5B62:
- case PCI_CHIP_RV370_5B64:
- case PCI_CHIP_RV370_5B65:
- info->ChipFamily = CHIP_FAMILY_RV380;
-@@ -7159,7 +7163,6 @@ void RADEONAdjustFrame(int scrnIndex, in
- RADEONDoAdjustFrame(pScrn, x, y, FALSE);
- }
-
-- RADEONSetFBLocation (pScrn);
- #ifdef XF86DRI
- if (info->CPStarted) DRIUnlock(pScrn->pScreen);
- #endif
diff --git a/x11-servers/xorg-server/files/patch-savage-pci-id b/x11-servers/xorg-server/files/patch-savage-pci-id
deleted file mode 100644
index f7396543d878..000000000000
--- a/x11-servers/xorg-server/files/patch-savage-pci-id
+++ /dev/null
@@ -1,87 +0,0 @@
---- programs/Xserver/hw/xfree86/common/xf86PciInfo.h.savage-pci-id-fixes 2003-01-08 04:28:57.000000000 -0500
-+++ programs/Xserver/hw/xfree86/common/xf86PciInfo.h 2003-01-08 05:28:02.000000000 -0500
-@@ -457,21 +457,34 @@
- #define PCI_CHIP_TRIO64V2_DXGX 0x8901
- #define PCI_CHIP_PLATO_PX 0x8902
- #define PCI_CHIP_Trio3D 0x8904
--#define PCI_CHIP_Trio3D_2X 0x8A13
- #define PCI_CHIP_VIRGE_DXGX 0x8A01
- #define PCI_CHIP_VIRGE_GX2 0x8A10
-+#define PCI_CHIP_Trio3D_2X 0x8A13
- #define PCI_CHIP_SAVAGE3D 0x8A20
- #define PCI_CHIP_SAVAGE3D_MV 0x8A21
- #define PCI_CHIP_SAVAGE4 0x8A22
--#define PCI_CHIP_VIRGE_MX 0x8C01
--#define PCI_CHIP_VIRGE_MXPLUS 0x8C01
--#define PCI_CHIP_VIRGE_MXP 0x8C03
- #define PCI_CHIP_PROSAVAGE_PM 0x8A25
- #define PCI_CHIP_PROSAVAGE_KM 0x8A26
-+#define PCI_CHIP_VIRGE_MX 0x8C01
-+#define PCI_CHIP_VIRGE_MXPLUS 0x8C02
-+#define PCI_CHIP_VIRGE_MXP 0x8C03
- #define PCI_CHIP_SAVAGE_MX_MV 0x8C10
- #define PCI_CHIP_SAVAGE_MX 0x8C11
- #define PCI_CHIP_SAVAGE_IX_MV 0x8C12
- #define PCI_CHIP_SAVAGE_IX 0x8C13
-+#define PCI_CHIP_SUPSAV_MX128 0x8C22
-+#define PCI_CHIP_SUPSAV_MX64 0x8C24
-+#define PCI_CHIP_SUPSAV_MX64C 0x8C26
-+#define PCI_CHIP_SUPSAV_IX128SDR 0x8C2A
-+#define PCI_CHIP_SUPSAV_IX128DDR 0x8C2B
-+#define PCI_CHIP_SUPSAV_IX64SDR 0x8C2C
-+#define PCI_CHIP_SUPSAV_IX64DDR 0x8C2D
-+#define PCI_CHIP_SUPSAV_IXCSDR 0x8C2E
-+#define PCI_CHIP_SUPSAV_IXCDDR 0x8C2F
-+#define PCI_CHIP_S3TWISTER_P 0x8D01
-+#define PCI_CHIP_S3TWISTER_K 0x8D02
-+#define PCI_CHIP_PROSAVAGE_DDR 0x8D03
-+#define PCI_CHIP_PROSAVAGE_DDRK 0x8D04
- #define PCI_CHIP_SAVAGE2000 0x9102
-
- /* ARK Logic */
---- programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h.savage-pci-id-fixes 2003-01-08 05:31:06.000000000 -0500
-+++ programs/Xserver/hw/xfree86/drivers/savage/savage_regs.h 2003-01-08 05:31:25.000000000 -0500
-@@ -3,30 +3,6 @@
- #ifndef _SAVAGE_REGS_H
- #define _SAVAGE_REGS_H
-
--/* These are here until xf86PciInfo.h is updated. */
--
--#ifndef PCI_CHIP_S3TWISTER_P
--#define PCI_CHIP_S3TWISTER_P 0x8d01
--#endif
--#ifndef PCI_CHIP_S3TWISTER_K
--#define PCI_CHIP_S3TWISTER_K 0x8d02
--#endif
--#ifndef PCI_CHIP_SUPSAV_MX128
--#define PCI_CHIP_SUPSAV_MX128 0x8c22
--#define PCI_CHIP_SUPSAV_MX64 0x8c24
--#define PCI_CHIP_SUPSAV_MX64C 0x8c26
--#define PCI_CHIP_SUPSAV_IX128SDR 0x8c2a
--#define PCI_CHIP_SUPSAV_IX128DDR 0x8c2b
--#define PCI_CHIP_SUPSAV_IX64SDR 0x8c2c
--#define PCI_CHIP_SUPSAV_IX64DDR 0x8c2d
--#define PCI_CHIP_SUPSAV_IXCSDR 0x8c2e
--#define PCI_CHIP_SUPSAV_IXCDDR 0x8c2f
--#endif
--#ifndef PCI_CHIP_PROSAVAGE_DDR
--#define PCI_CHIP_PROSAVAGE_DDR 0x8d03
--#define PCI_CHIP_PROSAVAGE_DDRK 0x8d04
--#endif
--
- #define S3_SAVAGE3D_SERIES(chip) ((chip>=S3_SAVAGE3D) && (chip<=S3_SAVAGE_MX))
-
- #define S3_SAVAGE4_SERIES(chip) ((chip==S3_SAVAGE4) || (chip==S3_PROSAVAGE))
---- programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c.savage-pci-id-fixes 2003-01-08 06:28:59.000000000 -0500
-+++ programs/Xserver/hw/xfree86/drivers/savage/savage_driver.c 2003-01-08 06:33:02.000000000 -0500
-@@ -123,8 +123,8 @@
- { PCI_CHIP_SAVAGE_IX, "Savage/IX" },
- { PCI_CHIP_PROSAVAGE_PM, "ProSavage PM133" },
- { PCI_CHIP_PROSAVAGE_KM, "ProSavage KM133" },
-- { PCI_CHIP_S3TWISTER_P, "ProSavage PN133" },
-- { PCI_CHIP_S3TWISTER_K, "ProSavage KN133" },
-+ { PCI_CHIP_S3TWISTER_P, "Twister PN133" },
-+ { PCI_CHIP_S3TWISTER_K, "Twister KN133" },
- { PCI_CHIP_SUPSAV_MX128, "SuperSavage/MX 128" },
- { PCI_CHIP_SUPSAV_MX64, "SuperSavage/MX 64" },
- { PCI_CHIP_SUPSAV_MX64C, "SuperSavage/MX 64C" },
diff --git a/x11-servers/xorg-server/files/patch-servermd.h b/x11-servers/xorg-server/files/patch-servermd.h
new file mode 100644
index 000000000000..4315d78de44f
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-servermd.h
@@ -0,0 +1,11 @@
+--- programs/Xserver/include/servermd.h.orig Sun Jan 8 14:05:55 2006
++++ programs/Xserver/include/servermd.h Sun Jan 8 14:06:22 2006
+@@ -216,7 +216,7 @@
+ defined(__sparc__) || defined(__mc68000__)
+
+ #if defined(__sparc) || defined(__sparc__)
+-# if !defined(sparc)
++# if !defined(sparc) && !defined(__FreeBSD__)
+ # define sparc 1
+ # endif
+ #endif
diff --git a/x11-servers/xorg-server/files/patch-xf86OSmouse.h b/x11-servers/xorg-server/files/patch-xf86OSmouse.h
deleted file mode 100644
index e9b4d9fa9159..000000000000
--- a/x11-servers/xorg-server/files/patch-xf86OSmouse.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h.orig Sat Jul 24 10:35:39 2004
-+++ programs/Xserver/hw/xfree86/os-support/xf86OSmouse.h Sat May 7 20:47:45 2005
-@@ -281,7 +281,7 @@
- /* Generalize for other axes. */
- #define MSE_NOAXISMAP MSE_NOZMAP
-
--#define MSE_MAXBUTTONS 12
-+#define MSE_MAXBUTTONS 16
- #define MSE_DFLTBUTTONS 3
-
- #endif /* _XF86OSMOUSE_H_ */
diff --git a/x11-servers/xorg-server/files/patch-xf86Pci.h b/x11-servers/xorg-server/files/patch-xf86Pci.h
deleted file mode 100644
index a7ec47c1e0e1..000000000000
--- a/x11-servers/xorg-server/files/patch-xf86Pci.h
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h
-===================================================================
-RCS file: /work/eich/freedesktop/cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h,v
-retrieving revision 1.1.1.2
-diff -u -r1.1.1.2 xf86Pci.h
---- programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 25 Nov 2003 19:28:50 -0000 1.1.1.2
-+++ programs/Xserver/hw/xfree86/os-support/bus/xf86Pci.h 2 Mar 2005 16:08:29 -0000
-@@ -329,7 +329,7 @@
- #define PCI_MAP_IS_MEM(b) (!PCI_MAP_IS_IO(b))
-
- #define PCI_MAP_IS64BITMEM(b) \
-- (((b) & PCI_MAP_MEMORY_TYPE_MASK) == PCI_MAP_MEMORY_TYPE_64BIT)
-+ (((b) & PCI_MAP_MEMORY_TYPE) == PCI_MAP_MEMORY_TYPE_64BIT)
-
- #define PCIGETMEMORY(b) ((b) & PCI_MAP_MEMORY_ADDRESS_MASK)
- #define PCIGETMEMORY64HIGH(b) (*((CARD32*)&b + 1))
diff --git a/x11-servers/xorg-server/files/patch-xfree86-Imakefile b/x11-servers/xorg-server/files/patch-xfree86-Imakefile
deleted file mode 100644
index 2bd0fe1e1745..000000000000
--- a/x11-servers/xorg-server/files/patch-xfree86-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/Xserver/hw/xfree86/Imakefile.orig Fri Dec 31 14:08:32 2004
-+++ programs/Xserver/hw/xfree86/Imakefile Fri Dec 31 14:08:34 2004
-@@ -217,8 +217,8 @@
- InstallManPage(Xorg,$(MANDIR))
- InstallGenManPage(xorg.conf,$(FILEMANDIR),$(FILEMANSUFFIX))
-
-+InstallNamedNonExec($(XORGCONFIG),xorg.conf.eg,$(LIBDIR))
- #if 0
--InstallNamedNonExec($(XORGCONFIG),XF86Config.eg,$(LIBDIR))
- InstallNamedNonExec($(XF98CONFIG),XF86Config.98,$(LIBDIR))
- #endif
- InstallNamedNonExec(Options,Options,$(LIBDIR))
diff --git a/x11-servers/xorg-server/files/patch-xkbout.c b/x11-servers/xorg-server/files/patch-xkbout.c
deleted file mode 100644
index 963e881d86f7..000000000000
--- a/x11-servers/xorg-server/files/patch-xkbout.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/xkbfile/xkbout.c.orig Fri May 7 18:05:29 2004
-+++ lib/xkbfile/xkbout.c Fri May 7 18:05:29 2004
-@@ -54,7 +54,6 @@
- #include "XKBsrv.h"
-
- #include <X11/extensions/XKBgeom.h>
--#include "extensions/XKBfile.h"
-
- #endif
-
diff --git a/x11-servers/xorg-server/files/patch-xorgconfig.c b/x11-servers/xorg-server/files/patch-xorgconfig.c
deleted file mode 100644
index 650360ec75fe..000000000000
--- a/x11-servers/xorg-server/files/patch-xorgconfig.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- programs/Xserver/hw/xfree86/xf86config/xorgconfig.c.orig Mon Nov 8 22:18:58 2004
-+++ programs/Xserver/hw/xfree86/xf86config/xorgconfig.c Mon Nov 8 22:19:22 2004
-@@ -854,8 +854,7 @@
- "which is the rate at which scanlines are displayed.\n"
- "\n"
- "The valid range for horizontal sync and vertical sync should be documented\n"
--"in the manual of your monitor. If in doubt, check the monitor database\n"
--TREEROOTDOC "/Monitors to see if your monitor is there.\n"
-+"in the manual of your monitor.\n"
- "\n";
-
- static char *hsyncintro_text =
diff --git a/x11-servers/xorg-server/pkg-plist b/x11-servers/xorg-server/pkg-plist
index 1a28ebdfef04..bd3bcb02577e 100644
--- a/x11-servers/xorg-server/pkg-plist
+++ b/x11-servers/xorg-server/pkg-plist
@@ -78,110 +78,118 @@ lib/X11/getconfig/cfg.sample
lib/X11/getconfig/xorg.cfg
lib/X11/xorg.conf.eg
lib/X11/xserver/SecurityPolicy
-%%AMD64_I386%%lib/modules/drivers/apm_drv.o
-%%AMD64_I386%%lib/modules/drivers/ark_drv.o
-lib/modules/drivers/ati_drv.o
-lib/modules/drivers/atimisc_drv.o
-%%AMD64_I386%%lib/modules/drivers/chips_drv.o
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.o
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.o
-%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.o
-%%AMD64_I386%%lib/modules/drivers/cyrix_drv.o
-%%AMD64_I386%%lib/modules/drivers/dummy_drv.o
-lib/modules/drivers/glint_drv.o
-%%AMD64_I386%%lib/modules/drivers/i128_drv.o
-%%I386%%lib/modules/drivers/i740_drv.o
-%%AMD64_I386%%lib/modules/drivers/i810_drv.o
-lib/modules/drivers/mga_drv.o
-%%AMD64_I386%%lib/modules/drivers/neomagic_drv.o
-%%I386%%lib/modules/drivers/nsc_drv.o
-%%SPARC64_NA%%lib/modules/drivers/nv_drv.o
-lib/modules/drivers/r128_drv.o
-lib/modules/drivers/radeon_drv.o
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.o
-%%SPARC64_NA%%lib/modules/drivers/riva128.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.o
-%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.o
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.o
-%%AMD64_I386%%lib/modules/drivers/sis_drv.o
-%%SPARC64%%lib/modules/drivers/sunbw2_drv.o
-%%SPARC64%%lib/modules/drivers/suncg14_drv.o
-%%SPARC64%%lib/modules/drivers/suncg3_drv.o
-%%SPARC64%%lib/modules/drivers/suncg6_drv.o
-%%SPARC64%%lib/modules/drivers/sunffb_drv.o
-%%SPARC64%%lib/modules/drivers/sunleo_drv.o
-%%SPARC64%%lib/modules/drivers/suntcx_drv.o
-lib/modules/drivers/tdfx_drv.o
-%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.o
-%%AMD64_I386%%lib/modules/drivers/trident_drv.o
-%%AMD64_I386%%lib/modules/drivers/tseng_drv.o
-%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.o
-lib/modules/drivers/vga_drv.o
-%%I386%%lib/modules/drivers/via_drv.o
-%%I386%%lib/modules/drivers/vmware_drv.o
-lib/modules/extensions/libGLcore.a
-lib/modules/extensions/libdbe.a
-lib/modules/extensions/libdri.a
-lib/modules/extensions/libextmod.a
-lib/modules/extensions/libglx.a
-lib/modules/extensions/librecord.a
-lib/modules/extensions/libxtrap.a
-lib/modules/fonts/libbitmap.a
+%%AMD64_I386%%lib/modules/drivers/apm_drv.so
+%%AMD64_I386%%lib/modules/drivers/ark_drv.so
+lib/modules/drivers/ati_drv.so
+lib/modules/drivers/atimisc_drv.so
+%%AMD64_I386%%lib/modules/drivers/chips_drv.so
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_alpine.so
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_drv.so
+%%SPARC64_NA%%%%PPC_NA%%lib/modules/drivers/cirrus_laguna.so
+%%AMD64_I386%%lib/modules/drivers/cyrix_drv.so
+%%ALPHA_NA%%lib/modules/drivers/dummy_drv.so
+lib/modules/drivers/glint_drv.so
+%%AMD64_I386%%lib/modules/drivers/i128_drv.so
+%%I386%%lib/modules/drivers/i740_drv.so
+%%AMD64_I386%%lib/modules/drivers/i810_drv.so
+lib/modules/drivers/mga_drv.so
+%%AMD64_I386%%lib/modules/drivers/neomagic_drv.so
+%%I386%%lib/modules/drivers/nsc_drv.so
+%%SPARC64_NA%%lib/modules/drivers/nv_drv.so
+lib/modules/drivers/r128_drv.so
+lib/modules/drivers/radeon_drv.so
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/rendition_drv.so
+%%SPARC64_NA%%lib/modules/drivers/riva128.so
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3_drv.so
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/s3virge_drv.so
+%%SPARC64_NA%%%%IA64_NA%%lib/modules/drivers/savage_drv.so
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/siliconmotion_drv.so
+%%AMD64_I386%%lib/modules/drivers/sis_drv.so
+%%SPARC64%%lib/modules/drivers/sunbw2_drv.so
+%%SPARC64%%lib/modules/drivers/suncg14_drv.so
+%%SPARC64%%lib/modules/drivers/suncg3_drv.so
+%%SPARC64%%lib/modules/drivers/suncg6_drv.so
+%%SPARC64%%lib/modules/drivers/sunffb_drv.so
+%%SPARC64%%lib/modules/drivers/sunleo_drv.so
+%%SPARC64%%lib/modules/drivers/suntcx_drv.so
+lib/modules/drivers/tdfx_drv.so
+%%SPARC64_NA%%%%IA64_NA%%%%PPC_NA%%lib/modules/drivers/tga_drv.so
+%%AMD64_I386%%lib/modules/drivers/trident_drv.so
+%%AMD64_I386%%lib/modules/drivers/tseng_drv.so
+%%ALPHA_NA%%%%PPC_NA%%lib/modules/drivers/vesa_drv.so
+lib/modules/drivers/vga_drv.so
+%%I386%%lib/modules/drivers/via_drv.so
+%%AMD64_I386%%lib/modules/drivers/vmware_drv.so
+lib/modules/extensions/libGLcore.so
+lib/modules/extensions/libdbe.so
+lib/modules/extensions/libdri.so
+lib/modules/extensions/libextmod.so
+lib/modules/extensions/libglx.so
+lib/modules/extensions/librecord.so
+lib/modules/extensions/libxtrap.so
+lib/modules/fonts/libbitmap.so
lib/modules/fonts/libfreetype.so
-lib/modules/fonts/libtype1.a
-lib/modules/freebsd/libdrm.a
-lib/modules/input/acecad_drv.o
-lib/modules/input/calcomp_drv.o
-lib/modules/input/citron_drv.o
-lib/modules/input/digitaledge_drv.o
-lib/modules/input/dmc_drv.o
-lib/modules/input/dynapro_drv.o
-lib/modules/input/elographics_drv.o
-lib/modules/input/fpit_drv.o
-lib/modules/input/hyperpen_drv.o
-lib/modules/input/js_x_drv.o
-lib/modules/input/kbd_drv.o
-lib/modules/input/keyboard_drv.o
-lib/modules/input/magellan_drv.o
-lib/modules/input/microtouch_drv.o
-lib/modules/input/mouse_drv.o
-lib/modules/input/mutouch_drv.o
-lib/modules/input/palmax_drv.o
-lib/modules/input/penmount_drv.o
-lib/modules/input/spaceorb_drv.o
-lib/modules/input/summa_drv.o
-lib/modules/input/tek4957_drv.o
-lib/modules/input/void_drv.o
-lib/modules/input/wacom_drv.o
-%%ALPHA_NA%%lib/modules/libafb.a
-lib/modules/libcfb.a
-lib/modules/libcfb16.a
-lib/modules/libcfb24.a
-lib/modules/libcfb32.a
-lib/modules/libcw.a
-lib/modules/libdamage.a
-lib/modules/libddc.a
-lib/modules/libfb.a
-lib/modules/libi2c.a
-lib/modules/libint10.a
-lib/modules/liblayer.a
-lib/modules/libmfb.a
-lib/modules/libpcidata.a
-lib/modules/librac.a
-lib/modules/libramdac.a
-lib/modules/libscanpci.a
-lib/modules/libshadow.a
-lib/modules/libshadowfb.a
-lib/modules/libvbe.a
-lib/modules/libvgahw.a
-lib/modules/libxaa.a
-lib/modules/libxf1bpp.a
-lib/modules/libxf24_32bpp.a
-lib/modules/libxf4bpp.a
-lib/modules/libxf8_16bpp.a
-lib/modules/libxf8_32bpp.a
-%%SPARC64%%lib/modules/libxf8_32wid.a
+lib/modules/fonts/libtype1.so
+lib/modules/freebsd/libdrm.so
+lib/modules/input/acecad_drv.so
+lib/modules/input/calcomp_drv.so
+lib/modules/input/citron_drv.so
+lib/modules/input/digitaledge_drv.so
+lib/modules/input/dmc_drv.so
+lib/modules/input/dynapro_drv.so
+lib/modules/input/elographics_drv.so
+lib/modules/input/fpit_drv.so
+lib/modules/input/hyperpen_drv.so
+lib/modules/input/js_x_drv.so
+lib/modules/input/kbd_drv.so
+lib/modules/input/keyboard_drv.so
+lib/modules/input/magellan_drv.so
+lib/modules/input/microtouch_drv.so
+lib/modules/input/mouse_drv.so
+lib/modules/input/mutouch_drv.so
+lib/modules/input/palmax_drv.so
+lib/modules/input/penmount_drv.so
+lib/modules/input/spaceorb_drv.so
+lib/modules/input/summa_drv.so
+lib/modules/input/tek4957_drv.so
+lib/modules/input/void_drv.so
+lib/modules/input/wacom_drv.so
+%%ALPHA_NA%%lib/modules/libafb.so
+lib/modules/libcfb.so
+lib/modules/libcfb16.so
+%%SPARC64%%lib/modules/libcfb24.so
+lib/modules/libcfb32.so
+lib/modules/libddc.so
+lib/modules/libexa.so
+lib/modules/libfb.so
+lib/modules/libi2c.so
+lib/modules/libint10.so
+lib/modules/liblayer.so
+lib/modules/libmfb.so
+lib/modules/libpcidata.so
+lib/modules/librac.so
+lib/modules/libramdac.so
+lib/modules/libscanpci.so
+lib/modules/libshadow.so
+lib/modules/libshadowfb.so
+lib/modules/libvbe.so
+lib/modules/libvgahw.so
+lib/modules/libxaa.so
+lib/modules/libxf1bpp.so
+lib/modules/libxf4bpp.so
+lib/modules/libxf8_16bpp.so
+lib/modules/libxf8_32bpp.so
+%%SPARC64%%lib/modules/libxf8_32wid.so
+lib/modules/multimedia/bt829_drv.so
+lib/modules/multimedia/fi1236_drv.so
+lib/modules/multimedia/msp3430_drv.so
+lib/modules/multimedia/tda8425_drv.so
+lib/modules/multimedia/tda9850_drv.so
+lib/modules/multimedia/tda9885_drv.so
+lib/modules/multimedia/theatre_detect_drv.so
+lib/modules/multimedia/theatre_drv.so
+lib/modules/multimedia/theatre200_drv.so
+lib/modules/multimedia/uda1380_drv.so
%%SPARC64_NA%%%%PPC_NA%%lib/modules/v10002d.uc
%%SPARC64_NA%%%%PPC_NA%%lib/modules/v20002d.uc
@dirrm lib/X11/getconfig
@@ -190,4 +198,10 @@ lib/modules/libxf8_32bpp.a
@dirrm lib/modules/freebsd
@dirrm lib/modules/drivers
@dirrm lib/modules/input
+@dirrm lib/modules/internal
+@dirrm lib/modules/multimedia
+@unexec rmdir %D/include/X11/pixmaps 2>/dev/null || true
@unexec rmdir %D/lib/X11/doc 2>/dev/null || true
+@unexec rmdir %D/lib/X11/etc 2>/dev/null || true
+@unexec rmdir %D/lib/X11/xserver 2>/dev/null || true
+@unexec rmdir %D/lib/modules 2>/dev/null || true
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index 78425d9ba9d5..010e67bfdcd5 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xorg-vfbserver
-PORTVERSION= 6.8.2
+PORTVERSION= 6.9.0
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XORG}
MASTER_SITE_SUBDIR= X11R${PORTVERSION}/src
diff --git a/x11-servers/xorg-vfbserver/distinfo b/x11-servers/xorg-vfbserver/distinfo
index d70b415d1ac1..177370c87899 100644
--- a/x11-servers/xorg-vfbserver/distinfo
+++ b/x11-servers/xorg-vfbserver/distinfo
@@ -1,6 +1,6 @@
-MD5 (xorg/X11R6.8.2-src1.tar.gz) = a9cfa54ae2e65a057b9c6416befeb6ab
-SHA256 (xorg/X11R6.8.2-src1.tar.gz) = 0868eb61f3a6af7e858494416cc3b1291d7ab602a6d69ec40bdf7e4fdecbcc5e
-SIZE (xorg/X11R6.8.2-src1.tar.gz) = 32373802
-MD5 (xorg/X11R6.8.2-src3.tar.gz) = 057d20af30569434e2c6693c1ca66e57
-SHA256 (xorg/X11R6.8.2-src3.tar.gz) = d295a304a014d96857f9acfb4b1a4b954462e476639623f05cfd839af9447e49
-SIZE (xorg/X11R6.8.2-src3.tar.gz) = 10379299
+MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
+SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
+SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
+MD5 (xorg/X11R6.9.0-src3.tar.gz) = 4d5450bde835270632e004b25e45ef33
+SHA256 (xorg/X11R6.9.0-src3.tar.gz) = 6c55602a0d6476457d3cf6a1413c39d63c70ca9255749bff5502dae9414f9971
+SIZE (xorg/X11R6.9.0-src3.tar.gz) = 10872474
diff --git a/x11-servers/xorg-vfbserver/scripts/configure b/x11-servers/xorg-vfbserver/scripts/configure
index 7ab6562143f3..2af13d547cf4 100644
--- a/x11-servers/xorg-vfbserver/scripts/configure
+++ b/x11-servers/xorg-vfbserver/scripts/configure
@@ -17,5 +17,6 @@ echo "#define BuildXF86DRI NO" >> $LOCALDEF
echo "#define UseInstalledPrograms YES" >> $LOCALDEF
echo "#define UseInstalledLibraries YES" >> $LOCALDEF
echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF
+echo "#define InstallSecurityConfig NO" >> $LOCALDEF
sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen