Switch sphinx to versioned deps.

7 files changed, 31 insertions, 26 deletions

diff --git a/textproc/py-sphinxcontrib-newsfeed/Makefile b/textproc/py-sphinxcontrib-newsfeed/Makefile
index 47027f464f0..4e22daea342 100644
--- a/textproc/py-sphinxcontrib-newsfeed/Makefile
+++ b/textproc/py-sphinxcontrib-newsfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/09/04 18:08:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2019/10/21 22:11:33 adam Exp $
 
 DISTNAME=	sphinxcontrib-newsfeed-0.1.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,10 @@ HOMEPAGE=	https://bitbucket.org/prometheus/sphinxcontrib-newsfeed
 COMMENT=	News Feed extension for Sphinx
 LICENSE=	2-clause-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-xapian/Makefile b/textproc/py-xapian/Makefile
index f5d5e8741ea..d185e98a70c 100644
--- a/textproc/py-xapian/Makefile
+++ b/textproc/py-xapian/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.3 2019/08/24 18:10:50 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2019/10/21 22:11:33 adam Exp $
 
-PKGNAME=		${PYPKGPREFIX}-${PKGNAME_MODULE}
-COMMENT=		Python bindings for Xapian search engine
-HOMEPAGE=		https://xapian.org/docs/bindings/python/
+PKGNAME=	${PYPKGPREFIX}-${PKGNAME_MODULE}
+COMMENT=	Python bindings for Xapian search engine
+HOMEPAGE=	https://xapian.org/docs/bindings/python/
 
