git: 727c80a7a9ae - main - devel/laminar: Update 1.3 => 1.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yusuf Yaman <nxjoseph_at_FreeBSD.org>
Date: Mon, 12 Oct 2026 22:22:44 UTC
The branch main has been updated by nxjoseph:

URL: https://cgit.FreeBSD.org/ports/commit/?id=727c80a7a9ae523f7449353925e8bc082e73fcb4

commit 727c80a7a9ae523f7449353925e8bc082e73fcb4
Author:     Marian Cingel <cingel.marian@gmail.com>
AuthorDate: 2026-10-07 19:52:08 +0000
Commit:     Yusuf Yaman <nxjoseph@FreeBSD.org>
CommitDate: 2026-10-12 22:21:37 +0000

    devel/laminar: Update 1.3 => 1.4
    
    While here:
    - Apply upstream fixes d25b7a4 and e62148b.
    - Fix pkg-plist for shell completions.
    - Unmark BROKEN since it compiles with recent Boost fine.
    
    Changelog:
    https://github.com/ohwgiles/laminar/releases/tag/1.4
    
    PR:             299211
    Approved by:    osa, vvd (Mentors, implicit)
    MFH:            2026Q4
---
 devel/laminar/Makefile  | 24 +++++++++++++++++-------
 devel/laminar/distinfo  | 14 +++++++++-----
 devel/laminar/pkg-plist |  4 ++--
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/devel/laminar/Makefile b/devel/laminar/Makefile
index 2cd82e0a3423..47d1fd65af4e 100644
--- a/devel/laminar/Makefile
+++ b/devel/laminar/Makefile
@@ -1,16 +1,20 @@
 PORTNAME=	laminar
-DISTVERSION=	1.3
+DISTVERSION=	1.4
 CATEGORIES=	devel
 MASTER_SITES=	GH \
 		https://cdnjs.cloudflare.com/ajax/libs/vue/2.6.12/:vue \
 		https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/:chart \
-		https://raw.githubusercontent.com/drudru/ansi_up/v4.0.4/:ansi
+		https://raw.githubusercontent.com/drudru/ansi_up/v5.2.1/:ansi
 DISTFILES=	ansi_up.js:ansi \
 		vue.min.js:vue \
 		chart.min.js:chart
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${GH_ACCOUNT}-${PORTNAME}-${DISTVERSION}-${GH_TAGNAME}_GH0${EXTRACT_SUFX}
 
+PATCH_SITES=	https://github.com/ohwgiles/laminar/commit/
+PATCHFILES=	d25b7a46bbbc1e1f84a0fe35d352f307ea5ccc16.patch:-p1 \
+		e62148b5f59c618970fda2c699fae3a9187e324c.patch:-p1
+
 MAINTAINER=	cingel.marian@gmail.com
 COMMENT=	Lightweight CI service
 WWW=		https://laminar.ohwg.net/
@@ -18,7 +22,6 @@ WWW=		https://laminar.ohwg.net/
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Does not compile against recent Boost
 ONLY_FOR_ARCHS=	aarch64 amd64 armv7 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	"Requires to translate 'uname -m' to linker '-m' flag in CMakeLists.txt"
 
@@ -31,14 +34,17 @@ USES=		cmake pkgconfig sqlite
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ohwgiles
-GH_TAGNAME=	277a59f1cba75fa763e5838b3443f11686dd5ebb
+GH_TAGNAME=	23abdd2712bc259aa2880a8533886bc8c5a1fc86
+
+USE_RC_SUBR=	laminard
 
-USERS=		${WWWOWN}
-GROUPS=		${WWWGRP}
 HOMEDIR=	/var/db/${PORTNAME}
 LAMINARD=	laminard
 
-USE_RC_SUBR=	laminard
+CMAKE_ARGS=	-DBASH_COMPLETIONS_DIR=${PREFIX}/share/bash-completion/completions \
+		-DLAMINAR_VERSION=${DISTVERSION} \
+		-DZSH_COMPLETIONS_DIR=${PREFIX}/share/zsh/site-functions
+
 SUB_FILES=	laminard.env
 
 SUB_LIST=	HOMEDIR=${HOMEDIR} \
@@ -46,6 +52,9 @@ SUB_LIST=	HOMEDIR=${HOMEDIR} \
 		PORTNAME=${PORTNAME} \
 		USERS=${USERS}
 
