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.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.0.4 pkgsrc-2005Q1-base:1.1 pkgsrc-2004Q4:1.1.0.2 pkgsrc-2004Q4-base:1.1; locks; strict; comment @# @; 1.5 date 2007.08.17.20.25.28; author joerg; state dead; branches; next 1.4; 1.4 date 2006.02.01.20.21.59; author joerg; state Exp; 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.04.15.21.33.27; author hira; state Exp; branches; next 1.1; 1.1 date 2004.11.15.11.15.49; author hira; 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-av,v 1.4 2006/02/01 20:21:59 joerg Exp $ --- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.orig 2005-11-08 06:33:29.000000000 +0000 +++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h @@@@ -445,7 +445,7 @@@@ extern int errno; /* Kernel of *BSD */ /**************************************************************************/ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || \ - defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) + defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__DragonFly__) # include # if defined(__FreeBSD_version) && !defined(__FreeBSD_kernel_version) @@@@ -470,11 +470,11 @@@@ extern int errno; # endif # ifdef SYSCONS_SUPPORT # define COMPAT_SYSCONS -# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) +# if defined(__NetBSD__) || defined(__OpenBSD__) # include # else -# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -# if (__FreeBSD_kernel_version >= 410000) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +# if defined(__DragonFly__) || (__FreeBSD_kernel_version >= 410000) # include # include # else @@@@ -488,7 +488,7 @@@@ extern int errno; # if defined(PCVT_SUPPORT) # if !defined(SYSCONS_SUPPORT) /* no syscons, so include pcvt specific header file */ -# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) # include # else # if defined(__NetBSD__) || defined(__OpenBSD__) @@@@ -511,8 +511,8 @@@@ extern int errno; # include # include # endif /* WSCONS_SUPPORT */ -# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -# if (__FreeBSD_kernel_version >= 500013) +# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +# if defined(__FreeBSD_kernel_version) && (__FreeBSD_kernel_version >= 500013) # include # else # undef MOUSE_GETINFO @ 1.4 log @Fix sysmouse handling on DragonFly, mostly garbage arrived. Thanks for Simon Schubert to point out the right file. Fix ATI driver option to not include the theatre module, if disabled. Shown by Robert Sebastian Gerus during testing of the first fix. Bump revision of xorg-server. @ text @d1 1 a1 1 $NetBSD$ @ 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 @d3 1 a3 1 --- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h.orig 2006-01-06 17:17:03.000000000 +0000 d14 35 @ 1.2 log @ - Add PLIST_SUBST for the scanpci. - Build the scanpci on the NetBSD/macppc. @ text @d1 1 a1 1 $NetBSD: patch-av,v 1.1 2004/11/15 11:15:49 hira Exp $ d3 11 a13 11 --- config/cf/xorg.cf.orig 2005-01-24 12:11:42.000000000 +0900 +++ config/cf/xorg.cf 2005-04-15 23:01:03.000000000 +0900 @@@@ -1294,6 +1294,8 @@@@ #ifndef BuildScanpci # if SystemV || SystemV4 || \ (defined(LinuxArchitecture) && !defined(Mc68020Architecture)) || \ + (defined(NetBSDArchitecture) && \ + (defined(AMD64Architecture) || defined(PpcArchitecture))) || \ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ defined(OS2Architecture) || defined(GNUMachArchitecture) # define BuildScanpci YES @ 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 --- config/cf/xorg.cf.orig 2004-11-14 02:17:40.000000000 +0900 +++ config/cf/xorg.cf 2004-11-14 02:17:44.000000000 +0900 @@@@ -1287,6 +1287,7 @@@@ d9 2 a10 1 + (defined(NetBSDArchitecture) && defined(AMD64Architecture)) || \ @