git: 7471004da10a - main - devel/loccount: update 2.16 → 2.22

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 02 Jun 2026 15:58:06 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7471004da10a27696934b93c812706f750c20cfe

commit 7471004da10a27696934b93c812706f750c20cfe
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-06-02 15:55:05 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-06-02 15:57:58 +0000

    devel/loccount: update 2.16 → 2.22
---
 devel/loccount/Makefile                   | 26 +++++++++++++++++++-------
 devel/loccount/distinfo                   | 12 +++++++++---
 devel/loccount/files/go.mod               |  9 +++++++++
 devel/loccount/files/modules.txt          | 10 ++++++++++
 devel/loccount/files/patch-languages.yaml | 14 ++++++++++++++
 5 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/devel/loccount/Makefile b/devel/loccount/Makefile
index 0f2ab1ffedfd..bf7da56f85fe 100644
--- a/devel/loccount/Makefile
+++ b/devel/loccount/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	loccount
-DISTVERSION=	2.16
-PORTREVISION=	23
+DISTVERSION=	2.22
 CATEGORIES=	devel
 MASTER_SITES=	http://www.catb.org/~esr/loccount/
 
@@ -11,22 +10,35 @@ WWW=		http://www.catb.org/esr/loccount/
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	a2x:textproc/asciidoc
+BUILD_DEPENDS=	asciidoctor:textproc/rubygem-asciidoctor \
+		${PYTHON_PKGNAMEPREFIX}pyyaml>0:devel/py-pyyaml@${PY_FLAVOR}
 
-USES=		gmake go python:build
+USES=		go:modules,no_targets python:build
 
-GO_PKGNAME=	gitlab.com/esr/${PORTNAME}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+
+USE_GITHUB=	nodefault
+GH_TUPLE=	boyter:gocodewalker:v1.5.1:boyter_gocodewalker/vendor/github.com/boyter/gocodewalker \
+		danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \
+		golang:sync:v0.12.0:golang_sync/vendor/golang.org/x/sync
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		share/man/man1/${PORTNAME}.1.gz
 
+post-extract:
+	@${CP} ${FILESDIR}/go.mod ${WRKSRC}/go.mod
+	@${CP} ${FILESDIR}/modules.txt ${WRKSRC}/vendor/modules.txt
+
 do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} loccount loccount.1
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} generate
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} build \
+		${GO_BUILDFLAGS} -o ${PORTNAME} -ldflags='-X main.version=${PORTVERSION}'
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} asciidoctor -D. -a nofooter -b manpage ${PORTNAME}.adoc
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME}-${PORTVERSION} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/loccount/distinfo b/devel/loccount/distinfo
index 592dc186f1a8..5bf4bd431785 100644
--- a/devel/loccount/distinfo
+++ b/devel/loccount/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1709999106
-SHA256 (loccount-2.16.tar.gz) = 4059cc0f61ccea2e424f1c3ccb838fedccaa15f0b53ef31534f59b38792048a2
-SIZE (loccount-2.16.tar.gz) = 83003
+TIMESTAMP = 1780415291
+SHA256 (loccount-2.22.tar.gz) = f59a53c1861208e1d99471ee770fa824b5369f840d6fb67f7f5bdd63f7811187
+SIZE (loccount-2.22.tar.gz) = 451106
+SHA256 (boyter-gocodewalker-v1.5.1_GH0.tar.gz) = f1c41d4e400e4ca3b87bc5135ab8798f152e60a152aede97c6cdcad19bb3ddc9
+SIZE (boyter-gocodewalker-v1.5.1_GH0.tar.gz) = 53658
+SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
+SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
+SHA256 (golang-sync-v0.12.0_GH0.tar.gz) = 1032c8a956571df44cfb3c22122a7a3a771af53b1af5698b15e0143a8aacfde7
+SIZE (golang-sync-v0.12.0_GH0.tar.gz) = 17923
diff --git a/devel/loccount/files/go.mod b/devel/loccount/files/go.mod
new file mode 100644
index 000000000000..62faa03569a1
--- /dev/null
+++ b/devel/loccount/files/go.mod
@@ -0,0 +1,9 @@
+module loccount
+
+go 1.23.0
+
+require (
+	github.com/boyter/gocodewalker v1.5.1
+	github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+)
diff --git a/devel/loccount/files/modules.txt b/devel/loccount/files/modules.txt
new file mode 100644
index 000000000000..7296bbef74cc
--- /dev/null
+++ b/devel/loccount/files/modules.txt
@@ -0,0 +1,10 @@
+# github.com/boyter/gocodewalker v1.5.1
+## explicit; go 1.23.0
+github.com/boyter/gocodewalker
+github.com/boyter/gocodewalker/go-gitignore
+# github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964
+## explicit
+github.com/danwakefield/fnmatch
+# golang.org/x/sync v0.12.0
+## explicit; go 1.23.0
+golang.org/x/sync/errgroup
diff --git a/devel/loccount/files/patch-languages.yaml b/devel/loccount/files/patch-languages.yaml
new file mode 100644
index 000000000000..53aa90b8991d
--- /dev/null
+++ b/devel/loccount/files/patch-languages.yaml
@@ -0,0 +1,14 @@
+-- Fix YAML syntax error: unquoted URL containing '?' in a flow mapping is
+-- invalid YAML. PyYAML's strict parser treats '?' as a complex mapping key
+-- indicator inside flow mappings, causing a ParserError at build time.
+--- languages.yaml.orig	2026-06-02 15:51:53 UTC
++++ languages.yaml
+@@ -2776,7 +2776,7 @@ languages:
+       units, coordinate format, aperture shapes, drawing and flash
+       operations, regions, polarity, and optional attributes that identify
+       layer function and manufacturing intent.
+-    links: {Specification: https://www.ucamco.com/files/downloads/file_en/554/gerber-layer-format-specification-revision-2026-05_en.pdf?eac6410808ad1d0b3f977429ddaab7d0=, File Formats: https://www.ucamco.com/en/file-formats}
++    links: {Specification: "https://www.ucamco.com/files/downloads/file_en/554/gerber-layer-format-specification-revision-2026-05_en.pdf?eac6410808ad1d0b3f977429ddaab7d0=", File Formats: https://www.ucamco.com/en/file-formats}
+     source:
+       Ext: [.gbr]
+       Bc: [[G04, '*']]