Changes 1.1.2:

* 809: Include custom fixers in the source distribution.

Changes 1.1.1:
* 791: Fix QtHelp, DevHelp and HtmlHelp index entry links.
* 792: Include "sphinx-apidoc" in the source distribution.
* 797: Don't crash on a misformatted glossary.
* 801: Make intersphinx work properly without SSL support.
* 805: Make the ``Sphinx.add_index_to_domain`` method work correctly.
* 780: Fix Python 2.5 compatibility.

3 files changed, 123 insertions, 14 deletions

diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile
index 7aa943f9cd0..0246ebc69a1 100644
--- a/textproc/py-sphinx/Makefile
+++ b/textproc/py-sphinx/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2011/10/05 07:53:27 obache Exp $
+# $NetBSD: Makefile,v 1.11 2011/11/28 10:48:25 adam Exp $
 
-DISTNAME=	Sphinx-1.0.8
+DISTNAME=	Sphinx-1.1.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
 MASTER_SITES=	http://pypi.python.org/packages/source/S/Sphinx/
diff --git a/textproc/py-sphinx/PLIST b/textproc/py-sphinx/PLIST
index 41316d15a80..63d5ed63b26 100644
--- a/textproc/py-sphinx/PLIST
+++ b/textproc/py-sphinx/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2010/09/27 10:29:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/11/28 10:48:25 adam Exp $
+bin/sphinx-apidoc
 bin/sphinx-autogen
 bin/sphinx-build
 bin/sphinx-quickstart
@@ -15,6 +16,9 @@ ${PYSITELIB}/sphinx/__init__.pyo
 ${PYSITELIB}/sphinx/addnodes.py
 ${PYSITELIB}/sphinx/addnodes.pyc
 ${PYSITELIB}/sphinx/addnodes.pyo
+${PYSITELIB}/sphinx/apidoc.py
+${PYSITELIB}/sphinx/apidoc.pyc
+${PYSITELIB}/sphinx/apidoc.pyo
 ${PYSITELIB}/sphinx/application.py
 ${PYSITELIB}/sphinx/application.pyc
 ${PYSITELIB}/sphinx/application.pyo
@@ -30,6 +34,9 @@ ${PYSITELIB}/sphinx/builders/devhelp.pyo
 ${PYSITELIB}/sphinx/builders/epub.py
 ${PYSITELIB}/sphinx/builders/epub.pyc
 ${PYSITELIB}/sphinx/builders/epub.pyo
+${PYSITELIB}/sphinx/builders/gettext.py
+${PYSITELIB}/sphinx/builders/gettext.pyc
+${PYSITELIB}/sphinx/builders/gettext.pyo
 ${PYSITELIB}/sphinx/builders/html.py
 ${PYSITELIB}/sphinx/builders/html.pyc
 ${PYSITELIB}/sphinx/builders/html.pyo
@@ -48,9 +55,15 @@ ${PYSITELIB}/sphinx/builders/manpage.pyo
 ${PYSITELIB}/sphinx/builders/qthelp.py
 ${PYSITELIB}/sphinx/builders/qthelp.pyc
 ${PYSITELIB}/sphinx/builders/qthelp.pyo
+${PYSITELIB}/sphinx/builders/texinfo.py
+${PYSITELIB}/sphinx/builders/texinfo.pyc
+${PYSITELIB}/sphinx/builders/texinfo.pyo
 ${PYSITELIB}/sphinx/builders/text.py
 ${PYSITELIB}/sphinx/builders/text.pyc
 ${PYSITELIB}/sphinx/builders/text.pyo
+${PYSITELIB}/sphinx/builders/websupport.py
+${PYSITELIB}/sphinx/builders/websupport.pyc
+${PYSITELIB}/sphinx/builders/websupport.pyo
 ${PYSITELIB}/sphinx/cmdline.py
 ${PYSITELIB}/sphinx/cmdline.pyc
 ${PYSITELIB}/sphinx/cmdline.pyo
@@ -135,6 +148,9 @@ ${PYSITELIB}/sphinx/ext/jsmath.pyo
 ${PYSITELIB}/sphinx/ext/mathbase.py
 ${PYSITELIB}/sphinx/ext/mathbase.pyc
 ${PYSITELIB}/sphinx/ext/mathbase.pyo
