5 files changed, 376 insertions, 139 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 93e70776faa1..bf8844ac493d 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -6,24 +6,22 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.2.1
-PORTREVISION=	3
+PORTVERSION=	4.3.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.2.0
+MASTER_SITE_SUBDIR=	4.3.0
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X420src-1.tgz X420src-2.tgz
-EXTRACT_ONLY=	X420src-1.tgz
-
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
-PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
+DISTFILES=	X430src-1.tgz \
+		X430src-2.tgz \
+		X430src-3.tgz \
+		X430src-4.tgz
 
 MAINTAINER=	anholt@freebsd.org
-COMMENT=	XFree86-4 Client environments
+COMMENT=	XFree86-4 client programs and related files
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		GLU.1:${PORTSDIR}/x11/XFree86-4-libraries \
+		Xcursor.1:${PORTSDIR}/x11/XFree86-4-libraries \
+		png.5:${PORTSDIR}/graphics/png \
 		Xft.2:${PORTSDIR}/x11-fonts/Xft
 
 XFREE86_VERSION=	4
@@ -34,8 +32,6 @@ PATCHDIR=		${.CURDIR}/../XFree86-4-libraries/files
 SCRIPTS_ENV=		InstallXdmConfig=${InstallXdmConfig} \
 			InstallXinitConfig=${InstallXinitConfig} \
 			InstallAppDefFiles=${InstallAppDefFiles} \
-			HasSecureRPC=${HasSecureRPC} \
-			HasPam=${HasPam} \
 			CC="${CC}" \
 			CXX="${CXX}" \
 			CFLAGS="${CFLAGS}"
@@ -61,20 +57,6 @@ XINSTALL_MAN_DIRS=	programs
 InstallXdmConfig?=	DEFAULT
 InstallXinitConfig?=	DEFAULT
 InstallAppDefFiles?=	DEFAULT
