Update to 2.6.3 based on PR 50396 by derouiche.

Oct 26, 2015: Released version 2.6.3 (a bug-fix release).

4 files changed, 35 insertions, 11 deletions

diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index d26fc6779fc..da506fb08c6 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -1,16 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2015/07/19 10:20:10 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2015/11/04 09:45:05 wiz Exp $
 
-DISTNAME=	Markdown-2.6.2
+DISTNAME=	Markdown-2.6.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
 CATEGORIES=	textproc python
-MASTER_SITES=	http://pypi.python.org/packages/source/M/Markdown/
+MASTER_SITES=	${MASTER_SITE_PYPI:=M/Markdown/}
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://pypi.python.org/pypi/Markdown
 COMMENT=	XHTML generator using a simple markup
 LICENSE=	modified-bsd
 
-PYTHON_SELF_CONFLICT=	yes
+USE_LANGUAGES=	# none
+
+PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
+
+post-extract:
+	${MV} ${WRKSRC}/bin/markdown_py ${WRKSRC}/bin/markdown_py${PYVERSSUFFIX}
+
+do-test:
+	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run-tests.py
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-markdown/PLIST b/textproc/py-markdown/PLIST
index e8956b06faf..73a4dd6df29 100644
--- a/textproc/py-markdown/PLIST
+++ b/textproc/py-markdown/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2015/07/19 10:20:10 wiz Exp $
-bin/markdown_py
+@comment $NetBSD: PLIST,v 1.6 2015/11/04 09:45:05 wiz Exp $
+bin/markdown_py${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/markdown/__init__.py
 ${PYSITELIB}/markdown/__init__.pyc
diff --git a/textproc/py-markdown/distinfo b/textproc/py-markdown/distinfo
index a6c5c969239..e68dcc9cfbe 100644
--- a/textproc/py-markdown/distinfo
+++ b/textproc/py-markdown/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 02:00:03 agc Exp $
+$NetBSD: distinfo,v 1.6 2015/11/04 09:45:05 wiz Exp $
 
-SHA1 (Markdown-2.6.2.tar.gz) = a988f811f1c73de4b49f610dee58a6b8132f5afe
-RMD160 (Markdown-2.6.2.tar.gz) = 5466f322ac0694d942d49588d12cc980f83e5dcf
-SHA512 (Markdown-2.6.2.tar.gz) = a69dabf65187f54d200f59191a149bfe2109f94ffc5d003e15c2e6333c0b5fdeebfc4136842d7be5a15bc903b7a22120a4ccba2722858194c43fd09cd8fbea16
-Size (Markdown-2.6.2.tar.gz) = 298231 bytes
+SHA1 (Markdown-2.6.3.tar.gz) = bb471f8b142dda09127494c6a1668707ab94ef81
+RMD160 (Markdown-2.6.3.tar.gz) = 07a54a3e96becb762560d35ea8323f53949d0136
+SHA512 (Markdown-2.6.3.tar.gz) = 29917d7112d84bc175cdab39fe1c57cc7c7efcef60cddde41905c8314caf86500eab50a1c93c5cde2cfcd82ce1214ab65367fc7d2111c9487596b9cae16882ee
+Size (Markdown-2.6.3.tar.gz) = 301441 bytes
+SHA1 (patch-setup.py) = 963a54be8e6e31e71908ea7c595f03dba85eb1f4
diff --git a/textproc/py-markdown/patches/patch-setup.py b/textproc/py-markdown/patches/patch-setup.py
new file mode 100644
index 00000000000..4dbca5a1371
--- /dev/null
+++ b/textproc/py-markdown/patches/patch-setup.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup.py,v 1.1 2015/11/04 09:45:05 wiz Exp $
+
+Avoid conflicts with other python versions of this package.
+
+--- setup.py.orig	2015-08-28 03:42:04.000000000 +0000
++++ setup.py
+@@ -244,7 +244,7 @@ setup(
+     maintainer_email='waylan.limberg [at] icloud.com',
+     license='BSD License',
+     packages=['markdown', 'markdown.extensions'],
+-    scripts=['bin/%s' % SCRIPT_NAME],
++    scripts=['bin/%s' % SCRIPT_NAME+sys.version[0:3]],
+     cmdclass={
+         'install_scripts': md_install_scripts,
+         'build_docs': build_docs,