+${PYSITELIB}/sphinx/ext/mathjax.py
+${PYSITELIB}/sphinx/ext/mathjax.pyc
+${PYSITELIB}/sphinx/ext/mathjax.pyo
 ${PYSITELIB}/sphinx/ext/oldcmarkup.py
 ${PYSITELIB}/sphinx/ext/oldcmarkup.pyc
 ${PYSITELIB}/sphinx/ext/oldcmarkup.pyo
@@ -177,6 +193,12 @@ ${PYSITELIB}/sphinx/locale/de/LC_MESSAGES/sphinx.po
 ${PYSITELIB}/sphinx/locale/es/LC_MESSAGES/sphinx.js
 ${PYSITELIB}/sphinx/locale/es/LC_MESSAGES/sphinx.mo
 ${PYSITELIB}/sphinx/locale/es/LC_MESSAGES/sphinx.po
+${PYSITELIB}/sphinx/locale/et/LC_MESSAGES/sphinx.js
+${PYSITELIB}/sphinx/locale/et/LC_MESSAGES/sphinx.mo
+${PYSITELIB}/sphinx/locale/et/LC_MESSAGES/sphinx.po
+${PYSITELIB}/sphinx/locale/fa/LC_MESSAGES/sphinx.js
+${PYSITELIB}/sphinx/locale/fa/LC_MESSAGES/sphinx.mo
+${PYSITELIB}/sphinx/locale/fa/LC_MESSAGES/sphinx.po
 ${PYSITELIB}/sphinx/locale/fi/LC_MESSAGES/sphinx.js
 ${PYSITELIB}/sphinx/locale/fi/LC_MESSAGES/sphinx.mo
 ${PYSITELIB}/sphinx/locale/fi/LC_MESSAGES/sphinx.po
@@ -192,9 +214,18 @@ ${PYSITELIB}/sphinx/locale/it/LC_MESSAGES/sphinx.po
 ${PYSITELIB}/sphinx/locale/ja/LC_MESSAGES/sphinx.js
 ${PYSITELIB}/sphinx/locale/ja/LC_MESSAGES/sphinx.mo
 ${PYSITELIB}/sphinx/locale/ja/LC_MESSAGES/sphinx.po
+${PYSITELIB}/sphinx/locale/ko/LC_MESSAGES/sphinx.js
+${PYSITELIB}/sphinx/locale/ko/LC_MESSAGES/sphinx.mo
+${PYSITELIB}/sphinx/locale/ko/LC_MESSAGES/sphinx.po
 ${PYSITELIB}/sphinx/locale/lt/LC_MESSAGES/sphinx.js
 ${PYSITELIB}/sphinx/locale/lt/LC_MESSAGES/sphinx.mo
 ${PYSITELIB}/sphinx/locale/lt/LC_MESSAGES/sphinx.po
+${PYSITELIB}/sphinx/locale/lv/LC_MESSAGES/sphinx.js
+${PYSITELIB}/sphinx/locale/lv/LC_MESSAGES/sphinx.mo
+${PYSITELIB}/sphinx/locale/lv/LC_MESSAGES/sphinx.po
+${PYSITELIB}/sphinx/locale/ne/LC_MESSAGES/sphinx.js
+${PYSITELIB}/sphinx/locale/ne/LC_MESSAGES/sphinx.mo
+${PYSITELIB}/sphinx/locale/ne/LC_MESSAGES/sphinx.po
 ${PYSITELIB}/sphinx/locale/nl/LC_MESSAGES/sphinx.js
 ${PYSITELIB}/sphinx/locale/nl/LC_MESSAGES/sphinx.mo
 ${PYSITELIB}/sphinx/locale/nl/LC_MESSAGES/sphinx.po
@@ -211,6 +242,9 @@ ${PYSITELIB}/sphinx/locale/sl/LC_MESSAGES/sphinx.js
 ${PYSITELIB}/sphinx/locale/sl/LC_MESSAGES/sphinx.mo
 ${PYSITELIB}/sphinx/locale/sl/LC_MESSAGES/sphinx.po
 ${PYSITELIB}/sphinx/locale/sphinx.pot
