[pkgsrc/trunk]: pkgsrc/audio/cdparanoia cdparanoia: fix build on FreeBSD

[triaxx <triaxx%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1e3b1373fd8
branches:  trunk
changeset: 385705:f1e3b1373fd8
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Thu Sep 27 15:29:06 2018 +0000

description:
cdparanoia: fix build on FreeBSD

Add comments to patches (not always relevant) to appease pkglint
Bump revision

diffstat:

 audio/cdparanoia/Makefile         |    4 +-
 audio/cdparanoia/distinfo         |   37 +++---
 audio/cdparanoia/patches/patch-aa |    4 +-
 audio/cdparanoia/patches/patch-ab |    4 +-
 audio/cdparanoia/patches/patch-ac |   28 ++++-
 audio/cdparanoia/patches/patch-ad |    4 +-
 audio/cdparanoia/patches/patch-ae |   33 +++--
 audio/cdparanoia/patches/patch-ba |    4 +-
 audio/cdparanoia/patches/patch-ca |    4 +-
 audio/cdparanoia/patches/patch-cb |    4 +-
 audio/cdparanoia/patches/patch-cc |    4 +-
 audio/cdparanoia/patches/patch-cd |    4 +-
 audio/cdparanoia/patches/patch-ce |    4 +-
 audio/cdparanoia/patches/patch-cg |  201 +++++++++++++++++++++++++++++++++++--
 audio/cdparanoia/patches/patch-ch |   15 +-
 audio/cdparanoia/patches/patch-ci |    4 +-
 audio/cdparanoia/patches/patch-cj |    4 +-
 audio/cdparanoia/patches/patch-ck |    4 +-
 audio/cdparanoia/patches/patch-cn |    4 +-
 19 files changed, 300 insertions(+), 70 deletions(-)

diffs (truncated from 756 to 300 lines):

diff -r d1e7e203fba8 -r f1e3b1373fd8 audio/cdparanoia/Makefile
--- a/audio/cdparanoia/Makefile Thu Sep 27 14:29:36 2018 +0000
+++ b/audio/cdparanoia/Makefile Thu Sep 27 15:29:06 2018 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2017/08/01 14:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2018/09/27 15:29:06 triaxx Exp $
 
 DISTNAME=      cdparanoia-III-10.2
 PKGNAME=       cdparanoia-3.0.10.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    audio
 MASTER_SITES=  http://downloads.xiph.org/releases/cdparanoia/
 EXTRACT_SUFX=  .src.tgz
diff -r d1e7e203fba8 -r f1e3b1373fd8 audio/cdparanoia/distinfo
--- a/audio/cdparanoia/distinfo Thu Sep 27 14:29:36 2018 +0000
+++ b/audio/cdparanoia/distinfo Thu Sep 27 15:29:06 2018 +0000
@@ -1,24 +1,25 @@
-$NetBSD: distinfo,v 1.35 2017/07/12 10:53:23 wiz Exp $
+$NetBSD: distinfo,v 1.36 2018/09/27 15:29:06 triaxx Exp $
 
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
 SHA512 (cdparanoia-III-10.2.src.tgz) = 4ab0a0f5ef44d56c1af72d1fc1035566a1a89c4eeddb9e8baea675fe51c06138d913342afc8bed167d9fa55672fa25a2763ce21f7e24c1232e4739aff20733a7
 Size (cdparanoia-III-10.2.src.tgz) = 183236 bytes
-SHA1 (patch-aa) = b67a318d4e5c0ca87639645096a41eaeb3fb2d1e
-SHA1 (patch-ab) = af07649ac4e0d4a5c2798e4cfc903e6959adea44
-SHA1 (patch-ac) = 87718f65b1994f6e266c7b8221fb8b585b9094b8
-SHA1 (patch-ad) = 861237917c229a4640b9311d371913aae78b746c
-SHA1 (patch-ae) = f12c5aca0b78803e1ab1be8518b032748a45ee0e
-SHA1 (patch-ba) = c846425d26372bada1bc086a7dc26120163feb13
-SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
-SHA1 (patch-cb) = 880d667b26891beb2c64ebe1937c4a2931dd42d5
-SHA1 (patch-cc) = e692c8f4a9811123baa6cb25c09dea0004cc9b68
-SHA1 (patch-cd) = c37da19fc99b5aa5682b08cd6ad162687e9b1337
-SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
+SHA1 (patch-aa) = 3b1557fd2d8cf2e746397ec92e46ad3723e78c6e
+SHA1 (patch-ab) = 29765396395c311b7904337f2a741eadde0806b7
+SHA1 (patch-ac) = b826430a6b51d76fefe6b51d4fc97addbca8eeac
+SHA1 (patch-ad) = 0e0a2d88dd20ac76f1c74fb3a101df5d98d14a22
+SHA1 (patch-ae) = cf411e6c85c0079c0300237d66fd194c6285fd8e
+SHA1 (patch-ba) = ad900b66052364fce32e9bb41ac318d42304860a
+SHA1 (patch-ca) = 259a9ad675875dcbeffe4a294df0b15eadaa9622
+SHA1 (patch-cb) = a8827d1e0f8857a8f12cf6db9c9a80d9c6f85300
+SHA1 (patch-cc) = 93f9a2ca1a0987baf8857bd38602d3abeeb4e7ef
+SHA1 (patch-cd) = cb6dd2f65de11536d3264eb7b2a7807df1a51a1d
+SHA1 (patch-ce) = 5580f294ebbd0a5cacdb54ef149aa8ef71fec075
 SHA1 (patch-cf) = 4208e82efd5bba15677dcc0ae5883bd9353624c6
-SHA1 (patch-cg) = a492f6d2459f75420930d8a6f264bde82119d23e
-SHA1 (patch-ch) = 80672901f4ddbc4f7228cfa1f57ee477c1e1ac28
-SHA1 (patch-ci) = bc0645bf6d2e3841817adb639bfa3ac68cb7f606
-SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
-SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
-SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475
+SHA1 (patch-cg) = 76ceca718c46f57ebb9bec63078c1f9f7e1bf778
+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
diff -r d1e7e203fba8 -r f1e3b1373fd8 audio/cdparanoia/patches/patch-aa
--- a/audio/cdparanoia/patches/patch-aa Thu Sep 27 14:29:36 2018 +0000
+++ b/audio/cdparanoia/patches/patch-aa Thu Sep 27 15:29:06 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2013/12/12 16:41:32 jperkin Exp $
+$NetBSD: patch-aa,v 1.9 2018/09/27 15:29:06 triaxx Exp $
+
+Support for MacOS and NetBSD.
 
 --- configure.in.orig  2006-08-16 18:02:25.000000000 +0000
 +++ configure.in
diff -r d1e7e203fba8 -r f1e3b1373fd8 audio/cdparanoia/patches/patch-ab
--- a/audio/cdparanoia/patches/patch-ab Thu Sep 27 14:29:36 2018 +0000
+++ b/audio/cdparanoia/patches/patch-ab Thu Sep 27 15:29:06 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.10 2009/08/09 16:00:53 drochner Exp $
+$NetBSD: patch-ab,v 1.11 2018/09/27 15:29:06 triaxx Exp $
+
+Fix Makefile.in for build
 
 --- Makefile.in.orig   2008-09-11 22:33:30.000000000 +0200
 +++ Makefile.in
diff -r d1e7e203fba8 -r f1e3b1373fd8 audio/cdparanoia/patches/patch-ac
--- a/audio/cdparanoia/patches/patch-ac Thu Sep 27 14:29:36 2018 +0000
+++ b/audio/cdparanoia/patches/patch-ac Thu Sep 27 15:29:06 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.12 2017/07/12 10:53:23 wiz Exp $
+$NetBSD: patch-ac,v 1.13 2018/09/27 15:29:06 triaxx Exp $
+
+Regen of configure script.
 
 --- configure.orig     2006-08-16 18:02:25.000000000 +0000
 +++ configure
@@ -8286,7 +8288,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -5607,124 +6559,106 @@ generated by GNU Autoconf 2.59.  Invocat
+@@ -5607,124 +6559,122 @@ generated by GNU Autoconf 2.59.  Invocat
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -8405,6 +8407,22 @@
 -_ACEOF
 -cat >>$CONFIG_STATUS <<\_ACEOF
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
      ac_cs_recheck=: ;;
 -  --version | --vers* | -V )
 -    echo "$ac_cs_version"; exit 0 ;;
