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.1.0.10
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.8
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.6
	pkgsrc-2005Q2-base:1.1
	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.4
date	2007.08.17.20.25.29;	author joerg;	state dead;
branches;
next	1.3;

1.3
date	2006.03.02.23.57.14;	author joerg;	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.11.15.11.15.49;	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-aw,v 1.3 2006/03/02 23:57:14 joerg Exp $

--- programs/Xserver/hw/xfree86/os-support/bsd/Imakefile.orig	2006-01-06 17:29:53.000000000 +0000
+++ programs/Xserver/hw/xfree86/os-support/bsd/Imakefile
@@@@ -8,7 +8,7 @@@@ XCOMM $XFree86: xc/programs/Xserver/hw/x
 
 #include <Server.tmpl>
 
-#if defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture)
+#if defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture)
 #if BuildXInputExt
 # if JoystickSupport
  JOYSTICK_SRC = bsd_jstk.c
@@@@ -47,7 +47,7 @@@@ SHARED_CFLAGS = PositionIndependentCFlag
   IOPERM_SRC = ioperm_noop.c
   IOPERM_OBJ = ioperm_noop.o
 # endif
-#elif defined(KFreeBSDArchitecture)
+#elif defined(KFreeBSDArchitecture) || defined(DragonFlyArchitecture)
 # if defined(i386Architecture) || defined(AMD64Architecture)
   IOPERMDEFINES = -DUSE_DEV_IO
 # elif defined(AlphaBsdArchitecture)
@@@@ -128,7 +128,7 @@@@ AXP_OBJ=bsd_ev56.o xf86Axp.o bsd_axp.o
 #endif
 
 #if (defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || \
-	defined(OpenBSDArchitecture)) && HasAgpGart
+	defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture)) && HasAgpGart
 AGP_SRC=lnx_agp.c
 AGP_OBJ=lnx_agp.o
 #else
@@@@ -220,7 +220,7 @@@@ LinkSourceFile(vidmem.c,../shared)
 LinkSourceFile(sigio.c,../shared)
 LinkSourceFile(kmod_noop.c,../shared)
 #if (defined(KFreeBSDArchitecture) || defined(NetBSDArchitecture) || \
-	defined(OpenBSDArchitecture)) && HasAgpGart
+	defined(OpenBSDArchitecture) || defined(DragonFlyArchitecture)) && HasAgpGart
 LinkSourceFile(lnx_agp.c,../linux)
 #else
 LinkSourceFile(agp_noop.c,../shared)
@


1.3
log
@Fix AGP GART support on DragonFly. Fix PLIST on DragonFly.
Bump xorg-server revision.
@
text
@d1 1
a1 1
$NetBSD: patch-aw,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$
d5 9
d23 18
@


1.1
log
@
Make this build on NetBSD/amd64.  Patch provided by Nicolas Joly
on port-amd64@@.  OK'd by xtraeme@@.
@
text
@d3 5
a7 5
--- config/cf/Imake.cf.orig	2004-08-12 06:14:01.000000000 +0900
+++ config/cf/Imake.cf	2004-11-09 03:52:53.000000000 +0900
@@@@ -246,6 +246,10 @@@@
 #   define PpcArchitecture
 #   undef __powerpc__
d9 5
a13 32
+# ifdef __x86_64__
+#  define AMD64Architecture
+#  undef __x86_64__
+# endif
 #endif /* NetBSD */
 
 /* Systems based on kernel of NetBSD */
@@@@ -253,7 +257,23 @@@@
 #define KNetBSDArchitecture
 #endif
 
-#ifdef __FreeBSD__
+#ifdef __DragonFly__
+# define MacroIncludeFile <DragonFly.cf>
+# define MacroFile DragonFly.cf
+# undef __DragonFly__
+# 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 <FreeBSD.cf>
 # define MacroFile FreeBSD.cf
 # undef __FreeBSD__
@