Don't use libstdc++ extensions with libc++. Fix build with newer bison.

Disambiguate conversion from PString to ifstream argument.

4 files changed, 104 insertions, 1 deletions

diff --git a/devel/ptlib/distinfo b/devel/ptlib/distinfo
index d389447b3b7..bd3d580ea8f 100644
--- a/devel/ptlib/distinfo
+++ b/devel/ptlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2012/12/01 15:28:03 darcy Exp $
+$NetBSD: distinfo,v 1.18 2013/10/14 14:36:12 joerg Exp $
 
 SHA1 (ptlib-2.10.7.tar.xz) = 51077b76aed30ab614e31b2a18cb383848d4332c
 RMD160 (ptlib-2.10.7.tar.xz) = 0c05b57f5435f4646af05278e66718e0e433a10a
@@ -8,6 +8,7 @@ SHA1 (patch-configure) = d05e68485a9cd3190410e7f4beb14ac44050d2cb
 SHA1 (patch-configure.ac) = f319f4a183a6fc6c59693f516d9c68921625158b
 SHA1 (patch-include_ptbuildopts.h.in) = 2b7ba6a6dbbe9480880652de774afbff346ce635
 SHA1 (patch-include_ptclib_pldap.h) = ccb5b36a5afa7d1762e90eb9bfdb134066d2d84f
+SHA1 (patch-include_ptlib_object.h) = 9ce0a2f333ab06ca17506481c2ae8b5b47441f85
 SHA1 (patch-include_ptlib_pmachdep.h) = 92dd7b693dc8d10ffaee7a22f8a3f3a1526e55c2
 SHA1 (patch-make_unix.mak) = 13d814a914b3bc4897a350f4393873b9b3a2b685
 SHA1 (patch-plugins_sound_esd_sound_esd.h) = 2c36497fa2b9f62144442e74eb9fd07e53ae07b8
@@ -16,6 +17,8 @@ SHA1 (patch-plugins_sound_oss_sound_oss.h) = ff48d7385a1e21d2bd896658d1ff8e39d73
 SHA1 (patch-plugins_vidinput_bsd_vidinput_bsd.h) = dd965232d9645cd12a866e597828bdf8da7cb389
 SHA1 (patch-src-unix-tlibthrd.cxx) = 0617f208b98ffe85730f411fb8494407e8c6324d
 SHA1 (patch-src_ptclib_pldap.cxx) = 791f3a6efeee35efa44d311eb7077bb0bad441f0
+SHA1 (patch-src_ptlib_common_getdate.y) = 5ebd077d0552b8667d4bea3b59ed8daabeecd8a0
+SHA1 (patch-src_ptlib_unix_svcproc.cxx) = 0fbaa6a2bde07625b8b826b7134d6e1a946f686c
 SHA1 (patch-unix-config.cxx) = 6127f91bc04d7f008087ebdb9a2fbd1dbb41fd19
 SHA1 (patch-unix-ossaix.cxx) = 3e7a902eb4b73388db01bd53e6c30546c96fe78d
 SHA1 (patch-unix-osutil.cxx) = e907fc2c068f3e20af2f0e97540a1f4e47895a18
