Update X.org packages to 6.8.1.

To see the changes about this release, please review the "RELNOTES" file, which is available via www or in the distribution tarballs. These packages were tested on: * NetBSD 2.0/-current * Bluewall GNU/Linux * Slackware 10 GNU/Linux I'm currently testing them on FreeBSD 5.3BETA4.
author: xtraeme <xtraeme@pkgsrc.org> 2004-09-21 17:38:52 +0000
committer: xtraeme <xtraeme@pkgsrc.org> 2004-09-21 17:38:52 +0000
commit: dbf12c08461f54e76cf1d2e4b1b6d5e4717f333c (patch)
tree: cbb27fea780cd24c28951d2e98105643d59fb19a /x11/xorg-libs
parent: 05452cd4d6368cefaa081ef8edc4b9cc3327d539 (diff)
download: pkgsrc-dbf12c08461f54e76cf1d2e4b1b6d5e4717f333c.tar.gz
21 files changed, 153 insertions, 986 deletions
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile
index 10295c66b09..5db157fa89d 100644
--- a/x11/xorg-libs/Makefile
+++ b/x11/xorg-libs/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2004/09/16 19:36:10 minskim Exp $
+# $NetBSD: Makefile,v 1.6 2004/09/21 17:38:53 xtraeme Exp $
 
 DISTNAME=		${DISTFILES}
 PKGNAME=		xorg-libs-${XORG_VER}
-PKGREVISION=		2
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_XORG}
-DISTFILES=		X11R6.7.0-src1.tar.gz X11R6.7.0-src2.tar.gz \
-			X11R6.7.0-src3.tar.gz
+DISTFILES=		X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \
+			X11R${XORG_VER}-src3.tar.gz
 
 MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.x.org/
diff --git a/x11/xorg-libs/PLIST.Linux b/x11/xorg-libs/PLIST.Linux
index f63aefaa230..143df65d83a 100644
--- a/x11/xorg-libs/PLIST.Linux
+++ b/x11/xorg-libs/PLIST.Linux
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+@comment $NetBSD: PLIST.Linux,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
 ${X11ROOT_PREFIX}/lib/libFS.so
 ${X11ROOT_PREFIX}/lib/libFS.so.6
 ${X11ROOT_PREFIX}/lib/libFS.so.6.0
 ${X11ROOT_PREFIX}/lib/libGL.so
 ${X11ROOT_PREFIX}/lib/libGL.so.1
 ${X11ROOT_PREFIX}/lib/libGL.so.1.2
+${X11ROOT_PREFIX}/lib/libGLU.a
 ${X11ROOT_PREFIX}/lib/libGLU.so
 ${X11ROOT_PREFIX}/lib/libGLU.so.1
 ${X11ROOT_PREFIX}/lib/libGLU.so.1.3
@@ -30,9 +31,6 @@ ${X11ROOT_PREFIX}/lib/libX11.so.6.2
 ${X11ROOT_PREFIX}/lib/libXRes.so
 ${X11ROOT_PREFIX}/lib/libXRes.so.1
 ${X11ROOT_PREFIX}/lib/libXRes.so.1.0
