3 files changed, 38 insertions, 96 deletions

diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index 2746b6d5cfbc..ec9afb6c6688 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webhelpers
-PORTVERSION=	0.6.4
+PORTVERSION=	1.2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,16 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python helper functions for writing templates in web applications
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}routes>=1.1:${PORTSDIR}/www/py-routes \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.4:${PORTSDIR}/devel/py-simplejson
+		${PYTHON_PKGNAMEPREFIX}simplejson>=1.4:${PORTSDIR}/devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:${PORTSDIR}/textproc/py-MarkupSafe
 
 USE_PYTHON=		2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	WebHelpers
 
-post-install:
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} \
-		-type d -exec ${CHMOD} 755 {} +
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} \
-		-type f -exec ${CHMOD} ${SHAREMODE} {} +
-
 .include <bsd.port.mk>
diff --git a/www/py-webhelpers/distinfo b/www/py-webhelpers/distinfo
index a55a79e9b197..b63375512bfc 100644
--- a/www/py-webhelpers/distinfo
+++ b/www/py-webhelpers/distinfo
@@ -1,3 +1,2 @@
-MD5 (WebHelpers-0.6.4.tar.gz) = d11ed399068aac9368281497d40a4436
-SHA256 (WebHelpers-0.6.4.tar.gz) = 1f74c787f392fecc0f174c170b521c5630e5d58f7bd88e3e0f0db983fa52d20d
-SIZE (WebHelpers-0.6.4.tar.gz) = 199379
+SHA256 (WebHelpers-1.2.tar.gz) = 3f9a0decc4b7e3385ee2ef02147010556b39eb2f6b59bb1bf9710c0e169697ef
+SIZE (WebHelpers-1.2.tar.gz) = 189498
diff --git a/www/py-webhelpers/pkg-plist b/www/py-webhelpers/pkg-plist
index da9388e43708..dec69810fa3d 100644
--- a/www/py-webhelpers/pkg-plist
+++ b/www/py-webhelpers/pkg-plist
@@ -3,16 +3,11 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/requires.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/commands/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/commands/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/commands/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/commands/compress_resources.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/commands/compress_resources.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/commands/compress_resources.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/constants.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/constants.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/constants.pyo
@@ -25,9 +20,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/feedgenerator.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/feedgenerator.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/feedgenerator.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/hinclude.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/hinclude.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/hinclude.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/__init__.pyo
@@ -37,18 +29,21 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/converters.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/converters.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/converters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/secure_form.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/secure_form.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/secure_form.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/grid.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/grid.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/grid.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/grid_demo.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/grid_demo.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/grid_demo.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/render.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/render.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/render.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/tags.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/tags.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/tags.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/tools.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/tools.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html/tools.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/htmlgen.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/htmlgen.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/htmlgen.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/markdown.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/markdown.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/markdown.pyo
@@ -67,72 +62,26 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/paginate.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/paginate.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/paginate.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/links.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/links.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/links.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/orm.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/orm.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination/orm.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/asset_tag.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/asset_tag.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/asset_tag.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/date.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/date.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/date.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/form_options.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/form_options.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/form_options.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/form_tag.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/form_tag.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/form_tag.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascript.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascript.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascript.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/builder.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/controls.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/dragdrop.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/effects.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/prototype.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/scriptaculous.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/slider.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/sound.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts/unittest.js
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/number.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/number.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/number.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/prototype.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/prototype.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/prototype.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/scriptaculous.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/scriptaculous.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/scriptaculous.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/secure_form_tag.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/secure_form_tag.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/secure_form_tag.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/tags.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/tags.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/tags.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/text.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/text.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/text.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/urls.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/urls.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/urls.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/wrapped.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/wrapped.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/wrapped.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/string24.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/string24.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/string24.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/public/stylesheets/grid.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/public/stylesheets/webhelpers.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/_jsmin.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/_jsmin.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/_jsmin.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/flash.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/flash.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/flash.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/grid.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/grid.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/grid.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/minify.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/minify.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/minify.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/secure_form.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/secure_form.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib/secure_form.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/text.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/text.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/text.pyo
@@ -143,10 +92,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/util.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/commands
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/html
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pagination
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails/javascripts
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/rails
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/public/stylesheets
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/public
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers/pylonslib
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/webhelpers
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%