[pkgsrc/trunk]: pkgsrc Switch sphinx to versioned deps.

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/405f481f5484
branches:  trunk
changeset: 342566:405f481f5484
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Oct 21 21:19:35 2019 +0000

description:
Switch sphinx to versioned deps.

diffstat:

 audio/musicpd/Makefile        |  5 +++--
 audio/ncmpc/Makefile          |  5 +++--
 databases/pgadmin3/options.mk |  7 ++++---
 databases/py-peewee/Makefile  |  8 +++++---
 4 files changed, 15 insertions(+), 10 deletions(-)

diffs (101 lines):

diff -r 57c2326b631c -r 405f481f5484 audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Mon Oct 21 21:11:13 2019 +0000
+++ b/audio/musicpd/Makefile    Mon Oct 21 21:19:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.196 2019/10/07 09:28:09 prlw1 Exp $
+# $NetBSD: Makefile,v 1.197 2019/10/21 21:19:35 adam Exp $
 
 DISTNAME=              mpd-0.21.15
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
@@ -11,7 +11,7 @@
 COMMENT=               Remote controllable audio player
 LICENSE=               gnu-gpl-v2
 
-TOOL_DEPENDS+=         ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 
 CONFLICTS=             mpd-[0-9]*
 
@@ -77,6 +77,7 @@
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff -r 57c2326b631c -r 405f481f5484 audio/ncmpc/Makefile
--- a/audio/ncmpc/Makefile      Mon Oct 21 21:11:13 2019 +0000
+++ b/audio/ncmpc/Makefile      Mon Oct 21 21:19:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2019/10/07 09:28:09 prlw1 Exp $
+# $NetBSD: Makefile,v 1.35 2019/10/21 21:19:35 adam Exp $
 
 DISTNAME=      ncmpc-0.35
 CATEGORIES=    audio
@@ -14,7 +14,7 @@
 USE_LANGUAGES= c c++14
 FAKE_NCURSES=  yes
 
-TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 
 MESON_ARGS+=   -Dlirc=disabled
 MESON_ARGS+=   -Dhtml_manual=false
@@ -45,5 +45,6 @@
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../lang/python/tool.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 57c2326b631c -r 405f481f5484 databases/pgadmin3/options.mk
--- a/databases/pgadmin3/options.mk     Mon Oct 21 21:11:13 2019 +0000
+++ b/databases/pgadmin3/options.mk     Mon Oct 21 21:19:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2018/05/10 07:12:53 adam Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/21 21:19:35 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pgadmin3
 PKG_SUPPORTED_OPTIONS= doc
@@ -11,8 +11,9 @@
 PLIST.doc=     yes
 PYTHON_FOR_BUILD_ONLY=yes
 .include "../../lang/python/pyversion.mk"
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx>=1.0:../../textproc/py-sphinx
-CONFIGURE_ARGS+=       --with-sphinx-build=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
+.include "../../lang/python/versioned_dependencies.mk"
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
+CONFIGURE_ARGS+=       --with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 .else
 CONFIGURE_ENV+=                ac_cv_path_SPHINX_BUILD=
 .endif
diff -r 57c2326b631c -r 405f481f5484 databases/py-peewee/Makefile
--- a/databases/py-peewee/Makefile      Mon Oct 21 21:11:13 2019 +0000
+++ b/databases/py-peewee/Makefile      Mon Oct 21 21:19:35 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2019/10/02 07:45:42 adam Exp $
+# $NetBSD: Makefile,v 1.61 2019/10/21 21:19:35 adam Exp $
 
 DISTNAME=      peewee-3.11.2
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -10,10 +10,11 @@
 COMMENT=       Small, expressive ORM for PostgreSQL, MySQL and SQLite
 LICENSE=       mit
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
-MAKE_FLAGS+=   SPHINXBUILD=sphinx-build${PYVERSSUFFIX}
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
+
+MAKE_FLAGS+=   SPHINXBUILD=sphinx-build-${PYVERSSUFFIX}
 
 FILES_SUBST+=  PKGMANDIR=${PKGMANDIR}
 MESSAGE_SUBST+=        PYPKGPREFIX=${PYPKGPREFIX}
@@ -39,4 +40,5 @@
 .include "../../devel/py-cython/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"