Upgrade to 3.3.3

8 files changed, 192 insertions, 128 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index c9c26b77fc43..77887cb4ad0b 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -1,27 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.2
+# Version required:     3.3.3
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.47 1998/10/27 04:12:44 jmz Exp $
+# $Id: Makefile,v 1.48 1998/11/14 09:43:34 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.2
+PKGNAME= 	XFree86-3.3.3
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.2/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/source/ \
-		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.2/source/ \
-		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.2/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/source/
-DISTFILES=	X332src-1.tgz X332src-2.tgz
-
-PATCH_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.2/fixes/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/fixes/ \
-		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.2/fixes/ \
-		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.2/fixes/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/fixes/
-PATCHFILES=	3.3.2-patch1 3.3.2-patch2 3.3.2-patch3
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
+		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.3/source/ \
+		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.3/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3/source/
+DISTFILES=	X333src-1.tgz X333src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -50,7 +43,7 @@ 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=	X332src-1.tgz X332src-2.tgz
+EXTRACT_ONLY=	X333src-1.tgz X333src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
diff --git a/x11-servers/XFree86-4-Server-snap/distinfo b/x11-servers/XFree86-4-Server-snap/distinfo
index b0c3b2fb2bb1..9fc941258e46 100644
--- a/x11-servers/XFree86-4-Server-snap/distinfo
+++ b/x11-servers/XFree86-4-Server-snap/distinfo
@@ -1,6 +1,3 @@
-MD5 (xc/X332src-1.tgz) = 61c0340f91c883e214886fb81d1eefc3
-MD5 (xc/X332src-2.tgz) = d7b5370405afaf1097952911d1b5303d
-MD5 (xc/3.3.2-patch1) = e5a66e732d62cf23007d6b939281028a
-MD5 (xc/3.3.2-patch2) = ba4752cdab2f73e34020285043d51e14
-MD5 (xc/3.3.2-patch3) = 413331b5bce0490a335855a7d3f42995
+MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985
+MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index bcdf57c5d129..e69abbea4384 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -1,6 +1,7 @@
 bin/SuperProbe
 bin/X
 bin/XF86Setup
+bin/XF86_3DLabs
 bin/XF86_8514
 bin/XF86_AGX
 bin/XF86_I128
@@ -588,6 +589,7 @@ lib/X11/doc/Devices
 lib/X11/doc/Monitors
 lib/X11/doc/QuickStart.doc
 lib/X11/doc/README
+lib/X11/doc/README.3DLabs
 lib/X11/doc/README.Config
 lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
@@ -596,7 +598,7 @@ lib/X11/doc/README.LinkKit
 lib/X11/doc/README.MGA
 lib/X11/doc/README.Mach32
 lib/X11/doc/README.Mach64
-lib/X11/doc/README.NV1
+lib/X11/doc/README.NVIDIA
 lib/X11/doc/README.Oak
 lib/X11/doc/README.P9000
 lib/X11/doc/README.S3
@@ -612,7 +614,11 @@ lib/X11/doc/README.ati
 lib/X11/doc/README.chips
 lib/X11/doc/README.cirrus
 lib/X11/doc/README.clkprog
+lib/X11/doc/README.cyrix
+lib/X11/doc/README.epson
 lib/X11/doc/README.mouse
+lib/X11/doc/README.neo
+lib/X11/doc/README.rendition
 lib/X11/doc/README.trident
 lib/X11/doc/README.tseng
 lib/X11/doc/RELNOTES
@@ -1128,6 +1134,7 @@ lib/X11/fonts/cyrillic/koi6x13.pcf.gz
 lib/X11/fonts/cyrillic/koi8x13.pcf.gz
 lib/X11/fonts/cyrillic/koi9x15.pcf.gz
 lib/X11/fonts/cyrillic/koinil2.pcf.gz
+lib/X11/fonts/local/fonts.dir
 lib/X11/fonts/misc/10x20.pcf.gz
 lib/X11/fonts/misc/12x24.pcf.gz
 lib/X11/fonts/misc/12x24rk.pcf.gz
