Update py-zconfig to 2.6.1.

Based on PR#42563 by Derouiche.

==========================
Change History for ZConfig
==========================

ZConfig 2.6.1 (2008/12/05)
--------------------------

- Fixed support for schema descriptions that override descriptions from a base
  schema.  If multiple base schema provide descriptions but the derived schema
  does not, the first base mentioned that provides a description wins.
  https://bugs.launchpad.net/zconfig/+bug/259475

- Fixed compatibility bug with Python 2.5.0.

- No longer trigger deprecation warnings under Python 2.6.


ZConfig 2.6.0 (2008/09/03)
--------------------------

- Added support for file rotation by time by specifying when and
  interval, rather than max-size, for log files.

- Removed dependency on setuptools from the setup.py.


ZConfig 2.5.1 (2007/12/24)
--------------------------

- Made it possible to run unit tests via 'python setup.py test' (requires
  setuptools on sys.path).

- Added better error messages to test failure assertions.

ZConfig 2.5 (31 Aug 2007)
-------------------------

  *A note on the version number:*

  Information discovered in the revision control system suggests that
  some past revision has been called "2.4", though it is not clear that
  any actual release was made with that version number.  We're going to
  skip revision 2.4 entirely to avoid potential issues with anyone using
  something claiming to be ZConfig 2.4, and go straight to version 2.5.

- Add support for importing schema components from ZIP archives (including
  eggs).

- Added a 'formatter' configuration option in the logging handler sections
  to allow specifying a constructor for the formatter.

- Documented the package: URL scheme that can be used in extending schema.

- Added support for reopening all log files opened via configurations using
  the ZConfig.components.logger package.  For Zope, this is usable via the
  ``zc.signalhandler`` package.  ``zc.signalhandler`` is not required for
  ZConfig.

- Added support for rotating log files internally by size.

- Added a minimal implementation of schema-less parsing; this is mostly
  intended for applications that want to read several fragments of ZConfig
  configuration files and assemble a combined configuration.  Used in some
  ``zc.buildout`` recipes.

- Converted to using ``zc.buildout`` and the standard test runner from
  ``zope.testing``.

- Added more tests.


ZConfig 2.3.1 (21 Aug 2005)
---------------------------

- Isolated some of the case-normalization code so it will at least be
  easier to override.  This remains non-trivial.


ZConfig 2.3 (18 May 2005)
-------------------------

- Added "inet-binding-address" and "inet-connection-address" to the
  set of standard datatypes.  These are similar to the "inet-address"
  type, but the default hostname is more sensible.  The datatype used
  should reflect how the value will be used.

- Alternate rotating logfile handler for Windows, to avoid platform
  limitations on renaming open files.  Contributed by Sidnei da Silva.

- For <section> and <multisection>, if the name attribute is omitted,
  assume name="*", since this is what is used most often.


ZConfig 2.2 (21 Apr 2004)
-------------------------

- More documentation has been written.

- Added a timedelta datatype function; the input is the same as for
  the time-interval datatype, but the resulting value is a
  datetime.timedelta object.

- Make sure keys specified as attributes of the <default> element are
  converted by the appropriate key type, and are re-checked for
  derived sections.

- Refactored the ZConfig.components.logger schema components so that a
  schema can import just one of the "eventlog" or "logger" sections if
  desired.  This can be helpful to avoid naming conflicts.

- Added a reopen() method to the logger factories.

- Always use an absolute pathname when opening a FileHandler.

- A fix to the logger 'format' key to allow the %(process)d expansion variable
  that the logging package supports.

- A new timedelta built-in datatype was added.  Similar to time-interval
  except that it returns a datetime.timedelta object instead.


ZConfig 2.1 (12 Apr 2004)
-------------------------

- Removed compatibility with Python 2.1 and 2.2.

- Schema components must really be in Python packages; the directory
  search has been modified to perform an import to locate the package
  rather than incorrectly implementing the search algorithm.

- The default objects use for section values now provide a method
  getSectionAttributes(); this returns a list of all the attributes of
  the section object which store configuration-defined data (including
  information derived from the schema).

- Default information can now be included in a schema for <key
  name="+"> and <multikey name="+"> by using <default key="...">.

- More documentation has been added to discuss schema extension.

- Support for a Unicode-free Python has been fixed.

- Derived section types now inherit the datatype of the base type if
  no datatype is identified explicitly.

- Derived section types can now override the keytype instead of always
  inheriting from their base type.

- <import package='...'/> makes use of the current prefix if the
  package name begins witha dot.

- Added two standard datatypes:  dotted-name and dotted-suffix.

- Added two standard schema components: ZConfig.components.basic and
  ZConfig.components.logger.


ZConfig 2.0 (27 Oct 2003)
-------------------------

