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.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.4
date	2007.08.17.20.25.31;	author joerg;	state dead;
branches;
next	1.3;

1.3
date	2006.01.23.22.54.44;	author joerg;	state Exp;
branches;
next	1.2;

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

1.1
date	2005.05.23.19.14.15;	author xtraeme;	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-bd,v 1.3 2006/01/23 22:54:44 joerg Exp $

--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c.orig	2006-01-23 22:47:05.000000000 +0000
+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_init.c
@@@@ -245,6 +245,7 @@@@ xf86OpenConsole()
 	     * switching anymore. Here we check for FreeBSD 3.1 and up.
 	     * Add cases for other *BSD that behave the same.
 	    */
+#if !defined(__DragonFly__)
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 	    uname (&uts);
 	    i = atof(uts.release) * 100;
@@@@ -266,6 +267,7 @@@@ xf86OpenConsole()
 		}
 		sleep(1);
 	    }
+#endif
 
 acquire_vt:
 	    /*
@


1.3
log
@Fix two more issues of FreeBSD leftovers/missing DF support in
xorg-server.
@
text
@d1 1
a1 1
$NetBSD$
@


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: patch-bd,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
d3 18
a20 13
--- extras/drm/shared/drm.h.orig	2005-04-30 23:19:49.000000000 +0200
+++ extras/drm/shared/drm.h	2005-04-30 23:21:37.000000000 +0200
@@@@ -46,8 +46,8 @@@@
 #define DRM_IOC_WRITE		_IOC_WRITE
 #define DRM_IOC_READWRITE	_IOC_READ|_IOC_WRITE
 #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#if defined(__FreeBSD__) && defined(IN_MODULE)
+#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#if (defined(__DragonFly__) || defined(__FreeBSD__)) && defined(IN_MODULE)
 /* Prevent name collision when including sys/ioccom.h */
 #undef ioctl
 #include <sys/ioccom.h>
@


1.1
log
@Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC
3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files,
we'll use the same file from xorg-libs.
@
text
@d1 1
a1 1
$NetBSD$
@