pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/ptlib Update to latest version.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0b3bc79017f9
branches:  trunk
changeset: 609907:0b3bc79017f9
user:      darcy <darcy%pkgsrc.org@localhost>
date:      Sat Oct 13 00:49:37 2012 +0000

description:
Update to latest version.
Cleans up TODO item.
Move maintainership to myself.

diffstat:

 devel/ptlib/Makefile                                      |  12 ++--
 devel/ptlib/distinfo                                      |  28 +++++-----
 devel/ptlib/patches/patch-Nucleus-pmachdep.h              |  39 ---------------
 devel/ptlib/patches/patch-configure                       |  30 ++++++-----
 devel/ptlib/patches/patch-include_ptclib_pldap.h          |  13 +++-
 devel/ptlib/patches/patch-include_ptlib_array.h           |  13 -----
 devel/ptlib/patches/patch-make_unix.mak                   |  22 ++++---
 devel/ptlib/patches/patch-plugins_sound_oss_sound_oss.cxx |  11 ++-
 devel/ptlib/patches/patch-src-unix-tlibthrd.cxx           |  19 +++++++
 devel/ptlib/patches/patch-unix-osutil.cxx                 |  25 +++------
 devel/ptlib/patches/patch-unix-pipechan.cxx               |  13 -----
 devel/ptlib/patches/patch-unix-pmachdep.h                 |  10 ++-
 devel/ptlib/patches/patch-unix-socket.cxx                 |  24 +++++----
 devel/ptlib/patches/patch-unix-tlib.cxx                   |  10 ++-
 14 files changed, 115 insertions(+), 154 deletions(-)

diffs (truncated from 509 to 300 lines):

diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/Makefile
--- a/devel/ptlib/Makefile      Fri Oct 12 18:57:17 2012 +0000
+++ b/devel/ptlib/Makefile      Sat Oct 13 00:49:37 2012 +0000
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2011/12/04 21:59:36 marino Exp $
+# $NetBSD: Makefile,v 1.15 2012/10/13 00:49:37 darcy Exp $
 
-DISTNAME=      ptlib-2.6.5
-PKGREVISION=   3
+DISTNAME=      ptlib-2.10.7
 CATEGORIES=    devel
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/ptlib/2.6/}
-EXTRACT_SUFX=  .tar.bz2
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/ptlib/2.10/}
+EXTRACT_SUFX=  .tar.xz
 
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+MAINTAINER=    darcy%NetBSD.org@localhost
 HOMEPAGE=      http://www.ekiga.net/
 COMMENT=       Portable Windows Libary
 # modified-bsd stands for Spencer's regex license, quite similar
@@ -58,6 +57,7 @@
 .include "../../graphics/libv4l/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../lang/lua/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/distinfo
--- a/devel/ptlib/distinfo      Fri Oct 12 18:57:17 2012 +0000
+++ b/devel/ptlib/distinfo      Sat Oct 13 00:49:37 2012 +0000
@@ -1,27 +1,25 @@
-$NetBSD: distinfo,v 1.13 2012/07/09 19:08:23 joerg Exp $
+$NetBSD: distinfo,v 1.14 2012/10/13 00:49:37 darcy Exp $
 
-SHA1 (ptlib-2.6.5.tar.bz2) = 919487aee09d5a1ea5c4f0abdc01bc49d9dcb596
-RMD160 (ptlib-2.6.5.tar.bz2) = ab2f8897b64ab7b1eb9fecc35470ce09af42bcf2
-Size (ptlib-2.6.5.tar.bz2) = 3302864 bytes
+SHA1 (ptlib-2.10.7.tar.xz) = 51077b76aed30ab614e31b2a18cb383848d4332c
+RMD160 (ptlib-2.10.7.tar.xz) = 0c05b57f5435f4646af05278e66718e0e433a10a
+Size (ptlib-2.10.7.tar.xz) = 2420924 bytes
 SHA1 (patch-Nucleus-NucleusPTime.cxx) = 3d8288a12f077867768d5ab0fc2a4e01c1cdb5fc
-SHA1 (patch-Nucleus-pmachdep.h) = e78bd26dbe72538aeeb88bdb75faa35768e328d9
-SHA1 (patch-configure) = 3af145c86d6a7060cb197228ae8046edbde437d4
+SHA1 (patch-configure) = d05e68485a9cd3190410e7f4beb14ac44050d2cb
 SHA1 (patch-configure.ac) = 0813261dd595f2980bf691ad6fc69b27a527f803
 SHA1 (patch-include_ptbuildopts.h.in) = 93559a280ec01e3eaa8396cd83bce7cf4ac275c5