@@ -8455,7 +8473,7 @@
  
    esac
    shift
-@@ -5738,32 +6676,48 @@ if $ac_cs_silent; then
+@@ -5738,32 +6688,48 @@ if $ac_cs_silent; then
  fi
  
  _ACEOF
@@ -8517,7 +8535,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -5773,344 +6727,464 @@ if $ac_need_defaults; then
+@@ -5773,344 +6739,464 @@ if $ac_need_defaults; then
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -9261,7 +9279,7 @@
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -6132,4 +7206,8 @@ if test "$no_create" != yes; then
+@@ -6132,4 +7218,8 @@ if test "$no_create" != yes; then
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
diff -r d1e7e203fba8 -r f1e3b1373fd8 audio/cdparanoia/patches/patch-ad
--- a/audio/cdparanoia/patches/patch-ad Thu Sep 27 14:29:36 2018 +0000
+++ b/audio/cdparanoia/patches/patch-ad Thu Sep 27 15:29:06 2018 +0000
@@ -1,4 +1,6 @@
-$NetBSD: patch-ad,v 1.7 2017/07/12 10:53:23 wiz Exp $
+$NetBSD: patch-ad,v 1.8 2018/09/27 15:29:06 triaxx Exp $
+
+Support for NetBSD and MacOS.
 
 --- utils.h.orig       2008-08-22 09:39:06.000000000 +0000
 +++ utils.h
