6 files changed, 101 insertions, 109 deletions

diff --git a/www/py-werkzeug/Makefile b/www/py-werkzeug/Makefile
index 597346fdfa9f..adb122532a24 100644
--- a/www/py-werkzeug/Makefile
+++ b/www/py-werkzeug/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	werkzeug
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.3
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -28,6 +28,11 @@ EXAMPLESDIR=	${PREFIX}/share/examples/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
+# Avoid to install patch files backup
+post-patch:
+	@cd ${WRKSRC} && \
+		${FIND} . -type f -name '*.orig' -exec ${RM} -f \{\} \; 
+
 .if !defined(NOPORTEXAMPLES)
 post-build:
 # Bytecode
diff --git a/www/py-werkzeug/distinfo b/www/py-werkzeug/distinfo
index 450869f7d03b..22b2a4f5c048 100644
--- a/www/py-werkzeug/distinfo
+++ b/www/py-werkzeug/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Werkzeug-0.8.2.tar.gz) = 15bbc16f586a9ec6606e8a6005373491270901ef8fd47a91898f5183cd383a28
-SIZE (Werkzeug-0.8.2.tar.gz) = 1108056
+SHA256 (Werkzeug-0.8.3.tar.gz) = 108c3d41fb701c4af4ef00e8ebbedc147632c82247beb798c8d8657a12810206
+SIZE (Werkzeug-0.8.3.tar.gz) = 1108617
diff --git a/www/py-werkzeug/files/patch-MANIFEST.in b/www/py-werkzeug/files/patch-MANIFEST.in
new file mode 100644
index 000000000000..cc84a6363ce0
--- /dev/null
+++ b/www/py-werkzeug/files/patch-MANIFEST.in
@@ -0,0 +1,16 @@
+--- MANIFEST.in.orig	2011-09-30 10:49:32.000000000 +0000
++++ MANIFEST.in	2012-02-02 09:42:30.000000000 +0000
+@@ -1,9 +1,9 @@
+-include Makefile CHANGES LICENSE AUTHORS
++include CHANGES LICENSE AUTHORS
+ recursive-include werkzeug/debug/shared *
+ recursive-include werkzeug/debug/templates *
+-recursive-include werkzeug/testsuite/res *
+-recursive-include werkzeug/testsuite/multipart *
+-recursive-include tests *
++recursive-exclude werkzeug/testsuite/res *
++recursive-exclude werkzeug/testsuite/multipart *
++recursive-exclude tests *
+ recursive-include docs *
+ recursive-include examples *
+ recursive-exclude docs *.pyc
diff --git a/www/py-werkzeug/files/patch-Werkzeug.egg-info_SOURCES.txt b/www/py-werkzeug/files/patch-Werkzeug.egg-info_SOURCES.txt
new file mode 100644
index 000000000000..ae0257d4d68c
--- /dev/null
+++ b/www/py-werkzeug/files/patch-Werkzeug.egg-info_SOURCES.txt
@@ -0,0 +1,54 @@
+--- Werkzeug.egg-info/SOURCES.txt.orig	2011-12-16 14:52:49.000000000 +0000
++++ Werkzeug.egg-info/SOURCES.txt	2012-02-02 09:26:11.000000000 +0000
+@@ -245,50 +245,3 @@
+ werkzeug/debug/shared/source.png
+ werkzeug/debug/shared/style.css
+ werkzeug/debug/shared/ubuntu.ttf
+-werkzeug/testsuite/__init__.py
+-werkzeug/testsuite/compat.py
+-werkzeug/testsuite/datastructures.py
+-werkzeug/testsuite/debug.py
+-werkzeug/testsuite/exceptions.py
+-werkzeug/testsuite/formparser.py
+-werkzeug/testsuite/http.py
+-werkzeug/testsuite/internal.py
+-werkzeug/testsuite/local.py
+-werkzeug/testsuite/routing.py
+-werkzeug/testsuite/security.py
+-werkzeug/testsuite/serving.py
+-werkzeug/testsuite/test.py
+-werkzeug/testsuite/urls.py
+-werkzeug/testsuite/utils.py
+-werkzeug/testsuite/wrappers.py
+-werkzeug/testsuite/wsgi.py
+-werkzeug/testsuite/contrib/__init__.py
+-werkzeug/testsuite/contrib/cache.py
+-werkzeug/testsuite/contrib/fixers.py
+-werkzeug/testsuite/contrib/iterio.py
+-werkzeug/testsuite/contrib/securecookie.py
+-werkzeug/testsuite/contrib/sessions.py
+-werkzeug/testsuite/contrib/wrappers.py
+-werkzeug/testsuite/multipart/collect.py
+-werkzeug/testsuite/multipart/ie7_full_path_request.txt
+-werkzeug/testsuite/multipart/firefox3-2png1txt/file1.png
+-werkzeug/testsuite/multipart/firefox3-2png1txt/file2.png
+-werkzeug/testsuite/multipart/firefox3-2png1txt/request.txt
+-werkzeug/testsuite/multipart/firefox3-2png1txt/text.txt
+-werkzeug/testsuite/multipart/firefox3-2pnglongtext/file1.png
+-werkzeug/testsuite/multipart/firefox3-2pnglongtext/file2.png
+-werkzeug/testsuite/multipart/firefox3-2pnglongtext/request.txt
+-werkzeug/testsuite/multipart/firefox3-2pnglongtext/text.txt
+-werkzeug/testsuite/multipart/ie6-2png1txt/file1.png
+-werkzeug/testsuite/multipart/ie6-2png1txt/file2.png
+-werkzeug/testsuite/multipart/ie6-2png1txt/request.txt
+-werkzeug/testsuite/multipart/ie6-2png1txt/text.txt
+-werkzeug/testsuite/multipart/opera8-2png1txt/file1.png
+-werkzeug/testsuite/multipart/opera8-2png1txt/file2.png
+-werkzeug/testsuite/multipart/opera8-2png1txt/request.txt
+-werkzeug/testsuite/multipart/opera8-2png1txt/text.txt
+-werkzeug/testsuite/multipart/webkit3-2png1txt/file1.png
+-werkzeug/testsuite/multipart/webkit3-2png1txt/file2.png
+-werkzeug/testsuite/multipart/webkit3-2png1txt/request.txt
+-werkzeug/testsuite/multipart/webkit3-2png1txt/text.txt
+-werkzeug/testsuite/res/test.txt
+\ No newline at end of file
diff --git a/www/py-werkzeug/files/patch-setup.py b/www/py-werkzeug/files/patch-setup.py
new file mode 100644
index 000000000000..1296fc4bf967
--- /dev/null
+++ b/www/py-werkzeug/files/patch-setup.py
@@ -0,0 +1,23 @@
+--- setup.py.orig	2011-12-16 14:52:45.000000000 +0000
++++ setup.py	2012-02-02 09:36:45.000000000 +0000
+@@ -54,7 +54,7 @@
+ .. _github: http://github.com/mitsuhiko/werkzeug
+ """
+ try:
+-    from setuptools import setup
++    from setuptools import setup, find_packages
+ except ImportError:
+     from distutils.core import setup
+ 
+@@ -78,10 +78,8 @@
+         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
+         'Topic :: Software Development :: Libraries :: Python Modules'
+     ],
+-    packages=['werkzeug', 'werkzeug.debug', 'werkzeug.contrib',
+-              'werkzeug.testsuite', 'werkzeug.testsuite.contrib'],
++    packages=find_packages(where='.', exclude=['werkzeug.test*']),
+     include_package_data=True,
+-    test_suite='werkzeug.testsuite.suite',
+     zip_safe=False,
+     platforms='any'
+ )
diff --git a/www/py-werkzeug/pkg-plist b/www/py-werkzeug/pkg-plist
index a8349ef44d32..64928c371adc 100644
--- a/www/py-werkzeug/pkg-plist
+++ b/www/py-werkzeug/pkg-plist
@@ -111,103 +111,6 @@
 %%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/testsuite/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/compat.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/compat.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/compat.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/fixers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/fixers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/fixers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/iterio.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/iterio.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/iterio.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/securecookie.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/securecookie.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/securecookie.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/sessions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/sessions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/sessions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/wrappers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/wrappers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib/wrappers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/datastructures.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/datastructures.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/datastructures.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/debug.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/debug.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/debug.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/exceptions.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/formparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/formparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/formparser.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/http.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/http.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/http.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/internal.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/internal.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/internal.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/local.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/local.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/local.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/collect.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/collect.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/collect.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2png1txt/file1.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2png1txt/file2.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2png1txt/request.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2png1txt/text.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2pnglongtext/file1.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2pnglongtext/file2.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2pnglongtext/request.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2pnglongtext/text.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/ie6-2png1txt/file1.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/ie6-2png1txt/file2.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/ie6-2png1txt/request.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/ie6-2png1txt/text.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/ie7_full_path_request.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/opera8-2png1txt/file1.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/opera8-2png1txt/file2.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/opera8-2png1txt/request.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/opera8-2png1txt/text.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/webkit3-2png1txt/file1.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/webkit3-2png1txt/file2.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/webkit3-2png1txt/request.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/webkit3-2png1txt/text.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/res/test.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/routing.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/routing.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/routing.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/security.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/security.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/security.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/serving.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/serving.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/serving.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/test.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/test.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/test.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/urls.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/urls.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/urls.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/utils.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/utils.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/utils.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/wrappers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/wrappers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/wrappers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/wsgi.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/wsgi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/wsgi.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/urls.pyo
@@ -223,15 +126,6 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/wsgi.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/res
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/webkit3-2png1txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/opera8-2png1txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/ie6-2png1txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2pnglongtext
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart/firefox3-2png1txt
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/multipart
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite/contrib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/testsuite
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug/shared
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/debug
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/werkzeug/contrib