-SHA1 (patch-include_ptclib_pldap.h) = 0a6d27519797174883de7c1c5dfe47b6f187d491
-SHA1 (patch-include_ptlib_array.h) = 494b5a5f3e012500c05a7b66ee7a62c7eb1a6500
-SHA1 (patch-make_unix.mak) = 03a436317afc6f77e574bf712b1926327bf00f6e
+SHA1 (patch-include_ptclib_pldap.h) = f220ea3f2dcae8d098bdb70329cdf86d4f1279fa
+SHA1 (patch-make_unix.mak) = 13d814a914b3bc4897a350f4393873b9b3a2b685
 SHA1 (patch-plugins_sound_esd_sound_esd.h) = 6caff0b4890fe3b137e5dd7ceb1013abe1f7fec8
-SHA1 (patch-plugins_sound_oss_sound_oss.cxx) = d00476fb46a0bf2474e8963a8fe9f1765d393d04
+SHA1 (patch-plugins_sound_oss_sound_oss.cxx) = 50817861710a82e98ebb3b029d021619a09c1132
 SHA1 (patch-plugins_sound_oss_sound_oss.h) = 7661d3d2f270680f293ddd4bb58cac8f6f021862
 SHA1 (patch-plugins_vidinput_bsd_vidinput_bsd.h) = 33ee2ced0dd8a1e0e567f8700bba92431193dc10
+SHA1 (patch-src-unix-tlibthrd.cxx) = 0076ee6625cc0c8e923e73ccebf3f27717d25dc7
 SHA1 (patch-src_ptclib_pldap.cxx) = 8c0f8b4326327abfac88f99dfa6edf5b7e250fbf
 SHA1 (patch-unix-config.cxx) = bf263b858d4b964786360c702bd634aa989a8751
 SHA1 (patch-unix-ossaix.cxx) = 5e473ffb524811c4da35fe8cb2f5f77b4807de5c
-SHA1 (patch-unix-osutil.cxx) = 33482828d543fda07fd4070f05295e5536a89e64
-SHA1 (patch-unix-pipechan.cxx) = 03117bf11b31c14255f30afe397d8e4b06d93760
-SHA1 (patch-unix-pmachdep.h) = 4ff7e803fca00f1e86f34234289efbb0910e26c3
+SHA1 (patch-unix-osutil.cxx) = d2836f781eff013ee32fc2b6fec828aee502b206
+SHA1 (patch-unix-pmachdep.h) = 0cc2d61fa624b60461fb45e1aebfd37d486be5c9
 SHA1 (patch-unix-serchan.cxx) = 20131e476b495b7e0babaeb1755c4bfc130909d6
-SHA1 (patch-unix-socket.cxx) = 15364058387caad5da2827cc823da6d578525835
+SHA1 (patch-unix-socket.cxx) = 80ff4d0bc67f4bf59e5bfd3e17e3b380f7774bbb
 SHA1 (patch-unix-switch.cxx) = b68d3dad99a7ff90113b9f4b6b19331c472bcca2
-SHA1 (patch-unix-tlib.cxx) = 6f4c6e8750316698484cea5dae4cd91d5717881d
+SHA1 (patch-unix-tlib.cxx) = 1685b856cf0991168954f5951f93b9b9f1e08db2
diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/patches/patch-Nucleus-pmachdep.h
--- a/devel/ptlib/patches/patch-Nucleus-pmachdep.h      Fri Oct 12 18:57:17 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-Nucleus-pmachdep.h,v 1.1 2011/12/04 21:59:36 marino Exp $
-
---- include/ptlib/Nucleus++/ptlib/pmachdep.h.orig      2009-09-21 00:25:51.000000000 +0000
-+++ include/ptlib/Nucleus++/ptlib/pmachdep.h
-@@ -62,6 +62,34 @@ typedef size_t socklen_t;
- #endif
- 
- ///////////////////////////////////////////////////////////////////////////////
-+#elif defined(P_DRAGONFLY)
-+
-+#if defined(P_PTHREADS)
-+#define _THREAD_SAFE
-+#define P_THREAD_SAFE_CLIB
-+
-+#include <pthread.h>
-+extern "C" int sigwait(sigset_t *set);
-+#endif
-+
-+#include <paths.h>
-+#include <errno.h>
-+#include <dlfcn.h>
-+#include <termios.h>
-+#include <sys/fcntl.h>
-+#include <sys/filio.h>
-+#include <sys/socket.h>
-+#include <sys/sockio.h>
-+#include <sys/signal.h>
-+#include <net/if.h>
-+
-+#define HAS_IFREQ
-+
-+#define PSETPGRP()  setpgrp(0, 0)
-+
-+typedef int socklen_t;
-+
-+///////////////////////////////////////////////////////////////////////////////
- #elif defined(P_FREEBSD)
- 
- #if defined(P_PTHREADS)
diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/patches/patch-configure
--- a/devel/ptlib/patches/patch-configure       Fri Oct 12 18:57:17 2012 +0000
+++ b/devel/ptlib/patches/patch-configure       Sat Oct 13 00:49:37 2012 +0000
@@ -1,8 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2011/12/04 21:59:36 marino Exp $
+$NetBSD: patch-configure,v 1.4 2012/10/13 00:49:38 darcy Exp $
+
+- Add DragonFly support
 
