Update to 2.0 .

4 files changed, 203 insertions, 77 deletions

diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile
index 16dd81e076bc..aae85a8c13b1 100644
--- a/devel/cxxtools/Makefile
+++ b/devel/cxxtools/Makefile
@@ -6,13 +6,14 @@
 #
 
 PORTNAME=	cxxtools
-PORTVERSION=	1.4.8
+PORTVERSION=	2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
 MAINTAINER=	nox@FreeBSD.org
 COMMENT=	Collection of general-purpose C++ classes
 
+PATCH_STRIP=	-p1
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"
diff --git a/devel/cxxtools/distinfo b/devel/cxxtools/distinfo
index a81de6f69ce9..e7d46bbeff52 100644
--- a/devel/cxxtools/distinfo
+++ b/devel/cxxtools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cxxtools-1.4.8.tar.gz) = 95476dce9f47c87b46806b072d2327d221e50b1502ad44413074d70fc084bde1
-SIZE (cxxtools-1.4.8.tar.gz) = 451807
+SHA256 (cxxtools-2.0.tar.gz) = ca0eb1beb8cbb78cdaf5672a4105f8cbbdc9f0c64a9ae8ab47a694a740212bee
+SIZE (cxxtools-2.0.tar.gz) = 679749
diff --git a/devel/cxxtools/files/patch-src-tcpsocketimpl.h b/devel/cxxtools/files/patch-src-tcpsocketimpl.h
new file mode 100644
index 000000000000..30f1a0835b1f
--- /dev/null
+++ b/devel/cxxtools/files/patch-src-tcpsocketimpl.h
@@ -0,0 +1,10 @@
+--- a/src/tcpsocketimpl.h
++++ b/src/tcpsocketimpl.h
+@@ -36,6 +36,7 @@
+ #include <string>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <sys/poll.h>
+ #include <sys/time.h>
+ #include <unistd.h>
diff --git a/devel/cxxtools/pkg-plist b/devel/cxxtools/pkg-plist
index 725aa852f119..6c98e8a5dd6c 100644
--- a/devel/cxxtools/pkg-plist
+++ b/devel/cxxtools/pkg-plist
@@ -1,97 +1,212 @@
 bin/cxxtools-config
-lib/libcxxtools.a
+lib/libcxxtools-http.la
+lib/libcxxtools-http.so
+lib/libcxxtools-http.so.7
+lib/libcxxtools-unit.la
+lib/libcxxtools-unit.so
+lib/libcxxtools-unit.so.7
+lib/libcxxtools-xml.la
+lib/libcxxtools-xml.so
+lib/libcxxtools-xml.so.7
+lib/libcxxtools-xmlrpc.la
+lib/libcxxtools-xmlrpc.so
+lib/libcxxtools-xmlrpc.so.7
 lib/libcxxtools.la
 lib/libcxxtools.so
-lib/libcxxtools.so.6
-include/cxxtools/callable.h
-include/cxxtools/signals.h
-include/cxxtools/streamcounter.h
-include/cxxtools/xmltag.h
-include/cxxtools/byteorder.h
-include/cxxtools/void.h
+lib/libcxxtools.so.7
+include/cxxtools/allocator.h
 include/cxxtools/api.h
-include/cxxtools/typetraits.h
-include/cxxtools/md5.h
+include/cxxtools/application.h
+include/cxxtools/arg.h
+include/cxxtools/atomicity.gcc.arm.h
+include/cxxtools/atomicity.gcc.avr32.h
+include/cxxtools/atomicity.gcc.mips.h
+include/cxxtools/atomicity.gcc.ppc.h
+include/cxxtools/atomicity.gcc.sparc.h
+include/cxxtools/atomicity.gcc.x86.h
+include/cxxtools/atomicity.gcc.x86_64.h
 include/cxxtools/atomicity.generic.h
-include/cxxtools/constmethod.tpp
 include/cxxtools/atomicity.h
-include/cxxtools/pollclass.h
-include/cxxtools/convert.h
-include/cxxtools/constmethod.h
-include/cxxtools/quotedprintablestream.h
-include/cxxtools/log.h
-include/cxxtools/dir.h
-include/cxxtools/iconvstream.h
-include/cxxtools/sudo.h
+include/cxxtools/atomicity.pthread.h
+include/cxxtools/atomicity.sun.h
+include/cxxtools/atomicity.windows.h
+include/cxxtools/base64codec.h
+include/cxxtools/base64stream.h
+include/cxxtools/byteorder.h
+include/cxxtools/cache.h
+include/cxxtools/callable.h
+include/cxxtools/callable.tpp
 include/cxxtools/cgi.h
