Update to 2.6.5

Submitted by:	maintainer (melifaro@ipfw.ru)

8 files changed, 68 insertions, 209 deletions

diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index bd1f79684360..7388b5a9506a 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ptlib
-PORTVERSION=	2.6.4
-PORTREVISION=	2
+PORTVERSION=	2.6.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ptlib/2.6
@@ -23,57 +22,69 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	pkgconfig
 WANT_GNOME=	yes
-WANT_SDL=	yes
 USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=yes
 USE_LDCONFIG=	yes
 
-NO_LATEST_LINK=	yes
+CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ARGS+=	--enable-oss --enable-plugins --with-expat-dir="${LOCALBASE}"
+
+OPTIONS=	ODBC		"Use ODBC" On \
+		V4L		"Use Video4Linux" Off \
+		BSDVIDEO	"Enable BSD video support" On \
+		SDL		"Use SDL" On \
+		LDAP		"Enable LDAP support" Off
 
 .include <bsd.port.pre.mk>
 
-CONFIGURE_ARGS+=	\
-		--with-expat-dir="${LOCALBASE}" \
-		--enable-oss
-ALL_TARGET=	optshared
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		PVERSION_MAJOR=${PORTVERSION:C/.[0-9]+$//g}  \
+		PVERSION_MINOR=${PORTVERSION:C/^[0-9]+.[0-9]+.//}
 
-# if explicitely asked for, depend upon it
-.if defined(WITH_SDL)
-USE_SDL+=	sdl
-CONFIGURE_ENV+=	SDL_CFLAGS="`${SDL_CONFIG} --cflags`" \
-		SDL_LIBS="`${SDL_CONFIG} --libs`"
-MAKE_ENV+=	SDL_CFLAGS="`${SDL_CONFIG} --cflags`" \
-		SDL_LIBS="`${SDL_CONFIG} --libs`"
+.if defined(WITH_DEBUG)
+ALL_TARGET=	optshared debugshared
+BROKEN=		debug libs install broken
+.else
+ALL_TARGET=	optshared
 .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
+LIB_DEPENDS+=		odbc.1:${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
+.if defined(WITH_BSDVIDEO)
+CONFIGURE_ARGS+=--enable-bsdvideo
+PLIST_SUB+=	BSDVIDEO=""
+WITH_VIDEO=1
+.else
+CONFIGURE_ARGS+=--disable-bsdvideo
+PLIST_SUB+=	BSDVIDEO="@comment "
 .endif
 
-# if nobody cares, use it if it is installed already
-.if !defined(WITHOUT_SDL) && !defined(WITH_SDL)
-.if ${HAVE_SDL:Msdl}
-USE_SDL+=	sdl
-CONFIGURE_ENV+=	SDL_CFLAGS="`sdl-config --cflags`" \
-		SDL_LIBS="`sdl-config --libs`"
-MAKE_ENV+=	SDL_CFLAGS="`sdl-config --cflags`" \
-		SDL_LIBS="`sdl-config --libs`"
+.if defined(WITH_V4L)
+CONFIGURE_ARGS+=--enable-v4l
+PLIST_SUB+=	V4L=""
+BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
+WITH_VIDEO=1
 .else
-CONFIGURE_ARGS+=	--disable-sdl
+CONFIGURE_ARGS+=--disable-v4l
+PLIST_SUB+=	V4L="@comment "
 .endif
+
+.if defined(WITH_VIDEO)
+CONFIGURE_ARGS+=	--enable-video
+PLIST_SUB+=	VIDEODIR=""
+.else
+CONFIGURE_ARGS+=	--disable-video
+PLIST_SUB+=	VIDEODIR="@comment "
 .endif
 
-.if !defined(WITHOUT_PLUGINS)
-CONFIGURE_ARGS+=	--enable-plugins
+.if defined(WITH_SDL)
+USE_SDL+=	sdl
+.else
+CONFIGURE_ARGS+=	--disable-sdl
 .endif
 
 .if defined(WITH_LDAP)
@@ -103,40 +114,16 @@ PLIST_SUB+=	AVC1394="@comment "
 #
 ##enable libdc1394
 #.if defined(WITH_DC1394)
-#LIB_DEPENDS+=	dc1394_control.13:${PORTSDIR}/devel/libdc1394
+#LIB_DEPENDS+=	dc1394.2[0-9]:${PORTSDIR}/multimedia/libdc1394
 #CONFIGURE_ARGS+=	--enable-dc
 #PLIST_SUB+=	DC1394=""
 #.else
 CONFIGURE_ARGS+=	--disable-dc
-PLIST_SUB+=	DC1394="@comment "
+#PLIST_SUB+=	DC1394="@comment "
 #.endif
 
-.if (${ARCH} == "amd64") || (${ARCH} == "ia64") || (${ARCH} == "sparc64")
-CFLAGS+=	-fPIC
-.endif
-
-.if (${ARCH} == "i386") || (${ARCH} == "ia64") || (${ARCH} == "amd64") || (${ARCH} == "sparc64")
-CONFIGURE_ARGS+=--enable-bsdvideo
-PLIST_SUB+=	BSDVIDEO=""
-.else
-CONFIGURE_ARGS+=--disable-bsdvideo
-PLIST_SUB+=	BSDVIDEO="@comment "
-.endif
-
-.if defined(WITH_V4L) || ( exists(${LOCALBASE}/include/linux/videodev.h) && \
-	!defined(WITHOUT_V4L) )
-CONFIGURE_ARGS+=--enable-v4l
-PLIST_SUB+=	V4L=""
-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
-.else
-CONFIGURE_ARGS+=--disable-v4l
-PLIST_SUB+=	V4L="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpt|-lpt-${PORTVERSION:C/.[0-9]+$//g}|' ${WRKSRC}/ptlib.pc.in
-	@${REINPLACE_CMD} -e 's|SDL11/|SDL/|' ${WRKSRC}/src/ptclib/vsdl.cxx \
-		${WRKSRC}/include/ptclib/vsdl.h
 .if ${ARCH} == sparc64 && ${OSVERSION} <= 700003
 	@${REINPLACE_CMD} -e 's|P_PTHREADS_XPG6|0|' ${WRKSRC}/src/ptlib/unix/tlibthrd.cxx
 .endif
diff --git a/devel/ptlib26/distinfo b/devel/ptlib26/distinfo
index 520ab710fdba..5d1d8079593a 100644
--- a/devel/ptlib26/distinfo
+++ b/devel/ptlib26/distinfo
@@ -1,3 +1,3 @@
-MD5 (ptlib-2.6.4.tar.gz) = 1fda52b3f3e899ff13481cc40d58f673
-SHA256 (ptlib-2.6.4.tar.gz) = 4136dba647faa976decee7201ef310b8a5806c9f191cceffb4955a218bd4ff43
-SIZE (ptlib-2.6.4.tar.gz) = 4858735
+MD5 (ptlib-2.6.5.tar.gz) = a7381ea6bbd35ee15e21eb1be107d6d5
+SHA256 (ptlib-2.6.5.tar.gz) = ae8ecf50a39d204910408934f2ab6965310e350c8c3ef4309dca985c761d05fb
+SIZE (ptlib-2.6.5.tar.gz) = 4861936
diff --git a/devel/ptlib26/files/patch-Makefile.in b/devel/ptlib26/files/patch-Makefile.in
index c1919dc1e954..d87720598716 100644
--- a/devel/ptlib26/files/patch-Makefile.in
+++ b/devel/ptlib26/files/patch-Makefile.in
@@ -1,21 +1,21 @@
---- Makefile.in.orig	2009-07-05 09:52:57.000000000 +0400
-+++ Makefile.in	2009-09-11 01:55:40.000000000 +0400
-@@ -85,11 +85,12 @@
+--- Makefile.in.orig	2009-10-03 19:15:36.000000000 +0400
++++ Makefile.in	2009-10-03 21:23:44.000000000 +0400
+@@ -92,11 +92,12 @@
                       $(DESTDIR)$(PREFIX)/share/ptlib/make ; \
  		do mkdir -p $$dir ; chmod 755 $$dir ; \
  	done )
--	$(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)
-+	$(INSTALL) -m 444 $(PT_LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so@BUILD_TYPE@@BUILD_NUMBER@
+-	$(INSTALL) -m 444 $(PT_LIBDIR)/$(LIB_SONAME) $(DESTDIR)$(LIBDIR)
++	$(INSTALL) -m 444 $(PT_LIBDIR)/$(LIB_SONAME) $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@
  	$(INSTALL) -m 444 $(PT_LIBDIR)/lib$(PTLIB_BASE)_s.a $(DESTDIR)$(LIBDIR)
  	(cd $(DESTDIR)$(LIBDIR) ; \
  		rm -f  $(PTLIB_FILE) ; \
--		ln -sf $(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) \
-+		ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) ; \
-+		ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so@BUILD_TYPE@@BUILD_NUMBER@ lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@.so \
+-		ln -sf $(LIB_SONAME) $(PTLIB_FILE) \
++		ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@ $(PTLIB_FILE) ; \
++		ln -sf lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so@BUILD_TYPE@@BUILD_NUMBER@ lib$(PTLIB_BASE)-@MAJOR_VERSION@.@MINOR_VERSION@$(OBJ_SUFFIX).so \
  	)
  ifeq (1, $(HAS_PLUGINS))
  	if test -e $(PT_LIBDIR)/device/; then \
-@@ -120,9 +121,9 @@
+@@ -127,9 +128,9 @@
  	$(INSTALL) -m 755 make/ptlib-config $(DESTDIR)$(PREFIX)/share/ptlib/make/
  	(cd $(DESTDIR)$(PREFIX)/bin; rm -f ptlib-config ; ln -snf ../share/ptlib/make/ptlib-config ptlib-config)
  
@@ -28,7 +28,7 @@
  uninstall:
  	rm -rf $(DESTDIR)$(PREFIX)/include/ptlib \
  	       $(DESTDIR)$(PREFIX)/include/ptclib \
-@@ -130,7 +131,7 @@
+@@ -137,7 +138,7 @@
  	       $(DESTDIR)$(PREFIX)/include/ptbuildopts.h \
  	       $(DESTDIR)$(PREFIX)/share/ptlib \
  	       $(DESTDIR)$(LIBDIR)/$(DEV_PLUGIN_DIR) \
@@ -36,4 +36,4 @@
 +	       $(DESTDIR)$(PREFIX)/libdata/pkgconfig/ptlib.pc
  	rm -f $(DESTDIR)$(LIBDIR)/lib$(PTLIB_BASE)_s.a \
  	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE) \
- 	      $(DESTDIR)$(LIBDIR)/$(PTLIB_FILE).@MAJOR_VERSION@.@MINOR_VERSION@@BUILD_TYPE@@BUILD_NUMBER@
+ 	      $(DESTDIR)$(LIBDIR)/$(LIB_SONAME)
diff --git a/devel/ptlib26/files/patch-configure b/devel/ptlib26/files/patch-configure
deleted file mode 100644
index 831e99a82074..000000000000
--- a/devel/ptlib26/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-threads b/devel/ptlib26/files/patch-threads
deleted file mode 100644
index bda36756566d..000000000000
--- a/devel/ptlib26/files/patch-threads
+++ /dev/null
@@ -1,83 +0,0 @@
---- include/ptlib/unix/ptlib/contain.h.orig	2009-08-29 14:52:29.000000000 +0400
-+++ include/ptlib/unix/ptlib/contain.h	2009-08-29 14:52:33.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.orig	2009-08-29 15:51:42.000000000 +0400
-+++ src/ptlib/unix/tlib.cxx	2009-08-29 15:51:45.000000000 +0400
-@@ -400,7 +400,7 @@
- {
-   if (PProcessInstance != NULL) {
-     PWaitAndSignal m(PProcessInstance->activeThreadMutex);
--    PThread & thread = PProcessInstance->activeThreads[(uintptr_t)id];
-+    PThread & thread = PProcessInstance->activeThreads[_hptr(id)];
-     return thread.GetThreadName();
-   }
-   return psprintf("%08x", id);
---- src/ptlib/unix/tlibthrd.cxx.orig	2009-08-29 14:54:22.000000000 +0400
-+++ src/ptlib/unix/tlibthrd.cxx	2009-08-29 15:41:14.000000000 +0400
-@@ -250,7 +250,7 @@
- {
-   PWaitAndSignal m(activeThreadMutex);
- 
--  if (!activeThreads.Contains((unsigned)id)) 
-+  if (!activeThreads.Contains(_hptr(id))) 
-     return PFalse;
- 
-   return pthread_kill(id, sig) == 0;
-@@ -259,8 +259,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) 
-@@ -393,7 +393,7 @@
-     if (id != 0) {
-       process.activeThreadMutex.Wait();
-       pthread_detach(id);
--      process.activeThreads.SetAt((unsigned)id, NULL);
-+      process.activeThreads.SetAt(_hptr(id), NULL);
-       process.activeThreadMutex.Signal();
-     }
- 
---- src/ptlib/common/osutils.cxx.orig	2009-08-29 15:55:29.000000000 +0400
-+++ src/ptlib/common/osutils.cxx	2009-08-29 15:55:32.000000000 +0400
-@@ -2208,21 +2208,21 @@
- PReadWriteMutex::Nest * PReadWriteMutex::GetNest() const
- {
-   PWaitAndSignal mutex(nestingMutex);
--  return nestedThreads.GetAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
-+  return nestedThreads.GetAt(POrdinalKey(_hptr(PThread::GetCurrentThreadId())));
- }
- 
- 
- void PReadWriteMutex::EndNest()
- {
-   nestingMutex.Wait();
--  nestedThreads.RemoveAt(POrdinalKey((INT)PThread::GetCurrentThreadId()));
-+  nestedThreads.RemoveAt(POrdinalKey(_hptr(PThread::GetCurrentThreadId())));
-   nestingMutex.Signal();
- }
- 
- 
- PReadWriteMutex::Nest & PReadWriteMutex::StartNest()
- {
--  POrdinalKey threadId = (INT)PThread::GetCurrentThreadId();
-+  POrdinalKey threadId = _hptr(PThread::GetCurrentThreadId());
- 
-   nestingMutex.Wait();
- 
diff --git a/devel/ptlib26/files/patch-unix_config.cxx b/devel/ptlib26/files/patch-unix_config.cxx
deleted file mode 100644
index 9b425933e7d9..000000000000
--- a/devel/ptlib26/files/patch-unix_config.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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~~\/"
- 
--#if defined(P_MACOSX) || defined(P_SOLARIS)
-+#if defined(P_MACOSX) || defined(P_SOLARIS) || defined(P_FREEBSD)
- #define environ (NULL)
- #endif
- 
diff --git a/devel/ptlib26/files/patch-unix_mak b/devel/ptlib26/files/patch-unix_mak
deleted file mode 100644
index b882435e1a35..000000000000
--- a/devel/ptlib26/files/patch-unix_mak
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-plist b/devel/ptlib26/pkg-plist
index 513f8ae763cc..c9434ca96ee0 100644
--- a/devel/ptlib26/pkg-plist
+++ b/devel/ptlib26/pkg-plist
@@ -156,12 +156,13 @@ include/ptlib/vconvert.h
 include/ptlib/video.h
 include/ptlib/videoio.h
 include/ptlib/videoio1394dc.h
-lib/libpt-2.6.so
-lib/libpt-2.6.so.4
+lib/libpt-%%PVERSION_MAJOR%%.so
 lib/libpt.so
 lib/libpt_s.a
-lib/ptlib-2.6.4/devices/sound/oss_pwplugin.so
-%%BSDVIDEO%%lib/ptlib-2.6.4/devices/videoinput/bsdvideo_pwplugin.so
+lib/libpt-%%PVERSION_MAJOR%%.so.%%PVERSION_MINOR%%
+lib/ptlib-%%PORTVERSION%%/devices/sound/oss_pwplugin.so
+%%BSDVIDEO%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/bsdvideo_pwplugin.so
+%%V4L%%lib/ptlib-%%PORTVERSION%%/devices/videoinput/v4l_pwplugin.so
 libdata/pkgconfig/ptlib.pc
 %%DATADIR%%/make/common.mak
 %%DATADIR%%/make/lib.mak
@@ -172,10 +173,10 @@ libdata/pkgconfig/ptlib.pc
 %%DATADIR%%/make/unix.mak
 @dirrm %%DATADIR%%/make
 @dirrm %%DATADIR%%
-%%BSDVIDEO%%@dirrm lib/ptlib-2.6.4/devices/videoinput
-@dirrm lib/ptlib-2.6.4/devices/sound
-@dirrm lib/ptlib-2.6.4/devices
-@dirrm lib/ptlib-2.6.4
+%%VIDEODIR%%@dirrm lib/ptlib-%%PORTVERSION%%/devices/videoinput
+@dirrm lib/ptlib-%%PORTVERSION%%/devices/sound
+@dirrm lib/ptlib-%%PORTVERSION%%/devices
+@dirrm lib/ptlib-%%PORTVERSION%%
 @dirrm include/ptlib/unix/ptlib
 @dirrm include/ptlib/unix
 @dirrm include/ptlib