From nobody Fri Feb 27 13:45:35 2026 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fMqMz2xRZz6T561 for ; Fri, 27 Feb 2026 13:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fMqMz2J70z3X6F for ; Fri, 27 Feb 2026 13:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772199935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YioQdJ2nnkQSVyH5zFOLEzZqckRLuwUHn+Zp3YLVVs=; b=HElptY08NfN56Kk3GwnhkoY0YkZ0vBNorRbFOruj1FKWW0J+m4468raB1LgoJk2QKs4AAU ztGzAkdUy678ZvxnfSEhWnGADUvLxVC+s3Z+JPuXERBwhepT6zkqygbpWBJw6+MV5LEkPa 9U1Q5sdaXCaBeBpW6vMntMaBYKHCuzmWicPR7yOVVsIOo7R6Ub6Nfw4WCxOssa2TKWWC7x G4eayDHXkqGRtO+GEgNJtBaypXTwmW9vkOXHh5IC3Xt8ssiwxuOoRzWVlXhR77gcKXIzBA gZM72wgOQvbvZmPUcsFU9LqoUp5Hujmg+EZ7n82rWPU/NbPtn15FXp/mQpcr2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772199935; a=rsa-sha256; cv=none; b=GmIMftY9rGp/O3gHVkICEtW5w7b3IBSIpBFaAgv0vq2JRfk8Q9fWuuqRfcfIe3TC1PVynE SM/pwsl6FpZTXFDWXGWJCJPdWDPxFYlh6VkN2kkIfcvDWRJCfZzOsoC0ZSmsupSJUcll3r EMMZG9Jfl41mx2YWjR+7yBIyq/hvNYSpOU8NykuaheS9EXQCSG/UGp1Gj5n7YaXM25HukU yW/51w/Yq1gkouF8A7U0BDotbB1IzDMjXOw/qGZNgo3J9gKefrfNLDAbPtl1e64ZYNlXkN JsQvXZOFDDLXNk+6S4HuDHqqAuOIWCtNMEAGdJQy0FqMyj9LcPk1AYxcRjIfqg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772199935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YioQdJ2nnkQSVyH5zFOLEzZqckRLuwUHn+Zp3YLVVs=; b=JfVys7HPXHvcBSL+YP5VLJuwODArT+NVe2niA9ieJaDZP7RhkBHZ48FMFdXfYmOC8Se79e MWbDEDccHJsjouDN0WfQ6M1oUAJVpP4Q/rqH2UjxN4oKNVtHvQ9/zwLcQlJBKjZF2MTI2M UUyAPZqUUAOVqKX5SI02aM1fp+GUBEYBIS/1vj8M81z4fnu4fdP3kuBfaZxQADLHiDhEoY r4tZ9JsRZjsyWWMWt2Dz9Q1ezkux9jWOoOu25kAstKZnmSGkdQMKwKztj37F1Y3hfR8WM1 swdnGgbv9wKITNA37/o1nRpP7ADSCaga6AXMb+jfhrEA9kJqONGktWVq1WogFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fMqMz1nWkz48X for ; Fri, 27 Feb 2026 13:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 202e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 27 Feb 2026 13:45:35 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: 0f8a5cc13c3d - main - sysutils/cbsd: Update rc script for CIX rebranding List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f8a5cc13c3d343c1c1abc4f41c2d753b8f726b9 Auto-Submitted: auto-generated Date: Fri, 27 Feb 2026 13:45:35 +0000 Message-Id: <69a19fff.202e0.664bb58e@gitrepo.freebsd.org> The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f8a5cc13c3d343c1c1abc4f41c2d753b8f726b9 commit 0f8a5cc13c3d343c1c1abc4f41c2d753b8f726b9 Author: Kirill Ponomarev AuthorDate: 2026-02-27 13:44:58 +0000 Commit: Kirill Ponomarev CommitDate: 2026-02-27 13:45:31 +0000 sysutils/cbsd: Update rc script for CIX rebranding - Replace hardcoded %%PREFIX%% paths with CIX_DISTDIR and CIX_BIN variables - Rename NO_CBSD_HISTORY to NO_CIX_HISTORY - Use ${miscdir}/daemonize instead of /usr/sbin/daemon --- sysutils/cbsd/Makefile | 1 + sysutils/cbsd/files/cbsdd.in | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile index cc6770133084..3e4352f0da2d 100644 --- a/sysutils/cbsd/Makefile +++ b/sysutils/cbsd/Makefile @@ -1,5 +1,6 @@ PORTNAME= cbsd DISTVERSION= 15.0.4 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= fbsd-ports@convectix.com diff --git a/sysutils/cbsd/files/cbsdd.in b/sysutils/cbsd/files/cbsdd.in index f4e7b4c8d00e..16634c8ad791 100644 --- a/sysutils/cbsd/files/cbsdd.in +++ b/sysutils/cbsd/files/cbsdd.in @@ -16,13 +16,16 @@ load_rc_config $name : ${cbsdd_enable="NO"} export workdir="${cbsd_workdir}" -export NO_CBSD_HISTORY=yes +export NO_CIX_HISTORY=yes # disable interactive question export NOINTER=1 # always answer 'no' export ALWAYS_NO=1 -globalconf=${cbsd_globalconf:-"%%PREFIX%%/cbsd/cbsd.conf"} +[ -z "${CIX_DISTDIR}" ] && CIX_DISTDIR="%%PREFIX%%/cbsd" +[ -z "${CIX_BIN}" ] && CIX_BIN="%%PREFIX%%/bin/cbsd" + +globalconf=${cbsd_globalconf:-"${CIX_DISTDIR}/cbsd.conf"} if [ ! -f ${globalconf} ]; then echo "cbsd: no such ${globalconf}"; @@ -62,22 +65,22 @@ pidfile="${cbsd_workdir}/var/run/$name.pid" command_args="&" cbsdd_prestart() { - %%PREFIX%%/bin/cbsd task mode=flushall > /dev/null 2>&1 + ${CIX_BIN} task mode=flushall > /dev/null 2>&1 . ${subrdir}/initenv.subr . ${inventory} - %%PREFIX%%/bin/cbsd sysinv mode=update - %%PREFIX%%/bin/cbsd netinv + ${CIX_BIN} sysinv mode=update + ${CIX_BIN} netinv update_netinfo ${miscdir}/sqlcli ${dbdir}/local.sqlite "UPDATE jails SET status='0' WHERE status='3'" - [ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd naton - /usr/sbin/daemon -f ${rcddir}/jails-astart start + [ -n "${nat_enable}" ] && ${CIX_BIN} naton + ${miscdir}/daemonize ${CIX_BIN} ${rcddir}/jails-astart start } cbsdd_prestop() { - ${rcddir}/jails-astart stop - [ -n "${nat_enable}" ] && %%PREFIX%%/bin/cbsd natoff + ${CIX_BIN} ${rcddir}/jails-astart stop + [ -n "${nat_enable}" ] && ${CIX_BIN} natoff } cbsdd_stop()