3 files changed, 80 insertions, 77 deletions

diff --git a/www/py-GinGin/Makefile b/www/py-GinGin/Makefile
index 660ea742f162..1905cc8c2f79 100644
--- a/www/py-GinGin/Makefile
+++ b/www/py-GinGin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	GinGin
-PORTVERSION=	0.9.9
+PORTVERSION=	1.0.0
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A hybrid of WIKI and BLOG system
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/mez_xml/__init__.py:${PORTSDIR}/devel/py-mez_xml
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mez_xml/__init__.py:${PORTSDIR}/devel/py-mez_xml
+RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
diff --git a/www/py-GinGin/distinfo b/www/py-GinGin/distinfo
index 643709a64373..0be589ff7cbd 100644
--- a/www/py-GinGin/distinfo
+++ b/www/py-GinGin/distinfo
@@ -1,3 +1,3 @@
-MD5 (GinGin-0.9.9.tar.gz) = b422ee3e0391602feb281f4c05d34d40
-SHA256 (GinGin-0.9.9.tar.gz) = 8cda33215411990ea3737fc27b53d5d49c12d64f63f20265cab2e80b86ec3bb0
-SIZE (GinGin-0.9.9.tar.gz) = 58989
+MD5 (GinGin-1.0.0.tar.gz) = 6598bc008a00cfb668f603d9111926d7
+SHA256 (GinGin-1.0.0.tar.gz) = 31cd710ba6ce1ac6ef75154bba06778f3be7e9f8ed0d65f72dd861a4569c9d9f
+SIZE (GinGin-1.0.0.tar.gz) = 61266
diff --git a/www/py-GinGin/pkg-plist b/www/py-GinGin/pkg-plist
index d12499c773a4..f7845d1c65a3 100644
--- a/www/py-GinGin/pkg-plist
+++ b/www/py-GinGin/pkg-plist
@@ -1,73 +1,32 @@
 @comment $FreeBSD$
 bin/GinGin_host.py
 %%PYTHON_SITELIBDIR%%/GinGin/GinGin_CGI.py
+%%PYTHON_SITELIBDIR%%/GinGin/GinGin_CGI.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/GinGin_CGI.pyo
 %%PYTHON_SITELIBDIR%%/GinGin/GinGin_acts.py
+%%PYTHON_SITELIBDIR%%/GinGin/GinGin_acts.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/GinGin_acts.pyo
 %%PYTHON_SITELIBDIR%%/GinGin/GinGin_db.py
+%%PYTHON_SITELIBDIR%%/GinGin/GinGin_db.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/GinGin_db.pyo
 %%PYTHON_SITELIBDIR%%/GinGin/__init__.py
+%%PYTHON_SITELIBDIR%%/GinGin/__init__.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/__init__.pyo
 %%PYTHON_SITELIBDIR%%/GinGin/antispam.py
-%%PYTHON_SITELIBDIR%%/GinGin/html_template.py
-%%PYTHON_SITELIBDIR%%/GinGin/represent.py
-%%PYTHON_SITELIBDIR%%/GinGin/tools.py
-%%PYTHON_SITELIBDIR%%/GinGin/user.py
-%%PYTHON_SITELIBDIR%%/GinGin/xml_template.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/__init__.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/all_kws.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/attaches.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/comment.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/doc.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/edit.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/edit_url.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/error_page.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/gingin.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/keyword.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/kw_urls.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/last_comments.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/rssfeed.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_ping_err.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_rss.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_view.py
-%%PYTHON_SITELIBDIR%%/GinGin/templates/__init__.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/all_kws.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/attaches.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/comment.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/doc.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/edit.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/edit_url.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/error_page.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/gingin.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/keyword.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/kw_urls.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/last_comments.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/rssfeed.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_ping_err.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_rss.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_view.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/templates/__init__.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/all_kws.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/attaches.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/comment.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/doc.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/edit.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/edit_url.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/error_page.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/gingin.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/keyword.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/kw_urls.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/last_comments.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/rssfeed.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_ping_err.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_rss.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_view.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/antispam.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/antispam.pyo
 %%PYTHON_SITELIBDIR%%/GinGin/data/GinGin.sql
 %%PYTHON_SITELIBDIR%%/GinGin/data/GinGin_CGI.py
+%%PYTHON_SITELIBDIR%%/GinGin/data/GinGin_CGI.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/data/GinGin_CGI.pyo
 %%PYTHON_SITELIBDIR%%/GinGin/data/GinGin_show_doc_src.txt
 %%PYTHON_SITELIBDIR%%/GinGin/data/add_url.html
