Upgrade to XFree86-3.1.1

10 files changed, 394 insertions, 332 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index c8cbd163b4bb..8dd186298ab1 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -1,16 +1,23 @@
 DISTNAME	=	xc
-PKGNAME		= 	XFree86-3.1
+PKGNAME		= 	XFree86-3.1.1
+WRKDIR?=                ${.CURDIR}/work
+BUILD_COOKIE?=		${WRKDIR}/.build_done
+PATCH_STRIP	=	-p1
 
 # uncomment one of the 2 lines below!
 #X11_ON_CDROM	=	yes
-#X11_VIA_FTP		=	yes
+X11_VIA_FTP	=	yes
 
 #define this if you are short of space - save ~28 Mbytes
 #REMOVE_NOT_ESSENTIAL	=	yes
 
 
 .if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
-build:
+build: configure ${BUILD_COOKIE}
+
+${BUILD_COOKIE}:
+	@echo "===>  Building for ${DISTNAME}"
+	@${MAKE} ${.MAKEFLAGS} pre-build
 .if defined(REMOVE_NOT_ESSENTIAL)
 	@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
 	@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
@@ -23,7 +30,6 @@ install:
 	@touch ${WRKDIR}/.install_done
 .endif
 
-
 .if defined(X11_ON_CDROM)
 .include "Makefile.cdrom"
 .elif defined(X11_VIA_FTP)
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-comment b/x11-servers/XFree86-4-Server-snap/pkg-comment
index 7172385e176f..8986b32c7157 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-comment
+++ b/x11-servers/XFree86-4-Server-snap/pkg-comment
@@ -1 +1 @@
-X11R6/XFree86 version 3.1
+X11R6/XFree86 version 3.1.1
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-descr b/x11-servers/XFree86-4-Server-snap/pkg-descr
index b03e98802d34..f0360e7c149a 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-descr
+++ b/x11-servers/XFree86-4-Server-snap/pkg-descr
@@ -1,6 +1,7 @@
 XFree86 is a added-value pack for X11R6 that supports several versions
 of Intel-based Unix and Unix-like operating systems.  XFree86-3.0 was
-part of the X11R6 core distribution.  This release XFree86-3.1 consists of
-many new features and performance improvements as well as many bug fixes.
-The release is available as source patches against the X Consortium X11R6
-code, as well as binary distributions for many architectures.
+part of the X11R6 core distribution.  This release of XFree86-3.1.1
+consists of many new features and performance improvements as well as
+many bug fixes.  The release is available as source patches against
+the X Consortium X11R6 code, as well as binary distributions for many
+architectures.
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index 1f20cbce423b..a97cfc1e6247 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -2,10 +2,11 @@
 @owner root
 @group bin
 @mode 4755
-SuperProbe
+bin/SuperProbe
 bin/XF86_8514
 bin/XF86_AGX
 bin/XF86_Mach32
+bin/XF86_Mach64
 bin/XF86_Mach8
 bin/XF86_Mono
 bin/XF86_P9000
@@ -28,9 +29,11 @@ bin/editres
 bin/fsinfo
 bin/fslsfonts
 bin/fstobdf
+bin/gccmakedep
 bin/iceauth
 bin/imake
 bin/kbd_mode
+bin/lbxproxy
 bin/lndir
 bin/makedepend
 bin/mergelib
@@ -42,6 +45,7 @@ bin/resize
 bin/rstart
 bin/sessreg
 bin/showrgb
+bin/smproxy
 bin/startx
 bin/twm
 bin/x11perf
@@ -54,6 +58,7 @@ bin/xconsole
 bin/xcutsel
 bin/xdm
 bin/xdpyinfo
+bin/xf86config
 bin/xfd
 bin/xfs
 bin/xhost
@@ -340,153 +345,165 @@ include/X11/fonts/FSlib.h
 include/X11/fonts/FSproto.h
 include/X11/fonts/fsmasks.h
 @mode 644
