9 files changed, 186 insertions, 39 deletions

diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index feeb4be96de2..7271f2eec52a 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	ptlib
-PORTVERSION=	2.4.4
+PORTVERSION=	2.6.1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/ptlib/2.4
+MASTER_SITE_SUBDIR=	sources/ptlib/2.6
 DISTNAME=	ptlib-${PORTVERSION}
 
-MAINTAINER=	d9364104@mail.nchu.edu.tw
-COMMENT=	A cross platform C++ library, used by OpenH323
+MAINTAINER=	melifaro@ipfw.ru
+COMMENT=	A cross platform C++ library, used by OPAL
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
@@ -28,18 +28,12 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800059
-BROKEN=		does not build
-.endif
-
 CONFIGURE_ENV=	\
 		OPENSSL_CFLAGS="-I/usr/include" \
 		OPENSSL_LIBS="-lssl"
 CONFIGURE_ARGS+=	\
-		--disable-atomicity \
 		--with-expat-dir="${LOCALBASE}" \
-		--enable-oss \
-		--disable-odbc
+		--enable-oss
 ALL_TARGET=	optshared
 
 # if explicitely asked for, depend upon it
@@ -51,6 +45,14 @@ MAKE_ENV+=	SDL_CFLAGS="`sdl-config --cflags`" \
 		SDL_LIBS="`sdl-config --libs`"
 .endif
 
+.if defined(WITH_ODBC)
+CONFIGURE_ARGS+=	--enable-odbc
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+#BUILD_DEPENDS+=         unixODBC>=2.2.12:${PORTSDIR}/databases/unixODBC
+.else
+CONFIGURE_ARGS+=	--disable-odbc
+.endif
+
 # if explicitely disabled, do not depend upon it
 .if defined(WITHOUT_SDL)
 CONFIGURE_ARGS+=	--disable-sdl
@@ -73,12 +75,11 @@ CONFIGURE_ARGS+=	--disable-sdl
 CONFIGURE_ARGS+=	--enable-plugins
 .endif
 
-#disable OpenLDAP support in PWLIB
-.if defined(WITHOUT_LDAP)
-CONFIGURE_ARGS+=	--disable-openldap
-.else
+.if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
 CONFIGURE_ARGS+=	--enable-openldap --with-ldap-dir="${LOCALBASE}"
+.else
+CONFIGURE_ARGS+=	--disable-openldap
 .endif
 
 # ONLY FOR THE BRAVE!
@@ -133,8 +134,10 @@ PLIST_SUB+=	V4L="@comment "
 
 post-patch:
 .if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
