Update py-Optik to 1.5.3.

Based on PR#41674 by Kamel Derouiche.

1.5.3 (23 Jul 2006)
-------------------

  * Port r47026 from Python svn repository: fix unit test so
    it doesn't screw up other tests in the Python test suite.

1.5.2 (22 Jul 2006)
-------------------

  * Minor documentation tweaks.

  * SF bug #1498146: handle Unicode help strings (affects option help,
    description, and epilog).

1.5.1 (19 Apr 2006)
-------------------

  * Fix so the 'merge' script works again (bugs spotted, and mostly
    fixed, by Andrea 'fwyzard' Bocci).

  * SF bug #1145594: add 'destroy()' method to OptionParser so
    applications can explicitly break reference cycles, making life
    easier for Python's garbage collector.

  * SF feature #988126: add 'epilog' attribute to OptionParser
    (and constructor arg): paragraph of text to print after the
    main option help.

  * Corrected French translation (po/optik/fr.po) (Laurent Laporte).

  * Beefed up reference guide.

  * Backported to Python 2.0/2.1 (Giovanni Bajo).

1.5 (6 Dec 2004)
----------------

(All changes first released in Optik 1.5a1 except as noted.)

  * Optik now requires Python 2.2 or later.

  * Add expansion of default values in help text: the string
    "%default" in an option's help string is expanded to str() of
    that option's default value, or "none" if no default value.

  * SF bug #955889: option default values that happen to be strings are
    now processed in the same way as values from the command line; this
    allows generation of nicer help when using custom types.  Can
    be disabled with parser.set_process_default_values(False).

  * SF bug #960515: don't crash when generating help for callback
    options that specify 'type', but not 'dest' or 'metavar'.

  * SF feature #815264: change the default help format for short options
    that take an argument from e.g. "-oARG" to "-o ARG"; add
    set_short_opt_delimiter() and set_long_opt_delimiter() methods to
    HelpFormatter to allow (slight) customization of the formatting.

  * SF patch #736940: internationalize Optik: all built-in user-
    targeted literal strings are passed through gettext.gettext().  Also
    added po/ directory for message catalog and translations, so that
    Optik-based applications have a single place to go for translations
    of Optik's built-in messags.  Include translations for Danish and
    German (thanks to Frederik S. Olesen and Martin v. L
    respectively), and partial translations for French (by me).

  * SF bug #878453 (Python): respect $COLUMNS environment variable for
    wrapping help output.

  * SF feature #964317: allow type objects to specify option types;
    allow "str" as an alias for "string".

  * SF feature #988122: expand "%prog" in the 'description' passed
    to OptionParser, just like in the 'usage' and 'version' strings.
    (This is *not* done in the 'description' passed to OptionGroup.)

  * Added HTML-formatted docs to the source distribution (in addition
    to the reStructuredText source files).

  * Added three new examples: custom_source.py, custom_type.py, and
    no_help.py.

  * Remove the old, broken "ignore" option conflict handler -- was
    only needed for compatibility with Optik 1.1.

  * Move documentation into docs/ directory, and write a script
    (mkpydoc) to automatically convert it to LaTeX for the Python
    standard library manual.  Many documentation improvements.
    (1.5a2)

  * SF #997100: attempt to avoid triggering a FutureWarning in
    __repr__() when using id() with "%x" (1.5a2).

  * SF #1048725: fix typo in Values.__eq__() introduced in 1.5a1.

  * Fix test script so it plays nice when being run with other test
    scripts (as in the Python test suite) (1.5a2).

  * SF patch #870807: allow users to specify integer option arguments
    in hexadecimal, octal, or binary with leading "0x", "0", or "0b"
    (1.5 final).

  * SF feature #1050184: add 'append_const' action (patch by
    Andrea 'fwyzard' Bocci) (1.5 final).

  * Keep going if importing gettext fails (so optparse can be used
    in the Python build process) (1.5 final).


Python 2.3 (29 July 2003)
-------------------------