-include/X11/lib/libFS.a
-include/X11/lib/libICE.a
-include/X11/lib/libICE.so.6.0
-include/X11/lib/libPEX5.a
-include/X11/lib/libPEX5.so.6.0
-include/X11/lib/libSM.a
-include/X11/lib/libSM.so.6.0
-include/X11/lib/libX11.a
-include/X11/lib/libX11.so.6.0
-include/X11/lib/libXExExt.a
-include/X11/lib/libXIE.a
-include/X11/lib/libXIE.so.6.0
-include/X11/lib/libXau.a
-include/X11/lib/libXaw.a
-include/X11/lib/libXaw.so.6.0
-include/X11/lib/libXdmcp.a
-include/X11/lib/libXext.a
-include/X11/lib/libXext.so.6.0
-include/X11/lib/libXi.a
-include/X11/lib/libXi.so.6.0
-include/X11/lib/libXmu.a
-include/X11/lib/libXmu.so.6.0
-include/X11/lib/libXt.a
-include/X11/lib/libXt.so.6.0
-include/X11/lib/libXtst.a
-include/X11/lib/libXtst.so.6.0
-include/X11/lib/liboldX.a
-include/X11/lib/liboldX.so.6.0
+lib/libFS.a
+lib/libICE.a
+lib/libICE.so.6.0
+lib/libPEX5.a
+lib/libPEX5.so.6.0
+lib/libSM.a
+lib/libSM.so.6.0
+lib/libX11.a
+lib/libX11.so.6.0
+lib/libXExExt.a
+lib/libXIE.a
+lib/libXIE.so.6.0
+lib/libXau.a
+lib/libXaw.a
+lib/libXaw.so.6.0
+lib/libXdmcp.a
+lib/libXext.a
+lib/libXext.so.6.0
+lib/libXi.a
+lib/libXi.so.6.0
+lib/libXmu.a
+lib/libXmu.so.6.0
+lib/libXt.a
+lib/libXt.so.6.0
+lib/libXtst.a
+lib/libXtst.so.6.0
+lib/liblbxXext.a
+lib/liboldX.a
+lib/liboldX.so.6.0
 @mode 444
