Update to 4.0.1. Remove libraries from -clients. Try to extract

only what each port needs.  Other miscellaneous bug fixes.

Submitted by:	maintainer

4 files changed, 302 insertions, 323 deletions

diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile
index 222fc9b..b65dd63 100644
--- a/x11/XFree86-4-clients/Makefile
+++ b/x11/XFree86-4-clients/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:	XFree86Xclients-4.0
+# New ports collection makefile for:	XFree86-4-clients
 # Date created:		10 Oct 1999
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
@@ -6,58 +6,131 @@
 #
 
 PORTNAME=	clients
-PORTVERSION=	4.0
+PORTVERSION=	4.0.1
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \
-		ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \
-		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \
+		ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \
+		ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \
+		ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/
 PKGNAMEPREFIX=	XFree86-
-DISTFILES=	X400src-1.tgz
+DISTFILES=	X401src-1.tgz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake-4
-
-PREFIX?=	${X11BASE}
-INSTALLS_SHLIB=	yes
-MTREE_FILE=	/etc/mtree/BSD.x11.dist
-DIST_SUBDIR=	xc
-WRKSRC=		${WRKDIR}/xc
-PATCHDIR=	${PORTSDIR}/x11/XFree86-4-libraries/patches
-SCRIPTS_ENV+=	PREFIX=${PREFIX} \
-		X11BASE=${X11BASE} \
-		WRKDIR=${WRKDIR} \
-		DISTDIR=${DISTDIR} \
-		InstallXdmConfig=${InstallXdmConfig} \
-		InstallXinitConfig=${InstallXinitConfig} \
-		InstallAppDefFiles=${InstallAppDefFiles} \
-		BuildAoutLibraries=${BuildAoutLibraries}
-ALL_TARGET=	FreeBSDPortsBuild
-.if defined(NO_INSTALL_MANPAGES)
-INSTALL_TARGET= FreeBSDPortsInstall
-.else
-INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man
-MANCOMPRESSED=	yes
-MAN1=		appres.1 atobm.1 bdftopcf.1 beforelight.1 bitmap.1 \
-		bmtoa.1 cxpm.1 dga.1 editres.1 fsinfo.1 fslsfonts.1 \
-		fstobdf.1 iceauth.1 ico.1 lbxproxy.1 libxrx.1 \
-		listres.1 makepsres.1 mkcfm.1 mkfontdir.1 oclock.1 \
-		proxymngr.1 resize.1 rstart.1 rstartd.1 sessreg.1 \
-		setxkbmap.1 showfont.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 xcutsel.1 xditview.1 xdm.1 xdpyinfo.1 \
-		xedit.1 xev.1 xeyes.1 xfd.1 xfindproxy.1 xfontsel.1 \
-		xfwp.1 xgamma.1 xgc.1 xhost.1 xieperf.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 xmodmap.1 xon.1 xprop.1 xrdb.1 \
-		xrefresh.1 xset.1 xsetmode.1 xsetpointer.1 xsetroot.1 \
-		xsm.1 xstdcmap.1 xterm.1 xvidtune.1 xwd.1 xwininfo.1 \
-		xwud.1
-.endif
+XFREE86_VERSION=	4
+USE_IMAKE=		YES
+DIST_SUBDIR=		xc
+WRKSRC=			${WRKDIR}/xc
+PATCHDIR=		${PORTSDIR}/x11/XFree86-4-libraries/patches
+SCRIPTS_ENV+=		PREFIX=${PREFIX} \
+			X11BASE=${X11BASE} \
+			WRKDIR=${WRKDIR} \
+			DISTDIR=${DISTDIR} \
+			InstallXdmConfig=${InstallXdmConfig} \
+			InstallXinitConfig=${InstallXinitConfig} \
+			InstallAppDefFiles=${InstallAppDefFiles} \
+			BuildAoutLibraries=${BuildAoutLibraries}
+ALL_TARGET=		FreeBSDPortsBuild
+INSTALL_TARGET= 	FreeBSDPortsInstall FreeBSDPortsInstall.man
+MANCOMPRESSED=		yes
+MAN1=			appres.1 \
+			atobm.1 \
+			bdftopcf.1 \
+			beforelight.1 \
+			bitmap.1 \
+			bmtoa.1 \
+			cxpm.1 \
+			dga.1 \
+			editres.1 \
+			fsinfo.1 \
+			fslsfonts.1 \
+			fstobdf.1 \
+			iceauth.1 \
+			ico.1 \
+			imake.1 \
+			lbxproxy.1 \
+			libxrx.1 \
+			listres.1 \
+			lndir.1 \
+			makedepend.1 \
+			makeg.1 \
+			makepsres.1 \
+			makestrs.1 \
+			mkcfm.1 \
+			mkdirhier.1 \
+			mkfontdir.1 \
+			oclock.1 \
+			proxymngr.1 \
+			pswrap.1 \
+			resize.1 \
+			revpath.1 \
+			rman.1 \
+			rstart.1 \
+			rstartd.1 \
+			sessreg.1 \
+			setxkbmap.1 \
+			showfont.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 \
+			xcutsel.1 \
+			xditview.1 \
+			xdm.1 \
+			xdpyinfo.1 \
+			xedit.1 \
+			xev.1 \
+			xeyes.1 \
+			xf86cfg.1 \
+			xfd.1 \
+			xfindproxy.1 \
+			xfontsel.1 \
+			xfwp.1 \
+			xgamma.1 \
+			xgc.1 \
+			xhost.1 \
+			xieperf.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 \
+			xmkmf.1 \
+			xmodmap.1 \
+			xon.1 \
+			xprop.1 \
+			xrdb.1 \
+			xrefresh.1 \
+			xset.1 \
+			xsetmode.1 \
+			xsetpointer.1 \
+			xsetroot.1 \
+			xsm.1 \
+			xstdcmap.1 \
+			xterm.1 \
+			xvidtune.1 \
+			xwd.1 \
+			xwininfo.1 \
+			xwud.1
 
 .if defined(XDM_DES)
 .if ${USA_RESIDENT} == YES
