Update to 2.0 .

5 files changed, 39 insertions, 60 deletions

diff --git a/www/tntnet/Makefile b/www/tntnet/Makefile
index f0e866863831..d83b7bc9d982 100644
--- a/www/tntnet/Makefile
+++ b/www/tntnet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tntnet
-PORTVERSION=	1.6.3
+PORTVERSION=	2.0
 CATEGORIES=	www devel
 MASTER_SITES=	http://www.tntnet.org/download/
 
diff --git a/www/tntnet/distinfo b/www/tntnet/distinfo
index fb0b4c0740f6..40f93c8939a3 100644
--- a/www/tntnet/distinfo
+++ b/www/tntnet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tntnet-1.6.3.tar.gz) = 1c16547e4fe6c07f8fe1b9d2eeb750cb2061032f31880f93f2080b049d54a3a4
-SIZE (tntnet-1.6.3.tar.gz) = 1952122
+SHA256 (tntnet-2.0.tar.gz) = 8e5daf06f9ae1ec05654c3f2b3c2a74cfd64cc2a9f6267f6e4bb604842315b1a
+SIZE (tntnet-2.0.tar.gz) = 1553215
diff --git a/www/tntnet/files/patch-etc b/www/tntnet/files/patch-etc
index 31fbb75110ac..8e9d92f3debe 100644
--- a/www/tntnet/files/patch-etc
+++ b/www/tntnet/files/patch-etc
@@ -1,6 +1,6 @@
 --- a/etc/Makefile.am
 +++ b/etc/Makefile.am
-@@ -1,30 +1,35 @@
+@@ -1,31 +1,36 @@
  nobase_dist_noinst_DATA = \
      tntnet/tntnet.conf.in \
 -    init.d/tntnet.in
@@ -24,8 +24,8 @@
 +tntnet/mime.conf.sample: tntnet/mime.conf
 +	cp tntnet/mime.conf $@
  
--tntnet/tntnet.conf: tntnet/tntnet.conf.in Makefile
-+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in Makefile
+-tntnet/tntnet.conf: tntnet/tntnet.conf.in
++tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in
  	sed -e 's,@libdir\@,@libdir@,g;' \
  	    -e 's,@pkglibdir\@,@pkglibdir@,g;' \
  	    -e 's,@sysconfdir\@,@sysconfdir@,g;' \
@@ -33,8 +33,8 @@
 -		-e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf
 +		-e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf.sample
  
--init.d/tntnet: init.d/tntnet.in Makefile
-+tntnet/tntnet: init.d/tntnet.in Makefile
+-init.d/tntnet: init.d/tntnet.in
++tntnet/tntnet: init.d/tntnet.in
  	sed -e 's,@libdir\@,@libdir@,g;' \
  	    -e 's,@pkglibdir\@,@pkglibdir@,g;' \
  	    -e 's,@sysconfdir\@,@sysconfdir@,g;' \
@@ -43,13 +43,14 @@
 +	    -e 's/^function //;' \
 +		-e 's,@datadir\@,@datadir@,g;' <init.d/tntnet.in >tntnet/tntnet
  
--tntnet/tntnet.properties: Makefile
-+tntnet/tntnet.properties.sample: Makefile
- 	cxxtools-config --logfile @localstatedir@/log/tntnet/tntnet.log --properties tntnet >$@
+-tntnet/tntnet.properties:
++tntnet/tntnet.properties.sample:
+ 	../tntnet-config --properties tntnet | \
+ 		sed -e 's,^#file=tntnet.log,file=@localstatedir@/log/tntnet/tntnet.log,' >$@
 --- a/etc/Makefile.in
 +++ b/etc/Makefile.in
-@@ -194,17 +194,18 @@ target_os = @target_os@
- target_vendor = @target_vendor@
+@@ -206,17 +206,18 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  nobase_dist_noinst_DATA = \
      tntnet/tntnet.conf.in \
 -    init.d/tntnet.in
@@ -72,15 +73,15 @@
  
  all: all-am
  
-@@ -436,21 +437,25 @@ uninstall-am: uninstall-info-am uninstal
+@@ -483,21 +484,25 @@ uninstall-am: uninstall-nobase_dist_sysc
  	uninstall-nobase_sysconfDATA
  
  