+include/cxxtools/char.h
+include/cxxtools/clock.h
+include/cxxtools/condition.h
+include/cxxtools/config.h
+include/cxxtools/connectable.h
+include/cxxtools/connection.h
+include/cxxtools/constmethod.h
+include/cxxtools/constmethod.tpp
+include/cxxtools/conversionerror.h
+include/cxxtools/convert.h
+include/cxxtools/date.h
+include/cxxtools/datetime.h
 include/cxxtools/delegate.h
-include/cxxtools/pool.h
-include/cxxtools/thread.h
-include/cxxtools/inifile.h
-include/cxxtools/udpstream.h
+include/cxxtools/delegate.tpp
+include/cxxtools/deserializer.h
+include/cxxtools/dir.h
+include/cxxtools/directory.h
 include/cxxtools/dlloader.h
+include/cxxtools/event.h
+include/cxxtools/eventloop.h
+include/cxxtools/eventsink.h
+include/cxxtools/eventsource.h
+include/cxxtools/facets.h
+include/cxxtools/fdstream.h
+include/cxxtools/file.h
+include/cxxtools/fileinfo.h
+include/cxxtools/fork.h
+include/cxxtools/formatter.h
+include/cxxtools/function.h
+include/cxxtools/function.tpp
+include/cxxtools/hdstream.h
+include/cxxtools/inifile.h
 include/cxxtools/iniparser.h
-include/cxxtools/regex.h
-include/cxxtools/dynbuffer.h
-include/cxxtools/method.h
-include/cxxtools/atomicity.gcc.x86_64.h
-include/cxxtools/connection.h
-include/cxxtools/callable.tpp
-include/cxxtools/atomicity.gcc.ppc.h
-include/cxxtools/atomicity.pthread.h
-include/cxxtools/slot.h
-include/cxxtools/arg.h
+include/cxxtools/invokable.h
 include/cxxtools/invokable.tpp
-include/cxxtools/sourceinfo.h
-include/cxxtools/tcpstream.h
-include/cxxtools/base64stream.h
-include/cxxtools/tee.h
-include/cxxtools/httpreply.h
-include/cxxtools/smartptr.h
-include/cxxtools/atomicity.gcc.mips.h
-include/cxxtools/multifstream.h
-include/cxxtools/mime.h
-include/cxxtools/any.h
+include/cxxtools/iodevice.h
+include/cxxtools/ioerror.h
+include/cxxtools/iostream.h
+include/cxxtools/jsonserializer.h
+include/cxxtools/library.h
+include/cxxtools/log.h
+include/cxxtools/loginit.h
 include/cxxtools/main.h
-include/cxxtools/function.tpp
-include/cxxtools/atomicity.gcc.arm.h
-include/cxxtools/invokable.h
-include/cxxtools/signals.tpp
+include/cxxtools/md5.h
+include/cxxtools/md5stream.h
+include/cxxtools/method.h
 include/cxxtools/method.tpp
-include/cxxtools/hdstream.h
-include/cxxtools/atomicity.gcc.x86.h
-include/cxxtools/iconverter.h
+include/cxxtools/mime.h
+include/cxxtools/multifstream.h
+include/cxxtools/mutex.h
+include/cxxtools/noncopyable.h
 include/cxxtools/pipe.h
-include/cxxtools/connectable.h
-include/cxxtools/delegate.tpp
-include/cxxtools/pipestream.h
-include/cxxtools/syserror.h
+include/cxxtools/pool.h
+include/cxxtools/process.h
+include/cxxtools/properties.h
 include/cxxtools/query_params.h
-include/cxxtools/fdstream.h
-include/cxxtools/net.h
+include/cxxtools/queue.h
+include/cxxtools/quotedprintablestream.h
 include/cxxtools/refcounted.h
+include/cxxtools/regex.h
+include/cxxtools/selectable.h
+include/cxxtools/selector.h
+include/cxxtools/semaphore.h
+include/cxxtools/serializationerror.h
+include/cxxtools/serializationinfo.h
+include/cxxtools/serializer.h
+include/cxxtools/settings.h
+include/cxxtools/signal.h
+include/cxxtools/signal.tpp
+include/cxxtools/singleton.h
+include/cxxtools/slot.h
+include/cxxtools/slot.tpp
+include/cxxtools/smartptr.h
+include/cxxtools/sourceinfo.h
+include/cxxtools/streambuffer.h
+include/cxxtools/streamcounter.h
+include/cxxtools/string.h
+include/cxxtools/string.tpp
+include/cxxtools/stringdata.h
+include/cxxtools/stringdata.tpp
+include/cxxtools/stringstream.h
+include/cxxtools/sudo.h
+include/cxxtools/syserror.h
+include/cxxtools/systemerror.h
+include/cxxtools/tee.h
+include/cxxtools/textbuffer.h
+include/cxxtools/textcodec.h
+include/cxxtools/textstream.h
+include/cxxtools/thread.h
+include/cxxtools/threadpool.h
+include/cxxtools/time.h
+include/cxxtools/timer.h
+include/cxxtools/timespan.h
+include/cxxtools/types.h
+include/cxxtools/typetraits.h
+include/cxxtools/utf8codec.h
+include/cxxtools/uuencode.h
+include/cxxtools/void.h
+include/cxxtools/xmltag.h
+include/cxxtools/http/api.h
+include/cxxtools/http/client.h
+include/cxxtools/http/messageheader.h
+include/cxxtools/http/reply.h
+include/cxxtools/http/replyheader.h
+include/cxxtools/http/request.h
+include/cxxtools/http/requestheader.h
+include/cxxtools/http/responder.h
+include/cxxtools/http/server.h
+include/cxxtools/http/service.h
+include/cxxtools/log/cxxtools.h
 include/cxxtools/log/cxxtools_init.h
