Update to XFree86 release 3.3.5

8 files changed, 159 insertions, 159 deletions

diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index b39b209..efda93f 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -84,7 +84,7 @@ static Distribution DistTable[] = {
 #endif
 { "ports",	"/usr",			&Dists,		DIST_PORTS,		NULL		},
 { "local",	"/",			&Dists,		DIST_LOCAL,		NULL		},
-{ "XF86334",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
+{ "XF86335",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
 { NULL },
 };
 
@@ -120,8 +120,8 @@ static Distribution SrcDistTable[] = {
 
 /* The XFree86 distribution */
 static Distribution XF86DistTable[] = {
-{ "XF86334",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
-{ "XF86334",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
+{ "XF86335",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
+{ "XF86335",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
 { "Xsrc1",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_SRC,		NULL		},
 { "Xsrcctrb",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_CSRC,		NULL		},
 { "Xbin",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_BIN,		NULL		},
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index c626af8..684f6b5 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -840,7 +840,7 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
       { "local",	"Local additions collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
-      { "XFree86",	"The XFree86 3.3.4 distribution",
+      { "XFree86",	"The XFree86 3.3.5 distribution",
 	x11FlagCheck,	distSetXF86 },
       { "All",		"All sources, binaries and X Window System binaries",
 	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
@@ -923,8 +923,8 @@ DMenu MenuSrcDistributions = {
 
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
-    "XFree86 3.3.4 Distribution",
-    "Please select the components you need from the XFree86 3.3.4\n"
+    "XFree86 3.3.5 Distribution",
+    "Please select the components you need from the XFree86 3.3.5\n"
     "distribution sets.",
     NULL,
     NULL,
@@ -939,7 +939,7 @@ DMenu MenuXF86Select = {
 
 DMenu MenuXF86SelectCore = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
-    "XFree86 3.3.4 base distribution types",
+    "XFree86 3.3.5 base distribution types",
     "Please check off the basic XFree86 components you wish to install.\n"
     "Bin, lib, and set are recommended for a minimum installaion.",
     NULL,
@@ -970,9 +970,9 @@ DMenu MenuXF86SelectCore = {
       { "9set",		"XFree86 Setup Utility for PC98 machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
 #endif
-      { "sources",	"XFree86 3.3.4 standard sources",
+      { "sources",	"XFree86 3.3.5 standard sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
-      { "csources",	"XFree86 3.3.4 contrib sources",
+      { "csources",	"XFree86 3.3.5 contrib sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
       { "All",		"Select all of the above",
 	NULL,		setX11Misc, NULL, NULL, ' ', ' ', ' ' },
diff --git a/release/sysinstall/sysinstall.8 b/release/sysinstall/sysinstall.8
index 19ed764..98bc9df 100644
--- a/release/sysinstall/sysinstall.8
+++ b/release/sysinstall/sysinstall.8
@@ -453,95 +453,95 @@ XFree86 official sources.
 .It Li XF86-co
 XFree86 contributed sources.
 .It Li Xbin
-XFree86 3.3.4 binaries.
+XFree86 3.3.5 binaries.
 .It Li Xcfg
-XFree86 3.3.4 configuration files.
+XFree86 3.3.5 configuration files.
 .It Li Xdoc
-XFree86 3.3.4 documentation.
+XFree86 3.3.5 documentation.
 .It Li Xhtml
-XFree86 3.3.4 HTML documentation.
+XFree86 3.3.5 HTML documentation.
 .It Li Xlib
-XFree86 3.3.4 libraries.
+XFree86 3.3.5 libraries.
 .It Li Xlk98
-XFree86 3.3.4 server link-kit for PC98 machines.
+XFree86 3.3.5 server link-kit for PC98 machines.
 .It Li Xlkit
-XFree86 3.3.4 server link-kit for standard machines.
+XFree86 3.3.5 server link-kit for standard machines.
 .It Li Xman
-XFree86 3.3.4 manual pages.
+XFree86 3.3.5 manual pages.
 .It Li Xprog
-XFree86 3.3.4 programmer's distribution.
+XFree86 3.3.5 programmer's distribution.
 .It Li Xps
-XFree86 3.3.4 postscript documentation.
+XFree86 3.3.5 postscript documentation.
 .It Li Xset
-XFree86 3.3.4 graphical setup tool.
+XFree86 3.3.5 graphical setup tool.
 .It Li X8514
-XFree86 3.3.4 8514 server.
+XFree86 3.3.5 8514 server.
 .It Li X9480
-XFree86 3.3.4 PC98 8-bit (256 color) PEGC-480 server.
+XFree86 3.3.5 PC98 8-bit (256 color) PEGC-480 server.
 .It Li X9EGC
-XFree86 3.3.4 PC98 4-bit (16 color) EGC server.
+XFree86 3.3.5 PC98 4-bit (16 color) EGC server.
 .It Li X9GA9
-XFree86 3.3.4 PC98 GA-968V4/PCI (S3 968) server.
+XFree86 3.3.5 PC98 GA-968V4/PCI (S3 968) server.
 .It Li X9GAN
-XFree86 3.3.4 PC98 GANB-WAP (cirrus) server.
+XFree86 3.3.5 PC98 GANB-WAP (cirrus) server.
 .It Li X9LPW
-XFree86 3.3.4 PC98 PowerWindowLB (S3) server.
+XFree86 3.3.5 PC98 PowerWindowLB (S3) server.
 .It Li X9NKV
-XFree86 3.3.4 PC98 NKV-NEC (cirrus) server.
+XFree86 3.3.5 PC98 NKV-NEC (cirrus) server.
 .It Li X9NS3
-XFree86 3.3.4 PC98 NEC (S3) server.
+XFree86 3.3.5 PC98 NEC (S3) server.
 .It Li X9SPW
-XFree86 3.3.4 PC98 SKB-PowerWindow (S3) server.
+XFree86 3.3.5 PC98 SKB-PowerWindow (S3) server.
 .It Li X9TGU
-XFree86 3.3.4 PC98 Cyber9320 and TGUI9680 server.
+XFree86 3.3.5 PC98 Cyber9320 and TGUI9680 server.
 .It Li X9WEP
-XFree86 3.3.4 PC98 WAB-EP (cirrus) server.
+XFree86 3.3.5 PC98 WAB-EP (cirrus) server.
 .It Li X9WS
-XFree86 3.3.4 PC98 WABS (cirrus) server.
+XFree86 3.3.5 PC98 WABS (cirrus) server.
 .It Li X9WSN
-XFree86 3.3.4 PC98 WSN-A2F (cirrus) server.
+XFree86 3.3.5 PC98 WSN-A2F (cirrus) server.
 .It Li XAGX
-XFree86 3.3.4 8 bit AGX server.
+XFree86 3.3.5 8 bit AGX server.
 .It Li XI128
-XFree86 3.3.4 #9 Imagine I128 server.
+XFree86 3.3.5 #9 Imagine I128 server.
 .It Li XMa8
-XFree86 3.3.4 ATI Mach8 server.
+XFree86 3.3.5 ATI Mach8 server.
 .It Li XMa32
-XFree86 3.3.4 ATI Mach32 server.
+XFree86 3.3.5 ATI Mach32 server.
 .It Li XMa64
-XFree86 3.3.4 ATI Mach64 server.
+XFree86 3.3.5 ATI Mach64 server.
 .It Li XMono
-XFree86 3.3.4 monochrome server.
+XFree86 3.3.5 monochrome server.
 .It Li XP9K
-XFree86 3.3.4 P9000 server.
+XFree86 3.3.5 P9000 server.
 .It Li XS3
-XFree86 3.3.4 S3 server.
+XFree86 3.3.5 S3 server.
 .It Li XS3V
-XFree86 3.3.4 S3 Virge server.
+XFree86 3.3.5 S3 Virge server.
 .It Li XSVGA
-XFree86 3.3.4 SVGA server.
+XFree86 3.3.5 SVGA server.
 .It Li XVG16
-XFree86 3.3.4 VGA16 server.
+XFree86 3.3.5 VGA16 server.
 .It Li XW32
-XFree86 3.3.4 ET4000/W32, /W32i and /W32p server.
+XFree86 3.3.5 ET4000/W32, /W32i and /W32p server.
 .It Li XTGA
 Server for TGA cards (alpha architecture only).
 .It Li Xnest
-XFree86 3.3.4 nested X server.
+XFree86 3.3.5 nested X server.
 .It Li Xvfb
-XFree86 3.3.4 virtual frame-buffer X server.
+XFree86 3.3.5 virtual frame-buffer X server.
 .It Li Xfnts
-XFree86 3.3.4 base font set.
+XFree86 3.3.5 base font set.
 .It Li Xf100
-XFree86 3.3.4 100DPI font set.
+XFree86 3.3.5 100DPI font set.
 .It Li Xfcyr
-XFree86 3.3.4 Cyrillic font set.
+XFree86 3.3.5 Cyrillic font set.
 .It Li Xfscl
-XFree86 3.3.4 scalable font set.
+XFree86 3.3.5 scalable font set.
 .It Li Xfnon
-XFree86 3.3.4 non-english font set.
+XFree86 3.3.5 non-english font set.
 .It Li Xfsrv
-XFree86 3.3.4 font server.
+XFree86 3.3.5 font server.
 .El
 .It distSetDeveloper
 Selects the standard Developer's distribution set.
@@ -580,7 +580,7 @@ Interactively select source subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distSetXF86
-Interactively select XFree86 3.3.4 subcomponents.
+Interactively select XFree86 3.3.5 subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distExtractAll
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index c626af8..684f6b5 100644
--- a/usr.sbin/sade/menus.c
+++ b/usr.sbin/sade/menus.c
@@ -840,7 +840,7 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
       { "local",	"Local additions collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
-      { "XFree86",	"The XFree86 3.3.4 distribution",
+      { "XFree86",	"The XFree86 3.3.5 distribution",
 	x11FlagCheck,	distSetXF86 },
       { "All",		"All sources, binaries and X Window System binaries",
 	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
@@ -923,8 +923,8 @@ DMenu MenuSrcDistributions = {
 
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
-    "XFree86 3.3.4 Distribution",
-    "Please select the components you need from the XFree86 3.3.4\n"
+    "XFree86 3.3.5 Distribution",
+    "Please select the components you need from the XFree86 3.3.5\n"
     "distribution sets.",
     NULL,
     NULL,
@@ -939,7 +939,7 @@ DMenu MenuXF86Select = {
 
 DMenu MenuXF86SelectCore = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
-    "XFree86 3.3.4 base distribution types",
+    "XFree86 3.3.5 base distribution types",
     "Please check off the basic XFree86 components you wish to install.\n"
     "Bin, lib, and set are recommended for a minimum installaion.",
     NULL,
@@ -970,9 +970,9 @@ DMenu MenuXF86SelectCore = {
       { "9set",		"XFree86 Setup Utility for PC98 machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
 #endif
-      { "sources",	"XFree86 3.3.4 standard sources",
+      { "sources",	"XFree86 3.3.5 standard sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
-      { "csources",	"XFree86 3.3.4 contrib sources",
+      { "csources",	"XFree86 3.3.5 contrib sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
       { "All",		"Select all of the above",
 	NULL,		setX11Misc, NULL, NULL, ' ', ' ', ' ' },
diff --git a/usr.sbin/sade/sade.8 b/usr.sbin/sade/sade.8
index 19ed764..98bc9df 100644
--- a/usr.sbin/sade/sade.8
+++ b/usr.sbin/sade/sade.8
@@ -453,95 +453,95 @@ XFree86 official sources.
 .It Li XF86-co
 XFree86 contributed sources.
 .It Li Xbin
-XFree86 3.3.4 binaries.
+XFree86 3.3.5 binaries.
 .It Li Xcfg
-XFree86 3.3.4 configuration files.
+XFree86 3.3.5 configuration files.
 .It Li Xdoc
-XFree86 3.3.4 documentation.
+XFree86 3.3.5 documentation.
 .It Li Xhtml
-XFree86 3.3.4 HTML documentation.
+XFree86 3.3.5 HTML documentation.
 .It Li Xlib
-XFree86 3.3.4 libraries.
+XFree86 3.3.5 libraries.
 .It Li Xlk98
-XFree86 3.3.4 server link-kit for PC98 machines.
+XFree86 3.3.5 server link-kit for PC98 machines.
 .It Li Xlkit
-XFree86 3.3.4 server link-kit for standard machines.
+XFree86 3.3.5 server link-kit for standard machines.
 .It Li Xman
-XFree86 3.3.4 manual pages.
+XFree86 3.3.5 manual pages.
 .It Li Xprog
-XFree86 3.3.4 programmer's distribution.
+XFree86 3.3.5 programmer's distribution.
 .It Li Xps
-XFree86 3.3.4 postscript documentation.
+XFree86 3.3.5 postscript documentation.
 .It Li Xset
-XFree86 3.3.4 graphical setup tool.
+XFree86 3.3.5 graphical setup tool.
 .It Li X8514
-XFree86 3.3.4 8514 server.
+XFree86 3.3.5 8514 server.
 .It Li X9480
-XFree86 3.3.4 PC98 8-bit (256 color) PEGC-480 server.
+XFree86 3.3.5 PC98 8-bit (256 color) PEGC-480 server.
 .It Li X9EGC
-XFree86 3.3.4 PC98 4-bit (16 color) EGC server.
+XFree86 3.3.5 PC98 4-bit (16 color) EGC server.
 .It Li X9GA9
-XFree86 3.3.4 PC98 GA-968V4/PCI (S3 968) server.
+XFree86 3.3.5 PC98 GA-968V4/PCI (S3 968) server.
 .It Li X9GAN
-XFree86 3.3.4 PC98 GANB-WAP (cirrus) server.
+XFree86 3.3.5 PC98 GANB-WAP (cirrus) server.
 .It Li X9LPW
-XFree86 3.3.4 PC98 PowerWindowLB (S3) server.
+XFree86 3.3.5 PC98 PowerWindowLB (S3) server.
 .It Li X9NKV
-XFree86 3.3.4 PC98 NKV-NEC (cirrus) server.
+XFree86 3.3.5 PC98 NKV-NEC (cirrus) server.
 .It Li X9NS3
-XFree86 3.3.4 PC98 NEC (S3) server.
+XFree86 3.3.5 PC98 NEC (S3) server.
 .It Li X9SPW
-XFree86 3.3.4 PC98 SKB-PowerWindow (S3) server.
+XFree86 3.3.5 PC98 SKB-PowerWindow (S3) server.
 .It Li X9TGU
-XFree86 3.3.4 PC98 Cyber9320 and TGUI9680 server.
+XFree86 3.3.5 PC98 Cyber9320 and TGUI9680 server.
 .It Li X9WEP
-XFree86 3.3.4 PC98 WAB-EP (cirrus) server.
+XFree86 3.3.5 PC98 WAB-EP (cirrus) server.
 .It Li X9WS
-XFree86 3.3.4 PC98 WABS (cirrus) server.
+XFree86 3.3.5 PC98 WABS (cirrus) server.
 .It Li X9WSN
-XFree86 3.3.4 PC98 WSN-A2F (cirrus) server.
+XFree86 3.3.5 PC98 WSN-A2F (cirrus) server.
 .It Li XAGX
-XFree86 3.3.4 8 bit AGX server.
+XFree86 3.3.5 8 bit AGX server.
 .It Li XI128
-XFree86 3.3.4 #9 Imagine I128 server.
+XFree86 3.3.5 #9 Imagine I128 server.
 .It Li XMa8
-XFree86 3.3.4 ATI Mach8 server.
+XFree86 3.3.5 ATI Mach8 server.
 .It Li XMa32
-XFree86 3.3.4 ATI Mach32 server.
+XFree86 3.3.5 ATI Mach32 server.
 .It Li XMa64
-XFree86 3.3.4 ATI Mach64 server.
+XFree86 3.3.5 ATI Mach64 server.
 .It Li XMono
-XFree86 3.3.4 monochrome server.
+XFree86 3.3.5 monochrome server.
 .It Li XP9K
-XFree86 3.3.4 P9000 server.
+XFree86 3.3.5 P9000 server.
 .It Li XS3
-XFree86 3.3.4 S3 server.
+XFree86 3.3.5 S3 server.
 .It Li XS3V
-XFree86 3.3.4 S3 Virge server.
+XFree86 3.3.5 S3 Virge server.
 .It Li XSVGA
-XFree86 3.3.4 SVGA server.
+XFree86 3.3.5 SVGA server.
 .It Li XVG16
-XFree86 3.3.4 VGA16 server.
+XFree86 3.3.5 VGA16 server.
 .It Li XW32
-XFree86 3.3.4 ET4000/W32, /W32i and /W32p server.
+XFree86 3.3.5 ET4000/W32, /W32i and /W32p server.
 .It Li XTGA
 Server for TGA cards (alpha architecture only).
 .It Li Xnest
-XFree86 3.3.4 nested X server.
+XFree86 3.3.5 nested X server.
 .It Li Xvfb
-XFree86 3.3.4 virtual frame-buffer X server.
+XFree86 3.3.5 virtual frame-buffer X server.
 .It Li Xfnts
-XFree86 3.3.4 base font set.
+XFree86 3.3.5 base font set.
 .It Li Xf100
-XFree86 3.3.4 100DPI font set.
+XFree86 3.3.5 100DPI font set.
 .It Li Xfcyr
-XFree86 3.3.4 Cyrillic font set.
+XFree86 3.3.5 Cyrillic font set.
 .It Li Xfscl
-XFree86 3.3.4 scalable font set.
+XFree86 3.3.5 scalable font set.
 .It Li Xfnon
-XFree86 3.3.4 non-english font set.
+XFree86 3.3.5 non-english font set.
 .It Li Xfsrv
-XFree86 3.3.4 font server.
+XFree86 3.3.5 font server.
 .El
 .It distSetDeveloper
 Selects the standard Developer's distribution set.
@@ -580,7 +580,7 @@ Interactively select source subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distSetXF86
-Interactively select XFree86 3.3.4 subcomponents.
+Interactively select XFree86 3.3.5 subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distExtractAll
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index b39b209..efda93f 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -84,7 +84,7 @@ static Distribution DistTable[] = {
 #endif
 { "ports",	"/usr",			&Dists,		DIST_PORTS,		NULL		},
 { "local",	"/",			&Dists,		DIST_LOCAL,		NULL		},
-{ "XF86334",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
+{ "XF86335",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
 { NULL },
 };
 
@@ -120,8 +120,8 @@ static Distribution SrcDistTable[] = {
 
 /* The XFree86 distribution */
 static Distribution XF86DistTable[] = {
-{ "XF86334",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
-{ "XF86334",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
+{ "XF86335",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_FONTS,	XF86FontDistTable },
+{ "XF86335",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_SERVER,	XF86ServerDistTable },
 { "Xsrc1",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_SRC,		NULL		},
 { "Xsrcctrb",	"/usr/X11R6/src",	&XF86Dists,	DIST_XF86_CSRC,		NULL		},
 { "Xbin",	"/usr/X11R6",		&XF86Dists,	DIST_XF86_BIN,		NULL		},
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index c626af8..684f6b5 100644
--- a/usr.sbin/sysinstall/menus.c
+++ b/usr.sbin/sysinstall/menus.c
@@ -840,7 +840,7 @@ DMenu MenuSubDistributions = {
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
       { "local",	"Local additions collection",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
-      { "XFree86",	"The XFree86 3.3.4 distribution",
+      { "XFree86",	"The XFree86 3.3.5 distribution",
 	x11FlagCheck,	distSetXF86 },
       { "All",		"All sources, binaries and X Window System binaries",
 	NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
@@ -923,8 +923,8 @@ DMenu MenuSrcDistributions = {
 
 DMenu MenuXF86Select = {
     DMENU_NORMAL_TYPE,
-    "XFree86 3.3.4 Distribution",
-    "Please select the components you need from the XFree86 3.3.4\n"
+    "XFree86 3.3.5 Distribution",
+    "Please select the components you need from the XFree86 3.3.5\n"
     "distribution sets.",
     NULL,
     NULL,
@@ -939,7 +939,7 @@ DMenu MenuXF86Select = {
 
 DMenu MenuXF86SelectCore = {
     DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
-    "XFree86 3.3.4 base distribution types",
+    "XFree86 3.3.5 base distribution types",
     "Please check off the basic XFree86 components you wish to install.\n"
     "Bin, lib, and set are recommended for a minimum installaion.",
     NULL,
@@ -970,9 +970,9 @@ DMenu MenuXF86SelectCore = {
       { "9set",		"XFree86 Setup Utility for PC98 machines",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
 #endif
-      { "sources",	"XFree86 3.3.4 standard sources",
+      { "sources",	"XFree86 3.3.5 standard sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
-      { "csources",	"XFree86 3.3.4 contrib sources",
+      { "csources",	"XFree86 3.3.5 contrib sources",
 	dmenuFlagCheck,	dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
       { "All",		"Select all of the above",
 	NULL,		setX11Misc, NULL, NULL, ' ', ' ', ' ' },
diff --git a/usr.sbin/sysinstall/sysinstall.8 b/usr.sbin/sysinstall/sysinstall.8
index 19ed764..98bc9df 100644
--- a/usr.sbin/sysinstall/sysinstall.8
+++ b/usr.sbin/sysinstall/sysinstall.8
@@ -453,95 +453,95 @@ XFree86 official sources.
 .It Li XF86-co
 XFree86 contributed sources.
 .It Li Xbin
-XFree86 3.3.4 binaries.
+XFree86 3.3.5 binaries.
 .It Li Xcfg
-XFree86 3.3.4 configuration files.
+XFree86 3.3.5 configuration files.
 .It Li Xdoc
-XFree86 3.3.4 documentation.
+XFree86 3.3.5 documentation.
 .It Li Xhtml
-XFree86 3.3.4 HTML documentation.
+XFree86 3.3.5 HTML documentation.
 .It Li Xlib
-XFree86 3.3.4 libraries.
+XFree86 3.3.5 libraries.
 .It Li Xlk98
-XFree86 3.3.4 server link-kit for PC98 machines.
+XFree86 3.3.5 server link-kit for PC98 machines.
 .It Li Xlkit
-XFree86 3.3.4 server link-kit for standard machines.
+XFree86 3.3.5 server link-kit for standard machines.
 .It Li Xman
-XFree86 3.3.4 manual pages.
+XFree86 3.3.5 manual pages.
 .It Li Xprog
-XFree86 3.3.4 programmer's distribution.
+XFree86 3.3.5 programmer's distribution.
 .It Li Xps
-XFree86 3.3.4 postscript documentation.
+XFree86 3.3.5 postscript documentation.
 .It Li Xset
-XFree86 3.3.4 graphical setup tool.
+XFree86 3.3.5 graphical setup tool.
 .It Li X8514
-XFree86 3.3.4 8514 server.
+XFree86 3.3.5 8514 server.
 .It Li X9480
-XFree86 3.3.4 PC98 8-bit (256 color) PEGC-480 server.
+XFree86 3.3.5 PC98 8-bit (256 color) PEGC-480 server.
 .It Li X9EGC
-XFree86 3.3.4 PC98 4-bit (16 color) EGC server.
+XFree86 3.3.5 PC98 4-bit (16 color) EGC server.
 .It Li X9GA9
-XFree86 3.3.4 PC98 GA-968V4/PCI (S3 968) server.
+XFree86 3.3.5 PC98 GA-968V4/PCI (S3 968) server.
 .It Li X9GAN
-XFree86 3.3.4 PC98 GANB-WAP (cirrus) server.
+XFree86 3.3.5 PC98 GANB-WAP (cirrus) server.
 .It Li X9LPW
-XFree86 3.3.4 PC98 PowerWindowLB (S3) server.
+XFree86 3.3.5 PC98 PowerWindowLB (S3) server.
 .It Li X9NKV
-XFree86 3.3.4 PC98 NKV-NEC (cirrus) server.
+XFree86 3.3.5 PC98 NKV-NEC (cirrus) server.
 .It Li X9NS3
-XFree86 3.3.4 PC98 NEC (S3) server.
+XFree86 3.3.5 PC98 NEC (S3) server.
 .It Li X9SPW
-XFree86 3.3.4 PC98 SKB-PowerWindow (S3) server.
+XFree86 3.3.5 PC98 SKB-PowerWindow (S3) server.
 .It Li X9TGU
-XFree86 3.3.4 PC98 Cyber9320 and TGUI9680 server.
+XFree86 3.3.5 PC98 Cyber9320 and TGUI9680 server.
 .It Li X9WEP
-XFree86 3.3.4 PC98 WAB-EP (cirrus) server.
+XFree86 3.3.5 PC98 WAB-EP (cirrus) server.
 .It Li X9WS
-XFree86 3.3.4 PC98 WABS (cirrus) server.
+XFree86 3.3.5 PC98 WABS (cirrus) server.
 .It Li X9WSN
-XFree86 3.3.4 PC98 WSN-A2F (cirrus) server.
+XFree86 3.3.5 PC98 WSN-A2F (cirrus) server.
 .It Li XAGX
-XFree86 3.3.4 8 bit AGX server.
+XFree86 3.3.5 8 bit AGX server.
 .It Li XI128
-XFree86 3.3.4 #9 Imagine I128 server.
+XFree86 3.3.5 #9 Imagine I128 server.
 .It Li XMa8
-XFree86 3.3.4 ATI Mach8 server.
+XFree86 3.3.5 ATI Mach8 server.
 .It Li XMa32
-XFree86 3.3.4 ATI Mach32 server.
+XFree86 3.3.5 ATI Mach32 server.
 .It Li XMa64
-XFree86 3.3.4 ATI Mach64 server.
+XFree86 3.3.5 ATI Mach64 server.
 .It Li XMono
-XFree86 3.3.4 monochrome server.
+XFree86 3.3.5 monochrome server.
 .It Li XP9K
-XFree86 3.3.4 P9000 server.
+XFree86 3.3.5 P9000 server.
 .It Li XS3
-XFree86 3.3.4 S3 server.
+XFree86 3.3.5 S3 server.
 .It Li XS3V
-XFree86 3.3.4 S3 Virge server.
+XFree86 3.3.5 S3 Virge server.
 .It Li XSVGA
-XFree86 3.3.4 SVGA server.
+XFree86 3.3.5 SVGA server.
 .It Li XVG16
-XFree86 3.3.4 VGA16 server.
+XFree86 3.3.5 VGA16 server.
 .It Li XW32
-XFree86 3.3.4 ET4000/W32, /W32i and /W32p server.
+XFree86 3.3.5 ET4000/W32, /W32i and /W32p server.
 .It Li XTGA
 Server for TGA cards (alpha architecture only).
 .It Li Xnest
-XFree86 3.3.4 nested X server.
+XFree86 3.3.5 nested X server.
 .It Li Xvfb
-XFree86 3.3.4 virtual frame-buffer X server.
+XFree86 3.3.5 virtual frame-buffer X server.
 .It Li Xfnts
-XFree86 3.3.4 base font set.
+XFree86 3.3.5 base font set.
 .It Li Xf100
-XFree86 3.3.4 100DPI font set.
+XFree86 3.3.5 100DPI font set.
 .It Li Xfcyr
-XFree86 3.3.4 Cyrillic font set.
+XFree86 3.3.5 Cyrillic font set.
 .It Li Xfscl
-XFree86 3.3.4 scalable font set.
+XFree86 3.3.5 scalable font set.
 .It Li Xfnon
-XFree86 3.3.4 non-english font set.
+XFree86 3.3.5 non-english font set.
 .It Li Xfsrv
-XFree86 3.3.4 font server.
+XFree86 3.3.5 font server.
 .El
 .It distSetDeveloper
 Selects the standard Developer's distribution set.
@@ -580,7 +580,7 @@ Interactively select source subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distSetXF86
-Interactively select XFree86 3.3.4 subcomponents.
+Interactively select XFree86 3.3.5 subcomponents.
 .Pp
 \fBVariables:\fR None
 .It distExtractAll