[megaglest] 50/143: Fix the upstream check for networking so it matches kFreeBSD

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository megaglest.

commit 1c5825608cffcf57874e620f676ca16f195d250c
Author: Paul Wise <pabs at debian.org>
Date:   Fri Dec 23 01:03:50 2011 +0000

    Fix the upstream check for networking so it matches kFreeBSD
---
 debian/changelog                        |  1 +
 debian/patches/fix-kFreeBSD-FTBFS.patch | 11 +++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 753d22d..108e142 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ megaglest (3.6.0.2-2) UNRELEASED; urgency=low
   * Team upload.
   * MegaGlest is not portable to non-x86 architectures, drop them
     The embedded code copy of streflop requires SSE.
+  * Fix the upstream check for networking so it matches kFreeBSD
 
  -- Paul Wise <pabs at debian.org>  Fri, 23 Dec 2011 08:08:50 +0800
 
diff --git a/debian/patches/fix-kFreeBSD-FTBFS.patch b/debian/patches/fix-kFreeBSD-FTBFS.patch
new file mode 100644
index 0000000..05be3a7
--- /dev/null
+++ b/debian/patches/fix-kFreeBSD-FTBFS.patch
@@ -0,0 +1,11 @@
+--- a/source/shared_lib/sources/platform/posix/socket.cpp
++++ b/source/shared_lib/sources/platform/posix/socket.cpp
+@@ -313,7 +313,7 @@
+ //	class Socket
+ // ===============================================
+ 
+-#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) || defined(__linux__)
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(BSD) || defined(__APPLE__) || defined(__linux__)
+ # define USE_GETIFADDRS 1
+ # include <ifaddrs.h>
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..891f949
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-kFreeBSD-FTBFS.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/megaglest.git