Wed Nov 4 09:45:05 2015 UTC ()
Update to 2.6.3 based on PR 50396 by derouiche.

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


(wiz)
diff -r1.8 -r1.9 pkgsrc/textproc/py-markdown/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/py-markdown/PLIST
diff -r1.5 -r1.6 pkgsrc/textproc/py-markdown/distinfo
diff -r0 -r1.1 pkgsrc/textproc/py-markdown/patches/patch-setup.py
cvs diff -r1.8 -r1.9 pkgsrc/textproc/py-markdown/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-markdown/Makefile 2015/07/19 10:20:10 1.8
+++ pkgsrc/textproc/py-markdown/Makefile 2015/11/04 09:45:05 1.9
@@ -1,16 +1,24 @@ @@ -1,16 +1,24 @@
1# $NetBSD: Makefile,v 1.8 2015/07/19 10:20:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2015/11/04 09:45:05 wiz Exp $
2 2
3DISTNAME= Markdown-2.6.2 3DISTNAME= Markdown-2.6.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= http://pypi.python.org/packages/source/M/Markdown/ 6MASTER_SITES= ${MASTER_SITE_PYPI:=M/Markdown/}
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://pypi.python.org/pypi/Markdown 9HOMEPAGE= http://pypi.python.org/pypi/Markdown
10COMMENT= XHTML generator using a simple markup 10COMMENT= XHTML generator using a simple markup
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13PYTHON_SELF_CONFLICT= yes 13USE_LANGUAGES= # none
 14
 15PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
 16
 17post-extract:
 18 ${MV} ${WRKSRC}/bin/markdown_py ${WRKSRC}/bin/markdown_py${PYVERSSUFFIX}
 19
 20do-test:
 21 ${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} run-tests.py
14 22
15.include "../../lang/python/distutils.mk" 23.include "../../lang/python/distutils.mk"
16.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/py-markdown/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/py-markdown/PLIST 2015/07/19 10:20:10 1.5
+++ pkgsrc/textproc/py-markdown/PLIST 2015/11/04 09:45:05 1.6
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1@comment $NetBSD: PLIST,v 1.5 2015/07/19 10:20:10 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.6 2015/11/04 09:45:05 wiz Exp $
2bin/markdown_py 2bin/markdown_py${PYVERSSUFFIX}
3${PYSITELIB}/${EGG_FILE} 3${PYSITELIB}/${EGG_FILE}
4${PYSITELIB}/markdown/__init__.py 4${PYSITELIB}/markdown/__init__.py
5${PYSITELIB}/markdown/__init__.pyc 5${PYSITELIB}/markdown/__init__.pyc
6${PYSITELIB}/markdown/__init__.pyo 6${PYSITELIB}/markdown/__init__.pyo
7${PYSITELIB}/markdown/__main__.py 7${PYSITELIB}/markdown/__main__.py
8${PYSITELIB}/markdown/__main__.pyc 8${PYSITELIB}/markdown/__main__.pyc
9${PYSITELIB}/markdown/__main__.pyo 9${PYSITELIB}/markdown/__main__.pyo
10${PYSITELIB}/markdown/__version__.py 10${PYSITELIB}/markdown/__version__.py
11${PYSITELIB}/markdown/__version__.pyc 11${PYSITELIB}/markdown/__version__.pyc
12${PYSITELIB}/markdown/__version__.pyo 12${PYSITELIB}/markdown/__version__.pyo
13${PYSITELIB}/markdown/blockparser.py 13${PYSITELIB}/markdown/blockparser.py
14${PYSITELIB}/markdown/blockparser.pyc 14${PYSITELIB}/markdown/blockparser.pyc
15${PYSITELIB}/markdown/blockparser.pyo 15${PYSITELIB}/markdown/blockparser.pyo
cvs diff -r1.5 -r1.6 pkgsrc/textproc/py-markdown/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/py-markdown/distinfo 2015/11/04 02:00:03 1.5
+++ pkgsrc/textproc/py-markdown/distinfo 2015/11/04 09:45:05 1.6
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
1$NetBSD: distinfo,v 1.5 2015/11/04 02:00:03 agc Exp $ 1$NetBSD: distinfo,v 1.6 2015/11/04 09:45:05 wiz Exp $
2 2
3SHA1 (Markdown-2.6.2.tar.gz) = a988f811f1c73de4b49f610dee58a6b8132f5afe 3SHA1 (Markdown-2.6.3.tar.gz) = bb471f8b142dda09127494c6a1668707ab94ef81
4RMD160 (Markdown-2.6.2.tar.gz) = 5466f322ac0694d942d49588d12cc980f83e5dcf 4RMD160 (Markdown-2.6.3.tar.gz) = 07a54a3e96becb762560d35ea8323f53949d0136
5SHA512 (Markdown-2.6.2.tar.gz) = a69dabf65187f54d200f59191a149bfe2109f94ffc5d003e15c2e6333c0b5fdeebfc4136842d7be5a15bc903b7a22120a4ccba2722858194c43fd09cd8fbea16 5SHA512 (Markdown-2.6.3.tar.gz) = 29917d7112d84bc175cdab39fe1c57cc7c7efcef60cddde41905c8314caf86500eab50a1c93c5cde2cfcd82ce1214ab65367fc7d2111c9487596b9cae16882ee
6Size (Markdown-2.6.2.tar.gz) = 298231 bytes 6Size (Markdown-2.6.3.tar.gz) = 301441 bytes
 7SHA1 (patch-setup.py) = 963a54be8e6e31e71908ea7c595f03dba85eb1f4
File Added: pkgsrc/textproc/py-markdown/patches/Attic/patch-setup.py
$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,