Update ptlib to 2.6.1. Lots of changes, no changelog in sight.

Main features on this new major release branch are:

    * Instant Messaging. Using several different ?standards?: RFC4975, MSRP, T.140, SIP-IM etc etc.
    * Much improved support for SIP event handling (SUBSCRIBE/NOTIFY/PUBLISH) using factories so more event packages can be added easily.
    * Support for SIP ?dialog? event package.
    * Support for Shared Line Appearance (aka Multiple Line Appearance, Bridged Line Appearance or Busy Lamp Field)
    * Significant improvements in IPv6 support (thanks Yuri Kiryanov!)
    * Major enhancements to the video rate controller.
    * Removal of the old H.263 ffmpeg plug in and enhancement of the H.263-1998 plug it to take its place.
    * H.224 support (H.323 only).
    * SBC audio codec plug in.
    * G.722 audio codec plug in.
    * CELT audio codec plug in.
    * SWIG support for use in other languages, Java first.
    * Much improved multi-platform sample GUI client, OpenPhone. Now standard test environment replacing simpleOPAL.

9 files changed, 96 insertions, 77 deletions

diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 4365f6f409d..a0dd0d57343 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2009/01/30 08:18:45 obache Exp $
+# $NetBSD: Makefile,v 1.7 2009/03/18 11:57:15 jmcneill Exp $
 
-DISTNAME=	ptlib-2.4.4
+DISTNAME=	ptlib-2.6.1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ptlib/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/ptlib/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/devel/ptlib/PLIST b/devel/ptlib/PLIST
index 0efad7ad265..8d5dad94798 100644
--- a/devel/ptlib/PLIST
+++ b/devel/ptlib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/10/25 18:12:34 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/03/18 11:57:15 jmcneill Exp $
 bin/ptlib-config
 include/ptbuildopts.h
 include/ptclib/asnber.h
@@ -23,6 +23,7 @@ include/ptclib/mime.h
 include/ptclib/modem.h
 include/ptclib/paec.h
 include/ptclib/pasn.h
+include/ptclib/pffvdev.h
 include/ptclib/pdns.h
 include/ptclib/pils.h
 include/ptclib/pldap.h
@@ -67,7 +68,6 @@ include/ptlib/config.h
 include/ptlib/contain.h
 include/ptlib/contain.inl
 include/ptlib/critsec.h
-include/ptlib/devplugin.h
 include/ptlib/dict.h
 include/ptlib/dynalink.h
 include/ptlib/ethsock.h
@@ -155,7 +155,6 @@ include/ptlib/unix/ptlib/timeint.h
 include/ptlib/unix/ptlib/timer.h
 include/ptlib/unix/ptlib/udpsock.h
 include/ptlib/unix/ptlib/video.h
-include/ptlib/unix/ptlib/videoio.h
 include/ptlib/vconvert.h
 include/ptlib/video.h
 include/ptlib/videoio.h
