kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Switch sphinx to versioned deps.

Browse source
This commit is contained in:
adam 2019-10-21 21:19:35 +00:00
parent 832505f5bf
commit b48b04a874
4 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audio/musicpd/Makefile
View file

@ -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 DISTNAME= mpd-0.21.15
PKGNAME= ${DISTNAME:S/mpd/musicpd/} PKGNAME= ${DISTNAME:S/mpd/musicpd/}
@ -11,7 +11,7 @@ HOMEPAGE= https://www.musicpd.org/
COMMENT= Remote controllable audio player COMMENT= Remote controllable audio player
LICENSE= gnu-gpl-v2 LICENSE= gnu-gpl-v2
TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
CONFLICTS= mpd-[0-9]* CONFLICTS= mpd-[0-9]*
@ -77,6 +77,7 @@ BUILDLINK_ABI_DEPENDS.flac+= flac>=1.2
.include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../lang/python/versioned_dependencies.mk"
.include "../../security/libgcrypt/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk"

5
audio/ncmpc/Makefile
View file

@ -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 DISTNAME= ncmpc-0.35
CATEGORIES= audio CATEGORIES= audio
@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config xgettext
USE_LANGUAGES= c c++14 USE_LANGUAGES= c c++14
FAKE_NCURSES= yes FAKE_NCURSES= yes
TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
MESON_ARGS+= -Dlirc=disabled MESON_ARGS+= -Dlirc=disabled
MESON_ARGS+= -Dhtml_manual=false MESON_ARGS+= -Dhtml_manual=false
@ -45,5 +45,6 @@ SUBST_VARS.py+= PYVERSSUFFIX
.include "../../devel/boost-headers/buildlink3.mk" .include "../../devel/boost-headers/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk"
.include "../../lang/python/tool.mk" .include "../../lang/python/tool.mk"
.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/pthread.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"

7
databases/pgadmin3/options.mk
View file

@ -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_OPTIONS_VAR= PKG_OPTIONS.pgadmin3
PKG_SUPPORTED_OPTIONS= doc PKG_SUPPORTED_OPTIONS= doc
@ -11,8 +11,9 @@ PLIST_VARS= doc
PLIST.doc= yes PLIST.doc= yes
PYTHON_FOR_BUILD_ONLY=yes PYTHON_FOR_BUILD_ONLY=yes
.include "../../lang/python/pyversion.mk" .include "../../lang/python/pyversion.mk"
BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.0:../../textproc/py-sphinx .include "../../lang/python/versioned_dependencies.mk"
CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
.else .else
CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD= CONFIGURE_ENV+= ac_cv_path_SPHINX_BUILD=
.endif .endif

8
databases/py-peewee/Makefile
View file

@ -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 DISTNAME= peewee-3.11.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME} PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@ -10,10 +10,11 @@ HOMEPAGE= http://www.peewee-orm.com/
COMMENT= Small, expressive ORM for PostgreSQL, MySQL and SQLite COMMENT= Small, expressive ORM for PostgreSQL, MySQL and SQLite
LICENSE= mit LICENSE= mit
BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 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} FILES_SUBST+= PKGMANDIR=${PKGMANDIR}
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
@ -39,4 +40,5 @@ post-install:
.include "../../devel/py-cython/buildlink3.mk" .include "../../devel/py-cython/buildlink3.mk"
.include "../../lang/python/application.mk" .include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk" .include "../../lang/python/egg.mk"
.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/bsd.pkg.mk" .include "../../mk/bsd.pkg.mk"