Sun Apr 11 22:55:42 2021 UTC ()
py-mercurial: add a patch to fix a self-test.


(wiz)
diff -r1.51 -r1.52 pkgsrc/devel/py-mercurial/Makefile
diff -r1.99 -r1.100 pkgsrc/devel/py-mercurial/distinfo
diff -r0 -r1.3 pkgsrc/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t
cvs diff -r1.51 -r1.52 pkgsrc/devel/py-mercurial/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/Makefile 2021/03/17 11:23:52 1.51
+++ pkgsrc/devel/py-mercurial/Makefile 2021/04/11 22:55:42 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.51 2021/03/17 11:23:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.52 2021/04/11 22:55:42 wiz Exp $
2# 2#
3# Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew 3# Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
4 4
5DISTNAME= mercurial-${VERSION} 5DISTNAME= mercurial-${VERSION}
6PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 6PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
7CATEGORIES= devel scm 7CATEGORIES= devel scm
8MASTER_SITES= https://www.mercurial-scm.org/release/ 8MASTER_SITES= https://www.mercurial-scm.org/release/
9 9
10MAINTAINER= wiz@NetBSD.org 10MAINTAINER= wiz@NetBSD.org
11HOMEPAGE= https://www.mercurial-scm.org/ 11HOMEPAGE= https://www.mercurial-scm.org/
12COMMENT= Fast, lightweight source control management system 12COMMENT= Fast, lightweight source control management system
13LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer 13LICENSE= gnu-gpl-v2 OR gnu-gpl-v3 # OR newer
14 14
@@ -30,26 +30,26 @@ INSTALLATION_DIRS+= share/doc/mercurial @@ -30,26 +30,26 @@ INSTALLATION_DIRS+= share/doc/mercurial
30.include "version.mk" 30.include "version.mk"
31.include "options.mk" 31.include "options.mk"
32 32
33# Known test failures as of 5.7 33# Known test failures as of 5.7
34# https://bz.mercurial-scm.org/show_bug.cgi?id=6429 34# https://bz.mercurial-scm.org/show_bug.cgi?id=6429
35USE_TOOLS+= bash:test 35USE_TOOLS+= bash:test
36# Two tests use "python": 36# Two tests use "python":
37# test-convert-cvs.t 37# test-convert-cvs.t
38# test-merge-tools.t 38# test-merge-tools.t
39# https://bz.mercurial-scm.org/show_bug.cgi?id=6480 39# https://bz.mercurial-scm.org/show_bug.cgi?id=6480
40# test-archive.t: 40# test-archive.t:
41# https://bz.mercurial-scm.org/show_bug.cgi?id=6499 41# https://bz.mercurial-scm.org/show_bug.cgi?id=6499
42# 42#
43# Ran 868 tests, 80 skipped, 3 failed. 43# Ran 868 tests, 80 skipped, 2 failed.
44 44
45TEST_TARGET= tests 45TEST_TARGET= tests
46TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q} 46TEST_MAKE_FLAGS+= PYTHON=${PYTHONBIN} TESTFLAGS=${_MAKE_JOBS:Q}
47 47
48post-install: 48post-install:
49 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 49 ${INSTALL_DATA} ${WRKSRC}/doc/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
50 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 50 ${INSTALL_DATA} ${WRKSRC}/doc/*.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
51 ${INSTALL_DATA} ${WRKSRC}/README.rst \ 51 ${INSTALL_DATA} ${WRKSRC}/README.rst \
52 ${DESTDIR}${PREFIX}/share/doc/mercurial 52 ${DESTDIR}${PREFIX}/share/doc/mercurial
53 53
54.include "../../lang/python/distutils.mk" 54.include "../../lang/python/distutils.mk"
55.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.99 -r1.100 pkgsrc/devel/py-mercurial/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/py-mercurial/distinfo 2021/03/17 11:23:52 1.99
+++ pkgsrc/devel/py-mercurial/distinfo 2021/04/11 22:55:42 1.100
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.99 2021/03/17 11:23:52 wiz Exp $ 1$NetBSD: distinfo,v 1.100 2021/04/11 22:55:42 wiz Exp $
2 2
3SHA1 (mercurial-5.7.1.tar.gz) = 44f2d2dbdbebeb86358d9e6bac0867f43ae06178 3SHA1 (mercurial-5.7.1.tar.gz) = 44f2d2dbdbebeb86358d9e6bac0867f43ae06178
4RMD160 (mercurial-5.7.1.tar.gz) = 3f059122baa88a4cbfa0ec16681b07f560b624df 4RMD160 (mercurial-5.7.1.tar.gz) = 3f059122baa88a4cbfa0ec16681b07f560b624df
5SHA512 (mercurial-5.7.1.tar.gz) = d887e2525f49e6b5bbf0f898b96bf9398b69f6b379c27090606469ff716b02989a346447cb37e62ab31a93ed58013ace17ec26e05f63fce225d8d6ca6214f966 5SHA512 (mercurial-5.7.1.tar.gz) = d887e2525f49e6b5bbf0f898b96bf9398b69f6b379c27090606469ff716b02989a346447cb37e62ab31a93ed58013ace17ec26e05f63fce225d8d6ca6214f966
6Size (mercurial-5.7.1.tar.gz) = 7900727 bytes 6Size (mercurial-5.7.1.tar.gz) = 7900727 bytes
7SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9 7SHA1 (patch-D8574) = 56cecc1c83558803186e84d90ef67b4dce68f8e9
8SHA1 (patch-rust_hg-core_src_lib.rs) = 38dc2a8c5f5ba9318cfa89e408cc7322e8429b8f 8SHA1 (patch-rust_hg-core_src_lib.rs) = 38dc2a8c5f5ba9318cfa89e408cc7322e8429b8f
 9SHA1 (patch-tests_test-convert-cvs.t) = 36423cbc58f5fea71f37e3a846fb2144924f6a45
9SHA1 (patch-tests_test-transaction-rollback-on-sigpipe.t) = 8d7152cf2c913fa418cd0dfd179358f2f6aa9ed5 10SHA1 (patch-tests_test-transaction-rollback-on-sigpipe.t) = 8d7152cf2c913fa418cd0dfd179358f2f6aa9ed5
File Added: pkgsrc/devel/py-mercurial/patches/Attic/patch-tests_test-convert-cvs.t
$NetBSD: patch-tests_test-convert-cvs.t,v 1.3 2021/04/11 22:55:42 wiz Exp $

Fix python interpreter.
https://bz.mercurial-scm.org/show_bug.cgi?id=6480

--- tests/test-convert-cvs.t.orig	2021-03-09 05:48:58.000000000 +0000
+++ tests/test-convert-cvs.t
@@ -521,7 +521,7 @@ Commit messages of version 1.2 - 1.4 use
 |cp932     |\x82\xa0      |  x      x     o    |
 
   $ mkdir -p cvsrepo/transcoding
-  $ python <<EOF
+  $ $PYTHON <<EOF
   > fp = open('cvsrepo/transcoding/file,v', 'wb')
   > fp.write((b'''
   > head	1.4;