3 files changed, 66 insertions, 9 deletions

diff --git a/www/py-albatross/Makefile b/www/py-albatross/Makefile
index c434f7750a12..cea30cf91599 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	albatross
-PORTVERSION=	1.33
+PORTVERSION=	1.36
 CATEGORIES=	www python
 MASTER_SITES=	http://object-craft.com.au/projects/albatross/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +22,7 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR} ${EXAMPLESDIR} ${DOCSDIR}/html
 	@${TAR} -cf - -C ${WRKSRC}/doc . | ${TAR} -xf - -C ${DOCSDIR}
-	@${TAR} -cf - -C ${WRKDIR}/albatross . | ${TAR} -xf - -C ${DOCSDIR}/html
+	@${TAR} -cf - -C ${WRKDIR}/albatross-html-$(PORTVERSION) . | ${TAR} -xf - -C ${DOCSDIR}/html
 	@${TAR} -cf - -C ${WRKSRC}/samples . | ${TAR} -xf - -C ${EXAMPLESDIR}
 .endif
 
diff --git a/www/py-albatross/distinfo b/www/py-albatross/distinfo
index f52814d3272b..52c08763e68b 100644
--- a/www/py-albatross/distinfo
+++ b/www/py-albatross/distinfo
@@ -1,6 +1,6 @@
-MD5 (albatross-1.33.tar.gz) = 2d9ef910b2e1c32a01bcb7e6dbd271a0
-SHA256 (albatross-1.33.tar.gz) = 34e62c62a3fab1146715ccc524660f3d5366e0316844c736f12539c296ab2bf0
-SIZE (albatross-1.33.tar.gz) = 265142
-MD5 (albatross-html-1.33.tar.gz) = 34b5951ff5a7cbf247dd94895df440d6
-SHA256 (albatross-html-1.33.tar.gz) = 790f50e4922c1087f1aa9dec84b55c7188ce8914ff79384536453a2c7b047acb
-SIZE (albatross-html-1.33.tar.gz) = 519660
+MD5 (albatross-1.36.tar.gz) = 7344c5564d87cbdc6f96ed00fbb19a91
+SHA256 (albatross-1.36.tar.gz) = 89994b31b57f5f258ac0ac57db7285f90bff8b82eaa22c778ef2b9a51c0542d2
+SIZE (albatross-1.36.tar.gz) = 289647
+MD5 (albatross-html-1.36.tar.gz) = d9bdc7695eaf637e3d5a56a076a8a8f3
+SHA256 (albatross-html-1.36.tar.gz) = 4735811ffa638c66f17aaf6350b9f02799e8d8d53a9f0dcefe89e46ba77507f3
+SIZE (albatross-html-1.36.tar.gz) = 589891
diff --git a/www/py-albatross/pkg-plist b/www/py-albatross/pkg-plist
index bfc559925454..9e6841235f7a 100644
--- a/www/py-albatross/pkg-plist
+++ b/www/py-albatross/pkg-plist
@@ -24,6 +24,12 @@ bin/al-httpd
 %%PYTHON_SITELIBDIR%%/albatross/fcgiapp.py
 %%PYTHON_SITELIBDIR%%/albatross/fcgiapp.pyc
 %%PYTHON_SITELIBDIR%%/albatross/fcgiapp.pyo
+%%PYTHON_SITELIBDIR%%/albatross/fcgiappold.py
+%%PYTHON_SITELIBDIR%%/albatross/fcgiappold.pyc
+%%PYTHON_SITELIBDIR%%/albatross/fcgiappold.pyo
+%%PYTHON_SITELIBDIR%%/albatross/fcgispawn.py
+%%PYTHON_SITELIBDIR%%/albatross/fcgispawn.pyc
+%%PYTHON_SITELIBDIR%%/albatross/fcgispawn.pyo
 %%PYTHON_SITELIBDIR%%/albatross/httpdapp.py
 %%PYTHON_SITELIBDIR%%/albatross/httpdapp.pyc
 %%PYTHON_SITELIBDIR%%/albatross/httpdapp.pyo
@@ -69,7 +75,9 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-a1
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-a2
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-a3
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-anytag-tr
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-comment
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-exception
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-exec1
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-exec2
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-flush
@@ -80,6 +88,8 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-for5
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-for6
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-for7
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-for8
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-for9
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-form-action
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-form-file
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-if1
@@ -104,6 +114,7 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-input-select3
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-input-select4
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-input-select5
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-input-select6
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-input-treeselect
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-input-treeselect-node
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-item
@@ -116,6 +127,9 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-macro6
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-macro7
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-macro8
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-macro9
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-macro10
+%%PORTDOCS%%%%DOCSDIR%%/doctest/tags-macro11
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-textarea1
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-textarea2
 %%PORTDOCS%%%%DOCSDIR%%/doctest/tags-value1
@@ -373,6 +387,34 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/rel-1.33.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rel-1.33-bug.html
 %%PORTDOCS%%%%DOCSDIR%%/html/rel-1.33-set-value.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-bug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-check-ext-tag.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-disabledbool.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-empty-anytag.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-fcgiappnew.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-new.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35-sess-srv-abort.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.35.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-alexpandargs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-alforiter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-alforvar.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-aloption.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-alsetdefault.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-bug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-envvars.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-fastcg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-fastcgifix.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-fixinputrec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-misc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-new.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-oldpython.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-reqmerge.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-sessclient.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-sha1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36-unittests.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rel-1.36.html
 %%PORTDOCS%%%%DOCSDIR%%/html/simple-2.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/simple-3.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/simple-4.txt
@@ -390,11 +432,14 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-a-page.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-a-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-a.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-any.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-comment.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-enhhtml.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-exec-expr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-exec.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-execflow.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-expand-arg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-expand-argexpr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-expand-name.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-expand.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-fakeapp.html
@@ -407,6 +452,7 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-for-listiter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-for-pagesize.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-for-prepare.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-for-vars.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-for.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-form-action.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-form-enctype.html
@@ -448,8 +494,10 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-macro-name.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-macro.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-macroproc.html
-%%PORTDOCS%%%%DOCSDIR%%/html/tag-option-selected.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-option-label.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-option-labelexpr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-option-value.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-option-valueexpr.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-option.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-ref.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-require.html
@@ -463,6 +511,8 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-select.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-setarg-name.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-setarg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-setdefault-name.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tag-setdefault.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-textarea-alias.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-textarea-list.html
 %%PORTDOCS%%%%DOCSDIR%%/html/tag-textarea-name.html
@@ -489,6 +539,7 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-a1.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-a2.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-a3.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tags-anytag-tr.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-comment.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-exec1.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-exec2.txt
@@ -500,6 +551,8 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-for5.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-for6.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-for7.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tags-for8.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tags-for9.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-form-action.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-form-file.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-if1.txt
@@ -524,6 +577,7 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-input-select3.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-input-select4.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-input-select5.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tags-input-select6.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-input-treeselect-node.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-input-treeselect.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-item.txt
@@ -536,6 +590,9 @@ bin/al-httpd
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-macro6.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-macro7.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-macro8.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tags-macro9.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tags-macro10.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/tags-macro11.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-textarea1.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-textarea2.txt
 %%PORTDOCS%%%%DOCSDIR%%/html/tags-value1.txt