- Update to 1.5.0

3 files changed, 143 insertions, 90 deletions

diff --git a/www/roundup/Makefile b/www/roundup/Makefile
index b23df0c3fa6c..d1795c2cf287 100644
--- a/www/roundup/Makefile
+++ b/www/roundup/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	roundup
-PORTVERSION=	1.4.21
+PORTVERSION=	1.5.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 
@@ -25,11 +25,11 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 .endif
 
 .if ${PORT_OPTIONS:MPGSQL}
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/psycopgmodule.so:${PORTSDIR}/databases/py-psycopg
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPRREFIX}psycopg>0:${PORTSDIR}/databases/py-psycopg
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}MySQLdb>0:${PORTSDIR}/databases/py-MySQLdb
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
diff --git a/www/roundup/distinfo b/www/roundup/distinfo
index 2aa23a3fa4dd..ee72b34dc019 100644
--- a/www/roundup/distinfo
+++ b/www/roundup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (roundup-1.4.21.tar.gz) = 3cb940e7e9063f8c821952796eee3997a8fd944bf570025ccc9a02e19c9ab644
-SIZE (roundup-1.4.21.tar.gz) = 2460371
+SHA256 (roundup-1.5.0.tar.gz) = 45ab9d3d92ff4ad7f1bb7ac561df43ca3c7e07129caab0dea810aa508f047be7
+SIZE (roundup-1.5.0.tar.gz) = 2388893
diff --git a/www/roundup/pkg-plist b/www/roundup/pkg-plist
index 385aabf64c95..32f9c5eb58da 100644
--- a/www/roundup/pkg-plist
+++ b/www/roundup/pkg-plist
@@ -95,12 +95,9 @@ man/man1/roundup-server.1.gz
 %%PYTHON_SITELIBDIR%%/roundup/backends/tsearch2_setup.py
 %%PYTHON_SITELIBDIR%%/roundup/backends/tsearch2_setup.pyc
 %%PYTHON_SITELIBDIR%%/roundup/backends/tsearch2_setup.pyo
-%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_zopetal.py
-%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_zopetal.pyc
-%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_zopetal.pyo
-%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_chameleon.py
-%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_chameleon.pyc
-%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_chameleon.pyo
+%%PYTHON_SITELIBDIR%%/roundup/cgi/KeywordsExpr.py
+%%PYTHON_SITELIBDIR%%/roundup/cgi/KeywordsExpr.pyc
+%%PYTHON_SITELIBDIR%%/roundup/cgi/KeywordsExpr.pyo
 %%PYTHON_SITELIBDIR%%/roundup/cgi/PageTemplates/Expressions.py
 %%PYTHON_SITELIBDIR%%/roundup/cgi/PageTemplates/Expressions.pyc
 %%PYTHON_SITELIBDIR%%/roundup/cgi/PageTemplates/Expressions.pyo
@@ -191,6 +188,15 @@ man/man1/roundup-server.1.gz
 %%PYTHON_SITELIBDIR%%/roundup/cgi/client.py
 %%PYTHON_SITELIBDIR%%/roundup/cgi/client.pyc
 %%PYTHON_SITELIBDIR%%/roundup/cgi/client.pyo
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_chameleon.py
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_chameleon.pyc
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_chameleon.pyo
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_jinja2.py
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_jinja2.pyc
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_jinja2.pyo
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_zopetal.py
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_zopetal.pyc
+%%PYTHON_SITELIBDIR%%/roundup/cgi/engine_zopetal.pyo
 %%PYTHON_SITELIBDIR%%/roundup/cgi/exceptions.py
 %%PYTHON_SITELIBDIR%%/roundup/cgi/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/roundup/cgi/exceptions.pyo
@@ -203,9 +209,6 @@ man/man1/roundup-server.1.gz
 %%PYTHON_SITELIBDIR%%/roundup/cgi/wsgi_handler.py
 %%PYTHON_SITELIBDIR%%/roundup/cgi/wsgi_handler.pyc
 %%PYTHON_SITELIBDIR%%/roundup/cgi/wsgi_handler.pyo
