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.8
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.6
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.4
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.2
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.1.0.2
	pkgsrc-2004Q4-base:1.1;
locks; strict;
comment	@# @;


1.4
date	2007.08.17.20.25.27;	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	2005.02.21.16.45.40;	author hira;	state Exp;
branches;
next	1.1;

1.1
date	2004.11.15.11.15.48;	author hira;	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-as,v 1.3 2006/01/18 23:53:06 xtraeme Exp $

--- lib/GL/dri/drm/Imakefile.orig	2006-01-06 13:44:51.000000000 +0000
+++ lib/GL/dri/drm/Imakefile
@@@@ -34,6 +35,7 @@@@ OS_SUBDIR3 = shared-core
 
 LIBDRM_DIR = ../../../../extras/drm/libdrm
 
+LinkSourceFile(xf86drm.h,$(LIBDRM_DIR))
 LinkSourceFile(xf86drm.c,$(LIBDRM_DIR))
 
 LinkSourceFile(xf86drmHash.c,$(LIBDRM_DIR))
@


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
@
Fix crash with -current/amd64.
 - don't pass address hint to mmap() with 2.99.16 or later
 - add __NetBSD__ to use mprotect()
@
text
@d1 1
a1 1
$NetBSD: patch-as,v 1.1 2004/11/15 11:15:48 hira Exp $
d3 3
a5 5
--- programs/Xserver/hw/xfree86/loader/loader.c.orig	2004-08-30 06:06:00.000000000 +0900
+++ programs/Xserver/hw/xfree86/loader/loader.c	2005-02-21 10:39:41.000000000 +0900
@@@@ -472,6 +472,13 @@@@
 #ifdef UseMMAP
     unsigned long ret;
d7 6
a12 44
+# if defined(__NetBSD__) && defined(__amd64__) && defined(PassHintToMMAP)
+#  define LOADER_MMAP_AREA_SIZE (256*1024*1024)
+#  define LOADER_MMAP_AREA_START ((2U*1024*1024*1024) - LOADER_MMAP_AREA_SIZE)
+    static char *mm_addr = (char *)LOADER_MMAP_AREA_START;
+# else
+    char *mm_addr = NULL;
+# endif
 # ifdef MmapPageAlign
     unsigned long pagesize;
     unsigned long new_size;
@@@@ -494,21 +501,31 @@@@
     if ((new_off_bias + size) > new_size)
 	new_size += pagesize;
     ret = (unsigned long)mmap(0, new_size, MMAP_PROT, MAP_PRIVATE
-#  ifdef __amd64__
+#  if defined(__amd64__) && !defined(PassHintToMMAP)
 			      | MAP_32BIT
 #  endif
 			      , fd, new_off);
     if (ret == -1)
 	FatalError("mmap() failed: %s\n", strerror(errno));
+
+#  if defined(__amd64__) && defined(__NetBSD__) && defined(PassHintToMMAP)
+    mm_addr += new_size:
+#  endif
+
     return (void *)(ret + new_off_bias);
 # else
     ret = (unsigned long)mmap(0, size, MMAP_PROT, MAP_PRIVATE
-#  ifdef __amd64__
+#  if defined(__amd64__) && !defined(PassHintToMMAP)
 			      | MAP_32BIT
 #  endif
 			      , fd, offset + offsetbias);
     if (ret == -1)
 	FatalError("mmap() failed: %s\n", strerror(errno));
+
+#  if defined(__amd64__) && defined(__NetBSD__) && defined(PassHintToMMAP)
+    mm_addr += (size + 4095) & ~4095;
+#  endif
+
     return (void *)ret;
 # endif
 #else
@


1.1
log
@
Make this build on NetBSD/amd64.  Patch provided by Nicolas Joly
on port-amd64@@.  OK'd by xtraeme@@.
@
text
@d1 1
a1 1
$NetBSD$
d3 2
a4 2
--- programs/Xserver/hw/xfree86/loader/loader.c.orig	2004-11-03 17:26:20.000000000 +0900
+++ programs/Xserver/hw/xfree86/loader/loader.c	2004-11-03 17:29:53.000000000 +0900
d9 1
a9 1
+# if defined(__NetBSD__) && defined(__amd64__)
d24 1
a24 1
+#  if defined(__amd64__) && !defined(__NetBSD__)
d31 1
a31 1
+#  if defined(__amd64__) && defined(__NetBSD__)
d39 1
a39 1
+#  if defined(__amd64__) && !defined(__NetBSD__)
d46 1
a46 1
+#  if defined(__amd64__) && defined(__NetBSD__)
@