-include/X11/lib/X11/XErrorDB
-include/X11/lib/X11/XF86Config.eg
-include/X11/lib/X11/XKeysymDB
-include/X11/lib/X11/rgb.txt
-include/X11/lib/X11/app-defaultsBeforelight
-include/X11/lib/X11/app-defaultsBitmap
-include/X11/lib/X11/app-defaultsBitmap-color
-include/X11/lib/X11/app-defaultsChooser
-include/X11/lib/X11/app-defaultsClock-color
-include/X11/lib/X11/app-defaultsEditres
-include/X11/lib/X11/app-defaultsEditres-color
-include/X11/lib/X11/app-defaultsXClipboard
-include/X11/lib/X11/app-defaultsXClock
-include/X11/lib/X11/app-defaultsXConsole
-include/X11/lib/X11/app-defaultsXLogo
-include/X11/lib/X11/app-defaultsXLogo-color
-include/X11/lib/X11/app-defaultsXTerm
-include/X11/lib/X11/app-defaultsXfd
-include/X11/lib/X11/app-defaultsXmag
-include/X11/lib/X11/app-defaultsXmh
-include/X11/lib/X11/configAmoeba.cf
-include/X11/lib/X11/configDGUX.cf
-include/X11/lib/X11/configFreeBSD.cf
-include/X11/lib/X11/configFresco.tmpl
-include/X11/lib/X11/configImake.cf
-include/X11/lib/X11/configImake.rules
-include/X11/lib/X11/configImake.tmpl
-include/X11/lib/X11/configIxx.tmpl
-include/X11/lib/X11/configLibrary.tmpl
-include/X11/lib/X11/configMips.cf
-include/X11/lib/X11/configNetBSD.cf
-include/X11/lib/X11/configOki.cf
-include/X11/lib/X11/configProject.tmpl
-include/X11/lib/X11/configServer.tmpl
-include/X11/lib/X11/configThreads.tmpl
-include/X11/lib/X11/configWin32.cf
-include/X11/lib/X11/configWin32.rules
-include/X11/lib/X11/configWinLib.tmpl
-include/X11/lib/X11/configapollo.cf
-include/X11/lib/X11/configbsd.cf
-include/X11/lib/X11/configbsdLib.rules
-include/X11/lib/X11/configbsdLib.tmpl
-include/X11/lib/X11/configbsdi.cf
-include/X11/lib/X11/configconvex.cf
-include/X11/lib/X11/configcray.cf
-include/X11/lib/X11/configfujitsu.cf
-include/X11/lib/X11/configgeneric.cf
-include/X11/lib/X11/confighp.cf
-include/X11/lib/X11/confighpLib.rules
-include/X11/lib/X11/confighpLib.tmpl
-include/X11/lib/X11/configibm.cf
-include/X11/lib/X11/configibmLib.rules
-include/X11/lib/X11/configibmLib.tmpl
-include/X11/lib/X11/configlinux.cf
-include/X11/lib/X11/configlnxLib.rules
-include/X11/lib/X11/configlnxLib.tmpl
-include/X11/lib/X11/configluna.cf
-include/X11/lib/X11/configmacII.cf
-include/X11/lib/X11/configmach.cf
-include/X11/lib/X11/configminix.cf
-include/X11/lib/X11/configmoto.cf
-include/X11/lib/X11/configncr.cf
-include/X11/lib/X11/confignec.cf
-include/X11/lib/X11/confignecLib.rules
-include/X11/lib/X11/confignecLib.tmpl
-include/X11/lib/X11/confignoop.rules
-include/X11/lib/X11/configoldlib.rules
-include/X11/lib/X11/configosf1.cf
-include/X11/lib/X11/configosfLib.rules
-include/X11/lib/X11/configosfLib.tmpl
-include/X11/lib/X11/configpegasus.cf
-include/X11/lib/X11/configrtcchack.bac
-include/X11/lib/X11/configsco.cf
-include/X11/lib/X11/configsequent.cf
-include/X11/lib/X11/configsgi.cf
-include/X11/lib/X11/configsgiLib.rules
-include/X11/lib/X11/configsite.def
-include/X11/lib/X11/configsony.cf
-include/X11/lib/X11/configsun.cf
-include/X11/lib/X11/configsunLib.rules
-include/X11/lib/X11/configsunLib.tmpl
-include/X11/lib/X11/configsv3Lib.rules
-include/X11/lib/X11/configsv3Lib.tmpl
-include/X11/lib/X11/configsv4Lib.rules
-include/X11/lib/X11/configsv4Lib.tmpl
-include/X11/lib/X11/configsvr3.cf
-include/X11/lib/X11/configsvr4.cf
-include/X11/lib/X11/configultrix.cf
-include/X11/lib/X11/configusl.cf
-include/X11/lib/X11/configx386.cf
-include/X11/lib/X11/configxf86.rules
-include/X11/lib/X11/configxf86site.def
-include/X11/lib/X11/configxfree86.cf
-include/X11/lib/X11/docAccelCards
-include/X11/lib/X11/docCOPYRIGHT
-include/X11/lib/X11/docDevices
-include/X11/lib/X11/docINSTALL
-include/X11/lib/X11/docMonitors
-include/X11/lib/X11/docREADME
-include/X11/lib/X11/docREADME.Config
-include/X11/lib/X11/docREADME.FreeBSD
-include/X11/lib/X11/docREADME.P9000
-include/X11/lib/X11/docREADME.S3
-include/X11/lib/X11/docREADME.Video7
-include/X11/lib/X11/docREADME.W32
-include/X11/lib/X11/docREADME.WstDig
-include/X11/lib/X11/docREADME.agx
-include/X11/lib/X11/docREADME.ati
-include/X11/lib/X11/docREADME.cirrus
-include/X11/lib/X11/docREADME.clkprog
-include/X11/lib/X11/docREADME.trident
-include/X11/lib/X11/docREADME.tseng
-include/X11/lib/X11/docServersOnly
-include/X11/lib/X11/docVideoModes.doc
-include/X11/lib/X11/docmodeDB.txt
-include/X11/lib/X11/etcati.test.c
-include/X11/lib/X11/etcet4000clock.c
-include/X11/lib/X11/etcxmodmap.std
+lib/X11/Cards
+lib/X11/XErrorDB
+lib/X11/XF86Config.eg
+lib/X11/XKeysymDB
+lib/X11/Xcms.txt
+lib/X11/rgb.txt
+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/XClipboard
+lib/X11/app-defaults/XClock
+lib/X11/app-defaults/XConsole
+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/Xfd
+lib/X11/app-defaults/Xmag
+lib/X11/app-defaults/Xmh
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Fresco.tmpl
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Ixx.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/Project.tmpl
+lib/X11/config/Server.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/rtcchack.bac
+lib/X11/config/sco.cf
+lib/X11/config/sequent.cf
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/doc/AccelCards
+lib/X11/doc/COPYRIGHT
+lib/X11/doc/Devices
+lib/X11/doc/INSTALL
+lib/X11/doc/Monitors
+lib/X11/doc/README
+lib/X11/doc/README.Config
+lib/X11/doc/README.FreeBSD
+lib/X11/doc/README.LinkKit
+lib/X11/doc/README.Oak
+lib/X11/doc/README.P9000
+lib/X11/doc/README.S3
+lib/X11/doc/README.Video7
+lib/X11/doc/README.W32
+lib/X11/doc/README.WstDig
+lib/X11/doc/README.agx
+lib/X11/doc/README.ati
+lib/X11/doc/README.cirrus
+lib/X11/doc/README.clkprog
+lib/X11/doc/README.trident
+lib/X11/doc/README.tseng
+lib/X11/doc/ServersOnly
+lib/X11/doc/VideoModes.doc
+lib/X11/doc/modeDB.txt
+lib/X11/etc/ati.test.c
+lib/X11/etc/et4000clock.c
+lib/X11/etc/regati.h
+lib/X11/etc/xmodmap.std
 lib/X11/fonts/100dpi/charI08.pcf.Z
 lib/X11/fonts/100dpi/charI10.pcf.Z
 lib/X11/fonts/100dpi/charI12.pcf.Z
@@ -1022,8 +1039,11 @@ lib/X11/rstart/commands/x11r6/@List
 lib/X11/rstart/commands/x11r6/LoadMonitor
 lib/X11/rstart/commands/x11r6/Terminal
 @mode 644
-usr/X11R6/lib/X11/rstart/contexts/@List
-usr/X11R6/lib/X11/rstart/contexts/default
+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
 @mode 755
 usr/X11R6/lib/X11/rstart/contexts/x
 usr/X11R6/lib/X11/rstart/contexts/x11
