[SCM] DarkPlaces, a Quake engine branch, master, updated. upstream/0_20110628+svn11231-3-g6ee7e97

[Simon McVittie]

The following commit has been merged in the master branch:
commit 4bce7d9bccb4b7e69ae250b265357dc82eb5ac2c
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 7 22:27:46 2011 +0100

    import a patch from the nexuiz package (which is actually an old copy of DarkPlaces) to compile on kFreeBSD

diff --git a/debian/changelog b/debian/changelog
index e2ade76..a6b0dda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,5 +9,7 @@ darkplaces (0~20110628+svn11231-1) UNRELEASED; urgency=low
     - disable loading d0_blind_id, d0_rijndael, OffscreenGecko libraries,
       rather than dlopening a potentially-incompatible version
     - fix some typos picked up by Lintian
+    - import a patch from the nexuiz package (which is actually an old
+      copy of DarkPlaces) to compile on kFreeBSD
 
  -- Simon McVittie <smcv at debian.org>  Thu, 07 Jul 2011 15:34:20 +0100
diff --git a/debian/copyright b/debian/copyright
index 57b7f33..d790134 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -53,6 +53,7 @@ Comment:
 Files: debian/*
 Copyright: © 2011 David Banks
            © 2011 Simon McVittie
+           © 2007 Cyril Brulebois
 License: GPL-2+
 
 Files: matrixlib.c
diff --git a/debian/patches/10_detect_gnu-kfreebsd.patch b/debian/patches/10_detect_gnu-kfreebsd.patch
new file mode 100644
index 0000000..bc81f96
--- /dev/null
+++ b/debian/patches/10_detect_gnu-kfreebsd.patch
@@ -0,0 +1,30 @@
+From: Cyril Brulebois
+Date: Fri, 26 Jan 2007
+Subject: Fix OS detection of darkplaces' makefile to not think it's on BSD
+  on GNU/kFreeBSD
+
+[The DarkPlaces build system mostly cares about userland, not the kernel,
+and GNU/kFreeBSD is equivalent to GNU/Linux in that respect. -smcv]
+
+diff -urNad nexuiz-2.2.1~/makefile nexuiz-2.2.1/makefile
+--- nexuiz-2.2.1~/makefile	2006-12-05 14:12:52.000000000 +0100
++++ nexuiz-2.2.1/makefile	2006-12-26 12:24:24.637350250 +0100
+@@ -9,6 +9,10 @@
+ 
+ # UNIXes
+ DP_ARCH:=$(shell uname)
++ifeq ($(DP_ARCH), GNU/kFreeBSD)
++	# same userspace as Linux, not a BSDish one
++	DP_MAKE_TARGET=linux
++else
+ ifneq ($(filter %BSD,$(DP_ARCH)),)
+ 	DP_MAKE_TARGET=bsd
+ else
+@@ -23,6 +27,7 @@
+ endif  # ifeq ($(DP_ARCH), SunOS)
+ endif  # ifeq ($(DP_ARCH), Darwin)
+ endif  # ifneq ($(filter %BSD,$(DP_ARCH)),)
++endif  # ifeq ($(DP_ARCH), GNU/kFreeBSD)
+ endif  # ifdef windir
+ endif  # ifndef DP_MAKE_TARGET
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 87bb27e..c4d17eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@
 0015-Be-more-type-safe-when-calling-setjmp-call-the-same-.patch
 0016-Be-a-bit-more-type-safe-about-using-libpng.patch
 0017-Fix-various-typos-dont-don-t-doesnt-doesn-t-arguemen.patch
+10_detect_gnu-kfreebsd.patch

-- 
DarkPlaces, a Quake engine