@@ -68,12 +141,15 @@ pre-fetch:
 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=	X400src-1.tgz
+EXTRACT_ONLY=	X401src-1.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
 .endif
 
+do-configure:
+	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
+
 # User Config:
 # If you want to save your current config files for Xdm, set following as NO
 InstallXdmConfig?=	YES
diff --git a/x11/XFree86-4-clients/distinfo b/x11/XFree86-4-clients/distinfo
index 32a6470..e9125a5 100644
--- a/x11/XFree86-4-clients/distinfo
+++ b/x11/XFree86-4-clients/distinfo
@@ -1 +1 @@
-MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d
+MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536
diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist
index af43289..d9c436a 100644
--- a/x11/XFree86-4-clients/pkg-plist
+++ b/x11/XFree86-4-clients/pkg-plist
@@ -47,6 +47,7 @@ bin/xdpyinfo
 bin/xedit
 bin/xev
 bin/xeyes
+bin/xf86cfg
 bin/xfd
 bin/xfindproxy
 bin/xfontsel
@@ -104,97 +105,168 @@ include/bitmaps/ldblarrow
 include/bitmaps/rdblarrow
 lib/X11/XErrorDB
 lib/X11/XKeysymDB
-lib/X11/locale/C/XLC_LOCALE
-lib/X11/locale/armscii-8/Compose
-lib/X11/locale/armscii-8/XLC_LOCALE
-lib/X11/locale/compose.dir
-lib/X11/locale/en_US.UTF-8/XLC_LOCALE
-lib/X11/locale/en_US.utf/Compose
-lib/X11/locale/en_US.utf/XLC_LOCALE
-lib/X11/locale/georgian-academy/Compose
-lib/X11/locale/georgian-academy/XLC_LOCALE
-lib/X11/locale/georgian-ps/Compose
-lib/X11/locale/georgian-ps/XLC_LOCALE
-lib/X11/locale/ibm-cp1133/Compose
-lib/X11/locale/ibm-cp1133/XLC_LOCALE
-lib/X11/locale/iso8859-1/XLC_LOCALE
-lib/X11/locale/iso8859-10/Compose
-lib/X11/locale/iso8859-10/XLC_LOCALE
-lib/X11/locale/iso8859-14/Compose
-lib/X11/locale/iso8859-14/XLC_LOCALE
-lib/X11/locale/iso8859-15/Compose
-lib/X11/locale/iso8859-15/XLC_LOCALE
-lib/X11/locale/iso8859-2/XLC_LOCALE
-lib/X11/locale/iso8859-3/XLC_LOCALE
-lib/X11/locale/iso8859-4/Compose
-lib/X11/locale/iso8859-4/XLC_LOCALE
-lib/X11/locale/iso8859-5/Compose
-lib/X11/locale/iso8859-5/XLC_LOCALE
-lib/X11/locale/iso8859-6/Compose
-lib/X11/locale/iso8859-6/XLC_LOCALE
-lib/X11/locale/iso8859-7/Compose
-lib/X11/locale/iso8859-7/XLC_LOCALE
-lib/X11/locale/iso8859-8/Compose
-lib/X11/locale/iso8859-8/XLC_LOCALE
-lib/X11/locale/iso8859-9/Compose
-lib/X11/locale/iso8859-9/XLC_LOCALE
-lib/X11/locale/ja.JIS/Compose
-lib/X11/locale/ja.JIS/XLC_LOCALE
-lib/X11/locale/ja.SJIS/Compose
-lib/X11/locale/ja.SJIS/XLC_LOCALE
-lib/X11/locale/ja/Compose
-lib/X11/locale/ja/XLC_LOCALE
-lib/X11/locale/ko/Compose
-lib/X11/locale/ko/XLC_LOCALE
-lib/X11/locale/koi8-r/Compose
-lib/X11/locale/koi8-r/XLC_LOCALE
-lib/X11/locale/koi8-u/Compose
-lib/X11/locale/koi8-u/XLC_LOCALE
-lib/X11/locale/locale.alias
-lib/X11/locale/locale.dir
-lib/X11/locale/mulelao-1/Compose
-lib/X11/locale/mulelao-1/XLC_LOCALE
-lib/X11/locale/tbl_data/gb2312
-lib/X11/locale/tbl_data/jis0201
-lib/X11/locale/tbl_data/jis0208
-lib/X11/locale/tbl_data/ksc5601
-lib/X11/locale/tbl_data/tab8859_1
-lib/X11/locale/tbl_data/tab8859_10
-lib/X11/locale/tbl_data/tab8859_14
-lib/X11/locale/tbl_data/tab8859_15
-lib/X11/locale/tbl_data/tab8859_2
-lib/X11/locale/tbl_data/tab8859_3
-lib/X11/locale/tbl_data/tab8859_4
-lib/X11/locale/tbl_data/tab8859_5
-lib/X11/locale/tbl_data/tab8859_6
-lib/X11/locale/tbl_data/tab8859_7
-lib/X11/locale/tbl_data/tab8859_8
-lib/X11/locale/tbl_data/tab8859_9
-lib/X11/locale/tbl_data/tabarmscii_8
-lib/X11/locale/tbl_data/tabgeorgian_academy
-lib/X11/locale/tbl_data/tabgeorgian_ps
-lib/X11/locale/tbl_data/tabibm_cp1133
-lib/X11/locale/tbl_data/tabkoi8_r
-lib/X11/locale/tbl_data/tabkoi8_u
-lib/X11/locale/tbl_data/tabmulelao_1
-lib/X11/locale/tbl_data/tabtcvn
-lib/X11/locale/tbl_data/tabtis620
-lib/X11/locale/tbl_data/tabviscii
-lib/X11/locale/th_TH.TACTIS/Compose
-lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
-lib/X11/locale/vi_VN.tcvn/Compose
-lib/X11/locale/vi_VN.tcvn/XLC_LOCALE
-lib/X11/locale/vi_VN.viscii/Compose
-lib/X11/locale/vi_VN.viscii/XLC_LOCALE
-lib/X11/locale/zh/Compose
-lib/X11/locale/zh/XLC_LOCALE
-lib/X11/locale/zh_TW.Big5/Compose
-lib/X11/locale/zh_TW.Big5/XLC_LOCALE
-lib/X11/locale/zh_TW/Compose
-lib/X11/locale/zh_TW/XLC_LOCALE
+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/XConsole
+lib/X11/app-defaults/XF86Cfg
+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/XSm
+lib/X11/app-defaults/XTerm
+lib/X11/app-defaults/XTerm-color
+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/Xvidtune
+lib/X11/doc/html/appres.1.html
+lib/X11/doc/html/atobm.1.html
+lib/X11/doc/html/bdftopcf.1.html
+lib/X11/doc/html/beforelight.1.html
+lib/X11/doc/html/bitmap.1.html
+lib/X11/doc/html/bmtoa.1.html
+lib/X11/doc/html/cxpm.1.html
+lib/X11/doc/html/dga.1.html
+lib/X11/doc/html/editres.1.html
+lib/X11/doc/html/fsinfo.1.html
+lib/X11/doc/html/fslsfonts.1.html
+lib/X11/doc/html/fstobdf.1.html
+lib/X11/doc/html/iceauth.1.html
+lib/X11/doc/html/ico.1.html
+lib/X11/doc/html/imake.1.html
+lib/X11/doc/html/lbxproxy.1.html
+lib/X11/doc/html/libxrx.1.html
+lib/X11/doc/html/listres.1.html
+lib/X11/doc/html/lndir.1.html
+lib/X11/doc/html/makedepend.1.html
+lib/X11/doc/html/makeg.1.html
+lib/X11/doc/html/makepsres.1.html
+lib/X11/doc/html/makestrs.1.html
+lib/X11/doc/html/manindex1.html
+lib/X11/doc/html/manindex3.html
+lib/X11/doc/html/mkcfm.1.html
+lib/X11/doc/html/mkdirhier.1.html
+lib/X11/doc/html/mkfontdir.1.html
+lib/X11/doc/html/oclock.1.html
+lib/X11/doc/html/proxymngr.1.html
+lib/X11/doc/html/pswrap.1.html
+lib/X11/doc/html/resize.1.html
+lib/X11/doc/html/revpath.1.html
+lib/X11/doc/html/rman.1.html
+lib/X11/doc/html/rstart.1.html
+lib/X11/doc/html/rstartd.1.html
+lib/X11/doc/html/sessreg.1.html
+lib/X11/doc/html/setxkbmap.1.html
+lib/X11/doc/html/showfont.1.html
+lib/X11/doc/html/smproxy.1.html
+lib/X11/doc/html/startx.1.html
+lib/X11/doc/html/sxpm.1.html
+lib/X11/doc/html/twm.1.html
+lib/X11/doc/html/viewres.1.html
+lib/X11/doc/html/x11perf.1.html
+lib/X11/doc/html/x11perfcomp.1.html
+lib/X11/doc/html/xauth.1.html
+lib/X11/doc/html/xbiff.1.html
+lib/X11/doc/html/xcalc.1.html
+lib/X11/doc/html/xclipboard.1.html
+lib/X11/doc/html/xclock.1.html
+lib/X11/doc/html/xcmsdb.1.html
+lib/X11/doc/html/xconsole.1.html
+lib/X11/doc/html/xcutsel.1.html
+lib/X11/doc/html/xditview.1.html
+lib/X11/doc/html/xdm.1.html
+lib/X11/doc/html/xdpyinfo.1.html
+lib/X11/doc/html/xedit.1.html
+lib/X11/doc/html/xev.1.html
+lib/X11/doc/html/xeyes.1.html
+lib/X11/doc/html/xf86cfg.1.html
+lib/X11/doc/html/xfd.1.html
+lib/X11/doc/html/xfindproxy.1.html
+lib/X11/doc/html/xfontsel.1.html
+lib/X11/doc/html/xfwp.1.html
+lib/X11/doc/html/xgamma.1.html
+lib/X11/doc/html/xgc.1.html
+lib/X11/doc/html/xhost.1.html
+lib/X11/doc/html/xieperf.1.html
+lib/X11/doc/html/xinit.1.html
+lib/X11/doc/html/xkbcomp.1.html
+lib/X11/doc/html/xkbevd.1.html
+lib/X11/doc/html/xkbprint.1.html
+lib/X11/doc/html/xkill.1.html
+lib/X11/doc/html/xload.1.html
+lib/X11/doc/html/xlogo.1.html
+lib/X11/doc/html/xlsatoms.1.html
+lib/X11/doc/html/xlsclients.1.html
+lib/X11/doc/html/xlsfonts.1.html
+lib/X11/doc/html/xmag.1.html
+lib/X11/doc/html/xman.1.html
+lib/X11/doc/html/xmessage.1.html
+lib/X11/doc/html/xmkmf.1.html
+lib/X11/doc/html/xmodmap.1.html
+lib/X11/doc/html/xon.1.html
+lib/X11/doc/html/xprop.1.html
+lib/X11/doc/html/xrdb.1.html
+lib/X11/doc/html/xrefresh.1.html
+lib/X11/doc/html/xset.1.html
+lib/X11/doc/html/xsetmode.1.html
+lib/X11/doc/html/xsetpointer.1.html
+lib/X11/doc/html/xsetroot.1.html
+lib/X11/doc/html/xsm.1.html
+lib/X11/doc/html/xstdcmap.1.html
+lib/X11/doc/html/xterm.1.html
+lib/X11/doc/html/xvidtune.1.html
+lib/X11/doc/html/xwd.1.html
+lib/X11/doc/html/xwininfo.1.html
+lib/X11/doc/html/xwud.1.html
+lib/X11/lbxproxy/AtomControl
+lib/X11/proxymngr/pmconfig
+lib/X11/rstart/commands/@List
+lib/X11/rstart/commands/ListContexts
+lib/X11/rstart/commands/ListGenericCommands
+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
+lib/X11/xdm/GiveConsole
+lib/X11/xdm/TakeConsole
+lib/X11/xdm/Xaccess
+lib/X11/xdm/Xresources
+lib/X11/xdm/Xservers
+lib/X11/xdm/Xsession
+lib/X11/xdm/Xsetup_0
+lib/X11/xdm/Xwilling
+lib/X11/xdm/chooser
+lib/X11/xdm/pixmaps/XFree86.xpm
+lib/X11/xdm/pixmaps/XFree86bw.xpm
+lib/X11/xdm/xdm-config
+lib/X11/xinit/xinitrc
 lib/X11/xkb/compat.dir
 lib/X11/xkb/compat/accessx
 lib/X11/xkb/compat/basic