@@ -1140,6 +1147,8 @@ lib/X11/fonts/misc/6x13B.pcf.gz
 lib/X11/fonts/misc/6x9.pcf.gz
 lib/X11/fonts/misc/7x13.pcf.gz
 lib/X11/fonts/misc/7x13B.pcf.gz
+lib/X11/fonts/misc/7x13euro.pcf.gz
+lib/X11/fonts/misc/7x13euroB.pcf.gz
 lib/X11/fonts/misc/7x14.pcf.gz
 lib/X11/fonts/misc/7x14B.pcf.gz
 lib/X11/fonts/misc/7x14rk.pcf.gz
@@ -1209,9 +1218,13 @@ lib/X11/locale/compose.dir
 lib/X11/locale/en_US.utf/XLC_LOCALE
 lib/X11/locale/iso8859-1/Compose
 lib/X11/locale/iso8859-1/XLC_LOCALE
+lib/X11/locale/iso8859-10/XLC_LOCALE
+lib/X11/locale/iso8859-15/Compose
+lib/X11/locale/iso8859-15/XLC_LOCALE
 lib/X11/locale/iso8859-2/Compose
 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/XLC_LOCALE
 lib/X11/locale/iso8859-6/XLC_LOCALE
@@ -1230,6 +1243,8 @@ 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_15
 lib/X11/locale/tbl_data/tab8859_2
 lib/X11/locale/tbl_data/tab8859_3
 lib/X11/locale/tbl_data/tab8859_4
@@ -1238,7 +1253,7 @@ 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/tabkoi8-r
+lib/X11/locale/tbl_data/tabkoi8_r
 lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
 lib/X11/locale/zh/XLC_LOCALE
 lib/X11/locale/zh_TW/XLC_LOCALE
@@ -1247,6 +1262,8 @@ 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
@@ -1339,8 +1356,8 @@ 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/hu
 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
@@ -1352,6 +1369,7 @@ 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/se
 lib/X11/xkb/keymap/sun/us
 lib/X11/xkb/keymap/xfree86
 lib/X11/xkb/keymap/xfree98
@@ -1404,6 +1422,7 @@ lib/X11/xkb/symbols/ru
 lib/X11/xkb/symbols/se
 lib/X11/xkb/symbols/sgi/jp
 lib/X11/xkb/symbols/sony/us
+lib/X11/xkb/symbols/sun/se
 lib/X11/xkb/symbols/sun/us
 lib/X11/xkb/symbols/th
 lib/X11/xkb/symbols/us
@@ -1422,57 +1441,60 @@ lib/X11/xsm/system.xsm
 lib/libFS.a
 lib/libICE.a
 lib/libICE.so
-lib/libICE.so.6.3
+lib/libICE.so.6
 lib/libPEX5.a
 lib/libPEX5.so
-lib/libPEX5.so.6.0
+lib/libPEX5.so.6
 lib/libSM.a
 lib/libSM.so
-lib/libSM.so.6.0
+lib/libSM.so.6
 lib/libX11.a
 lib/libX11.so
-lib/libX11.so.6.1
+lib/libX11.so.6
 lib/libXIE.a
 lib/libXIE.so
-lib/libXIE.so.6.0
+lib/libXIE.so.6
 lib/libXau.a
 lib/libXaw.a
 lib/libXaw.so
-lib/libXaw.so.6.1
+lib/libXaw.so.6
 lib/libXdmcp.a
 lib/libXdpms.a
 lib/libXext.a
 lib/libXext.so
-lib/libXext.so.6.3
+lib/libXext.so.6
 lib/libXi.a
 lib/libXi.so
-lib/libXi.so.6.0
+lib/libXi.so.6
 lib/libXmu.a
 lib/libXmu.so
-lib/libXmu.so.6.0
+lib/libXmu.so.6
 lib/libXp.a
 lib/libXp.so
-lib/libXp.so.6.2
+lib/libXp.so.6
 lib/libXss.a
 lib/libXt.a
 lib/libXt.so
-lib/libXt.so.6.0
+lib/libXt.so.6
 lib/libXtst.a
 lib/libXtst.so
-lib/libXtst.so.6.1
+lib/libXtst.so.6
 lib/libXxf86dga.a
 lib/libXxf86misc.a
 lib/libXxf86vm.a
 lib/liboldX.a
 lib/liboldX.so