diff --git a/devel/ptlib/buildlink3.mk b/devel/ptlib/buildlink3.mk
index 50636e64dbd..46f07a7fbeb 100644
--- a/devel/ptlib/buildlink3.mk
+++ b/devel/ptlib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2009/01/30 12:46:23 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2009/03/18 11:57:15 jmcneill Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PTLIB_BUILDLINK3_MK:=	${PTLIB_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	ptlib
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}ptlib
 
 .if !empty(PTLIB_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.ptlib+=	ptlib>=2.4.2
-BUILDLINK_ABI_DEPENDS.ptlib?=	ptlib>=2.4.2
+BUILDLINK_API_DEPENDS.ptlib+=	ptlib>=2.6.1
+BUILDLINK_ABI_DEPENDS.ptlib?=	ptlib>=2.6.1
 BUILDLINK_PKGSRCDIR.ptlib?=	../../devel/ptlib
 .endif	# PTLIB_BUILDLINK3_MK
 
diff --git a/devel/ptlib/distinfo b/devel/ptlib/distinfo
index 4f92b218d76..373985479f3 100644
--- a/devel/ptlib/distinfo
+++ b/devel/ptlib/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.6 2009/01/13 02:19:10 jmcneill Exp $
+$NetBSD: distinfo,v 1.7 2009/03/18 11:57:15 jmcneill Exp $
 
-SHA1 (ptlib-2.4.4.tar.bz2) = a6255cc6f2fb337518a9c49d8ce21f1790729ca7
-RMD160 (ptlib-2.4.4.tar.bz2) = 9a84d463bf203b1619a9df5a67d0fed80b182acd
-Size (ptlib-2.4.4.tar.bz2) = 3009442 bytes
-SHA1 (patch-ac) = b0cb79c86fb0cf3182d08a33ad48a3f9becc9c20
-SHA1 (patch-ad) = 04504e7549709f4936dc2c791b0fbcc425781c08
-SHA1 (patch-ae) = 92d140bd9536837186a03a3d3230bbb207df0ae4
-SHA1 (patch-af) = 837cf090245e924397118132bd9529bfc394e0b3
+SHA1 (ptlib-2.6.1.tar.bz2) = b269a20f1bf98130e0088eea6ec5689197cf5521
+RMD160 (ptlib-2.6.1.tar.bz2) = e7bd3f954c871725b269df0ab7561ab0fe6a23ba
+Size (ptlib-2.6.1.tar.bz2) = 3296212 bytes
+SHA1 (patch-ac) = b29fa5e9a2e8d4585367ee21ccf17691780f1429
+SHA1 (patch-ad) = 86f80d2a1dfad6effdd11c4290dc11c1bc56f199
+SHA1 (patch-ae) = af3ba745e56aba3c4f35ff4a69918a545466aa7d
+SHA1 (patch-af) = 3f1271e2b0f84cca82e7b8cbde0ef489d15b7810
 SHA1 (patch-ah) = 5d98d2037c1b389e098d993217f3cefb5050a908
 SHA1 (patch-ai) = 47a7d53e52f5a28b0f25baaf1782a4152e6c6927
 SHA1 (patch-aj) = 4c9548ef40857baf29daacc9acf6ecd68a1e5610
+SHA1 (patch-ak) = 996ce5a8a3e99bb3b6f4b559da35849f1f5d14b3
diff --git a/devel/ptlib/patches/patch-ac b/devel/ptlib/patches/patch-ac
index d634f26d623..c15ab2b81c2 100644
--- a/devel/ptlib/patches/patch-ac
+++ b/devel/ptlib/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
 
---- src/ptlib/unix/tlib.cxx.orig	2008-09-08 15:34:39.000000000 -0400
-+++ src/ptlib/unix/tlib.cxx	2008-09-08 15:34:54.000000000 -0400
-@@ -400,7 +400,7 @@
+--- src/ptlib/unix/tlib.cxx.orig	2009-03-17 23:43:30.000000000 -0400
++++ src/ptlib/unix/tlib.cxx
+@@ -400,7 +400,7 @@ PString PX_GetThreadName(pthread_t id)
  {
    if (PProcessInstance != NULL) {
-     PWaitAndSignal m(PProcessInstance->threadMutex);
+     PWaitAndSignal m(PProcessInstance->activeThreadMutex);
 -    PThread & thread = PProcessInstance->activeThreads[(unsigned)id];
 +    PThread & thread = PProcessInstance->activeThreads[(uintptr_t)id];
      return thread.GetThreadName();
diff --git a/devel/ptlib/patches/patch-ad b/devel/ptlib/patches/patch-ad
index ae4a0ab72a0..c118cddcdf2 100644
--- a/devel/ptlib/patches/patch-ad
+++ b/devel/ptlib/patches/patch-ad
@@ -1,49 +1,33 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
+$NetBSD: patch-ad,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
 
---- src/ptlib/unix/tlibthrd.cxx.orig	2008-09-08 15:35:17.000000000 -0400
-+++ src/ptlib/unix/tlibthrd.cxx	2008-09-08 15:36:17.000000000 -0400
-@@ -216,7 +216,7 @@
+--- src/ptlib/unix/tlibthrd.cxx.orig	2009-03-17 23:43:30.000000000 -0400
++++ src/ptlib/unix/tlibthrd.cxx
+@@ -240,7 +240,7 @@ PBoolean PProcess::PThreadKill(pthread_t
  {
-   PWaitAndSignal m(threadMutex);
+   PWaitAndSignal m(activeThreadMutex);
  
 -  if (!activeThreads.Contains((unsigned)id)) 
 +  if (!activeThreads.Contains((uintptr_t)id)) 
      return PFalse;
  
    return pthread_kill(id, sig) == 0;
-@@ -254,7 +254,7 @@
- #endif
- 
-   ((PProcess *)this)->activeThreads.DisallowDeleteObjects();
--  ((PProcess *)this)->activeThreads.SetAt((unsigned)PX_threadId, this);
-+  ((PProcess *)this)->activeThreads.SetAt((uintptr_t)PX_threadId, this);
- 
-   PX_firstTimeStart = PFalse;
- }
-@@ -366,7 +366,7 @@
-   PAssertPTHREAD(pthread_create, (&PX_threadId, &threadAttr, PX_ThreadStart, this));
- 
-   // put the thread into the thread list
--  process.activeThreads.SetAt((unsigned)PX_threadId, this);
-+  process.activeThreads.SetAt((uintptr_t)PX_threadId, this);
-   if (process.activeThreads.GetSize() > highWaterMark)
-     newHighWaterMark = highWaterMark = process.activeThreads.GetSize();
- 
-@@ -689,7 +689,7 @@
+@@ -249,8 +249,8 @@ PBoolean PProcess::PThreadKill(pthread_t
+ void PProcess::PXSetThread(pthread_t id, PThread * thread)
  {
-   PProcess & process = PProcess::Current();
-   process.threadMutex.Wait();
--  PThread * thread = process.activeThreads.GetAt((unsigned)pthread_self());
-+  PThread * thread = process.activeThreads.GetAt((uintptr_t)pthread_self());
-   process.threadMutex.Signal();
-   return thread;
- }
-@@ -830,7 +830,7 @@
-   }  
- 
-  // remove this thread from the active thread list
+   activeThreadMutex.Wait();
+-  PThread * currentThread = activeThreads.GetAt((PINDEX)id);
+-  activeThreads.SetAt((PINDEX)id, thread);
++  PThread * currentThread = activeThreads.GetAt((uintptr_t)id);
++  activeThreads.SetAt((uintptr_t)id, thread);
+   activeThreadMutex.Signal();
+ 
+   if (currentThread != NULL) 
+@@ -891,7 +891,7 @@ void PThread::PX_ThreadEnd(void * arg)
+   }
+ 
+   // remove this thread from the active thread list
 -  process.activeThreads.SetAt((unsigned)id, NULL);
 +  process.activeThreads.SetAt((uintptr_t)id, NULL);
  
-   // delete the thread if required, note this is done this way to avoid
-   // a race condition, the thread ID cannot be zeroed before the if!
+   bool deleteThread = thread->autoDelete; // Get flag before releasing lock
+ 
diff --git a/devel/ptlib/patches/patch-ae b/devel/ptlib/patches/patch-ae
index f4ca507bc7c..fe6f3a39c32 100644
--- a/devel/ptlib/patches/patch-ae
+++ b/devel/ptlib/patches/patch-ae
@@ -1,8 +1,26 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 13:18:26 jmcneill Exp $
+$NetBSD: patch-ae,v 1.2 2009/03/18 11:57:16 jmcneill Exp $
 
---- src/ptlib/common/osutils.cxx.orig	2008-09-08 15:37:04.000000000 -0400
-+++ src/ptlib/common/osutils.cxx	2008-09-08 15:37:31.000000000 -0400
-@@ -2091,21 +2091,21 @@
+--- src/ptlib/common/osutils.cxx.orig	2009-03-17 23:43:33.000000000 -0400
++++ src/ptlib/common/osutils.cxx
+@@ -1548,7 +1548,7 @@ PProcess::PProcess(const char * manuf, c
+   , m_library(false)
+ {
+   activeThreads.DisallowDeleteObjects();
+-  activeThreads.SetAt((PINDEX)GetCurrentThreadId(), this);
++  activeThreads.SetAt((uintptr_t)GetCurrentThreadId(), this);
+ 
+   PProcessInstance = this;
+ 
+@@ -1912,7 +1912,7 @@ PThread * PThread::Current()
+   PProcess & process = PProcess::Current();
+ 
+   process.activeThreadMutex.Wait();
+-  PThread * thread = process.activeThreads.GetAt((unsigned)GetCurrentThreadId());
++  PThread * thread = process.activeThreads.GetAt((uintptr_t)GetCurrentThreadId());
+   process.activeThreadMutex.Signal();
+ 
+   if (thread == NULL)
+@@ -2210,21 +2210,21 @@ PReadWriteMutex::~PReadWriteMutex()
  PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
  {
    PWaitAndSignal mutex(nestingMutex);
diff --git a/devel/ptlib/patches/patch-af b/devel/ptlib/patches/patch-af
index 07a6709c188..53c239e1a4d 100644
--- a/devel/ptlib/patches/patch-af
+++ b/devel/ptlib/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.2 2008/09/13 18:09:06 jmcneill Exp $
+$NetBSD: patch-af,v 1.3 2009/03/18 11:57:16 jmcneill Exp $
 
---- make/unix.mak.orig	2008-09-07 17:00:16.000000000 -0400
-+++ make/unix.mak	2008-09-08 15:40:22.000000000 -0400
-@@ -196,7 +196,7 @@
+--- make/unix.mak.orig	2009-03-17 23:43:35.000000000 -0400
++++ make/unix.mak
+@@ -186,7 +186,7 @@ endif # FreeBSD
  ifeq ($(OSTYPE),OpenBSD)
  
  ifeq ($(MACHTYPE),x86)
@@ -11,22 +11,24 @@ $NetBSD: patch-af,v 1.2 2008/09/13 18:09:06 jmcneill Exp $
  endif
  
  LDLIBS		+= -lossaudio
-@@ -220,6 +220,14 @@
- 
- STDCCFLAGS += -I$(UNIX_INC_DIR) -I$(PTLIBDIR)/include
+@@ -208,9 +208,16 @@ STDCCFLAGS	+= -mcpu=$(CPUTYPE)
+ endif
+ endif
  
 +ifeq ($(MACHTYPE),x86_64)
-+STDCCFLAGS     += -DP_64BIT
++STDCCFLAGS	+= -DP_64BIT
 +endif
 +
+ P_USE_RANLIB		:= 1
+ #STDCCFLAGS      += -DP_USE_PRAGMA		# migrated to configure
+ 
 +ifndef PROG
-+STDCCFLAGS    += -fPIC -DPIC
++STDCCFLAGS	+= -fPIC -DPIC
 +endif # PROG
-+
- # enable the USE_PTH line to compile using pth
- # enable the USE_NATIVE_THREADS line to compile using native threads
- # enable the USE_UNPROVEN_THREADS line to compile using unproven threads
-@@ -601,11 +609,11 @@
+ 
+ endif # NetBSD
+ 
+@@ -563,11 +570,11 @@ LIB_SUFFIX	= $(SHAREDLIBEXT)
  LIB_TYPE	=
  else   
  LIB_SUFFIX	= a 
diff --git a/devel/ptlib/patches/patch-ak b/devel/ptlib/patches/patch-ak
new file mode 100644
index 00000000000..ab668658bb9
--- /dev/null
+++ b/devel/ptlib/patches/patch-ak
@@ -0,0 +1,15 @@
+$NetBSD: patch-ak,v 1.1 2009/03/18 11:57:16 jmcneill Exp $
+
+--- src/ptlib/unix/config.cxx.orig	2009-03-17 23:43:30.000000000 -0400
++++ src/ptlib/unix/config.cxx
+@@ -53,6 +53,10 @@
+ #define environ (NULL)
+ #endif
+ 
++#if defined(__NetBSD__)
++extern char **environ;
++#endif
++
+ //
+ //  a single key/value pair
+ //