8 files changed, 66 insertions, 118 deletions

diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
index 314c1a55c0fe..301fe117a4c0 100644
--- a/x11/xorg-clients/Makefile
+++ b/x11/xorg-clients/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorg-clients
-PORTVERSION=	6.8.2
-PORTREVISION=	1
+PORTVERSION=	6.9.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG}
 MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo
index 37138345fc8f..3dfbb6044dbe 100644
--- a/x11/xorg-clients/distinfo
+++ b/x11/xorg-clients/distinfo
@@ -1,9 +1,9 @@
-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.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-src2.tar.gz) = f49a0993d89038a46556720688450479
+SHA256 (xorg/X11R6.9.0-src2.tar.gz) = 848289b323d6193ac03ca001f41aa3cdf9cfd129cfbda1c5add209d5c18a8e4c
+SIZE (xorg/X11R6.9.0-src2.tar.gz) = 6056976
+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/xorg-clients/files/manpages b/x11/xorg-clients/files/manpages
index f7708cfc60b1..f2ecbe5c0944 100644
--- a/x11/xorg-clients/files/manpages
+++ b/x11/xorg-clients/files/manpages
@@ -7,8 +7,6 @@ MAN1=	Xmark.1 \
 	bmtoa.1 \
 	cxpm.1 \
 	dga.1 \
-	dpsexec.1 \
-	dpsinfo.1 \
 	editres.1 \
 	fslsfonts.1 \
 	fstobdf.1 \
@@ -18,7 +16,6 @@ MAN1=	Xmark.1 \
 	ico.1 \
 	listres.1 \
 	luit.1 \
-	makepsres.1 \
 	mkcfm.1 \
 	mkfontdir.1 \
 	mkfontscale.1 \
@@ -33,7 +30,6 @@ MAN1=	Xmark.1 \
 	smproxy.1 \
 	startx.1 \
 	sxpm.1 \
-	texteroids.1 \
 	twm.1 \
 	viewres.1 \
 	x11perf.1 \
@@ -47,8 +43,10 @@ MAN1=	Xmark.1 \
 	xconsole.1 \
 	xcursorgen.1 \
 	xcutsel.1 \
+	xdbedizzy.1 \
 	xditview.1 \
 	xdm.1 \
+	xdpr.1 \
 	xdpyinfo.1 \
 	xdriinfo.1 \
 	xedit.1 \
@@ -82,6 +80,7 @@ MAN1=	Xmark.1 \
 	xphelloworld.1 \
 	xplsprinters.1 \
 	xprehashprinterlist.1 \
+	xpr.1 \
 	xprop.1 \
 	xpsimplehelloworld.1 \
 	xpxthelloworld.1 \
diff --git a/x11/xorg-clients/files/patch-startx b/x11/xorg-clients/files/patch-startx
index b9f000c61889..97d82fca0b83 100644
--- a/x11/xorg-clients/files/patch-startx
+++ b/x11/xorg-clients/files/patch-startx
@@ -1,6 +1,6 @@
---- programs/xinit/startx.cpp.orig	Thu Mar  4 09:49:08 2004
-+++ programs/xinit/startx.cpp	Sat May 29 16:26:20 2004
-@@ -80,8 +80,12 @@
+--- programs/xinit/startx.cpp.orig	Fri Dec 23 18:17:27 2005
++++ programs/xinit/startx.cpp	Fri Dec 23 18:19:43 2005
+@@ -105,8 +105,12 @@
  fi
  
  whoseargs="client"
@@ -13,17 +13,17 @@
      XCOMM '' required to prevent cpp from treating "/*" as a C comment.
      /''*|\./''*)
  	if [ "$whoseargs" = "client" ]; then
-@@ -172,7 +176,7 @@
- done
+@@ -224,7 +228,7 @@
+         XINIT $client $clientargs -- $server $display $serverargs
+ fi
+ #else
+-XINIT $client $clientargs -- $server $display $serverargs
++XINIT $client $clientargs -- $server $display $serverargs $listen_tcp
  #endif
  
--xinit $client $clientargs -- $server $display $serverargs
-+xinit $client $clientargs -- $server $display $serverargs $listen_tcp
- 
  if [ x"$removelist" != x ]; then
