[pkgsrc/trunk]: pkgsrc/audio/cdparanoia Fix build on Mac OS X and bump pkgrev...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/audio/cdparanoia Fix build on Mac OS X and bump pkgrev...
From: ben <ben%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:56:29 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc5f80d2a9fb
branches:  trunk
changeset: 518242:dc5f80d2a9fb
user:      ben <ben%pkgsrc.org@localhost>
date:      Sun Sep 03 17:13:30 2006 +0000

description:
Fix build on Mac OS X and bump pkgrevision.

This is based on the work found at:
  http://strangehours.livejournal.com/9698.html

Tested on i386 Mac OS X 10.4.7 and i386 NetBSD 3.0.

TODO: manual device selection in Mac OS X.

diffstat:

 audio/cdparanoia/Makefile         |    6 +-
 audio/cdparanoia/distinfo         |   31 ++-
 audio/cdparanoia/patches/patch-aa |   32 +++-
 audio/cdparanoia/patches/patch-ab |   14 +-
 audio/cdparanoia/patches/patch-ac |   49 ++++++-
 audio/cdparanoia/patches/patch-ad |   25 ++-
 audio/cdparanoia/patches/patch-ae |   77 ++++++++-
 audio/cdparanoia/patches/patch-ca |   15 +-
 audio/cdparanoia/patches/patch-cb |    4 +-
 audio/cdparanoia/patches/patch-cc |   65 ++++++--
 audio/cdparanoia/patches/patch-cd |   29 +++-
 audio/cdparanoia/patches/patch-cf |   73 ++++++----
 audio/cdparanoia/patches/patch-ch |   34 ++++-
 audio/cdparanoia/patches/patch-ci |   31 +++-
 audio/cdparanoia/patches/patch-cj |   15 ++
 audio/cdparanoia/patches/patch-ck |   36 +++++
 audio/cdparanoia/patches/patch-cl |   13 +
 audio/cdparanoia/patches/patch-cm |   14 +
 audio/cdparanoia/patches/patch-cn |  272 ++++++++++++++++++++++++++++++++++++++
 19 files changed, 715 insertions(+), 120 deletions(-)

diffs (truncated from 1418 to 300 lines):

diff -r 0df939da448e -r dc5f80d2a9fb audio/cdparanoia/Makefile
--- a/audio/cdparanoia/Makefile Sun Sep 03 16:55:15 2006 +0000
+++ b/audio/cdparanoia/Makefile Sun Sep 03 17:13:30 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2006/03/07 06:29:03 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2006/09/03 17:13:30 ben Exp $
 #
 
 DISTNAME=      cdparanoia-III-alpha9.8
 PKGNAME=       cdparanoia-3.0.9.8
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    audio
 MASTER_SITES=  http://www.xiph.org/paranoia/download/
 EXTRACT_SUFX=  .src.tgz
@@ -12,7 +12,7 @@
 HOMEPAGE=      http://www.xiph.org/paranoia/
 COMMENT=       CDDA reading utility with extra data verification features
 
-ONLY_FOR_PLATFORM=     FreeBSD-*-* NetBSD-*-* Linux-*-* DragonFly-*-*
+ONLY_FOR_PLATFORM=     FreeBSD-*-* NetBSD-*-* Linux-*-* DragonFly-*-* Darwin-*-*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
diff -r 0df939da448e -r dc5f80d2a9fb audio/cdparanoia/distinfo
--- a/audio/cdparanoia/distinfo Sun Sep 03 16:55:15 2006 +0000
+++ b/audio/cdparanoia/distinfo Sun Sep 03 17:13:30 2006 +0000
@@ -1,20 +1,25 @@
-$NetBSD: distinfo,v 1.14 2006/05/14 21:31:01 minskim Exp $
+$NetBSD: distinfo,v 1.15 2006/09/03 17:13:30 ben Exp $
 
 SHA1 (cdparanoia-III-alpha9.8.src.tgz) = 04cc33a7d22d6255f6239e3e74195506b3bdde06
 RMD160 (cdparanoia-III-alpha9.8.src.tgz) = d9225165f83b5386c58db263d6918a7006df1481
 Size (cdparanoia-III-alpha9.8.src.tgz) = 116591 bytes
-SHA1 (patch-aa) = 31b37e9fb7be1cb16249bcd6a8561ab64c2fbf39
-SHA1 (patch-ab) = 69d2996b7089cb87ce4e3de969da795ae041e720
-SHA1 (patch-ac) = 7de8b30c5b5ed2e82090115897d7c98e61776214
-SHA1 (patch-ad) = 45cb1d2d402f5769447507c8da24e289396021e7
-SHA1 (patch-ae) = ea4cbc4a13f36ba4da39bd9a944d4123f132b86e
+SHA1 (patch-aa) = 29fd5767b37360fe804013bb171fc7e5f4d8311f
+SHA1 (patch-ab) = d4dad2ef444cd82bbe6201f7cbdcc42d1f28cc6e
+SHA1 (patch-ac) = 3d2221af8d9280c77ad0f08836cbc6f2b311d61f
+SHA1 (patch-ad) = 9a1ea1b98b5f3810e1ccae57beb8c68b5e189716
+SHA1 (patch-ae) = 6ba166c2ac73b9c03a1944989c6ffbe655d80c71
 SHA1 (patch-ba) = 51151796493c946e5bdafbd22005136ea7f27a09
-SHA1 (patch-ca) = cf29a467bd37bc642edd81f8a6aa76cfb0c15344
-SHA1 (patch-cb) = 2123635be4d7765419d62958365a6df621471439
-SHA1 (patch-cc) = 311f8e45a9c3bc86cdb106730295f28a856ae2ab
-SHA1 (patch-cd) = 81a35822f89b4f674f03cbcbd5831cac96c3aa92
+SHA1 (patch-ca) = 9c35254c09a96b622cac44198443f66f7bc0e428
+SHA1 (patch-cb) = c19ee04017b836842bb0f2d2c77e8f35aad0f9bb
+SHA1 (patch-cc) = 9398e31db2e0c4cca19a95aa7b22cdb928869429
+SHA1 (patch-cd) = 81d31fb55db0f982959395cdecc3da826bf23bfb
 SHA1 (patch-ce) = 282e3169cc26ab11924c66a312d77d7c1f59f242
-SHA1 (patch-cf) = 3ccf5e52737cb449dbead92c582646d0ebe24500
+SHA1 (patch-cf) = 650de2a80235e42acd5670a06bd1e5bcf346100d
 SHA1 (patch-cg) = b9786ee81dcb7bd2f6572a20f424dd5291a8720d
-SHA1 (patch-ch) = d28ec06a56499ff96491edc49d462f43c41d15fe
-SHA1 (patch-ci) = 7d041cabce0a8935fd1807766a93eb72e7c9c717
+SHA1 (patch-ch) = 8d16dd8c80e8f1ee35ccc299ba927d685adde01c
+SHA1 (patch-ci) = 60db1d1d2e8ec9c6d446543762218b22c597d986
+SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
+SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
+SHA1 (patch-cl) = f511570233524feac434db160e51099316618058
+SHA1 (patch-cm) = 18001a6cf96dd6bfde8e1208be56a40fac9aa0d5
+SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475
diff -r 0df939da448e -r dc5f80d2a9fb audio/cdparanoia/patches/patch-aa
--- a/audio/cdparanoia/patches/patch-aa Sun Sep 03 16:55:15 2006 +0000
+++ b/audio/cdparanoia/patches/patch-aa Sun Sep 03 17:13:30 2006 +0000
@@ -1,8 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2001/06/25 12:17:55 simonb Exp $
+$NetBSD: patch-aa,v 1.4 2006/09/03 17:13:30 ben Exp $
 
---- configure.in.orig  Mon Aug 16 08:29:43 1999
-+++ configure.in       Mon Jun 25 21:15:58 2001
-@@ -20,6 +20,12 @@
+--- configure.in.orig  2000-03-25 23:33:22.000000000 -0800
++++ configure.in
+@@ -12,6 +12,17 @@ AC_PROG_RANLIB
+ AC_CHECK_PROG(AR,ar,ar)
+ AC_CHECK_PROG(INSTALL,install,install)
+ 
++case $host in
++*-*-darwin*)
++  EXTRA_OBJS=osx_interface.o
++  EXTRA_LIBS=-framework CoreFoundation -framework IOKit
++  ;;
++*)
++  EXTRA_OBJS=cooked_interface.o scsi_interface.o
++  EXTRA_LIBS=
++  ;;
++esac
++
+ if test -z "$GCC"; then
+       DEBUG="-g"
+       OPT="-O"
+@@ -20,6 +31,12 @@ else
        i?86-*-linux*)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
