Update to 2.2.1

* Fix MASTER_SITES, sf.net no longer has distfile.
* Fix HOMEPAGE.

Changelog:
* Change command name to markdown_py from markdown.
* Drop python 2.3 and 2.4 support.
* Many bugfixes.

3 files changed, 31 insertions, 21 deletions

diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index 3f774aa23e1..d243efe5e61 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2012/10/25 06:56:51 asau Exp $
+# $NetBSD: Makefile,v 1.6 2013/02/19 19:41:28 ryoon Exp $
 
-DISTNAME=	Markdown-2.0.3
+DISTNAME=	Markdown-2.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
-PKGREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-markdown/} \
-		http://pypi.python.org/packages/source/M/Markdown/
+MASTER_SITES=	http://pypi.python.org/packages/source/M/Markdown/
 
 MAINTAINER=	joerg@NetBSD.org
-HOMEPAGE=	http://www.freewisdom.org/projects/python-markdown/
+HOMEPAGE=	http://pypi.python.org/pypi/Markdown
 COMMENT=	XHTML generator using a simple markup
 LICENSE=	modified-bsd
 
diff --git a/textproc/py-markdown/PLIST b/textproc/py-markdown/PLIST
index e28759d145b..9b658cdecca 100644
--- a/textproc/py-markdown/PLIST
+++ b/textproc/py-markdown/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.2 2011/04/08 12:37:19 adam Exp $
-bin/markdown
+@comment $NetBSD: PLIST,v 1.3 2013/02/19 19:41:28 ryoon Exp $
+bin/markdown_py
 ${PYSITELIB}/markdown/__init__.py
 ${PYSITELIB}/markdown/__init__.pyc
 ${PYSITELIB}/markdown/__init__.pyo
+${PYSITELIB}/markdown/__main__.py
+${PYSITELIB}/markdown/__main__.pyc
+${PYSITELIB}/markdown/__main__.pyo
 ${PYSITELIB}/markdown/blockparser.py
 ${PYSITELIB}/markdown/blockparser.pyc
 ${PYSITELIB}/markdown/blockparser.pyo
 ${PYSITELIB}/markdown/blockprocessors.py
 ${PYSITELIB}/markdown/blockprocessors.pyc
 ${PYSITELIB}/markdown/blockprocessors.pyo
-${PYSITELIB}/markdown/commandline.py
-${PYSITELIB}/markdown/commandline.pyc
-${PYSITELIB}/markdown/commandline.pyo
 ${PYSITELIB}/markdown/etree_loader.py
 ${PYSITELIB}/markdown/etree_loader.pyc
 ${PYSITELIB}/markdown/etree_loader.pyo
@@ -21,6 +21,9 @@ ${PYSITELIB}/markdown/extensions/__init__.pyo
 ${PYSITELIB}/markdown/extensions/abbr.py
 ${PYSITELIB}/markdown/extensions/abbr.pyc
 ${PYSITELIB}/markdown/extensions/abbr.pyo
+${PYSITELIB}/markdown/extensions/attr_list.py
+${PYSITELIB}/markdown/extensions/attr_list.pyc
+${PYSITELIB}/markdown/extensions/attr_list.pyo
 ${PYSITELIB}/markdown/extensions/codehilite.py
 ${PYSITELIB}/markdown/extensions/codehilite.pyc
 ${PYSITELIB}/markdown/extensions/codehilite.pyo
@@ -42,15 +45,21 @@ ${PYSITELIB}/markdown/extensions/headerid.pyo
 ${PYSITELIB}/markdown/extensions/html_tidy.py
 ${PYSITELIB}/markdown/extensions/html_tidy.pyc
 ${PYSITELIB}/markdown/extensions/html_tidy.pyo
-${PYSITELIB}/markdown/extensions/imagelinks.py
-${PYSITELIB}/markdown/extensions/imagelinks.pyc
-${PYSITELIB}/markdown/extensions/imagelinks.pyo
 ${PYSITELIB}/markdown/extensions/meta.py
 ${PYSITELIB}/markdown/extensions/meta.pyc
 ${PYSITELIB}/markdown/extensions/meta.pyo
+${PYSITELIB}/markdown/extensions/nl2br.py
+${PYSITELIB}/markdown/extensions/nl2br.pyc
+${PYSITELIB}/markdown/extensions/nl2br.pyo
 ${PYSITELIB}/markdown/extensions/rss.py
 ${PYSITELIB}/markdown/extensions/rss.pyc
 ${PYSITELIB}/markdown/extensions/rss.pyo
+${PYSITELIB}/markdown/extensions/sane_lists.py
+${PYSITELIB}/markdown/extensions/sane_lists.pyc
+${PYSITELIB}/markdown/extensions/sane_lists.pyo
+${PYSITELIB}/markdown/extensions/smart_strong.py
+${PYSITELIB}/markdown/extensions/smart_strong.pyc
+${PYSITELIB}/markdown/extensions/smart_strong.pyo
 ${PYSITELIB}/markdown/extensions/tables.py
 ${PYSITELIB}/markdown/extensions/tables.pyc
 ${PYSITELIB}/markdown/extensions/tables.pyo
@@ -60,9 +69,6 @@ ${PYSITELIB}/markdown/extensions/toc.pyo
 ${PYSITELIB}/markdown/extensions/wikilinks.py
 ${PYSITELIB}/markdown/extensions/wikilinks.pyc
 ${PYSITELIB}/markdown/extensions/wikilinks.pyo
-${PYSITELIB}/markdown/html4.py
-${PYSITELIB}/markdown/html4.pyc
-${PYSITELIB}/markdown/html4.pyo
 ${PYSITELIB}/markdown/inlinepatterns.py
 ${PYSITELIB}/markdown/inlinepatterns.pyc
 ${PYSITELIB}/markdown/inlinepatterns.pyo
@@ -75,6 +81,12 @@ ${PYSITELIB}/markdown/postprocessors.pyo
 ${PYSITELIB}/markdown/preprocessors.py
 ${PYSITELIB}/markdown/preprocessors.pyc
 ${PYSITELIB}/markdown/preprocessors.pyo
+${PYSITELIB}/markdown/serializers.py
+${PYSITELIB}/markdown/serializers.pyc
+${PYSITELIB}/markdown/serializers.pyo
 ${PYSITELIB}/markdown/treeprocessors.py
 ${PYSITELIB}/markdown/treeprocessors.pyc
 ${PYSITELIB}/markdown/treeprocessors.pyo
+${PYSITELIB}/markdown/util.py
+${PYSITELIB}/markdown/util.pyc
+${PYSITELIB}/markdown/util.pyo
diff --git a/textproc/py-markdown/distinfo b/textproc/py-markdown/distinfo
index 0ad8f9e28fb..cdd412814c5 100644
--- a/textproc/py-markdown/distinfo
+++ b/textproc/py-markdown/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/04/08 12:37:19 adam Exp $
+$NetBSD: distinfo,v 1.3 2013/02/19 19:41:28 ryoon Exp $
 
-SHA1 (Markdown-2.0.3.tar.gz) = ce2848c60434a7c727c162ca5683998eb6d222c3
-RMD160 (Markdown-2.0.3.tar.gz) = fd3b0d634a8e066c48de8bab6141662e21d935a7
-Size (Markdown-2.0.3.tar.gz) = 71247 bytes
+SHA1 (Markdown-2.2.1.tar.gz) = f7365293d091a1a42e43ff2a976ebbd8d093f3e6
+RMD160 (Markdown-2.2.1.tar.gz) = 5057f935c5f23a24de8c301d458e9027664db091
+Size (Markdown-2.2.1.tar.gz) = 260043 bytes