@@ -210,6 +282,7 @@ lib/X11/xkb/compat/norepeat
 lib/X11/xkb/compat/pc
 lib/X11/xkb/compat/pc98
 lib/X11/xkb/compat/xtest
+lib/X11/xkb/compiled/README
 lib/X11/xkb/geometry.dir
 lib/X11/xkb/geometry/amiga
 lib/X11/xkb/geometry/ataritt
@@ -286,6 +359,8 @@ lib/X11/xkb/keymap/xfree86
 lib/X11/xkb/keymap/xfree98
 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
@@ -361,188 +436,6 @@ lib/X11/xkb/types/nocancel
 lib/X11/xkb/types/pc
 lib/X11/xkb/xkbcomp
 lib/X11/xman.help
-lib/libFS.a
-lib/libGL.a
-lib/libGL.so
-lib/libGL.so.1
-lib/libICE.so
-lib/libICE.so.6
-lib/libPEX5.so
-lib/libPEX5.so.6
-lib/libSM.so
-lib/libSM.so.6
-lib/libX11.so
-lib/libX11.so.6
-lib/libXIE.so
-lib/libXIE.so.6
-lib/libXau.a
-lib/libXaw.so
-lib/libXaw.so.6
-lib/libXaw.so.7
-lib/libXdmcp.a
-lib/libXext.so
-lib/libXext.so.6
-lib/libXfont.so
-lib/libXfont.so.1
-lib/libXfontcache.a
-lib/libXi.so
-lib/libXi.so.6
-lib/libXinerama.a
-lib/libXmu.so
-lib/libXmu.so.6
-lib/libXp.so
-lib/libXp.so.6
-lib/libXpm.so
-lib/libXpm.so.4
-lib/libXss.a
-lib/libXt.so
-lib/libXt.so.6
-lib/libXtst.so
-lib/libXtst.so.6
-lib/libXv.a
-lib/libXxf86dga.a
-lib/libXxf86misc.a
-lib/libXxf86vm.a
-lib/libdps.a
-lib/libdps.so
-lib/libdps.so.1
-lib/libdpstk.a
-lib/libdpstk.so
-lib/libdpstk.so.1
-lib/libfntstubs.a
-lib/liboldX.so
-lib/liboldX.so.6
-lib/libpsres.a
-lib/libpsres.so
-lib/libpsres.so.1
-lib/libxkbfile.a
-lib/libxkbui.a
-lib/libxrx.so
-lib/libxrx.so.6
-lib/modules/codeconv/libARABIC.a
-lib/modules/codeconv/libARMSCII8.a
-lib/modules/codeconv/libBIG5.a
-lib/modules/codeconv/libDOSENCODING.a
-lib/modules/codeconv/libGB2312.a
-lib/modules/codeconv/libGEORGIAN.a
-lib/modules/codeconv/libISO8859_1.a
-lib/modules/codeconv/libISO8859_10.a
-lib/modules/codeconv/libISO8859_11.a
-lib/modules/codeconv/libISO8859_14.a
-lib/modules/codeconv/libISO8859_15.a
-lib/modules/codeconv/libISO8859_2.a
-lib/modules/codeconv/libISO8859_3.a
-lib/modules/codeconv/libISO8859_4.a
-lib/modules/codeconv/libISO8859_5.a
-lib/modules/codeconv/libISO8859_6.a
-lib/modules/codeconv/libISO8859_7.a
-lib/modules/codeconv/libISO8859_8.a
-lib/modules/codeconv/libISO8859_9.a
-lib/modules/codeconv/libJISX0201.a
-lib/modules/codeconv/libJISX0208.a
-lib/modules/codeconv/libJISX0212.a
-lib/modules/codeconv/libKOI8.a
-lib/modules/codeconv/libKSC5601.a
-lib/modules/codeconv/libKSCJOHAB.a
-lib/modules/codeconv/libMULEENCODING.a
-lib/modules/codeconv/libTCVN.a
-lib/modules/codeconv/libVISCII.a
-lib/modules/fonts/libbitmap.a
-lib/modules/fonts/libfreetype.a
-lib/modules/fonts/libspeedo.a
-lib/modules/fonts/libtype1.a
-lib/modules/fonts/libxtt.a
+lib/X11/xsm/system.xsm
 @unexec rm -f %D/lib/X11/rstart/commands/x
 @unexec rm -f %D/lib/X11/rstart/commands/x11