-lib/liboldX.so.6.0
+lib/liboldX.so.6
 lib/libxkbfile.a
 lib/libxkbui.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/modules/pex5.so
+lib/modules/xf86AceCad.so
+lib/modules/xf86Dial.so
 lib/modules/xf86Elo.so
 lib/modules/xf86Jstk.so
+lib/modules/xf86MuTouch.so
 lib/modules/xf86Summa.so
 lib/modules/xf86Wacom.so
 lib/modules/xie.so
@@ -2602,6 +2624,8 @@ man/man5/XF86Config.5.gz
 @dirrm lib/X11/locale/iso8859-3
 @dirrm lib/X11/locale/iso8859-2
 @dirrm lib/X11/locale/iso8859-1
+@dirrm lib/X11/locale/iso8859-10
+@dirrm lib/X11/locale/iso8859-15
 @dirrm lib/X11/locale/en_US.utf
 @dirrm lib/X11/locale/C
 @dirrm lib/X11/locale
@@ -2614,6 +2638,7 @@ man/man5/XF86Config.5.gz
 @dirrm lib/X11/fonts/PEX
 @dirrm lib/X11/fonts/75dpi
 @dirrm lib/X11/fonts/100dpi
+@dirrm lib/X11/fonts/local
 @dirrm lib/X11/fonts
 @dirrm lib/X11/etc
 @dirrm lib/X11/doc
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 529fb3d69b26..d9295c9c8edd 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -3,7 +3,7 @@
 yesno () {
   answ=X;
   while [ $answ = X ]; do
-    echo -n "$1"
+    echo -n "$1 [YES] "
     read answ
     if [ X$answ = X ]; then answ="YES"; fi
     case $answ in
@@ -15,6 +15,21 @@ yesno () {
     esac
   done
 }
+noyes() {
+  answ=X;
+  while [ $answ = X ]; do
+    echo -n "$1 [NO] "
+    read answ
+    if [ X$answ = X ]; then answ="NO"; fi
+    case $answ in
+      y|yes|Y|YES) answ=YES;;
+      n|no|N|NO)   answ=NO;;
+      *) echo invalid answer
+      answ=X
+      ;;
+    esac
+  done
+}
 F=$WRKDIR/.config
 configure () {
 rm -f $F
@@ -73,14 +88,14 @@ if [ X"${MACHINE}" = X"pc98" ]; then
     servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA"
     selected=EGC
     for i in $servers; do
-	yesno "Do you want to build the $i server? [YES] "
+	yesno "Do you want to build the $i server?"
 	if [ $answ = YES ]; then selected="$selected $i"; fi
 	echo "#undef XF98${i}Server"           >>$F
 	echo "#define XF98${i}Server   $answ"  >>$F
     done
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
     for i in $servers; do
 	echo "#undef XF86${i}Server"           >>$F
     echo "#define XF86${i}Server   NO"  >>$F
@@ -89,10 +104,10 @@ else
 # force the compilation of the SVGA server.
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
     selected=SVGA
     for i in $servers; do
-	yesno "Do you want to build the $i server? [YES] "
+	yesno "Do you want to build the $i server?"
 	if [ $answ = YES ]; then selected="$selected $i"; fi
 	echo "#undef XF86${i}Server"           >>$F
 	echo "#define XF86${i}Server   $answ"  >>$F
@@ -119,7 +134,7 @@ while [ $ok != 1 ]; do
   if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
 done
 echo
-yesno "Do you want to build Xvfb? [YES] "
+yesno "Do you want to build Xvfb?"
 echo "#define XVirtualFramebufferServer $answ" >>$F
 
 if [ X"${MACHINE}" != X"pc98" ]; then
@@ -149,20 +164,20 @@ cat <<END
  and files that you may be currently using.  This would only be required
  on a first time build.
 END
-yesno "Install xdm config? [YES] "
+yesno "Install xdm config?"
 if [ $answ = YES ]; then
   echo "#define InstallXdmConfig	$answ" >> $F
 fi
-yesno "Install xinit config? [YES] "
+yesno "Install xinit config?"
 if [ $answ = YES ]; then
   echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config? [YES] "
+yesno "Install xfs config?"
 if [ $answ = YES ]; then
   echo "#define InstallFSConfig $answ" >> $F
 fi
 
-yesno "Do you want to include support for the FontServer? [YES] "
+yesno "Do you want to include support for the FontServer?"
 echo "#undef BuildFontServer" >>$F
 echo "#define  BuildFontServer $answ" >>$F
 echo "#undef InstallFSConfig" >>$F
@@ -173,11 +188,11 @@ cat <<'END'
  fonts once, if this is a first time install you will want to build the
  fonts)
 END
