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

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

5 files changed, 12 insertions, 36 deletions

diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index 410db2484c69..82dff74c9e7a 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tntnet
-PORTVERSION=	2.0
-PORTREVISION=	2
+PORTVERSION=	2.1
 CATEGORIES=	www devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
diff --git a/www/tntnet/distinfo b/www/tntnet/distinfo
index 40f93c8939a3..b4fa1d2ed0ee 100644
--- a/www/tntnet/distinfo
+++ b/www/tntnet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tntnet-2.0.tar.gz) = 8e5daf06f9ae1ec05654c3f2b3c2a74cfd64cc2a9f6267f6e4bb604842315b1a
-SIZE (tntnet-2.0.tar.gz) = 1553215
+SHA256 (tntnet-2.1.tar.gz) = 8623275f78e532a16f73a8b49b79a84fbf5eea314c22e8a7f7b8d50b3d081ab6
+SIZE (tntnet-2.1.tar.gz) = 1705181
diff --git a/www/tntnet/files/patch-clang b/www/tntnet/files/patch-clang
deleted file mode 100644
index b4046c53bdcc..000000000000
--- a/www/tntnet/files/patch-clang
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/framework/common/tnt/object.h
-+++ b/framework/common/tnt/object.h
-@@ -57,9 +57,9 @@ namespace tnt
-         : ptr(ptr_)
-         { }
-       ~PointerObject()
--        { destroy(ptr); }
-+        { this->destroy(ptr); }
-       void set(data_type* ptr_)
--        { destroy(ptr); ptr = ptr_; }
-+        { this->destroy(ptr); ptr = ptr_; }
-       data_type* get()  { return ptr; }
-   };
- 
---- a/framework/common/tnt/compident.h
-+++ b/framework/common/tnt/compident.h
-@@ -39,8 +39,9 @@ namespace tnt
- /// tntnet components are identified by the library, where they reside and a name
- /// inside the library. The name is actually a string constant, which was passed
- /// to the component factory ctor.
--struct Compident
-+class Compident
- {
-+public:
-   std::string libname;
-   std::string compname;
- 
diff --git a/www/tntnet/pkg-plist b/www/tntnet/pkg-plist
index 7f74eaf591f2..ce430f514ca2 100644
--- a/www/tntnet/pkg-plist
+++ b/www/tntnet/pkg-plist
@@ -14,6 +14,7 @@ bin/tntnet-config
 %%ETCDIR%%/tntnet.properties.sample
 @exec if [ ! -f %D/etc/tntnet/tntnet.properties ] ; then cp -p %D/%F %B/tntnet.properties; fi
 include/tnt/applicationunlocker.h
+include/tnt/backgroundworker.h
 include/tnt/cmd.h
 include/tnt/compident.h
 include/tnt/comploader.h
@@ -68,17 +69,20 @@ include/tnt/worker.h
 include/tnt/zdata.h
 lib/libtntnet.la
 lib/libtntnet.so
-lib/libtntnet.so.9
+lib/libtntnet.so.10
 lib/libtntnet_cgi.a
 lib/libtntnet_cgi.la
 lib/libtntnet_cgi.so
-lib/libtntnet_cgi.so.9
+lib/libtntnet_cgi.so.10
 lib/libtntnet_sdk.la
 lib/libtntnet_sdk.so
-lib/libtntnet_sdk.so.9
+lib/libtntnet_sdk.so.10
 lib/tntnet/alldemos.la
 lib/tntnet/alldemos.so
 lib/tntnet/alldemos.so.0
+lib/tntnet/backgroundjob.la
+lib/tntnet/backgroundjob.so
+lib/tntnet/backgroundjob.so.0
 lib/tntnet/calc.la
 lib/tntnet/calc.so
 lib/tntnet/calc.so.0
@@ -130,7 +134,7 @@ lib/tntnet/strings.so
 lib/tntnet/strings.so.0
 lib/tntnet/tntnet.la
 lib/tntnet/tntnet.so
-lib/tntnet/tntnet.so.9
+lib/tntnet/tntnet.so.10
 lib/tntnet/upload.la
 lib/tntnet/upload.so
 lib/tntnet/upload.so.0
diff --git a/www/vdr-plugin-live/Makefile b/www/vdr-plugin-live/Makefile
index 28f1e072b320..92239bd55c91 100644
--- a/www/vdr-plugin-live/Makefile
+++ b/www/vdr-plugin-live/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vdr-plugin-live
 PORTVERSION=	0.2.0s20110303
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www multimedia
 MASTER_SITES=	http://live.vdr-developer.org/downloads/:release \
 		LOCAL/nox/:snapshot