@@ -15,7 +33,7 @@
        *)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O20 -fsigned-char";;
-@@ -28,7 +34,10 @@
+@@ -28,7 +45,10 @@ fi
  
  AC_HEADER_STDC
  
@@ -27,7 +45,7 @@
  
  TYPESIZES="" 
  
-@@ -62,15 +71,25 @@
+@@ -62,15 +82,27 @@ fi
        
  AC_CHECK_HEADERS(linux/sbpcd.h, SBPCD_H="-DSBPCD_H='1' ")
  AC_CHECK_HEADERS(linux/ucdrom.h, UCDROM_H="-DUCDROM_H='1' ")
@@ -51,5 +69,7 @@
  AC_SUBST(DEBUG)
  AC_SUBST(CC)
 +AC_SUBST(LIBUTIL)
++AC_SUBST(EXTRA_OBJS)
++AC_SUBST(EXTRA_LIBS)
  
  AC_OUTPUT(Makefile interface/Makefile paranoia/Makefile)
diff -r 0df939da448e -r dc5f80d2a9fb audio/cdparanoia/patches/patch-ab
--- a/audio/cdparanoia/patches/patch-ab Sun Sep 03 16:55:15 2006 +0000
+++ b/audio/cdparanoia/patches/patch-ab Sun Sep 03 17:13:30 2006 +0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.5 2006/03/07 06:29:03 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2006/09/03 17:13:30 ben Exp $
 
-Note tht VERSION is *not* used for the libtool versioning.
+Note that VERSION is *not* used for the libtool versioning.
 
---- Makefile.in.orig   Wed Mar 28 07:46:58 2001
-+++ Makefile.in        Sun Mar  3 23:08:01 2002
+--- Makefile.in.orig   2001-03-27 14:46:58.000000000 -0800
++++ Makefile.in
 @@ -3,12 +3,12 @@
  # DO NOT EDIT BELOW! ##########################################################
  # (unless, of course, you know what you are doing :) ##########################
@@ -19,7 +19,7 @@
  OPT=@OPT@ $(FLAGS)
  DEBUG=@DEBUG@ $(FLAGS)
  CC=@CC@
-@@ -27,29 +27,29 @@
+@@ -27,29 +27,29 @@ PWD = $(shell pwd)
  
  OFILES = main.o report.o header.o buffering_write.o
  
@@ -38,7 +38,7 @@
 +STLIBDEP = interface/libcdda_interface.a paranoia/libcdda_paranoia.a
  
 +SHLIBDEP = interface/libcdda_interface.la paranoia/libcdda_paranoia.la
-+SHLIBS = $(SHLIBDEP) @LIBUTIL@ -lm
++SHLIBS = $(SHLIBDEP) @LIBUTIL@ @EXTRA_LIBS@ -lm
  
 -all:  
 +
@@ -63,7 +63,7 @@
  
  test: 
        cd interface && $(MAKE) all
-@@ -65,31 +65,20 @@
+@@ -65,31 +65,20 @@ slib:
  
  install:
        $(INSTALL) -d -m 0755 $(BINDIR)
diff -r 0df939da448e -r dc5f80d2a9fb audio/cdparanoia/patches/patch-ac
--- a/audio/cdparanoia/patches/patch-ac Sun Sep 03 16:55:15 2006 +0000
+++ b/audio/cdparanoia/patches/patch-ac Sun Sep 03 17:13:30 2006 +0000
@@ -1,8 +1,25 @@
-$NetBSD: patch-ac,v 1.5 2004/03/20 11:23:51 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2006/09/03 17:13:30 ben Exp $
 
---- configure.orig     Sat Apr 15 17:13:01 2000
+--- configure.orig     2000-04-15 08:13:01.000000000 -0700
 +++ configure
-@@ -893,6 +893,12 @@ else
+@@ -884,6 +884,16 @@ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++case $host in
++*-*-darwin*)
++  EXTRA_OBJS=osx_interface.o
++  EXTRA_LIBS="-framework CoreFoundation -framework IOKit"
++  ;;
++*)
++  EXTRA_OBJS="cooked_interface.o scsi_interface.o"
++  EXTRA_LIBS=
++  ;;
++esac
+ 
+ if test -z "$GCC"; then
+       DEBUG="-g"
+@@ -893,6 +903,12 @@ else
        i?86-*-linux*)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O20 -ffast-math -fsigned-char -finline-functions";;