--tntnet/tntnet.conf: tntnet/tntnet.conf.in Makefile
+-tntnet/tntnet.conf: tntnet/tntnet.conf.in
 +tntnet/mime.conf.sample: tntnet/mime.conf
 +	cp tntnet/mime.conf $@
 +
-+tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in Makefile
++tntnet/tntnet.conf.sample: tntnet/tntnet.conf.in
  	sed -e 's,@libdir\@,@libdir@,g;' \
  	    -e 's,@pkglibdir\@,@pkglibdir@,g;' \
  	    -e 's,@sysconfdir\@,@sysconfdir@,g;' \
@@ -88,8 +89,8 @@
 -		-e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf
 +		-e 's,@datadir\@,@datadir@,g;' <tntnet/tntnet.conf.in >tntnet/tntnet.conf.sample
  
--init.d/tntnet: init.d/tntnet.in Makefile
-+tntnet/tntnet: init.d/tntnet.in Makefile
+-init.d/tntnet: init.d/tntnet.in
++tntnet/tntnet: init.d/tntnet.in
  	sed -e 's,@libdir\@,@libdir@,g;' \
  	    -e 's,@pkglibdir\@,@pkglibdir@,g;' \
  	    -e 's,@sysconfdir\@,@sysconfdir@,g;' \
@@ -98,11 +99,11 @@
 +	    -e 's/^function //;' \
 +		-e 's,@datadir\@,@datadir@,g;' <init.d/tntnet.in >tntnet/tntnet
  
--tntnet/tntnet.properties: Makefile
-+tntnet/tntnet.properties.sample: Makefile
- 	cxxtools-config --logfile @localstatedir@/log/tntnet/tntnet.log --properties tntnet >$@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+-tntnet/tntnet.properties:
++tntnet/tntnet.properties.sample:
+ 	../tntnet-config --properties tntnet | \
+ 		sed -e 's,^#file=tntnet.log,file=@localstatedir@/log/tntnet/tntnet.log,' >$@
+ 
 --- a/etc/tntnet/tntnet.conf.in
 +++ b/etc/tntnet/tntnet.conf.in
 @@ -2,12 +2,15 @@
diff --git a/www/tntnet/files/patch-sdk-demos-calc-Makefile.in b/www/tntnet/files/patch-sdk-demos-calc-Makefile.in
deleted file mode 100644
index 12edb70baa2c..000000000000
--- a/www/tntnet/files/patch-sdk-demos-calc-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/sdk/demos/calc/Makefile.in
-+++ b/sdk/demos/calc/Makefile.in
-@@ -467,7 +467,7 @@ info: info-am
- 
- info-am:
- 
--install-data-am: install-docDATA
-+install-data-am: #install-docDATA
- 
- install-exec-am: install-pkglibLTLIBRARIES
- 
diff --git a/www/tntnet/pkg-plist b/www/tntnet/pkg-plist
index 90e11f98e1be..7f74eaf591f2 100644
--- a/www/tntnet/pkg-plist
+++ b/www/tntnet/pkg-plist
@@ -13,10 +13,13 @@ bin/tntnet-config
 @unexec if cmp -s %D/etc/tntnet/tntnet.properties.sample %D/etc/tntnet/tntnet.properties; then rm -f %D/etc/tntnet/tntnet.properties; fi
 %%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/cmd.h
 include/tnt/compident.h
 include/tnt/comploader.h
 include/tnt/component.h
 include/tnt/componentfactory.h
+include/tnt/configurator.h
 include/tnt/contentdisposition.h
 include/tnt/contenttype.h
 include/tnt/convert.h
@@ -34,10 +37,10 @@ include/tnt/httpmessage.h
 include/tnt/httpparser.h
 include/tnt/httpreply.h
 include/tnt/httprequest.h
-include/tnt/inflatestream.h
 include/tnt/job.h
 include/tnt/langlib.h
 include/tnt/maptarget.h
+include/tnt/mbcomponent.h
 include/tnt/messageattribute.h
 include/tnt/messageheader.h
 include/tnt/messageheaderparser.h
@@ -46,14 +49,16 @@ include/tnt/multipart.h
 include/tnt/object.h
 include/tnt/parser.h
 include/tnt/poller.h
