[pkgsrc/trunk]: pkgsrc Fix sphinx-build binary name

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Fix sphinx-build binary name
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 12:09:43 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5bee9d7b06ba
branches:  trunk
changeset: 403119:5bee9d7b06ba
user:      adam <adam%pkgsrc.org@localhost>
date:      Mon Oct 21 22:15:10 2019 +0000

description:
Fix sphinx-build binary name

diffstat:

 audio/musicpd/Makefile       |   4 ++--
 devel/py-tortoisehg/Makefile |   4 ++--
 mail/notmuch/Makefile        |   4 ++--
 misc/khard/Makefile          |   4 ++--
 security/fail2ban/Makefile   |   4 ++--
 sysutils/salt-docs/Makefile  |  11 ++++++-----
 textproc/xmlada/Makefile     |   4 ++--
 time/khal/Makefile           |   4 ++--
 time/py-vdirsyncer/Makefile  |   4 ++--
 www/trafficserver/Makefile   |   4 ++--
 10 files changed, 24 insertions(+), 23 deletions(-)

diffs (200 lines):

diff -r 0d762aaf75a6 -r 5bee9d7b06ba audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Mon Oct 21 22:11:33 2019 +0000
+++ b/audio/musicpd/Makefile    Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.197 2019/10/21 21:19:35 adam Exp $
+# $NetBSD: Makefile,v 1.198 2019/10/21 22:15:10 adam Exp $
 
 DISTNAME=              mpd-0.21.15
 PKGNAME=               ${DISTNAME:S/mpd/musicpd/}
@@ -55,7 +55,7 @@
 SUBST_STAGE.sphinx=    pre-configure
 SUBST_FILES.sphinx=    doc/meson.build
 SUBST_MESSAGE.sphinx=  Fixing sphinx binary name.
-SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
+SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
 
 LDFLAGS+=              ${LIBOSSAUDIO}
 
diff -r 0d762aaf75a6 -r 5bee9d7b06ba devel/py-tortoisehg/Makefile
--- a/devel/py-tortoisehg/Makefile      Mon Oct 21 22:11:33 2019 +0000
+++ b/devel/py-tortoisehg/Makefile      Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2019/10/21 21:42:22 adam Exp $
+# $NetBSD: Makefile,v 1.57 2019/10/21 22:15:11 adam Exp $
 
 DISTNAME=              tortoisehg-5.0.2
 PKGNAME=               ${PYPKGPREFIX}-${DISTNAME}
@@ -27,7 +27,7 @@
 SUBST_SED.df=          -e 's:thg_logo:${PREFIX}${thg_icon}:1'
 
 pre-build:
-       ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build${PYVERSSUFFIX} html
+       ${RUN} cd ${WRKSRC}/doc && ${MAKE_PROGRAM} SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} html
        ${RUN} rm ${WRKSRC}/doc/build/html/.buildinfo
        # conflicts with mercurial
        # https://bitbucket.org/tortoisehg/thg/issues/4629/tortoisehg-file-name-conflict-with
diff -r 0d762aaf75a6 -r 5bee9d7b06ba mail/notmuch/Makefile
--- a/mail/notmuch/Makefile     Mon Oct 21 22:11:33 2019 +0000
+++ b/mail/notmuch/Makefile     Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2019/06/12 13:26:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.53 2019/10/21 22:15:11 adam Exp $
 
 DISTNAME=      notmuch-0.29.1
 CATEGORIES=    mail
@@ -32,7 +32,7 @@
 SUBST_SED.gnuld=       -e 's/-Wl,--[^ ]*//g'
 
 SUBST_CLASSES+=                sphinx
-SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build${PYVERSSUFFIX},"
+SUBST_SED.sphinx+=     -e "s,sphinx-build,sphinx-build-${PYVERSSUFFIX},"
 SUBST_FILES.sphinx+=   bindings/python/docs/Makefile configure doc/Makefile.local
 SUBST_STAGE.sphinx=    pre-configure
 SUBST_MESSAGE.sphinx=  Fix sphinx command names.
diff -r 0d762aaf75a6 -r 5bee9d7b06ba misc/khard/Makefile
--- a/misc/khard/Makefile       Mon Oct 21 22:11:33 2019 +0000
+++ b/misc/khard/Makefile       Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/07/21 21:11:37 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2019/10/21 22:15:11 adam Exp $
 
 DISTNAME=              khard-0.14.0
 PKGREVISION=           1
@@ -27,7 +27,7 @@
 USE_TOOLS+=            gmake
 
 pre-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -C doc SPHINXBUILD=sphinx-build${PYVERSSUFFIX} man
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} -C doc SPHINXBUILD=sphinx-build-${PYVERSSUFFIX} man
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/misc/khard/khard.conf.example ${DESTDIR}${PREFIX}/share/examples/khard
diff -r 0d762aaf75a6 -r 5bee9d7b06ba security/fail2ban/Makefile
--- a/security/fail2ban/Makefile        Mon Oct 21 22:11:33 2019 +0000
+++ b/security/fail2ban/Makefile        Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/10/21 21:55:03 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/10/21 22:15:11 adam Exp $
 #
 
 DISTNAME=      fail2ban-0.9.6
@@ -103,7 +103,7 @@
        ${CP} ${FILESDIR}/paths-pkgsrc.conf ${WRKSRC}/config/paths-pkgsrc.conf
 
 post-build:
-               cd ${WRKSRC}/doc/ && make SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} text
+               cd ${WRKSRC}/doc/ && make SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX} text
 
 post-install:
 .for manfile1 in ${MANPAGES1}