diff -r d1e7e203fba8 -r f1e3b1373fd8 audio/cdparanoia/patches/patch-ae
--- a/audio/cdparanoia/patches/patch-ae Thu Sep 27 14:29:36 2018 +0000
+++ b/audio/cdparanoia/patches/patch-ae Thu Sep 27 15:29:06 2018 +0000
@@ -1,18 +1,21 @@
-$NetBSD: patch-ae,v 1.9 2015/02/21 00:09:08 joerg Exp $
+$NetBSD: patch-ae,v 1.10 2018/09/27 15:29:06 triaxx Exp $
+
+Fix wrong asumption that getopt_long is implemented everywhere.
 
 --- main.c.orig        2008-09-11 21:11:02.000000000 +0000
 +++ main.c
-@@ -25,7 +25,9 @@
+@@ -25,7 +25,10 @@
  #include <unistd.h>
  #include <string.h>
  #include <fcntl.h>
 +#ifdef GETOPT_LONG
  #include <getopt.h>
 +#endif
++#include <err.h>
  #include <errno.h>
  #include <math.h>
  #include <sys/time.h>
-@@ -204,6 +206,7 @@ VERSION"\n"
+@@ -204,6 +207,7 @@ VERSION"\n"
  "  cdparanoia [options] <span> [outfile]\n\n"
  
  "OPTIONS:\n"
@@ -20,7 +23,7 @@
  "  -A --analyze-drive              : run and log a complete analysis of drive\n"
  "                                    caching, timing and reading behavior;\n"
  "                                    verifies that cdparanoia is correctly\n"
-@@ -239,6 +242,7 @@ VERSION"\n"
+@@ -239,6 +243,7 @@ VERSION"\n"
  "                                    to n sectors\n"
  "  -o --force-search-overlap  <n>  : force minimum overlap search during\n"
  "                                    verification to n sectors\n"
@@ -28,7 +31,7 @@
  "  -d --force-cdrom-device   <dev> : use specified device; disallow \n"
  "                                    autosense\n"
  "  -k --force-cooked-device  <dev> : use specified cdrom device and force\n"
-@@ -248,6 +252,7 @@ VERSION"\n"
+@@ -248,6 +253,7 @@ VERSION"\n"
  "  -g --force-generic-device <dev> : use specified generic scsi device and\n"
  "                                    force use of the old SG kernel\n"
  "                                    interface. -g cannot be used with -k.\n"