+${PYSITELIB}/sphinx/locale/sv/LC_MESSAGES/sphinx.js
+${PYSITELIB}/sphinx/locale/sv/LC_MESSAGES/sphinx.mo
+${PYSITELIB}/sphinx/locale/sv/LC_MESSAGES/sphinx.po
 ${PYSITELIB}/sphinx/locale/tr/LC_MESSAGES/sphinx.js
 ${PYSITELIB}/sphinx/locale/tr/LC_MESSAGES/sphinx.mo
 ${PYSITELIB}/sphinx/locale/tr/LC_MESSAGES/sphinx.po
@@ -254,15 +288,24 @@ ${PYSITELIB}/sphinx/pycode/pgen2/token.pyo
 ${PYSITELIB}/sphinx/pycode/pgen2/tokenize.py
 ${PYSITELIB}/sphinx/pycode/pgen2/tokenize.pyc
 ${PYSITELIB}/sphinx/pycode/pgen2/tokenize.pyo
+${PYSITELIB}/sphinx/pygments_styles.py
+${PYSITELIB}/sphinx/pygments_styles.pyc
+${PYSITELIB}/sphinx/pygments_styles.pyo
 ${PYSITELIB}/sphinx/quickstart.py
 ${PYSITELIB}/sphinx/quickstart.pyc
 ${PYSITELIB}/sphinx/quickstart.pyo
 ${PYSITELIB}/sphinx/roles.py
 ${PYSITELIB}/sphinx/roles.pyc
 ${PYSITELIB}/sphinx/roles.pyo
-${PYSITELIB}/sphinx/search.py
-${PYSITELIB}/sphinx/search.pyc
-${PYSITELIB}/sphinx/search.pyo
+${PYSITELIB}/sphinx/search/__init__.py
+${PYSITELIB}/sphinx/search/__init__.pyc
+${PYSITELIB}/sphinx/search/__init__.pyo
+${PYSITELIB}/sphinx/search/en.py
+${PYSITELIB}/sphinx/search/en.pyc
+${PYSITELIB}/sphinx/search/en.pyo
+${PYSITELIB}/sphinx/search/ja.py
+${PYSITELIB}/sphinx/search/ja.pyc
+${PYSITELIB}/sphinx/search/ja.pyo
 ${PYSITELIB}/sphinx/setup_command.py
 ${PYSITELIB}/sphinx/setup_command.pyc
 ${PYSITELIB}/sphinx/setup_command.pyo
@@ -294,20 +337,31 @@ ${PYSITELIB}/sphinx/themes/basic/page.html
 ${PYSITELIB}/sphinx/themes/basic/relations.html
 ${PYSITELIB}/sphinx/themes/basic/search.html
 ${PYSITELIB}/sphinx/themes/basic/searchbox.html
+${PYSITELIB}/sphinx/themes/basic/searchresults.html
 ${PYSITELIB}/sphinx/themes/basic/sourcelink.html
-${PYSITELIB}/sphinx/themes/basic/static/basic.css
+${PYSITELIB}/sphinx/themes/basic/static/ajax-loader.gif
+${PYSITELIB}/sphinx/themes/basic/static/basic.css_t
+${PYSITELIB}/sphinx/themes/basic/static/comment-bright.png
+${PYSITELIB}/sphinx/themes/basic/static/comment-close.png
+${PYSITELIB}/sphinx/themes/basic/static/comment.png
 ${PYSITELIB}/sphinx/themes/basic/static/doctools.js
+${PYSITELIB}/sphinx/themes/basic/static/down-pressed.png
+${PYSITELIB}/sphinx/themes/basic/static/down.png
 ${PYSITELIB}/sphinx/themes/basic/static/file.png
 ${PYSITELIB}/sphinx/themes/basic/static/jquery.js
 ${PYSITELIB}/sphinx/themes/basic/static/minus.png
 ${PYSITELIB}/sphinx/themes/basic/static/plus.png
-${PYSITELIB}/sphinx/themes/basic/static/searchtools.js
+${PYSITELIB}/sphinx/themes/basic/static/searchtools.js_t
 ${PYSITELIB}/sphinx/themes/basic/static/underscore.js
