- Fix build with gcc 4.1 [1]

- Fix build with WITH_DEBUG [2]

Reported by:	kris mail [1], Sergey Zaharchenko <doublef-ctm@yandex.ru> [2]

5 files changed, 71 insertions, 9 deletions

diff --git a/devel/ptypes/Makefile b/devel/ptypes/Makefile
index c1fc3baca0cd..41d436de440a 100644
--- a/devel/ptypes/Makefile
+++ b/devel/ptypes/Makefile
@@ -27,7 +27,7 @@ OPTIONS=	DEBUG "Build debug version" off \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
-DEBUG_FLAGS=	-DDEBUG -g
+DEBUG_FLAGS=	"-DDEBUG -g"
 .endif
 .if defined(WITH_OPTIMIZED)
 PTHREAD_CFLAGS+=-O2
@@ -38,6 +38,7 @@ MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
 
 do-install:
 	${MKDIR} ${PREFIX}/include/ptypes
+	${RM} -f ${WRKSRC}/include/*.orig
 	${INSTALL_DATA} ${WRKSRC}/include/* ${PREFIX}/include/ptypes
 	${MKDIR} ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/so/libptypes.so.${SHLIB_VER} \
diff --git a/devel/ptypes/files/patch-include-pstreams.h b/devel/ptypes/files/patch-include-pstreams.h
new file mode 100644
index 000000000000..12e2419baabc
--- /dev/null
+++ b/devel/ptypes/files/patch-include-pstreams.h
@@ -0,0 +1,20 @@
+--- include/pstreams.h.orig	Sat Dec 16 19:39:35 2006
++++ include/pstreams.h	Sat Dec 16 19:44:05 2006
+@@ -266,6 +266,8 @@
+ // internal class used in fdxstm
+ //
+ 
++class fdxstm;
++
+ class ptpublic fdxoutstm: public outstm
+ {
+     friend class fdxstm;
+@@ -740,6 +742,8 @@
+ #  pragma warning (disable: 4251)
+ #endif
+ 
++
++class unit_thread;
+ 
+ class ptpublic unit: public component
+ {
diff --git a/devel/ptypes/files/patch-include-ptypes.h b/devel/ptypes/files/patch-include-ptypes.h
new file mode 100644
index 000000000000..f946ed6ac7d7
--- /dev/null
+++ b/devel/ptypes/files/patch-include-ptypes.h
@@ -0,0 +1,28 @@
+--- include/ptypes.h.orig	Sat Dec 16 19:35:24 2006
++++ include/ptypes.h	Sat Dec 16 19:42:49 2006
+@@ -42,7 +42,7 @@
+     { return (T*)pexchange((void**)target, (void*)value); }
+ 
+ 
+-#if (__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)
++#if (__GNUC__ == 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))
+ #  define VARIANT_TYPECAST_HACK
+ #endif
+ 
+@@ -71,6 +71,7 @@
+ 
+ ptpublic extern char* emptystr;
+ 
++class variant;
+ 
+ class ptpublic string 
+ {
+@@ -871,6 +872,8 @@
+     VAR_COMPOUND = VAR_STRING
+ };
+ 
++
++class _varray;
+ 
+ class ptpublic variant
+ {
diff --git a/devel/ptypes/files/patch-src-Makefile.FreeBSD b/devel/ptypes/files/patch-src-Makefile.FreeBSD
index c2ce12a3a0d0..ce9028c20ece 100644
--- a/devel/ptypes/files/patch-src-Makefile.FreeBSD
+++ b/devel/ptypes/files/patch-src-Makefile.FreeBSD
@@ -1,20 +1,22 @@
---- src/Makefile.FreeBSD.orig	Sat Mar 27 14:22:01 2004
-+++ src/Makefile.FreeBSD	Wed Mar 31 23:26:46 2004
-@@ -14,10 +14,10 @@
+--- src/Makefile.FreeBSD.orig	Mon May 17 13:37:27 2004
++++ src/Makefile.FreeBSD	Sat Dec 16 19:29:36 2006
+@@ -12,12 +12,10 @@
+ # Makefile for FreeBSD, called from ../Makefile
+ #
  
- CXX = g++
- 
--OS_CXXOPTS = -pthread -fPIC
--OS_LDLIBS = -lc_r
+-CXX = g++
 +OS_CXXOPTS = -fPIC $(PTHREAD_CFLAGS)
 +OS_LDLIBS = $(PTHREAD_LIBS)
  
+-OS_CXXOPTS = -pthread -fPIC
+-OS_LDLIBS = -lc_r
+-
 -LIBTOOL = $(CXX) -shared -pthread
 +LIBTOOL = $(CXX) -shared $(PTHREAD_LIBS)
  SOSTRIP = strip
  
  SOEXT = so
-@@ -25,7 +25,7 @@
+@@ -25,7 +23,7 @@
  SOINSTOPT = -h
  SOINSTNAME = $(SOREALNAME)
  
diff --git a/devel/ptypes/files/patch-src-pvariant.cxx b/devel/ptypes/files/patch-src-pvariant.cxx
new file mode 100644
index 000000000000..270b89efdf7a
--- /dev/null
+++ b/devel/ptypes/files/patch-src-pvariant.cxx
@@ -0,0 +1,11 @@
+--- src/pvariant.cxx.orig	Sat Dec 16 19:38:33 2006
++++ src/pvariant.cxx	Sat Dec 16 19:39:07 2006
+@@ -38,7 +38,7 @@
+ protected:
+     int refcount;
+ 
+-    virtual int _varray::compare(const void* key, const void* item) const;
++    virtual int compare(const void* key, const void* item) const;
+ 
+     friend class variant;
+