From nobody Wed Oct 07 17:57:13 2026 X-Original-To: dev-commits-src-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 4j0LRs6Tsjz4n4td for ; Wed, 07 Oct 2026 17:57:13 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j0LRs5sB6z4kwG for ; Wed, 07 Oct 2026 17:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791395833; 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=ksieASh/tbWf3K+mbafHB3rDdSYysehxn/oLzK9Baa8=; b=WwQ2xrjiVzRqu+lLMIiJJayPlwtg+WoUU2kTfduXRg35jc0jJueVPTjUYsvoNMvXbTkS+w TzoptUiI/Hpl1sI3AM/HuVsD1g/Klzcgd5nzAB6NzH3ZCC1Y4OYqLz1rGkxjKpfr8zEz6D l7F8Ko+PY3jsz7WUnHnK36NsZ/3DSQ0YPmRKD55+RisAPpXeeET6Rv6BXe9WG4W9pkp7/e 0dujD/o9+vtXWk1Z3i4sNxxjLhrRW5aaGEKroIzwpqd6MDDNr1uNXmhkBdUi8/320YjUgG 2zjHMjI7P3IiAY5B4xIQhr8/3fRKQPox+2y2tu8YlBx+CeUhJO6blgZax2TgJQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791395833; b=cslSM8jTEfG210DyVyzP9xKTrjb137mStxR/nTPhV1P1Mo9vR+NNMJv7tpBq5d7zoIQzvY MeUqtE+2AYbtfAwxripLS70brOAOgpy8+FCcsSIfDy0mvzOZRk3QW6ZXtKzGJTdi/74lTK o/uv4NWTa0qGZhAr/p4kkFW4y6JK8t8fSiiDUJ5mSFu6lQqoxM70g+TtDafltXBh4OILMq w3hCo1o3YpCU7DmE8g7CtvVy3pabpFhKRN/VX4oZEuGDanFMF7Rc+FvuVMS/FKJtaFTGO1 wELJS5XXr4LgMF2GRYoQcdeafAAVkzepooKmPy1k8udnZECnZBEzx5v8GN0TSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791395833; 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=ksieASh/tbWf3K+mbafHB3rDdSYysehxn/oLzK9Baa8=; b=iVi30ztXyPVcukhUodAfJ2PxaWQ1Zz6ctg2A9W11ZaA6QwmJA2i6341B30xHnx86luczmV kasKVe3aVCCUyOOcAhZan9Dma1PvPgRGo04OoIDiRhzFYd/YmicaI25B/ohKvwpK782f2B Obo3Hjt66gFaZ81/C7ri+xLUEEJXYw9tmZnSYkzy8P+j0rglJxLOV2l34tprWpS/Db2TQY SOpHopBKLpQPfIgKl9UxYQUM0wIvjTC+8YCErIYgl5vqR0KuJfQy9uE5bdw03lyXSiwEYQ ynjpekjdB4u2Xva3b9IVXVDV41IBn/RSeJyHZrpxcJrIZ2MjR+UbW/LXhCYvWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4j0LRs4v9Dz13d0 for ; Wed, 07 Oct 2026 17:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ab67 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 07 Oct 2026 17:57:13 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: b836604e126d - main - contrib/kyua: commit Makefile changes for version update List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b836604e126d5b3d0d3dee5da6c4168d3ec43fea Auto-Submitted: auto-generated Date: Wed, 07 Oct 2026 17:57:13 +0000 Message-Id: <6ac687f9.3ab67.36916cd3@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=b836604e126d5b3d0d3dee5da6c4168d3ec43fea commit b836604e126d5b3d0d3dee5da6c4168d3ec43fea Author: Enji Cooper AuthorDate: 2026-10-07 17:55:21 +0000 Commit: Enji Cooper CommitDate: 2026-10-07 17:55:21 +0000 contrib/kyua: commit Makefile changes for version update This was accidentally missed in the version update. MFC after: 1 month Fixes: eb8f69902 ("contrib/kyua: update to 0.15.0") --- usr.bin/kyua/Makefile | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 083f3a8ec038..a761ebd8b974 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -5,7 +5,6 @@ KYUA_DOCDIR= /usr/share/doc/kyua KYUA_EGDIR= /usr/share/examples/kyua KYUA_MISCDIR= /usr/share/kyua/misc KYUA_STOREDIR= /usr/share/kyua/store -KYUA_VERSION= 0.13 KYUA_SRCDIR= ${SRCTOP}/contrib/kyua .PATH: ${KYUA_SRCDIR} @@ -15,6 +14,7 @@ PROG_CXX= kyua SRCS= main.cpp LIBADD= lutok sqlite3 util +.PATH: ${KYUA_SRCDIR}/doc MAN= kyua-about.1 \ kyua-config.1 \ kyua-db-exec.1 \ @@ -44,10 +44,6 @@ CFLAGS+= -DGDB=\"/usr/local/bin/gdb\" \ -DKYUA_MISCDIR=\"${KYUA_MISCDIR}\" \ -DKYUA_PLATFORM=\"${MACHINE}\" \ -DKYUA_STOREDIR=\"${KYUA_STOREDIR}\" \ - -DPACKAGE=\"kyua\" \ - -DPACKAGE_NAME=\"Kyua\" \ - -DPACKAGE_VERSION=\"${KYUA_VERSION}\" \ - -DVERSION=\"${KYUA_VERSION}\" CXXWARNFLAGS.gcc+= -Wno-free-nonheap-object @@ -120,6 +116,9 @@ SRCS+= engine/atf.cpp \ engine/config.cpp \ engine/exceptions.cpp \ engine/filters.cpp \ + engine/googletest.cpp \ + engine/googletest_list.cpp \ + engine/googletest_result.cpp \ engine/kyuafile.cpp \ engine/plain.cpp \ engine/requirements.cpp \ @@ -209,20 +208,4 @@ STOREDIR= ${KYUA_STOREDIR} STORETAGS= package=kyua .PATH: ${KYUA_SRCDIR}/store -CLEANFILES+= ${MAN} -.PATH: ${KYUA_SRCDIR}/doc -.for man in ${MAN} -${man}: ${man}.in - sh ${KYUA_SRCDIR}/doc/manbuild.sh \ - -v "CONFDIR=${KYUA_CONFDIR}" \ - -v "DOCDIR=${KYUA_DOCDIR}" \ - -v "EGDIR=${KYUA_EGDIR}" \ - -v "MISCDIR=${KYUA_MISCDIR}" \ - -v "PACKAGE=kyua" \ - -v "STOREDIR=${KYUA_STOREDIR}" \ - -v "TESTSDIR=${TESTSBASE}" \ - -v "VERSION=${KYUA_VERSION}" \ - ${.ALLSRC} ${.TARGET} -.endfor - .include