Make this build on Darwin. The changes are taken from pwlib repository

pmachdep.h rev. 1.69
pssl.cxx rev. 1.42
maccoreaudio.cxx rev. 1.15
udll.cxx ewv. 1.18

5 files changed, 75 insertions, 9 deletions

diff --git a/devel/pwlib/distinfo b/devel/pwlib/distinfo
index f1525c3c8d6..cf4af0b6300 100644
--- a/devel/pwlib/distinfo
+++ b/devel/pwlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2006/10/12 17:28:16 rillig Exp $
+$NetBSD: distinfo,v 1.22 2007/03/14 17:12:47 yyamano Exp $
 
 SHA1 (pwlib-v1_8_3-src-tar.gz) = d3a6eff571ebfd37889e75cbaef75983e6119d2e
 RMD160 (pwlib-v1_8_3-src-tar.gz) = 1ce2544ef631c8344543e62988f97022c998bb05
@@ -21,11 +21,13 @@ SHA1 (patch-ao) = 665d7c87476b8bb7afe3bdb1a892cf98f7bff8d2
 SHA1 (patch-ap) = 5f7d299cdd15e5c773ffdc4085be4466d70ca412
 SHA1 (patch-aq) = f590dad7d36d3926586f5158d3ae599fda38f554
 SHA1 (patch-ar) = f4c8b0141758613506a95e2fe0ce328c49898144
-SHA1 (patch-as) = 2764ccc5876bc15a7d56e4416742e951f418945a
+SHA1 (patch-as) = f8d20a9fc2b577c158bf500bfe933903aa64b987
 SHA1 (patch-at) = 87bbff9a5426c18c3e8407406b244eef2413cdbd
 SHA1 (patch-au) = 4947ee29e91c84f39a370ebc128c1e67737234d1
 SHA1 (patch-av) = 2bb533f6a29f10d357aed1b12c0bfc43af8a4f3b
 SHA1 (patch-aw) = 236cb19fc7f0b78055b0634b3821c099318abb9f
-SHA1 (patch-ba) = ba9538222c5e6fb64c6211c7bda364ef31beeaf4
+SHA1 (patch-ay) = 4a7978e13956172e9190444cb773c950c2e95ace
+SHA1 (patch-az) = b82405bea8da7d93d965457f1090e64149e5f561
+SHA1 (patch-ba) = 5695be7e37677e7d4db84bb997404030e8a8523f
 SHA1 (patch-bb) = 03345fade582539c3b7332f14f1956686ad15289
 SHA1 (patch-bd) = 2d2fb1c6772a1e015cc1bceeb27fda39f57f5acc
diff --git a/devel/pwlib/patches/patch-as b/devel/pwlib/patches/patch-as
index 6a278cf453e..e27a3b1af40 100644
--- a/devel/pwlib/patches/patch-as
+++ b/devel/pwlib/patches/patch-as
@@ -1,6 +1,6 @@
-$NetBSD: patch-as,v 1.1 2006/01/08 04:57:55 joerg Exp $
+$NetBSD: patch-as,v 1.2 2007/03/14 17:12:47 yyamano Exp $
 
---- include/ptlib/unix/ptlib/pmachdep.h.orig	2006-01-08 03:44:23.000000000 +0000
+--- include/ptlib/unix/ptlib/pmachdep.h.orig	2004-11-16 09:30:38.000000000 +0900
 +++ include/ptlib/unix/ptlib/pmachdep.h
 @@ -217,7 +217,7 @@ typedef size_t socklen_t;
  #endif
@@ -20,3 +20,15 @@ $NetBSD: patch-as,v 1.1 2006/01/08 04:57:55 joerg Exp $
  typedef int socklen_t;
  #endif
  