-     xauth remove $removelist
---- programs/xinit/startx.man.orig	Fri Apr  2 13:47:36 2004
-+++ programs/xinit/startx.man	Sat May 29 16:22:56 2004
+--- programs/xinit/startx.man.orig	Fri Dec 23 18:20:17 2005
++++ programs/xinit/startx.man	Fri Dec 23 18:22:59 2005
 @@ -47,10 +47,17 @@
  somewhat nicer user interface for running a single session of the X
  Window System.  It is often run with no arguments.
@@ -50,5 +50,5 @@
 +.PP
 +startx -listen_tcp -- -depth 16
  .RE
+ #ifdef __SCOMAN__
  .PP
- To determine the client to run,
diff --git a/x11/xorg-clients/files/patch-symbols_fo b/x11/xorg-clients/files/patch-symbols_fo
deleted file mode 100644
index e4eb69697125..000000000000
--- a/x11/xorg-clients/files/patch-symbols_fo
+++ /dev/null
@@ -1,22 +0,0 @@
---- programs/xkbcomp/symbols/pc/Imakefile.orig	Thu Mar  4 17:49:11 2004
-+++ programs/xkbcomp/symbols/pc/Imakefile	Wed Nov  3 15:09:52 2004
-@@ -7,7 +7,7 @@
- 		cz cz_qwerty \
- 		de dev dk dvorak dz \
- 		ee el en_US es \
--		fi fr fr-latin9 \
-+		fi fo fr fr-latin9 \
- 		gb ge_la ge_ru guj gur \
- 		hr \
- 		ie il il_phonetic ir is it iu \
---- programs/xkbcomp/symbols/Imakefile.orig	Thu Mar  4 17:49:10 2004
-+++ programs/xkbcomp/symbols/Imakefile	Wed Nov  3 15:09:45 2004
-@@ -15,7 +15,7 @@
- 		 czsk cz cz_qwerty \
- 		 de de_CH dev dk dvorak \
- 		 ee el en_US es \
--		 fi fr fr_CH \
-+		 fi fo fr fr_CH \
- 		 gb ge_la ge_ru group guj gur \
- 		 hr hr_US hu hu_US hu_qwerty \
- 		 ie il il_phonetic iso9995-3 inet ir is it iu \
diff --git a/x11/xorg-clients/files/patch-xdm_Imakefile b/x11/xorg-clients/files/patch-xdm_Imakefile
new file mode 100644
index 000000000000..c215ad2d196f
--- /dev/null
+++ b/x11/xorg-clients/files/patch-xdm_Imakefile
@@ -0,0 +1,11 @@
+--- programs/xdm/Imakefile.orig	Thu Nov 24 21:24:10 2005
++++ programs/xdm/Imakefile	Thu Nov 24 21:25:17 2005
+@@ -107,7 +107,7 @@
+ #endif
+ #endif
+ 
+-#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture)
++#if !defined(i386IscArchitecture) && !defined(i386ScoArchitecture) && !defined(LinuxArchitecture) && !defined(NTOArchitecture) && !defined(SGIArchitecture) && !defined(AIXArchitecture) && !defined(FreeBSDArchitecture)
+ SYS_LIBRARIES3 = -lresolv
+ #endif
+ #if SystemV || defined(SequentArchitecture)
diff --git a/x11/xorg-clients/files/patch-xdriinfo.c b/x11/xorg-clients/files/patch-xdriinfo.c
deleted file mode 100644
index 19305a534243..000000000000
--- a/x11/xorg-clients/files/patch-xdriinfo.c
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: xdriinfo.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/xdriinfo/xdriinfo.c,v
-retrieving revision 1.1.3.1
-diff -u -r1.1.3.1 xdriinfo.c
---- programs/xdriinfo/xdriinfo.c	16 Jun 2004 09:27:39 -0000	1.1.3.1
-+++ programs/xdriinfo/xdriinfo.c	23 Nov 2005 04:40:38 -0000
-@@ -22,6 +22,7 @@
-  * 
-  */
- 
-+#define GLX_GLXEXT_LEGACY
- #include <GL/glx.h>
- #include <X11/Xlib.h>
- #include <stdio.h>
-@@ -57,8 +58,8 @@
-     char *funcArg = NULL;
-     char *dpyName = NULL;
- 
--    GetScreenDriver = (glXGetScreenDriver_t *)glXGetProcAddress ("glXGetScreenDriver");
--    GetDriverConfig = (glXGetDriverConfig_t *)glXGetProcAddress ("glXGetDriverConfig");
-+    GetScreenDriver = (glXGetScreenDriver_t *)glXGetProcAddressARB ("glXGetScreenDriver");
-+    GetDriverConfig = (glXGetDriverConfig_t *)glXGetProcAddressARB ("glXGetDriverConfig");
-     if (!GetScreenDriver || !GetDriverConfig) {
- 	fprintf (stderr, "libGL is too old.\n");
- 	return 1;
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
index 4254439b1a52..dc3ad36b362a 100644
--- a/x11/xorg-clients/pkg-plist
+++ b/x11/xorg-clients/pkg-plist
@@ -8,8 +8,6 @@ bin/bitmap
 bin/bmtoa
 bin/cxpm
 bin/dga
-bin/dpsexec
-bin/dpsinfo
 bin/editres
 bin/fslsfonts
 bin/fstobdf
@@ -19,7 +17,6 @@ bin/iceauth
 bin/ico
 bin/listres
 bin/luit
-bin/makepsres
 bin/mkcfm
 bin/mkfontdir
 bin/mkfontscale
@@ -34,7 +31,6 @@ bin/showrgb
 bin/smproxy
 bin/startx
 bin/sxpm
-bin/texteroids
 bin/twm
 bin/ucs2any
 bin/viewres
@@ -49,8 +45,10 @@ bin/xcmsdb
 bin/xconsole
 bin/xcursorgen
 bin/xcutsel
+bin/xdbedizzy
 bin/xditview
 bin/xdm
+bin/xdpr
 bin/xdpyinfo
 bin/xdriinfo
 bin/xedit
@@ -86,6 +84,7 @@ bin/xmore
 bin/xon
 bin/xphelloworld
 bin/xplsprinters
+bin/xpr
 bin/xprehashprinterlist
 bin/xprop
 bin/xpsimplehelloworld
@@ -401,11 +400,12 @@ lib/X11/xkb/compat/accessx
 lib/X11/xkb/compat/basic
 lib/X11/xkb/compat/complete
 lib/X11/xkb/compat/default
-lib/X11/xkb/compat/group_led
 lib/X11/xkb/compat/iso9995
 lib/X11/xkb/compat/japan
 lib/X11/xkb/compat/keypad
-lib/X11/xkb/compat/leds
+lib/X11/xkb/compat/ledcaps
+lib/X11/xkb/compat/lednum
+lib/X11/xkb/compat/ledscroll
 lib/X11/xkb/compat/misc
 lib/X11/xkb/compat/mousekeys
 lib/X11/xkb/compat/norepeat
@@ -538,6 +538,7 @@ lib/X11/xkb/symbols/bs
 lib/X11/xkb/symbols/by
 lib/X11/xkb/symbols/ca
 lib/X11/xkb/symbols/ca_enhanced
+lib/X11/xkb/symbols/capslock
 lib/X11/xkb/symbols/compose
 lib/X11/xkb/symbols/ctrl
 lib/X11/xkb/symbols/cz
@@ -556,6 +557,7 @@ lib/X11/xkb/symbols/ee
 lib/X11/xkb/symbols/el
 lib/X11/xkb/symbols/en_US
 lib/X11/xkb/symbols/es
+lib/X11/xkb/symbols/eurosign
 lib/X11/xkb/symbols/fi
 lib/X11/xkb/symbols/fo
 lib/X11/xkb/symbols/fr
@@ -619,84 +621,69 @@ lib/X11/xkb/symbols/ogham
 lib/X11/xkb/symbols/ori
 lib/X11/xkb/symbols/pc/al
 lib/X11/xkb/symbols/pc/am
-lib/X11/xkb/symbols/pc/ar
+lib/X11/xkb/symbols/pc/ara
+lib/X11/xkb/symbols/pc/az
+lib/X11/xkb/symbols/pc/ba
+lib/X11/xkb/symbols/pc/bd
 lib/X11/xkb/symbols/pc/be
-lib/X11/xkb/symbols/pc/ben
 lib/X11/xkb/symbols/pc/bg
 lib/X11/xkb/symbols/pc/br
+lib/X11/xkb/symbols/pc/bt
 lib/X11/xkb/symbols/pc/by
+lib/X11/xkb/symbols/pc/ca
+lib/X11/xkb/symbols/pc/ch
 lib/X11/xkb/symbols/pc/cz
-lib/X11/xkb/symbols/pc/cz_qwerty
 lib/X11/xkb/symbols/pc/de
-lib/X11/xkb/symbols/pc/dev
 lib/X11/xkb/symbols/pc/dk
-lib/X11/xkb/symbols/pc/dvorak
-lib/X11/xkb/symbols/pc/dz
 lib/X11/xkb/symbols/pc/ee
-lib/X11/xkb/symbols/pc/el
-lib/X11/xkb/symbols/pc/en_US
 lib/X11/xkb/symbols/pc/es
 lib/X11/xkb/symbols/pc/fi
 lib/X11/xkb/symbols/pc/fo
 lib/X11/xkb/symbols/pc/fr
-lib/X11/xkb/symbols/pc/fr-latin9
 lib/X11/xkb/symbols/pc/gb
-lib/X11/xkb/symbols/pc/ge_la
-lib/X11/xkb/symbols/pc/ge_ru
-lib/X11/xkb/symbols/pc/guj
-lib/X11/xkb/symbols/pc/gur
+lib/X11/xkb/symbols/pc/ge
+lib/X11/xkb/symbols/pc/gr
 lib/X11/xkb/symbols/pc/hr
+lib/X11/xkb/symbols/pc/hu
 lib/X11/xkb/symbols/pc/ie
 lib/X11/xkb/symbols/pc/il
-lib/X11/xkb/symbols/pc/il_phonetic
+lib/X11/xkb/symbols/pc/in
 lib/X11/xkb/symbols/pc/ir
 lib/X11/xkb/symbols/pc/is
 lib/X11/xkb/symbols/pc/it
-lib/X11/xkb/symbols/pc/iu
-lib/X11/xkb/symbols/pc/kan
+lib/X11/xkb/symbols/pc/jp
+lib/X11/xkb/symbols/pc/kg
 lib/X11/xkb/symbols/pc/la
+lib/X11/xkb/symbols/pc/latam
 lib/X11/xkb/symbols/pc/latin
-lib/X11/xkb/symbols/pc/lo
+lib/X11/xkb/symbols/pc/lk
 lib/X11/xkb/symbols/pc/lt
 lib/X11/xkb/symbols/pc/lv
-lib/X11/xkb/symbols/pc/mk
-lib/X11/xkb/symbols/pc/ml
+lib/X11/xkb/symbols/pc/mao
+lib/X11/xkb/symbols/pc/mkd
 lib/X11/xkb/symbols/pc/mm
+lib/X11/xkb/symbols/pc/mn
 lib/X11/xkb/symbols/pc/mt
-lib/X11/xkb/symbols/pc/mt_us
 lib/X11/xkb/symbols/pc/nl
 lib/X11/xkb/symbols/pc/no
-lib/X11/xkb/symbols/pc/ogham
-lib/X11/xkb/symbols/pc/ori
 lib/X11/xkb/symbols/pc/pc
+lib/X11/xkb/symbols/pc/pk
 lib/X11/xkb/symbols/pc/pl
-lib/X11/xkb/symbols/pc/pl2
 lib/X11/xkb/symbols/pc/pt
 lib/X11/xkb/symbols/pc/ro
 lib/X11/xkb/symbols/pc/ru
-lib/X11/xkb/symbols/pc/sapmi
 lib/X11/xkb/symbols/pc/se
-lib/X11/xkb/symbols/pc/se_FI
-lib/X11/xkb/symbols/pc/se_NO
-lib/X11/xkb/symbols/pc/se_SE
 lib/X11/xkb/symbols/pc/si
 lib/X11/xkb/symbols/pc/sk
-lib/X11/xkb/symbols/pc/sk_qwerty
-lib/X11/xkb/symbols/pc/sr
-lib/X11/xkb/symbols/pc/syr
-lib/X11/xkb/symbols/pc/syr_phonetic
-lib/X11/xkb/symbols/pc/tel
+lib/X11/xkb/symbols/pc/srp
+lib/X11/xkb/symbols/pc/sy
 lib/X11/xkb/symbols/pc/th
-lib/X11/xkb/symbols/pc/th_pat
-lib/X11/xkb/symbols/pc/th_tis
 lib/X11/xkb/symbols/pc/tj
-lib/X11/xkb/symbols/pc/tml
 lib/X11/xkb/symbols/pc/tr
 lib/X11/xkb/symbols/pc/ua
 lib/X11/xkb/symbols/pc/us
-lib/X11/xkb/symbols/pc/us_intl
 lib/X11/xkb/symbols/pc/uz
-lib/X11/xkb/symbols/pc/yu
+lib/X11/xkb/symbols/pc/vn
 lib/X11/xkb/symbols/pc104
 lib/X11/xkb/symbols/pl
 lib/X11/xkb/symbols/pl2