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.6 pkgsrc-2005Q4-base:1.1 pkgsrc-2005Q3:1.1.0.4 pkgsrc-2005Q3-base:1.1 pkgsrc-2005Q2:1.1.0.2 pkgsrc-2005Q2-base:1.1; locks; strict; comment @# @; 1.4 date 2007.08.17.20.25.30; author joerg; state dead; branches; next 1.3; 1.3 date 2006.01.23.22.54.44; author joerg; state Exp; branches; next 1.2; 1.2 date 2006.01.18.23.53.06; author xtraeme; state dead; branches; next 1.1; 1.1 date 2005.05.23.19.14.15; 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-bb,v 1.3 2006/01/23 22:54:44 joerg Exp $ --- programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c.orig 2006-01-23 22:44:12.000000000 +0000 +++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c @@@@ -72,7 +72,7 @@@@ static void usbSigioReadInput (int fd, void *closure); #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) /* These are for FreeBSD */ #define DEFAULT_MOUSE_DEV "/dev/mouse" #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse" @@@@ -101,7 +101,7 @@@@ SupportedInterfaces(void) { #if defined(__NetBSD__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO; -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO | MSE_MISC; #else return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_XPS2 | MSE_AUTO; @@@@ -124,7 +124,7 @@@@ static const char *internalNames[] = { * main "mouse" driver. */ static const char *miscNames[] = { -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) "SysMouse", #endif NULL @@@@ -153,7 +153,7 @@@@ CheckProtocol(const char *protocol) static const char * DefaultProtocol(void) { -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) return "Auto"; #elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT) return "WSMouse"; @@@@ -162,7 +162,7 @@@@ DefaultProtocol(void) #endif } -#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(MOUSE_PROTO_SYSMOUSE) +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) static struct { int dproto; const char *name; @@@@ -231,7 +231,7 @@@@ SetSysMouseRes(InputInfoPtr pInfo, const mode.rate = rate > 0 ? rate : -1; mode.resolution = res > 0 ? res : -1; mode.accelfactor = -1; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (pMse->autoProbe || (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) { /* @@@@ -249,7 +249,7 @@@@ SetSysMouseRes(InputInfoPtr pInfo, const } #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #define MOUSED_PID_FILE "/var/run/moused.pid" @@@@ -774,7 +774,7 @@@@ xf86OSMouseInit(int flags) p->BuiltinNames = BuiltinNames; p->DefaultProtocol = DefaultProtocol; p->CheckProtocol = CheckProtocol; -#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && defined(MOUSE_PROTO_SYSMOUSE) +#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE) p->SetupAuto = SetupAuto; p->SetPS2Res = SetSysMouseRes; p->SetBMRes = SetSysMouseRes; @@@@ -784,7 +784,7 @@@@ xf86OSMouseInit(int flags) p->SetupAuto = SetupAuto; p->SetMiscRes = SetMouseRes; #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__DragonFly__) p->FindDevice = FindDevice; #endif p->PreInit = bsdMousePreInit; @ 1.3 log @Fix two more issues of FreeBSD leftovers/missing DF support in xorg-server. @ text @d1 1 a1 1 $NetBSD$ @ 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: patch-bb,v 1.1 2005/05/23 19:14:15 xtraeme Exp $ d3 57 a59 3 --- config/imake/imake.c.orig 2004-03-04 18:45:52.000000000 +0100 +++ config/imake/imake.c 2004-08-10 17:20:20.000000000 +0200 @@@@ -1020,7 +1020,7 @@@@ d63 21 a83 12 -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__DragonFly__) static void get_stackprotector(FILE *inFile) { @@@@ -1603,7 +1604,7 @@@@ fprintf(inFile, "#define DefaultOSTeenyVersion 0\n"); } #endif /* EMX */ -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__DragonFly__) get_stackprotector(inFile); d85 1 a85 1 return FALSE; @ 1.1 log @Apply patches from Joerg Sonnenberger for DragonFlyBSD and GCC 3.x.x, while I'm here remove redundant DragonFly.cf from xorg-imake/files, we'll use the same file from xorg-libs. @ text @d1 1 a1 1 $NetBSD$ @