Switch sphinx to versioned deps.

9 files changed, 32 insertions, 19 deletions

diff --git a/ham/gnuradio-doxygen/Makefile b/ham/gnuradio-doxygen/Makefile
index 809f11a8c16..7ef1c9bda26 100644
--- a/ham/gnuradio-doxygen/Makefile
+++ b/ham/gnuradio-doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/10/21 14:01:18 mef Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/21 21:55:04 adam Exp $
 
 PKGNAME=	gnuradio-doxygen-${VERSION}
 PKGREVISION=	2
@@ -8,7 +8,6 @@ COMMENT=	Doxygen documentation of GNU Radio
 .include	"../../ham/gnuradio-core/Nocore.mk"
 
 BUILD_DEPENDS+=	doxygen>=1.8.15:../../devel/doxygen
-BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 
 DEPENDS+=	web2c-[0-9]*:../../print/web2c
@@ -16,8 +15,11 @@ DEPENDS+=	web2c-[0-9]*:../../print/web2c
 DEPENDS+=	texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
 DEPENDS+=	tex-newunicodechar-[-0-9]*:../../print/tex-newunicodechar
 
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:build
+
 CMAKE_ARGS+=	-DENABLE_DEFAULT=False
 CMAKE_ARGS+=	-DENABLE_DOXYGEN=ON
 CMAKE_ARGS+=	-DENABLE_SPHINX=ON
 
-.include	"../../mk/bsd.pkg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/notmuch/options.mk b/mail/notmuch/options.mk
index d7438aafd46..baec434588a 100644
--- a/mail/notmuch/options.mk
+++ b/mail/notmuch/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/04/05 09:59:01 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/21 21:55:04 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.notmuch
 PKG_SUPPORTED_OPTIONS=	notmuch-emacs doc
@@ -24,7 +24,8 @@ CONFIGURE_ARGS+=	--without-emacs
 PLIST_VARS+=		doc
 .if !empty(PKG_OPTIONS:Mdoc)
 PLIST.doc=		yes
-BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:build
+.include "../../lang/python/versioned_dependencies.mk"
 .else
 CONFIGURE_ARGS+=	--without-docs
 CONFIGURE_ARGS+=	--without-api-docs
diff --git a/print/zathura/Makefile b/print/zathura/Makefile
index ed4e11192ac..473e6f520a8 100644
--- a/print/zathura/Makefile
+++ b/print/zathura/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/10/07 09:28:13 prlw1 Exp $
+# $NetBSD: Makefile,v 1.30 2019/10/21 21:55:03 adam Exp $
 
 DISTNAME=	zathura-0.4.3
 PKGREVISION=	2
@@ -15,7 +15,8 @@ USE_TOOLS+=	pkg-config
 
 # XXX: msgfmt needs to support `--xml', always use the one from pkgsrc
 TOOL_DEPENDS+=	gettext-tools>=0.15:../../devel/gettext-tools
-TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:tool
 
 # Avoid possible dependency on librsvg
 MESON_ARGS+=	-D convert-icon=disabled
@@ -27,6 +28,7 @@ CFLAGS.SunOS+=	-D__EXTENSIONS__
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/girara/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff --git a/security/fail2ban/Makefile b/security/fail2ban/Makefile
index 696da7468e6..5efee3a6366 100644
--- a/security/fail2ban/Makefile
+++ b/security/fail2ban/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/04/25 07:33:15 maya Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/21 21:55:03 adam Exp $
 #
 
 DISTNAME=	fail2ban-0.9.6
@@ -14,9 +14,10 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
-BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
 BUILD_DEPENDS+=	${PYPKGPREFIX}-numpydoc-[0-9]*:../../textproc/py-numpydoc
 
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:build
+
 USE_TOOLS+=	make:build
 
 USE_LANGUAGES=		# none
@@ -121,4 +122,5 @@ post-install:
 .include "options.mk"
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-numpydoc/Makefile b/textproc/py-numpydoc/Makefile
index 1bb2f2d7bd0..de1054bfa95 100644
--- a/textproc/py-numpydoc/Makefile
+++ b/textproc/py-numpydoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/06/14 15:17:17 adam Exp $
+# $NetBSD: Makefile,v 1.7 2019/10/21 22:01:05 adam Exp $
 
 DISTNAME=	numpydoc-0.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,9 +11,11 @@ COMMENT=	Sphinx extension to support docstrings in Numpy format
 LICENSE=	modified-bsd
 
 DEPENDS+=	${PYPKGPREFIX}-jinja2>=2.3:../../textproc/py-jinja2
-DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.6.5:../../textproc/py-sphinx
+
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-pallets-sphinx-themes/Makefile b/textproc/py-pallets-sphinx-themes/Makefile
index e27925995b1..422bcc8e80d 100644
--- a/textproc/py-pallets-sphinx-themes/Makefile
+++ b/textproc/py-pallets-sphinx-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/10/11 16:28:39 adam Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/21 22:01:05 adam Exp $
 
 DISTNAME=	Pallets-Sphinx-Themes-1.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/pallets/pallets-sphinx-themes
 COMMENT=	Sphinx themes for Pallets and related projects
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-sphinx-issues/Makefile b/textproc/py-sphinx-issues/Makefile
index d240c35a1f5..ccd43252cb2 100644
--- a/textproc/py-sphinx-issues/Makefile
+++ b/textproc/py-sphinx-issues/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/04/24 15:50:43 adam Exp $
+# $NetBSD: Makefile,v 1.2 2019/10/21 22:01:05 adam Exp $
 
 DISTNAME=	sphinx-issues-1.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/sloria/sphinx-issues
 COMMENT=	Sphinx extension for linking to an issue tracker
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-sphinx-rtd-theme/Makefile b/textproc/py-sphinx-rtd-theme/Makefile
index d72ca6804bf..209838ee8bf 100644
--- a/textproc/py-sphinx-rtd-theme/Makefile
+++ b/textproc/py-sphinx-rtd-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/02/13 12:50:40 adam Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/21 22:01:06 adam Exp $
 
 DISTNAME=	sphinx_rtd_theme-0.4.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/_/-/g}
@@ -10,9 +10,10 @@ HOMEPAGE=	https://github.com/rtfd/sphinx_rtd_theme
 COMMENT=	Sphinx readthedocs.org theme
 LICENSE=	modified-bsd AND ofl-v1.1
 
-DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-sphinx-theme-cloud/Makefile b/textproc/py-sphinx-theme-cloud/Makefile
index 1d0c18341ab..d4a618e417b 100644
--- a/textproc/py-sphinx-theme-cloud/Makefile
+++ b/textproc/py-sphinx-theme-cloud/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/10/07 11:25:00 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/21 22:01:06 adam Exp $
 
 DISTNAME=	cloud_sptheme-1.9.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/cloud_sptheme/sphinx-theme-cloud/}
@@ -10,9 +10,10 @@ HOMEPAGE=	https://bitbucket.org/ecollins/cloud_sptheme
 COMMENT=	Sphinx cloud theme
 LICENSE=	modified-bsd
 
-DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx
 
 USE_LANGUAGES=	# none
 
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"