-yesno "Build fonts? [YES] "
+yesno "Build fonts?"
 if [ $answ = NO ]; then
   echo "#define BuildFonts		NO" >> $F
 fi
-yesno "Build the servers with Extended input devices? [YES] "
+yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
   echo "#undef BuildXInputExt" >> $F
   echo "#define BuildXInputExt		NO" >> $F
@@ -185,20 +200,30 @@ else
   echo "#define JoystickSupport		YES" >> $F
 fi
 
-yesno "Build PEX? [YES] "
+yesno "Build PEX?"
 if [ $answ = NO ]; then
   echo "#define BuildPexExt		NO" >> $F
 fi
-yesno "Build XIE? [YES] "
+yesno "Build XIE?"
 if [ $answ = NO ]; then
   echo "#define BuildXIE		NO" >> $F
 fi
 echo
 
-yesno "Build static libraries in addition to shared libraries? [YES] "
+yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
   echo "#define ForceNormalLib		YES" >> $F
 fi
+# ELF detection
+if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
+  ELF=yes
+  noyes "Do you want to build and install a.out compatibility libraries?"
+  if [ $answ = YES ]; then
+    echo "#define BuildAoutLibraries		YES" >> $F
+  fi
+else
+  ELF=no
+fi
 
 if [ ! `uname -r|grep ^2` ]; then
 cat <<'END'
@@ -209,7 +234,7 @@ cat <<'END'
  some countries restrict the use of strong cryptography.
 
 END
-yesno "Build with Secure RPC? [YES] "
+yesno "Build with Secure RPC?"
 if [ $answ = YES ]; then
   echo "#define HasSecureRPC		YES" >> $F
 fi
@@ -236,7 +261,7 @@ cat <<'END'
  the option controling this is contained the file xc/config/cf/xf86site.def.
 
 END
-yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
+yesno "Do you want to enable XDM-AUTHORIZATION-1 support?"
 cpwh=NO
 if [ $answ = YES ]; then
     WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
@@ -258,14 +283,6 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-# ELF detection
-if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
-  ELF=yes
-  echo "#define UseElfFormat		YES" >> $F
-else
-  ELF=no
-fi
-
 cat <<'END'
 
  XDM can be built so that it will get a KerberosIV TGT for your users
@@ -282,7 +299,7 @@ cat <<'END'
  will not be enabled if the kerberos libraries are unavailable.
 
 END
-yesno "Do you want to enable KerberosIV support? [YES] "
+yesno "Do you want to enable KerberosIV support?"
 cpkb=NO
 if [ $answ = YES ]; then
     if [ $ELF = yes ]; then
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index c9c26b77fc43..77887cb4ad0b 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -1,27 +1,20 @@
 # New ports collection makefile for:    XFree86
-# Version required:     3.3.2
+# Version required:     3.3.3
 # Date created:         5 January 1995
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.47 1998/10/27 04:12:44 jmz Exp $
+# $Id: Makefile,v 1.48 1998/11/14 09:43:34 asami Exp $
 #
 
 DISTNAME=	xc
