Update "xservers" package to version 3.3.6.2. The Changes since version

3.3.6.1 are:
- Build and install fonts because XFree86 3.3.6 servers don't work with
  XFree86 4.x fonts properly.
- Add a warning message that the font path in "/etc/XF86Config" needs to
  be adjusted.

5 files changed, 38 insertions, 8 deletions

diff --git a/x11/xservers/MESSAGE b/x11/xservers/MESSAGE
new file mode 100644
index 00000000000..89ba60ea6b0
--- /dev/null
+++ b/x11/xservers/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2002/02/23 18:34:13 tron Exp $
+
+Please change the font path directives in "/etc/XF86Config" to use
+"${PREFIX}/${X11_SUBDIR}lib/X11/fonts" instead of "${X11BASE}/lib/X11/fonts"
+because the old X servers cannot handle the new fonts properly.
+===========================================================================
diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index 0809db86ee4..5a7d5e9de3d 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2002/02/11 13:39:41 tron Exp $#
+# $NetBSD: Makefile,v 1.6 2002/02/23 18:34:13 tron Exp $#
 
-DISTNAME=	xservers-3.3.6.1
+DISTNAME=	xservers-3.3.6.2
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -25,8 +25,11 @@ IGNORE=		"The X11 servers are included in your X11 distribution."
 .endif
 
 X11_SUBDIR=	X11R6.3
-X11_SRCS=	Imakefile Makefile config include lib nls \
-		programs/Imakefile programs/Xserver programs/xkbcomp
+X11_SRCS=	Imakefile Makefile config fonts include lib nls \
+		programs/Imakefile programs/Xserver programs/mkfontdir \
+		programs/xkbcomp
+
+MESSAGE_SUBST+=	X11_SUBDIR=${X11_SUBDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/xservers/distinfo b/x11/xservers/distinfo
index bcdafaf1b7d..564dec4f392 100644
--- a/x11/xservers/distinfo
+++ b/x11/xservers/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2002/02/11 13:39:42 tron Exp $
+$NetBSD: distinfo,v 1.2 2002/02/23 18:34:13 tron Exp $
 
-SHA1 (patch-aa) = 68f565f14c4f27855621ac5fbfa4bb24e4de1e52
+SHA1 (patch-aa) = 3221e1993bf65c9f7516a146b73cddf32af6c0fa
 SHA1 (patch-ab) = 49380b43e031c878297eb32aaf014ac9244b1785
 SHA1 (patch-ac) = 35f3f5f7e431a0ca2e1ff97ba5ffc22a65681d4d
+SHA1 (patch-ad) = d2625138dba810be59a99e1ba8d28460f7edb789
diff --git a/x11/xservers/patches/patch-aa b/x11/xservers/patches/patch-aa
index 9d1a2cdec53..7bb3c2bc908 100644
--- a/x11/xservers/patches/patch-aa
+++ b/x11/xservers/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2002/02/11 13:39:42 tron Exp $
+B$NetBSD: patch-aa,v 1.2 2002/02/23 18:34:14 tron Exp $
 
 --- programs/Imakefile  1998/12/01 10:26:15     1.2
 +++ programs/Imakefile  2002/02/11 09:16:14
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.1 2002/02/11 13:39:42 tron Exp $
  
  #if BuildServersOnly
 -SUBDIRS = $(XSSRCDIR)
-+SUBDIRS = $(XSSRCDIR) xkbcomp
++SUBDIRS = $(XSSRCDIR) mkfontdir xkbcomp
  #else
  SUBDIRS = \
  	appres bdftopcf bitmap $(SCREENSAVESRCDIR) editres fsinfo \
diff --git a/x11/xservers/patches/patch-ad b/x11/xservers/patches/patch-ad
new file mode 100644
index 00000000000..bcb09321b7f
--- /dev/null
+++ b/x11/xservers/patches/patch-ad
@@ -0,0 +1,19 @@
+$NetBSD: patch-ad,v 1.1 2002/02/23 18:34:14 tron Exp $
+
+--- Imakefile.orig	Sat Feb 23 18:34:46 2002
++++ Imakefile	Sat Feb 23 18:34:28 2002
+@@ -8,11 +8,11 @@
+ #define OSName Unknown Operating System!
+ #endif
+ 
+-#if !BuildServersOnly
+-#if BuildFonts
++#if 1
++#if 1
+         FONTSDIR = fonts
+ #endif
+-#ifndef Win32Architecture
++#if 0
+         DOCSDIR = doc
+         NLSSUBDIR = nls
+ #endif