---- configure.orig     2009-09-21 00:25:59.000000000 +0000
+--- configure.orig     2012-08-23 02:13:11.000000000 +0000
 +++ configure
-@@ -3828,6 +3828,108 @@ fi
+@@ -4411,6 +4411,108 @@ fi
  
                     ;;
  
@@ -17,7 +19,7 @@
 +#define P_PTHREADS 1
 +_ACEOF
 +
-+                 { echo "$as_me:$LINENO: checking for swab" >&5
++          { echo "$as_me:$LINENO: checking for swab" >&5
 +echo $ECHO_N "checking for swab... $ECHO_C" >&6; }
 +if test "${ac_cv_func_swab+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -81,8 +83,8 @@
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && {
-+       test -z "$ac_cxx_werror_flag" ||
-+       test ! -s conftest.err
++    test -z "$ac_cxx_werror_flag" ||
++    test ! -s conftest.err
 +       } && test -s conftest$ac_exeext &&
 +       $as_test_x conftest$ac_exeext; then
 +  ac_cv_func_swab=yes
@@ -90,7 +92,7 @@
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
-+      ac_cv_func_swab=no
++   ac_cv_func_swab=no
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
@@ -106,17 +108,17 @@
 +
 +fi
 +
-+                 ;;
++          ;;
 +
    freebsd*|kfreebsd*)       OSTYPE=FreeBSD ;
                   OS_TAG="P_FREEBSD" ;
                     if test "x$OSRELEASE" = "x"; then
-@@ -8264,7 +8366,7 @@ echo "${ECHO_T}no" >&6; }
-               { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
+@@ -6806,7 +6908,7 @@ $as_echo "no" >&6; }
+               { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
                case "$target_os" in
 -                freebsd*|openbsd*|netbsd*|darwin*|beos*)
 +                dragonfly*|freebsd*|openbsd*|netbsd*|darwin*|beos*)
-                   { echo "$as_me:$LINENO: checking for dlopen in -lc" >&5
- echo $ECHO_N "checking for dlopen in -lc... $ECHO_C" >&6; }
- if test "${ac_cv_lib_c_dlopen+set}" = set; then
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lc" >&5
+ $as_echo_n "checking for dlopen in -lc... " >&6; }
+ if ${ac_cv_lib_c_dlopen+:} false; then :
diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/patches/patch-include_ptclib_pldap.h
--- a/devel/ptlib/patches/patch-include_ptclib_pldap.h  Fri Oct 12 18:57:17 2012 +0000
+++ b/devel/ptlib/patches/patch-include_ptclib_pldap.h  Sat Oct 13 00:49:37 2012 +0000
@@ -1,7 +1,9 @@
-$NetBSD: patch-include_ptclib_pldap.h,v 1.1 2012/04/19 12:34:43 hans Exp $
+$NetBSD: patch-include_ptclib_pldap.h,v 1.2 2012/10/13 00:49:38 darcy Exp $
 
---- include/ptclib/pldap.h.orig        2009-09-21 02:25:53.000000000 +0200
-+++ include/ptclib/pldap.h     2012-04-18 20:29:59.394305646 +0200
+- Allow building on Solaris
+
+--- include/ptclib/pldap.h.orig 2012-08-23 02:13:03.000000000 +0000
++++ include/ptclib/pldap.h
 @@ -103,12 +103,7 @@ class PLDAPSession : public PObject
        AuthSimple,
        AuthSASL,
@@ -13,5 +15,6 @@
        NumAuthenticationMethod
 -#endif
      };
