From ab90f5c15be045dd89fe98eba86a65518f01e6c1 Mon Sep 17 00:00:00 2001
From: markd <markd@pkgsrc.org>
Date: Mon, 14 Nov 2005 10:43:14 +0000
Subject: Don't #define memcmp and memcpy in terms of bcmp, bcopy on "BSD"s. 
 BSDs have had these standard functions for years and this fixes build on
 recent NetBSD's at least.

---
 games/nethack-qt/distinfo         |  4 ++--
 games/nethack-qt/patches/patch-af | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'games')

diff --git a/games/nethack-qt/distinfo b/games/nethack-qt/distinfo
index d970489ea6d..89238454ecc 100644
--- a/games/nethack-qt/distinfo
+++ b/games/nethack-qt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2005/02/23 23:12:00 agc Exp $
+$NetBSD: distinfo,v 1.20 2005/11/14 10:43:14 markd Exp $
 
 SHA1 (nethack-343-src.tgz) = c26537093c38152bc0fbcec20468d975b35f59fd
 RMD160 (nethack-343-src.tgz) = 42f600d24715a0b7e631b357c135761410b3ca95
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 6439ddb86b4600aa39e6b52cabaf4f6696dd1023
 SHA1 (patch-ab) = 6c42d5c4c12e70651f14b08658169f6c00b420db
 SHA1 (patch-ac) = 4181ec1186abd65b72400a56a6062e04d1783f81
 SHA1 (patch-ae) = a72da6e6bd1af3a8eaed97ecc1fdd1ed4198a5db
-SHA1 (patch-af) = 6e1acdc2ab68c4fe72819a75cf84c58ea382b29e
+SHA1 (patch-af) = 4c63205d51ad264aec0406810206e7a1913b7c54
 SHA1 (patch-ag) = 6aeae6bde079b9c9081f6e32523687010c9bc674
 SHA1 (patch-ah) = 5cef58d8bd20f3199ffd3ecd2ba9c640f66bb42c
 SHA1 (patch-ai) = 6c3b678a5b8123fe902cce1cbe8cce61ff4cf821
diff --git a/games/nethack-qt/patches/patch-af b/games/nethack-qt/patches/patch-af
index d3e64868337..a132d34184b 100644
--- a/games/nethack-qt/patches/patch-af
+++ b/games/nethack-qt/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2003/09/02 00:30:55 pooka Exp $
+$NetBSD: patch-af,v 1.4 2005/11/14 10:43:14 markd Exp $
 
---- include/unixconf.h.orig	2003-08-30 03:07:24.000000000 +0300
-+++ include/unixconf.h	2003-09-02 02:55:54.000000000 +0300
+--- include/unixconf.h.orig	2003-12-08 12:39:13.000000000 +1300
++++ include/unixconf.h
 @@ -19,20 +19,20 @@
   */
  
@@ -53,3 +53,12 @@ $NetBSD: patch-af,v 1.3 2003/09/02 00:30:55 pooka Exp $
  #else
  # if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX)
  #  if defined(M_XENIX)
+@@ -284,7 +288,7 @@
+ #endif
+ 
+ #if defined(BSD) || defined(ULTRIX)
+-# if !defined(DGUX) && !defined(SUNOS4)
++# if !defined(DGUX) && !defined(SUNOS4) && !defined(BSD)
+ #define memcpy(d, s, n)		bcopy(s, d, n)
+ #define memcmp(s1, s2, n)	bcmp(s2, s1, n)
+ # endif
-- 
cgit v1.2.3