-PKGNAME= 	XFree86-3.3.2
+PKGNAME= 	XFree86-3.3.3
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.2/source/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/source/ \
-		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.2/source/ \
-		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.2/source/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/source/
-DISTFILES=	X332src-1.tgz X332src-2.tgz
-
-PATCH_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.2/fixes/ \
-		ftp://xfree86.cdrom.com/pub/XFree86/3.3.2/fixes/ \
-		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.2/fixes/ \
-		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.2/fixes/ \
-		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.2/fixes/
-PATCHFILES=	3.3.2-patch1 3.3.2-patch2 3.3.2-patch3
+MASTER_SITES=	ftp://ftp.xfree86.org/pub/XFree86/3.3.3/source/ \
+		ftp://xfree86.cdrom.com/pub/XFree86/3.3.3/source/ \
+		ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.3.3/source/ \
+		ftp://ftp.uni-stuttgart.de/pub/X11/Xfree86/3.3.3/source/ \
+		ftp://sunsite.doc.ic.ac.uk/packages/XFree86/3.3.3/source/
+DISTFILES=	X333src-1.tgz X333src-2.tgz
 
 MAINTAINER=	jmz@FreeBSD.ORG
 
@@ -50,7 +43,7 @@ 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=	X332src-1.tgz X332src-2.tgz
+EXTRACT_ONLY=	X333src-1.tgz X333src-2.tgz
 DISTFILES+=	Wraphelp.c
 IGNOREFILES=	Wraphelp.c
 .endif
diff --git a/x11-servers/XFree86-4-Server/distinfo b/x11-servers/XFree86-4-Server/distinfo
index b0c3b2fb2bb1..9fc941258e46 100644
--- a/x11-servers/XFree86-4-Server/distinfo
+++ b/x11-servers/XFree86-4-Server/distinfo
@@ -1,6 +1,3 @@
-MD5 (xc/X332src-1.tgz) = 61c0340f91c883e214886fb81d1eefc3
-MD5 (xc/X332src-2.tgz) = d7b5370405afaf1097952911d1b5303d
-MD5 (xc/3.3.2-patch1) = e5a66e732d62cf23007d6b939281028a
-MD5 (xc/3.3.2-patch2) = ba4752cdab2f73e34020285043d51e14
-MD5 (xc/3.3.2-patch3) = 413331b5bce0490a335855a7d3f42995
+MD5 (xc/X333src-1.tgz) = 4c7518284e05d8858a95501d2013c985
+MD5 (xc/X333src-2.tgz) = 8b10b70b59c05bf9e5898444b725f039
 MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index bcdf57c5d129..e69abbea4384 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -1,6 +1,7 @@
 bin/SuperProbe
 bin/X
 bin/XF86Setup
+bin/XF86_3DLabs
 bin/XF86_8514
 bin/XF86_AGX
 bin/XF86_I128
@@ -588,6 +589,7 @@ lib/X11/doc/Devices
 lib/X11/doc/Monitors
 lib/X11/doc/QuickStart.doc
 lib/X11/doc/README
+lib/X11/doc/README.3DLabs
 lib/X11/doc/README.Config
 lib/X11/doc/README.DECtga
 lib/X11/doc/README.DGA
@@ -596,7 +598,7 @@ lib/X11/doc/README.LinkKit
 lib/X11/doc/README.MGA
 lib/X11/doc/README.Mach32
 lib/X11/doc/README.Mach64
-lib/X11/doc/README.NV1
+lib/X11/doc/README.NVIDIA
 lib/X11/doc/README.Oak
 lib/X11/doc/README.P9000
 lib/X11/doc/README.S3
@@ -612,7 +614,11 @@ lib/X11/doc/README.ati
 lib/X11/doc/README.chips
 lib/X11/doc/README.cirrus
 lib/X11/doc/README.clkprog
+lib/X11/doc/README.cyrix
+lib/X11/doc/README.epson
 lib/X11/doc/README.mouse
+lib/X11/doc/README.neo
+lib/X11/doc/README.rendition
 lib/X11/doc/README.trident
 lib/X11/doc/README.tseng
 lib/X11/doc/RELNOTES
@@ -1128,6 +1134,7 @@ lib/X11/fonts/cyrillic/koi6x13.pcf.gz
 lib/X11/fonts/cyrillic/koi8x13.pcf.gz
 lib/X11/fonts/cyrillic/koi9x15.pcf.gz
 lib/X11/fonts/cyrillic/koinil2.pcf.gz
+lib/X11/fonts/local/fonts.dir
 lib/X11/fonts/misc/10x20.pcf.gz
 lib/X11/fonts/misc/12x24.pcf.gz
 lib/X11/fonts/misc/12x24rk.pcf.gz
