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.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 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.1.1.0.12 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.10 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.8 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.6 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.4 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.2 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2007.08.17.20.25.16; author joerg; state dead; branches; next 1.3; 1.3 date 2006.12.16.11.32.44; author abs; state Exp; branches; next 1.2; 1.2 date 2006.01.18.23.53.06; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2004.07.29.04.49.53; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.07.29.04.49.53; 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-ag,v 1.3 2006/12/16 11:32:44 abs Exp $ --- config/cf/Imake.cf.orig 2005-11-08 06:33:24.000000000 +0000 +++ config/cf/Imake.cf @@@@ -234,8 +234,9 @@@@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # ifdef mc68000 # define Mc68020Architecture # endif -# ifdef __arm32__ +# if defined(__arm__) || defined(__arm32__) # define Arm32Architecture +# undef __arm__ # undef __arm32__ # endif # ifdef __vax__ @@@@ -246,6 +247,10 @@@@ XCOMM $XFree86: xc/config/cf/Imake.cf,v # define PpcArchitecture # undef __powerpc__ # endif +# ifdef __x86_64__ +# define AMD64Architecture +# undef __x86_64__ +# endif #endif /* NetBSD */ /* Systems based on kernel of NetBSD */ @ 1.3 log @Fix build on NetBSD/arm - _only_ affects #ifdef __NetBSD__ && __arm__. No change for other platforms/OSs @ text @d1 1 a1 1 $NetBSD: patch-ag,v 1.2 2006/01/18 23:53:06 xtraeme Exp $ @ 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$ d3 14 a16 3 --- config/cf/Imake.cf.orig 2005-12-06 11:10:24.000000000 +0100 +++ config/cf/Imake.cf 2005-12-06 11:10:43.000000000 +0100 @@@@ -246,6 +246,10 @@@@ @ 1.1 log @Initial revision @ text @d3 11 a13 4 --- config/cf/OpenBSD.cf.in.orig 2004-07-22 00:18:37.000000000 +0200 +++ config/cf/OpenBSD.cf.in 2004-07-22 00:19:48.000000000 +0200 @@@@ -162,7 +162,7 @@@@ #define MkdirHierCmd mkdir -p d15 1 a15 42 #ifndef CppCmd -#define CppCmd /usr/libexec/cpp +#define CppCmd @@@@PKGSRC_CPP@@@@ #endif #define StandardCppOptions -traditional #define StandardCppDefines /**/ @@@@ -170,10 +170,10 @@@@ #define PreIncDir DefaultGccIncludeDir #ifndef CcCmd -#define CcCmd cc +#define CcCmd @@@@PKGSRC_CC@@@@ #endif #ifndef AsCmd -#define AsCmd cc -c -x assembler +#define AsCmd @@@@PKGSRC_CC@@@@ -c -x assembler #endif #ifndef DefaultCCOptions #if defined(UseInstalled) @@@@ -226,7 +226,6 @@@@ #define HasBsdMake YES -#define BuildCyrillicFonts YES #define GzipFontCompression YES #define DefaultUserPath /bin:/usr/bin:/usr/local/bin:$(BINDIR) #define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) @@@@ -481,13 +480,7 @@@@ # endif -# ifndef DefaultGcc2i386Opt -# if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2 - /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */ -# define DefaultGcc2i386Opt -O2 GccAliasingArgs -# endif -# endif -# define OptimizedCDebugFlags DefaultGcc2i386Opt +# define OptimizedCDebugFlags @@@@PKGSRC_CFLAGS@@@@ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME # define ServerExtraSysLibs -li386 # define LdPostLib /**/ @ 1.1.1.1 log @Initial import of xorg-imake-6.7.0. The xorg-imake package provides various utilities, such as imake, lndir, mkdirhier, xmkmf, and others. These utilities are from X.org, although an X server and X libraries are not needed. @ text @@