Date: Mon, 28 Oct 2024 12:44:09 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: da967e317a86 - main - sysutils/bmd: use USES=uidfix Message-ID: <202410281244.49SCi9GH073815@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=da967e317a868bf27448284ba77e2262546ecc6f commit da967e317a868bf27448284ba77e2262546ecc6f Author: Yuichiro NAITO <naito.yuichiro@gmail.com> AuthorDate: 2024-10-25 17:06:32 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-10-28 12:41:55 +0000 sysutils/bmd: use USES=uidfix The bmd's Makefile uses 'bsd.prog.mk', so it is necessary to fix uid/gid for building the port in user privileges. The uidfix utility is a convenient way for this purpose. I omitted the local patch files to use 'USES=uidfix'. PR: 282223 --- sysutils/bmd/Makefile | 3 +++ sysutils/bmd/files/patch-Makefile | 23 ----------------------- sysutils/bmd/files/patch-rc.d_Makefile | 11 ----------- 3 files changed, 3 insertions(+), 34 deletions(-) diff --git a/sysutils/bmd/Makefile b/sysutils/bmd/Makefile index 6293fbdb2475..9e1f4f4bf054 100644 --- a/sysutils/bmd/Makefile +++ b/sysutils/bmd/Makefile @@ -1,5 +1,6 @@ PORTNAME= bmd DISTVERSION= 3.1 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= naito.yuichiro@gmail.com @@ -15,6 +16,8 @@ ONLY_FOR_ARCHS_REASON= bhyve runs on amd64 only RUN_DEPENDS= bhyve-firmware>0:sysutils/bhyve-firmware \ grub2-bhyve>0:sysutils/grub2-bhyve +USES= uidfix + USE_GITHUB= yes GH_ACCOUNT= yuichiro-naito diff --git a/sysutils/bmd/files/patch-Makefile b/sysutils/bmd/files/patch-Makefile deleted file mode 100644 index 49d5b98ed5b8..000000000000 --- a/sysutils/bmd/files/patch-Makefile +++ /dev/null @@ -1,23 +0,0 @@ ---- Makefile.orig 2024-10-07 06:15:41 UTC -+++ Makefile -@@ -1,10 +1,20 @@ -+BINOWN!= id -u -+BINGRP!= id -g -+DIROWN= $(BINOWN) -+DIRGRP= $(BINGRP) -+SHAREOWN= $(BINOWN) -+SHAREGRP= $(BINGRP) - MK_DEBUG_FILES?= no - SUBDIR= rc.d - BINDIR= $(LOCALBASE)/sbin - MANDIR= $(LOCALBASE)/share/man/man - DIRS= UEFIVARDIR PLUGINDIR - UEFIVARDIR= $(LOCALBASE)/var/cache/bmd -+UEFIVARDIR_OWN= $(BINOWN) -+UEFIVARDIR_GRP= $(BINGRP) - PLUGINDIR= $(LOCALBASE)/libexec/bmd -+PLUGINDIR_OWN= $(BINOWN) -+PLUGINDIR_GRP= $(BINGRP) - PROG= bmd - MAN= bmd.8 bmdctl.8 bmd.conf.5 - LINKS= ${BINDIR}/bmd ${BINDIR}/bmdctl diff --git a/sysutils/bmd/files/patch-rc.d_Makefile b/sysutils/bmd/files/patch-rc.d_Makefile deleted file mode 100644 index 92b0e4ac3769..000000000000 --- a/sysutils/bmd/files/patch-rc.d_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- rc.d/Makefile.orig 2023-08-08 05:39:45 UTC -+++ rc.d/Makefile -@@ -2,6 +2,8 @@ SCRIPTSDIR= $(LOCALBASE)/etc/rc.d - SCRIPTS= bmd - SCRIPTSNAME_bmd=bmd - SCRIPTSDIR= $(LOCALBASE)/etc/rc.d -+SCRIPTSOWN!= id -u -+SCRIPTSGRP!= id -g - - bmd: bmd.in - sed 's|%%LOCALBASE%%|$(LOCALBASE)|' < ${.ALLSRC} > ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410281244.49SCi9GH073815>