4 files changed, 27 insertions, 33 deletions

diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 9c0cfc3faf7a..c845f2a0dd60 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -1,24 +1,21 @@
-# New ports collection makefile for:    py-markdown
-# Date created:         28 November 2006
-# Whom:                 Graham Todd <gtodd@bellanet.org>
+# New ports collection makefile for:    py-markdown2
+# Date created:         4th June, 2009
+# Whom:                 Wen Heping <wenheping@gmail.com>
 #
 # $FreeBSD$
 #
 
-PORTNAME=		markdown
-PORTVERSION=		1.7
-CATEGORIES=		textproc python
-MASTER_SITES=		CHEESESHOP
-MASTER_SITE_SUBDIR=	source/M/Markdown
-PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+PORTNAME=	markdown2
+PORTVERSION=	1.0.1.12
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		alexbl@FreeBSD.org
-COMMENT=		Text markup to HTML conversion engine for Python
+MAINTAINER=	wenheping@gmail.com
+COMMENT=	A fast and complete Python implementaion of Markdown
 
-USE_ZIP=		yes
-USE_PYTHON=		2.4+
+USE_ZIP=	yes
+USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 .include <bsd.port.mk>
diff --git a/textproc/py-markdown2/distinfo b/textproc/py-markdown2/distinfo
index 7998a91252e6..ed3bd82d772a 100644
--- a/textproc/py-markdown2/distinfo
+++ b/textproc/py-markdown2/distinfo
@@ -1,3 +1,3 @@
-MD5 (markdown-1.7.zip) = 99b1721d723e8c64381fc023d23b202a
-SHA256 (markdown-1.7.zip) = 9600c27dc1266e40f06a94212b0620f97b71195f8dff6521152ac0fcae4b04e9
-SIZE (markdown-1.7.zip) = 26672
+MD5 (markdown2-1.0.1.12.zip) = bc30082cc46ceb5d9a47a587c2931c60
+SHA256 (markdown2-1.0.1.12.zip) = a60fdd1836c0e77b634db79bc4d3e2a6cd35d545e984f46e972fd2187a114ee4
+SIZE (markdown2-1.0.1.12.zip) = 96865
diff --git a/textproc/py-markdown2/pkg-descr b/textproc/py-markdown2/pkg-descr
index 473b80fcdcb4..27ddd4f95ce4 100644
--- a/textproc/py-markdown2/pkg-descr
+++ b/textproc/py-markdown2/pkg-descr
@@ -1,7 +1,9 @@
-Markdown is two things: (1) a plain text formatting syntax; and (2) a
-software tool that converts the plain text formatting to (X)HTML. The
-formatting syntax is designed to be easy and intuitive for web authors
-and resembles typical email formatting conventions. The resultant
-(X)HTML is structurally valid.
+py-markdown2  provides a converter written in Python that closely
+matches the behaviour of the original Perl-implemented Markdown.pl.
+There is another Python markdown.py , but markdown2.py is faster
+and, to my knowledge, more correct.
 
-WWW: http://www.freewisdom.org/projects/python-markdown
+Markdown is a light text markup format and a processor to convert
+that to HTML.
+
+WWW: http://code.google.com/p/python-markdown2/
diff --git a/textproc/py-markdown2/pkg-plist b/textproc/py-markdown2/pkg-plist
index fe8879ae322d..37cc4c094d6c 100644
--- a/textproc/py-markdown2/pkg-plist
+++ b/textproc/py-markdown2/pkg-plist
@@ -1,9 +1,4 @@
-%%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
+bin/markdown2
+%%PYTHON_SITELIBDIR%%/markdown2.py
+%%PYTHON_SITELIBDIR%%/markdown2.pyc
+%%PYTHON_SITELIBDIR%%/markdown2.pyo