Thu Mar 12 17:20:43 2020 UTC ()
textprox/py-sphinxcontrib*: Drop EXTRACT_USING=bsdtar

This is no longer necessary as NetBSD uses bsdtar by default.
(As discussed on tech-pkg.)


(gdt)
diff -r1.3 -r1.4 pkgsrc/textproc/py-sphinxcontrib-applehelp/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/py-sphinxcontrib-devhelp/Makefile
diff -r1.3 -r1.4 pkgsrc/textproc/py-sphinxcontrib-htmlhelp/Makefile
diff -r1.5 -r1.6 pkgsrc/textproc/py-sphinxcontrib-serializinghtml/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/textproc/py-sphinxcontrib-applehelp/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-sphinxcontrib-applehelp/Makefile 2020/03/07 23:30:22 1.3
+++ pkgsrc/textproc/py-sphinxcontrib-applehelp/Makefile 2020/03/12 17:20:43 1.4
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.3 2020/03/07 23:30:22 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2020/03/12 17:20:43 gdt Exp $
2 2
3DISTNAME= sphinxcontrib-applehelp-1.0.2 3DISTNAME= sphinxcontrib-applehelp-1.0.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-applehelp/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-applehelp/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://sphinx-doc.org/ 9HOMEPAGE= http://sphinx-doc.org/
10COMMENT= Sphinx API for Apple help books 10COMMENT= Sphinx API for Apple help books
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13EXTRACT_USING= bsdtar 
14 
15TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx 13TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx
16TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 14TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
17 15
18USE_LANGUAGES= # none 16USE_LANGUAGES= # none
19 17
20PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx 18PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx
21 19
22do-test: 20do-test:
23 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests 21 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
24 22
25.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/textproc/py-sphinxcontrib-devhelp/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-sphinxcontrib-devhelp/Makefile 2020/03/07 23:30:22 1.3
+++ pkgsrc/textproc/py-sphinxcontrib-devhelp/Makefile 2020/03/12 17:20:43 1.4
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.3 2020/03/07 23:30:22 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2020/03/12 17:20:43 gdt Exp $
2 2
3DISTNAME= sphinxcontrib-devhelp-1.0.2 3DISTNAME= sphinxcontrib-devhelp-1.0.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-devhelp/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-devhelp/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://sphinx-doc.org/ 9HOMEPAGE= http://sphinx-doc.org/
10COMMENT= Sphinx API for Devhelp document 10COMMENT= Sphinx API for Devhelp document
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13EXTRACT_USING= bsdtar 
14 
15TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx 13TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx
16TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 14TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
17 15
18USE_LANGUAGES= # none 16USE_LANGUAGES= # none
19 17
20PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx 18PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx
21 19
22do-test: 20do-test:
23 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests 21 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
24 22
25.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/textproc/py-sphinxcontrib-htmlhelp/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-sphinxcontrib-htmlhelp/Makefile 2020/03/07 23:30:22 1.3
+++ pkgsrc/textproc/py-sphinxcontrib-htmlhelp/Makefile 2020/03/12 17:20:43 1.4
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.3 2020/03/07 23:30:22 ryoon Exp $ 1# $NetBSD: Makefile,v 1.4 2020/03/12 17:20:43 gdt Exp $
2 2
3DISTNAME= sphinxcontrib-htmlhelp-1.0.3 3DISTNAME= sphinxcontrib-htmlhelp-1.0.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-htmlhelp/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-htmlhelp/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://sphinx-doc.org/ 9HOMEPAGE= http://sphinx-doc.org/
10COMMENT= Sphinx API for HTML help 10COMMENT= Sphinx API for HTML help
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13EXTRACT_USING= bsdtar 
14 
15TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx 13TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx
16TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 14TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
17 15
18USE_LANGUAGES= # none 16USE_LANGUAGES= # none
19 17
20PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx 18PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx
21 19
22do-test: 20do-test:
23 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests 21 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
24 22
25.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/textproc/py-sphinxcontrib-serializinghtml/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/py-sphinxcontrib-serializinghtml/Makefile 2020/03/10 23:07:58 1.5
+++ pkgsrc/textproc/py-sphinxcontrib-serializinghtml/Makefile 2020/03/12 17:20:43 1.6
@@ -1,31 +1,24 @@ @@ -1,31 +1,24 @@
1# $NetBSD: Makefile,v 1.5 2020/03/10 23:07:58 gdt Exp $ 1# $NetBSD: Makefile,v 1.6 2020/03/12 17:20:43 gdt Exp $
2 2
3DISTNAME= sphinxcontrib-serializinghtml-1.1.4 3DISTNAME= sphinxcontrib-serializinghtml-1.1.4
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= textproc python 5CATEGORIES= textproc python
6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-serializinghtml/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=s/sphinxcontrib-serializinghtml/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://sphinx-doc.org/ 9HOMEPAGE= http://sphinx-doc.org/
10COMMENT= Sphinx API for "serialized" HTML files 10COMMENT= Sphinx API for "serialized" HTML files
11LICENSE= 2-clause-bsd 11LICENSE= 2-clause-bsd
12 12
13# On NetBSD <= 8, pax-as-tar fails on this distfile. Use bsdtar 
14# (which on 9 and up will use base tar, if it's libarchive tar). 
15.include "../../mk/bsd.prefs.mk" 
16.if ${OPSYS} == NetBSD 
17EXTRACT_USING= bsdtar 
18.endif 
19 
20TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx 13TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=2.0.0:../../textproc/py-sphinx
21TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 14TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
22 15
23USE_LANGUAGES= # none 16USE_LANGUAGES= # none
24 17
25PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx 18PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-sphinx
26 19
27do-test: 20do-test:
28 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests 21 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
29 22
30.include "../../lang/python/egg.mk" 23.include "../../lang/python/egg.mk"
31.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"