@@ -1046,6 +1066,7 @@ lib/X11/xdm/Xresources
 lib/X11/xdm/Xservers
 lib/X11/xdm/xdm-config
 lib/X11/xinit/xinitrc
+lib/X11/xsm/system.xsm
 man/man1/SuperProbe.1.gz
 man/man1/XF86_8514.1.gz 
 man/man1/XF86_AGX.1.gz 
@@ -1074,6 +1095,7 @@ man/man1/fstobdf.1.gz
 man/man1/iceauth.1.gz
 man/man1/imake.1.gz
 man/man1/kbd_mode.1.gz
+man/man1/lbxproxy.1.gz
 man/man1/lndir.1.gz
 man/man1/makedepend.1.gz
 man/man1/mkdirhier.1.gz
@@ -1084,6 +1106,7 @@ man/man1/resize.1.gz
 man/man1/rstart.1.gz
 man/man1/rstartd.1.gz
 man/man1/showrgb.1.gz
+man/man1/smproxy.1.gz
 man/man1/startx.1.gz
 man/man1/twm.1.gz
 man/man1/x11perf.1.gz
@@ -1096,6 +1119,7 @@ man/man1/xconsole.1.gz
 man/man1/xcutsel.1.gz
 man/man1/xdm.1.gz
 man/man1/xdpyinfo.1.gz
+man/man1/xf86config.1.gz
 man/man1/xfd.1.gz
 man/man1/xfs.1.gz
 man/man1/xhost.1.gz
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index a756a7b4ee3f..7e6f2dfc5bd1 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -3,13 +3,13 @@
 cd $WRKSRC/config/cf/ || exit 1;
 cat >> xf86site.def << EOF
 #define XF86SvgaDrivers		et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
-				ncr77c22 compaq oak mx al2101 cl6420 \
-				video7 generic
+				ncr77c22 compaq oak mx al2101 ali cl64xx \
+				video7 chips generic
 
-#define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl6420 generic
+#define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl64xx generic
 
 #define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
-				ncr77c22 compaq oak cl6420 generic
+				ncr77c22 compaq oak cl64xx generic
  
 #define XF86MonoDrivers		hgc1280 sigma apollo hercules
 
@@ -20,10 +20,10 @@ EOF
 version=`uname -r`
 set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
 mv FreeBSD.cf FreeBSD.cf.old
-sed -e "s/1.1.5/$version/"                       \
-    -e "s/OSMajorVersion *1/OSMajorVersion $1/"  \
-    -e "s/OSMinorVersion *1/OSMinorVersion $2/"  \
-    -e "s/OSTeenyVersion *5/OSTeenyVersion $3/"  \
+sed -e "s/12.0/$version/"                       \
+    -e "s/OSMajorVersion *2/OSMajorVersion $1/"  \
+    -e "s/OSMinorVersion *0/OSMinorVersion $2/"  \
+    -e "s/OSTeenyVersion *0/OSTeenyVersion $3/"  \
     <FreeBSD.cf.old >FreeBSD.cf
 #you may change ExtraLibraries too!
 exit 0
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index c8cbd163b4bb..8dd186298ab1 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -1,16 +1,23 @@
 DISTNAME	=	xc
-PKGNAME		= 	XFree86-3.1
+PKGNAME		= 	XFree86-3.1.1
+WRKDIR?=                ${.CURDIR}/work
+BUILD_COOKIE?=		${WRKDIR}/.build_done
+PATCH_STRIP	=	-p1
 
 # uncomment one of the 2 lines below!
 #X11_ON_CDROM	=	yes
-#X11_VIA_FTP		=	yes
+X11_VIA_FTP	=	yes
 
 #define this if you are short of space - save ~28 Mbytes
 #REMOVE_NOT_ESSENTIAL	=	yes
 
 
 .if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
-build:
+build: configure ${BUILD_COOKIE}
+
+${BUILD_COOKIE}:
+	@echo "===>  Building for ${DISTNAME}"
+	@${MAKE} ${.MAKEFLAGS} pre-build
 .if defined(REMOVE_NOT_ESSENTIAL)
 	@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
 	@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
@@ -23,7 +30,6 @@ install:
 	@touch ${WRKDIR}/.install_done
 .endif
 
-
 .if defined(X11_ON_CDROM)
 .include "Makefile.cdrom"
 .elif defined(X11_VIA_FTP)
