Update to 1.20

PR:		73266
Submitted by:	Gregory Bond <gnb@itga.com.au>

3 files changed, 73 insertions, 50 deletions

diff --git a/www/py-albatross/Makefile b/www/py-albatross/Makefile
index 2265c2e1927..7befb3b700f 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	albatross
-PORTVERSION=	1.11
+PORTVERSION=	1.20
 CATEGORIES=	www python
 MASTER_SITES=	http://object-craft.com.au/projects/albatross/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-albatross/distinfo b/www/py-albatross/distinfo
index 031bcd4cb15..f95ef1c6666 100644
--- a/www/py-albatross/distinfo
+++ b/www/py-albatross/distinfo
@@ -1,4 +1,4 @@
-MD5 (albatross-1.11.tar.gz) = b5a70a1abb468326d79c5a1b4861d030
-SIZE (albatross-1.11.tar.gz) = 236142
-MD5 (albatross-html-1.11.tar.gz) = 326588b7e981d57e13adeeb1ad3dec03
-SIZE (albatross-html-1.11.tar.gz) = 477269
+MD5 (albatross-1.20.tar.gz) = 64c9e7357e51f85d228f17b2ea7ef9c9
+SIZE (albatross-1.20.tar.gz) = 256090
+MD5 (albatross-html-1.20.tar.gz) = 225a495eb6239350fa87b7ee4b264744
+SIZE (albatross-html-1.20.tar.gz) = 511384
diff --git a/www/py-albatross/pkg-plist b/www/py-albatross/pkg-plist
index 873931ee56e..309bd701796 100644
--- a/www/py-albatross/pkg-plist
+++ b/www/py-albatross/pkg-plist
@@ -9,6 +9,9 @@ bin/al-httpd
 %%PYTHON_SITELIBDIR%%/albatross/app.py
 %%PYTHON_SITELIBDIR%%/albatross/app.pyc
 %%PYTHON_SITELIBDIR%%/albatross/app.pyo
+%%PYTHON_SITELIBDIR%%/albatross/branchingsession.py
+%%PYTHON_SITELIBDIR%%/albatross/branchingsession.pyc
+%%PYTHON_SITELIBDIR%%/albatross/branchingsession.pyo
 %%PYTHON_SITELIBDIR%%/albatross/cgiapp.py
 %%PYTHON_SITELIBDIR%%/albatross/cgiapp.pyc
 %%PYTHON_SITELIBDIR%%/albatross/cgiapp.pyo
@@ -30,6 +33,9 @@ bin/al-httpd
 %%PYTHON_SITELIBDIR%%/albatross/randompage.py
 %%PYTHON_SITELIBDIR%%/albatross/randompage.pyc
 %%PYTHON_SITELIBDIR%%/albatross/randompage.pyo
+%%PYTHON_SITELIBDIR%%/albatross/request.py
+%%PYTHON_SITELIBDIR%%/albatross/request.pyc
+%%PYTHON_SITELIBDIR%%/albatross/request.pyo
 %%PYTHON_SITELIBDIR%%/albatross/session.py
 %%PYTHON_SITELIBDIR%%/albatross/session.pyc
 %%PYTHON_SITELIBDIR%%/albatross/session.pyo
@@ -54,39 +60,12 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/appcontext.dia
 %%PORTDOCS%%%%DOCSDIR%%/application.dia
 %%PORTDOCS%%%%DOCSDIR%%/appuser.tex
+%%PORTDOCS%%%%DOCSDIR%%/branchingsessioncontext.dia
 %%PORTDOCS%%%%DOCSDIR%%/changes.tex
 %%PORTDOCS%%%%DOCSDIR%%/copyright.tex
 %%PORTDOCS%%%%DOCSDIR%%/customtags.tex
 %%PORTDOCS%%%%DOCSDIR%%/dataflow.dia
 %%PORTDOCS%%%%DOCSDIR%%/doc_methods.py
-%%PORTDOCS%%%%DOCSDIR%%/fakeapp.py
-%%PORTDOCS%%%%DOCSDIR%%/installation.tex
-%%PORTDOCS%%%%DOCSDIR%%/introduction.tex
-%%PORTDOCS%%%%DOCSDIR%%/mixins.tex
-%%PORTDOCS%%%%DOCSDIR%%/modularapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/modularsessapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/modularsessfileapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/mvc.dia
-%%PORTDOCS%%%%DOCSDIR%%/packaged.tex
-%%PORTDOCS%%%%DOCSDIR%%/pagemap.dia
-%%PORTDOCS%%%%DOCSDIR%%/pstumble
-%%PORTDOCS%%%%DOCSDIR%%/randmodapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/randmodsessapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/randmodsessfileapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/sessionappcontext.dia
-%%PORTDOCS%%%%DOCSDIR%%/sessionfileappcontext.dia
-%%PORTDOCS%%%%DOCSDIR%%/simpleapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/simpleappcontext.dia
-%%PORTDOCS%%%%DOCSDIR%%/simplecontext.dia
-%%PORTDOCS%%%%DOCSDIR%%/simplesessapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/simplesessfileapp.dia
-%%PORTDOCS%%%%DOCSDIR%%/tags.tex
-%%PORTDOCS%%%%DOCSDIR%%/tempuser.tex
-%%PORTDOCS%%%%DOCSDIR%%/test_examples.py
-%%PORTDOCS%%%%DOCSDIR%%/thanks.tex
-%%PORTDOCS%%%%DOCSDIR%%/toolkit.dia
-%%PORTDOCS%%%%DOCSDIR%%/twolayer.dia
-%%PORTDOCS%%%%DOCSDIR%%/twolayerctx.dia
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-a1
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-a2
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-a3
@@ -148,6 +127,7 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/doctest/templ-white3
 %%PORTDOCS%%%%DOCSDIR%%/doctest/templ-white4
 %%PORTDOCS%%%%DOCSDIR%%/doctest/templ-white5
