4 files changed, 7 insertions, 148 deletions

diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index 5317e47155ec..fe859d679ded 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -6,36 +6,16 @@
 #
 
 PORTNAME=	flup
-PORTVERSION=	0.5.r2311
+PORTVERSION=	1.0
 CATEGORIES=	www python
 MASTER_SITES=	http://www.saddi.com/software/flup/dist/ \
-		http://www.cs.nctu.edu.tw/~lwhsu/ports/distfiles/
+		CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	flup-${PORTVERSION:E}
 
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Random assortment of WSGI servers, middleware
 
-BUILD_DEPENDS=	${EASY_INSTALL_CMD}:${PORTSDIR}/devel/py-setuptools
-RUN_DEPENDS=	${BUILD_DEPENDES}
-
 USE_PYTHON=	2.4+
-USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGVERSION=	0.5
-PYDISTUTILS_NOEGGINFO=	yes # XXX convert easy_install support to bsd.python.mk's
-
-EASY_INSTALL_CMD?=	easy_install-${PYTHON_VER}
-
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-
-PYDISTUTILS_BUILD_TARGET=	bdist_egg
-PYDISTUTILS_INSTALL_TARGET=	easy_install
-PYDISTUTILS_INSTALLARGS=	-O 1 -N -S ${PYTHON_SITELIBDIR} ${WRKSRC}/dist/${PYFLUP_EGG}
-
-PYFLUP_EGG=	${PORTNAME}-${PORTVERSION:R}-py${PYTHON_VER}.egg
-
-PLIST_SUB+=	EASY_INSTALL_CMD=${EASY_INSTALL_CMD} \
-		PYFLUP_EGG=${PYFLUP_EGG} \
-		PYFLUP_EGG_VER="${PORTNAME}==${PORTVERSION:R}"
+USE_PYDISTUTILS=	easy_install
 
 .include <bsd.port.mk>
diff --git a/www/py-flup/distinfo b/www/py-flup/distinfo
index 7bae5a29aa31..2b78e38a42f8 100644
--- a/www/py-flup/distinfo
+++ b/www/py-flup/distinfo
@@ -1,3 +1,3 @@
-MD5 (flup-r2311.tar.gz) = c54e0bc5877f1b612e8ac99a061598d4
-SHA256 (flup-r2311.tar.gz) = a3b7a930c33292ed305113552a188881834a5682b4761fd25341516e9ab19e97
-SIZE (flup-r2311.tar.gz) = 68742
+MD5 (flup-1.0.tar.gz) = 530801fe835fd9a680457e443eb95578
+SHA256 (flup-1.0.tar.gz) = dd943b9746997bb6e49820187998dd26a58b2d0f886a45c166209e6d7d35aa32
+SIZE (flup-1.0.tar.gz) = 46766
diff --git a/www/py-flup/files/patch-setup.py b/www/py-flup/files/patch-setup.py
deleted file mode 100644
index 1c0b8fbe3ef7..000000000000
--- a/www/py-flup/files/patch-setup.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- setup.py.orig	Sat Dec 16 22:39:23 2006
-+++ setup.py	Sat Dec 16 22:35:49 2006
-@@ -7,7 +7,7 @@
-     name = 'flup',
-     version = '0.5',
-     packages = find_packages(),
--    zip_safe = True, # Despite flup.resolver.importingmodule
-+#    zip_safe = True, # Despite flup.resolver.importingmodule
-     
-     entry_points = """
-     [paste.server_factory]
diff --git a/www/py-flup/pkg-plist b/www/py-flup/pkg-plist
index 252069d7e7d2..ddf68a1c022f 100644
--- a/www/py-flup/pkg-plist
+++ b/www/py-flup/pkg-plist
@@ -1,111 +1 @@
-@comment $FreeBSD$
-@unexec %%EASY_INSTALL_CMD%% -q -m -S %D/%%PYTHON_SITELIBDIR%% %%PYFLUP_EGG_VER%%
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/PKG-INFO
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/entry_points.txt
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/fcgi_app.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/fcgi_app.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/fcgi_app.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/scgi_app.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/scgi_app.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client/scgi_app.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/error.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/error.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/error.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/gzip.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/gzip.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/gzip.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/session.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/session.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware/session.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/publisher.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/publisher.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/publisher.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/complex.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/complex.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/complex.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/function.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/function.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/function.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/importingmodule.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/importingmodule.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/importingmodule.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/module.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/module.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/module.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/nopathinfo.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/nopathinfo.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/nopathinfo.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/objectpath.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/objectpath.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/objectpath.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/resolver.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/resolver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver/resolver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp_base.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp_base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp_base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp_fork.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp_fork.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/ajp_fork.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi_base.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi_base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi_base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi_fork.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi_fork.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/fcgi_fork.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/paste_factory.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/paste_factory.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/paste_factory.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/preforkserver.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/preforkserver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/preforkserver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi_base.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi_base.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi_base.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi_fork.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi_fork.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/scgi_fork.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/threadedserver.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/threadedserver.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/threadedserver.pyo
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/threadpool.py
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/threadpool.pyc
-%%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server/threadpool.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/server
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/resolver
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/middleware
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup/client
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/flup
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%/EGG-INFO
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYFLUP_EGG%%
-@dirrmtry %%PYTHON_SITELIBDIR%%
-@dirrmtry %%PYTHON_LIBDIR%%
-@exec %%EASY_INSTALL_CMD%% -q -N -S %D/%%PYTHON_SITELIBDIR%% %%PYFLUP_EGG_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%