py-markdown2: updated to 2.3.7

python-markdown2 2.3.7
* Drop support for legacy Python versions
* Fix syntax highlighting test cases that depend on Pygments output
* Add support for Python 3.7
* Add Wheel package support
* Fix toc_depth initialization regression
* XSS fix

4 files changed, 31 insertions, 14 deletions

diff --git a/textproc/py-markdown2/Makefile b/textproc/py-markdown2/Makefile
index 2b7ec5c040d..e7824cc990a 100644
--- a/textproc/py-markdown2/Makefile
+++ b/textproc/py-markdown2/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.14 2018/10/03 10:24:41 adam Exp $
+# $NetBSD: Makefile,v 1.15 2018/12/06 20:30:31 adam Exp $
 
-DISTNAME=	markdown2-2.3.6
+DISTNAME=	markdown2-2.3.7
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	textproc python
 MASTER_SITES=	${MASTER_SITE_PYPI:=m/markdown2/}
-EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/trentm/python-markdown2
 COMMENT=	Fast and complete Python implementation of Markdown
 LICENSE=	mit
 
-USE_LANGUAGES=		# none
+USE_LANGUAGES=	# none
 
-REPLACE_PYTHON=		lib/markdown2.py
+REPLACE_PYTHON=	lib/markdown2.py
 
 post-install:
-	cd ${DESTDIR}${PREFIX}/bin && ${MV} markdown2 markdown2-${PYVERSSUFFIX} || ${TRUE}
+	cd ${DESTDIR}${PREFIX}/bin && \
+		${MV} markdown2 markdown2-${PYVERSSUFFIX} || ${TRUE}
 
 do-test:
 	cd ${WRKSRC}/test && ${PYTHONBIN} test.py
 
 .include "../../lang/python/application.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-markdown2/PLIST b/textproc/py-markdown2/PLIST
index 39f40b1fb8e..b2f65c56b11 100644
--- a/textproc/py-markdown2/PLIST
+++ b/textproc/py-markdown2/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2017/07/06 07:43:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/12/06 20:30:31 adam Exp $
 bin/markdown2-${PYVERSSUFFIX}
-${PYSITELIB}/${EGG_FILE}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/markdown2.py
 ${PYSITELIB}/markdown2.pyc
 ${PYSITELIB}/markdown2.pyo
diff --git a/textproc/py-markdown2/distinfo b/textproc/py-markdown2/distinfo
index 33b51c8a523..ca42258648d 100644
--- a/textproc/py-markdown2/distinfo
+++ b/textproc/py-markdown2/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2018/10/03 10:24:41 adam Exp $
+$NetBSD: distinfo,v 1.10 2018/12/06 20:30:31 adam Exp $
 
-SHA1 (markdown2-2.3.6.zip) = 8125cc0136a79ce72f51d4397091cf9060651dc6
-RMD160 (markdown2-2.3.6.zip) = c40e8236edced6ee93d34fc13e5c9bf083701a8a
-SHA512 (markdown2-2.3.6.zip) = 4b8647424dd94406199adf5cb619143b466a3e5026be15ac682df9c0da21d2995195a873313988e8c572407e6053632e0c4910da70eadb2de2b10832102f3340
-Size (markdown2-2.3.6.zip) = 166114 bytes
+SHA1 (markdown2-2.3.7.tar.gz) = 6a80683bd7dab327b0bad29560eb07d9073c7e05
+RMD160 (markdown2-2.3.7.tar.gz) = 1eb4f1a94c0f8a035ad5f9fe409c932f874c24ce
+SHA512 (markdown2-2.3.7.tar.gz) = 4426c4fc06cc4c8a44e5e7362fc44f16cba56b685916e02125e4b255ed7808be17ec5708031996128f208fb92c4f4874c2dc1cde6494d30232ffdbe9477c271f
+Size (markdown2-2.3.7.tar.gz) = 85941 bytes
+SHA1 (patch-setup.cfg) = 1bc8e9f52f67c0a2ae2b04fa6901e2e60a94cf0e
diff --git a/textproc/py-markdown2/patches/patch-setup.cfg b/textproc/py-markdown2/patches/patch-setup.cfg
new file mode 100644
index 00000000000..b911a95fb73
--- /dev/null
+++ b/textproc/py-markdown2/patches/patch-setup.cfg
@@ -0,0 +1,13 @@
+$NetBSD: patch-setup.cfg,v 1.1 2018/12/06 20:30:31 adam Exp $
+
+Fix building.
+
+--- setup.cfg.orig	2018-12-06 20:28:16.000000000 +0000
++++ setup.cfg
+@@ -1,6 +1,3 @@
+-[aliases]
+-build = sdist bdist_wheel
+-
+ [wheel]
+ universal = 1
+