- 
-     /**Bind to the remote LDAP server.
+
+     /**Start encrypted connection
+
diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/patches/patch-include_ptlib_array.h
--- a/devel/ptlib/patches/patch-include_ptlib_array.h   Fri Oct 12 18:57:17 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-include_ptlib_array.h,v 1.1 2012/07/09 19:08:23 joerg Exp $
-
---- include/ptlib/array.h.orig 2012-07-06 18:14:53.000000000 +0000
-+++ include/ptlib/array.h
-@@ -523,7 +523,7 @@ template <class T> class PScalarArray : 
-       T t;
-       stream >> t;
-       if (!stream.fail())
--        SetAt(index, t);
-+        this->SetAt(index, t);
-     }
- };
- 
diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/patches/patch-make_unix.mak
--- a/devel/ptlib/patches/patch-make_unix.mak   Fri Oct 12 18:57:17 2012 +0000
+++ b/devel/ptlib/patches/patch-make_unix.mak   Sat Oct 13 00:49:37 2012 +0000
@@ -1,17 +1,19 @@
-$NetBSD: patch-make_unix.mak,v 1.1 2011/12/04 21:59:37 marino Exp $
+$NetBSD: patch-make_unix.mak,v 1.2 2012/10/13 00:49:38 darcy Exp $
 
---- make/unix.mak.orig 2009-09-21 00:25:30.000000000 +0000
+- Add DragonFly support
+
+--- make/unix.mak.orig 2012-08-23 02:12:44.000000000 +0000
 +++ make/unix.mak
 @@ -57,7 +57,7 @@ release tagbuild
  .PHONY: all $(STANDARD_TARGETS)
  
  
--ifeq (,$(findstring $(OSTYPE),linux FreeBSD OpenBSD NetBSD solaris beos Darwin Carbon AIX Nucleus VxWorks rtems QNX cygwin mingw))
-+ifeq (,$(findstring $(OSTYPE),linux DragonFly FreeBSD OpenBSD NetBSD solaris beos Darwin Carbon AIX Nucleus VxWorks rtems QNX cygwin mingw))
+-ifeq (,$(findstring $(OSTYPE),linux gnu FreeBSD OpenBSD NetBSD solaris beos Darwin Carbon AIX Nucleus VxWorks rtems QNX cygwin mingw))
++ifeq (,$(findstring $(OSTYPE),linux gnu DragonFly FreeBSD OpenBSD NetBSD solaris beos Darwin Carbon AIX Nucleus VxWorks rtems QNX cygwin mingw))
  
  default_target :
        @echo
-@@ -166,6 +166,31 @@ endif # linux
+@@ -203,6 +203,31 @@ endif # gnu
  
  ####################################################
  
@@ -19,20 +21,20 @@
 +
 +ifeq ($(MACHTYPE),x86)
 +ifdef CPUTYPE
-+STDCCFLAGS    += -mcpu=$(CPUTYPE)
++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
++P_USE_RANLIB   := 1
++#STDCCFLAGS     += -DP_USE_PRAGMA      # migrated to configure
 +
 +ifeq ($(P_SHAREDLIB),1)
 +ifndef PROG
-+STDCCFLAGS    += -fPIC -DPIC
++STDCCFLAGS += -fPIC -DPIC
 +endif # PROG
 +endif # P_SHAREDLIB
 +
diff -r e74bcb84a313 -r 0b3bc79017f9 devel/ptlib/patches/patch-plugins_sound_oss_sound_oss.cxx
--- a/devel/ptlib/patches/patch-plugins_sound_oss_sound_oss.cxx Fri Oct 12 18:57:17 2012 +0000
+++ b/devel/ptlib/patches/patch-plugins_sound_oss_sound_oss.cxx Sat Oct 13 00:49:37 2012 +0000
@@ -1,9 +1,11 @@
-$NetBSD: patch-plugins_sound_oss_sound_oss.cxx,v 1.1 2011/12/04 21:59:37 marino Exp $
+$NetBSD: patch-plugins_sound_oss_sound_oss.cxx,v 1.2 2012/10/13 00:49:38 darcy Exp $
+
+- Add DragonFly support
 
---- plugins/sound_oss/sound_oss.cxx.orig       2009-09-21 00:25:31.000000000 +0000
+--- plugins/sound_oss/sound_oss.cxx.orig       2012-08-23 02:12:47.000000000 +0000
 +++ plugins/sound_oss/sound_oss.cxx
-@@ -182,6 +182,11 @@ static void CollectSoundDevices(PDirecto
-               devname = devdir + "dsp0";
+@@ -183,6 +183,12 @@ static void CollectSoundDevices(PDirecto
+               devname = devdir + "dsp" + numbers;
                PTRACE(1, "OSS\tCollectSoundDevices FreeBSD devname set to devfs(5) name:" << devname );



Home | Main Index | Thread Index | Old Index