XFree86 4.2.0 Stage 2: XFree86-4-* miniport upgrades

	[1] Upgrade to 4.2.0.
	[2] Allow Wraphelp.c to be fetched by default, set HasXdmAuth=YES
	    by default.

Submitted by:	[1] sf, taguchi@tohoku.iij.ad.jp
Approved by:	[2] core

4 files changed, 74 insertions, 31 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 2e383a28cbb7..74d0586803fb 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -6,14 +6,18 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.1.0
-PORTREVISION=	2
+PORTVERSION=	4.2.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_XFREE}
-MASTER_SITE_SUBDIR=	4.1.0
+MASTER_SITES=	${MASTER_SITE_XFREE} \
+		ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
+		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
+MASTER_SITE_SUBDIR=	${PORTVERSION}
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X410src-1.tgz X410src-2.tgz
-EXTRACT_ONLY=	X410src-1.tgz
+DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz \
+		X${PORTVERSION:S/.//g}src-2.tgz Wraphelp.c:wrap
+EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES=	Wraphelp.c
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -50,30 +54,23 @@ INSTALL_TARGET=		FreeBSDPortsInstall FreeBSDPortsInstall.man
 InstallXdmConfig?=	DEFAULT
 InstallXinitConfig?=	DEFAULT
 InstallAppDefFiles?=	DEFAULT
-HasXdmAuth?=		DEFAULT
+HasXdmAuth?=		YES
 HasSecureRPC?=		DEFAULT
 HasPam?=		DEFAULT
 
-.if ${HasXdmAuth} == DEFAULT || ${HasXdmAuth} == YES
-.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
-pre-everything::
-	@${ECHO_MSG} "Assuming that you have fetched a USA-Legal Wraphelp.c."
-.else
-MASTER_SITES+=	ftp://psych.psy.uq.oz.au/pub/X11R5/ \
-		ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \
-		ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/
-EXTRACT_ONLY=	X410src-1.tgz
-DISTFILES+=	Wraphelp.c
-IGNOREFILES=	Wraphelp.c
-.endif	# USA_RESIDENT
-.endif	# HasXdmAuth
-
 post-extract:
 	( cd ${WRKDIR} && \
 	 ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
-	   ${DISTDIR}/${DIST_SUBDIR}/X410src-2.tgz \
+	   ${DISTDIR}/${DIST_SUBDIR}/X${PORTVERSION:S/.//g}src-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
+
+
 do-configure:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index 7207b321c4db..dadf02f3653f 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1,3 +1,3 @@
-MD5 (xc/X410src-1.tgz) = 2d4709f7106a1d65c175be445a3d3c32
-MD5 (xc/X410src-2.tgz) = beaffed1cbdb700e5fed6a5490a7f222
+MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/X420src-2.tgz) = dae33268a9f2735b9678a81fb23e8d3e
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11/XFree86-4-clients/files/manpages b/x11/XFree86-4-clients/files/manpages
index 9074e770806c..a8229eff870e 100644
--- a/x11/XFree86-4-clients/files/manpages
+++ b/x11/XFree86-4-clients/files/manpages
@@ -18,6 +18,7 @@ MAN1=	Xmark.1 \
 	ico.1 \
 	lbxproxy.1 \
 	listres.1 \
+	luit.1 \
 	makepsres.1 \
 	mkcfm.1 \
 	mkfontdir.1 \
@@ -52,7 +53,6 @@ MAN1=	Xmark.1 \
 	xedit.1 \
 	xev.1 \
 	xeyes.1 \
-	xf86cfg.1 \
 	xfd.1 \
 	xfindproxy.1 \
 	xfontsel.1 \
@@ -93,4 +93,13 @@ MAN1=	Xmark.1 \
 	xvinfo.1 \
 	xwd.1 \
 	xwininfo.1 \
-	xwud.1
+	xwud.1 \
+	xrandr.1 \
+	xtrap.1 \
+	xtrapchar.1 \
+	xtrapin.1 \
+	xtrapinfo.1 \
+	xtrapout.1 \
+	xtrapproto.1 \
+	xtrapreset.1 \
+	xtrapstats.1
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index 949019aaa5c9..6b7b9781e75a 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -19,6 +19,7 @@ bin/iceauth
 bin/ico
 bin/lbxproxy
 bin/listres
+bin/luit
 bin/makepsres
 bin/mkcfm
 bin/mkfontdir
@@ -37,6 +38,7 @@ bin/sxpm
 bin/texteroids
 bin/twm
 bin/ucs2any.pl
+bin/uxterm
 bin/viewres
 bin/x11perf
 bin/x11perfcomp
@@ -54,7 +56,6 @@ bin/xdpyinfo
 bin/xedit
 bin/xev
 bin/xeyes
-bin/xf86cfg
 bin/xfd
 bin/xfindproxy
 bin/xfontsel
@@ -85,6 +86,7 @@ bin/xmh
 bin/xmodmap
 bin/xon
 bin/xprop
+bin/xrandr
 bin/xrdb
 bin/xrefresh
 bin/xset
@@ -94,6 +96,13 @@ bin/xsetroot
 bin/xsm
 bin/xstdcmap
 bin/xterm
+bin/xtrapchar
+bin/xtrapin
+bin/xtrapinfo
+bin/xtrapout
+bin/xtrapproto
+bin/xtrapreset
+bin/xtrapstats
 bin/xvidtune
 bin/xvinfo
 bin/xwd
@@ -125,13 +134,13 @@ 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/UXTerm
 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/XConsole
-lib/X11/app-defaults/XF86Cfg
 lib/X11/app-defaults/XFontSel
 lib/X11/app-defaults/XLoad
 lib/X11/app-defaults/XLogo
@@ -150,8 +159,6 @@ lib/X11/app-defaults/Xman
 lib/X11/app-defaults/Xmessage
 lib/X11/app-defaults/Xmh
 lib/X11/app-defaults/Xvidtune
-lib/X11/doc/html/manindex1.html
-lib/X11/doc/html/manindex3.html
 lib/X11/etc/xterm.termcap
 lib/X11/etc/xterm.terminfo
 lib/X11/fonts/util/map-ISO8859-1
@@ -200,6 +207,7 @@ 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/xinit/xinitrc
 lib/X11/xkb/compat.dir
 lib/X11/xkb/compat/accessx
@@ -359,7 +367,6 @@ lib/X11/xkb/symbols/jp
 lib/X11/xkb/symbols/keypad
 lib/X11/xkb/symbols/lock
 lib/X11/xkb/symbols/lt
-lib/X11/xkb/symbols/lt_p
 lib/X11/xkb/symbols/lt_std
 lib/X11/xkb/symbols/lv
 lib/X11/xkb/symbols/macintosh/de
@@ -418,3 +425,33 @@ 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