+${PYSITELIB}/sphinx/themes/basic/static/up-pressed.png
+${PYSITELIB}/sphinx/themes/basic/static/up.png
+${PYSITELIB}/sphinx/themes/basic/static/websupport.js
 ${PYSITELIB}/sphinx/themes/basic/theme.conf
 ${PYSITELIB}/sphinx/themes/default/layout.html
 ${PYSITELIB}/sphinx/themes/default/static/default.css_t
 ${PYSITELIB}/sphinx/themes/default/static/sidebar.js
 ${PYSITELIB}/sphinx/themes/default/theme.conf
+${PYSITELIB}/sphinx/themes/epub/epub-cover.html
 ${PYSITELIB}/sphinx/themes/epub/layout.html
 ${PYSITELIB}/sphinx/themes/epub/static/epub.css
 ${PYSITELIB}/sphinx/themes/epub/theme.conf
@@ -320,6 +374,19 @@ ${PYSITELIB}/sphinx/themes/haiku/static/haiku.css_t
 ${PYSITELIB}/sphinx/themes/haiku/theme.conf
 ${PYSITELIB}/sphinx/themes/nature/static/nature.css_t
 ${PYSITELIB}/sphinx/themes/nature/theme.conf
+${PYSITELIB}/sphinx/themes/pyramid/layout.html
+${PYSITELIB}/sphinx/themes/pyramid/static/dialog-note.png
+${PYSITELIB}/sphinx/themes/pyramid/static/dialog-seealso.png
+${PYSITELIB}/sphinx/themes/pyramid/static/dialog-topic.png
+${PYSITELIB}/sphinx/themes/pyramid/static/dialog-warning.png
+${PYSITELIB}/sphinx/themes/pyramid/static/epub.css
+${PYSITELIB}/sphinx/themes/pyramid/static/footerbg.png
+${PYSITELIB}/sphinx/themes/pyramid/static/headerbg.png
+${PYSITELIB}/sphinx/themes/pyramid/static/ie6.css
+${PYSITELIB}/sphinx/themes/pyramid/static/middlebg.png
+${PYSITELIB}/sphinx/themes/pyramid/static/pyramid.css_t
+${PYSITELIB}/sphinx/themes/pyramid/static/transparent.gif
+${PYSITELIB}/sphinx/themes/pyramid/theme.conf
 ${PYSITELIB}/sphinx/themes/scrolls/artwork/logo.svg
 ${PYSITELIB}/sphinx/themes/scrolls/layout.html
 ${PYSITELIB}/sphinx/themes/scrolls/static/darkmetal.png
@@ -336,9 +403,9 @@ ${PYSITELIB}/sphinx/themes/scrolls/theme.conf
 ${PYSITELIB}/sphinx/themes/sphinxdoc/layout.html
 ${PYSITELIB}/sphinx/themes/sphinxdoc/static/contents.png
 ${PYSITELIB}/sphinx/themes/sphinxdoc/static/navigation.png
-${PYSITELIB}/sphinx/themes/sphinxdoc/static/sphinxdoc.css
+${PYSITELIB}/sphinx/themes/sphinxdoc/static/sphinxdoc.css_t
 ${PYSITELIB}/sphinx/themes/sphinxdoc/theme.conf
-${PYSITELIB}/sphinx/themes/traditional/static/traditional.css
+${PYSITELIB}/sphinx/themes/traditional/static/traditional.css_t
 ${PYSITELIB}/sphinx/themes/traditional/theme.conf
 ${PYSITELIB}/sphinx/theming.py
 ${PYSITELIB}/sphinx/theming.pyc
@@ -394,6 +461,42 @@ ${PYSITELIB}/sphinx/util/tags.pyo
 ${PYSITELIB}/sphinx/util/texescape.py
 ${PYSITELIB}/sphinx/util/texescape.pyc
 ${PYSITELIB}/sphinx/util/texescape.pyo
