Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1468932366173300"
MIME-Version: 1.0
Date: Tue, 19 Jul 2016 12:46:06 +0000
From: "Jonathan Perkin" <jperkin@netbsd.org>
Subject: CVS commit: pkgsrc/devel/ptlib
To: pkgsrc-changes@NetBSD.org
Reply-To: jperkin@netbsd.org
Message-Id: <20160719124606.52786FBB5@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1468932366173300
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jperkin
Date:		Tue Jul 19 12:46:06 UTC 2016

Modified Files:
	pkgsrc/devel/ptlib: distinfo
	pkgsrc/devel/ptlib/patches: patch-src-unix-tlibthrd.cxx
	    patch-unix-pmachdep.h

Log Message:
Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/ptlib/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/ptlib/patches/patch-src-unix-tlibthrd.cxx \
    pkgsrc/devel/ptlib/patches/patch-unix-pmachdep.h

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


--_----------=_1468932366173300
Content-Disposition: inline
Content-Length: 4162
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/ptlib/distinfo
diff -u pkgsrc/devel/ptlib/distinfo:1.21 pkgsrc/devel/ptlib/distinfo:1.22
--- pkgsrc/devel/ptlib/distinfo:1.21	Sat Jul 16 03:23:50 2016
+++ pkgsrc/devel/ptlib/distinfo	Tue Jul 19 12:46:06 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2016/07/16 03:23:50 markd Exp $
+$NetBSD: distinfo,v 1.22 2016/07/19 12:46:06 jperkin Exp $
 
 SHA1 (ptlib-2.10.7.tar.xz) = 51077b76aed30ab614e31b2a18cb383848d4332c
 RMD160 (ptlib-2.10.7.tar.xz) = 0c05b57f5435f4646af05278e66718e0e433a10a
@@ -17,7 +17,7 @@ SHA1 (patch-plugins_sound_esd_sound_esd.
 SHA1 (patch-plugins_sound_oss_sound_oss.cxx) = 50817861710a82e98ebb3b029d021619a09c1132
 SHA1 (patch-plugins_sound_oss_sound_oss.h) = ff48d7385a1e21d2bd896658d1ff8e39d737208b
 SHA1 (patch-plugins_vidinput_bsd_vidinput_bsd.h) = dd965232d9645cd12a866e597828bdf8da7cb389
-SHA1 (patch-src-unix-tlibthrd.cxx) = 0617f208b98ffe85730f411fb8494407e8c6324d
+SHA1 (patch-src-unix-tlibthrd.cxx) = 35f54cb5b831bdf5b47950eff2e54f928a0ae65f
 SHA1 (patch-src_ptclib_pldap.cxx) = 791f3a6efeee35efa44d311eb7077bb0bad441f0
 SHA1 (patch-src_ptclib_pssl.cxx) = b8480a23d3ba27afbe966b059183470637a2664a
 SHA1 (patch-src_ptclib_pxmlrpc.cxx) = 11ce9ec39da38ee253b98a5c0d436e5f9704fe9f
@@ -26,7 +26,7 @@ SHA1 (patch-src_ptlib_unix_svcproc.cxx) 
 SHA1 (patch-unix-config.cxx) = 6127f91bc04d7f008087ebdb9a2fbd1dbb41fd19
 SHA1 (patch-unix-ossaix.cxx) = 3e7a902eb4b73388db01bd53e6c30546c96fe78d
 SHA1 (patch-unix-osutil.cxx) = e907fc2c068f3e20af2f0e97540a1f4e47895a18
-SHA1 (patch-unix-pmachdep.h) = 0cc2d61fa624b60461fb45e1aebfd37d486be5c9
+SHA1 (patch-unix-pmachdep.h) = b96cdc036af8a1957cd56831c49c2a1d27ca9bf5
 SHA1 (patch-unix-serchan.cxx) = f77eb9839a84db91a16b72faafdc8d1499e78b31
 SHA1 (patch-unix-socket.cxx) = 80ff4d0bc67f4bf59e5bfd3e17e3b380f7774bbb
 SHA1 (patch-unix-switch.cxx) = 2c1bc4057a79b6b34651b299042876d2452a84b7

Index: pkgsrc/devel/ptlib/patches/patch-src-unix-tlibthrd.cxx
diff -u pkgsrc/devel/ptlib/patches/patch-src-unix-tlibthrd.cxx:1.2 pkgsrc/devel/ptlib/patches/patch-src-unix-tlibthrd.cxx:1.3
--- pkgsrc/devel/ptlib/patches/patch-src-unix-tlibthrd.cxx:1.2	Sat Dec  1 15:28:03 2012
+++ pkgsrc/devel/ptlib/patches/patch-src-unix-tlibthrd.cxx	Tue Jul 19 12:46:06 2016
@@ -1,18 +1,19 @@
-$NetBSD: patch-src-unix-tlibthrd.cxx,v 1.2 2012/12/01 15:28:03 darcy Exp $
+$NetBSD: patch-src-unix-tlibthrd.cxx,v 1.3 2016/07/19 12:46:06 jperkin Exp $
 
 - deal with lack of pthread_yield on NetBSD
 - XXX needs other platforms to be checked.
 
---- src/ptlib/unix/tlibthrd.cxx.orig    2012-08-23 02:12:27.000000000 +0000
+--- src/ptlib/unix/tlibthrd.cxx.orig	2012-08-23 02:12:27.000000000 +0000
 +++ src/ptlib/unix/tlibthrd.cxx
-@@ -1531,6 +1531,10 @@ PTimedMutex::~PTimedMutex()
+@@ -1531,7 +1531,11 @@ PTimedMutex::~PTimedMutex()
      for (PINDEX i = 0; i < 100; ++i) {
        if ((result = pthread_mutex_destroy(&m_mutex)) != EBUSY)
          break;
-+#if defined(P_NETBSD)
++#if defined(P_NETBSD) || defined(P_SOLARIS)
 +      sched_yield();
 +#else
        pthread_yield();
 +#endif
      }
    }