- Configurations can import additional schema components using a new
  "%import" directive; this can be used to integrate 3rd-party
  components into an application.

- Schemas may be extended using a new "extends" attribute on the
  <schema> element.

- Better error messages when elements in a schema definition are
  improperly nested.

- The "zconfig" script can now simply verify that a schema definition
  is valid, if that's all that's needed.

3 files changed, 126 insertions, 21 deletions

diff --git a/devel/py-zconfig/Makefile b/devel/py-zconfig/Makefile
index 95cf9a42cbe..319b2769570 100644
--- a/devel/py-zconfig/Makefile
+++ b/devel/py-zconfig/Makefile
@@ -1,19 +1,25 @@
-# $NetBSD: Makefile,v 1.7 2008/06/12 02:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/23 11:19:03 obache Exp $
 #
 
-DISTNAME=		ZConfig-1.0
-PKGNAME=		${PYPKGPREFIX}-zconfig-1.0
-PKGREVISION=		1
+DISTNAME=		ZConfig-2.6.1
+PKGNAME=		${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=		devel python
-MASTER_SITES=		http://www.zope.org/Members/fdrake/zconfig/
+MASTER_SITES=		http://pypi.python.org/packages/source/Z/ZConfig/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.zope.org/Members/fdrake/zconfig/
 COMMENT=		Configuration library
+#LICENSE=		zope-public-license-v2.1
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYDISTUTILSPKG=		yes
+USE_LANGUAGES=		# empty
 
-.include "../../lang/python/extension.mk"
+INSTALLATION_DIRS+=	share/doc/py-zconfig
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/zconfig.pdf \
+		${DESTDIR}${PREFIX}/share/doc/py-zconfig
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-zconfig/PLIST b/devel/py-zconfig/PLIST
index 045445261ea..94e1b517141 100644
--- a/devel/py-zconfig/PLIST
+++ b/devel/py-zconfig/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:49:06 joerg Exp $
-${PYSITELIB}/ZConfig/Config.py
-${PYSITELIB}/ZConfig/Config.pyc
-${PYSITELIB}/ZConfig/Config.pyo
-${PYSITELIB}/ZConfig/Context.py
-${PYSITELIB}/ZConfig/Context.pyc
-${PYSITELIB}/ZConfig/Context.pyo
+@comment $NetBSD: PLIST,v 1.4 2010/01/23 11:19:03 obache Exp $
+bin/zconfig
+bin/zconfig_schema2html
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/ZConfig/__init__.py
 ${PYSITELIB}/ZConfig/__init__.pyc
 ${PYSITELIB}/ZConfig/__init__.pyo
@@ -14,6 +15,53 @@ ${PYSITELIB}/ZConfig/cfgparser.pyo
 ${PYSITELIB}/ZConfig/cmdline.py
 ${PYSITELIB}/ZConfig/cmdline.pyc
 ${PYSITELIB}/ZConfig/cmdline.pyo
+${PYSITELIB}/ZConfig/components/__init__.py
+${PYSITELIB}/ZConfig/components/__init__.pyc
+${PYSITELIB}/ZConfig/components/__init__.pyo
+${PYSITELIB}/ZConfig/components/basic/__init__.py
+${PYSITELIB}/ZConfig/components/basic/__init__.pyc
+${PYSITELIB}/ZConfig/components/basic/__init__.pyo
+${PYSITELIB}/ZConfig/components/basic/component.xml
+${PYSITELIB}/ZConfig/components/basic/mapping.py
+${PYSITELIB}/ZConfig/components/basic/mapping.pyc
+${PYSITELIB}/ZConfig/components/basic/mapping.pyo
+${PYSITELIB}/ZConfig/components/basic/mapping.xml
+${PYSITELIB}/ZConfig/components/basic/tests/__init__.py
+${PYSITELIB}/ZConfig/components/basic/tests/__init__.pyc
+${PYSITELIB}/ZConfig/components/basic/tests/__init__.pyo
+${PYSITELIB}/ZConfig/components/basic/tests/test_mapping.py
+${PYSITELIB}/ZConfig/components/basic/tests/test_mapping.pyc
+${PYSITELIB}/ZConfig/components/basic/tests/test_mapping.pyo
+${PYSITELIB}/ZConfig/components/logger/__init__.py
+${PYSITELIB}/ZConfig/components/logger/__init__.pyc
+${PYSITELIB}/ZConfig/components/logger/__init__.pyo
+${PYSITELIB}/ZConfig/components/logger/abstract.xml
+${PYSITELIB}/ZConfig/components/logger/base-logger.xml
+${PYSITELIB}/ZConfig/components/logger/component.xml
+${PYSITELIB}/ZConfig/components/logger/datatypes.py
+${PYSITELIB}/ZConfig/components/logger/datatypes.pyc
+${PYSITELIB}/ZConfig/components/logger/datatypes.pyo
+${PYSITELIB}/ZConfig/components/logger/eventlog.xml
+${PYSITELIB}/ZConfig/components/logger/factory.py
+${PYSITELIB}/ZConfig/components/logger/factory.pyc
+${PYSITELIB}/ZConfig/components/logger/factory.pyo
+${PYSITELIB}/ZConfig/components/logger/handlers.py
+${PYSITELIB}/ZConfig/components/logger/handlers.pyc
+${PYSITELIB}/ZConfig/components/logger/handlers.pyo
+${PYSITELIB}/ZConfig/components/logger/handlers.xml
+${PYSITELIB}/ZConfig/components/logger/logger.py
+${PYSITELIB}/ZConfig/components/logger/logger.pyc
+${PYSITELIB}/ZConfig/components/logger/logger.pyo
+${PYSITELIB}/ZConfig/components/logger/logger.xml
+${PYSITELIB}/ZConfig/components/logger/loghandler.py
+${PYSITELIB}/ZConfig/components/logger/loghandler.pyc
+${PYSITELIB}/ZConfig/components/logger/loghandler.pyo
+${PYSITELIB}/ZConfig/components/logger/tests/__init__.py
+${PYSITELIB}/ZConfig/components/logger/tests/__init__.pyc
+${PYSITELIB}/ZConfig/components/logger/tests/__init__.pyo
+${PYSITELIB}/ZConfig/components/logger/tests/test_logger.py
+${PYSITELIB}/ZConfig/components/logger/tests/test_logger.pyc
+${PYSITELIB}/ZConfig/components/logger/tests/test_logger.pyo
 ${PYSITELIB}/ZConfig/datatypes.py
 ${PYSITELIB}/ZConfig/datatypes.pyc
 ${PYSITELIB}/ZConfig/datatypes.pyo
@@ -29,24 +77,60 @@ ${PYSITELIB}/ZConfig/matcher.pyo
 ${PYSITELIB}/ZConfig/schema.py
 ${PYSITELIB}/ZConfig/schema.pyc
 ${PYSITELIB}/ZConfig/schema.pyo
+${PYSITELIB}/ZConfig/schemaless.py
+${PYSITELIB}/ZConfig/schemaless.pyc
+${PYSITELIB}/ZConfig/schemaless.pyo
+${PYSITELIB}/ZConfig/schemaless.txt
 ${PYSITELIB}/ZConfig/substitution.py
 ${PYSITELIB}/ZConfig/substitution.pyc
 ${PYSITELIB}/ZConfig/substitution.pyo
 ${PYSITELIB}/ZConfig/tests/__init__.py
 ${PYSITELIB}/ZConfig/tests/__init__.pyc
 ${PYSITELIB}/ZConfig/tests/__init__.pyo
-${PYSITELIB}/ZConfig/tests/runtests.py
-${PYSITELIB}/ZConfig/tests/runtests.pyc
-${PYSITELIB}/ZConfig/tests/runtests.pyo
+${PYSITELIB}/ZConfig/tests/foosample.zip
+${PYSITELIB}/ZConfig/tests/input/base-datatype1.xml
+${PYSITELIB}/ZConfig/tests/input/base-datatype2.xml
+${PYSITELIB}/ZConfig/tests/input/base-keytype1.xml
+${PYSITELIB}/ZConfig/tests/input/base-keytype2.xml
+${PYSITELIB}/ZConfig/tests/input/base.xml
+${PYSITELIB}/ZConfig/tests/input/include.conf
+${PYSITELIB}/ZConfig/tests/input/inner.conf
+${PYSITELIB}/ZConfig/tests/input/library.xml
+${PYSITELIB}/ZConfig/tests/input/logger.xml
+${PYSITELIB}/ZConfig/tests/input/outer.conf
+${PYSITELIB}/ZConfig/tests/input/simple.conf
+${PYSITELIB}/ZConfig/tests/input/simple.xml
+${PYSITELIB}/ZConfig/tests/input/simplesections.conf
+${PYSITELIB}/ZConfig/tests/input/simplesections.xml
+${PYSITELIB}/ZConfig/tests/library/README.txt
+${PYSITELIB}/ZConfig/tests/library/__init__.py
+${PYSITELIB}/ZConfig/tests/library/__init__.pyc
+${PYSITELIB}/ZConfig/tests/library/__init__.pyo
+${PYSITELIB}/ZConfig/tests/library/thing/__init__.py
+${PYSITELIB}/ZConfig/tests/library/thing/__init__.pyc
+${PYSITELIB}/ZConfig/tests/library/thing/__init__.pyo
+${PYSITELIB}/ZConfig/tests/library/thing/component.xml
+${PYSITELIB}/ZConfig/tests/library/thing/extras/extras.xml
+${PYSITELIB}/ZConfig/tests/library/widget/__init__.py
+${PYSITELIB}/ZConfig/tests/library/widget/__init__.pyc
+${PYSITELIB}/ZConfig/tests/library/widget/__init__.pyo
+${PYSITELIB}/ZConfig/tests/library/widget/component.xml
+${PYSITELIB}/ZConfig/tests/library/widget/extra.xml
 ${PYSITELIB}/ZConfig/tests/support.py
 ${PYSITELIB}/ZConfig/tests/support.pyc
 ${PYSITELIB}/ZConfig/tests/support.pyo
+${PYSITELIB}/ZConfig/tests/test_cfgimports.py
+${PYSITELIB}/ZConfig/tests/test_cfgimports.pyc
+${PYSITELIB}/ZConfig/tests/test_cfgimports.pyo
 ${PYSITELIB}/ZConfig/tests/test_cmdline.py
 ${PYSITELIB}/ZConfig/tests/test_cmdline.pyc
 ${PYSITELIB}/ZConfig/tests/test_cmdline.pyo
 ${PYSITELIB}/ZConfig/tests/test_config.py
 ${PYSITELIB}/ZConfig/tests/test_config.pyc
 ${PYSITELIB}/ZConfig/tests/test_config.pyo
+${PYSITELIB}/ZConfig/tests/test_cookbook.py
+${PYSITELIB}/ZConfig/tests/test_cookbook.pyc
+${PYSITELIB}/ZConfig/tests/test_cookbook.pyo
 ${PYSITELIB}/ZConfig/tests/test_datatypes.py
 ${PYSITELIB}/ZConfig/tests/test_datatypes.pyc
 ${PYSITELIB}/ZConfig/tests/test_datatypes.pyo
@@ -56,9 +140,24 @@ ${PYSITELIB}/ZConfig/tests/test_loader.pyo
 ${PYSITELIB}/ZConfig/tests/test_schema.py
 ${PYSITELIB}/ZConfig/tests/test_schema.pyc
 ${PYSITELIB}/ZConfig/tests/test_schema.pyo
+${PYSITELIB}/ZConfig/tests/test_schemaless.py
+${PYSITELIB}/ZConfig/tests/test_schemaless.pyc
+${PYSITELIB}/ZConfig/tests/test_schemaless.pyo
 ${PYSITELIB}/ZConfig/tests/test_subst.py
 ${PYSITELIB}/ZConfig/tests/test_subst.pyc
 ${PYSITELIB}/ZConfig/tests/test_subst.pyo
+${PYSITELIB}/ZConfig/tests/zipsource/README.txt
+${PYSITELIB}/ZConfig/tests/zipsource/foo/__init__.py
+${PYSITELIB}/ZConfig/tests/zipsource/foo/__init__.pyc
+${PYSITELIB}/ZConfig/tests/zipsource/foo/__init__.pyo
+${PYSITELIB}/ZConfig/tests/zipsource/foo/sample/__init__.py
+${PYSITELIB}/ZConfig/tests/zipsource/foo/sample/__init__.pyc
+${PYSITELIB}/ZConfig/tests/zipsource/foo/sample/__init__.pyo
+${PYSITELIB}/ZConfig/tests/zipsource/foo/sample/component.xml
+${PYSITELIB}/ZConfig/tests/zipsource/foo/sample/datatypes.py
+${PYSITELIB}/ZConfig/tests/zipsource/foo/sample/datatypes.pyc
+${PYSITELIB}/ZConfig/tests/zipsource/foo/sample/datatypes.pyo
 ${PYSITELIB}/ZConfig/url.py
 ${PYSITELIB}/ZConfig/url.pyc
 ${PYSITELIB}/ZConfig/url.pyo
+share/doc/py-zconfig/zconfig.pdf
diff --git a/devel/py-zconfig/distinfo b/devel/py-zconfig/distinfo
index 6c365781a86..67b7b134882 100644
--- a/devel/py-zconfig/distinfo
+++ b/devel/py-zconfig/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 22:24:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2010/01/23 11:19:03 obache Exp $
 
-SHA1 (ZConfig-1.0.tar.gz) = 55c8cda06ca294044fd9be724cb402df11a6533c
-RMD160 (ZConfig-1.0.tar.gz) = 2dbac740b842ea2acb444fb4e6651a7585dcaaa5
-Size (ZConfig-1.0.tar.gz) = 104083 bytes
+SHA1 (ZConfig-2.6.1.tar.gz) = 720e213a83f63407ac810cd02b2768fd4ef0bcf1
+RMD160 (ZConfig-2.6.1.tar.gz) = bce5ad7119b532691fb4494cd6c7ea65120e839c
+Size (ZConfig-2.6.1.tar.gz) = 251631 bytes