From fe8762f0a635854614bd051b96b151c7e1fbff0c Mon Sep 17 00:00:00 2001
From: Tilman Keskinoz <arved@FreeBSD.org>
Date: Sat, 5 Nov 2005 19:02:30 +0000
Subject: [PATCH] Unbreak on CURRENT

---
 devel/commoncpp/Makefile                  |  4 ----
 devel/commoncpp/files/patch-src_mutex.cpp | 11 +++++++++++
 www/middleman/Makefile                    |  4 ----
 www/middleman/files/patch-include-types.h | 11 +++++++++++
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 devel/commoncpp/files/patch-src_mutex.cpp
 create mode 100644 www/middleman/files/patch-include-types.h

diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index 113002ca2ac4..cde9380eae6c 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -38,10 +38,6 @@ LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700000
-BROKEN=		"Does not compile on FreeBSD >= 7.0"
-.endif
-
 pre-configure:
 	@${CP} ${LTMAIN} ${WRKSRC}/autoconf
 
diff --git a/devel/commoncpp/files/patch-src_mutex.cpp b/devel/commoncpp/files/patch-src_mutex.cpp
new file mode 100644
index 000000000000..8c8be2a62cb7
--- /dev/null
+++ b/devel/commoncpp/files/patch-src_mutex.cpp
@@ -0,0 +1,11 @@
+--- src/mutex.cpp.orig	Sat Nov  5 19:54:24 2005
++++ src/mutex.cpp	Sat Nov  5 19:59:01 2005
+@@ -48,6 +48,8 @@
+ using namespace __gnu_cxx;
+ #endif
+ 
++using namespace std;
++
+ #ifdef	CCXX_NAMESPACES
+ namespace ost {
+ #endif
diff --git a/www/middleman/Makefile b/www/middleman/Makefile
index 208720a83aea..d7c2dba3ee88 100644
--- a/www/middleman/Makefile
+++ b/www/middleman/Makefile
@@ -43,10 +43,6 @@ PLIST_SUB+=	MMAN_CACHE=${MMAN_CACHE}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700000
-BROKEN=		"Does not compile on FreeBSD >= 7.0"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 	's|/usr/bin/mman|${PREFIX}/bin/mman|g ; \
diff --git a/www/middleman/files/patch-include-types.h b/www/middleman/files/patch-include-types.h
new file mode 100644
index 000000000000..9cf7c7c71241
--- /dev/null
+++ b/www/middleman/files/patch-include-types.h
@@ -0,0 +1,11 @@
+--- include/types.h.orig	Sat Nov  5 19:51:41 2005
++++ include/types.h	Sat Nov  5 19:51:54 2005
+@@ -1,6 +1,8 @@
+ #ifndef TYPES_H
+ #define TYPES_H
+ 
++#include <sys/types.h>
++
+ struct unlink_list {
+ 	struct unlink_list *next;
+ 	char *path;