diff --git a/x11-servers/XFree86-4-Server/pkg-comment b/x11-servers/XFree86-4-Server/pkg-comment
index 7172385e176f..8986b32c7157 100644
--- a/x11-servers/XFree86-4-Server/pkg-comment
+++ b/x11-servers/XFree86-4-Server/pkg-comment
@@ -1 +1 @@
-X11R6/XFree86 version 3.1
+X11R6/XFree86 version 3.1.1
diff --git a/x11-servers/XFree86-4-Server/pkg-descr b/x11-servers/XFree86-4-Server/pkg-descr
index b03e98802d34..f0360e7c149a 100644
--- a/x11-servers/XFree86-4-Server/pkg-descr
+++ b/x11-servers/XFree86-4-Server/pkg-descr
@@ -1,6 +1,7 @@
 XFree86 is a added-value pack for X11R6 that supports several versions
 of Intel-based Unix and Unix-like operating systems.  XFree86-3.0 was
-part of the X11R6 core distribution.  This release XFree86-3.1 consists of
-many new features and performance improvements as well as many bug fixes.
-The release is available as source patches against the X Consortium X11R6
-code, as well as binary distributions for many architectures.
+part of the X11R6 core distribution.  This release of XFree86-3.1.1
+consists of many new features and performance improvements as well as
+many bug fixes.  The release is available as source patches against
+the X Consortium X11R6 code, as well as binary distributions for many
+architectures.
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index 1f20cbce423b..a97cfc1e6247 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -2,10 +2,11 @@
 @owner root
 @group bin
 @mode 4755
-SuperProbe
+bin/SuperProbe
 bin/XF86_8514
 bin/XF86_AGX
 bin/XF86_Mach32
+bin/XF86_Mach64
 bin/XF86_Mach8
 bin/XF86_Mono
 bin/XF86_P9000
@@ -28,9 +29,11 @@ bin/editres
 bin/fsinfo
 bin/fslsfonts
 bin/fstobdf
+bin/gccmakedep
 bin/iceauth
 bin/imake
 bin/kbd_mode
+bin/lbxproxy
 bin/lndir
 bin/makedepend
 bin/mergelib
@@ -42,6 +45,7 @@ bin/resize
 bin/rstart
 bin/sessreg
 bin/showrgb
+bin/smproxy
 bin/startx
 bin/twm
 bin/x11perf
@@ -54,6 +58,7 @@ bin/xconsole
 bin/xcutsel
 bin/xdm
 bin/xdpyinfo
+bin/xf86config
 bin/xfd
 bin/xfs
 bin/xhost
@@ -340,153 +345,165 @@ include/X11/fonts/FSlib.h
 include/X11/fonts/FSproto.h
 include/X11/fonts/fsmasks.h
 @mode 644
-include/X11/lib/libFS.a
-include/X11/lib/libICE.a
-include/X11/lib/libICE.so.6.0
-include/X11/lib/libPEX5.a
-include/X11/lib/libPEX5.so.6.0
-include/X11/lib/libSM.a
-include/X11/lib/libSM.so.6.0
-include/X11/lib/libX11.a
-include/X11/lib/libX11.so.6.0
-include/X11/lib/libXExExt.a
-include/X11/lib/libXIE.a
-include/X11/lib/libXIE.so.6.0
-include/X11/lib/libXau.a
-include/X11/lib/libXaw.a
-include/X11/lib/libXaw.so.6.0
-include/X11/lib/libXdmcp.a
-include/X11/lib/libXext.a
-include/X11/lib/libXext.so.6.0
-include/X11/lib/libXi.a
-include/X11/lib/libXi.so.6.0
-include/X11/lib/libXmu.a
-include/X11/lib/libXmu.so.6.0
-include/X11/lib/libXt.a
-include/X11/lib/libXt.so.6.0
-include/X11/lib/libXtst.a
-include/X11/lib/libXtst.so.6.0
-include/X11/lib/liboldX.a
-include/X11/lib/liboldX.so.6.0
+lib/libFS.a
+lib/libICE.a
+lib/libICE.so.6.0
+lib/libPEX5.a
+lib/libPEX5.so.6.0
+lib/libSM.a
+lib/libSM.so.6.0
+lib/libX11.a
+lib/libX11.so.6.0
+lib/libXExExt.a
+lib/libXIE.a
+lib/libXIE.so.6.0
+lib/libXau.a
+lib/libXaw.a
+lib/libXaw.so.6.0
+lib/libXdmcp.a
+lib/libXext.a
+lib/libXext.so.6.0
+lib/libXi.a
+lib/libXi.so.6.0
+lib/libXmu.a
+lib/libXmu.so.6.0
+lib/libXt.a
+lib/libXt.so.6.0
+lib/libXtst.a
+lib/libXtst.so.6.0
+lib/liblbxXext.a
+lib/liboldX.a
+lib/liboldX.so.6.0
 @mode 444
