Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 06 Apr 2026 20:32:58 +0000
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 68b3e1a840f7 - main - devel/samurai: Update to 1.3
Message-ID:  <69d4187a.3abdf.23ae95ec@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=68b3e1a840f72fd63d13a2cc141ffb13511e919e

commit 68b3e1a840f72fd63d13a2cc141ffb13511e919e
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-04-06 20:26:15 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-04-06 20:32:43 +0000

    devel/samurai: Update to 1.3
    
    * Use INSTALL_* helpers for binary and manpages instead cp which
      project Makefile uses
    * Define additional CFLAGS in port makefile rather than in a patch
    
    Changelog: https://github.com/michaelforney/samurai/releases/tag/1.3
    
    Approved by:    maintainer (by mail)
---
 devel/samurai/Makefile             | 19 +++++++++++++------
 devel/samurai/distinfo             |  6 +++---
 devel/samurai/files/patch-Makefile | 12 ++++--------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/devel/samurai/Makefile b/devel/samurai/Makefile
index dffcd1a72e58..f7e6544356bf 100644
--- a/devel/samurai/Makefile
+++ b/devel/samurai/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	samurai
-DISTVERSION=	1.2-2024.09.04
-DISTVERSIONSUFFIX=	-${GH_TAGNAME}
+DISTVERSION=	1.3
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/michaelforney/${PORTNAME}/releases/download/${DISTVERSION}/
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Ninja-compatible build tool written in C
@@ -15,12 +15,19 @@ LICENSE_FILE_MIT=	${WRKSRC}/LICENSE
 USES=		cpe
 CPE_VENDOR=	${PORTNAME}_project
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	michaelforney
-GH_TAGNAME=	1890235
+CFLAGS+=	-DHAVE_GETLOADAVG
 
-ALL_TARGET=	samu
 PLIST_FILES=	bin/samu \
 		share/man/man1/samu.1.gz
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/samu ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/samu.1 ${STAGEDIR}${PREFIX}/share/man/man1
+
+.include <bsd.port.options.mk>
+
+.if ${OPSYS}_${OSREL:R} == FreeBSD_13
+CFLAGS+=	-D_XOPEN_SOURCE=700L
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/samurai/distinfo b/devel/samurai/distinfo
index 5300b4612aad..bdd2ce83f878 100644
--- a/devel/samurai/distinfo
+++ b/devel/samurai/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725496083
-SHA256 (michaelforney-samurai-1.2-2024.09.04-1890235-1890235_GH0.tar.gz) = 7f2cb469e78cb00c31bdb40c128d67c67673d296d3283eb8f6a0b348a7e54d6d
-SIZE (michaelforney-samurai-1.2-2024.09.04-1890235-1890235_GH0.tar.gz) = 32717
+TIMESTAMP = 1775512887
+SHA256 (samurai-1.3.tar.gz) = 1bc020a9e133432df51911ac71cc34322f828934d9a2282ba2916d88c15976af
+SIZE (samurai-1.3.tar.gz) = 33562
diff --git a/devel/samurai/files/patch-Makefile b/devel/samurai/files/patch-Makefile
index ac3c4ad1bfb5..a218a3d11805 100644
--- a/devel/samurai/files/patch-Makefile
+++ b/devel/samurai/files/patch-Makefile
@@ -1,15 +1,11 @@
---- Makefile.orig	2023-07-08 14:22:22 UTC
+--- Makefile.orig	2026-04-06 21:46:01 UTC
 +++ Makefile
-@@ -1,10 +1,10 @@
- .POSIX:
+@@ -2,7 +2,7 @@ OS=posix
  .PHONY: all install clean
  
+ OS=posix
 -PREFIX=/usr/local
 +PREFIX?=/usr/local
  BINDIR=$(PREFIX)/bin
  MANDIR=$(PREFIX)/share/man
--ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wno-unused-parameter
-+ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wno-unused-parameter -DHAVE_GETLOADAVG
- OBJ=\
- 	build.o\
- 	deps.o\
+ ALL_CFLAGS=$(CFLAGS) -std=c99 -Wall -Wextra -Wshadow -Wmissing-prototypes -Wpedantic -Wno-unused-parameter


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d4187a.3abdf.23ae95ec>