CVS commit: pkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 21 21:19:35 UTC 2019

Modified Files:
        pkgsrc/audio/musicpd: Makefile
        pkgsrc/audio/ncmpc: Makefile
        pkgsrc/databases/pgadmin3: options.mk
        pkgsrc/databases/py-peewee: Makefile

Log Message:
Switch sphinx to versioned deps.


To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 pkgsrc/audio/musicpd/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/audio/ncmpc/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/pgadmin3/options.mk
cvs rdiff -u -r1.60 -r1.61 pkgsrc/databases/py-peewee/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/musicpd/Makefile
diff -u pkgsrc/audio/musicpd/Makefile:1.196 pkgsrc/audio/musicpd/Makefile:1.197
--- pkgsrc/audio/musicpd/Makefile:1.196 Mon Oct  7 09:28:09 2019
+++ pkgsrc/audio/musicpd/Makefile       Mon Oct 21 21:19:35 2019
@@ -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"

Index: pkgsrc/audio/ncmpc/Makefile
diff -u pkgsrc/audio/ncmpc/Makefile:1.34 pkgsrc/audio/ncmpc/Makefile:1.35
--- pkgsrc/audio/ncmpc/Makefile:1.34    Mon Oct  7 09:28:09 2019
+++ pkgsrc/audio/ncmpc/Makefile Mon Oct 21 21:19:35 2019
@@ -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"

Index: pkgsrc/databases/pgadmin3/options.mk
diff -u pkgsrc/databases/pgadmin3/options.mk:1.3 pkgsrc/databases/pgadmin3/options.mk:1.4
--- pkgsrc/databases/pgadmin3/options.mk:1.3    Thu May 10 07:12:53 2018
+++ pkgsrc/databases/pgadmin3/options.mk        Mon Oct 21 21:19:35 2019
@@ -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

Index: pkgsrc/databases/py-peewee/Makefile
diff -u pkgsrc/databases/py-peewee/Makefile:1.60 pkgsrc/databases/py-peewee/Makefile:1.61
--- pkgsrc/databases/py-peewee/Makefile:1.60    Wed Oct  2 07:45:42 2019
+++ pkgsrc/databases/py-peewee/Makefile Mon Oct 21 21:19:35 2019
@@ -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"