- update to 2.9.3

- trim Makefile header
- pass maintainership to zope@
- add NO_STAGE=yes
- update USE_PYTHON value

Approved by:	wen (maintainer, by mail)

4 files changed, 127 insertions, 131 deletions

diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile
index 016be32e3bf8..c330680b218c 100644
--- a/devel/py-zconfig/Makefile
+++ b/devel/py-zconfig/Makefile
@@ -1,24 +1,20 @@
-# New ports collection makefile for:	py-zconfig
-# Date created:		8 September 2005
-# Whom:			Landon Fuller <landonf@opendarwin.org>
-#
+# Created by: Landon Fuller <landonf@opendarwin.org>
 # $FreeBSD$
 
 PORTNAME=	zconfig
-PORTVERSION=	2.9.0
-PORTREVISION=	1
+PORTVERSION=	2.9.3
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	ZConfig-${PORTVERSION}
 
-MAINTAINER=	wen@FreeBSD.org
+MAINTAINER=	zope@FreeBSD.org
 COMMENT=	General use python configuration library
 
 LICENSE=	ZPL21
 
-USE_ZIP=	yes
-USE_PYTHON=	2.5-2.7
+NO_STAGE=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	ZConfig
 
diff --git a/devel/py-zconfig/distinfo b/devel/py-zconfig/distinfo
index a1c8e23221e3..e180b97c2a07 100644
--- a/devel/py-zconfig/distinfo
+++ b/devel/py-zconfig/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ZConfig-2.9.0.zip) = 74845b421b5d917b706248ae2eb2123a2a4ae7a0cb04dfae4540c781268e9ec8
-SIZE (ZConfig-2.9.0.zip) = 296775
+SHA256 (ZConfig-2.9.3.tar.gz) = 28aae6309cbf14fdf446a4d7331476633fdb07f0cdbc2bde1d1ab34a1c1f447d
+SIZE (ZConfig-2.9.3.tar.gz) = 259894
diff --git a/devel/py-zconfig/pkg-descr b/devel/py-zconfig/pkg-descr
index e5300d6c8d2a..81b6c5617a2e 100644
--- a/devel/py-zconfig/pkg-descr
+++ b/devel/py-zconfig/pkg-descr
@@ -5,4 +5,4 @@ very different from the model support by the ConfigParser module
 found in Python's standard library, and is more suitable to
 configuration-intensive applications.
 
-WWW: http://pypi.python.org/pypi/ZConfig
+WWW: https://pypi.python.org/pypi/ZConfig/
diff --git a/devel/py-zconfig/pkg-plist b/devel/py-zconfig/pkg-plist
index 7782b9d2adc3..d3e5ff0fe96b 100644
--- a/devel/py-zconfig/pkg-plist
+++ b/devel/py-zconfig/pkg-plist
@@ -1,137 +1,94 @@
-bin/zconfig_schema2html
 bin/zconfig
+bin/zconfig_schema2html
+%%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/scripts/zconfig
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/zconfig_schema2html
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cfgparser.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cmdline.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/datatypes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/info.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/loader.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/matcher.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schema.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/substitution.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/url.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cfgparser.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cmdline.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/datatypes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/info.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/loader.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/matcher.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schema.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/substitution.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/url.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cfgparser.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cfgparser.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cfgparser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cmdline.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cmdline.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/cmdline.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/datatypes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/info.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/loader.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/matcher.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schema.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/substitution.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/url.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/mapping.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/component.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/mapping.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/mapping.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/component.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/mapping.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/mapping.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/mapping.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/mapping.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/test_mapping.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/test_mapping.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/test_mapping.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/test_mapping.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests/test_mapping.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/datatypes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/factory.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/handlers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/logger.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/loghandler.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/abstract.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/base-logger.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/component.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/eventlog.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/handlers.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/logger.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/datatypes.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/datatypes.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/datatypes.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/eventlog.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/factory.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/factory.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/factory.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/handlers.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/handlers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/handlers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/handlers.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/logger.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/logger.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/logger.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/logger.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/loghandler.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/loghandler.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/datatypes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/factory.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/loghandler.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/test_logger.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/test_logger.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/test_logger.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/test_logger.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests/test_logger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/handlers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/logger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/loghandler.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/datatypes.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/datatypes.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/datatypes.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/info.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/info.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/info.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/loader.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/loader.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/loader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/matcher.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/matcher.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/matcher.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schema.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schema.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schema.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/schemaless.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/substitution.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/substitution.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/substitution.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/support.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cfgimports.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cmdline.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cookbook.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_datatypes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_loader.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schema.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schemaless.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_subst.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/foosample.zip
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/support.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cfgimports.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cmdline.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cookbook.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_datatypes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_loader.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schema.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schemaless.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_subst.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/support.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cfgimports.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cmdline.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_config.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cookbook.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_datatypes.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_loader.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schema.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schemaless.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_subst.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_readme.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_readme.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_readme.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/README.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/component.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/extras/extras.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/component.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/extra.xml
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/foosample.zip
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/input/base-datatype1.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/input/base-datatype2.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/input/base-keytype1.xml
@@ -146,38 +103,81 @@ bin/zconfig
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/input/simple.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/input/simplesections.conf
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/input/simplesections.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/README.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/component.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/extras/extras.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/component.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget/extra.xml
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/support.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/support.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/support.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cfgimports.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cfgimports.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cfgimports.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cmdline.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cmdline.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cmdline.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_config.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_config.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_config.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cookbook.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cookbook.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_cookbook.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_datatypes.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_datatypes.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_datatypes.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_loader.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_loader.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_loader.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_readme.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_readme.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_readme.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schema.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schema.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schema.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schemaless.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schemaless.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_schemaless.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_subst.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_subst.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/test_subst.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/README.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/component.xml
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/datatypes.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/datatypes.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample/datatypes.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/not-zip-safe
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/zconfig
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts/zconfig_schema2html
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/url.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/url.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/url.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing/extras
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/thing
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library/widget
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/library
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/input
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo/sample
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource/foo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests/zipsource
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/logger
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components/basic
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig/components
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/ZConfig
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO