CVS commit: pkgsrc/games/plib

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Jun 27 14:19:52 UTC 2019

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

Log Message:
Unbreak NetBSD release builds: <dev/hid/hid.h> only appeared in 8_99_10.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/games/plib/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/games/plib/distinfo
cvs rdiff -u -r1.8 -r1.9 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/Makefile
diff -u pkgsrc/games/plib/Makefile:1.29 pkgsrc/games/plib/Makefile:1.30
--- pkgsrc/games/plib/Makefile:1.29     Sun Apr 17 16:39:22 2016
+++ pkgsrc/games/plib/Makefile  Thu Jun 27 14:19:51 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2016/04/17 16:39:22 youri Exp $
+# $NetBSD: Makefile,v 1.30 2019/06/27 14:19:51 hauke Exp $
 
 DISTNAME=      plib-1.8.5
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    games x11
 MASTER_SITES=  http://plib.sourceforge.net/dist/
 

Index: pkgsrc/games/plib/distinfo
diff -u pkgsrc/games/plib/distinfo:1.15 pkgsrc/games/plib/distinfo:1.16
--- pkgsrc/games/plib/distinfo:1.15     Sun Aug  5 20:42:10 2018
+++ pkgsrc/games/plib/distinfo  Thu Jun 27 14:19:51 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2018/08/05 20:42:10 nia Exp $
+$NetBSD: distinfo,v 1.16 2019/06/27 14:19:51 hauke 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) = e158c9d0eed70146a8ee979eb3488c365455259a
+SHA1 (patch-ad) = 97626674d127eeb7f7f6f0390a441dbf6419de0b
 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.8 pkgsrc/games/plib/patches/patch-ad:1.9
--- pkgsrc/games/plib/patches/patch-ad:1.8      Sun Aug  5 20:42:10 2018
+++ pkgsrc/games/plib/patches/patch-ad  Thu Jun 27 14:19:51 2019
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2018/08/05 20:42:10 nia Exp $
+$NetBSD: patch-ad,v 1.9 2019/06/27 14:19:51 hauke Exp $
 
 --- src/js/jsBSD.cxx.orig      2008-03-11 02:06:21.000000000 +0000
 +++ src/js/jsBSD.cxx
-@@ -49,16 +49,14 @@
+@@ -49,16 +49,16 @@
  #include <sys/ioctl.h>
  #if defined(__FreeBSD__)
  # include <sys/joystick.h>
@@ -14,7 +14,9 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42
  #if defined(__NetBSD__)
 -#ifdef HAVE_USBHID_H
 +#define HAVE_USBHID_H 1
-+#include <dev/hid/hid.h>
++#  if __NetBSD_Version__ > 899000900
++#    include <dev/hid/hid.h>
++#  endif
  #include <usbhid.h>
 -#else
 -#include <usb.h>
@@ -22,7 +24,7 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42
  #elif defined(__FreeBSD__)
  extern "C" {
  #  if __FreeBSD_version < 500000
-@@ -85,7 +83,9 @@ struct os_specific_s {
+@@ -85,7 +85,9 @@ struct os_specific_s {
    int              fd;
    int              is_analog;
    // The following structure members are specific to analog joysticks
@@ -32,7 +34,7 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42
  #ifdef HAVE_USB_JS
    // The following structure members are specific to USB joysticks
    struct hid_item *hids;
-@@ -437,7 +437,7 @@ void jsJoystick::rawRead ( int *buttons,
+@@ -437,7 +439,7 @@ void jsJoystick::rawRead ( int *buttons,
  
      return ;
    }
@@ -41,7 +43,7 @@ $NetBSD: patch-ad,v 1.8 2018/08/05 20:42
    if ( os->is_analog )
    {
      int status = ::read ( os->fd, &os->ajs, sizeof(os->ajs) );
-@@ -462,6 +462,7 @@ void jsJoystick::rawRead ( int *buttons,
+@@ -462,6 +464,7 @@ void jsJoystick::rawRead ( int *buttons,
  
      return;
    }