- Update devel/cxxtools and www/tntnet to 2.1 .

- Bump PORTREVISION for www/vdr-plugin-live that depends on tntnet.

4 files changed, 99 insertions, 215 deletions

diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile
index c7067e0b19ec..dfd81ccc19f2 100644
--- a/devel/cxxtools/Makefile
+++ b/devel/cxxtools/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cxxtools
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
diff --git a/devel/cxxtools/distinfo b/devel/cxxtools/distinfo
index e7d46bbeff52..6f1381feccc0 100644
--- a/devel/cxxtools/distinfo
+++ b/devel/cxxtools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cxxtools-2.0.tar.gz) = ca0eb1beb8cbb78cdaf5672a4105f8cbbdc9f0c64a9ae8ab47a694a740212bee
-SIZE (cxxtools-2.0.tar.gz) = 679749
+SHA256 (cxxtools-2.1.tar.gz) = 40dc264d453822f4f4513c41a545d9e42da030350729d7f8aa25dec9dc9755b3
+SIZE (cxxtools-2.1.tar.gz) = 803599
diff --git a/devel/cxxtools/files/patch-clang b/devel/cxxtools/files/patch-clang
deleted file mode 100644
index 83334f2b4701..000000000000
--- a/devel/cxxtools/files/patch-clang
+++ /dev/null
@@ -1,148 +0,0 @@
---- a/include/cxxtools/iostream.h
-+++ b/include/cxxtools/iostream.h
-@@ -56,7 +56,7 @@ class BasicIStream : public std::basic_i
-         {
-             BasicStreamBuffer<CharT>* tmp = _buffer;
-             _buffer = buffer;
--            rdbuf(buffer);
-+            this->rdbuf(buffer);
-             return tmp;
-         }
- 
-@@ -106,7 +106,7 @@ class BasicOStream : public std::basic_o
-         {
-             BasicStreamBuffer<CharT>* tmp = _buffer;
-             _buffer = buffer;
--            rdbuf(buffer);
-+            this->rdbuf(buffer);
-             return tmp;
-         }
- 
-@@ -152,7 +152,7 @@ class BasicIOStream : public std::basic_
-         {
-             BasicStreamBuffer<CharT>* tmp = _buffer;
-             _buffer = buffer;
--            rdbuf(buffer);
-+            this->rdbuf(buffer);
-             return tmp;
-         }
- 
---- a/include/cxxtools/textstream.h
-+++ b/include/cxxtools/textstream.h
-@@ -84,14 +84,14 @@ class BasicTextIStream : public std::bas
-         : std::basic_istream<intern_type>(0)
-         , _buffer( &is, codec )
-         {
--            init(&_buffer);
-+            this->init(&_buffer);
-         }
- 
-         explicit BasicTextIStream(CodecType* codec)
-         : std::basic_istream<intern_type>(0)
-         , _buffer( 0, codec )
-         {
--            init(&_buffer);
-+            this->init(&_buffer);
-         }
- 
-         //! @brief Deletes to codec.
-@@ -170,12 +170,12 @@ class BasicTextOStream : public std::bas
-         BasicTextOStream(StreamType& os, CodecType* codec)
-         : std::basic_ostream<intern_type>(0)
-         , _buffer( &os , codec )
--        { init(&_buffer); }
-+        { this->init(&_buffer); }
- 
-         explicit BasicTextOStream(CodecType* codec)
-         : std::basic_ostream<intern_type>(0)
-         , _buffer( 0 , codec )
--        { init(&_buffer); }
-+        { this->init(&_buffer); }
- 
-         //! @brief Deletes to codec.
-         ~BasicTextOStream()
-@@ -253,12 +253,12 @@ class BasicTextStream : public std::basi
-         BasicTextStream(StreamType& ios, CodecType* codec)
-         : std::basic_iostream<intern_type>(0)
-         , _buffer( &ios, codec)
--        { init(&_buffer); }
-+        { this->init(&_buffer); }
- 
-         explicit BasicTextStream(CodecType* codec)
-         : std::basic_iostream<intern_type>(0)
-         , _buffer(0, codec)
--        { init(&_buffer); }
-+        { this->init(&_buffer); }
- 
-         //! @brief Deletes the codec.
-         ~BasicTextStream()
---- a/include/cxxtools/streamcounter.h
-+++ b/include/cxxtools/streamcounter.h
-@@ -69,7 +69,7 @@ namespace cxxtools
-       BasicStreamcounter()
-         : std::basic_ostream<CharType, Traits>(0)
-       {
--        init(&streambuf);
-+        this->init(&streambuf);
-       }
- 
-       unsigned getCount() const           { return streambuf.getCount(); }
---- a/include/cxxtools/smartptr.h
-+++ b/include/cxxtools/smartptr.h
-@@ -249,14 +249,14 @@ namespace cxxtools
-         { ownershipPolicyType::link(ptr, ptr.object); }
-       ~SmartPtr()
-         { if (ownershipPolicyType::unlink(object))
--            destroy(object); }
-+            this->destroy(object); }
- 
-       SmartPtr& operator= (const SmartPtr& ptr)
-       {
-         if (object != ptr.object)
-         {
-           if (ownershipPolicyType::unlink(object))
--            destroy(object);
-+            this->destroy(object);
- 
-           object = ptr.object;
- 
---- a/include/cxxtools/query_params.h
-+++ b/include/cxxtools/query_params.h
-@@ -231,7 +231,7 @@ class QueryParams
-       : unnamed_params(src.unnamed_params),
-         named_params(src.named_params),
-         parent(src.parent),
--        use_parent_values(use_parent_values)
-+        use_parent_values(src.use_parent_values)
-     { }
- 
-     /// returns the parent-object
-@@ -332,8 +332,15 @@ class QueryParams
-     //
- 
-     /// get named parameter.
-+#if 0 // XXX this will return a temporary object for def with clang
-     const string& param(const string& name, size_type n = 0,
-       const string& def = std::string()) const
-+#else
-+    static const std::string emptystring;
-+
-+    const string& param(const string& name, size_type n = 0,
-+      const string& def = emptystring) const
-+#endif
-     {
-       named_params_type::const_iterator i = named_params.find(name);
-       if (i != named_params.end() && n < i->second.size())
---- a/src/query_params.cpp
-+++ b/src/query_params.cpp
-@@ -164,6 +164,10 @@ void _parse_url(
-   }
- }
- 
-+#if 1 // XXX clang problem, see query_params.h
-+const std::string QueryParams::emptystring;
-+#endif
-+
- void QueryParams::parse_url(const std::string& url)
- {
-   _parse_url(url.begin(), url.end(), unnamed_params, named_params);
diff --git a/devel/cxxtools/pkg-plist b/devel/cxxtools/pkg-plist
index 6c98e8a5dd6c..d884dbf62ed9 100644
--- a/devel/cxxtools/pkg-plist
+++ b/devel/cxxtools/pkg-plist
@@ -1,37 +1,48 @@
 bin/cxxtools-config
+lib/libcxxtools-bin.a
+lib/libcxxtools-bin.la
+lib/libcxxtools-bin.so
+lib/libcxxtools-bin.so.8
+lib/libcxxtools-http.a
 lib/libcxxtools-http.la
 lib/libcxxtools-http.so
-lib/libcxxtools-http.so.7
+lib/libcxxtools-http.so.8
+lib/libcxxtools-json.a
+lib/libcxxtools-json.la
+lib/libcxxtools-json.so
+lib/libcxxtools-json.so.8
+lib/libcxxtools-unit.a
 lib/libcxxtools-unit.la
 lib/libcxxtools-unit.so
-lib/libcxxtools-unit.so.7
+lib/libcxxtools-unit.so.8
+lib/libcxxtools-xml.a
 lib/libcxxtools-xml.la
 lib/libcxxtools-xml.so
-lib/libcxxtools-xml.so.7
+lib/libcxxtools-xml.so.8
+lib/libcxxtools-xmlrpc.a
 lib/libcxxtools-xmlrpc.la
 lib/libcxxtools-xmlrpc.so
-lib/libcxxtools-xmlrpc.so.7
+lib/libcxxtools-xmlrpc.so.8
+lib/libcxxtools.a
 lib/libcxxtools.la
 lib/libcxxtools.so
-lib/libcxxtools.so.7
+lib/libcxxtools.so.8
 include/cxxtools/allocator.h
 include/cxxtools/api.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/argin.h
+include/cxxtools/argout.h
 include/cxxtools/atomicity.gcc.x86_64.h
-include/cxxtools/atomicity.generic.h
 include/cxxtools/atomicity.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/bin/deserializer.h
+include/cxxtools/bin/formatter.h
+include/cxxtools/bin/rpcclient.h
+include/cxxtools/bin/rpcserver.h
+include/cxxtools/bin/serializer.h
+include/cxxtools/bin/valueparser.h
 include/cxxtools/byteorder.h
 include/cxxtools/cache.h
 include/cxxtools/callable.h
@@ -39,6 +50,7 @@ include/cxxtools/callable.tpp
 include/cxxtools/cgi.h
 include/cxxtools/char.h
 include/cxxtools/clock.h
+include/cxxtools/composer.h
 include/cxxtools/condition.h
 include/cxxtools/config.h
 include/cxxtools/connectable.h
@@ -47,11 +59,17 @@ include/cxxtools/constmethod.h
 include/cxxtools/constmethod.tpp
 include/cxxtools/conversionerror.h
 include/cxxtools/convert.h
+include/cxxtools/csvdeserializer.h
+include/cxxtools/csvformatter.h
+include/cxxtools/csvparser.h
+include/cxxtools/csvserializer.h
 include/cxxtools/date.h
 include/cxxtools/datetime.h
+include/cxxtools/decomposer.h
 include/cxxtools/delegate.h
 include/cxxtools/delegate.tpp
 include/cxxtools/deserializer.h
+include/cxxtools/deserializerbase.h
 include/cxxtools/dir.h
 include/cxxtools/directory.h
 include/cxxtools/dlloader.h
@@ -63,11 +81,21 @@ 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/hmac.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/inifile.h
 include/cxxtools/iniparser.h
 include/cxxtools/invokable.h
@@ -75,34 +103,68 @@ include/cxxtools/invokable.tpp
 include/cxxtools/iodevice.h
 include/cxxtools/ioerror.h
 include/cxxtools/iostream.h
+include/cxxtools/join.h
+include/cxxtools/json/httpclient.h
+include/cxxtools/json/httpservice.h
+include/cxxtools/json/request.h
+include/cxxtools/json/responder.h
+include/cxxtools/json/rpcclient.h
+include/cxxtools/json/rpcserver.h
+include/cxxtools/jsondeserializer.h
+include/cxxtools/jsonformatter.h
+include/cxxtools/jsonparser.h
 include/cxxtools/jsonserializer.h
 include/cxxtools/library.h
 include/cxxtools/log.h
+include/cxxtools/log/cxxtools.h
+include/cxxtools/log/cxxtools_init.h
 include/cxxtools/loginit.h
 include/cxxtools/main.h
 include/cxxtools/md5.h
 include/cxxtools/md5stream.h
+include/cxxtools/membar.gcc.h
+include/cxxtools/membar.gcc.nosmp.h
+include/cxxtools/membar.gcc.x86.h
+include/cxxtools/membar.h
 include/cxxtools/method.h
 include/cxxtools/method.tpp
 include/cxxtools/mime.h
 include/cxxtools/multifstream.h
 include/cxxtools/mutex.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/net/uri.h
 include/cxxtools/noncopyable.h
 include/cxxtools/pipe.h
 include/cxxtools/pool.h
-include/cxxtools/process.h
+include/cxxtools/posix/commandinput.h
+include/cxxtools/posix/commandoutput.h
+include/cxxtools/posix/exec.h
+include/cxxtools/posix/fork.h
+include/cxxtools/posix/pipe.h
+include/cxxtools/posix/pipestream.h
 include/cxxtools/properties.h
 include/cxxtools/query_params.h
 include/cxxtools/queue.h
 include/cxxtools/quotedprintablestream.h
 include/cxxtools/refcounted.h
 include/cxxtools/regex.h
+include/cxxtools/remoteclient.h
+include/cxxtools/remoteexception.h
+include/cxxtools/remoteprocedure.h
+include/cxxtools/remoteresult.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/serviceprocedure.h
+include/cxxtools/serviceregistry.h
 include/cxxtools/settings.h
 include/cxxtools/signal.h
 include/cxxtools/signal.tpp
@@ -111,15 +173,12 @@ include/cxxtools/slot.h
 include/cxxtools/slot.tpp
 include/cxxtools/smartptr.h
 include/cxxtools/sourceinfo.h
+include/cxxtools/split.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
@@ -130,39 +189,8 @@ include/cxxtools/threadpool.h
 include/cxxtools/time.h
 include/cxxtools/timer.h
 include/cxxtools/timespan.h
-include/cxxtools/types.h
+include/cxxtools/trim.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/disable.h
-include/cxxtools/log/disable_init.h
-include/cxxtools/log/log4cplus.h
-include/cxxtools/log/log4cplus_init.h
-include/cxxtools/log/log4cxx.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
@@ -175,6 +203,9 @@ include/cxxtools/unit/testmain.h
 include/cxxtools/unit/testmethod.h
 include/cxxtools/unit/testprotocol.h
 include/cxxtools/unit/testsuite.h
+include/cxxtools/utf8codec.h
+include/cxxtools/uuencode.h
+include/cxxtools/void.h
 include/cxxtools/xml/api.h
 include/cxxtools/xml/characters.h
 include/cxxtools/xml/comment.h
@@ -189,24 +220,26 @@ include/cxxtools/xml/processinginstruction.h
 include/cxxtools/xml/startelement.h
 include/cxxtools/xml/xmldeserializer.h
 include/cxxtools/xml/xmlerror.h
+include/cxxtools/xml/xmlformatter.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/errorcodes.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
+include/cxxtools/xmltag.h
 @dirrm include/cxxtools/xmlrpc
+@dirrm include/cxxtools/xml
+@dirrm include/cxxtools/unit
+@dirrm include/cxxtools/posix
+@dirrm include/cxxtools/net
+@dirrm include/cxxtools/log
+@dirrm include/cxxtools/json
+@dirrm include/cxxtools/http
+@dirrm include/cxxtools/bin
 @dirrm include/cxxtools