- Update to 1.8.1

PR:		170586
Submitted by:	Waitman Gobble <uzimac  at  da3m0n8t3r.com>

8 files changed, 64 insertions, 44 deletions

diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index 05bfa6089db0..98fb66b1d909 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	commoncpp
-PORTVERSION=	1.7.3
+PORTVERSION=	1.8.1
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNU
diff --git a/devel/commoncpp/distinfo b/devel/commoncpp/distinfo
index d8ce7f8e19f2..3f724066a31c 100644
--- a/devel/commoncpp/distinfo
+++ b/devel/commoncpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (commoncpp2-1.7.3.tar.gz) = b3aa57601e6d374f11f769a5c078ae17d98a678f68e5f5162fb893cc1ff85385
-SIZE (commoncpp2-1.7.3.tar.gz) = 894571
+SHA256 (commoncpp2-1.8.1.tar.gz) = 53ced4aff74e28a1d8018eb2b4974519028db3c12471ab6dff1c873578c9af4e
+SIZE (commoncpp2-1.8.1.tar.gz) = 908678
diff --git a/devel/commoncpp/files/patch-include-cc++_address.h b/devel/commoncpp/files/patch-include-cc++_address.h
index c84396db2f82..a7f38753b06b 100644
--- a/devel/commoncpp/files/patch-include-cc++_address.h
+++ b/devel/commoncpp/files/patch-include-cc++_address.h
@@ -1,28 +1,28 @@
---- inc/cc++/address.h	Tue Jan 23 14:15:02 2007
-+++ inc/cc++/address.h	Tue Sep 11 11:58:17 2007
-@@ -236,10 +236,10 @@
- 	bool isMember(const struct in_addr &inaddr) const;
+--- inc/cc++/address.h	2010-10-31 15:22:45.000000000 -0700
++++ inc/cc++/address.h	2012-08-12 20:17:20.000000000 -0700
+@@ -237,10 +237,10 @@
+     bool isMember(const struct in_addr &inaddr) const;
  
- 	inline bool operator==(const struct sockaddr *a) const
--		{return isMember(a);};
-+		{return isMember(a);}
+     inline bool operator==(const struct sockaddr *a) const
+-        {return isMember(a);};
++        {return isMember(a);}
  
- 	inline bool operator==(const struct in_addr &a) const
--		{return isMember(a);};
-+		{return isMember(a);}
+     inline bool operator==(const struct in_addr &a) const
+-        {return isMember(a);};
++        {return isMember(a);}
  };
  
- #ifdef	CCXX_IPV6
-@@ -324,10 +324,10 @@
- 	bool isMember(const struct in6_addr &inaddr) const;
+ #ifdef  CCXX_IPV6
+@@ -325,10 +325,10 @@
+     bool isMember(const struct in6_addr &inaddr) const;
  
- 	inline bool operator==(const struct sockaddr *sa) const
--		{return isMember(sa);};
-+		{return isMember(sa);}
+     inline bool operator==(const struct sockaddr *sa) const
+-        {return isMember(sa);};
++        {return isMember(sa);}
  
- 	inline bool operator==(const struct in6_addr &a) const
--		{return isMember(a);};
-+		{return isMember(a);}
+     inline bool operator==(const struct in6_addr &a) const
+-        {return isMember(a);};
++        {return isMember(a);}
  };
  
  #endif
diff --git a/devel/commoncpp/files/patch-src_applog.cpp b/devel/commoncpp/files/patch-src_applog.cpp
new file mode 100644
index 000000000000..9b68d594c1d0
--- /dev/null
+++ b/devel/commoncpp/files/patch-src_applog.cpp
@@ -0,0 +1,19 @@
+--- src/applog.cpp	2010-10-31 16:11:55.000000000 -0700
++++ src/applog.cpp	2012-08-12 20:50:40.000000000 -0700
+@@ -45,6 +45,7 @@
+ #include <cstdlib>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <sys/stat.h>
+ 
+ // TODO sc: test if has to move up now that it is into commoncpp
+ // NOTE: the order of inclusion is important do not move following include line
+@@ -53,6 +54,8 @@
+ // local includes
+ #include <cc++/applog.h>
+ 
++using namespace std;
++
+ #ifdef  CCXX_NAMESPACES
+ using namespace std;
+ namespace ost
diff --git a/devel/commoncpp/files/patch-src_mutex.cpp b/devel/commoncpp/files/patch-src_mutex.cpp
index 8c8be2a62cb7..e427e1237908 100644
--- a/devel/commoncpp/files/patch-src_mutex.cpp
+++ b/devel/commoncpp/files/patch-src_mutex.cpp
@@ -1,11 +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 @@
+--- src/mutex.cpp	2010-10-31 16:56:23.000000000 -0700
++++ src/mutex.cpp	2012-08-12 20:34:58.000000000 -0700
+@@ -50,6 +50,8 @@
  using namespace __gnu_cxx;
  #endif
  
 +using namespace std;
 +