-%%PYTHON_SITELIBDIR%%/roundup/cgi/KeywordsExpr.py
-%%PYTHON_SITELIBDIR%%/roundup/cgi/KeywordsExpr.pyc
-%%PYTHON_SITELIBDIR%%/roundup/cgi/KeywordsExpr.pyo
 %%PYTHON_SITELIBDIR%%/roundup/configuration.py
 %%PYTHON_SITELIBDIR%%/roundup/configuration.pyc
 %%PYTHON_SITELIBDIR%%/roundup/configuration.pyo
@@ -343,71 +346,113 @@ man/man1/roundup-server.1.gz
 %%DATADIR%%/templates/classic/html/user_utils.js
 %%DATADIR%%/templates/classic/initial_data.py
 %%DATADIR%%/templates/classic/schema.py
-%%DATADIR%%/templates/devel/detectors/userauditor.py
+%%DATADIR%%/templates/devel/TEMPLATE-INFO.txt
+%%DATADIR%%/templates/devel/config.ini
+%%DATADIR%%/templates/devel/detectors/messagesummary.py
 %%DATADIR%%/templates/devel/detectors/no_texthtml.py
 %%DATADIR%%/templates/devel/detectors/nosyreaction.py
+%%DATADIR%%/templates/devel/detectors/patches.py
 %%DATADIR%%/templates/devel/detectors/severityauditor.py
-%%DATADIR%%/templates/devel/detectors/messagesummary.py
 %%DATADIR%%/templates/devel/detectors/statusauditor.py
-%%DATADIR%%/templates/devel/detectors/patches.py
-%%DATADIR%%/templates/devel/html/user_utils.js
-%%DATADIR%%/templates/devel/html/style.css
+%%DATADIR%%/templates/devel/detectors/userauditor.py
+%%DATADIR%%/templates/devel/extensions/local_replace.py
+%%DATADIR%%/templates/devel/extensions/spambayes.py
+%%DATADIR%%/templates/devel/extensions/timestamp.py
+%%DATADIR%%/templates/devel/extensions/timezone.py
+%%DATADIR%%/templates/devel/html/_generic.404.html
+%%DATADIR%%/templates/devel/html/_generic.calendar.html
+%%DATADIR%%/templates/devel/html/_generic.collision.html
+%%DATADIR%%/templates/devel/html/_generic.help-empty.html
+%%DATADIR%%/templates/devel/html/_generic.help-list.html
+%%DATADIR%%/templates/devel/html/_generic.help-search.html
 %%DATADIR%%/templates/devel/html/_generic.help-submit.html
+%%DATADIR%%/templates/devel/html/_generic.help.html
+%%DATADIR%%/templates/devel/html/_generic.index.html
+%%DATADIR%%/templates/devel/html/_generic.item.html
+%%DATADIR%%/templates/devel/html/_generic.keywords_expr.html
+%%DATADIR%%/templates/devel/html/_generic.query.html
+%%DATADIR%%/templates/devel/html/bug.index.html
 %%DATADIR%%/templates/devel/html/bug.item.html
-%%DATADIR%%/templates/devel/html/keyword.item.html
+%%DATADIR%%/templates/devel/html/bug.search.html
+%%DATADIR%%/templates/devel/html/favicon.ico
+%%DATADIR%%/templates/devel/html/file.index.html
 %%DATADIR%%/templates/devel/html/file.item.html
+%%DATADIR%%/templates/devel/html/help.css
+%%DATADIR%%/templates/devel/html/help.html
+%%DATADIR%%/templates/devel/html/help_controls.js
+%%DATADIR%%/templates/devel/html/home.classlist.html
+%%DATADIR%%/templates/devel/html/home.html
+%%DATADIR%%/templates/devel/html/jquery.js
 %%DATADIR%%/templates/devel/html/keyword.index.html
-%%DATADIR%%/templates/devel/html/user.index.html
-%%DATADIR%%/templates/devel/html/user.help.html
+%%DATADIR%%/templates/devel/html/keyword.item.html
 %%DATADIR%%/templates/devel/html/milestone.index.html
