summaryrefslogtreecommitdiff
path: root/x11/xorg-libs
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2005-05-23 19:14:14 +0000
committerxtraeme <xtraeme@pkgsrc.org>2005-05-23 19:14:14 +0000
commit952bfda99e719c17898e04ef6fcea63279827387 (patch)
treec0f4eaadde5b9fd992de2937ef22d2129c2f7470 /x11/xorg-libs
parent7e46ac7477a21f487bf8291c02db68ad8d71c36c (diff)
downloadpkgsrc-952bfda99e719c17898e04ef6fcea63279827387.tar.gz
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.
Diffstat (limited to 'x11/xorg-libs')
-rw-r--r--x11/xorg-libs/distinfo12
-rw-r--r--x11/xorg-libs/files/DragonFly.cf38
-rw-r--r--x11/xorg-libs/patches/patch-bb22
-rw-r--r--x11/xorg-libs/patches/patch-bc22
-rw-r--r--x11/xorg-libs/patches/patch-bd15
-rw-r--r--x11/xorg-libs/patches/patch-be15
-rw-r--r--x11/xorg-libs/patches/patch-bf31
-rw-r--r--x11/xorg-libs/patches/patch-bg13
-rw-r--r--x11/xorg-libs/patches/patch-bh13
-rw-r--r--x11/xorg-libs/patches/patch-bi40
-rw-r--r--x11/xorg-libs/patches/patch-bj85
-rw-r--r--x11/xorg-libs/patches/patch-bk13
12 files changed, 301 insertions, 18 deletions
diff --git a/x11/xorg-libs/distinfo b/x11/xorg-libs/distinfo
index 7985744e65f..04e3a7fdccf 100644
--- a/x11/xorg-libs/distinfo
+++ b/x11/xorg-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2005/04/16 03:48:47 reed Exp $
+$NetBSD: distinfo,v 1.20 2005/05/23 19:14:15 xtraeme Exp $
SHA1 (X11R6.8.2-src1.tar.gz) = 23c60680274062a1db17f646a8388149309dc45c
RMD160 (X11R6.8.2-src1.tar.gz) = bb170d7a11416c3d9bd1d23d461ba4cea9b1b2c8
@@ -34,3 +34,13 @@ SHA1 (patch-aw) = d305ea935ba10d443f9bfdcfc2c74bab5a03ba60
SHA1 (patch-ay) = b154d0d4e95ea15c79921b605266701ee773d144
SHA1 (patch-az) = 3fc898c7c91037710b0fd27eff55ca8b55a19b4b
SHA1 (patch-ba) = 710acb72c80c38e52ba949053a9e43c72c0205f6
+SHA1 (patch-bb) = 126e217b3bb0df8bb072f26f1575af9c610b9ba6
+SHA1 (patch-bc) = 012c6de9d6469c152e7b31799aeaa2b41fa0d4d7
+SHA1 (patch-bd) = f370cbbacbd9061f526f3a1d4924c55bd77559fb
+SHA1 (patch-be) = 19573fbc5b27a6fd17366e51801ec5a84bd3a063
+SHA1 (patch-bf) = 0661e6e787e57c865844c10ba27b381f525673b5
+SHA1 (patch-bg) = 768fafea9066f7be420154e5c9e383d94bee5de5
+SHA1 (patch-bh) = 1d356a2e1a885476ed8e55f3e9db0fd5744772a5
+SHA1 (patch-bi) = 4afc732ca451004b600c431ef76956d64317654c
+SHA1 (patch-bj) = 263336947f34b98c054b75dba204756c8b8f488f
+SHA1 (patch-bk) = e8b5eca5ce2d3acc77797f16f956dfc9a2fcacc8
diff --git a/x11/xorg-libs/files/DragonFly.cf b/x11/xorg-libs/files/DragonFly.cf
index 86c9e305ccb..bff8068defb 100644
--- a/x11/xorg-libs/files/DragonFly.cf
+++ b/x11/xorg-libs/files/DragonFly.cf
@@ -1,9 +1,5 @@
/* xc/config/cf/DragonFly.cf */
-#ifndef LocalBase
-# define LocalBase @LOCALBASE@
-#endif
-
#define UseElfFormat YES
#define OSBinaryFormat [ELF]
@@ -60,21 +56,27 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
/*
* Multi-thread safe libs
*/
+#ifndef HasLibPthread
+# define HasLibPthread NO
+#endif
#define HasPosixThreads YES
#define ThreadedX YES
#define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE
#define HasThreadSafeAPI YES
#define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
-# define BuildThreadStubLibrary YES
-# define NeedUIThrStubs YES
+#if HasLibPthread
+# define ThreadsLibraries -lpthread
+#else
# define ThreadsLibraries -pthread
# define SharedX11Reqs $(LDPRELIB)
# define SharedXtReqs $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
+#endif
#define AvoidNullMakeCommand YES
#define StripInstalledPrograms YES
#define CompressAllFonts YES
+#define GzipFontCompression YES
#define Malloc0ReturnsNull YES
#define NeedConstPrototypes YES
#define NeedFunctionPrototypes YES
@@ -85,10 +87,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasPlugin YES
#define VendorHasX11R6_3libXext YES /* XC or XFree86 >= 3.3.1 */
-#define CcCmd cc
-#define OptimizedCDebugFlags /* -O2 causes some files to die out */
-#define CplusplusCmd c++
-#define CppCmd cpp
+#ifndef CcCmd
+#define CcCmd @@PKGSRC_CC@@
+#endif
+#ifndef CplusplusCmd
+#define CplusplusCmd @@PKGSRC_CXX@@
+#endif
+#define CppCmd @@PKGSRC_CPP@@
#define PreProcessCmd CppCmd
#define StandardCppOptions -traditional
@@ -106,6 +111,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# endif
#endif
+#define OptimizedCDebugFlags @@PKGSRC_CFLAGS@@
+
#define HasSetUserContext YES
#define HasGetpeereid YES
#define HasMTRRSupport YES
@@ -171,7 +178,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define UseGnuMalloc NO
#endif
#ifndef GnuMallocLibrary
-# define GnuMallocLibrary /**/
+# define GnuMallocLibrary -lgnumalloc
#endif
#ifndef HasZlib
@@ -187,12 +194,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#ifndef HasExpat
# define HasExpat YES
-# define ExpatDir LocalBase
#endif
#ifndef HasFreetype2
# define HasFreetype2 YES
-# define Freetype2Dir LocalBase
#endif
#undef InstallCmd
@@ -237,7 +242,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
#define HasMkstemp YES
#ifndef PreIncDir
-# define PreIncDir /usr/include /* DefaultGccIncludeDir ? */
+# define PreIncDir /usr/include
#endif
#define HasGroff YES
@@ -248,8 +253,8 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
# define ExtraFilesToClean *.core
#endif
-#define DefaultUserPath /usr/pkg/bin/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
-#define DefaultSystemPath /usr/pkg/sbin:/bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
+#define DefaultUserPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR):/usr/local/bin
+#define DefaultSystemPath /bin:/usr/bin:/sbin:/usr/sbin:$(BINDIR)
#ifndef SystemManDirectory
# define SystemManDirectory /usr/share/man
@@ -274,7 +279,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
'dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
#endif
-
#include <bsdLib.rules>
#include <xorg.cf>
diff --git a/x11/xorg-libs/patches/patch-bb b/x11/xorg-libs/patches/patch-bb
new file mode 100644
index 00000000000..53852a5b5c8
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bb
@@ -0,0 +1,22 @@
+$NetBSD: patch-bb,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- 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 @@
+ }
+ #endif
+
+-#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);
+ #endif
+ return FALSE;
diff --git a/x11/xorg-libs/patches/patch-bc b/x11/xorg-libs/patches/patch-bc
new file mode 100644
index 00000000000..6e23e8b0c50
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bc
@@ -0,0 +1,22 @@
+$NetBSD: patch-bc,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- include/Xos_r.h.orig 2005-04-30 23:18:21.000000000 +0200
++++ include/Xos_r.h 2005-04-30 23:17:52.000000000 +0200
+@@ -257,7 +257,7 @@
+ */
+
+ #if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
+- defined(__APPLE__)
++ defined(__APPLE__) || defined(__DragonFly__)
+ static __inline__ void _Xpw_copyPasswd(_Xgetpwparams p)
+ {
+ memcpy(&(p).pws, (p).pwp, sizeof(struct passwd));
+@@ -427,7 +427,7 @@
+ /* UnixWare 2.0, or other systems with thread support but no _r API. */
+ /* WARNING: The h_addr_list and s_aliases values are *not* copied! */
+
+-#if defined(__NetBSD__) || defined(__FreeBSD__)
++#if defined(__DragonFly__) || defined(__NetBSD__) || defined(__FreeBSD__)
+ #include <sys/param.h>
+ #endif
+
diff --git a/x11/xorg-libs/patches/patch-bd b/x11/xorg-libs/patches/patch-bd
new file mode 100644
index 00000000000..93b1b31da36
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bd
@@ -0,0 +1,15 @@
+$NetBSD: patch-bd,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- extras/drm/shared/drm.h.orig 2005-04-30 23:19:49.000000000 +0200
++++ extras/drm/shared/drm.h 2005-04-30 23:21:37.000000000 +0200
+@@ -46,8 +46,8 @@
+ #define DRM_IOC_WRITE _IOC_WRITE
+ #define DRM_IOC_READWRITE _IOC_READ|_IOC_WRITE
+ #define DRM_IOC(dir, group, nr, size) _IOC(dir, group, nr, size)
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) && defined(IN_MODULE)
++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if (defined(__DragonFly__) || defined(__FreeBSD__)) && defined(IN_MODULE)
+ /* Prevent name collision when including sys/ioccom.h */
+ #undef ioctl
+ #include <sys/ioccom.h>
diff --git a/x11/xorg-libs/patches/patch-be b/x11/xorg-libs/patches/patch-be
new file mode 100644
index 00000000000..328d0a90415
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-be
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c.orig 2005-04-30 23:25:04.000000000 +0200
++++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c 2005-04-30 23:25:32.000000000 +0200
+@@ -86,6 +86,10 @@
+
+ #include "xf86drm.h"
+
++#ifdef __DragonFly__
++#define DRM_MAJOR 145
++#endif
++
+ #ifdef __FreeBSD__
+ #define DRM_MAJOR 145
+ #endif
diff --git a/x11/xorg-libs/patches/patch-bf b/x11/xorg-libs/patches/patch-bf
new file mode 100644
index 00000000000..9be03b54b62
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bf
@@ -0,0 +1,31 @@
+$NetBSD: patch-bf,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c.orig 2005-04-30 22:49:33.000000000 +0200
++++ programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmCompat.c 2005-04-30 22:53:03.000000000 +0200
+@@ -78,7 +78,7 @@
+ #include "r128_drm.h"
+ #include <inttypes.h> /* for int64_t & friends */
+ #include "radeon_drm.h"
+-#ifndef __FreeBSD__
++#if !(defined(__FreeBSD__) || defined(__DragonFly__))
+ #include "sis_drm.h"
+ #include "i810_drm.h"
+ #include "i830_drm.h"
+@@ -89,7 +89,7 @@
+ * extensions used before XFree86 4.3.
+ */
+
+-#ifndef __FreeBSD__
++#if !(defined(__FreeBSD__) || defined(__DragonFly__))
+ /* I810 */
+
+ Bool drmI810CleanupDma(int driSubFD)
+@@ -1013,7 +1013,7 @@
+ }
+ }
+
+-#ifndef __FreeBSD__
++#if !(defined(__FreeBSD__) || defined(__DragonFly__))
+ /* SiS */
+
+ Bool drmSiSAgpInit(int driSubFD, int offset, int size)
diff --git a/x11/xorg-libs/patches/patch-bg b/x11/xorg-libs/patches/patch-bg
new file mode 100644
index 00000000000..ed281509e23
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bg
@@ -0,0 +1,13 @@
+$NetBSD: patch-bg,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c.orig 2005-04-30 22:55:18.000000000 +0200
++++ programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c 2005-04-30 22:55:55.000000000 +0200
+@@ -18,7 +18,7 @@
+ #if defined(linux)
+ #include <asm/ioctl.h>
+ #include <linux/agpgart.h>
+-#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ #include <sys/ioctl.h>
+ #include <sys/agpio.h>
+ #endif
diff --git a/x11/xorg-libs/patches/patch-bh b/x11/xorg-libs/patches/patch-bh
new file mode 100644
index 00000000000..665a2a06c53
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bh
@@ -0,0 +1,13 @@
+$NetBSD: patch-bh,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- lib/xtrans/Xtranssock.c Mon Apr 5 23:04:31 2004
++++ lib/xtrans/Xtranssock.c Mon Apr 5 23:04:58 2004
+@@ -91,7 +91,7 @@
+ #if defined(__osf__) || defined(linux) || defined(AIXV5)
+ #include <sys/param.h>
+ #endif /* osf */
+-#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/param.h>
+ #include <machine/endian.h>
+ #endif /* __NetBSD__ || __OpenBSD__ || __FreeBSD__ */
diff --git a/x11/xorg-libs/patches/patch-bi b/x11/xorg-libs/patches/patch-bi
new file mode 100644
index 00000000000..ad29b250a29
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bi
@@ -0,0 +1,40 @@
+$NetBSD: patch-bi,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Mon Nov 17 22:20:40 2003
++++ programs/Xserver/hw/xfree86/os-support/xf86_OSlib.h Sat Mar 20 05:37:28 2004
+@@ -406,7 +406,7 @@
+ /* 386BSD and derivatives, BSD/386 */
+ /**************************************************************************/
+
+-#if defined(__386BSD__) && (defined(__FreeBSD__) || defined(__NetBSD__))
++#if defined(__386BSD__) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__))
+ # undef __386BSD__
+ #endif
+
+@@ -441,7 +441,7 @@
+ # if defined(__NetBSD__) || defined(__OpenBSD__)
+ # include <machine/console.h>
+ # else
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <osreldate.h>
+ # if __FreeBSD_version >= 410000
+ # include <sys/consio.h>
+@@ -460,7 +460,7 @@
+ # if defined(__FreeBSD__)
+ # include <machine/pcvt_ioctl.h>
+ # else
+-# if defined(__NetBSD__) || defined(__OpenBSD__)
++# if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ # if !defined(WSCONS_SUPPORT)
+ # include <machine/pcvt_ioctl.h>
+ # endif /* WSCONS_SUPPORT */
+@@ -480,7 +480,7 @@
+ # include <dev/wscons/wsconsio.h>
+ # include <dev/wscons/wsdisplay_usl_io.h>
+ # endif /* WSCONS_SUPPORT */
+-# if defined(__FreeBSD__)
++# if defined(__FreeBSD__) || defined(__DragonFly__)
+ # include <osreldate.h>
+ # if __FreeBSD_version >= 500013
+ # include <sys/mouse.h>
diff --git a/x11/xorg-libs/patches/patch-bj b/x11/xorg-libs/patches/patch-bj
new file mode 100644
index 00000000000..0a8d1da6940
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bj
@@ -0,0 +1,85 @@
+$NetBSD: patch-bj,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- /dev/null 2004-08-06 12:14:07.000000000 -0500
++++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_mouse.c 2004-08-06 12:17:27.000000000 -0500
+@@ -68,7 +68,7 @@
+ static void usbSigioReadInput (int fd, void *closure);
+ #endif
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ /* These are for FreeBSD */
+ #define DEFAULT_MOUSE_DEV "/dev/mouse"
+ #define DEFAULT_SYSMOUSE_DEV "/dev/sysmouse"
+@@ -97,7 +97,7 @@
+ {
+ #if defined(__NetBSD__)
+ return MSE_SERIAL | MSE_BUS | MSE_PS2 | MSE_AUTO;
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || 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;
+@@ -120,7 +120,7 @@
+ * main "mouse" driver.
+ */
+ static const char *miscNames[] = {
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ "SysMouse",
+ #endif
+ NULL
+@@ -149,7 +149,7 @@
+ static const char *
+ DefaultProtocol(void)
+ {
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ return "Auto";
+ #elif defined(__OpenBSD__) && defined(WSCONS_SUPPORT)
+ return "WSMouse";
+@@ -158,7 +158,7 @@
+ #endif
+ }
+
+-#if defined(__FreeBSD__) && defined(MOUSE_PROTO_SYSMOUSE)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
+ static struct {
+ int dproto;
+ const char *name;
+@@ -227,7 +227,7 @@
+ mode.rate = rate > 0 ? rate : -1;
+ mode.resolution = res > 0 ? res : -1;
+ mode.accelfactor = -1;
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+ if (pMse->autoProbe ||
+ (protocol && xf86NameCmp(protocol, "SysMouse") == 0)) {
+ /*
+@@ -245,7 +245,7 @@
+ }
+ #endif
+
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+
+ #define MOUSED_PID_FILE "/var/run/moused.pid"
+
+@@ -767,7 +767,7 @@
+ p->BuiltinNames = BuiltinNames;
+ p->DefaultProtocol = DefaultProtocol;
+ p->CheckProtocol = CheckProtocol;
+-#if defined(__FreeBSD__) && defined(MOUSE_PROTO_SYSMOUSE)
++#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(MOUSE_PROTO_SYSMOUSE)
+ p->SetupAuto = SetupAuto;
+ p->SetPS2Res = SetSysMouseRes;
+ p->SetBMRes = SetSysMouseRes;
+@@ -777,7 +777,7 @@
+ p->SetupAuto = SetupAuto;
+ p->SetMiscRes = SetMouseRes;
+ #endif
+-#if defined(__FreeBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+ p->FindDevice = FindDevice;
+ #endif
+ p->PreInit = bsdMousePreInit;
diff --git a/x11/xorg-libs/patches/patch-bk b/x11/xorg-libs/patches/patch-bk
new file mode 100644
index 00000000000..fb1fee3745d
--- /dev/null
+++ b/x11/xorg-libs/patches/patch-bk
@@ -0,0 +1,13 @@
+$NetBSD: patch-bk,v 1.1 2005/05/23 19:14:15 xtraeme Exp $
+
+--- programs/Xserver/Xext/shm.c.orig 2005-04-30 23:00:21.000000000 +0200
++++ programs/Xserver/Xext/shm.c 2005-04-30 23:00:40.000000000 +0200
+@@ -157,7 +157,7 @@
+ }
+
+
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__CYGWIN__)
+ #include <sys/signal.h>
+
+ static Bool badSysCall = FALSE;