CVS commit: pkgsrc/games/knightcap

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jul  9 22:09:29 UTC 2023

Modified Files:
        pkgsrc/games/knightcap: Makefile distinfo
        pkgsrc/games/knightcap/patches: patch-ad

Log Message:
knightcap: Avoid potentially incompatible declarations of libc/libm functions


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/games/knightcap/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/knightcap/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/knightcap/patches/patch-ad

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/knightcap/Makefile
diff -u pkgsrc/games/knightcap/Makefile:1.36 pkgsrc/games/knightcap/Makefile:1.37
--- pkgsrc/games/knightcap/Makefile:1.36        Thu Aug 11 05:08:30 2022
+++ pkgsrc/games/knightcap/Makefile     Sun Jul  9 22:09:28 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2022/08/11 05:08:30 gutteridge Exp $
+# $NetBSD: Makefile,v 1.37 2023/07/09 22:09:28 nia Exp $
 
 DISTNAME=              KnightCap-3.6
 PKGNAME=               knightcap-3.6
-PKGREVISION=           8
+PKGREVISION=           9
 CATEGORIES=            games
 #MASTER_SITES=         ftp://ftp.samba.org/pub/KnightCap/
 

Index: pkgsrc/games/knightcap/distinfo
diff -u pkgsrc/games/knightcap/distinfo:1.9 pkgsrc/games/knightcap/distinfo:1.10
--- pkgsrc/games/knightcap/distinfo:1.9 Tue Oct 26 10:44:08 2021
+++ pkgsrc/games/knightcap/distinfo     Sun Jul  9 22:09:28 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:44:08 nia Exp $
+$NetBSD: distinfo,v 1.10 2023/07/09 22:09:28 nia Exp $
 
 BLAKE2s (KnightCap-3.6.tar.gz) = 8c369b356315c72f96825ea2a1a252a90afa473b7bc9a740bc11dc5670ab5722
 SHA512 (KnightCap-3.6.tar.gz) = 13eb4d92dc289d3794143ed3eb318aef8f5e5d969b8de67b3cdba343dd95e6cb0ba963f40133381835df229330baae35b38907e0fe28794b522f5ff3bd489d4f
@@ -6,7 +6,7 @@ Size (KnightCap-3.6.tar.gz) = 157943 byt
 SHA1 (patch-aa) = 8be5487db04419c82e8fcb9569145303ab783ef2
 SHA1 (patch-ab) = ad31712d14e820521f38432eaa75be5a47a23693
 SHA1 (patch-ac) = de3ce657b4d45aabde42faebe1e32dd95c190795
-SHA1 (patch-ad) = e9d87f18e34ec50defa435bc040f107da581e087
+SHA1 (patch-ad) = cdb56150cc70b7997f38539e63cb86761aa13115
 SHA1 (patch-ae) = 40882eb1368e90283a0bd79d1dd0d3f354fdb2ff
 SHA1 (patch-af) = cb051c8780f6cd81924747e8c140c4a32193f330
 SHA1 (patch-ag) = 54358f858d37569eb13fb6c8fa76b38586051636

Index: pkgsrc/games/knightcap/patches/patch-ad
diff -u pkgsrc/games/knightcap/patches/patch-ad:1.3 pkgsrc/games/knightcap/patches/patch-ad:1.4
--- pkgsrc/games/knightcap/patches/patch-ad:1.3 Sun Oct  3 08:53:00 2010
+++ pkgsrc/games/knightcap/patches/patch-ad     Sun Jul  9 22:09:28 2023
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2010/10/03 08:53:00 obache Exp $
+$NetBSD: patch-ad,v 1.4 2023/07/09 22:09:28 nia Exp $
 
---- knightcap.h.orig   1998-05-18 02:09:21 +0300
-+++ knightcap.h        2009-08-01 07:33:40 +0300
+--- knightcap.h.orig   1998-05-17 23:09:21.000000000 +0000
++++ knightcap.h
 @@ -92,7 +92,22 @@ typedef short etype;
  #define USE_PBRAIN 1
  #endif
@@ -46,27 +46,41 @@ $NetBSD: patch-ad,v 1.3 2010/10/03 08:53
  
  typedef enum {B_KING = -6,B_QUEEN = -5,B_ROOK = -4,B_BISHOP = -3,
              B_KNIGHT = -2,B_PAWN = -1,
-@@ -632,6 +656,11 @@ static inline int imax(int i1, int i2)
+@@ -622,25 +646,29 @@ static inline Square mirror_square(Squar
+ 
+ #define RAMP(x) ((x)<0?(x):RAMP_FACTOR*(x))
+ 
+-static inline int imin(int i1, int i2)
++static inline int knightcap_imin(int i1, int i2)
+ {
+       return i1 > i2? i2 : i1;
+ }
++#define imin knightcap_imin
+ 
+-static inline int imax(int i1, int i2)
++static inline int knightcap_imax(int i1, int i2)
+ {
        return i1 > i2? i1 : i2;
  }
++#define imax knightcap_imax
  
-+#if defined(__DragonFly__) || defined(__NetBSD__)
-+#include <sys/param.h>
-+#endif
-+
-+#if !(defined(__DragonFly__) && __DragonFly_version >= 200204) && !(defined(__NetBSD__) && (__NetBSD_Version__ >= 599002100 || (__NetBSD_Version__ >= 501000000 && __NetBSD_Version__ < 599000000)))
- static inline float fmin(float i1, float i2)
+-static inline float fmin(float i1, float i2)
++static inline float knightcap_fmin(float i1, float i2)
  {
        return i1 > i2? i2 : i1;
-@@ -641,6 +670,7 @@ static inline float fmax(float i1, float
+ }
++#define fmin knightcap_fmin
+ 
+-static inline float fmax(float i1, float i2)
++static inline float knightcap_fmax(float i1, float i2)
  {
        return i1 > i2? i1 : i2;
  }
-+#endif
++#define fmax knightcap_fmax
  
  static inline etype emin(etype i1, etype i2)
  {
-@@ -884,4 +914,8 @@ static inline int pop_count32(uint32 x)
+@@ -884,4 +912,8 @@ static inline int pop_count32(uint32 x)
        return pop_count16((x) & 0xFFFF) + pop_count16((x) >> 16);
  }