-	@${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' \
-		${WRKSRC}/src/ptlib/unix/tlibthrd.cxx
+	@${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx
+.endif
+.if ${OSVERSION} >= 800059
+	@${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/ptlib26/distinfo b/devel/ptlib26/distinfo
index 0d5bad28694d..8a3f2298d6ab 100644
--- a/devel/ptlib26/distinfo
+++ b/devel/ptlib26/distinfo
@@ -1,3 +1,3 @@
-MD5 (ptlib-2.4.4.tar.gz) = fe64e92187a864f92fda11c7fafc12f1
-SHA256 (ptlib-2.4.4.tar.gz) = bb8ba95d522f0767d8e3bead7512a05fbffce5abaeb9ec1c6e1ed2ccc02a24d1
-SIZE (ptlib-2.4.4.tar.gz) = 4308282
+MD5 (ptlib-2.6.1.tar.gz) = 7b61aa08f7bc98cdf5bbe7a909f7eed2
+SHA256 (ptlib-2.6.1.tar.gz) = f90f7296e3c26ca389038d54f7ede1ef33b85f1a0f622e97afeddada6593a1d9
+SIZE (ptlib-2.6.1.tar.gz) = 4858229
diff --git a/devel/ptlib26/files/patch-configure b/devel/ptlib26/files/patch-configure
new file mode 100644
index 000000000000..831e99a82074
--- /dev/null
+++ b/devel/ptlib26/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.ac.orig	2009-04-26 00:13:25.000000000 +0400
++++ configure.ac	2009-04-26 00:16:55.000000000 +0400
+@@ -322,7 +322,7 @@
+    x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
+                    ;;
+ 
+-   x86_64)	   MACHTYPE=x86_64 ;
++   x86_64 | amd64) MACHTYPE=$target_cpu ;
+ 		   P_64BIT=1 ;
+                    LIB64=1 ;
+ 		   ;;
+--- configure.orig	2009-04-26 00:20:17.000000000 +0400
++++ configure	2009-04-26 00:22:21.000000000 +0400
+@@ -4716,7 +4716,7 @@
+    x86 | i686 | i586 | i486 | i386 ) MACHTYPE=x86
+                    ;;
+ 
+-   x86_64)	   MACHTYPE=x86_64 ;
++   x86_64 | amd64) MACHTYPE=$target_cpu ;
+ 		   P_64BIT=1 ;
+                    LIB64=1 ;
+ 		   ;;
diff --git a/devel/ptlib26/files/patch-critsec.h b/devel/ptlib26/files/patch-critsec.h
new file mode 100644
index 000000000000..8cc0a2685ecf
--- /dev/null
+++ b/devel/ptlib26/files/patch-critsec.h
@@ -0,0 +1,23 @@
+--- include/ptlib/critsec.h.orig	2009-04-25 15:01:31.000000000 +0400
++++ include/ptlib/critsec.h	2009-04-25 15:02:45.000000000 +0400
+@@ -249,13 +249,13 @@
+ __inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int)        { return EXCHANGE_AND_ADD(&m_value, -1); }
+ __inline void PAtomicInteger::SetValue(IntegerType value)                   { m_value = value; }
+ #else
+-__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&mutex, NULL); }
+-__inline PAtomicInteger::~PAtomicInteger()                                  { pthread_mutex_destroy(&mutex); }
+-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++()           { pthread_mutex_lock(&mutex); int retval = ++m_value; pthread_mutex_unlock(&mutex); return retval; }
+-__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int)        { pthread_mutex_lock(&mutex); int retval = m_value++; pthread_mutex_unlock(&mutex); return retval; }
+-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--()           { pthread_mutex_lock(&mutex); int retval = --m_value; pthread_mutex_unlock(&mutex); return retval; }
+-__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int)        { pthread_mutex_lock(&mutex); int retval = m_value--; pthread_mutex_unlock(&mutex); return retval; }
+-__inline void PAtomicInteger::SetValue(IntegerType v)                       { pthread_mutex_lock(&mutex); m_value = v; pthread_mutex_unlock(&mutex); }
++__inline PAtomicInteger::PAtomicInteger(IntegerType value) : m_value(value) { pthread_mutex_init(&m_mutex, NULL); }
++__inline PAtomicInteger::~PAtomicInteger()                                  { pthread_mutex_destroy(&m_mutex); }
++__inline PAtomicInteger::IntegerType PAtomicInteger::operator++()           { pthread_mutex_lock(&m_mutex); int retval = ++m_value; pthread_mutex_unlock(&m_mutex); return retval; }
++__inline PAtomicInteger::IntegerType PAtomicInteger::operator++(int)        { pthread_mutex_lock(&m_mutex); int retval = m_value++; pthread_mutex_unlock(&m_mutex); return retval; }
++__inline PAtomicInteger::IntegerType PAtomicInteger::operator--()           { pthread_mutex_lock(&m_mutex); int retval = --m_value; pthread_mutex_unlock(&m_mutex); return retval; }
++__inline PAtomicInteger::IntegerType PAtomicInteger::operator--(int)        { pthread_mutex_lock(&m_mutex); int retval = m_value--; pthread_mutex_unlock(&m_mutex); return retval; }
++__inline void PAtomicInteger::SetValue(IntegerType v)                       { pthread_mutex_lock(&m_mutex); m_value = v; pthread_mutex_unlock(&m_mutex); }
+ #endif
+ 
+ 
diff --git a/devel/ptlib26/files/patch-threads b/devel/ptlib26/files/patch-threads
new file mode 100644
index 000000000000..6af06d959653
--- /dev/null
+++ b/devel/ptlib26/files/patch-threads
@@ -0,0 +1,76 @@
+--- include/ptlib/unix/ptlib/contain.h.orig	2009-04-25 21:59:44.000000000 +0400
++++ include/ptlib/unix/ptlib/contain.h	2009-04-25 22:01:14.000000000 +0400
+@@ -81,9 +81,11 @@
+ #ifdef P_64BIT
+ typedef long          INT;
+ typedef unsigned long UINT;
++#define _hptr(x)        (PINDEX)(unsigned long)(x)
+ #else
+ typedef int           INT;
+ typedef unsigned int  UINT;
++#define _hptr(x)        (unsigned)(x)
+ #endif
+ 
+ // Create "Windows" style definitions.
+--- src/ptlib/unix/tlib.cxx	2009-03-18 06:43:30.000000000 +0300
++++ src/ptlib/unix/tlib.cxx	2009-04-25 22:03:56.000000000 +0400
+@@ -400,7 +404,7 @@
+ {
+   if (PProcessInstance != NULL) {
+     PWaitAndSignal m(PProcessInstance->activeThreadMutex);
+-    PThread & thread = PProcessInstance->activeThreads[(unsigned)id];
++    PThread & thread = PProcessInstance->activeThreads[_hptr(id)];
+     return thread.GetThreadName();
+   }
+   return psprintf("%08x", id);
+--- src/ptlib/unix/tlibthrd.cxx	2009-03-18 06:43:30.000000000 +0300
++++ src/ptlib/unix/tlibthrd.cxx	2009-04-25 22:03:45.000000000 +0400
+@@ -240,7 +240,7 @@
+ {
+   PWaitAndSignal m(activeThreadMutex);
+ 
+-  if (!activeThreads.Contains((unsigned)id)) 
++  if (!activeThreads.Contains(_hptr(id))) 
+     return PFalse;
+ 
+   return pthread_kill(id, sig) == 0;
+@@ -249,8 +249,8 @@
+ void PProcess::PXSetThread(pthread_t id, PThread * thread)
+ {
+   activeThreadMutex.Wait();
+-  PThread * currentThread = activeThreads.GetAt((PINDEX)id);
+-  activeThreads.SetAt((PINDEX)id, thread);
++  PThread * currentThread = activeThreads.GetAt(_hptr(id));
++  activeThreads.SetAt(_hptr(id), thread);
+   activeThreadMutex.Signal();
+ 
+   if (currentThread != NULL) 
+@@ -891,7 +891,7 @@
+   }
+ 
+   // remove this thread from the active thread list
+-  process.activeThreads.SetAt((unsigned)id, NULL);
++  process.activeThreads.SetAt(_hptr(id), NULL);
+ 
+   bool deleteThread = thread->autoDelete; // Get flag before releasing lock
+ 
+--- src/ptlib/common/osutils.cxx	2009-03-18 06:43:33.000000000 +0300
++++ src/ptlib/common/osutils.cxx	2009-04-25 22:03:35.000000000 +0400
+@@ -1548,7 +1551,7 @@
+   , m_library(false)
+ {
+   activeThreads.DisallowDeleteObjects();
+-  activeThreads.SetAt((PINDEX)GetCurrentThreadId(), this);
++  activeThreads.SetAt(_hptr(GetCurrentThreadId()), this);
+ 
+   PProcessInstance = this;
+ 
+@@ -1912,7 +1915,7 @@
+   PProcess & process = PProcess::Current();
+ 
+   process.activeThreadMutex.Wait();
+-  PThread * thread = process.activeThreads.GetAt((unsigned)GetCurrentThreadId());
++  PThread * thread = process.activeThreads.GetAt(_hptr(GetCurrentThreadId()));
+   process.activeThreadMutex.Signal();
+ 
+   if (thread == NULL)
diff --git a/devel/ptlib26/files/patch-unix_config.cxx b/devel/ptlib26/files/patch-unix_config.cxx
new file mode 100644
index 000000000000..ede8a128fe8a
--- /dev/null
+++ b/devel/ptlib26/files/patch-unix_config.cxx
@@ -0,0 +1,11 @@
+--- src/ptlib/unix/config.cxx.orig	2009-04-25 15:12:34.000000000 +0400
++++ src/ptlib/unix/config.cxx	2009-04-25 15:12:52.000000000 +0400
+@@ -49,7 +49,7 @@
+ #define	EXTENSION		".ini"
+ #define	ENVIRONMENT_CONFIG_STR	"/\~~environment~~\/"
+ 
+-#ifdef P_MACOSX
++#if defined(P_MACOSX) || defined(P_FREEBSD)
+ #define environ (NULL)
+ #endif
+ 
diff --git a/devel/ptlib26/files/patch-unix_mak b/devel/ptlib26/files/patch-unix_mak
new file mode 100644
index 000000000000..b882435e1a35
--- /dev/null
+++ b/devel/ptlib26/files/patch-unix_mak
@@ -0,0 +1,13 @@
+--- make/unix.mak.orig	2009-04-25 20:32:22.000000000 +0400
++++ make/unix.mak	2009-04-25 20:35:25.000000000 +0400
+@@ -174,6 +174,10 @@
+ endif
+ endif
+ 
++ifeq ($(MACHTYPE),amd64)
++STDCCFLAGS     += -DP_64BIT
++endif
++
+ P_USE_RANLIB		:= 1
+ #STDCCFLAGS      += -DP_USE_PRAGMA		# migrated to configure
+ 
diff --git a/devel/ptlib26/pkg-descr b/devel/ptlib26/pkg-descr
index c6a71d32ca39..ab38421b0f13 100644
--- a/devel/ptlib26/pkg-descr
+++ b/devel/ptlib26/pkg-descr
@@ -2,6 +2,6 @@ PWLib is a multi-platform code library that can be used to write
 applications that will compile and run on the BSD Unixes, Windows, Linux
 and a few other Unix variants. It was developed by Equivalence Ltd Pty.
 
-It is used by the OpenH323 library.
+It is used by the OPAL library.
 
-WWW: http://www.openh323.org/
+WWW: http://www.opalvoip.org
diff --git a/devel/ptlib26/pkg-plist b/devel/ptlib26/pkg-plist
index 44cc2c7ec5b7..87f38c8da0be 100644
--- a/devel/ptlib26/pkg-plist
+++ b/devel/ptlib26/pkg-plist
@@ -23,6 +23,7 @@ include/ptclib/modem.h
 include/ptclib/paec.h
 include/ptclib/pasn.h
 include/ptclib/pdns.h
+include/ptclib/pffvdev.h
 include/ptclib/pils.h
 include/ptclib/pldap.h
 include/ptclib/pnat.h
@@ -66,7 +67,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
@@ -154,7 +154,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
@@ -162,23 +161,23 @@ include/ptlib/videoio1394dc.h
 lib/libpt.so
 lib/libpt.so.2
 lib/libpt_s.a
+lib/ptlib-2.6.1/devices/sound/oss_pwplugin.so
+lib/ptlib-2.6.1/devices/videoinput/bsdvideo_pwplugin.so
 libdata/pkgconfig/ptlib.pc
-share/ptlib/make/common.mak
-share/ptlib/make/lib.mak
-share/ptlib/make/plugins.mak
-share/ptlib/make/ptbuildopts.mak
-share/ptlib/make/ptlib-config
-share/ptlib/make/ptlib.mak
-share/ptlib/make/unix.mak
-%%BSDVIDEO%%lib/ptlib-2.4.4/devices/videoinput/bsdvideo_pwplugin.so
-%%BSDVIDEO%%lib/ptlib-2.4.4/devices/sound/oss_pwplugin.so
-@dirrm share/ptlib/make
-@dirrm share/ptlib
+%%DATADIR%%/make/common.mak
+%%DATADIR%%/make/lib.mak
+%%DATADIR%%/make/plugins.mak
+%%DATADIR%%/make/ptbuildopts.mak
+%%DATADIR%%/make/ptlib-config
+%%DATADIR%%/make/ptlib.mak
+%%DATADIR%%/make/unix.mak
+@dirrm %%DATADIR%%/make
+@dirrm %%DATADIR%%
+@dirrm lib/ptlib-2.6.1/devices/videoinput
+@dirrm lib/ptlib-2.6.1/devices/sound
+@dirrm lib/ptlib-2.6.1/devices
+@dirrm lib/ptlib-2.6.1
 @dirrm include/ptlib/unix/ptlib
 @dirrm include/ptlib/unix
 @dirrm include/ptlib
 @dirrm include/ptclib
-%%BSDVIDEO%%@dirrm lib/ptlib-2.4.4/devices/videoinput
-%%BSDVIDEO%%@dirrm lib/ptlib-2.4.4/devices/sound
-%%BSDVIDEO%%@dirrm lib/ptlib-2.4.4/devices
-%%BSDVIDEO%%@dirrm lib/ptlib-2.4.4