-DEPENDS+=		${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx
 
 .include "../../lang/python/pyversion.mk"
-
-.if (${PYPKGPREFIX} == py27)
+.if ${_PYTHON_VERSION} == 27
 CONFIGURE_ARGS+=	--with-python
 PYTHON_3_OR_PYTHON=	python
 .else
@@ -23,12 +22,13 @@ REPLACE_PYTHON=		python/docs/examples/*.py
 
 post-install:
 	${CHMOD} +x ${DESTDIR}${PREFIX}/share/doc/xapian-bindings/${PYTHON_3_OR_PYTHON}/examples/*.py
-.if (${PYPKGPREFIX} != py27)
+.if ${_PYTHON_VERSION} != 27
 	${MKDIR} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__
 	${MV} ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/*.cpython* ${DESTDIR}${PREFIX}/${PYSITELIB}/xapian/__pycache__/
 .endif
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../textproc/xapian/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xmlada/Makefile b/textproc/xmlada/Makefile
index 6853d2a1941..3a54f467452 100644
--- a/textproc/xmlada/Makefile
+++ b/textproc/xmlada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2019/09/02 13:20:11 adam Exp $
+# $NetBSD: Makefile,v 1.23 2019/10/21 22:11:33 adam Exp $
 
 DISTNAME=	xmlada-${XMLADA_VERS}
 PKGREVISION=	5
@@ -40,7 +40,7 @@ SUBST_SED.docs=		-e 's/^all: \(.*\)/all: \1 docs/g'
 MAKE_ENV+=	SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
 
 DESTSTATIC=	${DESTDIR}${PREFIX}/lib/xmlada/static
-DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx1
 PYTHON_VERSIONS_ACCEPTED=	27 # not yet ported as of 4.4.0.0
 
 post-install:
@@ -53,5 +53,5 @@ post-install:
 		     ${DESTSTATIC}/libxmlada_schema.a \
 		     ${DESTSTATIC}/libxmlada_unicode.a
 
-.include "../../lang/python/application.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile
index 108fb035231..675450bd20d 100644
--- a/www/py-pelican/Makefile
+++ b/www/py-pelican/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2017/09/03 08:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2019/10/21 22:11:34 adam Exp $
 
 DISTNAME=		pelican-3.7.1
 PKGREVISION=		1
@@ -23,7 +23,9 @@ DEPENDS+=		${PYPKGPREFIX}-blinker-[0-9]*:../../devel/py-blinker
 DEPENDS+=		${PYPKGPREFIX}-Unidecode-[0-9]*:../../textproc/py-Unidecode
 DEPENDS+=		${PYPKGPREFIX}-six>=1.4:../../lang/py-six
 DEPENDS+=		${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
-BUILD_DEPENDS+=		${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
+
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:build
+
 USE_TOOLS+=		bash:run make:build sed:build
 
 REPLACE_PYTHON+=	pelican/tools/pelican_import.py
@@ -56,7 +58,7 @@ TXTDOCFILES=		changelog.txt content.txt contribute.txt faq.txt \
 AUTO_MKDIRS=		yes
 
 post-build:
-	cd ${WRKSRC}/docs/ && make SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} text man
+	cd ${WRKSRC}/docs/ && make SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX} text man
 
 post-install:
 .for f in ${MANPAGES}
@@ -68,4 +70,5 @@ post-install:
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/py-werkzeug-docs/Makefile b/www/py-werkzeug-docs/Makefile
index 309c21395f9..828c2b8f41c 100644
--- a/www/py-werkzeug-docs/Makefile
+++ b/www/py-werkzeug-docs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2019/09/14 17:09:11 gutteridge Exp $
+# $NetBSD: Makefile,v 1.13 2019/10/21 22:11:34 adam Exp $
 
 PKGNAME=	${PYPKGPREFIX}-werkzeug-docs-${DISTNAME:C/[^-]*-//}
 COMMENT=	Python WSGI Utility Library (HTML documentation)
 
 TOOL_DEPENDS+=	${PYPKGPREFIX}-pallets-sphinx-themes-[0-9]*:../../textproc/py-pallets-sphinx-themes
-TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
 TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx-issues-[0-9]*:../../textproc/py-sphinx-issues
 TOOL_DEPENDS+=	${PYPKGPREFIX}-werkzeug-[0-9]*:../../www/py-werkzeug
 
@@ -30,7 +29,7 @@ do-install:
 
 PYTHON_FOR_BUILD_ONLY=	yes
 
-MAKE_FLAGS+=	SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
+MAKE_FLAGS+=	SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 
 .include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/trafficserver/Makefile b/www/trafficserver/Makefile
index 5c5fddb3c18..51d8523cecf 100644
--- a/www/trafficserver/Makefile
+++ b/www/trafficserver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/09/02 13:20:02 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/10/21 22:11:34 adam Exp $
 
 DISTNAME=	trafficserver-7.1.2
 PKGREVISION=	9
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 
 # For man pages
 PYTHON_FOR_BUILD_ONLY=		yes
-PYTHON_VERSIONS_ACCEPTED=	 27
-BUILD_DEPENDS+=			${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONS_ACCEPTED=	27
+BUILD_DEPENDS+=			${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx1
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/x11/gtkada/Makefile b/x11/gtkada/Makefile
index 723c66e929b..35f4db2db73 100644
--- a/x11/gtkada/Makefile
+++ b/x11/gtkada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2019/08/11 13:25:12 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2019/10/21 22:11:34 adam Exp $
 
 DISTNAME=	gtkada-${GTKADA_VERSION}
 PKGREVISION=	22
@@ -13,7 +13,7 @@ HOMEPAGE=	http://libre.adacore.com/libre/tools/gtkada/
 COMMENT=	Ada graphical toolkit based on Gtk+
 LICENSE=	gnu-gpl-v2
 
-BUILD_DEPENDS=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:build
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake perl pkg-config
@@ -34,7 +34,7 @@ SUBST_FILES.lgnat=	src/tools/Makefile.in testgtk/Makefile.in
 SUBST_SED.lgnat=	-e 's|-largs|-largs -lgnat|'
 SUBST_STAGE.sphinx=	pre-configure
 SUBST_FILES.sphinx=	docs/gtkada_ug/Makefile
-SUBST_SED.sphinx=	-e 's|sphinx-build|${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}|'
+SUBST_SED.sphinx=	-e 's|sphinx-build|${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}|'
 
 GENERATE_PLIST=	cd ${DESTDIR}${PREFIX}; \
 		${FIND} * \( -type f -or -type l \) | ${SORT};
@@ -66,6 +66,6 @@ post-install:
 	${RM} -rf ${DESTDIR}${PREFIX}/share/doc/gtkada/gtkada_ug/_sources
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"