Update "xservers" package to version 3.3.6.5:

- Remove a redundant directory from the distribution file which reduces
  its size from 20MB to 15MB.
- Add patches to work arround build problems caused by questionable code
  defining macros named like standard C functions before including
  "stdlib.h". This fixes PR pkg/32453 by Dave J. Barnes.

4 files changed, 33 insertions, 10 deletions

diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile
index 53c40095ce9..b365eb79d6b 100644
--- a/x11/xservers/Makefile
+++ b/x11/xservers/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:20 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2006/01/06 17:20:21 tron Exp $
 
-DISTNAME=	xservers-3.3.6.4
+DISTNAME=	xservers-3.3.6.5
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=	.tar.bz2
@@ -26,9 +26,6 @@ PKG_SKIP_REASON+=	"${PKGNAME} is part of your X11 distribution"
 .endif
 
 X11_SUBDIR=	X11R6.3
-X11_SRCS=	Imakefile Makefile config fonts include lib nls \
-		programs/Imakefile programs/Xserver programs/bdftopcf \
-		programs/mkfontdir programs/xkbcomp
 
 MESSAGE_SUBST+=	X11_SUBDIR=${X11_SUBDIR}
 
@@ -45,7 +42,6 @@ post-install:
 	${FIND} ${X11_SUBDIR} -type d -print | ${SORT} -r | \
 	${AWK} '{print("@dirrm "$$1)}' >>${PLIST_SRC}
 
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 print-x11-release:
diff --git a/x11/xservers/distinfo b/x11/xservers/distinfo
index 27f74ee063d..f84e24408eb 100644
--- a/x11/xservers/distinfo
+++ b/x11/xservers/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/08/08 18:12:46 tron Exp $
+$NetBSD: distinfo,v 1.5 2006/01/06 17:20:21 tron Exp $
 
-SHA1 (xservers-3.3.6.4.tar.bz2) = 6e78dfd8e76d0fc07b0427021bc09581deb08d13
-RMD160 (xservers-3.3.6.4.tar.bz2) = 18e456aa8b39936688cda1798c134ef9ffc27619
-Size (xservers-3.3.6.4.tar.bz2) = 24058313 bytes
+SHA1 (xservers-3.3.6.5.tar.bz2) = cac39534a4c5f8969d93ebfcf1352fc695148b69
+RMD160 (xservers-3.3.6.5.tar.bz2) = eb3cc52911ce7ce96cba1a24734086cbf92887d9
+Size (xservers-3.3.6.5.tar.bz2) = 15688324 bytes
 SHA1 (patch-aa) = 023c69ba09127bc4de484f0cd372aef3a8ea1ed7
 SHA1 (patch-ab) = 49380b43e031c878297eb32aaf014ac9244b1785
 SHA1 (patch-ac) = 35f3f5f7e431a0ca2e1ff97ba5ffc22a65681d4d
 SHA1 (patch-ad) = d2625138dba810be59a99e1ba8d28460f7edb789
+SHA1 (patch-ae) = 300e9c1afb7a77625f282e94611fa1494fe76b97
+SHA1 (patch-af) = ab5054d9374ca67ebbc5ffc1dedb29554040b225
diff --git a/x11/xservers/patches/patch-ae b/x11/xservers/patches/patch-ae
new file mode 100644
index 00000000000..b8bd5028def
--- /dev/null
+++ b/x11/xservers/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2006/01/06 17:20:21 tron Exp $
+
+--- lib/font/Type1/spaces.c.orig	1998-11-23 21:32:50.000000000 +0000
++++ lib/font/Type1/spaces.c	2006-01-06 16:02:52.000000000 +0000
+@@ -38,6 +38,7 @@
+ :h3.Include Files
+ */
+ /* $XFree86: xc/lib/font/Type1/spaces.c,v 3.0.6.2 1998/10/04 15:22:56 hohndel Exp $ */
++#include <stdlib.h>
+ #include "objects.h"
+ #include "spaces.h"
+ #include "paths.h"
diff --git a/x11/xservers/patches/patch-af b/x11/xservers/patches/patch-af
new file mode 100644
index 00000000000..2e34bf16c35
--- /dev/null
+++ b/x11/xservers/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2006/01/06 17:20:21 tron Exp $
+
+--- programs/Xserver/include/misc.h.orig	1997-06-30 14:44:46.000000000 +0100
++++ programs/Xserver/include/misc.h	2006-01-06 17:01:51.000000000 +0000
+@@ -78,6 +78,8 @@
+ extern unsigned long globalSerialNumber;
+ extern unsigned long serverGeneration;
+ 
++#include <stdlib.h>
++
+ #include <X11/Xosdefs.h>
+ #include <X11/Xfuncproto.h>
+ #include <X11/Xmd.h>