head	1.6;
access;
symbols
	pkgsrc-2013Q2:1.6.0.24
	pkgsrc-2013Q2-base:1.6
	pkgsrc-2012Q4:1.6.0.22
	pkgsrc-2012Q4-base:1.6
	pkgsrc-2011Q4:1.6.0.20
	pkgsrc-2011Q4-base:1.6
	pkgsrc-2011Q2:1.6.0.18
	pkgsrc-2011Q2-base:1.6
	pkgsrc-2009Q4:1.6.0.16
	pkgsrc-2009Q4-base:1.6
	pkgsrc-2008Q4:1.6.0.14
	pkgsrc-2008Q4-base:1.6
	pkgsrc-2008Q3:1.6.0.12
	pkgsrc-2008Q3-base:1.6
	cube-native-xorg:1.6.0.10
	cube-native-xorg-base:1.6
	pkgsrc-2008Q2:1.6.0.8
	pkgsrc-2008Q2-base:1.6
	pkgsrc-2008Q1:1.6.0.6
	pkgsrc-2008Q1-base:1.6
	pkgsrc-2007Q4:1.6.0.4
	pkgsrc-2007Q4-base:1.6
	pkgsrc-2007Q3:1.6.0.2
	pkgsrc-2007Q3-base:1.6
	pkgsrc-2007Q2:1.5.0.6
	pkgsrc-2007Q2-base:1.5
	pkgsrc-2007Q1:1.5.0.4
	pkgsrc-2007Q1-base:1.5
	pkgsrc-2006Q4:1.5.0.2
	pkgsrc-2006Q4-base:1.5
	pkgsrc-2006Q3:1.4.0.6
	pkgsrc-2006Q3-base:1.4
	pkgsrc-2006Q2:1.4.0.4
	pkgsrc-2006Q2-base:1.4
	pkgsrc-2006Q1:1.4.0.2
	pkgsrc-2006Q1-base:1.4
	pkgsrc-2005Q4:1.3.0.10
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.8
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.6
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.4
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.2
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.1.0.2
	pkgsrc-2004Q3-base:1.1;
locks; strict;
comment	@# @;


1.6
date	2007.08.17.20.25.27;	author joerg;	state dead;
branches;
next	1.5;

1.5
date	2006.12.16.11.32.44;	author abs;	state Exp;
branches;
next	1.4;

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

1.3
date	2004.10.20.14.33.30;	author reed;	state Exp;
branches;
next	1.2;

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

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


desc
@@


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

Remove xorg 6.9 packages from pkgsrc.
@
text
@$NetBSD: patch-ap,v 1.5 2006/12/16 11:32:44 abs Exp $

--- config/cf/Imake.cf.orig	2005-11-08 06:33:24.000000000 +0000
+++ config/cf/Imake.cf
@@@@ -234,8 +234,9 @@@@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
 # ifdef mc68000
 #   define Mc68020Architecture
 # endif
-# ifdef __arm32__
+# if defined(__arm__) || defined(__arm32__)
 #   define Arm32Architecture
+#   undef __arm__
 #   undef __arm32__
 # endif
 # ifdef __vax__
@@@@ -246,6 +247,10 @@@@ XCOMM $XFree86: xc/config/cf/Imake.cf,v 
 #   define PpcArchitecture
 #   undef __powerpc__
 # endif
+# ifdef __x86_64__
+#  define AMD64Architecture
+#  undef __x86_64__
+# endif
 #endif /* NetBSD */
 
 /* Systems based on kernel of NetBSD */
@


1.5
log
@Fix build on NetBSD/arm - _only_ affects #ifdef __NetBSD__ && __arm__.
No change for other platforms/OSs
@
text
@d1 1
a1 1
$NetBSD: patch-ag,v 1.2 2006/01/18 23:53:06 xtraeme Exp $
@


1.4
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$
d3 14
a16 3
--- config/cf/Imake.cf.orig	2005-12-06 11:10:24.000000000 +0100
+++ config/cf/Imake.cf	2005-12-06 11:10:43.000000000 +0100
@@@@ -246,6 +246,10 @@@@
@


1.3
log
@Make xdm use configs from under PKG_SYSCONFDIR.
Some ideas came from NetBSD's XFree86 customizations.

Use USE_PKGINSTALL and CONF_FILES for xorg-clients.
Installs xdm configs (and shell scripts) to examples directory.
Create OWN_DIRS for the authDir.

PLIST changes are for chooser is now in bin directory.
And pixmaps moved to include/X11/pixmaps directory.
xdm configs are no longer in lib/X11/xdm (so they are no longer lost
on reinstall).

(Anyone want to do twm and other configs?)
@
text
@d3 13
a15 10
--- programs/xdm/config/xdm-conf.cpp.orig	2004-04-23 12:54:43.000000000 -0700
+++ programs/xdm/config/xdm-conf.cpp
@@@@ -11,6 +11,7 @@@@ DisplayManager.keyFile:		XDMDIR/xdm-keys
 DisplayManager.servers:		XDMDIR/Xservers
 DisplayManager.accessFile:	XDMDIR/Xaccess
 DisplayManager.willing:		SU nobody -c XDMDIR/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.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
@d1 1
a1 1
$NetBSD: patch-ap,v 1.1 2004/09/16 19:36:10 minskim Exp $
d3 10
a12 11
--- 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);
@


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

Bump PKGREVISION and BUILDLINK_RECOMMENDED.
@
text
@d1 1
a1 1
$NetBSD$
@