CVS commit: pkgsrc/games/plib

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

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Feb 25 08:22:00 UTC 2021

Modified Files:
        pkgsrc/games/plib: distinfo
        pkgsrc/games/plib/patches: patch-ad

Log Message:
plib: Use <sys/joystick.h> rather than <machine/joystick.h> on NetBSD

NetBSD/aarch64 and others do not have <machine/joystick.h> but do have
<sys/joystick.h>.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/games/plib/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/games/plib/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/plib/distinfo
diff -u pkgsrc/games/plib/distinfo:1.16 pkgsrc/games/plib/distinfo:1.17
--- pkgsrc/games/plib/distinfo:1.16     Thu Jun 27 14:19:51 2019
+++ pkgsrc/games/plib/distinfo  Thu Feb 25 08:22:00 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2019/06/27 14:19:51 hauke Exp $
+$NetBSD: distinfo,v 1.17 2021/02/25 08:22:00 nia Exp $
 
 SHA1 (plib-1.8.5.tar.gz) = c2cf7e3e1e58f7b63dae4bb21e4fa82c3e4d4cfc
 RMD160 (plib-1.8.5.tar.gz) = 55019bf3758ec2542804d8e3994f4bed5a188e60
@@ -6,7 +6,7 @@ SHA512 (plib-1.8.5.tar.gz) = 17154cc7724
 Size (plib-1.8.5.tar.gz) = 779133 bytes
 SHA1 (patch-aa) = 6a9e3badb63de5b9b100805fa7151ce5db8ced69
 SHA1 (patch-ab) = 1bb0950b08427f8bcef84ee2da1cfd231ca60385
-SHA1 (patch-ad) = 97626674d127eeb7f7f6f0390a441dbf6419de0b
+SHA1 (patch-ad) = 67b7873b7c326df85c3da9d0d4df4dabe56deefc
 SHA1 (patch-ae) = fe166e1b3b5d150d3d83bad49e2576d9ebaa0fb7
 SHA1 (patch-af) = ea774a54a3cff4d43abae164bbcae745d4642aea
 SHA1 (patch-ag) = d715adee05f8e6973a5883f74573cc39bfd8d72e

Index: pkgsrc/games/plib/patches/patch-ad
diff -u pkgsrc/games/plib/patches/patch-ad:1.9 pkgsrc/games/plib/patches/patch-ad:1.10
--- pkgsrc/games/plib/patches/patch-ad:1.9      Thu Jun 27 14:19:51 2019
+++ pkgsrc/games/plib/patches/patch-ad  Thu Feb 25 08:22:00 2021
@@ -1,13 +1,16 @@
-$NetBSD: patch-ad,v 1.9 2019/06/27 14:19:51 hauke Exp $
+$NetBSD: patch-ad,v 1.10 2021/02/25 08:22:00 nia Exp $
 
 --- src/js/jsBSD.cxx.orig      2008-03-11 02:06:21.000000000 +0000
 +++ src/js/jsBSD.cxx
-@@ -49,16 +49,16 @@
+@@ -47,18 +47,18 @@
+ #include <string.h>
+ #include <errno.h>
  #include <sys/ioctl.h>
- #if defined(__FreeBSD__)
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
  # include <sys/joystick.h>
 -#else
-+#elif (defined(__OpenBSD__) && defined(__i386__)) || defined(__NetBSD__) || defined(__DragonFly__)
++#elif (defined(__OpenBSD__) && defined(__i386__)) || defined(__DragonFly__)
  # include <machine/joystick.h>                // For analog joysticks
  #endif
  #ifdef HAVE_USB_JS