Update "xservers" package to version 3.3.6.1. Changes since 3.3.6.0:

- Install into sub directory "X11R6.3" because at least on systems with
  "xpkwedge" installed it is not obvious what "/usr/pkg/R6.3" is.
- Build and install own "xkbcomp" because the old servers don't work with
  XFree86 4.x's one.

6 files changed, 55 insertions, 9 deletions

diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index 26c81baf043..0809db86ee4 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2001/12/26 10:01:08 tron Exp $#
+# $NetBSD: Makefile,v 1.5 2002/02/11 13:39:41 tron Exp $#
 
-DISTNAME=	xservers-3.3.6.0
+DISTNAME=	xservers-3.3.6.1
 CATEGORIES=	x11
-MASTER_SITES=	#empty
+MASTER_SITES=	# empty
+DISTFILES=	# empty
 
 MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.xfree86.org/
@@ -23,10 +24,9 @@ IGNORE=		"The X11 servers are included in your X11 distribution."
 .endif
 .endif
 
-X11_LINKS=	bin/xkbcomp lib/X11/xkb
-X11_SUBDIR=	R6.3
+X11_SUBDIR=	X11R6.3
 X11_SRCS=	Imakefile Makefile config include lib nls \
-		programs/Imakefile programs/Xserver
+		programs/Imakefile programs/Xserver programs/xkbcomp
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -53,9 +53,6 @@ do-configure:
 
 post-install:
 	cd ${PREFIX} && \
-	for LINK in ${X11_LINKS}; do \
-	  ${LN} -fs ${X11BASE}/$$LINK ${PREFIX}/${X11_SUBDIR}/$$LINK; \
-	done && \
 	${FIND} ${X11_SUBDIR} \! -type d | sort >${PLIST_SRC} && \
 	${FIND} ${X11_SUBDIR} -type d | sort -r | \
 	${AWK} '{print("@dirrm "$$1)}' >>${PLIST_SRC}
diff --git a/x11/xservers/distinfo b/x11/xservers/distinfo
new file mode 100644
index 00000000000..bcdafaf1b7d
--- /dev/null
+++ b/x11/xservers/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2002/02/11 13:39:42 tron Exp $
+
+SHA1 (patch-aa) = 68f565f14c4f27855621ac5fbfa4bb24e4de1e52
+SHA1 (patch-ab) = 49380b43e031c878297eb32aaf014ac9244b1785
+SHA1 (patch-ac) = 35f3f5f7e431a0ca2e1ff97ba5ffc22a65681d4d
diff --git a/x11/xservers/files/host.def b/x11/xservers/files/host.def
index 607b3c62318..27a70d5d089 100644
--- a/x11/xservers/files/host.def
+++ b/x11/xservers/files/host.def
@@ -12,3 +12,6 @@
 
 #undef	XVirtualFramebufferServer
 #define	XVirtualFramebufferServer	NO
+
+#undef	ForceNormalLib
+#define	ForceNormalLib			NO
diff --git a/x11/xservers/patches/patch-aa b/x11/xservers/patches/patch-aa
new file mode 100644
index 00000000000..9d1a2cdec53
--- /dev/null
+++ b/x11/xservers/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2002/02/11 13:39:42 tron Exp $
+
+--- programs/Imakefile  1998/12/01 10:26:15     1.2
++++ programs/Imakefile  2002/02/11 09:16:14
+@@ -48,7 +48,7 @@
+ #endif
+ 
+ #if BuildServersOnly
+-SUBDIRS = $(XSSRCDIR)
++SUBDIRS = $(XSSRCDIR) xkbcomp
+ #else
+ SUBDIRS = \
+ 	appres bdftopcf bitmap $(SCREENSAVESRCDIR) editres fsinfo \
diff --git a/x11/xservers/patches/patch-ab b/x11/xservers/patches/patch-ab
new file mode 100644
index 00000000000..4f051143468
--- /dev/null
+++ b/x11/xservers/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2002/02/11 13:39:42 tron Exp $
+
+--- lib/Imakefile.orig	Wed Aug 20 07:46:03 1997
++++ lib/Imakefile	Mon Feb 11 12:01:37 2002
+@@ -67,9 +67,9 @@
+ 	     $(XDPMSLIBDIR) \
+ 	     Xp $(ZLIBDIR)
+ #else
+-#if XnestServer
++#if 1
+ XEXTDIR = Xext
+ #endif
+ 
+ LINTSUBDIRS = Xau Xdmcp X11 $(XEXTDIR) $(XKBLIBDIR) $(XKBUILIBDIR) \
+ 	      $(LBXUTILDIR) $(XF86EXTLIBS) $(ZLIBDIR)
diff --git a/x11/xservers/patches/patch-ac b/x11/xservers/patches/patch-ac
new file mode 100644
index 00000000000..9867222e2fa
--- /dev/null
+++ b/x11/xservers/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2002/02/11 13:39:43 tron Exp $
+
+--- lib/X11/Imakefile.orig	Wed Sep  1 23:00:15 1999
++++ lib/X11/Imakefile	Mon Feb 11 13:42:17 2002
+@@ -905,7 +905,7 @@
+ 
+ OBJS = $(OBJS1) $(OBJS2) $(OBJS3)
+ 
+-#if !BuildServersOnly || XnestServer
++#if 1
+ #include <Library.tmpl>
+ 
+ SpecialCLibObjectRule(ErrDes,$(ICONFIGFILES),$(EDB_DEFINES))