From b48b04a8742f3c94118a787938ef3252f97ec42e Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Mon, 21 Oct 2019 21:19:35 +0000
Subject: [PATCH] Switch sphinx to versioned deps.

---
 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(-)

diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index f9ac0de149a5..9509f3b91401 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -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 @@ HOMEPAGE=		https://www.musicpd.org/
 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 @@ BUILDLINK_ABI_DEPENDS.flac+=	flac>=1.2
 .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 --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 21dc97f90b79..97f6b3f8819f 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -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_TOOLS+=	pkg-config xgettext
 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 @@ SUBST_VARS.py+=		PYVERSSUFFIX
 .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 --git a/databases/pgadmin3/options.mk b/databases/pgadmin3/options.mk
index 283f4b91111f..4aa17ff6a8e7 100644
--- a/databases/pgadmin3/options.mk
+++ b/databases/pgadmin3/options.mk
@@ -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_VARS=	doc
 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 --git a/databases/py-peewee/Makefile b/databases/py-peewee/Makefile
index 1b550adc7e99..6a8b59fc69f6 100644
--- a/databases/py-peewee/Makefile
+++ b/databases/py-peewee/Makefile
@@ -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 @@ HOMEPAGE=	http://www.peewee-orm.com/
 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 @@ post-install:
 .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"