diff -r 0d762aaf75a6 -r 5bee9d7b06ba sysutils/salt-docs/Makefile
--- a/sysutils/salt-docs/Makefile       Mon Oct 21 22:11:33 2019 +0000
+++ b/sysutils/salt-docs/Makefile       Mon Oct 21 22:15:10 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2019/04/25 07:33:21 maya Exp $
+# $NetBSD: Makefile,v 1.23 2019/10/21 22:15:10 adam Exp $
 
-DISTNAME=      salt-2019.2.0
+DISTNAME=      salt-2019.2.1
 PKGNAME=       ${DISTNAME:S/-/-docs-/}
-PKGREVISION=   1
 CATEGORIES=    sysutils python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=s/salt/}
 
@@ -13,19 +12,21 @@
 
 USE_TOOLS+=    gmake pax
 
-BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.2.3nb1*:../../textproc/py-sphinx
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-sphinx>=1.2.3nb1*:../../textproc/py-sphinx1
 
 NO_CONFIGURE=  yes
 BUILD_DIRS=    doc
 BUILD_TARGET=  html
 
-MAKE_FLAGS+=   SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
+MAKE_FLAGS+=   SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 
 HTMLDIR=       share/doc/salt
 PLIST_SRC=     ${WRKDIR}/.PLIST_SRC
 
 INSTALLATION_DIRS=     ${HTMLDIR}
 
+PYTHON_VERSIONS_ACCEPTED=      27
+
 do-install:
        cd ${WRKSRC}/doc/_build/html && pax -rw -pp . ${DESTDIR}${PREFIX}/${HTMLDIR}
        cd ${DESTDIR}${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
diff -r 0d762aaf75a6 -r 5bee9d7b06ba textproc/xmlada/Makefile
--- a/textproc/xmlada/Makefile  Mon Oct 21 22:11:33 2019 +0000
+++ b/textproc/xmlada/Makefile  Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2019/10/21 22:11:33 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/10/21 22:15:10 adam Exp $
 
 DISTNAME=      xmlada-${XMLADA_VERS}
 PKGREVISION=   5
@@ -37,7 +37,7 @@
 SUBST_FILES.docs=      Makefile.in
 SUBST_SED.docs=                -e 's/^all: \(.*\)/all: \1 docs/g'
 
-MAKE_ENV+=     SPHINXBUILD=${PREFIX}/bin/sphinx-build${PYVERSSUFFIX}
+MAKE_ENV+=     SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 
 DESTSTATIC=    ${DESTDIR}${PREFIX}/lib/xmlada/static
 DEPENDS+=      ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx1
diff -r 0d762aaf75a6 -r 5bee9d7b06ba time/khal/Makefile
--- a/time/khal/Makefile        Mon Oct 21 22:11:33 2019 +0000
+++ b/time/khal/Makefile        Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/04/25 07:33:25 maya Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/21 22:15:10 adam Exp $
 
 DISTNAME=              khal-0.10.1
 PKGREVISION=           1
@@ -42,7 +42,7 @@
 REPLACE_PYTHON+=       khal/*.py
 
 post-build:
-       cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} PYTHONPATH=${WRKSRC} ${GMAKE} man SPHINXBUILD=sphinx-build${PYVERSSUFFIX}
+       cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} PYTHONPATH=${WRKSRC} ${GMAKE} man SPHINXBUILD=sphinx-build-${PYVERSSUFFIX}
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/khal.conf.sample ${DESTDIR}${PREFIX}/share/doc/khal
diff -r 0d762aaf75a6 -r 5bee9d7b06ba time/py-vdirsyncer/Makefile
--- a/time/py-vdirsyncer/Makefile       Mon Oct 21 22:11:33 2019 +0000
+++ b/time/py-vdirsyncer/Makefile       Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2018/08/16 12:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2019/10/21 22:15:10 adam Exp $
 
 DISTNAME=      vdirsyncer-0.16.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -35,7 +35,7 @@
 USE_TOOLS+=    gmake
 
 post-build:
-       cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} PYTHONPATH=${WRKSRC} ${GMAKE} man SPHINXBUILD=sphinx-build${PYVERSSUFFIX}
+       cd ${WRKSRC}/docs && ${SETENV} ${MAKE_ENV} PYTHONPATH=${WRKSRC} ${GMAKE} man SPHINXBUILD=sphinx-build-${PYVERSSUFFIX}
 
 post-install:
        ${INSTALL_MAN} ${WRKSRC}/docs/_build/man/vdirsyncer.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
diff -r 0d762aaf75a6 -r 5bee9d7b06ba www/trafficserver/Makefile
--- a/www/trafficserver/Makefile        Mon Oct 21 22:11:33 2019 +0000
+++ b/www/trafficserver/Makefile        Mon Oct 21 22:15:10 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/10/21 22:11:34 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/10/21 22:15:10 adam Exp $
 
 DISTNAME=      trafficserver-7.1.2
 PKGREVISION=   9
@@ -88,7 +88,7 @@
 
 CONFIGURE_ENV.SunOS+=  ac_cv_func_epoll_ctl=no
 CONFIGURE_ENV.SunOS+=  ac_cv_func_inotify_init=no
-CONFIGURE_ENV+=                SPHINXBUILD=sphinx-build${PYVERSSUFFIX}
+CONFIGURE_ENV+=                SPHINXBUILD=sphinx-build-${PYVERSSUFFIX}
 
 REPLACE_BASH+=         tools/tsxs.in
 REPLACE_PERL+=         tools/tspush
Prev by Date: [pkgsrc/trunk]: pkgsrc Switch sphinx to versioned deps.
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/lld Restore NetBSD patches.
Previous by Thread: [pkgsrc/trunk]: pkgsrc Switch sphinx to versioned deps.
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/lld Restore NetBSD patches.
Indexes:
Home | Main Index | Thread Index | Old Index