-include/X11/lib/X11/XErrorDB
-include/X11/lib/X11/XF86Config.eg
-include/X11/lib/X11/XKeysymDB
-include/X11/lib/X11/rgb.txt
-include/X11/lib/X11/app-defaultsBeforelight
-include/X11/lib/X11/app-defaultsBitmap
-include/X11/lib/X11/app-defaultsBitmap-color
-include/X11/lib/X11/app-defaultsChooser
-include/X11/lib/X11/app-defaultsClock-color
-include/X11/lib/X11/app-defaultsEditres
-include/X11/lib/X11/app-defaultsEditres-color
-include/X11/lib/X11/app-defaultsXClipboard
-include/X11/lib/X11/app-defaultsXClock
-include/X11/lib/X11/app-defaultsXConsole
-include/X11/lib/X11/app-defaultsXLogo
-include/X11/lib/X11/app-defaultsXLogo-color
-include/X11/lib/X11/app-defaultsXTerm
-include/X11/lib/X11/app-defaultsXfd
-include/X11/lib/X11/app-defaultsXmag
-include/X11/lib/X11/app-defaultsXmh
-include/X11/lib/X11/configAmoeba.cf
-include/X11/lib/X11/configDGUX.cf
-include/X11/lib/X11/configFreeBSD.cf
-include/X11/lib/X11/configFresco.tmpl
-include/X11/lib/X11/configImake.cf
-include/X11/lib/X11/configImake.rules
-include/X11/lib/X11/configImake.tmpl
-include/X11/lib/X11/configIxx.tmpl
-include/X11/lib/X11/configLibrary.tmpl
-include/X11/lib/X11/configMips.cf
-include/X11/lib/X11/configNetBSD.cf
-include/X11/lib/X11/configOki.cf
-include/X11/lib/X11/configProject.tmpl
-include/X11/lib/X11/configServer.tmpl
-include/X11/lib/X11/configThreads.tmpl
-include/X11/lib/X11/configWin32.cf
-include/X11/lib/X11/configWin32.rules
-include/X11/lib/X11/configWinLib.tmpl
-include/X11/lib/X11/configapollo.cf
-include/X11/lib/X11/configbsd.cf
-include/X11/lib/X11/configbsdLib.rules
-include/X11/lib/X11/configbsdLib.tmpl
-include/X11/lib/X11/configbsdi.cf
-include/X11/lib/X11/configconvex.cf
-include/X11/lib/X11/configcray.cf
-include/X11/lib/X11/configfujitsu.cf
-include/X11/lib/X11/configgeneric.cf
-include/X11/lib/X11/confighp.cf
-include/X11/lib/X11/confighpLib.rules
-include/X11/lib/X11/confighpLib.tmpl
-include/X11/lib/X11/configibm.cf
-include/X11/lib/X11/configibmLib.rules
-include/X11/lib/X11/configibmLib.tmpl
-include/X11/lib/X11/configlinux.cf
-include/X11/lib/X11/configlnxLib.rules
-include/X11/lib/X11/configlnxLib.tmpl
-include/X11/lib/X11/configluna.cf
-include/X11/lib/X11/configmacII.cf
-include/X11/lib/X11/configmach.cf
-include/X11/lib/X11/configminix.cf
-include/X11/lib/X11/configmoto.cf
-include/X11/lib/X11/configncr.cf
-include/X11/lib/X11/confignec.cf
-include/X11/lib/X11/confignecLib.rules
-include/X11/lib/X11/confignecLib.tmpl
-include/X11/lib/X11/confignoop.rules
-include/X11/lib/X11/configoldlib.rules
-include/X11/lib/X11/configosf1.cf
-include/X11/lib/X11/configosfLib.rules
-include/X11/lib/X11/configosfLib.tmpl
-include/X11/lib/X11/configpegasus.cf
-include/X11/lib/X11/configrtcchack.bac
-include/X11/lib/X11/configsco.cf
-include/X11/lib/X11/configsequent.cf
-include/X11/lib/X11/configsgi.cf
-include/X11/lib/X11/configsgiLib.rules
-include/X11/lib/X11/configsite.def
-include/X11/lib/X11/configsony.cf
-include/X11/lib/X11/configsun.cf
-include/X11/lib/X11/configsunLib.rules
-include/X11/lib/X11/configsunLib.tmpl
-include/X11/lib/X11/configsv3Lib.rules
-include/X11/lib/X11/configsv3Lib.tmpl
-include/X11/lib/X11/configsv4Lib.rules
-include/X11/lib/X11/configsv4Lib.tmpl
-include/X11/lib/X11/configsvr3.cf
-include/X11/lib/X11/configsvr4.cf
-include/X11/lib/X11/configultrix.cf
-include/X11/lib/X11/configusl.cf
-include/X11/lib/X11/configx386.cf
-include/X11/lib/X11/configxf86.rules
-include/X11/lib/X11/configxf86site.def
-include/X11/lib/X11/configxfree86.cf
-include/X11/lib/X11/docAccelCards
-include/X11/lib/X11/docCOPYRIGHT
-include/X11/lib/X11/docDevices
-include/X11/lib/X11/docINSTALL
-include/X11/lib/X11/docMonitors
-include/X11/lib/X11/docREADME
-include/X11/lib/X11/docREADME.Config
-include/X11/lib/X11/docREADME.FreeBSD
-include/X11/lib/X11/docREADME.P9000
-include/X11/lib/X11/docREADME.S3
-include/X11/lib/X11/docREADME.Video7
-include/X11/lib/X11/docREADME.W32
-include/X11/lib/X11/docREADME.WstDig
-include/X11/lib/X11/docREADME.agx
-include/X11/lib/X11/docREADME.ati
-include/X11/lib/X11/docREADME.cirrus
-include/X11/lib/X11/docREADME.clkprog
-include/X11/lib/X11/docREADME.trident
-include/X11/lib/X11/docREADME.tseng
-include/X11/lib/X11/docServersOnly
-include/X11/lib/X11/docVideoModes.doc
-include/X11/lib/X11/docmodeDB.txt
-include/X11/lib/X11/etcati.test.c
-include/X11/lib/X11/etcet4000clock.c
-include/X11/lib/X11/etcxmodmap.std
+lib/X11/Cards
+lib/X11/XErrorDB
+lib/X11/XF86Config.eg
+lib/X11/XKeysymDB
+lib/X11/Xcms.txt
+lib/X11/rgb.txt
+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/XClipboard
+lib/X11/app-defaults/XClock
+lib/X11/app-defaults/XConsole
+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/Xfd
+lib/X11/app-defaults/Xmag
+lib/X11/app-defaults/Xmh
+lib/X11/config/Amoeba.cf
+lib/X11/config/DGUX.cf
+lib/X11/config/FreeBSD.cf
+lib/X11/config/Fresco.tmpl
+lib/X11/config/Imake.cf
+lib/X11/config/Imake.rules
+lib/X11/config/Imake.tmpl
+lib/X11/config/Ixx.tmpl
+lib/X11/config/Library.tmpl
+lib/X11/config/Mips.cf
+lib/X11/config/NetBSD.cf
+lib/X11/config/Oki.cf
+lib/X11/config/Project.tmpl
+lib/X11/config/Server.tmpl
+lib/X11/config/Threads.tmpl
+lib/X11/config/Win32.cf
+lib/X11/config/Win32.rules
+lib/X11/config/WinLib.tmpl
+lib/X11/config/apollo.cf
+lib/X11/config/bsd.cf
+lib/X11/config/bsdLib.rules
+lib/X11/config/bsdLib.tmpl
+lib/X11/config/bsdi.cf
+lib/X11/config/convex.cf
+lib/X11/config/cray.cf
+lib/X11/config/fujitsu.cf
+lib/X11/config/generic.cf
+lib/X11/config/host.def
+lib/X11/config/hp.cf
+lib/X11/config/hpLib.rules
+lib/X11/config/hpLib.tmpl
+lib/X11/config/ibm.cf
+lib/X11/config/ibmLib.rules
+lib/X11/config/ibmLib.tmpl
+lib/X11/config/isc.cf
+lib/X11/config/linux.cf
+lib/X11/config/lnxLib.rules
+lib/X11/config/lnxLib.tmpl
+lib/X11/config/lnxdoc.rules
+lib/X11/config/lnxdoc.tmpl
+lib/X11/config/luna.cf
+lib/X11/config/macII.cf
+lib/X11/config/mach.cf
+lib/X11/config/minix.cf
+lib/X11/config/moto.cf
+lib/X11/config/ncr.cf
+lib/X11/config/nec.cf
+lib/X11/config/necLib.rules
+lib/X11/config/necLib.tmpl
+lib/X11/config/noop.rules
+lib/X11/config/oldlib.rules
+lib/X11/config/osf1.cf
+lib/X11/config/osfLib.rules
+lib/X11/config/osfLib.tmpl
+lib/X11/config/pegasus.cf
+lib/X11/config/rtcchack.bac
+lib/X11/config/sco.cf
+lib/X11/config/sequent.cf
+lib/X11/config/sgi.cf
+lib/X11/config/sgiLib.rules
+lib/X11/config/site.def
+lib/X11/config/sony.cf
+lib/X11/config/sun.cf
+lib/X11/config/sunLib.rules
+lib/X11/config/sunLib.tmpl
+lib/X11/config/sv3Lib.rules
+lib/X11/config/sv3Lib.tmpl
+lib/X11/config/sv4Lib.rules
+lib/X11/config/sv4Lib.tmpl
+lib/X11/config/svr3.cf
+lib/X11/config/svr4.cf
+lib/X11/config/ultrix.cf
+lib/X11/config/usl.cf
+lib/X11/config/x386.cf
+lib/X11/config/xf86.rules
+lib/X11/config/xf86.tmpl
+lib/X11/config/xf86site.def
+lib/X11/config/xfree86.cf
+lib/X11/doc/AccelCards
+lib/X11/doc/COPYRIGHT
+lib/X11/doc/Devices
+lib/X11/doc/INSTALL
+lib/X11/doc/Monitors
+lib/X11/doc/README
+lib/X11/doc/README.Config
+lib/X11/doc/README.FreeBSD
+lib/X11/doc/README.LinkKit
+lib/X11/doc/README.Oak
+lib/X11/doc/README.P9000
+lib/X11/doc/README.S3
+lib/X11/doc/README.Video7
+lib/X11/doc/README.W32
+lib/X11/doc/README.WstDig
+lib/X11/doc/README.agx
+lib/X11/doc/README.ati
+lib/X11/doc/README.cirrus
+lib/X11/doc/README.clkprog
+lib/X11/doc/README.trident
+lib/X11/doc/README.tseng
+lib/X11/doc/ServersOnly
+lib/X11/doc/VideoModes.doc
+lib/X11/doc/modeDB.txt
+lib/X11/etc/ati.test.c
+lib/X11/etc/et4000clock.c
+lib/X11/etc/regati.h
+lib/X11/etc/xmodmap.std
 lib/X11/fonts/100dpi/charI08.pcf.Z
 lib/X11/fonts/100dpi/charI10.pcf.Z
 lib/X11/fonts/100dpi/charI12.pcf.Z
