pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

lcov: sync with lcov package

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Jul 13 06:34:09 2026 +0200
Changeset:	dad95aa3fb6ee70c371ba348b81d16f7248d0cc2

Modified Files:
	lcov-git/Makefile
	lcov-git/PLIST
Removed Files:
	lcov-git/distinfo
	lcov-git/patches/patch-bin_copy__dates.sh
	lcov-git/patches/patch-bin_get__changes.sh
	lcov-git/patches/patch-bin_get__version.sh
	lcov-git/patches/patch-bin_install.sh

Log Message:
lcov: sync with lcov package

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dad95aa3fb6ee70c371ba348b81d16f7248d0cc2

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

diffstat:
 lcov-git/Makefile                          |  65 ++++++++++-----
 lcov-git/PLIST                             | 124 ++++++++++++++++++++++++++++-
 lcov-git/distinfo                          |   6 --
 lcov-git/patches/patch-bin_copy__dates.sh  |  12 ---
 lcov-git/patches/patch-bin_get__changes.sh |  12 ---
 lcov-git/patches/patch-bin_get__version.sh |  43 ----------
 lcov-git/patches/patch-bin_install.sh      |  45 -----------
 7 files changed, 170 insertions(+), 137 deletions(-)

diffs:
diff --git a/lcov-git/Makefile b/lcov-git/Makefile
index 5f6f083561..f20eb391b3 100644
--- a/lcov-git/Makefile
+++ b/lcov-git/Makefile
@@ -1,37 +1,66 @@
-# $NetBSD$
-
-DISTNAME=	lcov-${LCOV_FULL}
-LCOV_VERSION=	1
-LCOV_RELEASE=	12
-LCOV_FULL=	${LCOV_VERSION}.${LCOV_RELEASE}
-CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GITHUB:=linux-test-project/}
+# $NetBSD: Makefile,v 1.24 2026/07/06 18:24:29 wiz Exp $
 
+DISTNAME=		lcov-2.5
+CATEGORIES=		devel
+MASTER_SITES=		${MASTER_SITE_GITHUB:=linux-test-project/}
+#GITHUB_TAG=		v${PKGVERSION_NOREV}
+#GITHUB_TAG=		2ab3b0d2fcd5e91b001d388b39025bb5cec5fdd2
 GIT_REPOSITORIES=	lcov
 GIT_REPO.lcov=		https://github.com/linux-test-project/lcov.git
 WRKSRC=			${WRKDIR}/lcov
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/linux-test-project/lcov/
-COMMENT=	Extension of GCOV
+MAINTAINER=	reed%reedmedia.net@localhost
+HOMEPAGE=	https://github.com/linux-test-project/lcov
+COMMENT=	Front-end for GCC's coverage testing tool gcov
 LICENSE=	gnu-gpl-v2
 
-EGDIR=		${PREFIX}/share/examples/lcov
-CONF_FILES+=	${EGDIR}/lcovrc ${PKG_SYSCONFDIR}/lcovrc
+TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+TOOL_DEPENDS+=	${PYPKGPREFIX}-sphinx-rtd-theme-[0-9]*:../../textproc/py-sphinx-rtd-theme
+DEPENDS+=	p5-DateTime-[0-9]*:../../time/p5-DateTime
+
+USE_TOOLS+=	bash:run gmake perl
+
+BUILD_TARGET=	doc_finished
 
 MAKE_FLAGS+=	PREFIX=${PREFIX}
-MAKE_FLAGS+=	CFG_DIR=${EGDIR}
+MAKE_FLAGS+=	DESTDIR=${DESTDIR}
+MAKE_FLAGS+=	SPHINXBUILD=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 MAKE_FLAGS+=	MAN_DIR=${PREFIX}/${PKGMANDIR}
-MAKE_FLAGS+=	VERSION=${LCOV_VERSION}
-MAKE_FLAGS+=	RELEASE=${LCOV_RELEASE}
-MAKE_FLAGS+=	FULL=${LCOV_FULL}
+MAKE_FLAGS+=	CFG_INST_DIR=${DESTDIR}${PREFIX}/share/examples/lcov
 
+CONF_FILES=	${PREFIX}/share/examples/lcov/lcovrc \
+		${PKG_SYSCONFDIR}/lcovrc
+
+REPLACE_BASH+=	bin/checkstyle.sh
+REPLACE_BASH+=	bin/copy_dates.sh
+REPLACE_PERL+=	bin/fix.pl
 REPLACE_PERL+=	bin/gendesc
 REPLACE_PERL+=	bin/genhtml
 REPLACE_PERL+=	bin/geninfo
 REPLACE_PERL+=	bin/genpng
+REPLACE_BASH+=	bin/get_changes.sh
+REPLACE_BASH+=	bin/get_version.sh
 REPLACE_PERL+=	bin/lcov
-REPLACE_PERL+=	bin/updateversion.pl
+REPLACE_PERL+=	bin/llvm2lcov
+REPLACE_PERL+=	bin/perl2lcov
+REPLACE_PERL+=	scripts/*.pm
+REPLACE_PERL+=	scripts/analyzeInfoFiles
+REPLACE_PERL+=	scripts/criteria
+REPLACE_PERL+=	scripts/get_signature
+REPLACE_PERL+=	scripts/getp4version
+REPLACE_PERL+=	scripts/gitblame
+REPLACE_PERL+=	scripts/gitdiff
+REPLACE_PERL+=	scripts/gitversion
+REPLACE_PERL+=	scripts/p4annotate
+REPLACE_PERL+=	scripts/p4udiff
+
+REPLACE_PYTHON+=	bin/py2lcov
+REPLACE_PYTHON+=	bin/xml2lcov
+REPLACE_PYTHON+=	bin/xml2lcovutil.py
+REPLACE_PYTHON+=	scripts/*.py
 
+.include "../../lang/python/application.mk"
+.include "../../lang/python/tool.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lcov-git/PLIST b/lcov-git/PLIST
index 466121f3bc..6d84b17e30 100644
--- a/lcov-git/PLIST
+++ b/lcov-git/PLIST
@@ -1,13 +1,135 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.5 2026/07/06 18:24:29 wiz Exp $
 bin/gendesc
 bin/genhtml
 bin/geninfo
 bin/genpng
 bin/lcov
+bin/llvm2lcov
+bin/perl2lcov
+bin/py2lcov
+bin/xml2lcov
+bin/xml2lcovutil.py
+lib/lcov/lcovutil.pm
 man/man1/gendesc.1
 man/man1/genhtml.1
 man/man1/geninfo.1
 man/man1/genpng.1
 man/man1/lcov.1
+man/man1/llvm2lcov.1
+man/man1/perl2lcov.1
+man/man1/py2lcov.1
+man/man1/spreadsheet.py.1
 man/man5/lcovrc.5
 share/examples/lcov/lcovrc
+share/lcov/html/.buildinfo
+share/lcov/html/_sources/index.rst.txt
+share/lcov/html/_sources/man/gendesc.rst.txt
+share/lcov/html/_sources/man/genhtml.rst.txt
+share/lcov/html/_sources/man/geninfo.rst.txt
+share/lcov/html/_sources/man/genpng.rst.txt
+share/lcov/html/_sources/man/lcov.rst.txt
+share/lcov/html/_sources/man/lcovrc.rst.txt
+share/lcov/html/_sources/man/llvm2lcov.rst.txt
+share/lcov/html/_sources/man/perl2lcov.rst.txt
+share/lcov/html/_sources/man/py2lcov.rst.txt
+share/lcov/html/_sources/man/spreadsheet.rst.txt
+share/lcov/html/_sources/scripts.rst.txt
+share/lcov/html/_static/_sphinx_javascript_frameworks_compat.js
+share/lcov/html/_static/base-stemmer.js
+share/lcov/html/_static/basic.css
+share/lcov/html/_static/css/badge_only.css
+share/lcov/html/_static/css/fonts/Roboto-Slab-Bold.woff
+share/lcov/html/_static/css/fonts/Roboto-Slab-Bold.woff2
+share/lcov/html/_static/css/fonts/Roboto-Slab-Regular.woff
+share/lcov/html/_static/css/fonts/Roboto-Slab-Regular.woff2
+share/lcov/html/_static/css/fonts/fontawesome-webfont.eot
+share/lcov/html/_static/css/fonts/fontawesome-webfont.svg
+share/lcov/html/_static/css/fonts/fontawesome-webfont.ttf
+share/lcov/html/_static/css/fonts/fontawesome-webfont.woff
+share/lcov/html/_static/css/fonts/fontawesome-webfont.woff2
+share/lcov/html/_static/css/fonts/lato-bold-italic.woff
+share/lcov/html/_static/css/fonts/lato-bold-italic.woff2
+share/lcov/html/_static/css/fonts/lato-bold.woff
+share/lcov/html/_static/css/fonts/lato-bold.woff2
+share/lcov/html/_static/css/fonts/lato-normal-italic.woff
+share/lcov/html/_static/css/fonts/lato-normal-italic.woff2
+share/lcov/html/_static/css/fonts/lato-normal.woff
+share/lcov/html/_static/css/fonts/lato-normal.woff2
+share/lcov/html/_static/css/theme.css
+share/lcov/html/_static/doctools.js
+share/lcov/html/_static/documentation_options.js
+share/lcov/html/_static/english-stemmer.js
+share/lcov/html/_static/file.png
+share/lcov/html/_static/fonts/Lato/lato-bold.eot
+share/lcov/html/_static/fonts/Lato/lato-bold.ttf
+share/lcov/html/_static/fonts/Lato/lato-bold.woff
+share/lcov/html/_static/fonts/Lato/lato-bold.woff2
+share/lcov/html/_static/fonts/Lato/lato-bolditalic.eot
+share/lcov/html/_static/fonts/Lato/lato-bolditalic.ttf
+share/lcov/html/_static/fonts/Lato/lato-bolditalic.woff
+share/lcov/html/_static/fonts/Lato/lato-bolditalic.woff2
+share/lcov/html/_static/fonts/Lato/lato-italic.eot
+share/lcov/html/_static/fonts/Lato/lato-italic.ttf
+share/lcov/html/_static/fonts/Lato/lato-italic.woff
+share/lcov/html/_static/fonts/Lato/lato-italic.woff2
+share/lcov/html/_static/fonts/Lato/lato-regular.eot
+share/lcov/html/_static/fonts/Lato/lato-regular.ttf
+share/lcov/html/_static/fonts/Lato/lato-regular.woff
+share/lcov/html/_static/fonts/Lato/lato-regular.woff2
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.eot
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.eot
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff
+share/lcov/html/_static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2
+share/lcov/html/_static/jquery.js
+share/lcov/html/_static/js/badge_only.js
+share/lcov/html/_static/js/theme.js
+share/lcov/html/_static/js/versions.js
+share/lcov/html/_static/language_data.js
+share/lcov/html/_static/minus.png
+share/lcov/html/_static/plus.png
+share/lcov/html/_static/pygments.css
+share/lcov/html/_static/searchtools.js
+share/lcov/html/_static/sphinx_highlight.js
+share/lcov/html/genindex.html
+share/lcov/html/index.html
+share/lcov/html/man/gendesc.html
+share/lcov/html/man/genhtml.html
+share/lcov/html/man/geninfo.html
+share/lcov/html/man/genpng.html
+share/lcov/html/man/lcov.html
+share/lcov/html/man/lcovrc.html
+share/lcov/html/man/llvm2lcov.html
+share/lcov/html/man/perl2lcov.html
+share/lcov/html/man/py2lcov.html
+share/lcov/html/man/spreadsheet.html
+share/lcov/html/objects.inv
+share/lcov/html/scripts.html
+share/lcov/html/search.html
+share/lcov/html/searchindex.js
+share/lcov/support-scripts/P4version.pm
+share/lcov/support-scripts/analyzeInfoFiles
+share/lcov/support-scripts/annotateutil.pm
+share/lcov/support-scripts/batchGitVersion.pm
+share/lcov/support-scripts/context.pm
+share/lcov/support-scripts/criteria
+share/lcov/support-scripts/criteria.pm
+share/lcov/support-scripts/get_signature
+share/lcov/support-scripts/getp4version
+share/lcov/support-scripts/gitblame
+share/lcov/support-scripts/gitblame.pm
+share/lcov/support-scripts/gitdiff
+share/lcov/support-scripts/gitversion
+share/lcov/support-scripts/gitversion.pm
+share/lcov/support-scripts/history.pm
+share/lcov/support-scripts/p4annotate
+share/lcov/support-scripts/p4annotate.pm
+share/lcov/support-scripts/p4udiff
+share/lcov/support-scripts/select.pm
+share/lcov/support-scripts/simplify.pm
+share/lcov/support-scripts/spreadsheet.py
+share/lcov/support-scripts/threshold.pm
+share/lcov/support-scripts/unreach.pm
diff --git a/lcov-git/distinfo b/lcov-git/distinfo
deleted file mode 100644
index b5555220b5..0000000000
--- a/lcov-git/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD$
-
-SHA1 (patch-bin_copy__dates.sh) = 8e7e04bda15321e5393d893fdcc2fcf68a5fbeb5
-SHA1 (patch-bin_get__changes.sh) = 86ce47d35cfea167eb3c73b4457c409a8dbbe198
-SHA1 (patch-bin_get__version.sh) = 4eb4ab689df37f1fcf0aa26a744a3baed5905975
-SHA1 (patch-bin_install.sh) = 09946e2d7e80d2d69a554f3921e96d4531a331ef
diff --git a/lcov-git/patches/patch-bin_copy__dates.sh b/lcov-git/patches/patch-bin_copy__dates.sh
deleted file mode 100644
index cc49781569..0000000000
--- a/lcov-git/patches/patch-bin_copy__dates.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Get rid of Bash
-
---- bin/copy_dates.sh.orig	2016-09-14 18:39:15.000000000 +0000
-+++ bin/copy_dates.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Usage: copy_dates.sh SOURCE TARGET
- #
diff --git a/lcov-git/patches/patch-bin_get__changes.sh b/lcov-git/patches/patch-bin_get__changes.sh
deleted file mode 100644
index 7abcfa7fc6..0000000000
--- a/lcov-git/patches/patch-bin_get__changes.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
-Get rid of Bash
-
---- bin/get_changes.sh.orig	2016-09-14 18:39:15.000000000 +0000
-+++ bin/get_changes.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Usage: get_changes.sh
- #
diff --git a/lcov-git/patches/patch-bin_get__version.sh b/lcov-git/patches/patch-bin_get__version.sh
deleted file mode 100644
index 2c9e679649..0000000000
--- a/lcov-git/patches/patch-bin_get__version.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD$
-
-Get rid of Bash
-
---- bin/get_version.sh.orig	2016-09-14 18:39:15.000000000 +0000
-+++ bin/get_version.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # Usage: get_version.sh --version|--release|--full
- #
-@@ -11,16 +11,16 @@ GITVER=$(cd $TOOLDIR ; git describe --ta
- if [ -z "$GITVER" ] ; then
- 	# Get version information from file
- 	if [ -e "$TOOLDIR/../.version" ] ; then
--		source "$TOOLDIR/../.version"
-+		. "$TOOLDIR/../.version"
- 	fi
- else
- 	# Get version information from git
--	FULL=${GITVER:1}
-+	FULL=${GITVER#?}
- 	VERSION=${GITVER%%-*}
--	VERSION=${VERSION:1}
-+	VERSION=${VERSION#?}
- 	if [ "${GITVER#*-}" != "$GITVER" ] ; then
- 		RELEASE=${GITVER#*-}
--		RELEASE=${RELEASE/-/.}
-+		RELEASE=$(echo $RELEASE | tr - .)
- 	fi
- fi
- 
-@@ -29,6 +29,6 @@ fi
- [ -z "$RELEASE" ] && RELEASE="1"
- [ -z "$FULL" ]    && FULL="$VERSION"
- 
--[ "$1" == "--version" ] && echo -n "$VERSION"
--[ "$1" == "--release" ] && echo -n "$RELEASE"
--[ "$1" == "--full"    ] && echo -n "$FULL"
-+[ "$1" = "--version" ] && echo -n "$VERSION"
-+[ "$1" = "--release" ] && echo -n "$RELEASE"
-+[ "$1" = "--full"    ] && echo -n "$FULL"
diff --git a/lcov-git/patches/patch-bin_install.sh b/lcov-git/patches/patch-bin_install.sh
deleted file mode 100644
index 24085da96b..0000000000
--- a/lcov-git/patches/patch-bin_install.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD$
-
-Get rid of Bash
-Try to use install(1) in a more portable way
-
---- bin/install.sh.orig	2016-12-21 08:18:41.000000000 +0000
-+++ bin/install.sh
-@@ -1,11 +1,11 @@
--#!/bin/bash
-+#!/bin/sh
- #
- # install.sh [--uninstall] sourcefile targetfile [install options]
- #
- 
- 
- # Check for uninstall option
--if test "x$1" == "x--uninstall" ; then
-+if test "x$1" = "x--uninstall" ; then
-   UNINSTALL=true
-   SOURCE=$2
-   TARGET=$3
-@@ -30,9 +30,9 @@ fi
- 
- do_install()
- {
--  local SOURCE=$1
--  local TARGET=$2
--  local PARAMS=$3
-+  local SOURCE="$1"
-+  local TARGET="$2"
-+  local PARAMS="$3"
- 
-   install -d $(dirname $TARGET)
-   install -p $PARAMS $SOURCE $TARGET
-@@ -45,8 +45,8 @@ do_install()
- 
- do_uninstall()
- {
--  local SOURCE=$1
--  local TARGET=$2
-+  local SOURCE="$1"
-+  local TARGET="$2"
- 
-   # Does target exist?
-   if test -r $TARGET ; then
Home | Main Index | Thread Index | Old Index