Update py-flup to r2311.

- Support gzip compression of XHTML pages using the correct MIME type.
- Deprecate WSGI_SCRIPT_NAME and scriptName in scgi_base.
- Update servers to default to an empty QUERY_STRING if not present in
the environ
- Update gzip.py: compresslevel -> compress_level
- Change intra-package imports into absolute imports.
- Add forceCookieOutput attribute to SessionService to force Set-Cookie
output for the current request.
- Add UNIX domain socket support to scgi, scgi_fork, scgi_app.
- Add flup.client package which contains various WSGI -> connector
client implentations.
- Change mime-type matching algorithm in GzipMiddleware.
- Add cookieAttributes to SessionService to make it easier to customize
the generated cookie's attributes.

Switch to use the common egg framework and mark as DESTDIR safe.

5 files changed, 117 insertions, 130 deletions

diff --git a/www/py-flup/DEINSTALL b/www/py-flup/DEINSTALL
deleted file mode 100644
index db16670345b..00000000000
--- a/www/py-flup/DEINSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case $STAGE in
-DEINSTALL)
-	@PY_MANAGE_EGGS@ unregister @FLUPEGG@
-	;;
-esac
diff --git a/www/py-flup/INSTALL b/www/py-flup/INSTALL
deleted file mode 100644
index 535b6037fa3..00000000000
--- a/www/py-flup/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case $STAGE in
-POST-INSTALL)
-	@PY_MANAGE_EGGS@ register @FLUPEGG@
-	;;
-esac
diff --git a/www/py-flup/Makefile b/www/py-flup/Makefile
index 2286156ce07..974a465c2b6 100644
--- a/www/py-flup/Makefile
+++ b/www/py-flup/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2007/02/22 19:01:27 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/08/09 13:31:52 joerg Exp $
 #
 
-DISTNAME=	flup-r2030
-PKGNAME=	${PYPKGPREFIX}-flup-2030
-PKGREVISION=	2
+DISTNAME=	flup-r2311
+PKGNAME=	${PYPKGPREFIX}-flup-2311
+EGG_NAME=	flup-0.5
 CATEGORIES=	www python
 MASTER_SITES=	http://www.saddi.com/software/flup/dist/
 
@@ -11,17 +11,9 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://trac.saddi.com/flup
 COMMENT=	WSGI support modules
 
-PKG_DESTDIR_SUPPORT=	# empty
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c1nb1:../../devel/py-setuptools
-CHECK_FILES_SKIP+=	${PREFIX}/${PYSITELIB}/easy-install.pth
+WRKSRC=		${WRKDIR}/${EGG_NAME}
 
