Mon Jul 6 15:18:26 2020 UTC ()
Update to 0.42c. From the changelog:

- jobserver.py: _try_read()'s alarm timeout needs to throw an exception.
- Documentation fixes.

pkgsrc changes:

- Avoid CONFLICTS with other redo implementations.


(schmonz)
diff -r0 -r1.1 pkgsrc/devel/apenwarr-redo/ALTERNATIVES
diff -r1.3 -r1.4 pkgsrc/devel/apenwarr-redo/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/apenwarr-redo/PLIST
diff -r1.5 -r1.6 pkgsrc/devel/apenwarr-redo/distinfo
diff -r0 -r1.1 pkgsrc/devel/apenwarr-redo/patches/patch-install.do
File Added: pkgsrc/devel/apenwarr-redo/ALTERNATIVES
bin/redo @PREFIX@/bin/apenwarr-redo
bin/redo-always @PREFIX@/bin/apenwarr-redo-always
bin/redo-ifchange @PREFIX@/bin/apenwarr-redo-ifchange
bin/redo-ifcreate @PREFIX@/bin/apenwarr-redo-ifcreate
bin/redo-log @PREFIX@/bin/apenwarr-redo-log
bin/redo-ood @PREFIX@/bin/apenwarr-redo-ood
bin/redo-sources @PREFIX@/bin/apenwarr-redo-sources
bin/redo-stamp @PREFIX@/bin/apenwarr-redo-stamp
bin/redo-targets @PREFIX@/bin/apenwarr-redo-targets
bin/redo-unlocked @PREFIX@/bin/apenwarr-redo-unlocked
bin/redo-whichdo @PREFIX@/bin/apenwarr-redo-whichdo
cvs diff -r1.3 -r1.4 pkgsrc/devel/apenwarr-redo/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/apenwarr-redo/Makefile 2020/03/30 08:02:22 1.3
+++ pkgsrc/devel/apenwarr-redo/Makefile 2020/07/06 15:18:25 1.4
@@ -1,33 +1,37 @@ @@ -1,33 +1,37 @@
1# $NetBSD: Makefile,v 1.3 2020/03/30 08:02:22 schmonz Exp $ 1# $NetBSD: Makefile,v 1.4 2020/07/06 15:18:25 schmonz Exp $
2 2
3DISTNAME= redo-0.42a 3DISTNAME= redo-0.42c
4PKGNAME= apenwarr-${DISTNAME} 4PKGNAME= apenwarr-${DISTNAME}
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= -https://codeload.github.com/apenwarr/redo/tar.gz/${DISTNAME} 6MASTER_SITES= -https://codeload.github.com/apenwarr/redo/tar.gz/${DISTNAME}
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= https://github.com/apenwarr/redo/ 9HOMEPAGE= https://github.com/apenwarr/redo/
10COMMENT= Python implementation of DJB's redo build tool 10COMMENT= Python implementation of DJB's redo build tool
11LICENSE= apache-2.0 11LICENSE= apache-2.0
12 12
13CONFLICTS+= jdebp-redo-[0-9]* 
14 
15BUILD_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4 13BUILD_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
16BUILD_DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown 14BUILD_DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown
17 15
18DEPENDS+= dash-[0-9]*:../../shells/dash 16DEPENDS+= dash-[0-9]*:../../shells/dash
19DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle 17DEPENDS+= ${PYPKGPREFIX}-setproctitle-[0-9]*:../../sysutils/py-setproctitle
20DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 18DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
21 19
22WRKSRC= ${WRKDIR}/redo-${DISTNAME} 20WRKSRC= ${WRKDIR}/redo-${DISTNAME}
23 21
24SUBST_CLASSES+= paths 22SUBST_CLASSES+= paths
25SUBST_STAGE.paths= do-configure 23SUBST_STAGE.paths= do-configure
26SUBST_FILES.paths= redo/whichpython.do 24SUBST_FILES.paths= redo/whichpython.do
27SUBST_VARS.paths= PYTHONBIN 25SUBST_VARS.paths= PYTHONBIN
28 26
29INSTALL_ENV+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} 27INSTALL_ENV+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
30 28
 29post-install:
 30 cd ${DESTDIR}${PREFIX}/bin; \
 31 for i in *; do mv -f $${i} apenwarr-$${i}; done
 32 cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
 33 for i in *; do mv -f $${i} apenwarr-$${i}; done
 34
31.include "../../lang/python/application.mk" 35.include "../../lang/python/application.mk"
32.include "../../lang/python/extension.mk" 36.include "../../lang/python/extension.mk"
33.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/apenwarr-redo/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/apenwarr-redo/PLIST 2019/11/09 15:00:55 1.2
+++ pkgsrc/devel/apenwarr-redo/PLIST 2020/07/06 15:18:25 1.3
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1@comment $NetBSD: PLIST,v 1.2 2019/11/09 15:00:55 schmonz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2020/07/06 15:18:25 schmonz Exp $
2bin/redo 2bin/apenwarr-redo
3bin/redo-always 3bin/apenwarr-redo-always
4bin/redo-ifchange 4bin/apenwarr-redo-ifchange
5bin/redo-ifcreate 5bin/apenwarr-redo-ifcreate
6bin/redo-log 6bin/apenwarr-redo-log
7bin/redo-ood 7bin/apenwarr-redo-ood
8bin/redo-sources 8bin/apenwarr-redo-sources
9bin/redo-stamp 9bin/apenwarr-redo-stamp
10bin/redo-targets 10bin/apenwarr-redo-targets
11bin/redo-unlocked 11bin/apenwarr-redo-unlocked
12bin/redo-whichdo 12bin/apenwarr-redo-whichdo
13lib/redo/__init__.py 13lib/redo/__init__.py
14lib/redo/__init__.pyc 14lib/redo/__init__.pyc
15lib/redo/atoi.py 15lib/redo/atoi.py
16lib/redo/atoi.pyc 16lib/redo/atoi.pyc
17lib/redo/builder.py 17lib/redo/builder.py
18lib/redo/builder.pyc 18lib/redo/builder.pyc
19lib/redo/cmd_always.py 19lib/redo/cmd_always.py
20lib/redo/cmd_always.pyc 20lib/redo/cmd_always.pyc
21lib/redo/cmd_ifchange.py 21lib/redo/cmd_ifchange.py
22lib/redo/cmd_ifchange.pyc 22lib/redo/cmd_ifchange.pyc
23lib/redo/cmd_ifcreate.py 23lib/redo/cmd_ifcreate.py
24lib/redo/cmd_ifcreate.pyc 24lib/redo/cmd_ifcreate.pyc
25lib/redo/cmd_log.py 25lib/redo/cmd_log.py
@@ -53,24 +53,24 @@ lib/redo/logs.pyc @@ -53,24 +53,24 @@ lib/redo/logs.pyc
53lib/redo/options.py 53lib/redo/options.py
54lib/redo/options.pyc 54lib/redo/options.pyc
55lib/redo/paths.py 55lib/redo/paths.py
56lib/redo/paths.pyc 56lib/redo/paths.pyc
57lib/redo/sh 57lib/redo/sh
58lib/redo/state.py 58lib/redo/state.py
59lib/redo/state.pyc 59lib/redo/state.pyc
60lib/redo/title.py 60lib/redo/title.py
61lib/redo/title.pyc 61lib/redo/title.pyc
62lib/redo/version/__init__.py 62lib/redo/version/__init__.py
63lib/redo/version/__init__.pyc 63lib/redo/version/__init__.pyc
64lib/redo/version/_version.py 64lib/redo/version/_version.py
65lib/redo/version/_version.pyc 65lib/redo/version/_version.pyc
66man/man1/redo-always.1 66man/man1/apenwarr-redo-always.1
67man/man1/redo-ifchange.1 67man/man1/apenwarr-redo-ifchange.1
68man/man1/redo-ifcreate.1 68man/man1/apenwarr-redo-ifcreate.1
69man/man1/redo-log.1 69man/man1/apenwarr-redo-log.1
70man/man1/redo-ood.1 70man/man1/apenwarr-redo-ood.1
71man/man1/redo-sources.1 71man/man1/apenwarr-redo-sources.1
72man/man1/redo-stamp.1 72man/man1/apenwarr-redo-stamp.1
73man/man1/redo-targets.1 73man/man1/apenwarr-redo-targets.1
74man/man1/redo-whichdo.1 74man/man1/apenwarr-redo-whichdo.1
75man/man1/redo.1 75man/man1/apenwarr-redo.1
76share/doc/redo/README.md 76share/doc/apenwarr-redo/README.md
cvs diff -r1.5 -r1.6 pkgsrc/devel/apenwarr-redo/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/apenwarr-redo/distinfo 2020/03/30 08:02:22 1.5
+++ pkgsrc/devel/apenwarr-redo/distinfo 2020/07/06 15:18:25 1.6
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1$NetBSD: distinfo,v 1.5 2020/03/30 08:02:22 schmonz Exp $ 1$NetBSD: distinfo,v 1.6 2020/07/06 15:18:25 schmonz Exp $
2 2
3SHA1 (redo-0.42a.tar.gz) = 5720e2fa9d7fc5bd1d36fcb9477c771f5fe1c229 3SHA1 (redo-0.42c.tar.gz) = efc1dec0bc831a3bb4d6c3d3f2854e551ecf9cfa
4RMD160 (redo-0.42a.tar.gz) = 4c7fdfee85b036b827e33a04837fb49127d168a8 4RMD160 (redo-0.42c.tar.gz) = 89c434620a0dffb268d06a8e3c6d64ece1398d89
5SHA512 (redo-0.42a.tar.gz) = 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb 5SHA512 (redo-0.42c.tar.gz) = 764ef84cfb56d5dd883cf80f706a567491e1a679d136219c4db3c122386aad3cfbd28131dc231a91639f596d7b8819c4254e4e7fa38f917996ca8bf3e1a5dc19
6Size (redo-0.42a.tar.gz) = 195053 bytes 6Size (redo-0.42c.tar.gz) = 195222 bytes
7SHA1 (patch-bin_all.do) = 761d24a832fa8067b6123fc02918460f579ffb5a 7SHA1 (patch-bin_all.do) = 761d24a832fa8067b6123fc02918460f579ffb5a
8SHA1 (patch-do) = 75b461b94d83f6145d161355aec59633bcad2c20 8SHA1 (patch-do) = 75b461b94d83f6145d161355aec59633bcad2c20
9SHA1 (patch-docs_md2man.py) = 7b2c08665a9777f713c584025b91e2b95c349eb9 9SHA1 (patch-docs_md2man.py) = 7b2c08665a9777f713c584025b91e2b95c349eb9
 10SHA1 (patch-install.do) = 2852716c3102b335aecfb480c2ff9a04ede2eeba
10SHA1 (patch-redo_sh.do) = d6223596c83744d19f23d0026a321fc89102569d 11SHA1 (patch-redo_sh.do) = d6223596c83744d19f23d0026a321fc89102569d
11SHA1 (patch-redo_whichpython.do) = aadf1ccc48743980abc40840121a423bb07eb9dc 12SHA1 (patch-redo_whichpython.do) = aadf1ccc48743980abc40840121a423bb07eb9dc
12SHA1 (patch-t_shelltest.od) = ca86299da6ae30b44a0e10cfe1a6ef30299dd0bc 13SHA1 (patch-t_shelltest.od) = ca86299da6ae30b44a0e10cfe1a6ef30299dd0bc
File Added: pkgsrc/devel/apenwarr-redo/patches/patch-install.do
$NetBSD: patch-install.do,v 1.1 2020/07/06 15:18:26 schmonz Exp $

Avoid CONFLICTS with other redo implementations.

--- install.do.orig	2020-06-15 06:20:02.000000000 +0000
+++ install.do
@@ -4,7 +4,7 @@ exec >&2
 : ${DESTDIR=NONE}
 : ${PREFIX:=/usr}
 : ${MANDIR:=$DESTDIR$PREFIX/share/man}
-: ${DOCDIR:=$DESTDIR$PREFIX/share/doc/redo}
+: ${DOCDIR:=$DESTDIR$PREFIX/share/doc/apenwarr-redo}
 : ${BINDIR:=$DESTDIR$PREFIX/bin}
 : ${LIBDIR:=$DESTDIR$PREFIX/lib/redo}