+include/tnt/process.h
 include/tnt/query_params.h
-include/tnt/regex.h
 include/tnt/savepoint.h
 include/tnt/scope.h
 include/tnt/scopemanager.h
 include/tnt/sessionscope.h
-include/tnt/sodata.h
+include/tnt/sessionunlocker.h
+include/tnt/socketif.h
 include/tnt/stringlessignorecase.h
+include/tnt/threadcontext.h
 include/tnt/tntconfig.h
 include/tnt/tntnet.h
 include/tnt/unzipfile.h
@@ -61,55 +66,43 @@ include/tnt/urlescostream.h
 include/tnt/urlmapper.h
 include/tnt/worker.h
 include/tnt/zdata.h
-lib/libtntnet.a
 lib/libtntnet.la
 lib/libtntnet.so
-lib/libtntnet.so.8
+lib/libtntnet.so.9
 lib/libtntnet_cgi.a
 lib/libtntnet_cgi.la
 lib/libtntnet_cgi.so
-lib/libtntnet_cgi.so.8
-lib/libtntnet_sdk.a
+lib/libtntnet_cgi.so.9
 lib/libtntnet_sdk.la
 lib/libtntnet_sdk.so
-lib/libtntnet_sdk.so.8
-lib/tntnet/alldemos.a
+lib/libtntnet_sdk.so.9
 lib/tntnet/alldemos.la
 lib/tntnet/alldemos.so
 lib/tntnet/alldemos.so.0
-lib/tntnet/calc.a
 lib/tntnet/calc.la
 lib/tntnet/calc.so
 lib/tntnet/calc.so.0
-lib/tntnet/calcajax.a
 lib/tntnet/calcajax.la
 lib/tntnet/calcajax.so
 lib/tntnet/calcajax.so.0
-lib/tntnet/calci18n.a
 lib/tntnet/calci18n.la
 lib/tntnet/calci18n.so
 lib/tntnet/calci18n.so.0
-lib/tntnet/calcmvc.a
 lib/tntnet/calcmvc.la
 lib/tntnet/calcmvc.so
 lib/tntnet/calcmvc.so.0
-lib/tntnet/chat.a
 lib/tntnet/chat.la
 lib/tntnet/chat.so
 lib/tntnet/chat.so.0
-lib/tntnet/comp.a
 lib/tntnet/comp.la
 lib/tntnet/comp.so
 lib/tntnet/comp.so.0
-lib/tntnet/config.a
 lib/tntnet/config.la
 lib/tntnet/config.so
 lib/tntnet/config.so.0
-lib/tntnet/controls.a
 lib/tntnet/controls.la
 lib/tntnet/controls.so
 lib/tntnet/controls.so.0
-lib/tntnet/cookie.a
 lib/tntnet/cookie.la
 lib/tntnet/cookie.so
 lib/tntnet/cookie.so.0
@@ -117,31 +110,27 @@ lib/tntnet/extlib.a
 lib/tntnet/extlib.la
 lib/tntnet/extlib.so
 lib/tntnet/extlib.so.0
-lib/tntnet/hello.a
 lib/tntnet/hello.la
 lib/tntnet/hello.so
 lib/tntnet/hello.so.0
-lib/tntnet/savepoint.a
+lib/tntnet/message.la
+lib/tntnet/message.so
+lib/tntnet/message.so.0
 lib/tntnet/savepoint.la
 lib/tntnet/savepoint.so
 lib/tntnet/savepoint.so.0
-lib/tntnet/session.a
 lib/tntnet/session.la
 lib/tntnet/session.so
 lib/tntnet/session.so.0
-lib/tntnet/sprintf.a
 lib/tntnet/sprintf.la
 lib/tntnet/sprintf.so
 lib/tntnet/sprintf.so.0
-lib/tntnet/strings.a
 lib/tntnet/strings.la
 lib/tntnet/strings.so
 lib/tntnet/strings.so.0
-lib/tntnet/tntnet.a
 lib/tntnet/tntnet.la
 lib/tntnet/tntnet.so
-lib/tntnet/tntnet.so.8
-lib/tntnet/upload.a
+lib/tntnet/tntnet.so.9
 lib/tntnet/upload.la
 lib/tntnet/upload.so
 lib/tntnet/upload.so.0