-include/cxxtools/log/log4cplus.h
 include/cxxtools/log/disable.h
-include/cxxtools/log/log4cxx_init.h
 include/cxxtools/log/disable_init.h
+include/cxxtools/log/log4cplus.h
 include/cxxtools/log/log4cplus_init.h
-include/cxxtools/log/cxxtools.h
 include/cxxtools/log/log4cxx.h
-include/cxxtools/function.h
-include/cxxtools/slot.tpp
-include/cxxtools/fork.h
-include/cxxtools/properties.h
-include/cxxtools/atomicity.windows.h
-include/cxxtools/atomicity.gcc.sparc.h
-include/cxxtools/udp.h
-include/cxxtools/loginit.h
-include/cxxtools/noncopyable.h
-include/cxxtools/md5stream.h
-include/cxxtools/httprequest.h
-include/cxxtools/atomicity.sun.h
-include/cxxtools/uuencode.h
-include/cxxtools/hirestime.h
-include/cxxtools/config.h
+include/cxxtools/log/log4cxx_init.h
+include/cxxtools/net/addrinfo.h
+include/cxxtools/net/net.h
+include/cxxtools/net/tcpserver.h
+include/cxxtools/net/tcpsocket.h
+include/cxxtools/net/tcpstream.h
+include/cxxtools/net/udp.h
+include/cxxtools/net/udpstream.h
+include/cxxtools/posix/pipe.h
+include/cxxtools/posix/pipestream.h
+include/cxxtools/unit/application.h
+include/cxxtools/unit/assertion.h
+include/cxxtools/unit/registertest.h
+include/cxxtools/unit/reporter.h
+include/cxxtools/unit/test.h
+include/cxxtools/unit/testcase.h
+include/cxxtools/unit/testcontext.h
+include/cxxtools/unit/testfixture.h
+include/cxxtools/unit/testmain.h
+include/cxxtools/unit/testmethod.h
+include/cxxtools/unit/testprotocol.h
+include/cxxtools/unit/testsuite.h
+include/cxxtools/xml/api.h
+include/cxxtools/xml/characters.h
+include/cxxtools/xml/comment.h
+include/cxxtools/xml/doctypedeclaration.h
+include/cxxtools/xml/enddocument.h
+include/cxxtools/xml/endelement.h
+include/cxxtools/xml/entityresolver.h
+include/cxxtools/xml/namespace.h
+include/cxxtools/xml/namespacecontext.h
+include/cxxtools/xml/node.h
+include/cxxtools/xml/processinginstruction.h
+include/cxxtools/xml/startelement.h
+include/cxxtools/xml/xmldeserializer.h
+include/cxxtools/xml/xmlerror.h
+include/cxxtools/xml/xmlreader.h
+include/cxxtools/xml/xmlserializer.h
+include/cxxtools/xml/xmlwriter.h
+include/cxxtools/xmlrpc/api.h
+include/cxxtools/xmlrpc/client.h
+include/cxxtools/xmlrpc/fault.h
+include/cxxtools/xmlrpc/formatter.h
+include/cxxtools/xmlrpc/httpclient.h
+include/cxxtools/xmlrpc/remoteprocedure.h
+include/cxxtools/xmlrpc/responder.h
+include/cxxtools/xmlrpc/result.h
+include/cxxtools/xmlrpc/scanner.h
+include/cxxtools/xmlrpc/service.h
+@dirrm include/cxxtools/http
 @dirrm include/cxxtools/log
+@dirrm include/cxxtools/net
+@dirrm include/cxxtools/posix
+@dirrm include/cxxtools/unit
+@dirrm include/cxxtools/xml
+@dirrm include/cxxtools/xmlrpc
 @dirrm include/cxxtools