-@unexec rm -f %D/lib/X11/rstart
-@unexec rm -f %D/lib/X11/twm
-@unexec rm -f %D/lib/X11/xinit
-@unexec rm -f %D/lib/X11/xsm
-@dirrm lib/X11/x11perfcomp
-@dirrm lib/X11/xkb/symbols/hp
-@dirrm lib/X11/xkb/symbols/macintosh
-@dirrm lib/X11/xkb/symbols/sgi
-@dirrm lib/X11/xkb/symbols/xfree68
-@dirrm lib/X11/xkb/types
-@dirrm lib/X11/locale/armscii-8
-@dirrm lib/X11/locale/en_US.UTF-8
-@dirrm lib/X11/locale/georgian-academy
-@dirrm lib/X11/locale/georgian-ps
-@dirrm lib/X11/locale/ibm-cp1133
-@dirrm lib/X11/locale/iso8859-10
-@dirrm lib/X11/locale/iso8859-14
-@dirrm lib/X11/locale/iso8859-15
-@dirrm lib/X11/locale/koi8-u
-@dirrm lib/X11/locale/mulelao-1
-@dirrm lib/X11/locale/vi_VN.tcvn
-@dirrm lib/X11/locale/vi_VN.viscii
-@dirrm lib/modules/fonts
-@dirrm lib/modules/codeconv
-@dirrm include/bitmaps
-@cwd /etc
-X11/app-defaults/Beforelight
-X11/app-defaults/Bitmap
-X11/app-defaults/Bitmap-color
-X11/app-defaults/Chooser
-X11/app-defaults/Clock-color
-X11/app-defaults/Editres
-X11/app-defaults/Editres-color
-X11/app-defaults/Viewres
-X11/app-defaults/XCalc
-X11/app-defaults/XCalc-color
-X11/app-defaults/XClipboard
-X11/app-defaults/XClock
-X11/app-defaults/XConsole
-X11/app-defaults/XFontSel
-X11/app-defaults/XLoad
-X11/app-defaults/XLogo
-X11/app-defaults/XLogo-color
-X11/app-defaults/XSm
-X11/app-defaults/XTerm
-X11/app-defaults/XTerm-color
-X11/app-defaults/Xditview
-X11/app-defaults/Xditview-chrtr
-X11/app-defaults/Xedit
-X11/app-defaults/Xedit-color
-X11/app-defaults/Xfd
-X11/app-defaults/Xgc
-X11/app-defaults/Xmag
-X11/app-defaults/Xman
-X11/app-defaults/Xmessage
-X11/app-defaults/Xvidtune
-X11/lbxproxy/AtomControl
-X11/proxymngr/pmconfig
-X11/rstart/commands/@List
-X11/rstart/commands/ListContexts
-X11/rstart/commands/ListGenericCommands
-X11/rstart/commands/x11r6/@List
-X11/rstart/commands/x11r6/LoadMonitor
-X11/rstart/commands/x11r6/Terminal
-X11/rstart/config
-X11/rstart/contexts/@List
-X11/rstart/contexts/default
-X11/rstart/contexts/x
-X11/rstart/contexts/x11
-X11/rstart/contexts/x11r6
-X11/rstart/rstartd.real
-X11/twm/system.twmrc
-X11/xdm/GiveConsole
-X11/xdm/TakeConsole
-X11/xdm/Xaccess
-X11/xdm/Xresources
-X11/xdm/Xservers
-X11/xdm/Xsession
-X11/xdm/Xsetup_0
-X11/xdm/Xwilling
-X11/xdm/chooser
-X11/xdm/pixmaps/XFree86.xpm
-X11/xdm/pixmaps/XFree86bw.xpm
-X11/xdm/xdm-config
-X11/xinit/xinitrc
-X11/xsm/system.xsm
-@unexec rm -f %D/X11/xdm/authdir
-@unexec rmdir %D/X11/xdm/pixmaps
-@cwd /var
-db/xkb/README
-@unexec rmdir %D/db/xdm
-@unexec rmdir %D/db/xkb
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 324e0c8..0bc42cf 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -36,8 +36,15 @@ configure () {
 	BuildAoutLibraries=NO
     fi
 
+    echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF
+
+    # I want to set this line.
+    # but the probrem is too deep. not yet done.
+    # echo "#define InstallXserverSetUID NO" >> $LOCALDEF
+
     # disable some configs: there are not used this ports
-    for i in InstallFSConfig \
+    for i in \
+	InstallFSConfig \
 	BuildServer \
 	BuildFontServer \
 	BuildFonts \
@@ -49,10 +56,13 @@ configure () {
 	BuildCyrillicFonts \
 	BuildLatin2Fonts \
 	LibHeaders \
-	ForceNormalLib
+        LibInstall \
+	ForceNormalLib \
+	ModuleInstall
     do \
 	echo "#define $i NO" >> $LOCALDEF
     done
+    echo "#define LibInstallBuild  YES" >> $LOCALDEF
     echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF
     echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF
     echo "#define InstallXdmConfig $InstallXdmConfig" >> $LOCALDEF