3 files changed, 89 insertions, 17 deletions

diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index 1d02604988a9..473dfe3f2e8e 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=		markdown
-PORTVERSION=		1.7
+PORTVERSION=		2.0.1
 CATEGORIES=		textproc python
 MASTER_SITES=		CHEESESHOP
-MASTER_SITE_SUBDIR=	source/M/Markdown
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+DISTNAME=		Markdown-${PORTVERSION}
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=		wenheping@gmail.com
 COMMENT=		Text markup to HTML conversion engine for Python
 
-USE_ZIP=		yes
 USE_PYTHON=		2.4+
 USE_PYDISTUTILS=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+PYDISTUTILS_PKGNAME=	Markdown
 
 .include <bsd.port.mk>
diff --git a/textproc/py-markdown/distinfo b/textproc/py-markdown/distinfo
index 7998a91252e6..6a6308de0b6a 100644
--- a/textproc/py-markdown/distinfo
+++ b/textproc/py-markdown/distinfo
@@ -1,3 +1,3 @@
-MD5 (markdown-1.7.zip) = 99b1721d723e8c64381fc023d23b202a
-SHA256 (markdown-1.7.zip) = 9600c27dc1266e40f06a94212b0620f97b71195f8dff6521152ac0fcae4b04e9
-SIZE (markdown-1.7.zip) = 26672
+MD5 (Markdown-2.0.1.tar.gz) = bfdb2171faeb410d6099653da90b9bf7
+SHA256 (Markdown-2.0.1.tar.gz) = ac63daef3cf5fd12853e19002914dcb459ae465769981238da2839c2dcf41652
+SIZE (Markdown-2.0.1.tar.gz) = 71588
diff --git a/textproc/py-markdown/pkg-plist b/textproc/py-markdown/pkg-plist
index fe8879ae322d..e6ccb64b1bc3 100644
--- a/textproc/py-markdown/pkg-plist
+++ b/textproc/py-markdown/pkg-plist
@@ -1,9 +1,82 @@
-%%PYTHON_SITELIBDIR%%/markdown.py
-%%PYTHON_SITELIBDIR%%/markdown.pyc
-%%PYTHON_SITELIBDIR%%/markdown.pyo
-%%PYTHON_SITELIBDIR%%/mdx_footnotes.py
-%%PYTHON_SITELIBDIR%%/mdx_footnotes.pyc
-%%PYTHON_SITELIBDIR%%/mdx_footnotes.pyo
-%%PYTHON_SITELIBDIR%%/mdx_rss.py
-%%PYTHON_SITELIBDIR%%/mdx_rss.pyc
-%%PYTHON_SITELIBDIR%%/mdx_rss.pyo
+@comment $FreeBSD$
+bin/markdown
+%%PYTHON_SITELIBDIR%%/markdown/__init__.py
+%%PYTHON_SITELIBDIR%%/markdown/__init__.pyc
+%%PYTHON_SITELIBDIR%%/markdown/__init__.pyo
+%%PYTHON_SITELIBDIR%%/markdown/blockparser.py
+%%PYTHON_SITELIBDIR%%/markdown/blockparser.pyc
+%%PYTHON_SITELIBDIR%%/markdown/blockparser.pyo
+%%PYTHON_SITELIBDIR%%/markdown/blockprocessors.py
+%%PYTHON_SITELIBDIR%%/markdown/blockprocessors.pyc
+%%PYTHON_SITELIBDIR%%/markdown/blockprocessors.pyo
+%%PYTHON_SITELIBDIR%%/markdown/commandline.py
+%%PYTHON_SITELIBDIR%%/markdown/commandline.pyc
+%%PYTHON_SITELIBDIR%%/markdown/commandline.pyo
+%%PYTHON_SITELIBDIR%%/markdown/etree_loader.py
+%%PYTHON_SITELIBDIR%%/markdown/etree_loader.pyc
+%%PYTHON_SITELIBDIR%%/markdown/etree_loader.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/__init__.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/__init__.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/abbr.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/abbr.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/abbr.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/codehilite.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/codehilite.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/codehilite.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/def_list.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/def_list.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/def_list.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/extra.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/extra.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/extra.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/fenced_code.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/fenced_code.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/fenced_code.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/footnotes.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/footnotes.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/footnotes.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/headerid.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/headerid.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/headerid.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/html_tidy.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/html_tidy.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/html_tidy.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/imagelinks.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/imagelinks.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/imagelinks.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/meta.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/meta.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/meta.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/rss.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/rss.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/rss.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/tables.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/tables.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/tables.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/toc.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/toc.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/toc.pyo
+%%PYTHON_SITELIBDIR%%/markdown/extensions/wikilinks.py
+%%PYTHON_SITELIBDIR%%/markdown/extensions/wikilinks.pyc
+%%PYTHON_SITELIBDIR%%/markdown/extensions/wikilinks.pyo
+%%PYTHON_SITELIBDIR%%/markdown/html4.py
+%%PYTHON_SITELIBDIR%%/markdown/html4.pyc
+%%PYTHON_SITELIBDIR%%/markdown/html4.pyo
+%%PYTHON_SITELIBDIR%%/markdown/inlinepatterns.py
+%%PYTHON_SITELIBDIR%%/markdown/inlinepatterns.pyc
+%%PYTHON_SITELIBDIR%%/markdown/inlinepatterns.pyo
+%%PYTHON_SITELIBDIR%%/markdown/odict.py
+%%PYTHON_SITELIBDIR%%/markdown/odict.pyc
+%%PYTHON_SITELIBDIR%%/markdown/odict.pyo
+%%PYTHON_SITELIBDIR%%/markdown/postprocessors.py
+%%PYTHON_SITELIBDIR%%/markdown/postprocessors.pyc
+%%PYTHON_SITELIBDIR%%/markdown/postprocessors.pyo
+%%PYTHON_SITELIBDIR%%/markdown/preprocessors.py
+%%PYTHON_SITELIBDIR%%/markdown/preprocessors.pyc
+%%PYTHON_SITELIBDIR%%/markdown/preprocessors.pyo
+%%PYTHON_SITELIBDIR%%/markdown/treeprocessors.py
+%%PYTHON_SITELIBDIR%%/markdown/treeprocessors.pyc
+%%PYTHON_SITELIBDIR%%/markdown/treeprocessors.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/markdown/extensions
+@dirrm %%PYTHON_SITELIBDIR%%/markdown