-%%DATADIR%%/templates/devel/html/jquery.js
-%%DATADIR%%/templates/devel/html/_generic.collision.html
-%%DATADIR%%/templates/devel/html/query.js
-%%DATADIR%%/templates/devel/html/home.classlist.html
-%%DATADIR%%/templates/devel/html/_generic.index.html
-%%DATADIR%%/templates/devel/html/_generic.help.html
-%%DATADIR%%/templates/devel/html/_generic.help-empty.html
+%%DATADIR%%/templates/devel/html/milestone.item.html
+%%DATADIR%%/templates/devel/html/msg.index.html
+%%DATADIR%%/templates/devel/html/msg.item.html
 %%DATADIR%%/templates/devel/html/page.html
-%%DATADIR%%/templates/devel/html/task.search.html
-%%DATADIR%%/templates/devel/html/_generic.item.html
-%%DATADIR%%/templates/devel/html/home.html
-%%DATADIR%%/templates/devel/html/_generic.query.html
-%%DATADIR%%/templates/devel/html/user.rego_progress.html
-%%DATADIR%%/templates/devel/html/bug.index.html
+%%DATADIR%%/templates/devel/html/patch.index.html
+%%DATADIR%%/templates/devel/html/patch.item.html
 %%DATADIR%%/templates/devel/html/query.edit.html
 %%DATADIR%%/templates/devel/html/query.html
 %%DATADIR%%/templates/devel/html/query.item.html
-%%DATADIR%%/templates/devel/html/help.css
-%%DATADIR%%/templates/devel/html/_generic.help-list.html
+%%DATADIR%%/templates/devel/html/query.js
+%%DATADIR%%/templates/devel/html/style.css
+%%DATADIR%%/templates/devel/html/task.index.html
+%%DATADIR%%/templates/devel/html/task.item.html
+%%DATADIR%%/templates/devel/html/task.search.html
 %%DATADIR%%/templates/devel/html/tracker.css
-%%DATADIR%%/templates/devel/html/user.register.html
-%%DATADIR%%/templates/devel/html/msg.item.html
-%%DATADIR%%/templates/devel/html/msg.index.html
 %%DATADIR%%/templates/devel/html/user.forgotten.html
-%%DATADIR%%/templates/devel/html/milestone.item.html
-%%DATADIR%%/templates/devel/html/patch.item.html
-%%DATADIR%%/templates/devel/html/help_controls.js
 %%DATADIR%%/templates/devel/html/user.help-search.html
-%%DATADIR%%/templates/devel/html/file.index.html
-%%DATADIR%%/templates/devel/html/task.item.html
-%%DATADIR%%/templates/devel/html/task.index.html
-%%DATADIR%%/templates/devel/html/_generic.help-search.html
-%%DATADIR%%/templates/devel/html/_generic.calendar.html
-%%DATADIR%%/templates/devel/html/favicon.ico
+%%DATADIR%%/templates/devel/html/user.help.html
+%%DATADIR%%/templates/devel/html/user.index.html
 %%DATADIR%%/templates/devel/html/user.item.html
-%%DATADIR%%/templates/devel/html/_generic.keywords_expr.html
-%%DATADIR%%/templates/devel/html/bug.search.html
-%%DATADIR%%/templates/devel/html/help.html
-%%DATADIR%%/templates/devel/html/_generic.404.html
-%%DATADIR%%/templates/devel/html/patch.index.html
-%%DATADIR%%/templates/devel/config.ini
+%%DATADIR%%/templates/devel/html/user.register.html
+%%DATADIR%%/templates/devel/html/user.rego_progress.html
+%%DATADIR%%/templates/devel/html/user_utils.js
 %%DATADIR%%/templates/devel/initial_data.py
-%%DATADIR%%/templates/devel/TEMPLATE-INFO.txt
-%%DATADIR%%/templates/devel/extensions/local_replace.py
-%%DATADIR%%/templates/devel/extensions/spambayes.py
-%%DATADIR%%/templates/devel/extensions/timestamp.py
-%%DATADIR%%/templates/devel/extensions/timezone.py
 %%DATADIR%%/templates/devel/schema.py
+%%DATADIR%%/templates/jinja2/TEMPLATE-INFO.txt
+%%DATADIR%%/templates/jinja2/config.ini
+%%DATADIR%%/templates/jinja2/detectors/messagesummary.py
+%%DATADIR%%/templates/jinja2/detectors/nosyreaction.py
+%%DATADIR%%/templates/jinja2/detectors/statusauditor.py
+%%DATADIR%%/templates/jinja2/detectors/userauditor.py
+%%DATADIR%%/templates/jinja2/html/_generic.404.html
+%%DATADIR%%/templates/jinja2/html/_generic.collision.html
+%%DATADIR%%/templates/jinja2/html/_generic.help-empty.html
+%%DATADIR%%/templates/jinja2/html/_generic.index.html
+%%DATADIR%%/templates/jinja2/html/file.index.html
+%%DATADIR%%/templates/jinja2/html/file.item.html
+%%DATADIR%%/templates/jinja2/html/home.classlist.html
+%%DATADIR%%/templates/jinja2/html/home.html
+%%DATADIR%%/templates/jinja2/html/issue.index.html
+%%DATADIR%%/templates/jinja2/html/issue.item.edit.html
+%%DATADIR%%/templates/jinja2/html/issue.item.html
+%%DATADIR%%/templates/jinja2/html/issue.item.readonly.html
+%%DATADIR%%/templates/jinja2/html/keyword.item.html
+%%DATADIR%%/templates/jinja2/html/layout/banner.html
+%%DATADIR%%/templates/jinja2/html/layout/footer.html
+%%DATADIR%%/templates/jinja2/html/layout/navigation.html
+%%DATADIR%%/templates/jinja2/html/layout/page.html
+%%DATADIR%%/templates/jinja2/html/layout/pagination.html
+%%DATADIR%%/templates/jinja2/html/layout/permission.html
+%%DATADIR%%/templates/jinja2/html/layout/sort.html
+%%DATADIR%%/templates/jinja2/html/msg.index.html
+%%DATADIR%%/templates/jinja2/html/msg.item.html
+%%DATADIR%%/templates/jinja2/html/user.forgotten.html
+%%DATADIR%%/templates/jinja2/html/user.index.html
+%%DATADIR%%/templates/jinja2/html/user.item.html
+%%DATADIR%%/templates/jinja2/html/user.register.html
+%%DATADIR%%/templates/jinja2/html/user.rego_progress.html
+%%DATADIR%%/templates/jinja2/initial_data.py
+%%DATADIR%%/templates/jinja2/schema.py
+%%DATADIR%%/templates/jinja2/static/bootstrap-responsive.min.css
+%%DATADIR%%/templates/jinja2/static/bootstrap.min.css
+%%DATADIR%%/templates/jinja2/static/bootstrap.min.js
+%%DATADIR%%/templates/jinja2/static/glyphicons-halflings-white.png
+%%DATADIR%%/templates/jinja2/static/glyphicons-halflings.png
+%%DATADIR%%/templates/jinja2/static/jquery-1.9.0.min.js
+%%DATADIR%%/templates/jinja2/static/style.css
 %%DATADIR%%/templates/minimal/TEMPLATE-INFO.txt
 %%DATADIR%%/templates/minimal/detectors/userauditor.py
 %%DATADIR%%/templates/minimal/extensions/README.txt
@@ -492,39 +537,47 @@ man/man1/roundup-server.1.gz
 %%DATADIR%%/templates/responsive/html/bug.index.html
 %%DATADIR%%/templates/responsive/static/glyphicons-halflings-white.png
 %%DATADIR%%/templates/responsive/static/bootstrap.min.css
-%%DATADIR%%/templates/responsive/static/UbuntuMono-Regular.ttf
 %%DATADIR%%/templates/responsive/static/glyphicons-halflings.png
 %%DATADIR%%/templates/responsive/static/bootstrap-responsive.min.css
-%%DATADIR%%/templates/responsive/static/DroidSans.ttf
 %%DATADIR%%/templates/responsive/static/style.css