-HasSecureRPC?=		DEFAULT
-HasPam?=		DEFAULT
-
-post-extract:
-	( cd ${WRKDIR} && \
-	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	   ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \
-	    | ${TAR} -xf - xc/fonts/util )
-
-post-patch:
-	cd ${WRKSRC}/nls; \
-	for i in Compose XI18N_OBJS XLC_LOCALE; do \
-		${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \
-	done
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index 82d6aafcf277..ce75fce221f3 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,3 +1,4 @@
-MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
-MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
-MD5 (xc/4.2.0-4.2.1-1-freebsd.patch.gz) = 1d4c49d7f354b307b7961e6d8e6c4274
+MD5 (xc/X430src-1.tgz) = 4f241a4f867363f40efa2b00dca292af
+MD5 (xc/X430src-2.tgz) = 844c2ee908d21dbf8911fd13115bf8b4
+MD5 (xc/X430src-3.tgz) = b82a0443e1b7bf860e4343e6b6766cb6
+MD5 (xc/X430src-4.tgz) = 567903747018f2534965ab6cb3976b38
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
index c7b83b350efe..11b2398fbffc 100644
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@@ -22,6 +22,7 @@ MAN1=	Xmark.1 \
 	makepsres.1 \
 	mkcfm.1 \
 	mkfontdir.1 \
+	mkfontscale.1 \
 	oclock.1 \
 	proxymngr.1 \
 	resize.1 \
@@ -46,6 +47,7 @@ MAN1=	Xmark.1 \
 	xclock.1 \
 	xcmsdb.1 \
 	xconsole.1 \
+	xcursorgen.1 \
 	xcutsel.1 \
 	xditview.1 \
 	xdm.1 \
@@ -61,7 +63,6 @@ MAN1=	Xmark.1 \
 	xgamma.1 \
 	xgc.1 \
 	xhost.1 \
-	xieperf.1 \
 	xinit.1 \
 	xkbcomp.1 \
 	xkbevd.1 \
@@ -79,6 +80,7 @@ MAN1=	Xmark.1 \
 	xmodmap.1 \
 	xon.1 \
 	xprop.1 \
+	xrandr.1 \
 	xrdb.1 \
 	xrefresh.1 \
 	xset.1 \
@@ -88,12 +90,6 @@ MAN1=	Xmark.1 \
 	xsm.1 \
 	xstdcmap.1 \
 	xterm.1 \
-	xvidtune.1 \
-	xvinfo.1 \
-	xwd.1 \
-	xwininfo.1 \
-	xwud.1 \
-	xrandr.1 \
 	xtrap.1 \
 	xtrapchar.1 \
 	xtrapin.1 \
@@ -101,4 +97,9 @@ MAN1=	Xmark.1 \
 	xtrapout.1 \
 	xtrapproto.1 \
 	xtrapreset.1 \
-	xtrapstats.1
+	xtrapstats.1 \
+	xvidtune.1 \
+	xvinfo.1 \
+	xwd.1 \
+	xwininfo.1 \
+	xwud.1
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 70ce68def1dd..7c9a0cd68c2e 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -2,7 +2,7 @@ bin/Xmark
 bin/appres
 bin/atobm
 bin/bdftopcf
-bin/bdftruncate.pl
+bin/bdftruncate
 bin/beforelight
 bin/bitmap
 bin/bmtoa
@@ -23,6 +23,7 @@ bin/luit
 bin/makepsres
 bin/mkcfm
 bin/mkfontdir
+bin/mkfontscale
 bin/oclock
 bin/proxymngr
 bin/resize
@@ -37,7 +38,7 @@ bin/startx
 bin/sxpm
 bin/texteroids
 bin/twm
-bin/ucs2any.pl
+bin/ucs2any
 bin/uxterm
 bin/viewres
 bin/x11perf
@@ -49,6 +50,7 @@ bin/xclipboard
 bin/xclock
 bin/xcmsdb
 bin/xconsole
+bin/xcursorgen
 bin/xcutsel
 bin/xditview
 bin/xdm
@@ -64,7 +66,6 @@ bin/xfwp
 bin/xgamma
 bin/xgc
 bin/xhost
-bin/xieperf
 bin/xinit
 bin/xkbbell
 bin/xkbcomp
@@ -154,11 +155,18 @@ 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/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
 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
@@ -166,18 +174,169 @@ 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-ISO8859-10
-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-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/lbxproxy/AtomControl
 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
@@ -204,9 +363,28 @@ lib/X11/xdm/chooser
 lib/X11/xdm/pixmaps/XFree86.xpm
 lib/X11/xdm/pixmaps/XFree86bw.xpm
 lib/X11/xdm/xdm-config
-lib/X11/xedit/lisp/fun.lsp
+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/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
 lib/X11/xinit/xinitrc
+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
@@ -221,9 +399,11 @@ 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/dell
@@ -247,6 +427,8 @@ 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
@@ -264,6 +446,7 @@ 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
@@ -308,6 +491,7 @@ 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
@@ -315,24 +499,34 @@ 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/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/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/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
@@ -349,19 +543,31 @@ 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/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
@@ -381,74 +587,135 @@ 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/ar
+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/by
+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/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/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/hr
+lib/X11/xkb/symbols/pc/ie
+lib/X11/xkb/symbols/pc/il
+lib/X11/xkb/symbols/pc/il_phonetic
+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/la
+lib/X11/xkb/symbols/pc/latin
+lib/X11/xkb/symbols/pc/lo
+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/mm
+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/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/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/th
+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/yu
 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/ru
+lib/X11/xkb/symbols/ru_yawerty
+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/syr
+lib/X11/xkb/symbols/syr_phonetic
+lib/X11/xkb/symbols/tel
 lib/X11/xkb/symbols/th
+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/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/cancel
+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/nocancel
 lib/X11/xkb/types/pc
 lib/X11/xkb/xkbcomp
 lib/X11/xman.help
 lib/X11/xsm/system.xsm
-@unexec rm -f %D/lib/X11/rstart/commands/x
-@unexec rm -f %D/lib/X11/rstart/commands/x11
-lib/X11/xkb/symbols/al
-lib/X11/xkb/symbols/altwin
-lib/X11/xkb/symbols/ar
-lib/X11/xkb/symbols/ben
-lib/X11/xkb/symbols/compose
-lib/X11/xkb/symbols/czsk
-lib/X11/xkb/symbols/dev
-lib/X11/xkb/symbols/ge_la
-lib/X11/xkb/symbols/ge_ru
-lib/X11/xkb/symbols/guj
-lib/X11/xkb/symbols/gur
-lib/X11/xkb/symbols/ir
-lib/X11/xkb/symbols/iu
-lib/X11/xkb/symbols/la
-lib/X11/xkb/symbols/level3
-lib/X11/xkb/symbols/mm
-lib/X11/xkb/symbols/mt
-lib/X11/xkb/symbols/mt_us
-lib/X11/xkb/symbols/nl
-lib/X11/xkb/symbols/pl2
-lib/X11/xkb/symbols/ru_yawerty
-lib/X11/xkb/symbols/sapmi
-lib/X11/xkb/symbols/se_FI
-lib/X11/xkb/symbols/se_NO
-lib/X11/xkb/symbols/se_SE
-lib/X11/xkb/symbols/tj
-lib/X11/xkb/symbols/tml
-lib/X11/xkb/symbols/tr_f
-lib/X11/xkb/symbols/us_group2
-lib/X11/xkb/symbols/yu
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 23b4aeb368b7..6c959040d2ba 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -1,14 +1,11 @@
 #!/bin/sh
 
 # This script does the following:
-# (1) cp current xf86site.def (it is created by the imake-4 port) 
+# (1) cp xf86site.def, installed by imake-4 port,
 #       to ${WRKDIR}/xc/config/cf.
-#     this means this port uses imake-4's config for defaults.
-# (2) Generate temporal config for compiling.
-#     Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-#     used locally for compiling this port, so these configs will be generated
-#     by this script. These configs will be stored to the `host.def' file,
-#     but this host.def will never be installed.
+#     this provides settings for the ports system.
+# (2) Create a host.def for this specific port, using 
+#     host.def as a base.
 
 ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
 DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -16,38 +13,28 @@ ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
 LOCALDEF=$WRKDIR/.config
 HOSTDEF=$WRKDIR/xc/config/cf/host.def
 
-configure () {
-    # Use original host.def as initial config file
-    rm -f $LOCALDEF
-    grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF
-    echo "#define ProjectRoot $PREFIX" >> $LOCALDEF
+# Use original host.def as initial config file
+rm -f $LOCALDEF
+grep -v '#define.*ProjectRoot' $ORIGHOSTDEF	>> $LOCALDEF
+echo "#define ProjectRoot $PREFIX"		>> $LOCALDEF
 
-    # It's good for FreeBSD ports/packages system.
-    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
-    echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+# This is also defined in xf86site.def, but doesn't get
+# picked up for some reason.
+echo "#define NothingOutsideProjectRoot YES"	>> $LOCALDEF
 
-    # User Config.
-    if [ X$HasSecureRPC != XDEFAULT -a X$HasSecureRPC != X ]; then
-	echo "#define HasSecureRPC $HasSecureRPC" >> $LOCALDEF
-    fi
-    if [ X$HasPam != XDEFAULT -a X$HasPam != X ]; then
-	echo "#define HasPam $HasPam" >> $LOCALDEF
-    fi
-    if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
-	echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
-    fi
-    if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
-	echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
-    fi
-    if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
-	echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
-    fi
-    if [ ! -d /sys -a ! -d /usr/src/sys ]; then
-        echo "#define BuildXF86DRI NO" >> $LOCALDEF
-    fi
+# User Config.
+if [ X$InstallXdmConfig != XDEFAULT -a X$InstallXdmConfig != X ]; then
+echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF
+fi
+if [ X$InstallXinitConfig != XDEFAULT -a X$InstallXinitConfig != X ]; then
+echo "#define InstallXinitConfig $InstallXinitConfig" >> $LOCALDEF
+fi
+if [ X$InstallAppDefFiles != XDEFAULT -a X$InstallAppDefFiles != X ]; then
+echo "#define InstallAppDefFiles $InstallAppDefFiles" >> $LOCALDEF
+fi
 
-    # disable some configs: there are not used this ports
-    for i in \
+# disable some options
+for i in \
 	InstallFSConfig \
 	BuildServer \
 	BuildFontServer \
@@ -59,34 +46,33 @@ configure () {
 	BuildCIDFonts \
 	BuildCyrillicFonts \
 	BuildLatin2Fonts \
+	BuildPlugin \
 	LibHeaders \
-        LibInstall \
+	LibInstall \
 	ForceNormalLib \
 	ModInstall \
 	XTrueTypeInstallCConvHeaders
-    do \
-	echo "#define $i NO" >> $LOCALDEF
-    done
-    echo "#define LibInstallBuild  YES" >> $LOCALDEF
-    echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
-    echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
-    echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF
-    echo "#define DontUseLibPathVar YES" >> $LOCALDEF
-    echo "#define PreloadSetup" >> $LOCALDEF
-    echo "#define BuildPlugin NO" >> $LOCALDEF
-    echo "#define UseInstalledPrograms YES" >> $LOCALDEF
-    echo "#define FreeBSDCC	${CC}" >> $LOCALDEF
-    echo "#define FreeBSDCXX	${CXX}" >> $LOCALDEF
-    echo "#define FreeBSDCFLAGS	${CFLAGS}" >> $LOCALDEF
+do \
+	echo "#define $i NO"			>> $LOCALDEF
+done
 
-    # Copy ORIGDEF to DESTDEF
-    rm -f $DESTDEF
-    cp -f $ORIGDEF $DESTDEF
+echo "#define FreeBSDCC	${CC}"			>> $LOCALDEF
+echo "#define FreeBSDCXX ${CXX}"		>> $LOCALDEF
+echo "#define FreeBSDCFLAGS ${CFLAGS}"		>> $LOCALDEF
 
-    # copy generated config to host.def
-    cp -f $LOCALDEF $HOSTDEF
-}
+echo "#define LibInstallBuild  YES"		>> $LOCALDEF
+echo "#define FreeBSDBuildXlib NO"		>> $LOCALDEF
+echo "#define FreeBSDBuildXbin YES"		>> $LOCALDEF
+echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF
+echo "#define DontUseLibPathVar YES"		>> $LOCALDEF
+echo "#define PreloadSetup"			>> $LOCALDEF
+echo "#define UseInstalledPrograms YES"		>> $LOCALDEF
+
+# Copy ORIGDEF to DESTDEF
+rm -f $DESTDEF
+cp -f $ORIGDEF $DESTDEF
+
+# copy generated config to host.def
+cp -f $LOCALDEF $HOSTDEF
 
-cp ${X11BASE}/lib/X11/config/version.def ${WRKSRC}/config/cf
-configure
 exit 0