@@ -1140,6 +1147,8 @@ lib/X11/fonts/misc/6x13B.pcf.gz
 lib/X11/fonts/misc/6x9.pcf.gz
 lib/X11/fonts/misc/7x13.pcf.gz
 lib/X11/fonts/misc/7x13B.pcf.gz
+lib/X11/fonts/misc/7x13euro.pcf.gz
+lib/X11/fonts/misc/7x13euroB.pcf.gz
 lib/X11/fonts/misc/7x14.pcf.gz
 lib/X11/fonts/misc/7x14B.pcf.gz
 lib/X11/fonts/misc/7x14rk.pcf.gz
@@ -1209,9 +1218,13 @@ lib/X11/locale/compose.dir
 lib/X11/locale/en_US.utf/XLC_LOCALE
 lib/X11/locale/iso8859-1/Compose
 lib/X11/locale/iso8859-1/XLC_LOCALE
+lib/X11/locale/iso8859-10/XLC_LOCALE
+lib/X11/locale/iso8859-15/Compose
+lib/X11/locale/iso8859-15/XLC_LOCALE
 lib/X11/locale/iso8859-2/Compose
 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/XLC_LOCALE
 lib/X11/locale/iso8859-6/XLC_LOCALE
@@ -1230,6 +1243,8 @@ 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_15
 lib/X11/locale/tbl_data/tab8859_2
 lib/X11/locale/tbl_data/tab8859_3
 lib/X11/locale/tbl_data/tab8859_4
@@ -1238,7 +1253,7 @@ 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/tabkoi8-r
+lib/X11/locale/tbl_data/tabkoi8_r
 lib/X11/locale/th_TH.TACTIS/XLC_LOCALE
 lib/X11/locale/zh/XLC_LOCALE
 lib/X11/locale/zh_TW/XLC_LOCALE
@@ -1247,6 +1262,8 @@ 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
@@ -1339,8 +1356,8 @@ 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/hu
 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
@@ -1352,6 +1369,7 @@ 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/se
 lib/X11/xkb/keymap/sun/us
 lib/X11/xkb/keymap/xfree86
 lib/X11/xkb/keymap/xfree98
@@ -1404,6 +1422,7 @@ lib/X11/xkb/symbols/ru
 lib/X11/xkb/symbols/se
 lib/X11/xkb/symbols/sgi/jp
 lib/X11/xkb/symbols/sony/us
+lib/X11/xkb/symbols/sun/se
 lib/X11/xkb/symbols/sun/us
 lib/X11/xkb/symbols/th
 lib/X11/xkb/symbols/us
@@ -1422,57 +1441,60 @@ lib/X11/xsm/system.xsm
 lib/libFS.a
 lib/libICE.a
 lib/libICE.so
-lib/libICE.so.6.3
+lib/libICE.so.6
 lib/libPEX5.a
 lib/libPEX5.so
-lib/libPEX5.so.6.0
+lib/libPEX5.so.6
 lib/libSM.a
 lib/libSM.so
-lib/libSM.so.6.0
+lib/libSM.so.6
 lib/libX11.a
 lib/libX11.so
-lib/libX11.so.6.1
+lib/libX11.so.6
 lib/libXIE.a
 lib/libXIE.so
-lib/libXIE.so.6.0
+lib/libXIE.so.6
 lib/libXau.a
 lib/libXaw.a
 lib/libXaw.so
-lib/libXaw.so.6.1
+lib/libXaw.so.6
 lib/libXdmcp.a
 lib/libXdpms.a
 lib/libXext.a
 lib/libXext.so
-lib/libXext.so.6.3
+lib/libXext.so.6
 lib/libXi.a
 lib/libXi.so
-lib/libXi.so.6.0
+lib/libXi.so.6
 lib/libXmu.a
 lib/libXmu.so
-lib/libXmu.so.6.0
+lib/libXmu.so.6
 lib/libXp.a
 lib/libXp.so
-lib/libXp.so.6.2
+lib/libXp.so.6
 lib/libXss.a
 lib/libXt.a
 lib/libXt.so
-lib/libXt.so.6.0
+lib/libXt.so.6
 lib/libXtst.a
 lib/libXtst.so
