head	1.4;
access;
symbols
	pkgsrc-2013Q2:1.4.0.24
	pkgsrc-2013Q2-base:1.4
	pkgsrc-2012Q4:1.4.0.22
	pkgsrc-2012Q4-base:1.4
	pkgsrc-2011Q4:1.4.0.20
	pkgsrc-2011Q4-base:1.4
	pkgsrc-2011Q2:1.4.0.18
	pkgsrc-2011Q2-base:1.4
	pkgsrc-2009Q4:1.4.0.16
	pkgsrc-2009Q4-base:1.4
	pkgsrc-2008Q4:1.4.0.14
	pkgsrc-2008Q4-base:1.4
	pkgsrc-2008Q3:1.4.0.12
	pkgsrc-2008Q3-base:1.4
	cube-native-xorg:1.4.0.10
	cube-native-xorg-base:1.4
	pkgsrc-2008Q2:1.4.0.8
	pkgsrc-2008Q2-base:1.4
	pkgsrc-2008Q1:1.4.0.6
	pkgsrc-2008Q1-base:1.4
	pkgsrc-2007Q4:1.4.0.4
	pkgsrc-2007Q4-base:1.4
	pkgsrc-2007Q3:1.4.0.2
	pkgsrc-2007Q3-base:1.4
	pkgsrc-2007Q2:1.3.0.12
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.10
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.8
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.6
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.4
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.2
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.2.0.10
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.8
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.6
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.4
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.2
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.1.0.2
	pkgsrc-2004Q3-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2007.08.17.20.25.25;	author joerg;	state dead;
branches;
next	1.3;

1.3
date	2006.01.18.23.53.06;	author xtraeme;	state Exp;
branches;
next	1.2;

1.2
date	2004.09.21.17.38.53;	author xtraeme;	state Exp;
branches;
next	1.1;

1.1
date	2004.09.16.19.36.10;	author minskim;	state Exp;
branches;
next	;


desc
@@


1.4
log
@To quote Johnny Lam: "In modular-xorg we trust"

Remove xorg 6.9 packages from pkgsrc.
@
text
@$NetBSD: patch-al,v 1.3 2006/01/18 23:53:06 xtraeme Exp $

--- programs/xdm/config/xdm-conf.cpp.orig	2006-01-02 11:00:33.000000000 +0100
+++ programs/xdm/config/xdm-conf.cpp	2006-01-02 11:00:51.000000000 +0100
@@@@ -19,6 +19,7 @@@@
 DisplayManager.accessFile:	XDMCONFIGDIR/Xaccess
 DisplayManager*resources:	XDMCONFIGDIR/Xresources
 DisplayManager.willing:		SU nobody -c XDMSCRIPTDIR/Xwilling
+DisplayManager.authDir:		XDMAUTHDIR
 ! All displays should use authorization, but we cannot be sure
 ! X terminals may not be configured that way, so they will require
 ! individual resource settings.
@


1.3
log
@Update meta-pkgs/xorg to 6.9.0.

The full list of changes:
http://ftp.x.org/pub/X11R7.0/doc/html/RELNOTES2.html

Thanks to joerg@@ and reed@@ for testing on DragonFlyBSD.

Tested on NetBSD/i386 3.0/-current and DragonFlyBSD-1.4/i386.
@
text
@d1 1
a1 1
$NetBSD$
@


1.2
log
@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.
@
text
@d3 10
a12 23
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) {
@


1.1
log
@Incorporate libXpm security fixes of X.Org X11R6.8.1.

Bump PKGREVISION and BUILDLINK_RECOMMENDED.
@
text
@d3 23
a25 29
--- 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);
@