head 1.5; access; symbols pkgsrc-2013Q2:1.5.0.24 pkgsrc-2013Q2-base:1.5 pkgsrc-2012Q4:1.5.0.22 pkgsrc-2012Q4-base:1.5 pkgsrc-2011Q4:1.5.0.20 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q2:1.5.0.18 pkgsrc-2011Q2-base:1.5 pkgsrc-2009Q4:1.5.0.16 pkgsrc-2009Q4-base:1.5 pkgsrc-2008Q4:1.5.0.14 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.12 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.10 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.8 pkgsrc-2008Q2-base:1.5 pkgsrc-2008Q1:1.5.0.6 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.5.0.4 pkgsrc-2007Q4-base:1.5 pkgsrc-2007Q3:1.5.0.2 pkgsrc-2007Q3-base:1.5 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 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.6 pkgsrc-2005Q4-base:1.3 pkgsrc-2005Q3:1.3.0.4 pkgsrc-2005Q3-base:1.3 pkgsrc-2005Q2:1.3.0.2 pkgsrc-2005Q2-base:1.3 pkgsrc-2005Q1:1.2.0.4 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.2 pkgsrc-2004Q4-base:1.2; locks; strict; comment @# @; 1.5 date 2007.08.17.20.25.17; author joerg; state dead; branches; next 1.4; 1.4 date 2006.01.18.23.53.06; author xtraeme; state Exp; branches; next 1.3; 1.3 date 2005.06.07.02.43.26; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2004.11.15.11.15.42; author hira; state Exp; branches; next 1.1; 1.1 date 2004.11.01.23.41.59; author xtraeme; state Exp; branches; next ; desc @@ 1.5 log @To quote Johnny Lam: "In modular-xorg we trust" Remove xorg 6.9 packages from pkgsrc. @ text @$NetBSD: patch-ah,v 1.4 2006/01/18 23:53:06 xtraeme Exp $ --- config/cf/darwin.cf.in.orig 2005-12-06 11:18:05.000000000 +0100 +++ config/cf/darwin.cf.in 2005-12-06 11:20:10.000000000 +0100 @@@@ -97,7 +97,7 @@@@ * Turn off to build on raw Darwin systems. */ #ifndef DarwinQuartzSupport -# define DarwinQuartzSupport YES +# define DarwinQuartzSupport @@@@DARWIN_USE_QUARTZ@@@@ #endif #if DarwinQuartzSupport @@@@ -170,7 +170,7 @@@@ * so we use the 3.1-based version in this case. */ #if (GccMajorVersion == 3) && (GccMinorVersion == 3) -# define CppCmd /usr/bin/cpp3 +# define CppCmd /usr/bin/cpp #else # define CppCmd /usr/bin/cpp #endif @@@@ -184,8 +184,8 @@@@ #endif /* we have a gcc compatible compiler, but its not called gcc */ -#define CcCmd /usr/bin/cc -#define CplusplusCmd /usr/bin/c++ +#define CcCmd @@@@PKGSRC_CC@@@@ +#define CplusplusCmd @@@@PKGSRC_CXX@@@@ /* default flags to pass to cc */ #ifndef DefaultCCOptions @@@@ -213,7 +213,7 @@@@ #ifdef PpcDarwinArchitecture # define DarwinMachineDefines -D__powerpc__ # if HasGcc3 -# define OptimizedCDebugFlags -Os +# define OptimizedCDebugFlags @@@@PKGSRC_CFLAGS@@@@ # else # define OptimizedCDebugFlags -O2 # endif @@@@ -223,7 +223,7 @@@@ #ifdef i386DarwinArchitecture # define DarwinMachineDefines -D__i386__ # if HasGcc3 -# define OptimizedCDebugFlags -Os +# define OptimizedCDebugFlags @@@@PKGSRC_CFLAGS@@@@ # else # define OptimizedCDebugFlags -O2 -fno-strength-reduce # endif @ 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$ @ 1.3 log @Apply patches from Joerg Sonnerberger to fix some misc problems, like imake problems with audio/nas and the mouse issues seen on DragonFlyBSD, this closes PR pkg/30418. @ text @d1 1 a1 1 $NetBSD: patch-ah,v 1.2 2004/11/15 11:15:42 hira Exp $ d3 9 a11 11 --- config/cf/Imake.cf.orig 2004-08-12 06:14:01.000000000 +0900 +++ config/cf/Imake.cf 2004-11-09 20:01:31.000000000 +0900 @@@@ -246,6 +246,10 @@@@ # define PpcArchitecture # undef __powerpc__ # endif +# ifdef __x86_64__ +# define AMD64Architecture +# undef __x86_64__ +# endif #endif /* NetBSD */ d13 11 a23 3 /* Systems based on kernel of NetBSD */ @@@@ -253,7 +257,24 @@@@ #define KNetBSDArchitecture d26 26 a51 22 -#ifdef __FreeBSD__ +#ifdef __DragonFly__ +# define MacroIncludeFile +# define MacroFile DragonFly.cf +# undef __DragonFly__ +# define DragonFlyArchitecture +# define FreeBSDArchitecture +# define KFreeBSDArchitecture +# ifdef __i386__ +# define i386BsdArchitecture +# define i386Architecture +# undef i386 +# endif +# ifdef __amd64__ +# define AMD64Architecture +# undef __amd64__ +# undef __x86_64__ +# endif +#elif defined __FreeBSD__ # define MacroIncludeFile # define MacroFile FreeBSD.cf # undef __FreeBSD__ @ 1.2 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: patch-ah,v 1.1 2004/11/01 23:41:59 xtraeme Exp $ d16 1 a16 1 @@@@ -253,7 +257,23 @@@@ d25 1 @ 1.1 log @Make this build/work on DragonFlyBSD. Patches were submitted by Todd Willey via tech-pkg@@. @ text @d1 1 a1 1 $NetBSD$ d3 14 a16 3 --- config/cf/Imake.cf.orig 2004-10-25 15:42:06.000000000 +0000 +++ config/cf/Imake.cf 2004-10-22 15:29:33.000000000 +0000 @@@@ -253,7 +253,23 @@@@ @