+USERS=		${WWWOWN}
+GROUPS=		${WWWGRP}
+
 PLIST_SUB=	GROUPS=${GROUPS} \
 		HOMEDIR=${HOMEDIR} \
 		LAMINARD=${LAMINARD} \
@@ -69,5 +78,6 @@ post-install:
 		 ${STAGEDIR}${HOMEDIR}/cfg/jobs \
 		 ${STAGEDIR}${PREFIX}/etc/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/laminard.env ${STAGEDIR}${ETCDIR}/${LAMINARD}.env.sample
+	${RM} -r ${STAGEDIR}/etc/laminar.conf
 
 .include <bsd.port.mk>
diff --git a/devel/laminar/distinfo b/devel/laminar/distinfo
index 842b5bb4e0c4..dcfd693f4622 100644
--- a/devel/laminar/distinfo
+++ b/devel/laminar/distinfo
@@ -1,9 +1,13 @@
-TIMESTAMP = 1699395718
-SHA256 (laminar/ansi_up.js) = 996608ae1a80c64fb2b41e07f3ef1c4fc7ec437746c03867000de98686e5a8b7
-SIZE (laminar/ansi_up.js) = 22159
+TIMESTAMP = 1791382170
+SHA256 (laminar/ansi_up.js) = 9feb6333bcfada8bcc86de99b9dde37f242f82b3ba70bf737721016a42aeb91b
+SIZE (laminar/ansi_up.js) = 23236
 SHA256 (laminar/vue.min.js) = 29296ccacaa9ed35ed168fc51e36f54fd6f8db9c7786bbf38cc59a27229ba5c2
 SIZE (laminar/vue.min.js) = 93670
 SHA256 (laminar/chart.min.js) = fbc45926e6b46845a0f905552a0e0b1331049bff1115ecf94dbe0904d895e710
 SIZE (laminar/chart.min.js) = 199560
-SHA256 (laminar/ohwgiles-laminar-1.3-277a59f1cba75fa763e5838b3443f11686dd5ebb_GH0.tar.gz) = 61fa0b17e2515aace7e98ed1f020314163cbbc6212a1fa94437229a78fcaa62f
-SIZE (laminar/ohwgiles-laminar-1.3-277a59f1cba75fa763e5838b3443f11686dd5ebb_GH0.tar.gz) = 104295
+SHA256 (laminar/ohwgiles-laminar-1.4-23abdd2712bc259aa2880a8533886bc8c5a1fc86_GH0.tar.gz) = f5439c270390b48c6512d81b98381778e3b7c1c794bb3e31a48c70ba9f49897b
+SIZE (laminar/ohwgiles-laminar-1.4-23abdd2712bc259aa2880a8533886bc8c5a1fc86_GH0.tar.gz) = 105422
+SHA256 (laminar/d25b7a46bbbc1e1f84a0fe35d352f307ea5ccc16.patch) = c49b70a0572f12941d5de56eac4a48f5b2b97060b5a50bca4da60185a86696ab
+SIZE (laminar/d25b7a46bbbc1e1f84a0fe35d352f307ea5ccc16.patch) = 738
+SHA256 (laminar/e62148b5f59c618970fda2c699fae3a9187e324c.patch) = 52e80da052bc3e92cec37f50cbf5bb82f310efb8f3e2d8aaf5ea3f2354b05680
+SIZE (laminar/e62148b5f59c618970fda2c699fae3a9187e324c.patch) = 1730
diff --git a/devel/laminar/pkg-plist b/devel/laminar/pkg-plist
index 7b865e524010..e6a38b67fe0b 100644
--- a/devel/laminar/pkg-plist
+++ b/devel/laminar/pkg-plist
@@ -3,8 +3,8 @@ bin/laminarc
 sbin/laminard
 share/man/man1/laminarc.1.gz
 share/man/man8/laminard.8.gz
-usr/share/bash-completion/completions/laminarc
-usr/share/zsh/site-functions/_laminarc
+share/bash-completion/completions/laminarc
+share/zsh/site-functions/_laminarc
 @dir(%%USERS%%,%%GROUPS%%) %%HOMEDIR%%/cfg/jobs
 @dir(%%USERS%%,%%GROUPS%%) %%HOMEDIR%%/cfg
 @dir(%%USERS%%,%%GROUPS%%) %%HOMEDIR%%