-@dirrm %%DATADIR%%/templates/responsive/static
-@dirrm %%DATADIR%%/templates/responsive/html
-@dirrm %%DATADIR%%/templates/responsive/extensions
-@dirrm %%DATADIR%%/templates/responsive/detectors
-@dirrm %%DATADIR%%/templates/responsive
+@dirrmtry %%DATADIR%%/templates/responsive/static
+@dirrmtry %%DATADIR%%/templates/responsive/html/layout
+@dirrmtry %%DATADIR%%/templates/responsive/html
+@dirrmtry %%DATADIR%%/templates/responsive/extensions
+@dirrmtry %%DATADIR%%/templates/responsive/detectors
+@dirrmtry %%DATADIR%%/templates/responsive
 @dirrmtry %%DATADIR%%/templates/minimal/static
-@dirrm %%DATADIR%%/templates/minimal/html
-@dirrm %%DATADIR%%/templates/minimal/extensions
-@dirrm %%DATADIR%%/templates/minimal/detectors
-@dirrm %%DATADIR%%/templates/minimal
+@dirrmtry %%DATADIR%%/templates/minimal/html/layout
+@dirrmtry %%DATADIR%%/templates/minimal/html
+@dirrmtry %%DATADIR%%/templates/minimal/extensions
+@dirrmtry %%DATADIR%%/templates/minimal/detectors
+@dirrmtry %%DATADIR%%/templates/minimal
+@dirrmtry %%DATADIR%%/templates/jinja2/static
+@dirrmtry %%DATADIR%%/templates/jinja2/html/layout
+@dirrmtry %%DATADIR%%/templates/jinja2/html
+@dirrmtry %%DATADIR%%/templates/jinja2/extensions
+@dirrmtry %%DATADIR%%/templates/jinja2/detectors
+@dirrmtry %%DATADIR%%/templates/jinja2
 @dirrmtry %%DATADIR%%/templates/devel/static
-@dirrm %%DATADIR%%/templates/devel/html
-@dirrm %%DATADIR%%/templates/devel/detectors
-@dirrm %%DATADIR%%/templates/devel/extensions
-@dirrm %%DATADIR%%/templates/devel
+@dirrmtry %%DATADIR%%/templates/devel/html/layout
+@dirrmtry %%DATADIR%%/templates/devel/html
+@dirrmtry %%DATADIR%%/templates/devel/extensions
+@dirrmtry %%DATADIR%%/templates/devel/detectors
+@dirrmtry %%DATADIR%%/templates/devel
 @dirrmtry %%DATADIR%%/templates/classic/static
-@dirrm %%DATADIR%%/templates/classic/html
-@dirrm %%DATADIR%%/templates/classic/extensions
-@dirrm %%DATADIR%%/templates/classic/detectors
-@dirrm %%DATADIR%%/templates/classic
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/cgi-bin
-@dirrm %%DATADIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/roundup/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi/ZTUtils
-@dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi/TAL
-@dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi/PageTemplates
-@dirrm %%PYTHON_SITELIBDIR%%/roundup/cgi
-@dirrm %%PYTHON_SITELIBDIR%%/roundup/backends
-@dirrm %%PYTHON_SITELIBDIR%%/roundup/anypy
-@dirrm %%PYTHON_SITELIBDIR%%/roundup
+@dirrmtry %%DATADIR%%/templates/classic/html/layout
+@dirrmtry %%DATADIR%%/templates/classic/html
+@dirrmtry %%DATADIR%%/templates/classic/extensions
+@dirrmtry %%DATADIR%%/templates/classic/detectors
+@dirrmtry %%DATADIR%%/templates/classic
+@dirrmtry %%DATADIR%%/templates
+@dirrmtry %%DATADIR%%/cgi-bin
+@dirrmtry %%DATADIR%%
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup/scripts
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup/cgi/ZTUtils
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup/cgi/TAL
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup/cgi/PageTemplates
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup/cgi
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup/backends
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup/anypy
+@dirrmtry %%PYTHON_SITELIBDIR%%/roundup