- #ifdef	CCXX_NAMESPACES
+ #ifdef  CCXX_NAMESPACES
  namespace ost {
- #endif
+ using namespace std;
diff --git a/devel/commoncpp/files/patch-src_thread.cpp b/devel/commoncpp/files/patch-src_thread.cpp
index fdef47fabf7e..78aa9596f68a 100644
--- a/devel/commoncpp/files/patch-src_thread.cpp
+++ b/devel/commoncpp/files/patch-src_thread.cpp
@@ -1,11 +1,11 @@
---- src/thread.cpp	Wed Oct  4 19:16:54 2006
-+++ src/thread.cpp	Wed Oct  4 19:17:17 2006
-@@ -820,7 +820,7 @@
+--- src/thread.cpp	2010-10-31 17:58:07.000000000 -0700
++++ src/thread.cpp	2012-08-12 20:26:53.000000000 -0700
+@@ -796,7 +796,7 @@
  cctid_t Thread::getId(void) const
  {
- 	if(!priv)
--		return -1;
-+		return false;
+     if(!priv)
+-        return (cctid_t)-1;
++	return (cctid_t)false;
  
- 	return priv->_tid;
+     return priv->_tid;
  }
diff --git a/devel/commoncpp/files/patch-src_timer.cpp b/devel/commoncpp/files/patch-src_timer.cpp
index 217ef30a8c55..a433751ab586 100644
--- a/devel/commoncpp/files/patch-src_timer.cpp
+++ b/devel/commoncpp/files/patch-src_timer.cpp
@@ -1,11 +1,11 @@
---- src/timer.cpp.orig	Tue Jan 23 21:09:13 2007
-+++ src/timer.cpp	Tue Sep 11 13:12:41 2007
-@@ -117,7 +117,7 @@
- 	active = true;
+--- src/timer.cpp	2010-10-31 18:00:33.000000000 -0700
++++ src/timer.cpp	2012-08-12 20:29:31.000000000 -0700
+@@ -118,7 +118,7 @@
+     active = true;
  }
  
--#ifdef	HAVE_HIRES_TIMER
+-#ifdef  HAVE_HIRES_TIMER
 +#if defined(HAVE_HIRES_TIMER) && !defined(__FreeBSD__)
  void TimerPort::sleepTimer(void)
  {
- 	struct timespec ts;
+     struct timespec ts;
diff --git a/devel/commoncpp/pkg-plist b/devel/commoncpp/pkg-plist
index c957b5e7fdb2..e5a9ac6a2587 100644
--- a/devel/commoncpp/pkg-plist
+++ b/devel/commoncpp/pkg-plist
@@ -1,5 +1,6 @@
 bin/ccgnu2-config
 include/cc++/address.h
+include/cc++/applog.h
 include/cc++/buffer.h
 include/cc++/cmdoptns.h
 include/cc++/common.h
@@ -37,13 +38,13 @@ include/cc++/unix.h
 include/cc++/url.h
 include/cc++/xml.h
 include/cc++/zstream.h
-lib/libccext2-1.7.so
-lib/libccext2-1.7.so.0
+lib/libccext2-1.8.so
+lib/libccext2-1.8.so.0
 lib/libccext2.a
 lib/libccext2.la
 lib/libccext2.so
-lib/libccgnu2-1.7.so
-lib/libccgnu2-1.7.so.0
+lib/libccgnu2-1.8.so
+lib/libccgnu2-1.8.so.0
 lib/libccgnu2.a
 lib/libccgnu2.la
 lib/libccgnu2.so