+ 
Index: pkgsrc/devel/ptlib/patches/patch-unix-pmachdep.h
diff -u pkgsrc/devel/ptlib/patches/patch-unix-pmachdep.h:1.2 pkgsrc/devel/ptlib/patches/patch-unix-pmachdep.h:1.3
--- pkgsrc/devel/ptlib/patches/patch-unix-pmachdep.h:1.2	Sat Oct 13 00:49:38 2012
+++ pkgsrc/devel/ptlib/patches/patch-unix-pmachdep.h	Tue Jul 19 12:46:06 2016
@@ -1,8 +1,8 @@
-$NetBSD: patch-unix-pmachdep.h,v 1.2 2012/10/13 00:49:38 darcy Exp $
+$NetBSD: patch-unix-pmachdep.h,v 1.3 2016/07/19 12:46:06 jperkin Exp $
 
 - Add DragonFly support
 
---- include/ptlib/unix/ptlib/pmachdep.h.orig	2012-08-23 02:12:57.000000000 +0000
+--- include/ptlib/unix/ptlib/pmachdep.h.orig	2016-07-19 12:34:32.470453722 +0000
 +++ include/ptlib/unix/ptlib/pmachdep.h
 @@ -78,6 +78,34 @@ typedef size_t socklen_t;
  #define HAS_IFREQ
@@ -39,3 +39,13 @@ $NetBSD: patch-unix-pmachdep.h,v 1.2 201
  #elif defined(P_FREEBSD)
  
  #if defined(P_PTHREADS)
+@@ -195,7 +223,9 @@ typedef union {
+ } upad128_t;
+ #endif
+ 
++#ifndef INADDR_NONE
+ #define INADDR_NONE     -1
++#endif
+ #if P_SOLARIS < 7
+ typedef int socklen_t;
+ #endif


--_----------=_1468932366173300--