Mon Oct 21 21:45:40 2019 UTC ()
Switch sphinx to versioned deps.


(adam)
diff -r1.7 -r1.8 pkgsrc/devel/py-requests-mock/Makefile
diff -r1.15 -r1.16 pkgsrc/devel/py-trytond/options.mk
diff -r1.217 -r1.218 pkgsrc/emulators/qemu/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/devel/py-requests-mock/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-requests-mock/Makefile 2019/09/02 07:34:54 1.7
+++ pkgsrc/devel/py-requests-mock/Makefile 2019/10/21 21:45:40 1.8
@@ -1,30 +1,32 @@ @@ -1,30 +1,32 @@
1# $NetBSD: Makefile,v 1.7 2019/09/02 07:34:54 adam Exp $ 1# $NetBSD: Makefile,v 1.8 2019/10/21 21:45:40 adam Exp $
2 2
3DISTNAME= requests-mock-1.7.0 3DISTNAME= requests-mock-1.7.0
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= devel www python 5CATEGORIES= devel www python
6MASTER_SITES= ${MASTER_SITE_PYPI:=r/requests-mock/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=r/requests-mock/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://requests-mock.readthedocs.org/ 9HOMEPAGE= https://requests-mock.readthedocs.org/
10COMMENT= Mock out responses from the requests package 10COMMENT= Mock out responses from the requests package
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13DEPENDS+= ${PYPKGPREFIX}-requests>=2.3:../../devel/py-requests 13DEPENDS+= ${PYPKGPREFIX}-requests>=2.3:../../devel/py-requests
14DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six 14DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
15BUILD_DEPENDS+= ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr 15BUILD_DEPENDS+= ${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
16TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures 16TEST_DEPENDS+= ${PYPKGPREFIX}-fixtures-[0-9]*:../../devel/py-fixtures
17TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock 17TEST_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
18TEST_DEPENDS+= ${PYPKGPREFIX}-purl-[0-9]*:../../www/py-purl 18TEST_DEPENDS+= ${PYPKGPREFIX}-purl-[0-9]*:../../www/py-purl
19TEST_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.1.2:../../textproc/py-sphinx 
20TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 19TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
21TEST_DEPENDS+= ${PYPKGPREFIX}-testrepository>=0.0.18:../../devel/py-testrepository 20TEST_DEPENDS+= ${PYPKGPREFIX}-testrepository>=0.0.18:../../devel/py-testrepository
22TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools 21TEST_DEPENDS+= ${PYPKGPREFIX}-testtools-[0-9]*:../../devel/py-testtools
23 22
24USE_LANGUAGES= # none 23USE_LANGUAGES= # none
25 24
 25PYTHON_VERSIONED_DEPENDENCIES= sphinx:test
 26
26do-test: 27do-test:
27 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests 28 cd ${WRKSRC} && pytest-${PYVERSSUFFIX} tests
28 29
29.include "../../lang/python/egg.mk" 30.include "../../lang/python/egg.mk"
 31.include "../../lang/python/versioned_dependencies.mk"
30.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.15 -r1.16 pkgsrc/devel/py-trytond/options.mk (expand / switch to unified diff)

--- pkgsrc/devel/py-trytond/options.mk 2019/09/02 13:19:37 1.15
+++ pkgsrc/devel/py-trytond/options.mk 2019/10/21 21:45:40 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.15 2019/09/02 13:19:37 adam Exp $ 1# $NetBSD: options.mk,v 1.16 2019/10/21 21:45:40 adam Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.py-trytond 3PKG_OPTIONS_VAR= PKG_OPTIONS.py-trytond
4PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx 4PKG_SUPPORTED_OPTIONS= cdecimal mysql pydot psycopg pytz simplejson sphinx
5PKG_SUGGESTED_OPTIONS+= psycopg pytz simplejson sphinx 5PKG_SUGGESTED_OPTIONS+= psycopg pytz simplejson sphinx
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9# XXX: Supports unoconv http://dag.wieers.com/home-made/unoconv/) option and 9# XXX: Supports unoconv http://dag.wieers.com/home-made/unoconv/) option and
10# XXX: python-Levenshtein (http://github.com/miohtama/python-Levenshtein) option 10# XXX: python-Levenshtein (http://github.com/miohtama/python-Levenshtein) option
11 11
12.if !empty(PKG_OPTIONS:Mcdecimal) 12.if !empty(PKG_OPTIONS:Mcdecimal)
13PYTHON_VERSIONS_ACCEPTED= 27 # py-cdecimal is obsolete for that version and thus not available 13PYTHON_VERSIONS_ACCEPTED= 27 # py-cdecimal is obsolete for that version and thus not available
14DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal 14DEPENDS+= ${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
@@ -26,15 +26,16 @@ DEPENDS+= ${PYPKGPREFIX}-dot-[0-9]*:../ @@ -26,15 +26,16 @@ DEPENDS+= ${PYPKGPREFIX}-dot-[0-9]*:../
26.if !empty(PKG_OPTIONS:Mpsycopg) 26.if !empty(PKG_OPTIONS:Mpsycopg)
27DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2 27DEPENDS+= ${PYPKGPREFIX}-psycopg2>=2:../../databases/py-psycopg2
28.endif 28.endif
29 29
30.if !empty(PKG_OPTIONS:Mpytz) 30.if !empty(PKG_OPTIONS:Mpytz)
31DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz 31DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
32.endif 32.endif
33 33
34.if !empty(PKG_OPTIONS:Msimplejson) 34.if !empty(PKG_OPTIONS:Msimplejson)
35DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson 35DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
36.endif 36.endif
37 37
38.if !empty(PKG_OPTIONS:Msphinx) 38.if !empty(PKG_OPTIONS:Msphinx)
39DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 39PYTHON_VERSIONED_DEPENDENCIES= sphinx
 40.include "../../lang/python/versioned_dependencies.mk"
40.endif 41.endif
cvs diff -r1.217 -r1.218 pkgsrc/emulators/qemu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/qemu/Makefile 2019/08/22 12:23:05 1.217
+++ pkgsrc/emulators/qemu/Makefile 2019/10/21 21:45:39 1.218
@@ -1,49 +1,50 @@ @@ -1,49 +1,50 @@
1# $NetBSD: Makefile,v 1.217 2019/08/22 12:23:05 ryoon Exp $ 1# $NetBSD: Makefile,v 1.218 2019/10/21 21:45:39 adam Exp $
2 2
3DISTNAME= qemu-4.1.0 3DISTNAME= qemu-4.1.0
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= https://download.qemu.org/ 6MASTER_SITES= https://download.qemu.org/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.qemu-project.org/ 10HOMEPAGE= http://www.qemu-project.org/
11COMMENT= CPU emulator using dynamic translation 11COMMENT= CPU emulator using dynamic translation
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 AND mit AND modified-bsd
13 13
14USE_CURSES= resize_term wide 14USE_CURSES= resize_term wide
15USE_LANGUAGES+= c c++ 15USE_LANGUAGES+= c c++
16USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config 16USE_TOOLS+= bison flex gmake makeinfo perl:build pod2man pkg-config
17FAKE_NCURSES= yes 17FAKE_NCURSES= yes
18UNLIMIT_RESOURCES= datasize 18UNLIMIT_RESOURCES= datasize
19HAS_CONFIGURE= yes 19HAS_CONFIGURE= yes
20 20
21GMAKE_REQD= 4.1 # needed for docs 21GMAKE_REQD= 4.1 # needed for docs
22TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 22
 23PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
23 24
24SUBST_CLASSES+= prefix 25SUBST_CLASSES+= prefix
25SUBST_STAGE.prefix= pre-configure 26SUBST_STAGE.prefix= pre-configure
26SUBST_MESSAGE.prefix= Setting PREFIX 27SUBST_MESSAGE.prefix= Setting PREFIX
27SUBST_FILES.prefix+= configure 28SUBST_FILES.prefix+= configure
28SUBST_VARS.prefix+= PREFIX 29SUBST_VARS.prefix+= PREFIX
29 30
30SUBST_CLASSES+= sphinx-build 31SUBST_CLASSES+= sphinx-build
31SUBST_STAGE.sphinx-build= pre-configure 32SUBST_STAGE.sphinx-build= pre-configure
32SUBST_MESSAGE.sphinx-build= Fix hardcoded sphinx-build 33SUBST_MESSAGE.sphinx-build= Fix hardcoded sphinx-build
33SUBST_FILES.sphinx-build+= Makefile configure 34SUBST_FILES.sphinx-build+= Makefile configure
34SUBST_FILES.sphinx-build+= roms/skiboot/doc/Makefile 35SUBST_FILES.sphinx-build+= roms/skiboot/doc/Makefile
35SUBST_FILES.sphinx-build+= roms/u-boot/Documentation/Makefile 36SUBST_FILES.sphinx-build+= roms/u-boot/Documentation/Makefile
36SUBST_SED.sphinx-build+= -e 's/sphinx-build/sphinx-build${PYVERSSUFFIX}/g' 37SUBST_SED.sphinx-build+= -e 's/sphinx-build/sphinx-build-${PYVERSSUFFIX}/g'
37 38
38.include "options.mk" 39.include "options.mk"
39 40
40.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
41 42
42CONFIGURE_ARGS+= --prefix=${PREFIX} 43CONFIGURE_ARGS+= --prefix=${PREFIX}
43CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu 44CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu
44CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 45CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
45CONFIGURE_ARGS+= --python=${PYTHONBIN} 46CONFIGURE_ARGS+= --python=${PYTHONBIN}
46CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd 47CONFIGURE_ARGS+= --smbd=${PREFIX}/sbin/smbd
47CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 48CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
48CONFIGURE_ARGS+= --enable-curses 49CONFIGURE_ARGS+= --enable-curses
49CONFIGURE_ARGS+= --enable-docs 50CONFIGURE_ARGS+= --enable-docs
@@ -144,20 +145,21 @@ post-install: @@ -144,20 +145,21 @@ post-install:
144 145
145# On Darwin, qemu uses Cocoa and CoreAudio 146# On Darwin, qemu uses Cocoa and CoreAudio
146.if ${OPSYS} != "Darwin" 147.if ${OPSYS} != "Darwin"
147.include "../../mk/oss.buildlink3.mk" 148.include "../../mk/oss.buildlink3.mk"
148.endif 149.endif
149.include "../../archivers/lzo/buildlink3.mk" 150.include "../../archivers/lzo/buildlink3.mk"
150.include "../../devel/glib2/buildlink3.mk" 151.include "../../devel/glib2/buildlink3.mk"
151.include "../../devel/jemalloc/buildlink3.mk" 152.include "../../devel/jemalloc/buildlink3.mk"
152.include "../../devel/snappy/buildlink3.mk" 153.include "../../devel/snappy/buildlink3.mk"
153.include "../../devel/zlib/buildlink3.mk" 154.include "../../devel/zlib/buildlink3.mk"
154.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 155.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
155.include "../../graphics/png/buildlink3.mk" 156.include "../../graphics/png/buildlink3.mk"
156.include "../../lang/python/extension.mk" 157.include "../../lang/python/extension.mk"
 158.include "../../lang/python/versioned_dependencies.mk"
157.include "../../security/libgcrypt/buildlink3.mk" 159.include "../../security/libgcrypt/buildlink3.mk"
158.include "../../www/curl/buildlink3.mk" 160.include "../../www/curl/buildlink3.mk"
159.include "../../x11/pixman/buildlink3.mk" 161.include "../../x11/pixman/buildlink3.mk"
160.include "../../mk/curses.buildlink3.mk" 162.include "../../mk/curses.buildlink3.mk"
161.include "../../mk/jpeg.buildlink3.mk" 163.include "../../mk/jpeg.buildlink3.mk"
162.include "../../mk/pthread.buildlink3.mk" 164.include "../../mk/pthread.buildlink3.mk"
163.include "../../mk/bsd.pkg.mk" 165.include "../../mk/bsd.pkg.mk"