diff options
author | schmonz <schmonz@pkgsrc.org> | 2020-07-06 15:18:25 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2020-07-06 15:18:25 +0000 |
commit | d17e680d6c245945c51eb486f244357b1818b2fe (patch) | |
tree | 46016180e5b90e64aae7329b345f9546e7370fc6 /devel/apenwarr-redo | |
parent | 889ea52d7e23e797a5bbcfdf54f115c479be9c26 (diff) | |
download | pkgsrc-d17e680d6c245945c51eb486f244357b1818b2fe.tar.gz |
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.
Diffstat (limited to 'devel/apenwarr-redo')
-rw-r--r-- | devel/apenwarr-redo/ALTERNATIVES | 11 | ||||
-rw-r--r-- | devel/apenwarr-redo/Makefile | 12 | ||||
-rw-r--r-- | devel/apenwarr-redo/PLIST | 46 | ||||
-rw-r--r-- | devel/apenwarr-redo/distinfo | 11 | ||||
-rw-r--r-- | devel/apenwarr-redo/patches/patch-install.do | 15 |
5 files changed, 63 insertions, 32 deletions
diff --git a/devel/apenwarr-redo/ALTERNATIVES b/devel/apenwarr-redo/ALTERNATIVES new file mode 100644 index 00000000000..5bbf99c18ba --- /dev/null +++ b/devel/apenwarr-redo/ALTERNATIVES @@ -0,0 +1,11 @@ +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 diff --git a/devel/apenwarr-redo/Makefile b/devel/apenwarr-redo/Makefile index 3d40bd6dc9d..5b870081bde 100644 --- a/devel/apenwarr-redo/Makefile +++ b/devel/apenwarr-redo/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2020/03/30 08:02:22 schmonz Exp $ +# $NetBSD: Makefile,v 1.4 2020/07/06 15:18:25 schmonz Exp $ -DISTNAME= redo-0.42a +DISTNAME= redo-0.42c PKGNAME= apenwarr-${DISTNAME} CATEGORIES= devel MASTER_SITES= -https://codeload.github.com/apenwarr/redo/tar.gz/${DISTNAME} @@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/apenwarr/redo/ COMMENT= Python implementation of DJB's redo build tool LICENSE= apache-2.0 -CONFLICTS+= jdebp-redo-[0-9]* - BUILD_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4 BUILD_DEPENDS+= ${PYPKGPREFIX}-markdown-[0-9]*:../../textproc/py-markdown @@ -28,6 +26,12 @@ SUBST_VARS.paths= PYTHONBIN INSTALL_ENV+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR} +post-install: + cd ${DESTDIR}${PREFIX}/bin; \ + for i in *; do mv -f $${i} apenwarr-$${i}; done + cd ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ + for i in *; do mv -f $${i} apenwarr-$${i}; done + .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/apenwarr-redo/PLIST b/devel/apenwarr-redo/PLIST index 870006a31a3..487387b6e15 100644 --- a/devel/apenwarr-redo/PLIST +++ b/devel/apenwarr-redo/PLIST @@ -1,15 +1,15 @@ -@comment $NetBSD: PLIST,v 1.2 2019/11/09 15:00:55 schmonz Exp $ -bin/redo -bin/redo-always -bin/redo-ifchange -bin/redo-ifcreate -bin/redo-log -bin/redo-ood -bin/redo-sources -bin/redo-stamp -bin/redo-targets -bin/redo-unlocked -bin/redo-whichdo +@comment $NetBSD: PLIST,v 1.3 2020/07/06 15:18:25 schmonz Exp $ +bin/apenwarr-redo +bin/apenwarr-redo-always +bin/apenwarr-redo-ifchange +bin/apenwarr-redo-ifcreate +bin/apenwarr-redo-log +bin/apenwarr-redo-ood +bin/apenwarr-redo-sources +bin/apenwarr-redo-stamp +bin/apenwarr-redo-targets +bin/apenwarr-redo-unlocked +bin/apenwarr-redo-whichdo lib/redo/__init__.py lib/redo/__init__.pyc lib/redo/atoi.py @@ -63,14 +63,14 @@ lib/redo/version/__init__.py lib/redo/version/__init__.pyc lib/redo/version/_version.py lib/redo/version/_version.pyc -man/man1/redo-always.1 -man/man1/redo-ifchange.1 -man/man1/redo-ifcreate.1 -man/man1/redo-log.1 -man/man1/redo-ood.1 -man/man1/redo-sources.1 -man/man1/redo-stamp.1 -man/man1/redo-targets.1 -man/man1/redo-whichdo.1 -man/man1/redo.1 -share/doc/redo/README.md +man/man1/apenwarr-redo-always.1 +man/man1/apenwarr-redo-ifchange.1 +man/man1/apenwarr-redo-ifcreate.1 +man/man1/apenwarr-redo-log.1 +man/man1/apenwarr-redo-ood.1 +man/man1/apenwarr-redo-sources.1 +man/man1/apenwarr-redo-stamp.1 +man/man1/apenwarr-redo-targets.1 +man/man1/apenwarr-redo-whichdo.1 +man/man1/apenwarr-redo.1 +share/doc/apenwarr-redo/README.md diff --git a/devel/apenwarr-redo/distinfo b/devel/apenwarr-redo/distinfo index b5dccadb0b0..86162043c12 100644 --- a/devel/apenwarr-redo/distinfo +++ b/devel/apenwarr-redo/distinfo @@ -1,12 +1,13 @@ -$NetBSD: distinfo,v 1.5 2020/03/30 08:02:22 schmonz Exp $ +$NetBSD: distinfo,v 1.6 2020/07/06 15:18:25 schmonz Exp $ -SHA1 (redo-0.42a.tar.gz) = 5720e2fa9d7fc5bd1d36fcb9477c771f5fe1c229 -RMD160 (redo-0.42a.tar.gz) = 4c7fdfee85b036b827e33a04837fb49127d168a8 -SHA512 (redo-0.42a.tar.gz) = 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb -Size (redo-0.42a.tar.gz) = 195053 bytes +SHA1 (redo-0.42c.tar.gz) = efc1dec0bc831a3bb4d6c3d3f2854e551ecf9cfa +RMD160 (redo-0.42c.tar.gz) = 89c434620a0dffb268d06a8e3c6d64ece1398d89 +SHA512 (redo-0.42c.tar.gz) = 764ef84cfb56d5dd883cf80f706a567491e1a679d136219c4db3c122386aad3cfbd28131dc231a91639f596d7b8819c4254e4e7fa38f917996ca8bf3e1a5dc19 +Size (redo-0.42c.tar.gz) = 195222 bytes SHA1 (patch-bin_all.do) = 761d24a832fa8067b6123fc02918460f579ffb5a SHA1 (patch-do) = 75b461b94d83f6145d161355aec59633bcad2c20 SHA1 (patch-docs_md2man.py) = 7b2c08665a9777f713c584025b91e2b95c349eb9 +SHA1 (patch-install.do) = 2852716c3102b335aecfb480c2ff9a04ede2eeba SHA1 (patch-redo_sh.do) = d6223596c83744d19f23d0026a321fc89102569d SHA1 (patch-redo_whichpython.do) = aadf1ccc48743980abc40840121a423bb07eb9dc SHA1 (patch-t_shelltest.od) = ca86299da6ae30b44a0e10cfe1a6ef30299dd0bc diff --git a/devel/apenwarr-redo/patches/patch-install.do b/devel/apenwarr-redo/patches/patch-install.do new file mode 100644 index 00000000000..3a7b69907e9 --- /dev/null +++ b/devel/apenwarr-redo/patches/patch-install.do @@ -0,0 +1,15 @@ +$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} + |