-PYDISTUTILSPKG=	yes
-PY_PATCHPLIST=	yes
-PYTHON_VERSIONS_ACCEPTED=	24
-
-FILES_SUBST+=	PY_MANAGE_EGGS=${PREFIX}/bin/${PYPKGPREFIX}-manage-eggs
-FILES_SUBST+=	FLUPEGG=${PREFIX}/${PYSITELIB}/flup-0.5-py2.4.egg
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-flup/PLIST b/www/py-flup/PLIST
index 0deedf43dc2..28b1858bdfb 100644
--- a/www/py-flup/PLIST
+++ b/www/py-flup/PLIST
@@ -1,97 +1,106 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/09/01 15:08:15 joerg Exp $
-${PYSITELIB}/flup-0.5-py2.4.egg/EGG-INFO/PKG-INFO
-${PYSITELIB}/flup-0.5-py2.4.egg/EGG-INFO/SOURCES.txt
-${PYSITELIB}/flup-0.5-py2.4.egg/EGG-INFO/dependency_links.txt
-${PYSITELIB}/flup-0.5-py2.4.egg/EGG-INFO/entry_points.txt
-${PYSITELIB}/flup-0.5-py2.4.egg/EGG-INFO/not-zip-safe
-${PYSITELIB}/flup-0.5-py2.4.egg/EGG-INFO/top_level.txt
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/__init__.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/__init__.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/__init__.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/__init__.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/__init__.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/__init__.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/error.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/error.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/error.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/gzip.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/gzip.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/gzip.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/session.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/session.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware/session.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/publisher.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/publisher.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/publisher.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/__init__.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/__init__.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/__init__.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/complex.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/complex.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/complex.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/function.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/function.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/function.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/importingmodule.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/importingmodule.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/importingmodule.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/module.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/module.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/module.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/nopathinfo.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/nopathinfo.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/nopathinfo.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/objectpath.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/objectpath.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/objectpath.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/resolver.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/resolver.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver/resolver.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/__init__.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/__init__.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/__init__.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp_base.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp_base.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp_base.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp_fork.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp_fork.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/ajp_fork.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi_base.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi_base.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi_base.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi_fork.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi_fork.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/fcgi_fork.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/paste_factory.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/paste_factory.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/paste_factory.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/preforkserver.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/preforkserver.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/preforkserver.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi_base.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi_base.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi_base.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi_fork.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi_fork.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/scgi_fork.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/threadedserver.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/threadedserver.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/threadedserver.pyo
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/threadpool.py
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/threadpool.pyc
-${PYSITELIB}/flup-0.5-py2.4.egg/flup/server/threadpool.pyo
-@dirrm ${PYSITELIB}/flup-0.5-py2.4.egg/EGG-INFO
-@dirrm ${PYSITELIB}/flup-0.5-py2.4.egg/flup/middleware
-@dirrm ${PYSITELIB}/flup-0.5-py2.4.egg/flup/resolver
-@dirrm ${PYSITELIB}/flup-0.5-py2.4.egg/flup/server
-@dirrm ${PYSITELIB}/flup-0.5-py2.4.egg/flup
-@dirrm ${PYSITELIB}/flup-0.5-py2.4.egg
+@comment $NetBSD: PLIST,v 1.2 2007/08/09 13:31:52 joerg Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/zip-safe
+${PYSITELIB}/flup/__init__.py
+${PYSITELIB}/flup/__init__.pyc
+${PYSITELIB}/flup/__init__.pyo
+${PYSITELIB}/flup/client/__init__.py
+${PYSITELIB}/flup/client/__init__.pyc
+${PYSITELIB}/flup/client/__init__.pyo
+${PYSITELIB}/flup/client/fcgi_app.py
+${PYSITELIB}/flup/client/fcgi_app.pyc
+${PYSITELIB}/flup/client/fcgi_app.pyo
+${PYSITELIB}/flup/client/scgi_app.py
+${PYSITELIB}/flup/client/scgi_app.pyc
+${PYSITELIB}/flup/client/scgi_app.pyo
+${PYSITELIB}/flup/middleware/__init__.py
+${PYSITELIB}/flup/middleware/__init__.pyc
+${PYSITELIB}/flup/middleware/__init__.pyo
+${PYSITELIB}/flup/middleware/error.py
+${PYSITELIB}/flup/middleware/error.pyc
+${PYSITELIB}/flup/middleware/error.pyo
+${PYSITELIB}/flup/middleware/gzip.py
+${PYSITELIB}/flup/middleware/gzip.pyc
+${PYSITELIB}/flup/middleware/gzip.pyo
+${PYSITELIB}/flup/middleware/session.py
+${PYSITELIB}/flup/middleware/session.pyc
+${PYSITELIB}/flup/middleware/session.pyo
+${PYSITELIB}/flup/publisher.py
+${PYSITELIB}/flup/publisher.pyc
+${PYSITELIB}/flup/publisher.pyo
+${PYSITELIB}/flup/resolver/__init__.py
+${PYSITELIB}/flup/resolver/__init__.pyc
+${PYSITELIB}/flup/resolver/__init__.pyo
+${PYSITELIB}/flup/resolver/complex.py
+${PYSITELIB}/flup/resolver/complex.pyc
+${PYSITELIB}/flup/resolver/complex.pyo
+${PYSITELIB}/flup/resolver/function.py
+${PYSITELIB}/flup/resolver/function.pyc
+${PYSITELIB}/flup/resolver/function.pyo
+${PYSITELIB}/flup/resolver/importingmodule.py
+${PYSITELIB}/flup/resolver/importingmodule.pyc
+${PYSITELIB}/flup/resolver/importingmodule.pyo
+${PYSITELIB}/flup/resolver/module.py
+${PYSITELIB}/flup/resolver/module.pyc
+${PYSITELIB}/flup/resolver/module.pyo
+${PYSITELIB}/flup/resolver/nopathinfo.py
+${PYSITELIB}/flup/resolver/nopathinfo.pyc
+${PYSITELIB}/flup/resolver/nopathinfo.pyo
+${PYSITELIB}/flup/resolver/objectpath.py
+${PYSITELIB}/flup/resolver/objectpath.pyc
+${PYSITELIB}/flup/resolver/objectpath.pyo
+${PYSITELIB}/flup/resolver/resolver.py
+${PYSITELIB}/flup/resolver/resolver.pyc
+${PYSITELIB}/flup/resolver/resolver.pyo
+${PYSITELIB}/flup/server/__init__.py
+${PYSITELIB}/flup/server/__init__.pyc
+${PYSITELIB}/flup/server/__init__.pyo
+${PYSITELIB}/flup/server/ajp.py
+${PYSITELIB}/flup/server/ajp.pyc
+${PYSITELIB}/flup/server/ajp.pyo
+${PYSITELIB}/flup/server/ajp_base.py
+${PYSITELIB}/flup/server/ajp_base.pyc
+${PYSITELIB}/flup/server/ajp_base.pyo
+${PYSITELIB}/flup/server/ajp_fork.py
+${PYSITELIB}/flup/server/ajp_fork.pyc
+${PYSITELIB}/flup/server/ajp_fork.pyo
+${PYSITELIB}/flup/server/fcgi.py
+${PYSITELIB}/flup/server/fcgi.pyc
+${PYSITELIB}/flup/server/fcgi.pyo
+${PYSITELIB}/flup/server/fcgi_base.py
+${PYSITELIB}/flup/server/fcgi_base.pyc
+${PYSITELIB}/flup/server/fcgi_base.pyo
+${PYSITELIB}/flup/server/fcgi_fork.py
+${PYSITELIB}/flup/server/fcgi_fork.pyc
+${PYSITELIB}/flup/server/fcgi_fork.pyo
+${PYSITELIB}/flup/server/paste_factory.py
+${PYSITELIB}/flup/server/paste_factory.pyc
+${PYSITELIB}/flup/server/paste_factory.pyo
+${PYSITELIB}/flup/server/preforkserver.py
+${PYSITELIB}/flup/server/preforkserver.pyc
+${PYSITELIB}/flup/server/preforkserver.pyo
+${PYSITELIB}/flup/server/scgi.py
+${PYSITELIB}/flup/server/scgi.pyc
+${PYSITELIB}/flup/server/scgi.pyo
+${PYSITELIB}/flup/server/scgi_base.py
+${PYSITELIB}/flup/server/scgi_base.pyc
+${PYSITELIB}/flup/server/scgi_base.pyo
+${PYSITELIB}/flup/server/scgi_fork.py
+${PYSITELIB}/flup/server/scgi_fork.pyc
+${PYSITELIB}/flup/server/scgi_fork.pyo
+${PYSITELIB}/flup/server/threadedserver.py
+${PYSITELIB}/flup/server/threadedserver.pyc
+${PYSITELIB}/flup/server/threadedserver.pyo
+${PYSITELIB}/flup/server/threadpool.py
+${PYSITELIB}/flup/server/threadpool.pyc
+${PYSITELIB}/flup/server/threadpool.pyo
+@dirrm ${PYSITELIB}/flup/server
+@dirrm ${PYSITELIB}/flup/resolver
+@dirrm ${PYSITELIB}/flup/middleware
+@dirrm ${PYSITELIB}/flup/client
+@dirrm ${PYSITELIB}/${EGG_INFODIR}
+@dirrm ${PYSITELIB}/flup
diff --git a/www/py-flup/distinfo b/www/py-flup/distinfo
index d787e2feeb1..ca539310fa5 100644
--- a/www/py-flup/distinfo
+++ b/www/py-flup/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/09/01 15:08:15 joerg Exp $
+$NetBSD: distinfo,v 1.2 2007/08/09 13:31:52 joerg Exp $
 
-SHA1 (flup-r2030.tar.gz) = 4b09ac42b8d947d2326b8d60078c841f1a6eb8b5
-RMD160 (flup-r2030.tar.gz) = 167f87a2e398060bd3a8a939034f2ac5ffae2c0b
-Size (flup-r2030.tar.gz) = 60309 bytes
+SHA1 (flup-r2311.tar.gz) = f473d9ce496ad18b21c5a0302ebcfbb25d7cfbd2
+RMD160 (flup-r2311.tar.gz) = 867cc618643d155869cecf7af45d01748ec3d171
+Size (flup-r2311.tar.gz) = 68742 bytes