@@ -15,7 +32,7 @@
        *)
                DEBUG="-g -Wall -fsigned-char"
                OPT="-O20 -fsigned-char";;
-@@ -1084,7 +1090,6 @@ EOF
+@@ -1084,7 +1100,6 @@ EOF
  fi
  
  
@@ -23,7 +40,7 @@
  
  TYPESIZES="" 
  
-@@ -1476,6 +1481,143 @@ else
+@@ -1476,6 +1491,143 @@ else
  fi
  done
  
@@ -167,7 +184,27 @@
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
  echo "configure:1482: checking whether ${MAKE-make} sets \${MAKE}" >&5
-@@ -1744,9 +1886,12 @@ s%@CPP@%$CPP%g
+@@ -1686,6 +1838,10 @@ for ac_option
+ do
+   case "\$ac_option" in
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
+     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+@@ -1736,6 +1892,8 @@ s%@host_alias@%$host_alias%g
+ s%@host_cpu@%$host_cpu%g
+ s%@host_vendor@%$host_vendor%g
+ s%@host_os@%$host_os%g
++s%@EXTRA_OBJS@%$EXTRA_OBJS%g
++s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+ s%@CC@%$CC%g
+ s%@RANLIB@%$RANLIB%g
+ s%@AR@%$AR%g
+@@ -1744,9 +1902,12 @@ s%@CPP@%$CPP%g
  s%@SET_MAKE@%$SET_MAKE%g
  s%@SBPCD_H@%$SBPCD_H%g
  s%@UCDROM_H@%$UCDROM_H%g
diff -r 0df939da448e -r dc5f80d2a9fb audio/cdparanoia/patches/patch-ad
--- a/audio/cdparanoia/patches/patch-ad Sun Sep 03 16:55:15 2006 +0000
+++ b/audio/cdparanoia/patches/patch-ad Sun Sep 03 17:13:30 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2002/03/04 14:45:13 itohy Exp $
+$NetBSD: patch-ad,v 1.4 2006/09/03 17:13:30 ben Exp $
 
---- utils.h.orig       Thu Apr 20 07:41:04 2000
-+++ utils.h    Sun Mar  3 23:24:19 2002
-@@ -1,5 +1,16 @@
+--- utils.h.orig       2000-04-19 15:41:04.000000000 -0700
++++ utils.h
+@@ -1,5 +1,20 @@
  #include <stdlib.h>
 +#ifdef __linux__
  #include <endian.h>
@@ -16,27 +16,42 @@
 +#include <machine/bswap.h>
 +#endif
 +#endif
++#if defined(__APPLE__) && defined(__MACH__)
++#include <stdint.h>
++#include <machine/endian.h>
++#endif
  #include <stdio.h>
  #include <errno.h>
  #include <string.h>
-@@ -19,15 +30,23 @@
+@@ -19,15 +34,34 @@ static inline int bigendianp(void){
  }
  
  static inline int32_t swap32(int32_t x){
 +#ifdef __NetBSD__
 +  return bswap32(x);
 +#else
++#if defined(__APPLE__) && defined(__MACH__)
++  return((((uint32_t)x & 0x000000ffU) << 24) | 
++        (((uint32_t)x & 0x0000ff00U) <<  8) | 
++        (((uint32_t)x & 0x00ff0000U) >>  8) | 
++        (((uint32_t)x & 0xff000000U) >> 24));
++#else
    return((((u_int32_t)x & 0x000000ffU) << 24) | 
         (((u_int32_t)x & 0x0000ff00U) <<  8) | 
         (((u_int32_t)x & 0x00ff0000U) >>  8) | 
         (((u_int32_t)x & 0xff000000U) >> 24));
 +#endif
++#endif
  }
  
  static inline int16_t swap16(int16_t x){
 +#ifdef __NetBSD__
Prev by Date: [pkgsrc/trunk]: pkgsrc/net/p5-Net-DNS Updated to version 0.58.
Next by Date: [pkgsrc/trunk]: pkgsrc/archivers/gtar-base Fix for CVE-2006-0300 via RedHat
Previous by Thread: [pkgsrc/trunk]: pkgsrc/net/p5-Net-DNS Updated to version 0.58.
Next by Thread: [pkgsrc/trunk]: pkgsrc/archivers/gtar-base Fix for CVE-2006-0300 via RedHat
Indexes:
Home | Main Index | Thread Index | Old Index