diff --git a/devel/ptlib/patches/patch-include_ptlib_object.h b/devel/ptlib/patches/patch-include_ptlib_object.h
new file mode 100644
index 00000000000..1306cd51b81
--- /dev/null
+++ b/devel/ptlib/patches/patch-include_ptlib_object.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-include_ptlib_object.h,v 1.1 2013/10/14 14:36:12 joerg Exp $
+
+--- include/ptlib/object.h.orig	2013-10-14 12:44:10.000000000 +0000
++++ include/ptlib/object.h
+@@ -1011,7 +1011,7 @@ struct PAllocatorTemplate
+                    + __GNUC_PATCHLEVEL__)
+ 
+ // Memory pooling allocators
+-#if defined(__GNUC__) && (GCC_VERSION > 40000) && !defined(P_MINGW) && !defined(P_MACOSX) 
++#if defined(__GNUC__) && (GCC_VERSION > 40000) && !defined(P_MINGW) && !defined(P_MACOSX) && !defined(_LIBCPP_VERSION)
+ #include <ext/mt_allocator.h>
+ template <class Type> struct PFixedPoolAllocator    : public PAllocatorTemplate<__gnu_cxx::__mt_alloc<Type>, Type> { };
+ template <class Type> struct PVariablePoolAllocator : public PAllocatorTemplate<__gnu_cxx::__mt_alloc<Type>, Type> { };
diff --git a/devel/ptlib/patches/patch-src_ptlib_common_getdate.y b/devel/ptlib/patches/patch-src_ptlib_common_getdate.y
new file mode 100644
index 00000000000..7d9544a676f
--- /dev/null
+++ b/devel/ptlib/patches/patch-src_ptlib_common_getdate.y
@@ -0,0 +1,53 @@
+$NetBSD: patch-src_ptlib_common_getdate.y,v 1.1 2013/10/14 14:36:12 joerg Exp $
+
+--- src/ptlib/common/getdate.y.orig	2013-10-14 12:59:57.000000000 +0000
++++ src/ptlib/common/getdate.y
+@@ -107,7 +107,6 @@ struct Variables {
+ 
+ #define YYPURE		1
+ #define YYLEX_PARAM	VARIABLE
+-#define YYPARSE_PARAM	parseParam
+ 
+ #define yyparse		PTime_yyparse
+ #define yylex		PTime_yylex
+@@ -120,19 +119,15 @@ struct Variables {
+ static int yyparse(void *); 
+ static int yylex();
+ 
+-#ifdef __GNUC__
+-static int yyerror(char const *msg);
+-#else
+-static void yyerror(char const *msg);
+-#endif
+-
++static int yyerror(void *param, char const *msg);
+ 
+ static void SetPossibleDate(struct Variables*, time_t, time_t, time_t);
+ 
+ 
+ %}
+ 
+-%pure_parser
++%pure-parser
++%parse-param { void * parseParam}
+ 
+ %union {
+     time_t		Number;
+@@ -1017,16 +1012,10 @@ time_t STDAPICALLTYPE PTimeParse(void * 
+ #pragma warning(disable:4028 4100 4211)
+ #endif
+ 
+-#ifdef __GNUC__
+-int yyerror(const char * s)
++int yyerror(void *parseParam, const char * s)
+ {
+   return 0;
+ }
+-#else
+-static void yyerror(const char * s)
+-{
+-}
+-#endif
+ 
+ #ifdef _MSC_VER
+ #pragma warning(default:4028 4100 4211)
diff --git a/devel/ptlib/patches/patch-src_ptlib_unix_svcproc.cxx b/devel/ptlib/patches/patch-src_ptlib_unix_svcproc.cxx
new file mode 100644
index 00000000000..14ff2691b15
--- /dev/null
+++ b/devel/ptlib/patches/patch-src_ptlib_unix_svcproc.cxx
@@ -0,0 +1,34 @@
+$NetBSD: patch-src_ptlib_unix_svcproc.cxx,v 1.1 2013/10/14 14:36:12 joerg Exp $
+
+--- src/ptlib/unix/svcproc.cxx.orig	2013-10-14 12:48:18.000000000 +0000
++++ src/ptlib/unix/svcproc.cxx
+@@ -217,7 +217,8 @@ int PServiceProcess::InitialiseService()
+     pid_t pid;
+ 
+     {
+-      ifstream pidfile(pidfilename);
++      const char *pidfilename2(pidfilename);
++      ifstream pidfile(pidfilename2);
+       if (!pidfile.is_open()) {
+         cout << "Could not open pid file: \"" << pidfilename << "\""
+                 " - " << strerror(errno) << endl;
+@@ -384,7 +385,8 @@ int PServiceProcess::InitialiseService()
+   // Run as a daemon, ie fork
+ 
+   if (!pidfilename) {
+-    ifstream pidfile(pidfilename);
++    const char *pidfilename2(pidfilename);
++    ifstream pidfile(pidfilename2);
+     if (pidfile.is_open()) {
+       pid_t pid;
+       pidfile >> pid;
+@@ -412,7 +414,8 @@ int PServiceProcess::InitialiseService()
+       cout << "Daemon started with pid " << pid << endl;
+       if (!pidfilename) {
+         // Write out the child pid to magic file in /var/run (at least for linux)
+-        ofstream pidfile(pidfilename);
++        const char *pidfilename2(pidfilename);
++        ofstream pidfile(pidfilename2);
+         if (pidfile.is_open())
+           pidfile << pid;
+         else