make 10.2 work on macosx (port wouldn't compile since it was upgraded

from 9.8 to 10.2).   the main issue is that macosx doesn't have the
clockid_t and clock_gettime() API.

4 files changed, 40 insertions, 18 deletions

diff --git a/audio/cdparanoia/distinfo b/audio/cdparanoia/distinfo
index 4f3f6ab07d8..eabe10b2063 100644
--- a/audio/cdparanoia/distinfo
+++ b/audio/cdparanoia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2010/12/15 21:08:30 chuck Exp $
+$NetBSD: distinfo,v 1.30 2010/12/16 04:55:46 chuck Exp $
 
 SHA1 (cdparanoia-III-10.2.src.tgz) = 1901e20d3a370ca6afa4c76a9ef30d3f03044320
 RMD160 (cdparanoia-III-10.2.src.tgz) = d6c4ea9cc4aa4d5bcca4985e668ea6142d53cc55
@@ -10,14 +10,14 @@ SHA1 (patch-ad) = f0c79049cbc26e9483c410f00cb6df85c280c145
 SHA1 (patch-ae) = dda320ca0817b06cb25be86b2a891776550603ae
 SHA1 (patch-ba) = 0f4f8ddecd9f5f273f7a1687bbb1477fd64500c1
 SHA1 (patch-ca) = 9860c2227f9d359e808c0ee0989020a9a3163a48
-SHA1 (patch-cb) = 31891b99826876e8c16ecc7688972087c49f53ac
+SHA1 (patch-cb) = 48c05accf3b235a2a1bb168b88cad6e8936169b1
 SHA1 (patch-cc) = e692c8f4a9811123baa6cb25c09dea0004cc9b68
 SHA1 (patch-cd) = 7141563e10b0d23dbd4ff824224a10908741be5b
 SHA1 (patch-ce) = b343191fa2e337e2c3c091c585451c726c1f745b
 SHA1 (patch-cf) = 8d204272dace7bb1d3238e44f6ff152ab38f0930
 SHA1 (patch-cg) = fd92ca2b999c4d25ddbe5abe5f384c5c83019624
-SHA1 (patch-ch) = 37c8e5e675ed8db8ae7768918bea28d509a0563c
-SHA1 (patch-ci) = 0b334f818b35871856f386f77e0bce935ab1b3d0
+SHA1 (patch-ch) = 4b0a232bc21fc57777897269139894428d11016b
+SHA1 (patch-ci) = dabc5121436aee0efde4cda8a01903d918cb8e4a
 SHA1 (patch-cj) = e2420e2ccadd2d6ea30d6bf48af9c141dc395afc
 SHA1 (patch-ck) = 0232f8f42d98b49043f55cd6aaf1f50ab38fadfb
 SHA1 (patch-cn) = b79db0b24a042a5801b47e6db5e20cbf07a53475
diff --git a/audio/cdparanoia/patches/patch-cb b/audio/cdparanoia/patches/patch-cb
index e8e8edbaac9..9a98d77d362 100644
--- a/audio/cdparanoia/patches/patch-cb
+++ b/audio/cdparanoia/patches/patch-cb
@@ -1,7 +1,7 @@
-$NetBSD: patch-cb,v 1.7 2009/08/29 04:54:52 hasso Exp $
+$NetBSD: patch-cb,v 1.8 2010/12/16 04:55:46 chuck Exp $
 
---- interface/low_interface.h.orig	2008-09-11 13:43:52 +0300
-+++ interface/low_interface.h	2009-08-26 10:00:01 +0300
+--- interface/low_interface.h.orig	2008-09-11 06:43:52.000000000 -0400
++++ interface/low_interface.h	2010-12-15 23:40:19.000000000 -0500
 @@ -26,6 +26,7 @@
  #include <sys/time.h>
  #include <sys/types.h>
@@ -33,7 +33,18 @@ $NetBSD: patch-cb,v 1.7 2009/08/29 04:54:52 hasso Exp $
  #include "cdda_interface.h"
  
  #ifndef SG_EMULATED_HOST
