Update to version 1.2.5

Submitted by:	David Sugar <dyfet@gnu.org> MAINTAINER

4 files changed, 31 insertions, 20 deletions

diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile
index af12b45eb3b8..132988cce342 100644
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	CommonC++
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	1.2.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cplusplus
@@ -15,21 +14,21 @@ MASTER_SITE_SUBDIR=	cplusplus
 MAINTAINER=	dyfet@gnu.org
 
 USE_GMAKE=	yes
+USE_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+#USE_AUTOCONF=	yes
 INSTALLS_SHLIB=	yes
+#AUTOCONF=	autoconf && ${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+#		s|l\$$ost_cv_thread_library|\$$ost_cv_thread_library|g' \
+#			${WRKSRC}/configure
+#
+# I had immense problems with autoconf generated on xBSD 4.0 where the
+# generated configure would mangle library names.
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 411000
-CFLAGS+=	-DUSE_FPATHCONF_HACK
-.endif
-
-pre-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|-release \$$\(LT_RELEASE\)||g'
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		 s|l\$$ost_cv_thread_library|\$$ost_cv_thread_library|g ; \
-		 s|=c_r|=pthread|g' ${WRKSRC}/configure
+post-extract:
+	cd ${WRKSRC} ; ./configure
+#	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+#		's|-release \$$\(LT_RELEASE\)||g'
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -37,4 +36,4 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/commoncpp
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/commoncpp/distinfo b/devel/commoncpp/distinfo
index 4bc1307f400a..f2c6421d8cb1 100644
--- a/devel/commoncpp/distinfo
+++ b/devel/commoncpp/distinfo
@@ -1 +1 @@
-MD5 (CommonC++-1.2.1.tar.gz) = 351844b7793be408ccb8fd85b8632707
+MD5 (CommonC++-1.2.5.tar.gz) = 3471fadff2dffe9b059a7a30cb123ec3
diff --git a/devel/commoncpp/pkg-descr b/devel/commoncpp/pkg-descr
index 11026296fbb1..e4b591b85c2f 100644
--- a/devel/commoncpp/pkg-descr
+++ b/devel/commoncpp/pkg-descr
@@ -1,5 +1,5 @@
 Common C++ offers a portable highly portable C++ application development
-framework.  Common C++ provides classes for threads, sockets, daemon 
+framework.  Common C++ provides	classes for threads, sockets, daemon 
 management, system logging, object synchronization, realtime network 
 development, persistant object management, and file access.
 
diff --git a/devel/commoncpp/pkg-plist b/devel/commoncpp/pkg-plist
index 107fe576e6ff..32406babee42 100644
--- a/devel/commoncpp/pkg-plist
+++ b/devel/commoncpp/pkg-plist
@@ -10,15 +10,15 @@ include/cc++/serial.h
 include/cc++/slog.h
 include/cc++/socket.h
 include/cc++/thread.h
+lib/libccio-1.2.so.0
 lib/libccio.a
 lib/libccio.so
-lib/libccio.so.0
+lib/libccstd-1.2.so.0
 lib/libccstd.a
 lib/libccstd.so
-lib/libccstd.so.0
+lib/libccxx-1.2.so.0
 lib/libccxx.a
 lib/libccxx.so
-lib/libccxx.so.0
 share/doc/commoncpp/AtomicCounter.html
 share/doc/commoncpp/BaseObject.html
 share/doc/commoncpp/Body.html
@@ -31,6 +31,7 @@ share/doc/commoncpp/Engine::Exception.html
 share/doc/commoncpp/Entity.html
 share/doc/commoncpp/Event.html
 share/doc/commoncpp/FIFOSession.html
+share/doc/commoncpp/File.html
 share/doc/commoncpp/FixedBuffer.html
 share/doc/commoncpp/Frameset.html
 share/doc/commoncpp/HTMLDocument.html
@@ -39,10 +40,13 @@ share/doc/commoncpp/InetAddress.html
 share/doc/commoncpp/InetHostAddress.html
 share/doc/commoncpp/InetMaskAddress.html
 share/doc/commoncpp/Keydata.html
+share/doc/commoncpp/LockedFile.html
 share/doc/commoncpp/MappedFile.html
 share/doc/commoncpp/MemPager.html
 share/doc/commoncpp/Mutex.html
 share/doc/commoncpp/MutexCounter.html
+share/doc/commoncpp/NamedPipe.html
+share/doc/commoncpp/NewFile.html
 share/doc/commoncpp/PersistException.html
 share/doc/commoncpp/Pipe.html
 share/doc/commoncpp/Poller.html
@@ -82,11 +86,14 @@ share/doc/commoncpp/UDPSocket.html
 share/doc/commoncpp/UDPTransmit.html
 share/doc/commoncpp/Vector2D.html
 share/doc/commoncpp/Writer.html
+share/doc/commoncpp/__EXPORT.html
 share/doc/commoncpp/__________extras___math___math_h.html
 share/doc/commoncpp/__________extras___script___script_h.html
 share/doc/commoncpp/_____common___html_h.html
+share/doc/commoncpp/_____common___math_h.html
 share/doc/commoncpp/_____common___misc_h.html
 share/doc/commoncpp/_____common___persist_h.html
+share/doc/commoncpp/_____common___script_h.html
 share/doc/commoncpp/all-globals.html
 share/doc/commoncpp/fifostream.html
 share/doc/commoncpp/file_h.html
@@ -102,6 +109,7 @@ share/doc/commoncpp/full-list-Engine::Exception.html
 share/doc/commoncpp/full-list-Entity.html
 share/doc/commoncpp/full-list-Event.html
 share/doc/commoncpp/full-list-FIFOSession.html
+share/doc/commoncpp/full-list-File.html
 share/doc/commoncpp/full-list-FixedBuffer.html
 share/doc/commoncpp/full-list-Frameset.html
 share/doc/commoncpp/full-list-HTMLDocument.html
@@ -110,10 +118,13 @@ share/doc/commoncpp/full-list-InetAddress.html
 share/doc/commoncpp/full-list-InetHostAddress.html
 share/doc/commoncpp/full-list-InetMaskAddress.html
 share/doc/commoncpp/full-list-Keydata.html
+share/doc/commoncpp/full-list-LockedFile.html
 share/doc/commoncpp/full-list-MappedFile.html
 share/doc/commoncpp/full-list-MemPager.html
 share/doc/commoncpp/full-list-Mutex.html
 share/doc/commoncpp/full-list-MutexCounter.html
+share/doc/commoncpp/full-list-NamedPipe.html
+share/doc/commoncpp/full-list-NewFile.html
 share/doc/commoncpp/full-list-PersistException.html
 share/doc/commoncpp/full-list-Pipe.html
 share/doc/commoncpp/full-list-Poller.html
@@ -153,6 +164,7 @@ share/doc/commoncpp/full-list-UDPSocket.html
 share/doc/commoncpp/full-list-UDPTransmit.html
 share/doc/commoncpp/full-list-Vector2D.html
 share/doc/commoncpp/full-list-Writer.html
+share/doc/commoncpp/full-list-__EXPORT.html
 share/doc/commoncpp/full-list-fifostream.html
 share/doc/commoncpp/full-list-tcpstream.html
 share/doc/commoncpp/full-list-ttystream.html