diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
index c4e809a3d73d..78e657ac93f0 100644
--- a/www/py-werkzeug/Makefile
+++ b/www/py-werkzeug/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	werkzeug
-PORTVERSION=	0.6.2
+PORTVERSION=	0.7
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +15,9 @@ DISTNAME=	Werkzeug-${DISTVERSION}
 MAINTAINER=	moggie@elasticmind.net
 COMMENT=	Python utilities collection for building WSGI applications
 
+LICENSE=	BSD
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_PYTHON=	2.6+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	Werkzeug
@@ -25,8 +28,13 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-post-install:
 .if !defined(NOPORTEXAMPLES)
+post-build:
+# Bytecode
+	${PYTHON_CMD} -m compileall ${WRKSRC}/examples ; \
+	${PYTHON_CMD} -O -m compileall ${WRKSRC}/examples
+
+post-install:
 	${MKDIR} ${EXAMPLESDIR}
 	@cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
 .endif
diff --git a/www/py-werkzeug/distinfo b/www/py-werkzeug/distinfo
index 2625154fe3b3..3306a67e7936 100644
--- a/www/py-werkzeug/distinfo
+++ b/www/py-werkzeug/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Werkzeug-0.6.2.tar.gz) = 4a80c87db4c105f24bb6587b2fdc45a1844e6b0d185d698543b43f2cf900d27b
-SIZE (Werkzeug-0.6.2.tar.gz) = 1720741
+SHA256 (Werkzeug-0.7.tar.gz) = 1f249abd79f791841827f09cdee1334c965b77db061fc1ea7c2c1248a24e8340
+SIZE (Werkzeug-0.7.tar.gz) = 1103423
diff --git a/www/py-werkzeug/pkg-plist b/www/py-werkzeug/pkg-plist
index 195c1960757a..64928c371adc 100644
--- a/www/py-werkzeug/pkg-plist
+++ b/www/py-werkzeug/pkg-plist
@@ -1,57 +1,69 @@
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/datastructures.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/http.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/local.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/routing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/script.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/serving.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/templates.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/test.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testapp.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/useragents.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wrappers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/_internal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/formparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/posixemulation.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/security.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/posixemulation.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/security.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/formparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/datastructures.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/http.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/local.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/routing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/script.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/serving.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/test.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/templates.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testapp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/useragents.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wrappers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/_internal.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/console.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/render.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/repr.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/tbtools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/_internal.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/_internal.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/_internal.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/atom.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/atom.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/atom.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/cache.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/cache.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/cache.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/fixers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/fixers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/fixers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/iterio.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/iterio.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/iterio.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/jsrouting.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/jsrouting.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/jsrouting.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/kickstart.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/kickstart.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/kickstart.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/limiter.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/limiter.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/limiter.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/lint.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/lint.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/lint.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/profiler.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/profiler.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/profiler.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/securecookie.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/securecookie.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/securecookie.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/sessions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/sessions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/sessions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/testtools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/testtools.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/testtools.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/wrappers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/wrappers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/wrappers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/datastructures.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/datastructures.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/datastructures.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/console.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/render.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/repr.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/tbtools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/utils.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/body.tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/codetable.tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/console.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/console.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/console.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/repr.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/repr.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/repr.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/FONT_LICENSE
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/console.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/debugger.js
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/jquery.js
@@ -59,139 +71,138 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/more.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/source.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/style.css
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/vartable.tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/console.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/dump_object.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/frame.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/help_command.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/source.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/traceback_full.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/traceback_plaintext.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates/traceback_summary.html
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/console.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/render.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/repr.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared/ubuntu.ttf
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/tbtools.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/tbtools.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/tbtools.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/atom.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/fixers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/iterio.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/jsrouting.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/kickstart.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/limiter.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/lint.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/profiler.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/securecookie.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/sessions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/testtools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/wrappers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/atom.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/fixers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/iterio.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/jsrouting.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/kickstart.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/limiter.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/lint.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/profiler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/securecookie.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/sessions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/testtools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/wrappers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/atom.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/fixers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/iterio.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/jsrouting.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/kickstart.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/limiter.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/lint.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/profiler.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/securecookie.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/sessions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/testtools.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/wrappers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/datastructures.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/exceptions.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/http.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/local.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/routing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/script.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/serving.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/templates.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/test.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testapp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/useragents.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wrappers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/_internal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/formparser.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/formparser.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/formparser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/http.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/http.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/http.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/local.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/local.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/local.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/posixemulation.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/posixemulation.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/posixemulation.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/routing.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/routing.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/routing.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/script.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/script.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/script.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/security.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/security.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/security.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/serving.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/serving.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/serving.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/templates.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/templates.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/templates.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testapp.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testapp.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testapp.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/useragents.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/useragents.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/useragents.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/utils.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/utils.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wrappers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wrappers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wrappers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
-
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookieauth.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpbasicauth.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-coolmagic.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-couchy.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-cupoftee.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-i18nurls.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-plnt.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-shorty.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-simplewiki.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-webpylike.py
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/securecookie.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/securecookie.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/securecookie.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/sessions.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/application.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/helpers.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/sessions.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/sessions.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookieauth.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookieauth.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cookieauth.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/application.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/application.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/application.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/helpers.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/helpers.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/helpers.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/public/style.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/templates/layout.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/templates/static/about.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/templates/static/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/templates/static/not_found.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/views/static.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/utils.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/utils.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/views/__init__.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/application.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/models.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/views/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/views/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/views/static.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/views/static.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/coolmagic/views/static.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/utils.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/views.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/application.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/application.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/application.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/models.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/models.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/models.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/static/style.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/templates/display.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/templates/layout.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/templates/list.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/templates/new.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/templates/not_found.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/application.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/db.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/network.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/pages.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/utils.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/utils.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/views.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/views.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/couchy/views.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/__init__.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/application.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/application.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/application.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/db.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/db.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/db.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/network.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/network.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/network.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/pages.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/pages.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/utils.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/pages.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/shared/content.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/shared/down.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/shared/favicon.ico
@@ -204,61 +215,123 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/templates/search.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/templates/server.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/templates/serverlist.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/application.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/urls.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/views.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/utils.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cupoftee/utils.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpbasicauth.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpbasicauth.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpbasicauth.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/__init__.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/application.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/application.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/application.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/templates/about.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/templates/blog.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/templates/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/templates/layout.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/partial/complex_routing.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/urls.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/urls.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/urls.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/views.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/views.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/i18nurls/views.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-coolmagic.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-coolmagic.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-coolmagic.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-couchy.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-couchy.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-couchy.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-cupoftee.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-cupoftee.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-cupoftee.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-i18nurls.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-i18nurls.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-i18nurls.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-plnt.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-plnt.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-plnt.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-shorty.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-shorty.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-shorty.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-simplewiki.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-simplewiki.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-simplewiki.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-webpylike.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-webpylike.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/manage-webpylike.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/partial/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/database.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/sync.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/utils.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/views.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/webapp.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/partial/complex_routing.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/partial/complex_routing.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/partial/complex_routing.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/__init__.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/database.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/sync.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/utils.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/views.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/webapp.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/database.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/database.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/database.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/shared/style.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/sync.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/sync.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/sync.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/templates/about.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/templates/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/templates/layout.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/application.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/models.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/utils.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/views.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/utils.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/utils.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/views.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/views.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/views.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/webapp.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/webapp.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/plnt/webapp.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/shortly.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/shortly.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/shortly.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/static/style.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/templates/404.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/templates/layout.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/templates/new_url.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shortly/templates/short_link_details.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/__init__.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/application.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/models.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/utils.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/views.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/application.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/application.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/application.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/models.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/models.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/models.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/static/style.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/templates/display.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/templates/layout.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/templates/list.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/templates/new.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/templates/not_found.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/actions.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/application.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/database.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/specialpages.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/utils.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/utils.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/views.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/views.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/shorty/views.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/__init__.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/actions.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/application.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/database.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/specialpages.pyc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/utils.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/__init__.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/__init__.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/actions.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/actions.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/actions.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/application.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/application.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/application.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/database.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/database.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/database.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/shared/style.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/specialpages.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/specialpages.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/specialpages.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/templates/action_diff.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/templates/action_edit.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/templates/action_log.html
@@ -270,9 +343,18 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/templates/page_index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/templates/page_missing.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/templates/recent_changes.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/utils.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/utils.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/simplewiki/utils.pyo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/upload.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpylike/example.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpylike/example.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpylike/example.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpylike/webpylike.py
-
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpylike/webpylike.pyc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/webpylike/webpylike.pyo
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/webpylike
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simplewiki/templates
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/simplewiki/shared
@@ -280,6 +362,9 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/shorty/templates
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/shorty/static
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/shorty
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/shortly/templates
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/shortly/static
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/shortly
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plnt/templates
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plnt/shared
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/plnt
@@ -299,11 +384,3 @@
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/coolmagic
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%