CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 21 21:55:04 UTC 2019

Modified Files:
        pkgsrc/ham/gnuradio-doxygen: Makefile
        pkgsrc/mail/notmuch: options.mk
        pkgsrc/print/zathura: Makefile
        pkgsrc/security/fail2ban: Makefile

Log Message:
Switch sphinx to versioned deps.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/ham/gnuradio-doxygen/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mail/notmuch/options.mk
cvs rdiff -u -r1.29 -r1.30 pkgsrc/print/zathura/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/security/fail2ban/Makefile

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

Modified files:

Index: pkgsrc/ham/gnuradio-doxygen/Makefile
diff -u pkgsrc/ham/gnuradio-doxygen/Makefile:1.28 pkgsrc/ham/gnuradio-doxygen/Makefile:1.29
--- pkgsrc/ham/gnuradio-doxygen/Makefile:1.28   Mon Oct 21 14:01:18 2019
+++ pkgsrc/ham/gnuradio-doxygen/Makefile        Mon Oct 21 21:55:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/10/21 14:01:18 mef Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/21 21:55:04 adam Exp $
 
 PKGNAME=       gnuradio-doxygen-${VERSION}
 PKGREVISION=   2
@@ -8,7 +8,6 @@ COMMENT=        Doxygen documentation of GNU Ra
 .include       "../../ham/gnuradio-core/Nocore.mk"
 
 BUILD_DEPENDS+=        doxygen>=1.8.15:../../devel/doxygen
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 BUILD_DEPENDS+=        graphviz-[0-9]*:../../graphics/graphviz
 
 DEPENDS+=      web2c-[0-9]*:../../print/web2c
@@ -16,8 +15,11 @@ DEPENDS+=    web2c-[0-9]*:../../print/web2c
 DEPENDS+=      texlive-collection-latex-[0-9]*:../../meta-pkgs/texlive-collection-latex
 DEPENDS+=      tex-newunicodechar-[-0-9]*:../../print/tex-newunicodechar
 
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
+
 CMAKE_ARGS+=   -DENABLE_DEFAULT=False
 CMAKE_ARGS+=   -DENABLE_DOXYGEN=ON
 CMAKE_ARGS+=   -DENABLE_SPHINX=ON
 
-.include       "../../mk/bsd.pkg.mk"
+.include "../../lang/python/versioned_dependencies.mk"
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/mail/notmuch/options.mk
diff -u pkgsrc/mail/notmuch/options.mk:1.3 pkgsrc/mail/notmuch/options.mk:1.4
--- pkgsrc/mail/notmuch/options.mk:1.3  Fri Apr  5 09:59:01 2019
+++ pkgsrc/mail/notmuch/options.mk      Mon Oct 21 21:55:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2019/04/05 09:59:01 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2019/10/21 21:55:04 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.notmuch
 PKG_SUPPORTED_OPTIONS= notmuch-emacs doc
@@ -24,7 +24,8 @@ CONFIGURE_ARGS+=      --without-emacs
 PLIST_VARS+=           doc
 .if !empty(PKG_OPTIONS:Mdoc)
 PLIST.doc=             yes
-BUILD_DEPENDS+=                ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
+.include "../../lang/python/versioned_dependencies.mk"
 .else
 CONFIGURE_ARGS+=       --without-docs
 CONFIGURE_ARGS+=       --without-api-docs

Index: pkgsrc/print/zathura/Makefile
diff -u pkgsrc/print/zathura/Makefile:1.29 pkgsrc/print/zathura/Makefile:1.30
--- pkgsrc/print/zathura/Makefile:1.29  Mon Oct  7 09:28:13 2019
+++ pkgsrc/print/zathura/Makefile       Mon Oct 21 21:55:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/10/07 09:28:13 prlw1 Exp $
+# $NetBSD: Makefile,v 1.30 2019/10/21 21:55:03 adam Exp $
 
 DISTNAME=      zathura-0.4.3
 PKGREVISION=   2
@@ -15,7 +15,8 @@ USE_TOOLS+=   pkg-config
 
 # XXX: msgfmt needs to support `--xml', always use the one from pkgsrc
 TOOL_DEPENDS+= gettext-tools>=0.15:../../devel/gettext-tools
-TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
 
 # Avoid possible dependency on librsvg
 MESON_ARGS+=   -D convert-icon=disabled
@@ -27,6 +28,7 @@ CFLAGS.SunOS+=        -D__EXTENSIONS__
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/girara/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/file/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"

Index: pkgsrc/security/fail2ban/Makefile
diff -u pkgsrc/security/fail2ban/Makefile:1.9 pkgsrc/security/fail2ban/Makefile:1.10
--- pkgsrc/security/fail2ban/Makefile:1.9       Thu Apr 25 07:33:15 2019
+++ pkgsrc/security/fail2ban/Makefile   Mon Oct 21 21:55:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/04/25 07:33:15 maya Exp $
+# $NetBSD: Makefile,v 1.10 2019/10/21 21:55:03 adam Exp $
 #
 
 DISTNAME=      fail2ban-0.9.6
@@ -14,9 +14,10 @@ LICENSE=     gnu-gpl-v2
 
 DEPENDS+=      ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
 BUILD_DEPENDS+=        ${PYPKGPREFIX}-numpydoc-[0-9]*:../../textproc/py-numpydoc
 
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:build
+
 USE_TOOLS+=    make:build
 
 USE_LANGUAGES=         # none
@@ -121,4 +122,5 @@ post-install:
 .include "options.mk"
 
 .include "../../lang/python/distutils.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/bsd.pkg.mk"