[nethack] 06/31: Update the kfreebsd FTBFS patch

[James Cowgill]

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

jcowgill-guest pushed a commit to branch master
in repository nethack.

commit 03cb4b386bfcde65fd51bb84736c5ef3029f8364
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Mar 5 22:11:23 2016 +0000

    Update the kfreebsd FTBFS patch
---
 debian/patches/0021-fix-kfreebsd-ftbfs.patch | 61 +++++++++++-----------------
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/debian/patches/0021-fix-kfreebsd-ftbfs.patch b/debian/patches/0021-fix-kfreebsd-ftbfs.patch
index b090176..f54488d 100644
--- a/debian/patches/0021-fix-kfreebsd-ftbfs.patch
+++ b/debian/patches/0021-fix-kfreebsd-ftbfs.patch
@@ -1,49 +1,34 @@
 Description: Fix FTBFS on kfreebsd
  "#define BSD 1" also has to be un-commented in include/unixconf.h in order
  for nethack to be built successfully on kfreebsd (see
- 0017-Debian-and-Linux-specifics-defined-in-unixconf.h.patch). Also, if
- 0011-Pasi-Kallinen-s-patch-to-add-colors-to-inventory-ite.patch (i.e. the
- menucolors patch) is applied, defining MENU_COLOR_REGEX causes a FTBFS on
- kfreebsd (not sure why), so define it only on Linux for now.
+ 0017-Debian-and-Linux-specifics-defined-in-unixconf.h.patch).
 Author: Vincent Cheng <vcheng at debian.org>
-Last-Update: 2012-06-11
+Author: James Cowgill <jcowgill at debian.org>
+Last-Update: 2016-03-05
 
---- a/src/hacklib.c
-+++ b/src/hacklib.c
-@@ -3,6 +3,10 @@
- /* Copyright (c) Robert Patrick Rankin, 1991		  */
- /* NetHack may be freely redistributed.  See license for details. */
+--- a/include/unixconf.h
++++ b/include/unixconf.h
+@@ -273,10 +273,10 @@
+  */
+ #define SAFERHANGUP
  
-+#if defined(__FreeBSD_kernel__)
 +#include <time.h>
-+#endif
 +
- /* We could include only config.h, except for the overlay definitions... */
- #include "hack.h"
- /*=
---- a/util/makedefs.c
-+++ b/util/makedefs.c
-@@ -4,6 +4,10 @@
- /* Copyright (c) Dean Luick, 1990.				  */
- /* NetHack may be freely redistributed.  See license for details. */
+ #if defined(BSD) || defined(ULTRIX)
+ #include <sys/time.h>
+-#else
+-#include <time.h>
+ #endif
  
-+#if defined(__FreeBSD_kernel__)
-+#include <time.h>
-+#endif
-+
- #define MAKEDEFS_C	/* use to conditionally include file sections */
- /* #define DEBUG */	/* uncomment for debugging info */
- 
---- a/win/tty/termcap.c
-+++ b/win/tty/termcap.c
-@@ -835,10 +835,6 @@
- 
- #include <curses.h>
+ #define HLOCK "perm" /* an empty file used for locking purposes */
+@@ -300,10 +300,6 @@
+ #endif
  
--#ifndef LINUX
--extern char *tparm();
+ #if defined(BSD) || defined(ULTRIX)
+-#if !defined(DGUX) && !defined(SUNOS4)
+-#define memcpy(d, s, n) bcopy(s, d, n)
+-#define memcmp(s1, s2, n) bcmp(s2, s1, n)
 -#endif
--
- #  ifdef COLOR_BLACK	/* trust include file */
- #undef COLOR_BLACK
- #  else
+ #ifdef SUNOS4
+ #include <memory.h>
+ #endif

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