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-ar,v 1.3 2006/01/18 23:53:06 xtraeme Exp $ --- config/cf/DragonFly.cf.in.orig 2006-01-06 13:35:13.000000000 +0000 +++ config/cf/DragonFly.cf.in @@@@ -96,12 +96,12 @@@@ XCOMM operating system: OSName (OSMajor #define HasFlex YES #ifndef CcCmd -# define CcCmd cc +# define CcCmd @@@@PKGSRC_CC@@@@ #endif #ifndef CplusplusCmd -# define CplusplusCmd c++ +# define CplusplusCmd @@@@PKGSRC_CXX@@@@ #endif -#define CppCmd /usr/bin/cpp +#define CppCmd @@@@PKGSRC_CPP@@@@ #define PreProcessCmd CppCmd #define StandardCppOptions -traditional #define StandardCppDefines /**/ @@@@ -148,6 +148,10 @@@@ XCOMM operating system: OSName (OSMajor # define HasSSESupport NO #endif +#ifndef BuildDmx +#define BuildDmx YES +#endif + #ifndef UseRpath # define UseRpath YES #endif @@@@ -293,7 +297,7 @@@@ XCOMM operating system: OSName (OSMajor * Compress manual pages */ #ifndef CompressManPages -# define CompressManPages YES +# define CompressManPages NO #endif #define HasBsdMake YES @ 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-ar,v 1.1 2004/11/15 11:15:48 hira Exp $ d3 20 a22 4 --- programs/Xserver/hw/xfree86/loader/Imakefile.orig 2004-08-13 12:39:57.000000000 +0900 +++ programs/Xserver/hw/xfree86/loader/Imakefile 2005-02-21 10:38:49.000000000 +0900 @@@@ -40,6 +40,11 @@@@ ARCHDEFINES = -DDoMMAPedMerge -DMmapPageAlign d25 2 a26 3 +#if defined(NetBSDArchitecture) && defined(AMD64Architecture) && \ + defined(PassHintToMMAP) +ARCHDEFINES = -DUseMMAP -DPassHintToMMAP d29 10 a38 2 DEFINES = $(DBMALLOCDEFINE) $(DLOPENDEFINES) $(OS_DEFINES) $(COMPAT_DEFINES) \ $(SHM_DEFINES) $(FONTCACHE_DEFINES) $(ARCHDEFINES) d40 1 @ 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 3 a5 3 --- programs/Xserver/hw/xfree86/loader/Imakefile.orig 2004-11-03 17:25:44.000000000 +0900 +++ programs/Xserver/hw/xfree86/loader/Imakefile 2004-11-03 17:25:49.000000000 +0900 @@@@ -40,6 +40,10 @@@@ d9 3 a11 2 +#if defined(NetBSDArchitecture) && defined(AMD64Architecture) +ARCHDEFINES = -DUseMMAP @