-lib/libXtst.so.6.1
+lib/libXtst.so.6
 lib/libXxf86dga.a
 lib/libXxf86misc.a
 lib/libXxf86vm.a
 lib/liboldX.a
 lib/liboldX.so
-lib/liboldX.so.6.0
+lib/liboldX.so.6
 lib/libxkbfile.a
 lib/libxkbui.a
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/modules/pex5.so
+lib/modules/xf86AceCad.so
+lib/modules/xf86Dial.so
 lib/modules/xf86Elo.so
 lib/modules/xf86Jstk.so
+lib/modules/xf86MuTouch.so
 lib/modules/xf86Summa.so
 lib/modules/xf86Wacom.so
 lib/modules/xie.so
@@ -2602,6 +2624,8 @@ man/man5/XF86Config.5.gz
 @dirrm lib/X11/locale/iso8859-3
 @dirrm lib/X11/locale/iso8859-2
 @dirrm lib/X11/locale/iso8859-1
+@dirrm lib/X11/locale/iso8859-10
+@dirrm lib/X11/locale/iso8859-15
 @dirrm lib/X11/locale/en_US.utf
 @dirrm lib/X11/locale/C
 @dirrm lib/X11/locale
@@ -2614,6 +2638,7 @@ man/man5/XF86Config.5.gz
 @dirrm lib/X11/fonts/PEX
 @dirrm lib/X11/fonts/75dpi
 @dirrm lib/X11/fonts/100dpi
+@dirrm lib/X11/fonts/local
 @dirrm lib/X11/fonts
 @dirrm lib/X11/etc
 @dirrm lib/X11/doc
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 529fb3d69b26..d9295c9c8edd 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -3,7 +3,7 @@
 yesno () {
   answ=X;
   while [ $answ = X ]; do
-    echo -n "$1"
+    echo -n "$1 [YES] "
     read answ
     if [ X$answ = X ]; then answ="YES"; fi
     case $answ in
@@ -15,6 +15,21 @@ yesno () {
     esac
   done
 }
+noyes() {
+  answ=X;
+  while [ $answ = X ]; do
+    echo -n "$1 [NO] "
+    read answ
+    if [ X$answ = X ]; then answ="NO"; fi
+    case $answ in
+      y|yes|Y|YES) answ=YES;;
+      n|no|N|NO)   answ=NO;;
+      *) echo invalid answer
+      answ=X
+      ;;
+    esac
+  done
+}
 F=$WRKDIR/.config
 configure () {
 rm -f $F
@@ -73,14 +88,14 @@ if [ X"${MACHINE}" = X"pc98" ]; then
     servers="GA968 GANBWAP MGA NEC480 NECS3 NKVNEC PWLB PWSKB SVGA TGUI WABEP WABS WSNA"
     selected=EGC
     for i in $servers; do
-	yesno "Do you want to build the $i server? [YES] "
+	yesno "Do you want to build the $i server?"
 	if [ $answ = YES ]; then selected="$selected $i"; fi
 	echo "#undef XF98${i}Server"           >>$F
 	echo "#define XF98${i}Server   $answ"  >>$F
     done
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
     for i in $servers; do
 	echo "#undef XF86${i}Server"           >>$F
     echo "#define XF86${i}Server   NO"  >>$F
@@ -89,10 +104,10 @@ else
 # force the compilation of the SVGA server.
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     YES"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128"
+    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
     selected=SVGA
     for i in $servers; do
-	yesno "Do you want to build the $i server? [YES] "
+	yesno "Do you want to build the $i server?"
 	if [ $answ = YES ]; then selected="$selected $i"; fi
 	echo "#undef XF86${i}Server"           >>$F
 	echo "#define XF86${i}Server   $answ"  >>$F
@@ -119,7 +134,7 @@ while [ $ok != 1 ]; do
   if [ $ok = 0 ]; then echo you must choose a server among $selected; fi  
 done
 echo
-yesno "Do you want to build Xvfb? [YES] "
+yesno "Do you want to build Xvfb?"
 echo "#define XVirtualFramebufferServer $answ" >>$F
 
 if [ X"${MACHINE}" != X"pc98" ]; then
@@ -149,20 +164,20 @@ cat <<END
  and files that you may be currently using.  This would only be required
  on a first time build.
 END
-yesno "Install xdm config? [YES] "
+yesno "Install xdm config?"
 if [ $answ = YES ]; then
   echo "#define InstallXdmConfig	$answ" >> $F
 fi
-yesno "Install xinit config? [YES] "
+yesno "Install xinit config?"
 if [ $answ = YES ]; then
   echo "#define InstallXinitConfig $answ" >> $F
 fi
-yesno "Install xfs config? [YES] "
+yesno "Install xfs config?"
 if [ $answ = YES ]; then
   echo "#define InstallFSConfig $answ" >> $F
 fi
 
-yesno "Do you want to include support for the FontServer? [YES] "
+yesno "Do you want to include support for the FontServer?"
 echo "#undef BuildFontServer" >>$F
 echo "#define  BuildFontServer $answ" >>$F
 echo "#undef InstallFSConfig" >>$F
@@ -173,11 +188,11 @@ cat <<'END'
  fonts once, if this is a first time install you will want to build the
  fonts)
 END