@@ -36,7 +39,7 @@
  "  -S --force-read-speed <n>       : read from device at specified speed; by\n"
  "                                    default, cdparanoia sets drive to full\n"
  "                                    speed.\n"
-@@ -267,6 +272,52 @@ VERSION"\n"
+@@ -267,6 +273,52 @@ VERSION"\n"
  "  -Z --disable-paranoia           : disable all paranoia checking\n"
  "  -Y --disable-extra-paranoia     : only do cdda2wav-style overlap checking\n"
  "  -X --abort-on-skip              : abort on imperfect reads/skips\n\n"
@@ -89,7 +92,7 @@
  
  "OUTPUT SMILIES:\n"
  "  :-)   Normal operation, low/no jitter\n"
-@@ -588,10 +639,10 @@ static void callback(long inpos, int fun
+@@ -588,10 +640,10 @@ static void callback(long inpos, int fun
            buffer[aheadposition+19]='>';
        }
     
@@ -102,7 +105,7 @@
          fprintf(logfile,"\n\n");
          fflush(logfile);
        }
-@@ -606,6 +657,7 @@ static void callback(long inpos, int fun
+@@ -606,6 +658,7 @@ static void callback(long inpos, int fun
  
  const char *optstring = "escCn:o:O:d:g:k:S:prRwafvqVQhZz::YXWBi:Tt:l::L::A";
  
@@ -110,7 +113,7 @@
  struct option options [] = {
        {"stderr-progress",no_argument,NULL,'e'},
        {"search-for-drive",no_argument,NULL,'s'},
-@@ -644,6 +696,7 @@ struct option options [] = {
+@@ -644,6 +697,7 @@ struct option options [] = {
  
        {NULL,0,NULL,0}
  };
@@ -118,7 +121,7 @@
  
  long blocking_write(int outf, char *buffer, long num){
    long words=0,temp;
-@@ -703,7 +756,12 @@ int main(int argc,char *argv[]){
+@@ -703,7 +757,12 @@ int main(int argc,char *argv[]){
  
    atexit(cleanup);
  
@@ -132,7 +135,7 @@
      switch(c){
      case 'B':
        batch=1;
-@@ -720,6 +778,7 @@ int main(int argc,char *argv[]){
+@@ -720,6 +779,7 @@ int main(int argc,char *argv[]){
      case 'o':
        force_cdrom_overlap=atoi(optarg);
        break;
@@ -140,7 +143,7 @@
      case 'd':
        if(force_cdrom_device)free(force_cdrom_device);
        force_cdrom_device=copystring(optarg);
-@@ -733,6 +792,7 @@ int main(int argc,char *argv[]){
+@@ -733,6 +793,7 @@ int main(int argc,char *argv[]){
        if(force_generic_device)free(force_generic_device);
        force_generic_device=copystring(optarg);
        break;
@@ -148,7 +151,7 @@
      case 'k':
        if(force_generic_device || force_cdrom_device){
        report("-k option incompatable with -d and -g\n");
-@@ -939,6 +999,18 @@ int main(int argc,char *argv[]){
+@@ -939,6 +1000,18 @@ int main(int argc,char *argv[]){
  
    /* Query the cdrom/disc; we may need to override some settings */
  
@@ -167,7 +170,7 @@
    if(force_cooked_device){
      d=cdda_identify_cooked(force_cooked_device,verbose,NULL);
    }else if(force_generic_device)
-@@ -971,6 +1043,7 @@ int main(int argc,char *argv[]){
+@@ -971,6 +1044,7 @@ int main(int argc,char *argv[]){
            report(" ");
        }
        }
@@ -175,7 +178,7 @@
  
    if(!d){
      if(!verbose)
-@@ -1005,7 +1078,9 @@ int main(int argc,char *argv[]){
+@@ -1005,7 +1079,9 @@ int main(int argc,char *argv[]){
      report("Forcing default to read %d sectors; "
           "ignoring preset and autosense",force_cdrom_sectors);
      d->nsectors=force_cdrom_sectors;