@@ -1022,8 +1039,11 @@ lib/X11/rstart/commands/x11r6/@List
 lib/X11/rstart/commands/x11r6/LoadMonitor
 lib/X11/rstart/commands/x11r6/Terminal
 @mode 644
-usr/X11R6/lib/X11/rstart/contexts/@List
-usr/X11R6/lib/X11/rstart/contexts/default
+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
 @mode 755
 usr/X11R6/lib/X11/rstart/contexts/x
 usr/X11R6/lib/X11/rstart/contexts/x11
@@ -1046,6 +1066,7 @@ lib/X11/xdm/Xresources
 lib/X11/xdm/Xservers
 lib/X11/xdm/xdm-config
 lib/X11/xinit/xinitrc
+lib/X11/xsm/system.xsm
 man/man1/SuperProbe.1.gz
 man/man1/XF86_8514.1.gz 
 man/man1/XF86_AGX.1.gz 
@@ -1074,6 +1095,7 @@ man/man1/fstobdf.1.gz
 man/man1/iceauth.1.gz
 man/man1/imake.1.gz
 man/man1/kbd_mode.1.gz
+man/man1/lbxproxy.1.gz
 man/man1/lndir.1.gz
 man/man1/makedepend.1.gz
 man/man1/mkdirhier.1.gz