+@@ -489,8 +489,10 @@ void *dlsym(void *handle, const char *sy
+ #include <net/if.h>
+ #include <netinet/tcp.h>
+ #include <sys/ioctl.h>
+- 
++
++#if defined (P_MACOSX) && (P_MACOSX < 800)
+ typedef int socklen_t;
++#endif
+  
+ #define HAS_IFREQ
+  
diff --git a/devel/pwlib/patches/patch-ay b/devel/pwlib/patches/patch-ay
new file mode 100644
index 00000000000..60942acd7a8
--- /dev/null
+++ b/devel/pwlib/patches/patch-ay
@@ -0,0 +1,25 @@
+$NetBSD: patch-ay,v 1.1 2007/03/14 17:12:47 yyamano Exp $
+
+--- src/ptlib/unix/maccoreaudio.cxx.orig	2004-11-18 17:40:47.000000000 +0900
++++ src/ptlib/unix/maccoreaudio.cxx
+@@ -1323,8 +1323,8 @@ OSStatus PSoundChannelCoreAudio::SetupAd
+ 	bufferSizeBytes += bufferSizeBytes / 10; // +10%
+ 
+    //calculate size of ABL given the last field, assum non-interleaved 
+-   UInt32 propsize = 
+-      offsetof(AudioBufferList, mBuffers[hwASBD.mChannelsPerFrame]);
++   UInt32 mChannelsPerFrame = hwASBD.mChannelsPerFrame;
++   UInt32 propsize = (UInt32) &(((AudioBufferList *)0)->mBuffers[mChannelsPerFrame]);
+ 
+    //malloc buffer lists
+    mInputBufferList = (AudioBufferList *)malloc(propsize);
+@@ -1358,7 +1358,8 @@ OSStatus PSoundChannelCoreAudio::SetupAd
+ 
+ 
+    //calculate number of buffers from channels
+-   propsize = offsetof(AudioBufferList, mBuffers[pwlibASBD.mChannelsPerFrame]);
++   mChannelsPerFrame = pwlibASBD.mChannelsPerFrame;
++   propsize = (UInt32) &(((AudioBufferList *)0)->mBuffers[mChannelsPerFrame]);
+ 
+    //malloc buffer lists
+    mOutputBufferList = (AudioBufferList *)malloc(propsize);
diff --git a/devel/pwlib/patches/patch-az b/devel/pwlib/patches/patch-az
new file mode 100644
index 00000000000..00682c59c21
--- /dev/null
+++ b/devel/pwlib/patches/patch-az
@@ -0,0 +1,27 @@
+$NetBSD: patch-az,v 1.1 2007/03/14 17:12:47 yyamano Exp $
+
+--- src/ptlib/unix/udll.cxx.orig	2004-05-11 10:15:53.000000000 +0900
++++ src/ptlib/unix/udll.cxx
+@@ -88,6 +88,7 @@
+ #include <ptlib.h>
+ 
+ #ifdef P_MACOSX
++#if P_MACOSX < 700
+ 
+ /*
+ Copyright (c) 2002 Peter O'Gorman <ogorman@users.sourceforge.net>
+@@ -326,7 +327,13 @@ static void *dlsym(void *handle, const c
+ 	return value;
+ }
+ 
+-#endif
++#else
++
++// The functionality implemented above ships directly with MacOSX 10.3 and later
++#include <dlfcn.h>
++#endif // P_MACOSX < 700
++
++#endif // P_MACOSX
+ 
+ #ifndef	P_DYNALINK
+ 
diff --git a/devel/pwlib/patches/patch-ba b/devel/pwlib/patches/patch-ba
index 58d9074c7a5..91cf9b43d2b 100644
--- a/devel/pwlib/patches/patch-ba
+++ b/devel/pwlib/patches/patch-ba
@@ -1,7 +1,7 @@
-$NetBSD: patch-ba,v 1.5 2006/03/13 22:58:45 rillig Exp $
+$NetBSD: patch-ba,v 1.6 2007/03/14 17:12:48 yyamano Exp $
 
---- src/ptclib/pssl.cxx.orig	2004-04-09 08:52:17.000000000 +0200
-+++ src/ptclib/pssl.cxx	2006-03-13 23:48:01.000000000 +0100
+--- src/ptclib/pssl.cxx.orig	2004-04-09 15:52:17.000000000 +0900
++++ src/ptclib/pssl.cxx
 @@ -297,14 +297,22 @@ PSSLPrivateKey::PSSLPrivateKey(const PFi
  
  PSSLPrivateKey::PSSLPrivateKey(const BYTE * keyData, PINDEX keySize)
@@ -72,7 +72,7 @@ $NetBSD: patch-ba,v 1.5 2006/03/13 22:58:45 rillig Exp $
  }
  
 -#ifdef __BEOS__
-+#if defined(__BEOS__) || (defined(__NetBSD__) && OPENSSL_VERSION_NUMBER < 0x00908000L)
++#if defined(__BEOS__) || ((defined(__NetBSD__) || defined(__APPLE__)) && OPENSSL_VERSION_NUMBER < 0x00908000L)
  // 2/21/04 Yuri Kiryanov - fix for compiler choke on BeOS for usage of
  // SSL function d2i_DHparams_bio below in PSSLDiffieHellman::Load
  #undef  d2i_DHparams_bio