-${X11ROOT_PREFIX}/lib/libXThrStub.so
-${X11ROOT_PREFIX}/lib/libXThrStub.so.6
-${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
 ${X11ROOT_PREFIX}/lib/libXTrap.so
 ${X11ROOT_PREFIX}/lib/libXTrap.so.6
 ${X11ROOT_PREFIX}/lib/libXTrap.so.6.4
@@ -42,23 +40,34 @@ ${X11ROOT_PREFIX}/lib/libXaw.so.6
 ${X11ROOT_PREFIX}/lib/libXaw.so.6.1
 ${X11ROOT_PREFIX}/lib/libXaw.so.7
 ${X11ROOT_PREFIX}/lib/libXaw.so.7.0
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXaw.so.8.0
 ${X11ROOT_PREFIX}/lib/libXdmcp.a
 ${X11ROOT_PREFIX}/lib/libXext.so
 ${X11ROOT_PREFIX}/lib/libXext.so.6
 ${X11ROOT_PREFIX}/lib/libXext.so.6.4
 ${X11ROOT_PREFIX}/lib/libXfont.a
-${X11ROOT_PREFIX}/lib/libXfont.so
-${X11ROOT_PREFIX}/lib/libXfont.so.1
-${X11ROOT_PREFIX}/lib/libXfont.so.1.5
-${X11ROOT_PREFIX}/lib/libXfontcache.so
-${X11ROOT_PREFIX}/lib/libXfontcache.so.1
-${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
 ${X11ROOT_PREFIX}/lib/libXi.so
 ${X11ROOT_PREFIX}/lib/libXi.so.6
 ${X11ROOT_PREFIX}/lib/libXi.so.6.0
 ${X11ROOT_PREFIX}/lib/libXinerama.so
 ${X11ROOT_PREFIX}/lib/libXinerama.so.1
 ${X11ROOT_PREFIX}/lib/libXinerama.so.1.0
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXevie.so.1.0
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
+${X11ROOT_PREFIX}/lib/libdmx.a
 ${X11ROOT_PREFIX}/lib/libXmu.so
 ${X11ROOT_PREFIX}/lib/libXmu.so.6
 ${X11ROOT_PREFIX}/lib/libXmu.so.6.2
@@ -120,3 +129,5 @@ ${X11ROOT_PREFIX}/lib/libxkbfile.so.1.0
 ${X11ROOT_PREFIX}/lib/libxkbui.so
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1
 ${X11ROOT_PREFIX}/lib/libxkbui.so.1.0
+${X11ROOT_PREFIX}/include/X11/extensions/dmxext.h
+${X11ROOT_PREFIX}/include/X11/extensions/dmxproto.h
diff --git a/x11/xorg-libs/PLIST.NetBSD b/x11/xorg-libs/PLIST.NetBSD
index 9817ceac7e4..0813de70399 100644
--- a/x11/xorg-libs/PLIST.NetBSD
+++ b/x11/xorg-libs/PLIST.NetBSD
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
+@comment $NetBSD: PLIST.NetBSD,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
 ${X11ROOT_PREFIX}/lib/libFS.a
 ${X11ROOT_PREFIX}/lib/libFS.so
 ${X11ROOT_PREFIX}/lib/libFS.so.6
@@ -35,9 +35,6 @@ ${X11ROOT_PREFIX}/lib/libXRes.a
 ${X11ROOT_PREFIX}/lib/libXRes.so
 ${X11ROOT_PREFIX}/lib/libXRes.so.1
 ${X11ROOT_PREFIX}/lib/libXRes.so.1.0
-${X11ROOT_PREFIX}/lib/libXThrStub.so
-${X11ROOT_PREFIX}/lib/libXThrStub.so.6
-${X11ROOT_PREFIX}/lib/libXThrStub.so.6.1
 ${X11ROOT_PREFIX}/lib/libXTrap.a
 ${X11ROOT_PREFIX}/lib/libXTrap.so
 ${X11ROOT_PREFIX}/lib/libXTrap.so.6
@@ -49,6 +46,26 @@ ${X11ROOT_PREFIX}/lib/libXaw.so.6
 ${X11ROOT_PREFIX}/lib/libXaw.so.6.1
 ${X11ROOT_PREFIX}/lib/libXaw.so.7
 ${X11ROOT_PREFIX}/lib/libXaw.so.7.0
+${X11ROOT_PREFIX}/lib/libXaw.so.8
+${X11ROOT_PREFIX}/lib/libXaw.so.8.0
+${X11ROOT_PREFIX}/lib/libXcomposite.a
+${X11ROOT_PREFIX}/lib/libXcomposite.so
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1
+${X11ROOT_PREFIX}/lib/libXcomposite.so.1.0
+${X11ROOT_PREFIX}/lib/libXdamage.a
+${X11ROOT_PREFIX}/lib/libXdamage.so
+${X11ROOT_PREFIX}/lib/libXdamage.so.1
+${X11ROOT_PREFIX}/lib/libXdamage.so.1.0
+${X11ROOT_PREFIX}/lib/libXevie.a
+${X11ROOT_PREFIX}/lib/libXevie.so
+${X11ROOT_PREFIX}/lib/libXevie.so.1
+${X11ROOT_PREFIX}/lib/libXevie.so.1.0
+${X11ROOT_PREFIX}/lib/libXfixes.a
+${X11ROOT_PREFIX}/lib/libXfixes.so
+${X11ROOT_PREFIX}/lib/libXfixes.so.3
+${X11ROOT_PREFIX}/lib/libXfixes.so.3.0
+${X11ROOT_PREFIX}/lib/libXprintAppUtil.a
+${X11ROOT_PREFIX}/lib/libXprintUtil.a
 ${X11ROOT_PREFIX}/lib/libXdmcp.a
 ${X11ROOT_PREFIX}/lib/libXext.a
 ${X11ROOT_PREFIX}/lib/libXext.so
@@ -58,10 +75,6 @@ ${X11ROOT_PREFIX}/lib/libXfont.a
 ${X11ROOT_PREFIX}/lib/libXfont.so
 ${X11ROOT_PREFIX}/lib/libXfont.so.1
 ${X11ROOT_PREFIX}/lib/libXfont.so.1.5
-${X11ROOT_PREFIX}/lib/libXfontcache.a
-${X11ROOT_PREFIX}/lib/libXfontcache.so
-${X11ROOT_PREFIX}/lib/libXfontcache.so.1
-${X11ROOT_PREFIX}/lib/libXfontcache.so.1.2
 ${X11ROOT_PREFIX}/lib/libXi.a
 ${X11ROOT_PREFIX}/lib/libXi.so
 ${X11ROOT_PREFIX}/lib/libXi.so.6
diff --git a/x11/xorg-libs/PLIST.common b/x11/xorg-libs/PLIST.common
index b0a40d309fb..7fcc7f22ab8 100644
--- a/x11/xorg-libs/PLIST.common
+++ b/x11/xorg-libs/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2004/08/11 15:40:49 recht Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2004/09/21 17:38:53 xtraeme Exp $
 ${X11ROOT_PREFIX}/include/DPS/ColorSB.h
 ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h
 ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h
@@ -111,6 +111,8 @@ ${X11ROOT_PREFIX}/include/X11/Xaw/Panner.h
 ${X11ROOT_PREFIX}/include/X11/Xaw/PannerP.h
 ${X11ROOT_PREFIX}/include/X11/Xaw/Porthole.h
 ${X11ROOT_PREFIX}/include/X11/Xaw/PortholeP.h
+${X11ROOT_PREFIX}/include/X11/Xaw/Print.h
+${X11ROOT_PREFIX}/include/X11/Xaw/PrintSP.h
 ${X11ROOT_PREFIX}/include/X11/Xaw/Repeater.h
 ${X11ROOT_PREFIX}/include/X11/Xaw/RepeaterP.h
 ${X11ROOT_PREFIX}/include/X11/Xaw/Reports.h
@@ -179,6 +181,8 @@ ${X11ROOT_PREFIX}/include/X11/Xmu/WidgetNode.h
 ${X11ROOT_PREFIX}/include/X11/Xmu/WinUtil.h
 ${X11ROOT_PREFIX}/include/X11/Xmu/Xct.h
 ${X11ROOT_PREFIX}/include/X11/Xmu/Xmu.h
+${X11ROOT_PREFIX}/include/X11/XprintAppUtil/xpapputil.h
+${X11ROOT_PREFIX}/include/X11/XprintUtil/xprintutil.h
 ${X11ROOT_PREFIX}/include/X11/Xos.h
 ${X11ROOT_PREFIX}/include/X11/Xos_r.h
 ${X11ROOT_PREFIX}/include/X11/Xosdefs.h
@@ -262,6 +266,19 @@ ${X11ROOT_PREFIX}/include/X11/cursorfont.h
 ${X11ROOT_PREFIX}/include/X11/extensions/MITMisc.h
 ${X11ROOT_PREFIX}/include/X11/extensions/Print.h
 ${X11ROOT_PREFIX}/include/X11/extensions/Printstr.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xcomposite.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xdamage.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xevie.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xeviestr.h
+${X11ROOT_PREFIX}/include/X11/extensions/composite.h
+${X11ROOT_PREFIX}/include/X11/extensions/compositeproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/damage.h
+${X11ROOT_PREFIX}/include/X11/extensions/damageproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/damagewire.h
+${X11ROOT_PREFIX}/include/X11/extensions/xevieplaceholder.h
+${X11ROOT_PREFIX}/include/X11/extensions/xfixesproto.h
+${X11ROOT_PREFIX}/include/X11/extensions/xfixeswire.h
+${X11ROOT_PREFIX}/include/X11/extensions/Xfixes.h
 ${X11ROOT_PREFIX}/include/X11/extensions/XEVI.h
 ${X11ROOT_PREFIX}/include/X11/extensions/XEVIstr.h
 ${X11ROOT_PREFIX}/include/X11/extensions/XI.h
@@ -303,9 +320,6 @@ ${X11ROOT_PREFIX}/include/X11/extensions/bigreqstr.h
 ${X11ROOT_PREFIX}/include/X11/extensions/dpms.h
 ${X11ROOT_PREFIX}/include/X11/extensions/dpmsstr.h
 ${X11ROOT_PREFIX}/include/X11/extensions/extutil.h
-${X11ROOT_PREFIX}/include/X11/extensions/fontcache.h
-${X11ROOT_PREFIX}/include/X11/extensions/fontcacheP.h
-${X11ROOT_PREFIX}/include/X11/extensions/fontcachstr.h
 ${X11ROOT_PREFIX}/include/X11/extensions/lbxbuf.h
 ${X11ROOT_PREFIX}/include/X11/extensions/lbxbufstr.h
 ${X11ROOT_PREFIX}/include/X11/extensions/lbxdeltastr.h
@@ -359,12 +373,6 @@ ${X11ROOT_PREFIX}/include/X11/extensions/xtrapproto.h
 ${X11ROOT_PREFIX}/include/X11/fonts/FS.h
 ${X11ROOT_PREFIX}/include/X11/fonts/FSlib.h
 ${X11ROOT_PREFIX}/include/X11/fonts/FSproto.h
-${X11ROOT_PREFIX}/include/X11/fonts/codeconv/cconvversion.h
-${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcap.h
-${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcconv.h
-${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcconvP.h
-${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttcommon.h
-${X11ROOT_PREFIX}/include/X11/fonts/codeconv/xttversion.h
 ${X11ROOT_PREFIX}/include/X11/fonts/fontenc.h
 ${X11ROOT_PREFIX}/include/X11/fonts/fsmasks.h
 ${X11ROOT_PREFIX}/include/X11/keysym.h
@@ -372,6 +380,10 @@ ${X11ROOT_PREFIX}/include/X11/keysymdef.h
 ${X11ROOT_PREFIX}/include/X11/xpm.h
 ${X11ROOT_PREFIX}/include/xf86Optrec.h
 ${X11ROOT_PREFIX}/include/xf86Parser.h
+${X11ROOT_PREFIX}/lib/pkgconfig/xcomposite.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/xdamage.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/xevie.pc
+${X11ROOT_PREFIX}/lib/pkgconfig/xfixes.pc
 ${X11ROOT_PREFIX}/lib/X11/XErrorDB
 ${X11ROOT_PREFIX}/lib/X11/XKeysymDB
 ${X11ROOT_PREFIX}/lib/X11/Xcms.txt
@@ -519,11 +531,8 @@ ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5/XLC_LOCALE
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/Compose
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XI18N_OBJS
 ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW/XLC_LOCALE
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheChangeCacheSettings.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheSettings.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheGetCacheStatistics.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryExtension.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/FontCacheQueryVersion.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xevie.${LIBMAN_SUFFIX}
+${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfixes.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGA.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGAChangePixmapMode.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XDGACloseFramebuffer.${LIBMAN_SUFFIX}
@@ -562,5 +571,4 @@ ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverSetAttributes.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnregister.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/XScreenSaverUnsetAttributes.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xaw.${LIBMAN_SUFFIX}
-${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xfontcache.${LIBMAN_SUFFIX}
 ${X11ROOT_PREFIX}/${LIBMAN_DIR}/Xss.${LIBMAN_SUFFIX}
diff --git a/x11/xorg-libs/PLIST.common_end b/x11/xorg-libs/PLIST.common_end
index f9a57aa6ddf..eda53d76537 100644
--- a/x11/xorg-libs/PLIST.common_end
+++ b/x11/xorg-libs/PLIST.common_end
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2004/07/29 04:50:53 xtraeme Exp $
+@comment $NetBSD: PLIST.common_end,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
+@dirrm ${X11ROOT_PREFIX}/lib/pkgconfig
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.big5
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW.UTF-8
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/zh_TW
@@ -54,9 +55,10 @@
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/armscii-8
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale/C
 @dirrm ${X11ROOT_PREFIX}/lib/X11/locale
-@dirrm ${X11ROOT_PREFIX}/include/X11/fonts/codeconv
 @dirrm ${X11ROOT_PREFIX}/include/X11/fonts
 @dirrm ${X11ROOT_PREFIX}/include/X11/extensions
+@dirrm ${X11ROOT_PREFIX}/include/X11/XprintAppUtil
+@dirrm ${X11ROOT_PREFIX}/include/X11/XprintUtil
 @dirrm ${X11ROOT_PREFIX}/include/X11/Xmu
 @dirrm ${X11ROOT_PREFIX}/include/X11/Xaw
 @dirrm ${X11ROOT_PREFIX}/include/X11/SM
diff --git a/x11/xorg-libs/buildlink3.mk b/x11/xorg-libs/buildlink3.mk
index 1f1e4db95df..ee2dc996401 100644
--- a/x11/xorg-libs/buildlink3.mk
+++ b/x11/xorg-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/09/16 19:36:10 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 17:38:53 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XORG_LIBS_BUILDLINK3_MK:=	${XORG_LIBS_BUILDLINK3_MK}+
@@ -18,8 +18,7 @@ BUILDLINK_PACKAGES:=	xorg-libs ${BUILDLINK_PACKAGES}
 
 .if !empty(XORG_LIBS_BUILDLINK3_MK:M+)
 
-BUILDLINK_DEPENDS.xorg-libs+=	xorg-libs>=6.7.0
-BUILDLINK_RECOMMENDED.xorg-libs+=	xorg-libs>=6.7.0nb2
+BUILDLINK_DEPENDS.xorg-libs+=	xorg-libs>=6.8.1
 BUILDLINK_PKGSRCDIR.xorg-libs?=	../../x11/xorg-libs
 BUILDLINK_TRANSFORM.xorg-libs+=	-e "s|/${X11ROOT_PREFIX}/|/|"
 
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 24552b88dcc..cd842358275 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,25 +1,17 @@
-$NetBSD: distinfo,v 1.2 2004/09/16 19:36:10 minskim Exp $
+$NetBSD: distinfo,v 1.3 2004/09/21 17:38:53 xtraeme Exp $
 
-SHA1 (X11R6.7.0-src1.tar.gz) = 14f282cee9dc1ff6ebc34d834892599b53195f8b
-Size (X11R6.7.0-src1.tar.gz) = 30039655 bytes
-SHA1 (X11R6.7.0-src2.tar.gz) = c043966761e84ce0a63c351f12291228fbf07d03
-Size (X11R6.7.0-src2.tar.gz) = 5739983 bytes
-SHA1 (X11R6.7.0-src3.tar.gz) = 4234d68bd9484baaaf29f5c58f432edb732b6451
-Size (X11R6.7.0-src3.tar.gz) = 10855793 bytes
-SHA1 (patch-aa) = b890d02e360df4ea43df808f4a128d465b4f607c
-SHA1 (patch-ab) = 17ede6e7c6c232f9fe2804d7ab4addd85b5cd25c
+SHA1 (X11R6.8.1-src1.tar.gz) = 78d64a5ea4440699eefb6c7bf76f7b6ce3f2fb15
+Size (X11R6.8.1-src1.tar.gz) = 30573498 bytes
+SHA1 (X11R6.8.1-src2.tar.gz) = 1fb1d8a47f4b0873d358f8dded21a92ec1d91995
+Size (X11R6.8.1-src2.tar.gz) = 5810902 bytes
+SHA1 (X11R6.8.1-src3.tar.gz) = 8efe7a7b731eb5ea8aeaea63c4985d28b3514d16
+Size (X11R6.8.1-src3.tar.gz) = 10019766 bytes
+SHA1 (patch-aa) = 009b7a2679ae98ebd7071e4fa6169c3401273ca1
 SHA1 (patch-ac) = 90584e5732fb882f431afd69f6fd1c26c9d22bee
-SHA1 (patch-ad) = b34f46d715e90159df3897cf20023b58b9deff67
 SHA1 (patch-ae) = a06752ee9f55e64a407fac6fbde3547fd096c71d
-SHA1 (patch-af) = 30618658577dd37b31191197cd2c156ff72e0d90
 SHA1 (patch-ag) = 178d556fa11818420cd685308cf179ee5f6f7dac
 SHA1 (patch-ah) = 4545d9fd50c2a7b6f5a04da330784eaf9a5373ad
 SHA1 (patch-ai) = 841c2e76c3934b9da967aaed1876b78d3fc0465e
-SHA1 (patch-aj) = db9c5c632af1bc1398ba3761ee9ed2a2470a0a76
-SHA1 (patch-ak) = faefb423f2fd8d996a94a4828d9a637d47249d42
-SHA1 (patch-al) = 65a0e16cae97ad0970ef9e4eee2aaade3fea7b98
-SHA1 (patch-am) = b52649d74b8c6f0d946728c1d706c03860bbedf6
-SHA1 (patch-an) = b47bec52f41d846df82c6dfd9d7dadb12e630334
-SHA1 (patch-ao) = 9d6a0406f9a872063bdd2c6960585c61ddd4ee86
-SHA1 (patch-ap) = c5e1789afa5eeda9be795d78eca6a0c1692fff9a
-SHA1 (patch-aq) = 1eb268c329b33ad9822d752638a8bde62dca4d92
+SHA1 (patch-aj) = 78855dfdafe76695290636e170f69b6685ad23e1
+SHA1 (patch-ak) = d600481936a6b141dc1247e1af2270e224b03b22
+SHA1 (patch-al) = cb82cecd7147da8edd19d9f38a0789f07cddea87
diff --git a/x11/xorg-libs/files/Wraphelp.c b/x11/xorg-libs/files/Wraphelp.c
deleted file mode 100755
index 6231cc534d8..00000000000
--- a/x11/xorg-libs/files/Wraphelp.c
+++ /dev/null
@@ -1,409 +0,0 @@
-/* $NetBSD: Wraphelp.c,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ */
-
-/* Export of this software from the United States of America is assumed
- * to require a specific license from the United States Government.
- * It is the responsibility of any person or organization contemplating
- * export to obtain such a license before exporting.
- */
-
-/*
- * This program implements the
- * Proposed Federal Information Processing
- *  Data Encryption Standard.
- * See Federal Register, March 17, 1975 (40FR12134)
- */
-
-/*
- * Initial permutation,
- */
-static	char	IP[] = {
-	58,50,42,34,26,18,10, 2,
-	60,52,44,36,28,20,12, 4,
-	62,54,46,38,30,22,14, 6,
-	64,56,48,40,32,24,16, 8,
-	57,49,41,33,25,17, 9, 1,
-	59,51,43,35,27,19,11, 3,
-	61,53,45,37,29,21,13, 5,
-	63,55,47,39,31,23,15, 7,
-};
-
-/*
- * Final permutation, FP = IP^(-1)
- */
-static	char	FP[] = {
-	40, 8,48,16,56,24,64,32,
-	39, 7,47,15,55,23,63,31,
-	38, 6,46,14,54,22,62,30,
-	37, 5,45,13,53,21,61,29,
-	36, 4,44,12,52,20,60,28,
-	35, 3,43,11,51,19,59,27,
-	34, 2,42,10,50,18,58,26,
-	33, 1,41, 9,49,17,57,25,
-};
-
-/*
- * Permuted-choice 1 from the key bits
- * to yield C and D.
- * Note that bits 8,16... are left out:
- * They are intended for a parity check.
- */
-static	char	PC1_C[] = {
-	57,49,41,33,25,17, 9,
-	 1,58,50,42,34,26,18,
-	10, 2,59,51,43,35,27,
-	19,11, 3,60,52,44,36,
-};
-
-static	char	PC1_D[] = {
-	63,55,47,39,31,23,15,
-	 7,62,54,46,38,30,22,
-	14, 6,61,53,45,37,29,
-	21,13, 5,28,20,12, 4,
-};
-
-/*
- * Sequence of shifts used for the key schedule.
-*/
-static	char	shifts[] = {
-	1,1,2,2,2,2,2,2,1,2,2,2,2,2,2,1,
-};
-
-/*
- * Permuted-choice 2, to pick out the bits from
- * the CD array that generate the key schedule.
- */
-static	char	PC2_C[] = {
-	14,17,11,24, 1, 5,
-	 3,28,15, 6,21,10,
-	23,19,12, 4,26, 8,
-	16, 7,27,20,13, 2,
-};
-
-static	char	PC2_D[] = {
-	41,52,31,37,47,55,
-	30,40,51,45,33,48,
-	44,49,39,56,34,53,
-	46,42,50,36,29,32,
-};
-
-/*
- * The C and D arrays used to calculate the key schedule.
- */
-
-static	char	C[28];
-static	char	D[28];
-
-/*
- * The key schedule.
- * Generated from the key.
- */
-static	char	KS[16][48];
-
-/*
- * The E bit-selection table.
- */
-static	char	E[48];
-static	char	e[] = {
-	32, 1, 2, 3, 4, 5,
-	 4, 5, 6, 7, 8, 9,
-	 8, 9,10,11,12,13,
-	12,13,14,15,16,17,
-	16,17,18,19,20,21,
-	20,21,22,23,24,25,
-	24,25,26,27,28,29,
-	28,29,30,31,32, 1,
-};
-
-/*
- * Set up the key schedule from the key.
- */
-
-static
-setkey(key)
-char *key;
-{
-	int	i, j, k;
-	int	t;
-	char	*ptr;
-
-	/*
-	 * First, generate C and D by permuting
-	 * the key.  The low order bit of each
-	 * 8-bit char is not used, so C and D are only 28
-	 * bits apiece.
-	 */
-	for (i=0; i<28; i++) {
-		C[i] = key[PC1_C[i]-1];
-		D[i] = key[PC1_D[i]-1];
-	}
-	/*
-	 * To generate Ki, rotate C and D according
-	 * to schedule and pick up a permutation
-	 * using PC2.
-	 */
-	for (i=0; i<16; i++) {
-		/*
-		 * rotate.
-		 */
-		for (k=0; k<shifts[i]; k++) {
-			t = C[0];
-			ptr = C;
-			for (j=0; j<28-1; j++)
-			{
-				*ptr = ptr[1];
-				ptr++;
-			}
-			C[27] = t;
-			t = D[0];
-			ptr = D;
-			for (j=0; j<28-1; j++)
-			{
-				*ptr = ptr[1];
-				ptr++;
-			}
-			D[27] = t;
-		}
-		/*
-		 * get Ki. Note C and D are concatenated.
-		 */
-		ptr = &KS[i][0];
-		for (j=0; j<24; j++) {
-			ptr[j] = C[PC2_C[j]-1];
-			ptr[j+24] = D[PC2_D[j]-28-1];
-		}
-	}
-
-	for(i=0;i<48;i++)
-		E[i] = e[i];
-}
-
-/*
- * The 8 selection functions.
- * For some reason, they give a 0-origin
- * index, unlike everything else.
- */
-static	char	S[8][64] = {
-	14, 4,13, 1, 2,15,11, 8, 3,10, 6,12, 5, 9, 0, 7,
-	 0,15, 7, 4,14, 2,13, 1,10, 6,12,11, 9, 5, 3, 8,
-	 4, 1,14, 8,13, 6, 2,11,15,12, 9, 7, 3,10, 5, 0,
-	15,12, 8, 2, 4, 9, 1, 7, 5,11, 3,14,10, 0, 6,13,
-
-	15, 1, 8,14, 6,11, 3, 4, 9, 7, 2,13,12, 0, 5,10,
-	 3,13, 4, 7,15, 2, 8,14,12, 0, 1,10, 6, 9,11, 5,
-	 0,14, 7,11,10, 4,13, 1, 5, 8,12, 6, 9, 3, 2,15,
-	13, 8,10, 1, 3,15, 4, 2,11, 6, 7,12, 0, 5,14, 9,
-
-	10, 0, 9,14, 6, 3,15, 5, 1,13,12, 7,11, 4, 2, 8,
-	13, 7, 0, 9, 3, 4, 6,10, 2, 8, 5,14,12,11,15, 1,
-	13, 6, 4, 9, 8,15, 3, 0,11, 1, 2,12, 5,10,14, 7,
-	 1,10,13, 0, 6, 9, 8, 7, 4,15,14, 3,11, 5, 2,12,
-
-	 7,13,14, 3, 0, 6, 9,10, 1, 2, 8, 5,11,12, 4,15,
-	13, 8,11, 5, 6,15, 0, 3, 4, 7, 2,12, 1,10,14, 9,
-	10, 6, 9, 0,12,11, 7,13,15, 1, 3,14, 5, 2, 8, 4,
-	 3,15, 0, 6,10, 1,13, 8, 9, 4, 5,11,12, 7, 2,14,
-
-	 2,12, 4, 1, 7,10,11, 6, 8, 5, 3,15,13, 0,14, 9,
-	14,11, 2,12, 4, 7,13, 1, 5, 0,15,10, 3, 9, 8, 6,
-	 4, 2, 1,11,10,13, 7, 8,15, 9,12, 5, 6, 3, 0,14,
-	11, 8,12, 7, 1,14, 2,13, 6,15, 0, 9,10, 4, 5, 3,
-
-	12, 1,10,15, 9, 2, 6, 8, 0,13, 3, 4,14, 7, 5,11,
-	10,15, 4, 2, 7,12, 9, 5, 6, 1,13,14, 0,11, 3, 8,
-	 9,14,15, 5, 2, 8,12, 3, 7, 0, 4,10, 1,13,11, 6,
-	 4, 3, 2,12, 9, 5,15,10,11,14, 1, 7, 6, 0, 8,13,
-
-	 4,11, 2,14,15, 0, 8,13, 3,12, 9, 7, 5,10, 6, 1,
-	13, 0,11, 7, 4, 9, 1,10,14, 3, 5,12, 2,15, 8, 6,
-	 1, 4,11,13,12, 3, 7,14,10,15, 6, 8, 0, 5, 9, 2,
-	 6,11,13, 8, 1, 4,10, 7, 9, 5, 0,15,14, 2, 3,12,
-
-	13, 2, 8, 4, 6,15,11, 1,10, 9, 3,14, 5, 0,12, 7,
-	 1,15,13, 8,10, 3, 7, 4,12, 5, 6,11, 0,14, 9, 2,
-	 7,11, 4, 1, 9,12,14, 2, 0, 6,10,13,15, 3, 5, 8,
-	 2, 1,14, 7, 4,10, 8,13,15,12, 9, 0, 3, 5, 6,11,
-};
-
-/*
- * P is a permutation on the selected combination
- * of the current L and key.
- */
-static	char	P[] = {
-	16, 7,20,21,
-	29,12,28,17,
-	 1,15,23,26,
-	 5,18,31,10,
-	 2, 8,24,14,
-	32,27, 3, 9,
-	19,13,30, 6,
-	22,11, 4,25,
-};
-
-/*
- * The current block, divided into 2 halves.
- */
-
-static	char	L[64];
-#define R   (L + 32)
-static	char	tempL[32];
-static	char	f[32];
-
-/*
- * The combination of the key and the input, before selection.
- */
-static	char	preS[48];
-
-/*
- * The payoff: encrypt a block.
- */
-
-static
-encrypt (block, edflag)
-char *block;
-{
-	int i, ii;
-	register t, j, k;
-
-	/*
-	 * First, permute the bits in the input
-	 */
-	for (j=0; j<64; j++)
-		L[j] = block[IP[j]-1];
-	/*
-	 * Perform an encryption operation 16 times.
-	 */
-	for (ii=0; ii<16; ii++) {
-/*		print_bits ("L R", L); */
-		/*
-		 * Set direction
-		 */
-		if (edflag)
-			i = 15-ii;
-		else
-			i = ii;
-		/*
-		 * Save the R array,
-		 * which will be the new L.
-		 */
-		for (j=0; j<32; j++)
-			tempL[j] = R[j];
-		/*
-		 * Expand R to 48 bits using the E selector;
-		 * exclusive-or with the current key bits.
-		 */
-		for (j=0; j<48; j++)
-			preS[j] = R[E[j]-1] ^ KS[i][j];
-		/*
-		 * The pre-select bits are now considered
-		 * in 8 groups of 6 bits each.
-		 * The 8 selection functions map these
-		 * 6-bit quantities into 4-bit quantities
-		 * and the results permuted
-		 * to make an f(R, K).
-		 * The indexing into the selection functions
-		 * is peculiar; it could be simplified by
-		 * rewriting the tables.
-		 */
-		for (j=0; j<8; j++) {
-			t = 6*j;
-			k = S[j][(preS[t+0]<<5)+
-				(preS[t+1]<<3)+
-				(preS[t+2]<<2)+
-				(preS[t+3]<<1)+
-				(preS[t+4]<<0)+
-				(preS[t+5]<<4)];
-			t = 4*j;
-			f[t+0] = (k>>3)&01;
-			f[t+1] = (k>>2)&01;
-			f[t+2] = (k>>1)&01;
-			f[t+3] = (k>>0)&01;
-		}
-		/*
-		 * The new R is L ^ f(R, K).
-		 * The f here has to be permuted first, though.
-		 */
-		for (j=0; j<32; j++)
-			R[j] = L[j] ^ f[P[j]-1];
-		/*
-		 * Finally, the new L (the original R)
-		 * is copied back.
-		 */
-		for (j=0; j<32; j++)
-			L[j] = tempL[j];
-	}
-	/*
-	 * The output L and R are reversed.
-	 */
-	for (j=0; j<32; j++) {
-		t = L[j];
-		L[j] = R[j];
-		R[j] = t;
-	}
-	/*
-	 * The final output
-	 * gets the inverse permutation of the very original.
-	 */
-	for (j=0; j<64; j++)
-		block[j] = L[FP[j]-1];
-}
-
-static
-bytes_to_bits (bytes, bits)
-    unsigned char   *bytes;
-    char	    *bits;
-{
-    int	    bit, byte, value;
-
-    for (byte = 0; byte < 8; byte++)
-    {
-	value = *bytes++;
-	for (bit = 0; bit < 8; bit++)
-	    *bits++ = (value >> (7-bit)) & 1;
-    }
-}
-
-static
-bits_to_bytes (bits, bytes)
-    char	    *bits;
-    unsigned char   *bytes;
-{
-    int	    bit, byte, value;
-
-    for (byte = 0; byte < 8; byte++)
-    {
-	value = 0;
-	for (bit = 0; bit < 8; bit++)
-	    value |= *bits++ << (7-bit);
-	*bytes++ = value;
-    }
-}
-
-/*
- * Interface compatible with Kerberos DES implementation
- */
-
-# include   "Wrap.h"
-
-/*ARGSUSED*/
-_XdmcpAuthSetup (key, schedule)
-    auth_cblock		key;
-    auth_wrapper_schedule	schedule;
-{
-    char    expand_key[64];
-
-    bytes_to_bits ((unsigned char *) key, expand_key);
-    setkey (expand_key);
-}
-
-/*ARGSUSED*/
-_XdmcpAuthDoIt (input, output, schedule, edflag)
-    auth_cblock		input, output;
-    auth_wrapper_schedule	schedule;
-    int			edflag;
-{
-    char    expand_input[64];
-
-    bytes_to_bits ((unsigned char *) input, expand_input);
-    encrypt (expand_input, !edflag);
-    bits_to_bytes (expand_input, (unsigned char *) output);
-}
diff --git a/x11/xorg-libs/files/host.def b/x11/xorg-libs/files/host.def
index 037a2a189d9..cb858e84dc6 100644
--- a/x11/xorg-libs/files/host.def
+++ b/x11/xorg-libs/files/host.def
@@ -1,9 +1,15 @@
-/* $NetBSD: host.def,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $ */
+/* $NetBSD: host.def,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ */
 
 #define ProjectRoot @PREFIX@
 
 #define MakeCmd @MAKE@
+
+/* To avoid stupid warnings on Linux */
+
+#ifndef LinuxArchitecture
 #define HasGnuMake	NO
+#endif
+
 #define ImakeCmd @IMAKE@
 #define RmanCmd @RMAN@
 #define HtmlIndexCmd @MKHTMLINDEX@
@@ -56,7 +62,6 @@
 #define BuildFreetype2Library NO
 #define BuildFontconfigLibrary NO
 #define BuildXftLibrary NO
-#define BuildXft1Library NO
 #define BuildRandRLibrary NO
 
 #define HasFreetype2 YES
diff --git a/x11/xorg-libs/patches/patch-aa b/x11/xorg-libs/patches/patch-aa
index 10dadac71f1..bf120249ea2 100644
--- a/x11/xorg-libs/patches/patch-aa
+++ b/x11/xorg-libs/patches/patch-aa
@@ -1,23 +1,28 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
 
---- config/cf/Library.tmpl.orig	2004-07-29 01:38:38.000000000 +0200
-+++ config/cf/Library.tmpl	2004-07-29 01:39:33.000000000 +0200
-@@ -389,6 +389,10 @@
+--- config/cf/Library.tmpl.orig	2004-09-10 07:47:27.000000000 +0200
++++ config/cf/Library.tmpl	2004-09-10 07:48:58.000000000 +0200
+@@ -389,8 +389,10 @@
   */
  
  #ifndef MakeStringsDependency
+-# ifndef UseInstalled
+-#  define MakeStringsDependency						@@\
 +#if defined(UseInstalled) || defined(UseInstalledPrograms)
 +#define MakeStringsDependency                                          @@\
 +MAKESTRS = @MAKESTRS@
 +#else
- # define MakeStringsDependency						@@\
  MAKESTRS = $(CONFIGSRC)/util/makestrs					@@\
  NoCmpScript(HostProgramTargetName($(MAKESTRS)) $(MAKESTRS).Osuf)	@@\
-@@ -398,6 +402,7 @@
+ 									@@\
+@@ -398,9 +400,7 @@
+ 	cd $(CONFIGSRC)/util && $(MAKE) HostProgramTargetName(makestrs)	@@\
  									@@\
  includes:: HostProgramTargetName($(MAKESTRS))
- #endif
+-# else
+-#  define MakeStringsDependency  /**/
+-# endif
 +#endif
+ #endif
  
  #ifndef ToolkitMakeStrings
- # if defined(LibTookitMakeStringsDependency) && LibTookitMakeStringsDependency
diff --git a/x11/xorg-libs/patches/patch-ab b/x11/xorg-libs/patches/patch-ab
deleted file mode 100644
index c022b4119a2..00000000000
--- a/x11/xorg-libs/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/29 04:50:56 xtraeme Exp $
-
---- programs/Xserver/dix/main.c.orig	2003-07-07 01:39:11.000000000 +0000
-+++ programs/Xserver/dix/main.c	2003-07-07 01:43:07.000000000 +0000
-@@ -505,7 +505,7 @@
-     /* Leave off the ridBase and ridMask, these must be sent with 
-        connection */
- 
--    setup.release = VENDOR_RELEASE;
-+    setup.release = NULL;
-     /*
-      * per-server image and bitmap parameters are defined in Xmd.h
-      */
diff --git a/x11/xorg-libs/patches/patch-ad b/x11/xorg-libs/patches/patch-ad
deleted file mode 100644
index cc769423f6d..00000000000
--- a/x11/xorg-libs/patches/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
-
---- config/cf/FreeBSD.cf.in.orig	2004-03-03 07:40:43.000000000 +0000
-+++ config/cf/FreeBSD.cf.in	2004-03-03 07:44:05.000000000 +0000
-@@ -190,11 +190,11 @@
- # define CcCmd			$(CLIENTENVSETUP) cc
- # define CplusplusCmd		$(CLIENTENVSETUP) c++
- #else
--# define CcCmd			cc
--# define CplusplusCmd		c++
-+# define CcCmd			@@PKGSRC_CC@@
-+# define CplusplusCmd		@@PKGSRC_CXX@@
- #endif
- 
--#define CppCmd			/usr/bin/cpp
-+#define CppCmd			@@PKGSRC_CPP@@
- #define PreProcessCmd		CppCmd
- #define StandardCppOptions	-traditional
- #define StandardCppDefines	/**/
-@@ -207,7 +207,7 @@
- #else
- #define NoSystemWarn
- #endif
--#define DefaultCCOptions	-ansi -pedantic NoSystemWarn -Dasm=__asm \
-+#define DefaultCCOptions	-ansi NoSystemWarn -Dasm=__asm \
- 	GccWarningOptions
- #endif
- #endif
-@@ -439,18 +439,8 @@
- #define XawI18nDefines		-DUSE_XWCHAR_STRING -DUSE_XMBTOWC
- #endif
- 
--/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
--#ifndef DefaultGcc2i386Opt
--#if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
--#define DefaultGcc2i386Opt -O2 GccAliasingArgs
--#endif
--#endif
--
--#ifdef i386Architecture
--# define OptimizedCDebugFlags DefaultGcc2i386Opt
--#else
--# define OptimizedCDebugFlags -O
--#endif
-+#define DefaultGcc2i386Opt
-+#define OptimizedCDebugFlags   @@PKGSRC_CFLAGS@@
- 
- #ifndef PreIncDir
- # define PreIncDir	/usr/include
-@@ -476,7 +466,7 @@
-  * Compress manual pages
-  */
- #ifndef CompressManPages
--# define CompressManPages	YES
-+# define CompressManPages	NO
- #endif
- 
- #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1)
diff --git a/x11/xorg-libs/patches/patch-af b/x11/xorg-libs/patches/patch-af
deleted file mode 100644
index ac0432fe498..00000000000
--- a/x11/xorg-libs/patches/patch-af
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/07/29 04:50:58 xtraeme Exp $
-
-http://www.mail-archive.com/devel@xfree86.org/msg04688.html
-
---- ./lib/XvMC/hw/i810/Imakefile.orig	2002-10-30 10:42:57.000000000 -0800
-+++ ./lib/XvMC/hw/i810/Imakefile
-@@ -20,7 +20,7 @@ ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-       DEFINES = $(ALLOC_DEFINES) -DTRUE=1 -DFALSE=0
-      INCLUDES = -I$(XINCLUDESRC) -I$(INCLUDESRC) -I$(XLIBSRC) -I$(EXTINCSRC) \
- 		-I$(XF86COMSRC) -I$(XF86OSSRC) -I$(XF86OSSRC)/linux/drm/kernel \
--		-I$(XF86DRIVERSRC)/i810
-+		-I$(XF86DRIVERSRC)/i810 -I$(XF86OSSRC)/shared/drm/kernel
-          SRCS = I810XvMC.c
-          OBJS = I810XvMC.o xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
-      LINTLIBS = $(LINTXLIB)
diff --git a/x11/xorg-libs/patches/patch-aj b/x11/xorg-libs/patches/patch-aj
index 26db6bbdc50..49e42ec442a 100644
--- a/x11/xorg-libs/patches/patch-aj
+++ b/x11/xorg-libs/patches/patch-aj
@@ -1,53 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2004/09/16 19:36:10 minskim Exp $
+$NetBSD: patch-aj,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
 
---- extras/Xpm/lib/create.c.orig	2004-03-04 11:46:10.000000000 -0600
-+++ extras/Xpm/lib/create.c
-@@ -816,6 +816,9 @@ XpmCreateImageFromXpmImage(display, imag
- 
-     ErrorStatus = XpmSuccess;
- 
-+    if (image->ncolors >= SIZE_MAX / sizeof(Pixel))
-+	return (XpmNoMemory);
-+
-     /* malloc pixels index tables */
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
-@@ -988,6 +991,8 @@ CreateXImage(display, visual, depth, for
- 	return (XpmNoMemory);
- 
- #if !defined(FOR_MSW) && !defined(AMIGA)
-+    if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
-+	return XpmNoMemory;
-     /* now that bytes_per_line must have been set properly alloc data */
-     (*image_return)->data =
- 	(char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -2055,6 +2060,9 @@ xpmParseDataAndCreate(display, data, ima
- 	xpmGetCmt(data, &colors_cmt);
- 
-     /* malloc pixels index tables */
-+    if (ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+	return XpmNoMemory;
-+
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
-     if (!image_pixels)
- 	RETURN(XpmNoMemory);
-@@ -2309,7 +2317,8 @@ ParseAndPutPixels(
- 	    }
- 	    obm = SelectObject(*dc, image->bitmap);
+--- programs/x11perf/Imakefile.orig	2004-09-10 09:44:07.000000000 +0200
++++ programs/x11perf/Imakefile	2004-09-10 09:44:19.000000000 +0200
+@@ -12,7 +12,7 @@
+ #if HasShm
+         SHMDEFS = -DMITSHM
  #endif
--
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
- 
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
-@@ -2415,6 +2424,9 @@ if (cidx[f]) XpmFree(cidx[f]);}
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
+-#if BuildRenderLibrary
++#if 0
+     XRENDERDEFS = -DXRENDER
+     XRENDERDEPS = $(DEPXRENDERLIB)
+     XRENDERLIBS = $(XRENDERLIB)
diff --git a/x11/xorg-libs/patches/patch-ak b/x11/xorg-libs/patches/patch-ak
index 4bdaef1a838..391c16fd8ae 100644
--- a/x11/xorg-libs/patches/patch-ak
+++ b/x11/xorg-libs/patches/patch-ak
@@ -1,13 +1,13 @@
-$NetBSD: patch-ak,v 1.1 2004/09/16 19:36:10 minskim Exp $
+$NetBSD: patch-ak,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
 
---- extras/Xpm/lib/data.c.orig	2004-03-04 11:46:10.000000000 -0600
-+++ extras/Xpm/lib/data.c
-@@ -375,7 +375,7 @@ xpmGetCmt(data, cmt)
- {
-     if (!data->type)
- 	*cmt = NULL;
--    else if (data->CommentLength) {
-+    else if (data->CommentLength != 0 && data->CommentLength < SIZE_MAX - 1) {
- 	*cmt = (char *) XpmMalloc(data->CommentLength + 1);
- 	strncpy(*cmt, data->Comment, data->CommentLength);
- 	(*cmt)[data->CommentLength] = '\0';
+--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig	2004-09-14 10:59:24.000000000 +0200
++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile	2004-09-14 11:00:01.000000000 +0200
+@@ -128,7 +128,7 @@
+ #endif
+ 
+ LOCAL_LIBRARIES = $(XKBUILIB) $(XKBFILELIB) -lxf86config $(XXF86MISCLIB) \
+-		  $(XXF86VMLIB) $(XAWLIB) $(XMULIB) $(XTOOLLIB) \
++		  $(XXF86VMLIB) -lXaw $(XMULIB) $(XTOOLLIB) \
+ 		  $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(LOADERLIB) $(DLLIB) \
+ 		  $(XLIB) $(CURSESLIB) RegexLibrary -lm
+ 
diff --git a/x11/xorg-libs/patches/patch-al b/x11/xorg-libs/patches/patch-al
index aeaf66d48bd..84f9a08769d 100644
--- a/x11/xorg-libs/patches/patch-al
+++ b/x11/xorg-libs/patches/patch-al
@@ -1,31 +1,25 @@
-$NetBSD: patch-al,v 1.1 2004/09/16 19:36:10 minskim Exp $
+$NetBSD: patch-al,v 1.2 2004/09/21 17:38:53 xtraeme Exp $
 
---- extras/Xpm/lib/hashtab.c.orig	2003-11-14 10:48:24.000000000 -0600
-+++ extras/Xpm/lib/hashtab.c
-@@ -135,7 +135,7 @@ HashTableGrows(table)
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
-     xpmHashAtom *t, *p;
-     int i;
-     int oldSize = size;
-@@ -144,6 +144,8 @@ HashTableGrows(table)
-     HASH_TABLE_GROWS
- 	table->size = size;
-     table->limit = size / 3;
-+    if (size >= SIZE_MAX / sizeof(*atomTable)) 
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
-@@ -204,6 +206,8 @@ xpmHashTableInit(table)
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size >= SIZE_MAX / sizeof(*atomTable))
-+	return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
- 	return (XpmNoMemory);
+Workaround to make this build on Linux, I think the error is related
+to buildlink.
+
+--- programs/Xserver/hw/dmx/dmxinit.c.orig	2004-09-16 15:20:43.000000000 +0200
++++ programs/Xserver/hw/dmx/dmxinit.c	2004-09-16 15:21:21.000000000 +0200
+@@ -573,7 +573,7 @@
+ #endif
+ 
+     if (dmxGeneration != serverGeneration) {
+-	int vendrel = VENDOR_RELEASE;
++	int vendrel = NULL;
+         int major, minor, year, month, day;
+         
+         dmxGeneration = serverGeneration;
+@@ -595,7 +595,7 @@
+         dmxLog(dmxInfo, "DMX version:        %d.%d.%02d%02d%02d (%s)\n",
+                major, minor, year, month, day, VENDOR_STRING);
+ 
+-        SetVendorRelease(VENDOR_RELEASE);
++        SetVendorRelease(NULL);
+         SetVendorString(VENDOR_STRING);
+ 
+         if (dmxGeneration == 1) {
diff --git a/x11/xorg-libs/patches/patch-am b/x11/xorg-libs/patches/patch-am
deleted file mode 100644
index abc71ee7358..00000000000
--- a/x11/xorg-libs/patches/patch-am
+++ /dev/null
@@ -1,179 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/09/16 19:36:10 minskim Exp $
-
---- extras/Xpm/lib/parse.c.orig	2004-03-04 11:46:10.000000000 -0600
-+++ extras/Xpm/lib/parse.c
-@@ -44,6 +44,24 @@
- #include <ctype.h>
- #include <string.h>
- 
-+#ifdef HAS_STRLCAT
-+# define STRLCAT(dst, src, dstsize) { \
-+  	if (strlcat(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+  	if (strlcpy(dst, src, dstsize) >= (dstsize)) \
-+	    return (XpmFileInvalid); }
-+#else
-+# define STRLCAT(dst, src, dstsize) { \
-+	if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+ 	    strcat(dst, src); \
-+	else return (XpmFileInvalid); }
-+# define STRLCPY(dst, src, dstsize) { \
-+	if (strlen(src) < (dstsize)) \
-+ 	    strcpy(dst, src); \
-+	else return (XpmFileInvalid); }
-+#endif
-+
- LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
- 			 unsigned int height, unsigned int ncolors,
- 			 unsigned int cpp, XpmColor *colorTable,
-@@ -66,7 +84,7 @@ xpmParseValues(data, width, height, ncol
-     unsigned int *extensions;
- {
-     unsigned int l;
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ + 1];
- 
-     if (!data->format) {		/* XPM 2 or 3 */
- 
-@@ -175,10 +193,10 @@ xpmParseColors(data, ncolors, cpp, color
-     XpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key = 0, l, a, b;
-+    unsigned int key = 0, l, a, b, len;
-     unsigned int curkey;		/* current color key */
-     unsigned int lastwaskey;		/* key read */
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ+1];
-     char curbuf[BUFSIZ];		/* current buffer */
-     char **sptr, *s;
-     XpmColor *color;
-@@ -186,6 +204,8 @@ xpmParseColors(data, ncolors, cpp, color
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	return (XpmNoMemory);
-@@ -197,6 +217,10 @@ xpmParseColors(data, ncolors, cpp, color
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -234,13 +258,14 @@ xpmParseColors(data, ncolors, cpp, color
- 		}
- 		if (!lastwaskey && key < NKEYS) {	/* open new key */
- 		    if (curkey) {	/* flush string */
--			s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+			len = strlen(curbuf) + 1;
-+			s = (char *) XpmMalloc(len);
- 			if (!s) {
- 			    xpmFreeColorTable(colorTable, ncolors);
- 			    return (XpmNoMemory);
- 			}
- 			defaults[curkey] = s;
--			strcpy(s, curbuf);
-+			memcpy(s, curbuf, len);
- 		    }
- 		    curkey = key + 1;	/* set new key  */
- 		    *curbuf = '\0';	/* reset curbuf */
-@@ -251,9 +276,9 @@ xpmParseColors(data, ncolors, cpp, color
- 			return (XpmFileInvalid);
- 		    }
- 		    if (!lastwaskey)
--			strcat(curbuf, " ");	/* append space */
-+			STRLCAT(curbuf, " ", sizeof(curbuf)); /* append space */
- 		    buf[l] = '\0';
--		    strcat(curbuf, buf);/* append buf */
-+		    STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
- 		    lastwaskey = 0;
- 		}
- 	    }
-@@ -261,12 +286,13 @@ xpmParseColors(data, ncolors, cpp, color
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmFileInvalid);
- 	    }
--	    s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = defaults[curkey] = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	}
-     } else {				/* XPM 1 */
- 	/* get to the beginning of the first string */
-@@ -279,6 +305,10 @@ xpmParseColors(data, ncolors, cpp, color
- 	    /*
- 	     * read pixel value
- 	     */
-+	    if (cpp >= SIZE_MAX - 1) {
-+		xpmFreeColorTable(colorTable, ncolors);
-+		return (XpmNoMemory);
-+	    }
- 	    color->string = (char *) XpmMalloc(cpp + 1);
- 	    if (!color->string) {
- 		xpmFreeColorTable(colorTable, ncolors);
-@@ -307,16 +337,17 @@ xpmParseColors(data, ncolors, cpp, color
- 	    *curbuf = '\0';		/* init curbuf */
- 	    while ((l = xpmNextWord(data, buf, BUFSIZ))) {
- 		if (*curbuf != '\0')
--		    strcat(curbuf, " ");/* append space */
-+		    STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
- 		buf[l] = '\0';
--		strcat(curbuf, buf);	/* append buf */
-+		STRLCAT(curbuf, buf, sizeof(curbuf));	/* append buf */
- 	    }
--	    s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+	    len = strlen(curbuf) + 1;
-+	    s = (char *) XpmMalloc(len);
- 	    if (!s) {
- 		xpmFreeColorTable(colorTable, ncolors);
- 		return (XpmNoMemory);
- 	    }
--	    strcpy(s, curbuf);
-+	    memcpy(s, curbuf, len);
- 	    color->c_color = s;
- 	    *curbuf = '\0';		/* reset curbuf */
- 	    if (a < ncolors - 1)
-@@ -341,6 +372,9 @@ ParsePixels(data, width, height, ncolors
-     unsigned int *iptr, *iptr2;
-     unsigned int a, x, y;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int)) 
-+	return XpmNoMemory;
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -364,6 +398,9 @@ ParsePixels(data, width, height, ncolors
- 	{
- 	    unsigned short colidx[256];
- 
-+	    if (ncolors > 256)
-+		return (XpmFileInvalid);
-+
- 	    bzero((char *)colidx, 256 * sizeof(short));
- 	    for (a = 0; a < ncolors; a++)
- 		colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -442,6 +479,9 @@ if (cidx[f]) XpmFree(cidx[f]);}
- 	    char *s;
- 	    char buf[BUFSIZ];
- 
-+	    if (cpp >= sizeof(buf))
-+		return (XpmFileInvalid);
-+
- 	    buf[cpp] = '\0';
- 	    if (USE_HASHTABLE) {
- 		xpmHashAtom *slot;
diff --git a/x11/xorg-libs/patches/patch-an b/x11/xorg-libs/patches/patch-an
deleted file mode 100644
index e0007f30609..00000000000
--- a/x11/xorg-libs/patches/patch-an
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-an,v 1.1 2004/09/16 19:36:10 minskim Exp $
-
---- extras/Xpm/lib/scan.c.orig	2004-03-04 11:46:10.000000000 -0600
-+++ extras/Xpm/lib/scan.c
-@@ -107,7 +107,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
- 				  XpmAttributes *attributes));
- 
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, 
-+			     unsigned int ncolors, 
- 			     Pixel *pixels, unsigned int mask,
- 			     unsigned int cpp, XpmAttributes *attributes));
- 
-@@ -232,11 +233,17 @@ XpmCreateXpmImageFromImage(display, imag
-     else
- 	cpp = 0;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+	width * height >= SIZE_MAX / sizeof(unsigned int))
-+	RETURN(XpmNoMemory);
-     pmap.pixelindex =
- 	(unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
- 	RETURN(XpmNoMemory);
- 
-+    if (pmap.size >= SIZE_MAX / sizeof(Pixel)) 
-+	RETURN(XpmNoMemory);
-+
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
- 	RETURN(XpmNoMemory);
-@@ -302,6 +309,8 @@ XpmCreateXpmImageFromImage(display, imag
-      * color
-      */
- 
-+    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
-+	RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
- 	RETURN(XpmNoMemory);
-@@ -360,6 +369,8 @@ ScanTransparentColor(color, cpp, attribu
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
- 	return (XpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -407,7 +418,7 @@ static int
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
-     Display *display;
-     XpmColor *colors;
--    int ncolors;
-+    unsigned int ncolors;
-     Pixel *pixels;
-     unsigned int mask;
-     unsigned int cpp;
-@@ -451,6 +462,8 @@ ScanOtherColors(display, colors, ncolors
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
-+	return (XpmNoMemory);
-     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
- 	return (XpmNoMemory);
diff --git a/x11/xorg-libs/patches/patch-ao b/x11/xorg-libs/patches/patch-ao
deleted file mode 100644
index 9fa35c79448..00000000000
--- a/x11/xorg-libs/patches/patch-ao
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2004/09/16 19:36:10 minskim Exp $
-
---- extras/Xpm/lib/Attrib.c.orig	2003-11-14 10:48:24.000000000 -0600
-+++ extras/Xpm/lib/Attrib.c
-@@ -35,7 +35,7 @@
- #include "XpmI.h"
- 
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
- 				 XpmColor ***oldct));
- 
- LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
-@@ -46,12 +46,15 @@ LFUNC(FreeOldColorTable, void, (XpmColor
- static int
- CreateOldColorTable(ct, ncolors, oldct)
-     XpmColor *ct;
--    int ncolors;
-+    unsigned int ncolors;
-     XpmColor ***oldct;
- {
-     XpmColor **colorTable, **color;
-     int a;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor *))
-+	return XpmNoMemory;
-+
-     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-     if (!colorTable) {
- 	*oldct = NULL;
diff --git a/x11/xorg-libs/patches/patch-ap b/x11/xorg-libs/patches/patch-ap
deleted file mode 100644
index 60569192079..00000000000
--- a/x11/xorg-libs/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/09/16 19:36:10 minskim Exp $
-
---- extras/Xpm/lib/CrDatFrI.c.orig	2004-03-04 11:46:10.000000000 -0600
-+++ extras/Xpm/lib/CrDatFrI.c
-@@ -124,6 +124,8 @@ XpmCreateDataFromXpmImage(data_return, i
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size >= SIZE_MAX / sizeof(char *))
-+	return (XpmNoMemory);
-     header = (char **) XpmCalloc(header_size, sizeof(char *));
-     if (!header)
- 	return (XpmNoMemory);
diff --git a/x11/xorg-libs/patches/patch-aq b/x11/xorg-libs/patches/patch-aq
deleted file mode 100644
index 1c6c8e1cb57..00000000000
--- a/x11/xorg-libs/patches/patch-aq
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2004/09/16 19:36:10 minskim Exp $
-
---- extras/Xpm/lib/XpmI.h.orig	2004-03-04 11:46:10.000000000 -0600
-+++ extras/Xpm/lib/XpmI.h
-@@ -86,6 +86,18 @@ extern FILE *popen();
- 		boundCheckingCalloc((long)(nelem),(long) (elsize))
- #endif
- 
-+#if defined(SCO) || defined(__USLC__)
-+#include <stdint.h>	/* For SIZE_MAX */
-+#endif
-+#include <limits.h>
-+#ifndef SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else 
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #define XPMMAXCMTLEN BUFSIZ
- typedef struct {
-     unsigned int type;
-@@ -187,9 +199,9 @@ typedef struct _xpmHashAtom {
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
-
author	xtraeme <xtraeme@pkgsrc.org>	2004-09-21 17:38:52 +0000
committer	xtraeme <xtraeme@pkgsrc.org>	2004-09-21 17:38:52 +0000
commit	dbf12c08461f54e76cf1d2e4b1b6d5e4717f333c (patch)
tree	cbb27fea780cd24c28951d2e98105643d59fb19a /x11/xorg-libs
parent	05452cd4d6368cefaa081ef8edc4b9cc3327d539 (diff)
download	pkgsrc-dbf12c08461f54e76cf1d2e4b1b6d5e4717f333c.tar.gz