18 files changed, 0 insertions, 1460 deletions

diff --git a/x11/xorg-clients/Makefile b/x11/xorg-clients/Makefile
deleted file mode 100644
index 70f17146df30..000000000000
--- a/x11/xorg-clients/Makefile
+++ /dev/null
@@ -1,100 +0,0 @@
-# New ports collection makefile for:    xorg-clients
-# Date created:		30 May 2004
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	xorg-clients
-PORTVERSION=	6.9.0
-PORTREVISION=	3
-CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTFILES=	X11R${PORTVERSION}-src1.tar.gz \
-		X11R${PORTVERSION}-src2.tar.gz \
-		X11R${PORTVERSION}-src3.tar.gz
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	X client programs and related files from X.Org
-
-RUN_DEPENDS=	xterm>0:${PORTSDIR}/x11/xterm
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
-
-CONFLICTS=	XFree86-clients-*
-
-EXTRA_PATCHES=	${CF_PATCHES}
-
-XINCLUDE_DIRS=	lib/xtrans
-XBUILD_DIRS=	programs fonts/util
-XMAN_DIRS=	programs
-USE_XLIB=	yes
-
-XDMCONFDATA=	Xaccess Xresources Xservers xdm-config
-XDMCONFSCRIPTS=	GiveConsole TakeConsole Xsession Xsetup_0 Xwilling
-
-.if !defined(WITH_SETUID_LUIT)
-pre-everything::
-	@${ECHO_MSG} "If you want to use xterm with locales in a secure manner, luit must be"
-	@${ECHO_MSG} "installed setuid.  If you want to do this, define WITH_SETUID_LUIT when"
-	@${ECHO_MSG} "installing this port (either in /etc/make.conf or on command line with"
-	@${ECHO_MSG} "install target)."
-.endif
-
-post-install:
-	if [ ! -e ${X11BASE}/bin/resize ]; then \
-		${LN} -sf ${X11BASE}/bin/resize-static ${X11BASE}/bin/resize; \
-	fi
-	if [ ! -e ${X11BASE}/bin/xterm ]; then \
-		${LN} -sf ${X11BASE}/bin/xterm-static ${X11BASE}/bin/xterm; \
-	fi
-	if [ ! -e ${X11BASE}/bin/uxterm ]; then \
-		${LN} -sf ${X11BASE}/bin/uxterm-static ${X11BASE}/bin/uxterm; \
-	fi
-	if [ ! -e ${X11BASE}/lib/X11/app-defaults/UXTerm ]; then \
-		${LN} -sf ${X11BASE}/lib/X11/app-defaults/UXTerm-static \
-		${X11BASE}/lib/X11/app-defaults/UXTerm; \
-	fi
-	if [ ! -e ${X11BASE}/lib/X11/app-defaults/XTerm ]; then \
-		${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-static \
-		${X11BASE}/lib/X11/app-defaults/XTerm; \
-	fi
-	if [ ! -e ${X11BASE}/lib/X11/app-defaults/XTerm-color ]; then \
-		${LN} -sf ${X11BASE}/lib/X11/app-defaults/XTerm-color-static \
-		${X11BASE}/lib/X11/app-defaults/XTerm-color; \
-	fi
-
-.if defined(WITH_SETUID_LUIT)
-	${CHOWN} root:wheel ${PREFIX}/bin/luit
-	${CHMOD} 04711 ${PREFIX}/bin/luit
-.endif
-	${MKDIR} ${PREFIX}/lib/X11/xinit
-	${INSTALL_DATA} ${WRKSRC}/programs/xinit/xinitrc \
-		${PREFIX}/lib/X11/xinit/xinitrc.default
-.for i in ${XDMCONFDATA}
-	${INSTALL_DATA} ${WRKSRC}/programs/xdm/config/${i} \
-		${PREFIX}/lib/X11/xdm/${i}.default
-.endfor
-.for i in ${XDMCONFSCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/programs/xdm/config/${i} \
-		${PREFIX}/lib/X11/xdm/${i}.default
-.endfor
-	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502123
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-4x
-.endif
-
-.if ${X_WINDOW_SYSTEM:L} != xorg
-IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
-	distribution. See The X Window System and Virtual Consoles chapter\
-	of FAQ for more information
-.endif
-
-.include "${FILESDIR}/manpages"
-
-.include <bsd.port.post.mk>
diff --git a/x11/xorg-clients/distinfo b/x11/xorg-clients/distinfo
deleted file mode 100644
index 3dfbb6044dbe..000000000000
--- a/x11/xorg-clients/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-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/extra-patch-4x b/x11/xorg-clients/files/extra-patch-4x
deleted file mode 100644
index 91672685e8c4..000000000000
--- a/x11/xorg-clients/files/extra-patch-4x
+++ /dev/null
@@ -1,79 +0,0 @@
---- programs/xedit/util.c.orig	Fri Jan 27 13:07:57 2006
-+++ programs/xedit/util.c	Fri Jan 27 13:10:58 2006
-@@ -58,43 +58,14 @@
- extern Widget vpanes[2], labels[3], texts[3], forms[3];
- extern XawTextWrapMode wrapmodes[3];
- 
--#ifndef va_copy
--# ifdef __va_copy
--#  define va_copy __va_copy
--# else
--#  error "no working va_copy was found"
--# endif
--#endif
--    
- /*
-  * Implementation
-  */
- void
--XeditPrintf(const char *format, ...)
-+XeditPrintf(char *str)
- {
--    char         *str;
--    size_t        size;
--    va_list       va,
--                  va2;
--    XawTextBlock  text;
--    XawTextPosition pos;
--    
--    va_start(va, format);
--
--    va_copy(va2, va);
--    size = vsnprintf(NULL, 0, format, va2);
--    va_end(va2);
--
--    str = (char *)malloc(size + 1);
--    if (str == NULL)
--        return;
--
--    vsnprintf(str, size + 1, format, va);
--    str[size] = 0;
--    
--    va_end(va);
--    
--    pos = XawTextSourceScan(XawTextGetSource(messwidget),
-+    XawTextBlock text;
-+    XawTextPosition pos = XawTextSourceScan(XawTextGetSource(messwidget),
- 					    0, XawstAll, XawsdRight, 1, True);
- 
-     text.length = strlen(str);
-@@ -106,7 +77,6 @@
- 
-     XawTextSetInsertionPoint(messwidget, pos + text.length);
-     
--    free(str);
- }
- 
- Widget
---- programs/xedit/xedit.h.orig	Fri Jan 27 13:11:42 2006
-+++ programs/xedit/xedit.h	Fri Jan 27 13:12:55 2006
-@@ -106,7 +106,7 @@
- void Feep(void);
- 
- /*	externals in util.c 	*/
--void XeditPrintf(const char *format, ...);
-+void XeditPrintf(char*);
- Widget MakeCommandButton(Widget, char*, XtCallbackProc);
- Widget MakeStringBox(Widget, String, String);
- String GetString(Widget);
---- programs/xmore/print.h.orig	Fri Jan 27 13:21:05 2006
-+++ programs/xmore/print.h	Fri Jan 27 13:22:53 2006
-@@ -38,7 +38,7 @@
- #if defined(XMORE)
- #define PrintMsg(x) { printf("xmore: "); printf x ; }
- #elif defined(XEDIT)
--#define PrintMsg(x) { XeditPrintf x ; }
-+#define PrintMsg(x) { printf("xedit: "); printf x ; }
- #else
- #error unknown application
- #endif 
diff --git a/x11/xorg-clients/files/manpages b/x11/xorg-clients/files/manpages
deleted file mode 100644
index f2ecbe5c0944..000000000000
--- a/x11/xorg-clients/files/manpages
+++ /dev/null
@@ -1,108 +0,0 @@
-MAN1=	Xmark.1 \
-	appres.1 \
-	atobm.1 \
-	bdftopcf.1 \
-	beforelight.1 \
-	bitmap.1 \
-	bmtoa.1 \
-	cxpm.1 \
-	dga.1 \
-	editres.1 \
-	fslsfonts.1 \
-	fstobdf.1 \
-	glxgears.1 \
-	glxinfo.1 \
-	iceauth.1 \
-	ico.1 \
-	listres.1 \
-	luit.1 \
-	mkcfm.1 \
-	mkfontdir.1 \
-	mkfontscale.1 \
-	oclock.1 \
-	proxymngr.1 \
-	rstart.1 \
-	rstartd.1 \
-	sessreg.1 \
-	setxkbmap.1 \
-	showfont.1 \
-	showrgb.1 \
-	smproxy.1 \
-	startx.1 \
-	sxpm.1 \
-	twm.1 \
-	viewres.1 \
-	x11perf.1 \
-	x11perfcomp.1 \
-	xauth.1 \
-	xbiff.1 \
-	xcalc.1 \
-	xclipboard.1 \
-	xclock.1 \
-	xcmsdb.1 \
-	xconsole.1 \
-	xcursorgen.1 \
-	xcutsel.1 \
-	xdbedizzy.1 \
-	xditview.1 \
-	xdm.1 \
-	xdpr.1 \
-	xdpyinfo.1 \
-	xdriinfo.1 \
-	xedit.1 \
-	xev.1 \
-	xeyes.1 \
-	xfd.1 \
-	xfindproxy.1 \
-	xfontsel.1 \
-	xfsinfo.1 \
-	xfwp.1 \
-	xgamma.1 \
-	xgc.1 \
-	xhost.1 \
-	xinit.1 \
-	xkbcomp.1 \
-	xkbevd.1 \
-	xkbprint.1 \
-	xkill.1 \
-	xload.1 \
-	xlogo.1 \
-	xlsatoms.1 \
-	xlsclients.1 \
-	xlsfonts.1 \
-	xmag.1 \
-	xman.1 \
-	xmessage.1 \
-	xmh.1 \
-	xmodmap.1 \
-	xmore.1 \
-	xon.1 \
-	xphelloworld.1 \
-	xplsprinters.1 \
-	xprehashprinterlist.1 \
-	xpr.1 \
-	xprop.1 \
-	xpsimplehelloworld.1 \
-	xpxthelloworld.1 \
-	xrandr.1 \
-	xrdb.1 \
-	xrefresh.1 \
-	xset.1 \
-	xsetmode.1 \
-	xsetpointer.1 \
-	xsetroot.1 \
-	xsm.1 \
-	xstdcmap.1 \
-	xtrap.1 \
-	xtrapchar.1 \
-	xtrapin.1 \
-	xtrapinfo.1 \
-	xtrapout.1 \
-	xtrapproto.1 \
-	xtrapreset.1 \
-	xtrapstats.1 \
-	xvidtune.1 \
-	xvinfo.1 \
-	xwd.1 \
-	xwininfo.1 \
-	xwud.1
diff --git a/x11/xorg-clients/files/patch-dpsinfo-Imakefile b/x11/xorg-clients/files/patch-dpsinfo-Imakefile
deleted file mode 100644
index b8bb1b853432..000000000000
--- a/x11/xorg-clients/files/patch-dpsinfo-Imakefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- programs/dpsinfo/Imakefile.orig	Fri Apr 23 12:54:31 2004
-+++ programs/dpsinfo/Imakefile	Tue Oct 19 20:05:08 2004
-@@ -13,10 +13,10 @@
- 
- .SUFFIXES: .psw .h
- 
--.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c : 
- 	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
- 
--.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h : 
- 	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
- 
- depend:: $(DERIVED_FILES)
diff --git a/x11/xorg-clients/files/patch-luit.c b/x11/xorg-clients/files/patch-luit.c
deleted file mode 100644
index a5e858bc67f2..000000000000
--- a/x11/xorg-clients/files/patch-luit.c
+++ /dev/null
@@ -1,79 +0,0 @@
---- programs/luit/luit.c	Fri Mar  5 01:48:51 2004
-+++ /tmp/luit/luit.c	Sun Jul 18 09:01:22 2004
-@@ -45,6 +45,8 @@
- #include "charset.h"
- #include "iso2022.h"
- 
-+static int p2c_waitpipe[2];
-+static int c2p_waitpipe[2];
- static Iso2022Ptr inputState = NULL, outputState = NULL;
- 
- static char *child_argv0 = NULL;
-@@ -462,6 +464,8 @@
-         exit(1);
-     }
- 
-+    pipe(p2c_waitpipe);
-+    pipe(c2p_waitpipe);
-     pid = fork();
-     if(pid < 0) {
-         perror("Couldn't fork");
-@@ -470,8 +474,12 @@
- 
-     if(pid == 0) {
-         close(pty);
-+	close(p2c_waitpipe[1]);
-+	close(c2p_waitpipe[0]);
-         child(line, path, child_argv);
-     } else {
-+	close(p2c_waitpipe[0]);
-+	close(c2p_waitpipe[1]);
-         free(child_argv);
-         free(path);
-         free(line);
-@@ -486,6 +494,7 @@
- {
-     int tty;
-     int pgrp;
-+    char tmp[10];
- 
-     close(0);
-     close(1);
-@@ -501,6 +510,7 @@
-         kill(getppid(), SIGABRT);
-         exit(1);
-     }
-+    write(c2p_waitpipe[1],"1",1);
-     
-     if(tty != 0)
-         dup2(tty, 0);
-@@ -512,6 +522,9 @@
-     if(tty > 2)
-         close(tty);
-     
-+    read(p2c_waitpipe[0],tmp,1);
-+    close(c2p_waitpipe[1]);
-+    close(p2c_waitpipe[0]);
-     execvp(path, argv);
-     perror("Couldn't exec");
-     exit(1);
-@@ -535,7 +548,9 @@
-     int i;
-     int val;
-     int rc;
-+    char tmp[10];
- 
-+    read(c2p_waitpipe[0],tmp,1);
-     if(verbose) {
-         reportIso2022(outputState);
-     }
-@@ -564,6 +579,9 @@
- 
-     setWindowSize(0, pty);
- 
-+    write(p2c_waitpipe[1],"1",1);
-+    close(c2p_waitpipe[0]);
-+    close(p2c_waitpipe[1]);
-     for(;;) {
-         rc = waitForInput(0, pty);
- 
diff --git a/x11/xorg-clients/files/patch-startx b/x11/xorg-clients/files/patch-startx
deleted file mode 100644
index 97d82fca0b83..000000000000
--- a/x11/xorg-clients/files/patch-startx
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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"
-+listen_tcp="-nolisten tcp"
- while [ x"$1" != x ]; do
-     case "$1" in
-+    -listen_tcp)
-+	listen_tcp=""
-+	;;
-     XCOMM '' required to prevent cpp from treating "/*" as a C comment.
-     /''*|\./''*)
- 	if [ "$whoseargs" = "client" ]; then
-@@ -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
- 
- if [ x"$removelist" != x ]; then
---- 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.
- .PP
--Arguments immediately following the
-+Except for the
-+.RB '-listen_tcp'
-+option, arguments immediately following the
- .I startx
- command are used to start a client in the same manner as
- .IR xinit (1).
-+The
-+.RB '-listen_tcp'
-+option of startx enables the TCP/IP transport type which is needed for remote X
-+displays.  This is disabled by default for security reasons.
-+.PP
- The special argument
- .RB '--'
- marks the end of client arguments and the beginning of server options.
-@@ -71,6 +78,8 @@
- startx -- -dpi 100
- .PP
- startx -- -layout Multihead
-+.PP
-+startx -listen_tcp -- -depth 16
- .RE
- #ifdef __SCOMAN__
- .PP
diff --git a/x11/xorg-clients/files/patch-symbols_pc_gr b/x11/xorg-clients/files/patch-symbols_pc_gr
deleted file mode 100644
index a18b27cbc105..000000000000
--- a/x11/xorg-clients/files/patch-symbols_pc_gr
+++ /dev/null
@@ -1,38 +0,0 @@
---- programs/xkbcomp/symbols/pc/gr.orig	Tue Jan 31 20:28:22 2006
-+++ programs/xkbcomp/symbols/pc/gr	Tue Jan 31 20:29:05 2006
-@@ -13,7 +13,7 @@
- default partial alphanumeric_keys alternate_group
- xkb_symbols "basic" {
- 
--    include "pc/el(bare)"
-+    include "pc/gr(bare)"
- 
-     name[Group1] = "Greece";
- 
-@@ -83,7 +83,7 @@
- partial alphanumeric_keys alternate_group
- xkb_symbols "extended" {
- 
--    include "pc/el(basic)"
-+    include "pc/gr(basic)"
-     name[Group1] = "Greece - Extended";
- 
-     key.type = "THREE_LEVEL";
-@@ -102,7 +102,7 @@
- partial alphanumeric_keys alternate_group
- xkb_symbols "polytonic" {
- 
--    include "pc/el(extended)"
-+    include "pc/gr(extended)"
- 
-     name[Group1] = "Greece - Polytonic";
- 
-@@ -119,7 +119,7 @@
- partial alphanumeric_keys alternate_group
- xkb_symbols "nodeadkeys" {
- 
--    include "pc/el(basic)"
-+    include "pc/gr(basic)"
-     name[Group1] = "Greece - Eliminate dead keys";
- 
-     key <AC10> { [	semicolon,		colon		] };
diff --git a/x11/xorg-clients/files/patch-symbols_pc_pc b/x11/xorg-clients/files/patch-symbols_pc_pc
deleted file mode 100644
index a6e66d58f5f1..000000000000
--- a/x11/xorg-clients/files/patch-symbols_pc_pc
+++ /dev/null
@@ -1,19 +0,0 @@
---- programs/xkbcomp/symbols/pc/pc.orig	Fri Aug 12 13:08:49 2005
-+++ programs/xkbcomp/symbols/pc/pc	Mon May  8 21:01:25 2006
-@@ -101,16 +101,8 @@
- 	type= "PC_SYSRQ",
- 	symbols[Group1]= [ Print, Sys_Req ]
-     };
--    key <SYRQ> {
--	type= "PC_SYSRQ",
--	symbols[Group1]= [ Print, Sys_Req ]
--    };
-     key <SCLK> {  [  Scroll_Lock	]	};
-     key <PAUS> {
--	type= "PC_BREAK",
--	symbols[Group1]= [ Pause, Break ]
--    };
--    key <BRK> {
- 	type= "PC_BREAK",
- 	symbols[Group1]= [ Pause, Break ]
-     };
diff --git a/x11/xorg-clients/files/patch-texteroids b/x11/xorg-clients/files/patch-texteroids
deleted file mode 100644
index 13240cf33c2a..000000000000
--- a/x11/xorg-clients/files/patch-texteroids
+++ /dev/null
@@ -1,15 +0,0 @@
---- programs/texteroids/Imakefile.orig	Fri Apr 23 12:54:37 2004
-+++ programs/texteroids/Imakefile	Tue Oct 19 20:07:40 2004
-@@ -13,10 +13,10 @@
- 
- .SUFFIXES: .psw .h
- 
--.psw.c : ProgramTargetName($(PSWRAP))
-+.psw.c :
- 	RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
- 
--.psw.h : ProgramTargetName($(PSWRAP))
-+.psw.h :
- 	RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
- 
- depend:: $(DERIVED_FILES)
diff --git a/x11/xorg-clients/files/patch-xdm b/x11/xorg-clients/files/patch-xdm
deleted file mode 100644
index b836d9bfa8b2..000000000000
--- a/x11/xorg-clients/files/patch-xdm
+++ /dev/null
@@ -1,27 +0,0 @@
---- programs/xdm/config/Imakefile.orig	Fri Apr  2 13:47:35 2004
-+++ programs/xdm/config/Imakefile	Sun May 30 11:55:14 2004
-@@ -5,7 +5,7 @@
- 
- XCOMM $XFree86: xc/programs/xdm/config/Imakefile,v 1.14 2003/12/30 22:09:14 herrb Exp $
- 
--SERVERSTYPE = XdmServersType
-+SERVERSTYPE = ws
- 
- all:: Xservers.ws xdm-config Xservers Xresources
- 
-@@ -46,6 +46,7 @@
- 
- LinkFile(Xservers,Xservers.$(SERVERSTYPE))
- 
-+#if 0
- #if InstallXdmConfig
- InstallNonExecFile(xdm-config,$(XDMDIR))
- InstallNonExecFile(Xresources,$(XDMDIR))
-@@ -66,6 +67,7 @@
- InstallNamedProgNoClobber(TakeConsole,TakeConsole,$(XDMDIR))
- InstallNamedProgNoClobber(Xsetup_0,Xsetup_0,$(XDMDIR))
- InstallNamedProgNoClobber(Xwilling,Xwilling,$(XDMDIR))
-+#endif
- #endif
- 
- #if InstallXdmConfig
diff --git a/x11/xorg-clients/files/patch-xdm_Imakefile b/x11/xorg-clients/files/patch-xdm_Imakefile
deleted file mode 100644
index c215ad2d196f..000000000000
--- a/x11/xorg-clients/files/patch-xdm_Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-xdm_session.c b/x11/xorg-clients/files/patch-xdm_session.c
deleted file mode 100644
index f4cff5c5a4ed..000000000000
--- a/x11/xorg-clients/files/patch-xdm_session.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- programs/xdm/session.c.orig	Thu Mar  4 09:48:55 2004
-+++ programs/xdm/session.c	Wed Jun 16 16:59:46 2004
-@@ -55,7 +55,6 @@
- #ifdef SECURE_RPC
- # include <rpc/rpc.h>
- # include <rpc/key_prot.h>
--extern int key_setnet(struct key_netstarg *arg);
- #endif
- #ifdef K5AUTH
- # include <krb5/krb5.h>
-@@ -529,6 +528,7 @@
-     int	pid;
- #ifdef HAS_SETUSERCONTEXT
-     struct passwd* pwd;
-+    extern char **environ;
- #endif
- #ifdef USE_PAM
-     pam_handle_t *pamh = thepamh ();
-@@ -610,6 +610,8 @@
- 	 * Set the user's credentials: uid, gid, groups,
- 	 * environment variables, resource limits, and umask.
- 	 */
-+        /* destroy user environment before calling setusercontext */
-+	environ = verify->userEnviron;
- 	pwd = getpwnam(name);
- 	if (pwd) {
- 	    if (setusercontext(NULL, pwd, pwd->pw_uid, LOGIN_SETALL) < 0) {
-@@ -617,6 +619,7 @@
- 		    errno);
- 		return (0);
- 	    }
-+            verify->userEnviron = environ;    
- 	    endpwent();
- 	} else {
- 	    LogError ("getpwnam for \"%s\" failed, errno=%d\n", name, errno);
diff --git a/x11/xorg-clients/files/patch-xinit-Imakefile b/x11/xorg-clients/files/patch-xinit-Imakefile
deleted file mode 100644
index 7e66ed546f7c..000000000000
--- a/x11/xorg-clients/files/patch-xinit-Imakefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- programs/xinit/Imakefile.orig	Sun May 30 11:47:25 2004
-+++ programs/xinit/Imakefile	Sun May 30 11:53:23 2004
-@@ -48,10 +48,12 @@
- #endif
- InstallManPage(startx,$(MANDIR))
- 
-+#if 0
- #if InstallXinitConfig
- InstallNonExecFile($(SAMPLECONFIG),$(XINITDIR))
- #else
- InstallNonExecFileNoClobber($(SAMPLECONFIG),$(XINITDIR))
-+#endif
- #endif
- 
- LinkConfDirectory(xinit,.,xinit,.)
diff --git a/x11/xorg-clients/pkg-descr b/x11/xorg-clients/pkg-descr
deleted file mode 100644
index 40de2429b479..000000000000
--- a/x11/xorg-clients/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-This package contains the X.Org X11 clients.
-
-WWW: http://www.x.org/
-
-- Eric Anholt
-anholt@FreeBSD.org
diff --git a/x11/xorg-clients/pkg-install b/x11/xorg-clients/pkg-install
deleted file mode 100644
index 41f1c1d7fca5..000000000000
--- a/x11/xorg-clients/pkg-install
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/X11R6}
-
-XDMCONFDIR=${PKG_PREFIX}/lib/X11/xdm
-XDMCONFFILES="GiveConsole TakeConsole Xaccess Xresources Xservers Xsession \
-	Xsetup_0 Xwilling xdm-config"
-for file in $XDMCONFFILES; do
-	if [ ! -f ${XDMCONFDIR}/$file ]; then
-		cp ${XDMCONFDIR}/$file.default ${XDMCONFDIR}/$file
-	fi
-done
-
-XINITCONFDIR=${PKG_PREFIX}/lib/X11/xinit
-if [ ! -f ${XINITCONFDIR}/xinitrc ]; then
-	cp ${XINITCONFDIR}/xinitrc.default ${XINITCONFDIR}/xinitrc
-fi
diff --git a/x11/xorg-clients/pkg-plist b/x11/xorg-clients/pkg-plist
deleted file mode 100644
index bfe441660a93..000000000000
--- a/x11/xorg-clients/pkg-plist
+++ /dev/null
@@ -1,814 +0,0 @@
-bin/Xmark
-bin/appres
-bin/atobm
-bin/bdftopcf
-bin/bdftruncate
-bin/beforelight
-bin/bitmap
-bin/bmtoa
-bin/cxpm
-bin/dga
-bin/editres
-bin/fslsfonts
-bin/fstobdf
-bin/glxgears
-bin/glxinfo
-bin/iceauth
-bin/ico
-bin/listres
-bin/luit
-bin/mkcfm
-bin/mkfontdir
-bin/mkfontscale
-bin/oclock
-bin/proxymngr
-bin/rstart
-bin/rstartd
-bin/sessreg
-bin/setxkbmap
-bin/showfont
-bin/showrgb
-bin/smproxy
-bin/startx
-bin/sxpm
-bin/twm
-bin/ucs2any
-bin/viewres
-bin/x11perf
-bin/x11perfcomp
-bin/xauth
-bin/xbiff
-bin/xcalc
-bin/xclipboard
-bin/xclock
-bin/xcmsdb
-bin/xconsole
-bin/xcursorgen
-bin/xcutsel
-bin/xdbedizzy
-bin/xditview
-bin/xdm
-bin/xdpr
-bin/xdpyinfo
-bin/xdriinfo
-bin/xedit
-bin/xev
-bin/xeyes
-bin/xfd
-bin/xfindproxy
-bin/xfontsel
-bin/xfsinfo
-bin/xfwp
-bin/xgamma
-bin/xgc
-bin/xhost
-bin/xinit
-bin/xkbbell
-bin/xkbcomp
-bin/xkbevd
-bin/xkbprint
-bin/xkbvleds
-bin/xkbwatch
-bin/xkill
-bin/xload
-bin/xlogo
-bin/xlsatoms
-bin/xlsclients
-bin/xlsfonts
-bin/xmag
-bin/xman
-bin/xmessage
-bin/xmh
-bin/xmodmap
-bin/xmore
-bin/xon
-bin/xphelloworld
-bin/xplsprinters
-bin/xpr
-bin/xprehashprinterlist
-bin/xprop
-bin/xpsimplehelloworld
-bin/xpxthelloworld
-bin/xrandr
-bin/xrdb
-bin/xrefresh
-bin/xset
-bin/xsetmode
-bin/xsetpointer
-bin/xsetroot
-bin/xsm
-bin/xstdcmap
-bin/xtrapchar
-bin/xtrapin
-bin/xtrapinfo
-bin/xtrapout
-bin/xtrapproto
-bin/xtrapreset
-bin/xtrapstats
-bin/xvidtune
-bin/xvinfo
-bin/xwd
-bin/xwininfo
-bin/xwud
-include/X11/PM/PM.h
-include/X11/PM/PMproto.h
-include/X11/bitmaps/Dashes
-include/X11/bitmaps/Down
-include/X11/bitmaps/Excl
-include/X11/bitmaps/FlipHoriz
-include/X11/bitmaps/FlipVert
-include/X11/bitmaps/Fold
-include/X11/bitmaps/Left
-include/X11/bitmaps/Right
-include/X11/bitmaps/RotateLeft
-include/X11/bitmaps/RotateRight
-include/X11/bitmaps/Stipple
-include/X11/bitmaps/Term
-include/X11/bitmaps/Up
-include/X11/bitmaps/black6
-include/X11/bitmaps/box6
-include/X11/bitmaps/ldblarrow
-include/X11/bitmaps/rdblarrow
-lib/X11/app-defaults/Beforelight
-lib/X11/app-defaults/Bitmap
-lib/X11/app-defaults/Bitmap-color
-lib/X11/app-defaults/Chooser
-lib/X11/app-defaults/Clock-color
-lib/X11/app-defaults/Editres
-lib/X11/app-defaults/Editres-color
-lib/X11/app-defaults/Viewres
-lib/X11/app-defaults/XCalc
-lib/X11/app-defaults/XCalc-color
-lib/X11/app-defaults/XClipboard
-lib/X11/app-defaults/XClock
-lib/X11/app-defaults/XClock-color
-lib/X11/app-defaults/XConsole
-lib/X11/app-defaults/XFontSel
-lib/X11/app-defaults/XLoad
-lib/X11/app-defaults/XLogo
-lib/X11/app-defaults/XLogo-color
-lib/X11/app-defaults/XMore
-lib/X11/app-defaults/XSm
-lib/X11/app-defaults/Xditview
-lib/X11/app-defaults/Xditview-chrtr
-lib/X11/app-defaults/Xedit
-lib/X11/app-defaults/Xedit-color
-lib/X11/app-defaults/Xfd
-lib/X11/app-defaults/Xgc
-lib/X11/app-defaults/Xmag
-lib/X11/app-defaults/Xman
-lib/X11/app-defaults/Xmessage
-lib/X11/app-defaults/Xmessage-color
-lib/X11/app-defaults/Xmh
-lib/X11/app-defaults/Xvidtune
-lib/X11/fonts/util/map-ISO8859-1
-lib/X11/fonts/util/map-ISO8859-10
-lib/X11/fonts/util/map-ISO8859-11
-lib/X11/fonts/util/map-ISO8859-13
-lib/X11/fonts/util/map-ISO8859-14
-lib/X11/fonts/util/map-ISO8859-15
-lib/X11/fonts/util/map-ISO8859-16
-lib/X11/fonts/util/map-ISO8859-2
-lib/X11/fonts/util/map-ISO8859-3
-lib/X11/fonts/util/map-ISO8859-4
-lib/X11/fonts/util/map-ISO8859-5
-lib/X11/fonts/util/map-ISO8859-7
-lib/X11/fonts/util/map-ISO8859-8
-lib/X11/fonts/util/map-ISO8859-9
-lib/X11/fonts/util/map-JISX0201.1976-0
-lib/X11/fonts/util/map-KOI8-R
-lib/X11/icons/default/index.theme
-lib/X11/icons/handhelds/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-lib/X11/icons/handhelds/cursors/X_cursor
-lib/X11/icons/handhelds/cursors/arrow
-lib/X11/icons/handhelds/cursors/based_arrow_down
-lib/X11/icons/handhelds/cursors/based_arrow_up
-lib/X11/icons/handhelds/cursors/bottom_left_corner
-lib/X11/icons/handhelds/cursors/bottom_right_corner
-lib/X11/icons/handhelds/cursors/bottom_side
-lib/X11/icons/handhelds/cursors/bottom_tee
-lib/X11/icons/handhelds/cursors/center_ptr
-lib/X11/icons/handhelds/cursors/circle
-lib/X11/icons/handhelds/cursors/cross
-lib/X11/icons/handhelds/cursors/cross_reverse
-lib/X11/icons/handhelds/cursors/crosshair
-lib/X11/icons/handhelds/cursors/dot
-lib/X11/icons/handhelds/cursors/dotbox
-lib/X11/icons/handhelds/cursors/double_arrow
-lib/X11/icons/handhelds/cursors/draft_large
-lib/X11/icons/handhelds/cursors/draft_small
-lib/X11/icons/handhelds/cursors/draped_box
-lib/X11/icons/handhelds/cursors/fleur
-lib/X11/icons/handhelds/cursors/gumby
-lib/X11/icons/handhelds/cursors/hand2
-lib/X11/icons/handhelds/cursors/left_ptr
-lib/X11/icons/handhelds/cursors/left_ptr_watch
-lib/X11/icons/handhelds/cursors/left_side
-lib/X11/icons/handhelds/cursors/left_tee
-lib/X11/icons/handhelds/cursors/ll_angle
-lib/X11/icons/handhelds/cursors/pencil
-lib/X11/icons/handhelds/cursors/plus
-lib/X11/icons/handhelds/cursors/right_ptr
-lib/X11/icons/handhelds/cursors/right_side
-lib/X11/icons/handhelds/cursors/right_tee
-lib/X11/icons/handhelds/cursors/sb_h_double_arrow
-lib/X11/icons/handhelds/cursors/sb_right_arrow
-lib/X11/icons/handhelds/cursors/sb_up_arrow
-lib/X11/icons/handhelds/cursors/sb_v_double_arrow
-lib/X11/icons/handhelds/cursors/shuttle
-lib/X11/icons/handhelds/cursors/tcross
-lib/X11/icons/handhelds/cursors/top_left_arrow
-lib/X11/icons/handhelds/cursors/top_left_corner
-lib/X11/icons/handhelds/cursors/top_right_corner
-lib/X11/icons/handhelds/cursors/top_side
-lib/X11/icons/handhelds/cursors/top_tee
-lib/X11/icons/handhelds/cursors/watch
-lib/X11/icons/handhelds/cursors/xterm
-lib/X11/icons/redglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-lib/X11/icons/redglass/cursors/X_cursor
-lib/X11/icons/redglass/cursors/arrow
-lib/X11/icons/redglass/cursors/based_arrow_down
-lib/X11/icons/redglass/cursors/based_arrow_up
-lib/X11/icons/redglass/cursors/bottom_left_corner
-lib/X11/icons/redglass/cursors/bottom_right_corner
-lib/X11/icons/redglass/cursors/bottom_side
-lib/X11/icons/redglass/cursors/bottom_tee
-lib/X11/icons/redglass/cursors/center_ptr
-lib/X11/icons/redglass/cursors/circle
-lib/X11/icons/redglass/cursors/cross
-lib/X11/icons/redglass/cursors/cross_reverse
-lib/X11/icons/redglass/cursors/crosshair
-lib/X11/icons/redglass/cursors/dot
-lib/X11/icons/redglass/cursors/dotbox
-lib/X11/icons/redglass/cursors/double_arrow
-lib/X11/icons/redglass/cursors/draft_large
-lib/X11/icons/redglass/cursors/draft_small
-lib/X11/icons/redglass/cursors/draped_box
-lib/X11/icons/redglass/cursors/fleur
-lib/X11/icons/redglass/cursors/gumby
-lib/X11/icons/redglass/cursors/hand2
-lib/X11/icons/redglass/cursors/left_ptr
-lib/X11/icons/redglass/cursors/left_ptr_watch
-lib/X11/icons/redglass/cursors/left_side
-lib/X11/icons/redglass/cursors/left_tee
-lib/X11/icons/redglass/cursors/ll_angle
-lib/X11/icons/redglass/cursors/pencil
-lib/X11/icons/redglass/cursors/plus
-lib/X11/icons/redglass/cursors/right_ptr
-lib/X11/icons/redglass/cursors/right_side
-lib/X11/icons/redglass/cursors/right_tee
-lib/X11/icons/redglass/cursors/sb_h_double_arrow
-lib/X11/icons/redglass/cursors/sb_right_arrow
-lib/X11/icons/redglass/cursors/sb_up_arrow
-lib/X11/icons/redglass/cursors/sb_v_double_arrow
-lib/X11/icons/redglass/cursors/shuttle
-lib/X11/icons/redglass/cursors/tcross
-lib/X11/icons/redglass/cursors/top_left_arrow
-lib/X11/icons/redglass/cursors/top_left_corner
-lib/X11/icons/redglass/cursors/top_right_corner
-lib/X11/icons/redglass/cursors/top_side
-lib/X11/icons/redglass/cursors/top_tee
-lib/X11/icons/redglass/cursors/watch
-lib/X11/icons/redglass/cursors/xterm
-lib/X11/icons/whiteglass/cursors/08e8e1c95fe2fc01f976f1e063a24ccd
-lib/X11/icons/whiteglass/cursors/X_cursor
-lib/X11/icons/whiteglass/cursors/arrow
-lib/X11/icons/whiteglass/cursors/base_arrow_down
-lib/X11/icons/whiteglass/cursors/base_arrow_up
-lib/X11/icons/whiteglass/cursors/boat
-lib/X11/icons/whiteglass/cursors/bottom_left_corner
-lib/X11/icons/whiteglass/cursors/bottom_right_corner
-lib/X11/icons/whiteglass/cursors/bottom_side
-lib/X11/icons/whiteglass/cursors/bottom_tee
-lib/X11/icons/whiteglass/cursors/center_ptr
-lib/X11/icons/whiteglass/cursors/circle
-lib/X11/icons/whiteglass/cursors/cross
-lib/X11/icons/whiteglass/cursors/cross_reverse
-lib/X11/icons/whiteglass/cursors/crosshair
-lib/X11/icons/whiteglass/cursors/dot
-lib/X11/icons/whiteglass/cursors/dot_box_mask
-lib/X11/icons/whiteglass/cursors/double_arrow
-lib/X11/icons/whiteglass/cursors/draft_large
-lib/X11/icons/whiteglass/cursors/draft_small
-lib/X11/icons/whiteglass/cursors/draped_box
-lib/X11/icons/whiteglass/cursors/exchange
-lib/X11/icons/whiteglass/cursors/fleur
-lib/X11/icons/whiteglass/cursors/gumby
-lib/X11/icons/whiteglass/cursors/hand1
-lib/X11/icons/whiteglass/cursors/hand2
-lib/X11/icons/whiteglass/cursors/left_ptr
-lib/X11/icons/whiteglass/cursors/left_ptr_watch
-lib/X11/icons/whiteglass/cursors/left_side
-lib/X11/icons/whiteglass/cursors/left_tee
-lib/X11/icons/whiteglass/cursors/ll_angle
-lib/X11/icons/whiteglass/cursors/lr_angle
-lib/X11/icons/whiteglass/cursors/pencil
-lib/X11/icons/whiteglass/cursors/pirate
-lib/X11/icons/whiteglass/cursors/plus
-lib/X11/icons/whiteglass/cursors/question_arrow
-lib/X11/icons/whiteglass/cursors/right_ptr
-lib/X11/icons/whiteglass/cursors/right_side
-lib/X11/icons/whiteglass/cursors/right_tee
-lib/X11/icons/whiteglass/cursors/sailboat
-lib/X11/icons/whiteglass/cursors/sb_down_arrow
-lib/X11/icons/whiteglass/cursors/sb_h_double_arrow
-lib/X11/icons/whiteglass/cursors/sb_left_arrow
-lib/X11/icons/whiteglass/cursors/sb_right_arrow
-lib/X11/icons/whiteglass/cursors/sb_up_arrow
-lib/X11/icons/whiteglass/cursors/sb_v_double_arrow
-lib/X11/icons/whiteglass/cursors/shuttle
-lib/X11/icons/whiteglass/cursors/sizing
-lib/X11/icons/whiteglass/cursors/target
-lib/X11/icons/whiteglass/cursors/tcross
-lib/X11/icons/whiteglass/cursors/top_left_arrow
-lib/X11/icons/whiteglass/cursors/top_left_corner
-lib/X11/icons/whiteglass/cursors/top_right_corner
-lib/X11/icons/whiteglass/cursors/top_side
-lib/X11/icons/whiteglass/cursors/top_tee
-lib/X11/icons/whiteglass/cursors/trek
-lib/X11/icons/whiteglass/cursors/ul_angle
-lib/X11/icons/whiteglass/cursors/ur_angle
-lib/X11/icons/whiteglass/cursors/watch
-lib/X11/icons/whiteglass/cursors/xterm
-lib/X11/proxymngr/pmconfig
-lib/X11/rgb.txt
-lib/X11/rstart/commands/@List
-lib/X11/rstart/commands/ListContexts
-lib/X11/rstart/commands/ListGenericCommands
-lib/X11/rstart/commands/x
-lib/X11/rstart/commands/x11
-lib/X11/rstart/commands/x11r6/@List
-lib/X11/rstart/commands/x11r6/LoadMonitor
-lib/X11/rstart/commands/x11r6/Terminal
-lib/X11/rstart/config
-lib/X11/rstart/contexts/@List
-lib/X11/rstart/contexts/default
-lib/X11/rstart/contexts/x
-lib/X11/rstart/contexts/x11
-lib/X11/rstart/contexts/x11r6
-lib/X11/rstart/rstartd.real
-lib/X11/twm/system.twmrc
-lib/X11/x11perfcomp/fillblnk
-lib/X11/x11perfcomp/perfboth
-lib/X11/x11perfcomp/perfratio
-@unexec if cmp -s %D/lib/X11/xdm/GiveConsole.default %D/lib/X11/xdm/GiveConsole; then rm -f %D/lib/X11/xdm/GiveConsole; fi
-lib/X11/xdm/GiveConsole.default
-@unexec if cmp -s %D/lib/X11/xdm/TakeConsole.default %D/lib/X11/xdm/TakeConsole; then rm -f %D/lib/X11/xdm/TakeConsole; fi
-lib/X11/xdm/TakeConsole.default
-@unexec if cmp -s %D/lib/X11/xdm/Xaccess.default %D/lib/X11/xdm/Xaccess; then rm -f %D/lib/X11/xdm/Xaccess; fi
-lib/X11/xdm/Xaccess.default
-@unexec if cmp -s %D/lib/X11/xdm/Xresources.default %D/lib/X11/xdm/Xresources; then rm -f %D/lib/X11/xdm/Xresources; fi
-lib/X11/xdm/Xresources.default
-@unexec if cmp -s %D/lib/X11/xdm/Xservers.default %D/lib/X11/xdm/Xservers; then rm -f %D/lib/X11/xdm/Xservers; fi
-lib/X11/xdm/Xservers.default
-@unexec if cmp -s %D/lib/X11/xdm/Xsession.default %D/lib/X11/xdm/Xsession; then rm -f %D/lib/X11/xdm/Xsession; fi
-lib/X11/xdm/Xsession.default
-@unexec if cmp -s %D/lib/X11/xdm/Xsetup_0.default %D/lib/X11/xdm/Xsetup_0; then rm -f %D/lib/X11/xdm/Xsetup_0; fi
-lib/X11/xdm/Xsetup_0.default
-@unexec if cmp -s %D/lib/X11/xdm/Xwilling.default %D/lib/X11/xdm/Xwilling; then rm -f %D/lib/X11/xdm/Xwilling; fi
-lib/X11/xdm/Xwilling.default
-lib/X11/xdm/chooser
-lib/X11/xdm/pixmaps/xorg-bw.xpm
-lib/X11/xdm/pixmaps/xorg.xpm
-@unexec if cmp -s %D/lib/X11/xdm/xdm-config.default %D/lib/X11/xdm/xdm-config; then rm -f %D/lib/X11/xdm/xdm-config; fi
-lib/X11/xdm/xdm-config.default
-lib/X11/xedit/lisp/indent.lsp
-lib/X11/xedit/lisp/lisp.lsp
-lib/X11/xedit/lisp/progmodes/c.lsp
-lib/X11/xedit/lisp/progmodes/html.lsp
-lib/X11/xedit/lisp/progmodes/imake.lsp
-lib/X11/xedit/lisp/progmodes/lisp.lsp
-lib/X11/xedit/lisp/progmodes/make.lsp
-lib/X11/xedit/lisp/progmodes/man.lsp
-lib/X11/xedit/lisp/progmodes/patch.lsp
-lib/X11/xedit/lisp/progmodes/rpm.lsp
-lib/X11/xedit/lisp/progmodes/sgml.lsp
-lib/X11/xedit/lisp/progmodes/sh.lsp
-lib/X11/xedit/lisp/progmodes/xconf.lsp
-lib/X11/xedit/lisp/progmodes/xlog.lsp
-lib/X11/xedit/lisp/progmodes/xrdb.lsp
-lib/X11/xedit/lisp/syntax.lsp
-lib/X11/xedit/lisp/xedit.lsp
-@unexec if cmp -s %D/lib/X11/xinit/xinitrc.default %D/lib/X11/xinit/xinitrc; then rm -f %D/lib/X11/xinit/xinitrc; fi
-lib/X11/xinit/xinitrc.default
-lib/X11/xkb/README
-lib/X11/xkb/README.config
-lib/X11/xkb/README.enhancing
-lib/X11/xkb/compat.dir
-lib/X11/xkb/compat/README
-lib/X11/xkb/compat/accessx
-lib/X11/xkb/compat/basic
-lib/X11/xkb/compat/complete
-lib/X11/xkb/compat/default
-lib/X11/xkb/compat/iso9995
-lib/X11/xkb/compat/japan
-lib/X11/xkb/compat/keypad
-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
-lib/X11/xkb/compat/pc
-lib/X11/xkb/compat/pc98
-lib/X11/xkb/compat/xfree86
-lib/X11/xkb/compat/xtest
-lib/X11/xkb/compiled/README
-lib/X11/xkb/geometry.dir
-lib/X11/xkb/geometry/README
-lib/X11/xkb/geometry/amiga
-lib/X11/xkb/geometry/ataritt
-lib/X11/xkb/geometry/chicony
-lib/X11/xkb/geometry/dell
-lib/X11/xkb/geometry/digital/lk
-lib/X11/xkb/geometry/digital/pc
-lib/X11/xkb/geometry/digital/unix
-lib/X11/xkb/geometry/everex
-lib/X11/xkb/geometry/fujitsu
-lib/X11/xkb/geometry/hp
-lib/X11/xkb/geometry/ibm/thinkpad
-lib/X11/xkb/geometry/keytronic
-lib/X11/xkb/geometry/kinesis
-lib/X11/xkb/geometry/macintosh
-lib/X11/xkb/geometry/microsoft
-lib/X11/xkb/geometry/nec
-lib/X11/xkb/geometry/northgate
-lib/X11/xkb/geometry/pc
-lib/X11/xkb/geometry/sgi/O2
-lib/X11/xkb/geometry/sgi/indigo
-lib/X11/xkb/geometry/sgi/indy
-lib/X11/xkb/geometry/sony
-lib/X11/xkb/geometry/sun
-lib/X11/xkb/geometry/winbook
-lib/X11/xkb/keycodes.dir
-lib/X11/xkb/keycodes/README
-lib/X11/xkb/keycodes/aliases
-lib/X11/xkb/keycodes/amiga
-lib/X11/xkb/keycodes/ataritt
-lib/X11/xkb/keycodes/digital/lk
-lib/X11/xkb/keycodes/digital/pc
-lib/X11/xkb/keycodes/fujitsu
-lib/X11/xkb/keycodes/hp
-lib/X11/xkb/keycodes/ibm
-lib/X11/xkb/keycodes/macintosh
-lib/X11/xkb/keycodes/powerpcps2
-lib/X11/xkb/keycodes/sgi/indigo
-lib/X11/xkb/keycodes/sgi/indy
-lib/X11/xkb/keycodes/sgi/iris
-lib/X11/xkb/keycodes/sony
-lib/X11/xkb/keycodes/sun
-lib/X11/xkb/keycodes/xfree86
-lib/X11/xkb/keycodes/xfree98
-lib/X11/xkb/keymap.dir
-lib/X11/xkb/keymap/README
-lib/X11/xkb/keymap/amiga
-lib/X11/xkb/keymap/ataritt
-lib/X11/xkb/keymap/digital/us
-lib/X11/xkb/keymap/macintosh
-lib/X11/xkb/keymap/sgi/be
-lib/X11/xkb/keymap/sgi/bg
-lib/X11/xkb/keymap/sgi/ca
-lib/X11/xkb/keymap/sgi/cz
-lib/X11/xkb/keymap/sgi/cz_qwerty
-lib/X11/xkb/keymap/sgi/de
-lib/X11/xkb/keymap/sgi/de_CH
-lib/X11/xkb/keymap/sgi/dk
-lib/X11/xkb/keymap/sgi/dvorak
-lib/X11/xkb/keymap/sgi/en_US
-lib/X11/xkb/keymap/sgi/es
-lib/X11/xkb/keymap/sgi/fi
-lib/X11/xkb/keymap/sgi/fr
-lib/X11/xkb/keymap/sgi/fr_CH
-lib/X11/xkb/keymap/sgi/gb
-lib/X11/xkb/keymap/sgi/hu
-lib/X11/xkb/keymap/sgi/it
-lib/X11/xkb/keymap/sgi/jp
-lib/X11/xkb/keymap/sgi/no
-lib/X11/xkb/keymap/sgi/pl
-lib/X11/xkb/keymap/sgi/pt
-lib/X11/xkb/keymap/sgi/ru
-lib/X11/xkb/keymap/sgi/se
-lib/X11/xkb/keymap/sgi/sk
-lib/X11/xkb/keymap/sgi/sk_qwerty
-lib/X11/xkb/keymap/sgi/th
-lib/X11/xkb/keymap/sgi/us
-lib/X11/xkb/keymap/sony
-lib/X11/xkb/keymap/sun/de
-lib/X11/xkb/keymap/sun/es
-lib/X11/xkb/keymap/sun/fi
-lib/X11/xkb/keymap/sun/fr
-lib/X11/xkb/keymap/sun/no
-lib/X11/xkb/keymap/sun/pl
-lib/X11/xkb/keymap/sun/ru
-lib/X11/xkb/keymap/sun/se
-lib/X11/xkb/keymap/sun/uk
-lib/X11/xkb/keymap/sun/us
-lib/X11/xkb/keymap/xfree86
-lib/X11/xkb/keymap/xfree98
-lib/X11/xkb/rules/README
-lib/X11/xkb/rules/sgi
-lib/X11/xkb/rules/sgi.lst
-lib/X11/xkb/rules/sun
-lib/X11/xkb/rules/sun.lst
-lib/X11/xkb/rules/xfree86
-lib/X11/xkb/rules/xfree86-it.lst
-lib/X11/xkb/rules/xfree86.lst
-lib/X11/xkb/rules/xfree86.xml
-lib/X11/xkb/rules/xorg
-lib/X11/xkb/rules/xorg-it.lst
-lib/X11/xkb/rules/xorg.lst
-lib/X11/xkb/rules/xorg.xml
-lib/X11/xkb/semantics/basic
-lib/X11/xkb/semantics/complete
-lib/X11/xkb/semantics/default
-lib/X11/xkb/semantics/xtest
-lib/X11/xkb/symbols.dir
-lib/X11/xkb/symbols/README
-lib/X11/xkb/symbols/al
-lib/X11/xkb/symbols/altwin
-lib/X11/xkb/symbols/am
-lib/X11/xkb/symbols/apple
-lib/X11/xkb/symbols/ar
-lib/X11/xkb/symbols/az
-lib/X11/xkb/symbols/be
-lib/X11/xkb/symbols/ben
-lib/X11/xkb/symbols/bg
-lib/X11/xkb/symbols/br
-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
-lib/X11/xkb/symbols/cz_qwerty
-lib/X11/xkb/symbols/czsk
-lib/X11/xkb/symbols/de
-lib/X11/xkb/symbols/de_CH
-lib/X11/xkb/symbols/dev
-lib/X11/xkb/symbols/digital/lk
-lib/X11/xkb/symbols/digital/pc
-lib/X11/xkb/symbols/digital/us
-lib/X11/xkb/symbols/digital/vt
-lib/X11/xkb/symbols/dk
-lib/X11/xkb/symbols/dvorak
-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
-lib/X11/xkb/symbols/fr_CH
-lib/X11/xkb/symbols/fujitsu/jp
-lib/X11/xkb/symbols/fujitsu/us
-lib/X11/xkb/symbols/gb
-lib/X11/xkb/symbols/ge_la
-lib/X11/xkb/symbols/ge_ru
-lib/X11/xkb/symbols/group
-lib/X11/xkb/symbols/guj
-lib/X11/xkb/symbols/gur
-lib/X11/xkb/symbols/hp/us
-lib/X11/xkb/symbols/hr
-lib/X11/xkb/symbols/hr_US
-lib/X11/xkb/symbols/hu
-lib/X11/xkb/symbols/hu_US
-lib/X11/xkb/symbols/hu_qwerty
-lib/X11/xkb/symbols/ie
-lib/X11/xkb/symbols/il
-lib/X11/xkb/symbols/il_phonetic
-lib/X11/xkb/symbols/inet
-lib/X11/xkb/symbols/ir
-lib/X11/xkb/symbols/is
-lib/X11/xkb/symbols/iso9995-3
-lib/X11/xkb/symbols/it
-lib/X11/xkb/symbols/iu
-lib/X11/xkb/symbols/jp
-lib/X11/xkb/symbols/kan
-lib/X11/xkb/symbols/keypad
-lib/X11/xkb/symbols/la
-lib/X11/xkb/symbols/level3
-lib/X11/xkb/symbols/lo
-lib/X11/xkb/symbols/lock
-lib/X11/xkb/symbols/lt
-lib/X11/xkb/symbols/lt_std
-lib/X11/xkb/symbols/lv
-lib/X11/xkb/symbols/macintosh/de
-lib/X11/xkb/symbols/macintosh/de_CH
-lib/X11/xkb/symbols/macintosh/dk
-lib/X11/xkb/symbols/macintosh/es
-lib/X11/xkb/symbols/macintosh/fi
-lib/X11/xkb/symbols/macintosh/fr
-lib/X11/xkb/symbols/macintosh/fr_CH
-lib/X11/xkb/symbols/macintosh/gb
-lib/X11/xkb/symbols/macintosh/it
-lib/X11/xkb/symbols/macintosh/nl
-lib/X11/xkb/symbols/macintosh/no
-lib/X11/xkb/symbols/macintosh/pt
-lib/X11/xkb/symbols/macintosh/se
-lib/X11/xkb/symbols/macintosh/us
-lib/X11/xkb/symbols/mk
-lib/X11/xkb/symbols/ml
-lib/X11/xkb/symbols/mm
-lib/X11/xkb/symbols/mt
-lib/X11/xkb/symbols/mt_us
-lib/X11/xkb/symbols/nec/jp
-lib/X11/xkb/symbols/nl
-lib/X11/xkb/symbols/no
-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/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/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/de
-lib/X11/xkb/symbols/pc/dk
-lib/X11/xkb/symbols/pc/ee
-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/gb
-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/in
-lib/X11/xkb/symbols/pc/ir
-lib/X11/xkb/symbols/pc/is
-lib/X11/xkb/symbols/pc/it
-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/lk
-lib/X11/xkb/symbols/pc/lt
-lib/X11/xkb/symbols/pc/lv
-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/nl
-lib/X11/xkb/symbols/pc/no
-lib/X11/xkb/symbols/pc/pc
-lib/X11/xkb/symbols/pc/pk
-lib/X11/xkb/symbols/pc/pl
-lib/X11/xkb/symbols/pc/pt
-lib/X11/xkb/symbols/pc/ro
-lib/X11/xkb/symbols/pc/ru
-lib/X11/xkb/symbols/pc/se
-lib/X11/xkb/symbols/pc/si
-lib/X11/xkb/symbols/pc/sk
-lib/X11/xkb/symbols/pc/srp
-lib/X11/xkb/symbols/pc/sy
-lib/X11/xkb/symbols/pc/th
-lib/X11/xkb/symbols/pc/tj
-lib/X11/xkb/symbols/pc/tr
-lib/X11/xkb/symbols/pc/ua
-lib/X11/xkb/symbols/pc/us
-lib/X11/xkb/symbols/pc/uz
-lib/X11/xkb/symbols/pc/vn
-lib/X11/xkb/symbols/pc104
-lib/X11/xkb/symbols/pl
-lib/X11/xkb/symbols/pl2
-lib/X11/xkb/symbols/pt
-lib/X11/xkb/symbols/ralt
-lib/X11/xkb/symbols/ro
-lib/X11/xkb/symbols/ro2
-lib/X11/xkb/symbols/ru
-lib/X11/xkb/symbols/sapmi
-lib/X11/xkb/symbols/se
-lib/X11/xkb/symbols/se_FI
-lib/X11/xkb/symbols/se_NO
-lib/X11/xkb/symbols/se_SE
-lib/X11/xkb/symbols/sgi/jp
-lib/X11/xkb/symbols/si
-lib/X11/xkb/symbols/sk
-lib/X11/xkb/symbols/sk_qwerty
-lib/X11/xkb/symbols/sony/us
-lib/X11/xkb/symbols/sr
-lib/X11/xkb/symbols/srvr_ctrl
-lib/X11/xkb/symbols/sun/se
-lib/X11/xkb/symbols/sun/us
-lib/X11/xkb/symbols/sun/usb
-lib/X11/xkb/symbols/syr
-lib/X11/xkb/symbols/syr_phonetic
-lib/X11/xkb/symbols/tel
-lib/X11/xkb/symbols/th
-lib/X11/xkb/symbols/th_pat
-lib/X11/xkb/symbols/th_tis
-lib/X11/xkb/symbols/tj
-lib/X11/xkb/symbols/tml
-lib/X11/xkb/symbols/tr
-lib/X11/xkb/symbols/tr_f
-lib/X11/xkb/symbols/ua
-lib/X11/xkb/symbols/us
-lib/X11/xkb/symbols/us_group2
-lib/X11/xkb/symbols/us_group3
-lib/X11/xkb/symbols/us_intl
-lib/X11/xkb/symbols/uz
-lib/X11/xkb/symbols/vn
-lib/X11/xkb/symbols/xfree68/amiga
-lib/X11/xkb/symbols/xfree68/ataritt
-lib/X11/xkb/symbols/yu
-lib/X11/xkb/types.dir
-lib/X11/xkb/types/README
-lib/X11/xkb/types/basic
-lib/X11/xkb/types/caps
-lib/X11/xkb/types/complete
-lib/X11/xkb/types/default
-lib/X11/xkb/types/extra
-lib/X11/xkb/types/iso9995
-lib/X11/xkb/types/mousekeys
-lib/X11/xkb/types/numpad
-lib/X11/xkb/types/pc
-lib/X11/xkb/xkbcomp
-lib/X11/xman.help
-lib/X11/xsm/system.xsm
-
-@comment xterm workaround
-
-@exec if [ ! -e %D/bin/resize ]; then ln -sf %D/bin/resize-static %D/bin/resize; fi
-@exec if [ ! -e %D/bin/uxterm ]; then ln -sf %D/bin/uxterm-static %D/bin/uxterm; fi
-@exec if [ ! -e %D/bin/xterm ]; then ln -sf %D/bin/xterm-static %D/bin/xterm; fi
-@exec if [ ! -e %D/lib/X11/app-defaults/UXTerm ]; then ln -sf %D/lib/X11/app-defaults/UXTerm-static %D/lib/X11/app-defaults/UXTerm; fi
-@exec if [ ! -e %D/lib/X11/app-defaults/XTerm-color ]; then ln -sf %D/lib/X11/app-defaults/XTerm-color-static %D/lib/X11/app-defaults/XTerm-color; fi
-@exec if [ ! -e %D/lib/X11/app-defaults/XTerm ]; then ln -s %D/lib/X11/app-defaults/XTerm-static %D/lib/X11/app-defaults/XTerm; fi
-@unexec if [ -L %D/bin/resize ]; then rm %D/bin/resize; fi
-@unexec if [ -L %D/bin/uxterm ]; then rm %D/bin/uxterm; fi
-@unexec if [ -L %D/bin/xterm ]; then rm %D/bin/xterm; fi
-@unexec if [ -L %D/lib/X11/app-defaults/UXTerm ]; then rm %D/lib/X11/app-defaults/UXTerm; fi
-@unexec if [ -L %D/lib/X11/app-defaults/XTerm-color ]; then rm %D/lib/X11/app-defaults/XTerm-color; fi
-@unexec if [ -L %D/lib/X11/app-defaults/XTerm ]; then rm %D/lib/X11/app-defaults/XTerm; fi
-
-@dirrm include/X11/PM
-@dirrm lib/X11/proxymngr
-@dirrm lib/X11/rstart/commands/x11r6
-@dirrm lib/X11/rstart/commands
-@dirrm lib/X11/rstart/contexts
-@dirrm lib/X11/rstart
-@dirrm lib/X11/twm
-@dirrm lib/X11/x11perfcomp
-@dirrm lib/X11/xdm/pixmaps
-@dirrm lib/X11/xdm
-@dirrm lib/X11/xedit/lisp/progmodes
-@dirrm lib/X11/xedit/lisp
-@dirrm lib/X11/xedit
-@dirrm lib/X11/xkb/compat
-@dirrm lib/X11/xkb/geometry/digital
-@dirrm lib/X11/xkb/geometry/ibm
-@dirrm lib/X11/xkb/geometry/sgi
-@dirrm lib/X11/xkb/geometry
-@dirrm lib/X11/xkb/keycodes/digital
-@dirrm lib/X11/xkb/keycodes/sgi
-@dirrm lib/X11/xkb/keycodes
-@dirrm lib/X11/xkb/keymap/digital
-@dirrm lib/X11/xkb/keymap/sgi
-@dirrm lib/X11/xkb/keymap/sun
-@dirrm lib/X11/xkb/keymap
-@dirrm lib/X11/xkb/semantics
-@dirrm lib/X11/xkb/symbols/hp
-@dirrm lib/X11/xkb/symbols/digital
-@dirrm lib/X11/xkb/symbols/fujitsu
-@dirrm lib/X11/xkb/symbols/macintosh
-@dirrm lib/X11/xkb/symbols/nec
-@dirrm lib/X11/xkb/symbols/sgi
-@dirrm lib/X11/xkb/symbols/sony
-@dirrm lib/X11/xkb/symbols/sun
-@dirrm lib/X11/xkb/symbols/xfree68
-@dirrm lib/X11/xkb/symbols/pc
-@dirrm lib/X11/xkb/symbols
-@dirrm lib/X11/xkb/types
-@dirrm lib/X11/xkb/compiled
-@dirrm lib/X11/xkb/rules
-@dirrm lib/X11/xkb
-@dirrm lib/X11/xsm
-@dirrm lib/X11/icons/default
-@dirrm lib/X11/icons/redglass/cursors
-@dirrm lib/X11/icons/redglass
-@dirrm lib/X11/icons/whiteglass/cursors
-@dirrm lib/X11/icons/whiteglass
-@dirrm lib/X11/icons/handhelds/cursors
-@dirrm lib/X11/icons/handhelds
-@dirrm lib/X11/icons
-@dirrm lib/X11/xinit
-@unexec rm %D/lib/X11/fonts/util/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache -v %D/lib/X11/fonts/util 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/util/fonts.cache-1 -a ! -s %D/lib/X11/fonts/util/fonts.cache-1 ]; then rm %D/lib/X11/fonts/util/fonts.cache-1; fi
-@dirrm lib/X11/fonts/util
diff --git a/x11/xorg-clients/scripts/configure b/x11/xorg-clients/scripts/configure
deleted file mode 100644
index 5b2332cff3fb..000000000000
--- a/x11/xorg-clients/scripts/configure
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define BuildServer NO"			>> $LOCALDEF
-echo "#define BuildLBX NO"			>> $LOCALDEF
-echo "#define BuildXterm NO"			>> $LOCALDEF
-echo "#define BuildFontServer NO"			>> $LOCALDEF
-echo "#define BuildPlugin NO"			>> $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledLibraries YES"	>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen