CVS commit: pkgsrc/devel/lcov

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Oct  7 07:44:30 UTC 2026

Modified Files:
        pkgsrc/devel/lcov: Makefile distinfo
Removed Files:
        pkgsrc/devel/lcov/patches: patch-tests_common.tst
            patch-tests_lcov_extract_extract2.sh

Log Message:
lcov: add upstream patch fixing the remaining test issues

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/devel/lcov/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/lcov/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/lcov/patches/patch-tests_common.tst \
    pkgsrc/devel/lcov/patches/patch-tests_lcov_extract_extract2.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/lcov/Makefile
diff -u pkgsrc/devel/lcov/Makefile:1.31 pkgsrc/devel/lcov/Makefile:1.32
--- pkgsrc/devel/lcov/Makefile:1.31     Tue Oct  6 08:46:50 2026
+++ pkgsrc/devel/lcov/Makefile  Wed Oct  7 07:44:30 2026
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.31 2026/10/06 08:46:50 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2026/10/07 07:44:30 wiz Exp $
 
 DISTNAME=      lcov-2.6
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=linux-test-project/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
+PATCHFILES+=   af02b08f844200aa3ee611062036499f652520d0.diff
+PATCH_SITES=   https://github.com/henry2cox/lcov/commit/
 
 MAINTAINER=    reed%reedmedia.net@localhost
 HOMEPAGE=      https://github.com/linux-test-project/lcov
@@ -23,7 +25,6 @@ DEPENDS+=     p5-Memory-Process-[0-9]*:../..
 DEPENDS+=      p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 DEPENDS+=      ${PYPKGPREFIX}-coverage-[0-9]*:../../devel/py-coverage
 DEPENDS+=      ${PYPKGPREFIX}-xlsxwriter>=0:../../textproc/py-xlsxwriter
-TEST_DEPENDS+= coreutils-[0-9]*:../../sysutils/coreutils
 TEST_DEPENDS+= jq-[0-9]*:../../devel/jq
 
 USE_LANGUAGES= c c++
@@ -44,8 +45,8 @@ MAKE_FLAGS+=  CFG_INST_DIR=${DESTDIR}${PR
 CONF_FILES=    ${PREFIX}/share/examples/lcov/lcovrc \
                ${PKG_SYSCONFDIR}/lcovrc
 
-# as of 2.6nb1:
-# 91 tests executed, 84 passed, 7 failed, 0 skipped
+# as of 2.6nb4:
+# 91 tests executed, 91 passed, 0 failed, 0 skipped
 TEST_TARGET=   test
 # breaks tests
 #TEST_ENV+=    TESTCASE_ARGS=--parallel\ ${_MAKE_JOBS_N:U1}
@@ -168,37 +169,13 @@ SUBST_MESSAGE.bh= Fixing path to bash.
 
 SUBST_CLASSES+=                pyc
 SUBST_SED.pyc+=                -e "s,cover_cmd = 'coverage,cover_cmd = 'coverage-${PYVERSSUFFIX},"
-SUBST_SED.pyc+=                -e "s,CMD='coverage,CMD='coverage-${PYVERSSUFFIX},"
+SUBST_SED.pyc+=                -e "s,command -v coverage,command -v coverage-${PYVERSSUFFIX},"
+SUBST_SED.pyc+=                -e 's,echo "coverage",echo "coverage-'${PYVERSSUFFIX}'",'
 SUBST_FILES.pyc+=      bin/py2lcov
-SUBST_FILES.pyc+=      tests/py2lcov/py2lcov.sh
+SUBST_FILES.pyc+=      tests/common.tst
 SUBST_STAGE.pyc=       pre-configure
 SUBST_MESSAGE.pyc=     Fixing py-coverage binary name.
 
-# needs mktemp --suffix
-# needs md5sum
-# needs wc without leading space
-SUBST_CLASSES+=                gnu
-SUBST_SED.gnu+=                -e "s,md5sum,gmd5sum,"
-SUBST_SED.gnu+=                -e "s,mktemp,gmktemp,"
-SUBST_SED.gnu+=                -e "s, wc , gwc ,"
-SUBST_FILES.gnu+=      tests/bin/common
-SUBST_FILES.gnu+=      tests/bin/test_run
-SUBST_FILES.gnu+=      tests/genhtml/full.sh
-SUBST_FILES.gnu+=      tests/genhtml/htmlgen/htmlgen.sh
-SUBST_FILES.gnu+=      tests/genhtml/part1.sh
-SUBST_FILES.gnu+=      tests/genhtml/part2.sh
-SUBST_FILES.gnu+=      tests/genhtml/target.sh
-SUBST_FILES.gnu+=      tests/genhtml/zero.sh
-SUBST_FILES.gnu+=      tests/lcov/exception/exception.sh
-SUBST_FILES.gnu+=      tests/lcov/scheduling/scheduling.sh
-SUBST_FILES.gnu+=      tests/lcov/tempdir/tempdir.sh
-SUBST_FILES.gnu+=      tests/lcov/xplatform/xplatform.sh
-SUBST_FILES.gnu+=      tests/scripts/gitblame_test.sh
-SUBST_FILES.gnu+=      tests/scripts/p4annotate_test.sh
-SUBST_FILES.gnu+=      tests/scripts/p4version_test.sh
-SUBST_STAGE.gnu=       pre-test
-SUBST_MESSAGE.gnu=     Preferring GNU tools.
-
 REPLACE_PERL+= bin/fix.pl
 REPLACE_PERL+= bin/gendesc
 REPLACE_PERL+= bin/genhtml
@@ -268,6 +245,7 @@ pre-configure:
 post-install:
        ${RM} -f ${DESTDIR}${PREFIX}/share/lcov/tests/common.tst.orig
        ${RM} -f ${DESTDIR}${PREFIX}/share/lcov/tests/lcov/extract/extract2.sh.orig
+       ${FIND} ${DESTDIR}${PREFIX} -name *.orig_dist -delete
 
 .include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/python/application.mk"

Index: pkgsrc/devel/lcov/distinfo
diff -u pkgsrc/devel/lcov/distinfo:1.13 pkgsrc/devel/lcov/distinfo:1.14
--- pkgsrc/devel/lcov/distinfo:1.13     Mon Oct  5 19:39:02 2026
+++ pkgsrc/devel/lcov/distinfo  Wed Oct  7 07:44:30 2026
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2026/10/05 19:39:02 wiz Exp $
+$NetBSD: distinfo,v 1.14 2026/10/07 07:44:30 wiz Exp $
 
+BLAKE2s (af02b08f844200aa3ee611062036499f652520d0.diff) = 6cc47e5ce7b40c76c96d364fea51c9505dfbd6c9a01a44b3d2c6dd9b23c7e196
+SHA512 (af02b08f844200aa3ee611062036499f652520d0.diff) = 6f2e89cc8caf2277f95f0c2ca5943acd606befbeb44854f8accfff25bbfdac83981d0959cd80738a1183500be2d7971bec28e408a3e4a7c7be04e03aa796ce5d
+Size (af02b08f844200aa3ee611062036499f652520d0.diff) = 40882 bytes
 BLAKE2s (lcov-2.6.tar.gz) = a2c53724e238994c00e44e8558db49bef0125ea1b5c78938c43c7aa9f15fb299
 SHA512 (lcov-2.6.tar.gz) = fa420e9adeffc68e1c9331a705cd055c4c8367d49742b38ea21a23b25f74ff5c71b4873123d9cde63a40988fb2c334690f4fc18aa30dd23e5fb52927d4b52501
 Size (lcov-2.6.tar.gz) = 1172595 bytes
 SHA1 (patch-lib_LcovUtil_Makefile.PL) = d2c57c45698d72477c33ca735fd4798547baa786
-SHA1 (patch-tests_common.tst) = 9810623c31f2a1fd3c3a2968660c54b54cf1811f
-SHA1 (patch-tests_lcov_extract_extract2.sh) = ff55048f2e1b2c611d823ae160249a085c3af6e6