+${PYSITELIB}/sphinx/util/websupport.py
+${PYSITELIB}/sphinx/util/websupport.pyc
+${PYSITELIB}/sphinx/util/websupport.pyo
+${PYSITELIB}/sphinx/versioning.py
+${PYSITELIB}/sphinx/versioning.pyc
+${PYSITELIB}/sphinx/versioning.pyo
+${PYSITELIB}/sphinx/websupport/__init__.py
+${PYSITELIB}/sphinx/websupport/__init__.pyc
+${PYSITELIB}/sphinx/websupport/__init__.pyo
+${PYSITELIB}/sphinx/websupport/errors.py
+${PYSITELIB}/sphinx/websupport/errors.pyc
+${PYSITELIB}/sphinx/websupport/errors.pyo
+${PYSITELIB}/sphinx/websupport/search/__init__.py
+${PYSITELIB}/sphinx/websupport/search/__init__.pyc
+${PYSITELIB}/sphinx/websupport/search/__init__.pyo
+${PYSITELIB}/sphinx/websupport/search/nullsearch.py
+${PYSITELIB}/sphinx/websupport/search/nullsearch.pyc
+${PYSITELIB}/sphinx/websupport/search/nullsearch.pyo
+${PYSITELIB}/sphinx/websupport/search/whooshsearch.py
+${PYSITELIB}/sphinx/websupport/search/whooshsearch.pyc
+${PYSITELIB}/sphinx/websupport/search/whooshsearch.pyo
+${PYSITELIB}/sphinx/websupport/search/xapiansearch.py
+${PYSITELIB}/sphinx/websupport/search/xapiansearch.pyc
+${PYSITELIB}/sphinx/websupport/search/xapiansearch.pyo
+${PYSITELIB}/sphinx/websupport/storage/__init__.py
+${PYSITELIB}/sphinx/websupport/storage/__init__.pyc
+${PYSITELIB}/sphinx/websupport/storage/__init__.pyo
+${PYSITELIB}/sphinx/websupport/storage/differ.py
+${PYSITELIB}/sphinx/websupport/storage/differ.pyc
+${PYSITELIB}/sphinx/websupport/storage/differ.pyo
+${PYSITELIB}/sphinx/websupport/storage/sqlalchemy_db.py
+${PYSITELIB}/sphinx/websupport/storage/sqlalchemy_db.pyc
+${PYSITELIB}/sphinx/websupport/storage/sqlalchemy_db.pyo
+${PYSITELIB}/sphinx/websupport/storage/sqlalchemystorage.py
+${PYSITELIB}/sphinx/websupport/storage/sqlalchemystorage.pyc
+${PYSITELIB}/sphinx/websupport/storage/sqlalchemystorage.pyo
 ${PYSITELIB}/sphinx/writers/__init__.py
 ${PYSITELIB}/sphinx/writers/__init__.pyc
 ${PYSITELIB}/sphinx/writers/__init__.pyo
@@ -406,6 +509,12 @@ ${PYSITELIB}/sphinx/writers/latex.pyo
 ${PYSITELIB}/sphinx/writers/manpage.py
 ${PYSITELIB}/sphinx/writers/manpage.pyc
 ${PYSITELIB}/sphinx/writers/manpage.pyo
+${PYSITELIB}/sphinx/writers/texinfo.py
+${PYSITELIB}/sphinx/writers/texinfo.pyc
+${PYSITELIB}/sphinx/writers/texinfo.pyo
 ${PYSITELIB}/sphinx/writers/text.py
 ${PYSITELIB}/sphinx/writers/text.pyc
 ${PYSITELIB}/sphinx/writers/text.pyo
+${PYSITELIB}/sphinx/writers/websupport.py
+${PYSITELIB}/sphinx/writers/websupport.pyc
+${PYSITELIB}/sphinx/writers/websupport.pyo
diff --git a/textproc/py-sphinx/distinfo b/textproc/py-sphinx/distinfo
index 8870fc0031b..7fedae77377 100644
--- a/textproc/py-sphinx/distinfo
+++ b/textproc/py-sphinx/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2011/10/05 07:53:27 obache Exp $
+$NetBSD: distinfo,v 1.9 2011/11/28 10:48:25 adam Exp $
 
-SHA1 (Sphinx-1.0.8.tar.gz) = 0301700e51f9610b6e2bc3df06ec97a8d80883d5
-RMD160 (Sphinx-1.0.8.tar.gz) = 3d09880012f7dc26268923a3e0b13e8ab1250ae4
-Size (Sphinx-1.0.8.tar.gz) = 2289041 bytes
+SHA1 (Sphinx-1.1.2.tar.gz) = 92f422474e43345ab69dedceeedfd7d18c55da2d
+RMD160 (Sphinx-1.1.2.tar.gz) = 0cf4f8d799b239d54248b9abf8b40680086b7320
+Size (Sphinx-1.1.2.tar.gz) = 2624636 bytes