CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 21 Oct 2019 22:11:34 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct 21 22:11:34 UTC 2019

Modified Files:
        pkgsrc/textproc/py-sphinxcontrib-newsfeed: Makefile
        pkgsrc/textproc/py-xapian: Makefile
        pkgsrc/textproc/xmlada: Makefile
        pkgsrc/www/py-pelican: Makefile
        pkgsrc/www/py-werkzeug-docs: Makefile
        pkgsrc/www/trafficserver: Makefile
        pkgsrc/x11/gtkada: Makefile

Log Message:
Switch sphinx to versioned deps.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-sphinxcontrib-newsfeed/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-xapian/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/textproc/xmlada/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-pelican/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/py-werkzeug-docs/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/www/trafficserver/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/x11/gtkada/Makefile

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

Modified files:

Index: pkgsrc/textproc/py-sphinxcontrib-newsfeed/Makefile
diff -u pkgsrc/textproc/py-sphinxcontrib-newsfeed/Makefile:1.2 pkgsrc/textproc/py-sphinxcontrib-newsfeed/Makefile:1.3
--- pkgsrc/textproc/py-sphinxcontrib-newsfeed/Makefile:1.2      Mon Sep  4 18:08:29 2017
+++ pkgsrc/textproc/py-sphinxcontrib-newsfeed/Makefile  Mon Oct 21 22:11:33 2019
@@ -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/promethe
 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"

Index: pkgsrc/textproc/py-xapian/Makefile
diff -u pkgsrc/textproc/py-xapian/Makefile:1.3 pkgsrc/textproc/py-xapian/Makefile:1.4
--- pkgsrc/textproc/py-xapian/Makefile:1.3      Sat Aug 24 18:10:50 2019
+++ pkgsrc/textproc/py-xapian/Makefile  Mon Oct 21 22:11:33 2019
@@ -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/*.
 
 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"

Index: pkgsrc/textproc/xmlada/Makefile
diff -u pkgsrc/textproc/xmlada/Makefile:1.22 pkgsrc/textproc/xmlada/Makefile:1.23
--- pkgsrc/textproc/xmlada/Makefile:1.22        Mon Sep  2 13:20:11 2019
+++ pkgsrc/textproc/xmlada/Makefile     Mon Oct 21 22:11:33 2019
@@ -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:
 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"

Index: pkgsrc/www/py-pelican/Makefile
diff -u pkgsrc/www/py-pelican/Makefile:1.7 pkgsrc/www/py-pelican/Makefile:1.8
--- pkgsrc/www/py-pelican/Makefile:1.7  Sun Sep  3 08:53:17 2017
+++ pkgsrc/www/py-pelican/Makefile      Mon Oct 21 22:11:34 2019
@@ -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]*
 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 
 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"

Index: pkgsrc/www/py-werkzeug-docs/Makefile
diff -u pkgsrc/www/py-werkzeug-docs/Makefile:1.12 pkgsrc/www/py-werkzeug-docs/Makefile:1.13
--- pkgsrc/www/py-werkzeug-docs/Makefile:1.12   Sat Sep 14 17:09:11 2019
+++ pkgsrc/www/py-werkzeug-docs/Makefile        Mon Oct 21 22:11:34 2019
@@ -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"

Index: pkgsrc/www/trafficserver/Makefile
diff -u pkgsrc/www/trafficserver/Makefile:1.19 pkgsrc/www/trafficserver/Makefile:1.20
--- pkgsrc/www/trafficserver/Makefile:1.19      Mon Sep  2 13:20:02 2019
+++ pkgsrc/www/trafficserver/Makefile   Mon Oct 21 22:11:34 2019
@@ -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"
 

Index: pkgsrc/x11/gtkada/Makefile
diff -u pkgsrc/x11/gtkada/Makefile:1.49 pkgsrc/x11/gtkada/Makefile:1.50
--- pkgsrc/x11/gtkada/Makefile:1.49     Sun Aug 11 13:25:12 2019
+++ pkgsrc/x11/gtkada/Makefile  Mon Oct 21 22:11:34 2019
@@ -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
 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
 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"

Prev by Date: CVS commit: pkgsrc/devel/lld
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/devel/lld
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index