-%%PYTHON_SITELIBDIR%%/GinGin/data/dot.htaccess
 %%PYTHON_SITELIBDIR%%/GinGin/data/attaches-dot.htaccess
 %%PYTHON_SITELIBDIR%%/GinGin/data/config.py.example
 %%PYTHON_SITELIBDIR%%/GinGin/data/css/GinGin_classic.css
 %%PYTHON_SITELIBDIR%%/GinGin/data/css/GinGin_magic.css
 %%PYTHON_SITELIBDIR%%/GinGin/data/css/GinGin_skey.css
+%%PYTHON_SITELIBDIR%%/GinGin/data/dot.htaccess
 %%PYTHON_SITELIBDIR%%/GinGin/data/images/GinGin.svg
 %%PYTHON_SITELIBDIR%%/GinGin/data/images/green_bar/bb.jpg
 %%PYTHON_SITELIBDIR%%/GinGin/data/images/green_bar/bg.jpg
@@ -92,33 +51,77 @@ bin/GinGin_host.py
 %%PYTHON_SITELIBDIR%%/GinGin/data/js/mcol.js
 %%PYTHON_SITELIBDIR%%/GinGin/data/js/rc4.js
 %%PYTHON_SITELIBDIR%%/GinGin/data/js/show_doc_body.js
-%%PYTHON_SITELIBDIR%%/GinGin/data/GinGin_CGI.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/data/GinGin_CGI.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/GinGin_CGI.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/GinGin_acts.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/GinGin_db.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/__init__.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/antispam.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/html_template.py
 %%PYTHON_SITELIBDIR%%/GinGin/html_template.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/represent.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/tools.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/user.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/xml_template.pyc
-%%PYTHON_SITELIBDIR%%/GinGin/GinGin_CGI.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/GinGin_acts.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/GinGin_db.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/__init__.pyo
-%%PYTHON_SITELIBDIR%%/GinGin/antispam.pyo
 %%PYTHON_SITELIBDIR%%/GinGin/html_template.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/represent.py
+%%PYTHON_SITELIBDIR%%/GinGin/represent.pyc
 %%PYTHON_SITELIBDIR%%/GinGin/represent.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/__init__.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/__init__.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/__init__.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/all_kws.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/all_kws.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/all_kws.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/attaches.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/attaches.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/attaches.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/comment.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/comment.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/comment.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/doc.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/doc.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/doc.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/edit.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/edit.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/edit.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/edit_url.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/edit_url.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/edit_url.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/error_page.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/error_page.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/error_page.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/gingin.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/gingin.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/gingin.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/keyword.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/keyword.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/keyword.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/kw_urls.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/kw_urls.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/kw_urls.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/last_comments.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/last_comments.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/last_comments.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/rssfeed.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/rssfeed.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/rssfeed.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_ping_err.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_ping_err.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_ping_err.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_rss.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_rss.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_rss.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_view.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_view.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/tb_view.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/templates/unpublished.py
+%%PYTHON_SITELIBDIR%%/GinGin/templates/unpublished.pyc
+%%PYTHON_SITELIBDIR%%/GinGin/templates/unpublished.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/tools.py
+%%PYTHON_SITELIBDIR%%/GinGin/tools.pyc
 %%PYTHON_SITELIBDIR%%/GinGin/tools.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/user.py
+%%PYTHON_SITELIBDIR%%/GinGin/user.pyc
 %%PYTHON_SITELIBDIR%%/GinGin/user.pyo
+%%PYTHON_SITELIBDIR%%/GinGin/xml_template.py
+%%PYTHON_SITELIBDIR%%/GinGin/xml_template.pyc
 %%PYTHON_SITELIBDIR%%/GinGin/xml_template.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/GinGin/templates
-@dirrm %%PYTHON_SITELIBDIR%%/GinGin/data/css
+@dirrm %%PYTHON_SITELIBDIR%%/GinGin/data/js
 @dirrm %%PYTHON_SITELIBDIR%%/GinGin/data/images/green_box
 @dirrm %%PYTHON_SITELIBDIR%%/GinGin/data/images/green_bar
 @dirrm %%PYTHON_SITELIBDIR%%/GinGin/data/images
-@dirrm %%PYTHON_SITELIBDIR%%/GinGin/data/js
+@dirrm %%PYTHON_SITELIBDIR%%/GinGin/data/css
 @dirrm %%PYTHON_SITELIBDIR%%/GinGin/data
 @dirrm %%PYTHON_SITELIBDIR%%/GinGin