(A couple of fixes were made in Optik in time for its inclusion in
Python 2.3 as optparse, but I never got around to making a corresponding
bug-fix release of Optik.)

  * Add __all__ to optik package and optparse module (fixes
    SF bug #728563).

  * Fix so the 'prog' attribute of OptionParser (which was
    surreptitiously added in 1.4.1, but undocumented, untested,
    and not working) actually works.


1.4.1 (20 Apr 2003)
-------------------

  * Changed to use the new textwrap module included with Python 2.3.
    Includes a copy of textwrap.py for use with older Python versions.

  * Set __all__ in each of the optik.* modules, to make life easier for
    optik/__init__.py.

  * Rewrote the test suite to use PyUnit, and added some new tests
    that revealed some long-hidden bugs.  Fixed those bugs.
    (Thanks to Johannes Gijsbers for doing all the work!)

  * For versions of Python with builtin True and False values (ie.
    Python 2.2.1 and later), make store_true/store_false use them.

  * Add forwards-compatibility 'optparse' module, so scripts can
    import from 'optparse' and work under base Python 2.3, or
    under older Pythons with Optik 1.4.1 or later installed.

3 files changed, 19 insertions, 10 deletions

diff --git a/devel/py-Optik/Makefile b/devel/py-Optik/Makefile
index 6cce979a42f..5d9a5a60187 100644
--- a/devel/py-Optik/Makefile
+++ b/devel/py-Optik/Makefile
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.13 2008/06/12 02:14:28 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/04 10:35:28 obache Exp $
 
-DISTNAME=	Optik-1.4
-PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	1
+DISTNAME=	optik-1.5.3
+PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/optik/Optik/}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=optik/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://optik.sourceforge.net/
 COMMENT=	Command line parsing library for Python
+LICENSE=	modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYDISTUTILSPKG=	# defined
+PYDISTUTILSPKG=	yes
+
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} test/test_optik.py
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-Optik/PLIST b/devel/py-Optik/PLIST
index c199c6e8945..fb71182b393 100644
--- a/devel/py-Optik/PLIST
+++ b/devel/py-Optik/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/02/04 10:35:28 obache Exp $
 ${PYSITELIB}/optik/__init__.py
 ${PYSITELIB}/optik/__init__.pyc
 ${PYSITELIB}/optik/__init__.pyo
@@ -14,3 +14,9 @@ ${PYSITELIB}/optik/option.pyo
 ${PYSITELIB}/optik/option_parser.py
 ${PYSITELIB}/optik/option_parser.pyc
 ${PYSITELIB}/optik/option_parser.pyo
+${PYSITELIB}/optik/textwrap.py
+${PYSITELIB}/optik/textwrap.pyc
+${PYSITELIB}/optik/textwrap.pyo
+${PYSITELIB}/optparse.py
+${PYSITELIB}/optparse.pyc
+${PYSITELIB}/optparse.pyo
diff --git a/devel/py-Optik/distinfo b/devel/py-Optik/distinfo
index 073d1030b28..8eb96612971 100644
--- a/devel/py-Optik/distinfo
+++ b/devel/py-Optik/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 22:24:31 agc Exp $
+$NetBSD: distinfo,v 1.5 2010/02/04 10:35:28 obache Exp $
 
-SHA1 (Optik-1.4.tar.gz) = 311f159842ddea735653a4b125bf130a81c3ecf7
-RMD160 (Optik-1.4.tar.gz) = f83442943c280ef1cdd1c6545e2d2ad71f4ff2a0
-Size (Optik-1.4.tar.gz) = 42752 bytes
+SHA1 (optik-1.5.3.tar.gz) = e4718ed19bf15cf7d882b369e9e5de7c352d7fb5
+RMD160 (optik-1.5.3.tar.gz) = 01791efdcc7f1974a9f19b299b3e2ef066605056
+Size (optik-1.5.3.tar.gz) = 86179 bytes