@@ -1084,6 +1106,7 @@ man/man1/resize.1.gz
 man/man1/rstart.1.gz
 man/man1/rstartd.1.gz
 man/man1/showrgb.1.gz
+man/man1/smproxy.1.gz
 man/man1/startx.1.gz
 man/man1/twm.1.gz
 man/man1/x11perf.1.gz
@@ -1096,6 +1119,7 @@ man/man1/xconsole.1.gz
 man/man1/xcutsel.1.gz
 man/man1/xdm.1.gz
 man/man1/xdpyinfo.1.gz
+man/man1/xf86config.1.gz
 man/man1/xfd.1.gz
 man/man1/xfs.1.gz
 man/man1/xhost.1.gz
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index a756a7b4ee3f..7e6f2dfc5bd1 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -3,13 +3,13 @@
 cd $WRKSRC/config/cf/ || exit 1;
 cat >> xf86site.def << EOF
 #define XF86SvgaDrivers		et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
-				ncr77c22 compaq oak mx al2101 cl6420 \
-				video7 generic
+				ncr77c22 compaq oak mx al2101 ali cl64xx \
+				video7 chips generic
 
-#define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl6420 generic
+#define XF86Vga16Drivers	et4000 ncr77c22 ati tvga8900 oak cl64xx generic
 
 #define XF86Vga2Drivers		et4000 et3000 pvga1 gvga ati tvga8900 cirrus \
-				ncr77c22 compaq oak cl6420 generic
+				ncr77c22 compaq oak cl64xx generic
  
 #define XF86MonoDrivers		hgc1280 sigma apollo hercules
 
@@ -20,10 +20,10 @@ EOF
 version=`uname -r`
 set `echo $version|sed -e 's/\./ /g' -e 's/-/ /g'`
 mv FreeBSD.cf FreeBSD.cf.old
-sed -e "s/1.1.5/$version/"                       \
-    -e "s/OSMajorVersion *1/OSMajorVersion $1/"  \
-    -e "s/OSMinorVersion *1/OSMinorVersion $2/"  \
-    -e "s/OSTeenyVersion *5/OSTeenyVersion $3/"  \
+sed -e "s/12.0/$version/"                       \
+    -e "s/OSMajorVersion *2/OSMajorVersion $1/"  \
+    -e "s/OSMinorVersion *0/OSMinorVersion $2/"  \
+    -e "s/OSTeenyVersion *0/OSTeenyVersion $3/"  \
     <FreeBSD.cf.old >FreeBSD.cf
 #you may change ExtraLibraries too!
 exit 0