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:15:11 +0000

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

Modified Files:
        pkgsrc/audio/musicpd: Makefile
        pkgsrc/devel/py-tortoisehg: Makefile
        pkgsrc/mail/notmuch: Makefile
        pkgsrc/misc/khard: Makefile
        pkgsrc/security/fail2ban: Makefile
        pkgsrc/sysutils/salt-docs: Makefile
        pkgsrc/textproc/xmlada: Makefile
        pkgsrc/time/khal: Makefile
        pkgsrc/time/py-vdirsyncer: Makefile
        pkgsrc/www/trafficserver: Makefile

Log Message:
Fix sphinx-build binary name


To generate a diff of this commit:
cvs rdiff -u -r1.197 -r1.198 pkgsrc/audio/musicpd/Makefile
cvs rdiff -u -r1.56 -r1.57 pkgsrc/devel/py-tortoisehg/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/mail/notmuch/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/misc/khard/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/fail2ban/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/salt-docs/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/xmlada/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/time/khal/Makefile
cvs rdiff -u -r1.52 -r1.53 pkgsrc/time/py-vdirsyncer/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/www/trafficserver/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.197 pkgsrc/audio/musicpd/Makefile:1.198
--- pkgsrc/audio/musicpd/Makefile:1.197 Mon Oct 21 21:19:35 2019
+++ pkgsrc/audio/musicpd/Makefile       Mon Oct 21 22:15:10 2019
@@ -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_CLASSES+=               sphinx
 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}
 

Index: pkgsrc/devel/py-tortoisehg/Makefile
diff -u pkgsrc/devel/py-tortoisehg/Makefile:1.56 pkgsrc/devel/py-tortoisehg/Makefile:1.57
--- pkgsrc/devel/py-tortoisehg/Makefile:1.56    Mon Oct 21 21:42:22 2019
+++ pkgsrc/devel/py-tortoisehg/Makefile Mon Oct 21 22:15:11 2019
@@ -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_FILES.df=               contrib/thg.desktop
 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

Index: pkgsrc/mail/notmuch/Makefile
diff -u pkgsrc/mail/notmuch/Makefile:1.52 pkgsrc/mail/notmuch/Makefile:1.53
--- pkgsrc/mail/notmuch/Makefile:1.52   Wed Jun 12 13:26:27 2019
+++ pkgsrc/mail/notmuch/Makefile        Mon Oct 21 22:15:11 2019
@@ -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_FILES.gnuld=    lib/Makefile.local
 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.

Index: pkgsrc/misc/khard/Makefile
diff -u pkgsrc/misc/khard/Makefile:1.19 pkgsrc/misc/khard/Makefile:1.20
--- pkgsrc/misc/khard/Makefile:1.19     Sun Jul 21 21:11:37 2019
+++ pkgsrc/misc/khard/Makefile  Mon Oct 21 22:15:11 2019
@@ -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 @@ REPLACE_PYTHON+=      */*.py
 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

Index: pkgsrc/security/fail2ban/Makefile
diff -u pkgsrc/security/fail2ban/Makefile:1.10 pkgsrc/security/fail2ban/Makefile:1.11
--- pkgsrc/security/fail2ban/Makefile:1.10      Mon Oct 21 21:55:03 2019
+++ pkgsrc/security/fail2ban/Makefile   Mon Oct 21 22:15:11 2019
@@ -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 @@ post-extract:
        ${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}

Index: pkgsrc/sysutils/salt-docs/Makefile
diff -u pkgsrc/sysutils/salt-docs/Makefile:1.22 pkgsrc/sysutils/salt-docs/Makefile:1.23
--- pkgsrc/sysutils/salt-docs/Makefile:1.22     Thu Apr 25 07:33:21 2019
+++ pkgsrc/sysutils/salt-docs/Makefile  Mon Oct 21 22:15:10 2019
@@ -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 @@ LICENSE=    apache-2.0
 
 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}

Index: pkgsrc/textproc/xmlada/Makefile
diff -u pkgsrc/textproc/xmlada/Makefile:1.23 pkgsrc/textproc/xmlada/Makefile:1.24
--- pkgsrc/textproc/xmlada/Makefile:1.23        Mon Oct 21 22:11:33 2019
+++ pkgsrc/textproc/xmlada/Makefile     Mon Oct 21 22:15:10 2019
@@ -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_MESSAGE.docs=   Set build xmlada doc
 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

Index: pkgsrc/time/khal/Makefile
diff -u pkgsrc/time/khal/Makefile:1.28 pkgsrc/time/khal/Makefile:1.29
--- pkgsrc/time/khal/Makefile:1.28      Thu Apr 25 07:33:25 2019
+++ pkgsrc/time/khal/Makefile   Mon Oct 21 22:15:10 2019
@@ -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
 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

Index: pkgsrc/time/py-vdirsyncer/Makefile
diff -u pkgsrc/time/py-vdirsyncer/Makefile:1.52 pkgsrc/time/py-vdirsyncer/Makefile:1.53
--- pkgsrc/time/py-vdirsyncer/Makefile:1.52     Thu Aug 16 12:43:43 2018
+++ pkgsrc/time/py-vdirsyncer/Makefile  Mon Oct 21 22:15:10 2019
@@ -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 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 # not s
 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

Index: pkgsrc/www/trafficserver/Makefile
diff -u pkgsrc/www/trafficserver/Makefile:1.20 pkgsrc/www/trafficserver/Makefile:1.21
--- pkgsrc/www/trafficserver/Makefile:1.20      Mon Oct 21 22:11:34 2019
+++ pkgsrc/www/trafficserver/Makefile   Mon Oct 21 22:15:10 2019
@@ -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_ARGS+=      --with-user=${TS_USER}
 
 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: CVS commit: pkgsrc
Next by Date: CVS commit: pkgsrc/devel/py-cookiecutter
Previous by Thread: CVS commit: pkgsrc
Next by Thread: CVS commit: pkgsrc/devel/py-cookiecutter
Indexes:

Home | Main Index | Thread Index | Old Index