CVS commit: pkgsrc/audio/cdparanoia

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Thu Sep 27 19:23:09 UTC 2018

Modified Files:
        pkgsrc/audio/cdparanoia: distinfo
        pkgsrc/audio/cdparanoia/patches: patch-cg

Log Message:
Use consistent conditional for scsi_inquiry() to fix build on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/audio/cdparanoia/distinfo
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/cdparanoia/patches/patch-cg

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

Modified files:

Index: pkgsrc/audio/cdparanoia/distinfo
diff -u pkgsrc/audio/cdparanoia/distinfo:1.36 pkgsrc/audio/cdparanoia/distinfo:1.37
--- pkgsrc/audio/cdparanoia/distinfo:1.36       Thu Sep 27 15:29:06 2018
+++ pkgsrc/audio/cdparanoia/distinfo    Thu Sep 27 19:23:09 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.36 2018/09/27 15:29:06 triaxx Exp $
+$NetBSD: distinfo,v 1.37 2018/09/27 19:23:09 ryoon Exp $
 
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
@@ -16,10 +16,9 @@ SHA1 (patch-cc) = 93f9a2ca1a0987baf8857b
 SHA1 (patch-cd) = cb6dd2f65de11536d3264eb7b2a7807df1a51a1d
 SHA1 (patch-ce) = 5580f294ebbd0a5cacdb54ef149aa8ef71fec075
 SHA1 (patch-cf) = 4208e82efd5bba15677dcc0ae5883bd9353624c6
-SHA1 (patch-cg) = 76ceca718c46f57ebb9bec63078c1f9f7e1bf778
+SHA1 (patch-cg) = 7445d7c9d32ea6fd955666c93a68498b299bd921
 SHA1 (patch-ch) = 607f57828094ada2799b84723cc01ae333887d2f
 SHA1 (patch-ci) = 783a8cdf88aa9a0f7be3bb2c865b6609237291fc
 SHA1 (patch-cj) = 99bdcf970d9b74154ee205e9465e67dbfed773b0
 SHA1 (patch-ck) = 968a7191d10f16e298853175543c8f533659acc2
 SHA1 (patch-cn) = 62a2e329b8bec1c74e53e72a478576c484e67b56
-SHA1 (patch-paranoia_overlap.c) = 3c46bbf406214d30b09e88cd10a3bc3946c77396

Index: pkgsrc/audio/cdparanoia/patches/patch-cg
diff -u pkgsrc/audio/cdparanoia/patches/patch-cg:1.14 pkgsrc/audio/cdparanoia/patches/patch-cg:1.15
--- pkgsrc/audio/cdparanoia/patches/patch-cg:1.14       Thu Sep 27 15:29:06 2018
+++ pkgsrc/audio/cdparanoia/patches/patch-cg    Thu Sep 27 19:23:09 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-cg,v 1.14 2018/09/27 15:29:06 triaxx Exp $
+$NetBSD: patch-cg,v 1.15 2018/09/27 19:23:09 ryoon Exp $
 
 - fix ripping on NetBSD/amd64
 - build fix on DragonFly
@@ -442,7 +442,7 @@ $NetBSD: patch-cg,v 1.14 2018/09/27 15:2
    }
  }
  
-+#if defined(__linux__)
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
  /* request vendor brand and model */
  unsigned char *scsi_inquiry(cdrom_drive *d){
    unsigned char sense[SG_MAX_SENSE];