+%%PORTDOCS%%%%DOCSDIR%%/fakeapp.py
 %%PORTDOCS%%%%DOCSDIR%%/html/about.html
 %%PORTDOCS%%%%DOCSDIR%%/html/albatross.css
 %%PORTDOCS%%%%DOCSDIR%%/html/albatross.html
@@ -196,6 +176,21 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/front.html
 %%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/grammar.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/blank.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/blank.png
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/contents.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/contents.png
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/index.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/index.png
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/modules.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/modules.png
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/next.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/next.png
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/previous.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/previous.png
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/pyfav.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/up.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/up.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img1.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img10.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img11.png
@@ -213,6 +208,7 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/img22.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img23.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img24.png
+%%PORTDOCS%%%%DOCSDIR%%/html/img25.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img3.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img4.png
 %%PORTDOCS%%%%DOCSDIR%%/html/img5.png
@@ -240,6 +236,7 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/mixin-app-file-sess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mixin-app-sess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mixin-appsession.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mixin-ctx-branching-sess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mixin-ctx-file-sess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mixin-ctx-sess.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mixin-ctxsession.html
@@ -272,7 +269,10 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/other-html.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/other.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/pack-app.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pack-appclasses.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pack-appcontext.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pack-branchingsesscontext.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pack-contextclasses.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pack-modularapp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pack-modularsessapp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pack-modularsessfileapp.html
@@ -330,6 +330,18 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/rel-1.11-servername.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rel-1.11-xhtml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rel-1.11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-branchingsession.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-bug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-cookiefixes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-fixredirecturl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-pagemodule.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-refactorrequest.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-reqequalsimgmap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-requeststatus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-responseheadercase.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20-responsemultiheader.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.20.html
 %%PORTDOCS%%%%DOCSDIR%%/html/simple-2.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/simple-3.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/simple-4.txt
@@ -525,21 +537,32 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tug-white.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tug-zeromacro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/up.png
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/blank.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/blank.png
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/contents.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/contents.png
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/index.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/index.png
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/modules.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/modules.png
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/next.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/next.png
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/previous.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/previous.png
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/pyfav.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/up.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/icons/up.png
+%%PORTDOCS%%%%DOCSDIR%%/installation.tex
+%%PORTDOCS%%%%DOCSDIR%%/introduction.tex
+%%PORTDOCS%%%%DOCSDIR%%/mixins.tex
+%%PORTDOCS%%%%DOCSDIR%%/modularapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/modularsessapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/modularsessfileapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/mvc.dia
+%%PORTDOCS%%%%DOCSDIR%%/packaged.tex
+%%PORTDOCS%%%%DOCSDIR%%/pagemap.dia
+%%PORTDOCS%%%%DOCSDIR%%/randmodapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/randmodsessapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/randmodsessfileapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/sessionappcontext.dia
+%%PORTDOCS%%%%DOCSDIR%%/sessionfileappcontext.dia
+%%PORTDOCS%%%%DOCSDIR%%/simpleapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/simpleappcontext.dia
+%%PORTDOCS%%%%DOCSDIR%%/simplecontext.dia
+%%PORTDOCS%%%%DOCSDIR%%/simplesessapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/simplesessfileapp.dia
+%%PORTDOCS%%%%DOCSDIR%%/tags.tex
+%%PORTDOCS%%%%DOCSDIR%%/tempuser.tex
+%%PORTDOCS%%%%DOCSDIR%%/test_examples.py
+%%PORTDOCS%%%%DOCSDIR%%/thanks.tex
+%%PORTDOCS%%%%DOCSDIR%%/toolkit.dia
+%%PORTDOCS%%%%DOCSDIR%%/twolayer.dia
+%%PORTDOCS%%%%DOCSDIR%%/twolayerctx.dia
 %%PORTDOCS%%share/examples/albatross/.cvsignore
 %%PORTDOCS%%share/examples/albatross/extension/.cvsignore
 %%PORTDOCS%%share/examples/albatross/extension/cal.html
@@ -608,12 +631,12 @@ bin/al-httpd
 %%PORTDOCS%%share/examples/albatross/popview5/popviewlib.py
 %%PORTDOCS%%share/examples/albatross/random/.cvsignore
 %%PORTDOCS%%share/examples/albatross/random/install.py
-%%PORTDOCS%%share/examples/albatross/random/randompage.py
-%%PORTDOCS%%share/examples/albatross/random/utils.py
 %%PORTDOCS%%share/examples/albatross/random/pages/paginate.html
 %%PORTDOCS%%share/examples/albatross/random/pages/paginate.py
 %%PORTDOCS%%share/examples/albatross/random/pages/tree.html
 %%PORTDOCS%%share/examples/albatross/random/pages/tree.py
+%%PORTDOCS%%share/examples/albatross/random/randompage.py
+%%PORTDOCS%%share/examples/albatross/random/utils.py
 %%PORTDOCS%%share/examples/albatross/sybase/.cvsignore
 %%PORTDOCS%%share/examples/albatross/sybase/htaccess
 %%PORTDOCS%%share/examples/albatross/sybase/install.py