-@@ -107,10 +124,18 @@ struct cdda_private_data {
+@@ -100,17 +117,29 @@
+ struct cdda_private_data {
+   struct sg_header *sg_hd;
+   unsigned char *sg_buffer; /* points into sg_hd */
++#if defined(__APPLE__) && defined(__MACH__)
++  /* don't need clock */
++#else
+   clockid_t clock;
++#endif
+   int last_milliseconds;
+ };
+ 
  #define MAX_RETRIES 8
  #define MAX_BIG_BUFF_SIZE 65536
  #define MIN_BIG_BUFF_SIZE 4096
diff --git a/audio/cdparanoia/patches/patch-ch b/audio/cdparanoia/patches/patch-ch
index 1f4ceb0c7c8..551281d9fb6 100644
--- a/audio/cdparanoia/patches/patch-ch
+++ b/audio/cdparanoia/patches/patch-ch
@@ -1,7 +1,7 @@
-$NetBSD: patch-ch,v 1.6 2009/08/29 04:54:52 hasso Exp $
+$NetBSD: patch-ch,v 1.7 2010/12/16 04:55:46 chuck Exp $
 
---- interface/cdda_interface.h.orig	2008-09-11 13:43:52 +0300
-+++ interface/cdda_interface.h	2009-08-28 11:50:44 +0300
+--- interface/cdda_interface.h.orig	2008-09-11 06:43:52.000000000 -0400
++++ interface/cdda_interface.h	2010-12-15 23:39:17.000000000 -0500
 @@ -18,9 +18,24 @@
  #endif
  #define CD_FRAMESAMPLES (CD_FRAMESIZE_RAW / 4)
@@ -20,14 +20,14 @@ $NetBSD: patch-ch,v 1.6 2009/08/29 04:54:52 hasso Exp $
 +#include <camlib.h>
 +#endif
 +
-+#ifdef __NetBSD__
++#if defined(__NetBSD__) || (defined(__APPLE__) && defined(__MACH__))
 +#define ENOMEDIUM 12345
 +#endif
 +
  #define MAXTRK 100
  
  typedef struct TOC {	/* structure of table of contents */
-@@ -35,6 +50,7 @@ typedef struct TOC {	/* structure of tab
+@@ -35,6 +50,7 @@
  #define TEST_INTERFACE	 2
  #define SGIO_SCSI	 3
  #define SGIO_SCSI_BUGGY1 4
@@ -35,7 +35,7 @@ $NetBSD: patch-ch,v 1.6 2009/08/29 04:54:52 hasso Exp $
  
  #define CDDA_MESSAGE_FORGETIT 0
  #define CDDA_MESSAGE_PRINTIT 1
-@@ -49,13 +65,27 @@ typedef struct cdrom_drive{
+@@ -49,13 +65,27 @@
    int opened; /* This struct may just represent a candidate for opening */
  
    char *cdda_device_name;
@@ -65,7 +65,7 @@ $NetBSD: patch-ch,v 1.6 2009/08/29 04:54:52 hasso Exp $
    int interface;
    int bigendianp;
    int nsectors;
-@@ -84,7 +114,7 @@ typedef struct cdrom_drive{
+@@ -84,7 +114,7 @@
    int is_atapi;
    int is_mmc;
  
diff --git a/audio/cdparanoia/patches/patch-ci b/audio/cdparanoia/patches/patch-ci
index dcbaa518ad7..3be0cd8f16c 100644
--- a/audio/cdparanoia/patches/patch-ci
+++ b/audio/cdparanoia/patches/patch-ci
@@ -1,7 +1,7 @@
-$NetBSD: patch-ci,v 1.8 2010/03/26 16:38:32 jdc Exp $
+$NetBSD: patch-ci,v 1.9 2010/12/16 04:55:46 chuck Exp $
 
---- interface/interface.c.orig	2008-09-11 10:43:52.000000000 +0000
-+++ interface/interface.c	2010-03-24 13:57:38.000000000 +0000
+--- interface/interface.c.orig	2008-09-11 06:43:52.000000000 -0400
++++ interface/interface.c	2010-12-15 23:41:29.000000000 -0500
 @@ -35,6 +35,10 @@
  
      _clean_messages(d);
@@ -74,3 +74,14 @@ $NetBSD: patch-ci,v 1.8 2010/03/26 16:38:32 jdc Exp $
  	/* byteswap? */
  	if(d->bigendianp==-1) /* not determined yet */
  	  d->bigendianp=data_bigendianp(d);
+@@ -127,7 +153,9 @@
+ 	}
+       }	
+     }
+-    if(ms)*ms=d->private->last_milliseconds;
++    if(ms) {
++      *ms = (d->private == NULL) ? 0 : d->private->last_milliseconds;
++    }
+     return(sectors);
+   }
+