head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.24
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.22
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.20
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.18
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.16
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.14
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.12
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.10
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.8
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.6
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.4
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.2
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.2.0.12
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.10
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.8
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.6
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.4
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.2
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.1.0.6
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.4
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.2
	pkgsrc-2005Q2-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2007.08.17.20.25.29;	author joerg;	state dead;
branches;
next	1.2;

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

1.1
date	2005.04.14.21.35.51;	author xtraeme;	state Exp;
branches;
next	;


desc
@@


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

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

--- programs/xinit/startx.cpp.orig	2006-01-13 18:26:13.000000000 +0100
+++ programs/xinit/startx.cpp
@@@@ -208,7 +208,7 @@@@ add $displayname . $mcookie
 EOF
 	removelist="$displayname $removelist"
     else
-        dummy=$((dummy+1));
+        dummy=$(($dummy + 1));
         XAUTH -q -f $xserverauthfile << EOF
 add :$dummy . $authcookie
 EOF
@


1.2
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.1
log
@* Apply patch from OpenBSD CVS to fix libXpm vulnerability:
	http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-0605
* Apply patch from FreeBSD/ports to fix the problem with the radeon
  driver switching from graphics to text mode.

Bump PKGREVISION.
@
text
@d3 11
a13 20
--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c.orig
+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c
@@@@ -5748,7 +5748,7 @@@@ static void RADEONSave(ScrnInfoPtr pScrn
 	 */
 	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
 #else
-	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS); /* Save mode
+	vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL); /* Save mode
 						       * & fonts & cmap
 						       */
 #endif
@@@@ -5818,7 +5818,7 @@@@ static void RADEONRestore(ScrnInfoPtr pS
 	 */
 	vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
 #else
-	vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
+	vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
 #endif
 	vgaHWLock(hwp);
     } else {
@