-yesno "Build fonts? [YES] "
+yesno "Build fonts?"
 if [ $answ = NO ]; then
   echo "#define BuildFonts		NO" >> $F
 fi
-yesno "Build the servers with Extended input devices? [YES] "
+yesno "Build the servers with Extended input devices?"
 if [ $answ = NO ]; then
   echo "#undef BuildXInputExt" >> $F
   echo "#define BuildXInputExt		NO" >> $F
@@ -185,20 +200,30 @@ else
   echo "#define JoystickSupport		YES" >> $F
 fi
 
-yesno "Build PEX? [YES] "
+yesno "Build PEX?"
 if [ $answ = NO ]; then
   echo "#define BuildPexExt		NO" >> $F
 fi
-yesno "Build XIE? [YES] "
+yesno "Build XIE?"
 if [ $answ = NO ]; then
   echo "#define BuildXIE		NO" >> $F
 fi
 echo
 
-yesno "Build static libraries in addition to shared libraries? [YES] "
+yesno "Build static libraries in addition to shared libraries?"
 if [ $answ = YES ]; then
   echo "#define ForceNormalLib		YES" >> $F
 fi
+# ELF detection
+if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
+  ELF=yes
+  noyes "Do you want to build and install a.out compatibility libraries?"
+  if [ $answ = YES ]; then
+    echo "#define BuildAoutLibraries		YES" >> $F
+  fi
+else
+  ELF=no
+fi
 
 if [ ! `uname -r|grep ^2` ]; then
 cat <<'END'
@@ -209,7 +234,7 @@ cat <<'END'
  some countries restrict the use of strong cryptography.
 
 END
-yesno "Build with Secure RPC? [YES] "
+yesno "Build with Secure RPC?"
 if [ $answ = YES ]; then
   echo "#define HasSecureRPC		YES" >> $F
 fi
@@ -236,7 +261,7 @@ cat <<'END'
  the option controling this is contained the file xc/config/cf/xf86site.def.
 
 END
-yesno "Do you want to enable XDM-AUTHORIZATION-1 support? [YES] "
+yesno "Do you want to enable XDM-AUTHORIZATION-1 support?"
 cpwh=NO
 if [ $answ = YES ]; then
     WH=$WRKDIR/xc/lib/Xdmcp/Wraphelp.c
@@ -258,14 +283,6 @@ if [ $cpwh != NO ]; then
   echo "#define	HasXdmAuth		$answ"	>> $F
 fi
 
-# ELF detection
-if [ `sysctl -n kern.osreldate` -ge 300004 -a  X`objformat` = Xelf ]; then
-  ELF=yes
-  echo "#define UseElfFormat		YES" >> $F
-else
-  ELF=no
-fi
-
 cat <<'END'
 
  XDM can be built so that it will get a KerberosIV TGT for your users
@@ -282,7 +299,7 @@ cat <<'END'
  will not be enabled if the kerberos libraries are unavailable.
 
 END
-yesno "Do you want to enable KerberosIV support? [YES] "
+yesno "Do you want to enable KerberosIV support?"
 cpkb=NO
 if [ $answ = YES ]; then
     if [ $ELF = yes ]; then