git: b836604e126d - main - contrib/kyua: commit Makefile changes for version update

From: Enji Cooper <ngie_at_FreeBSD.org>
Date: Wed, 07 Oct 2026 17:57:13 UTC
The branch main has been updated by ngie:

URL: https://cgit.FreeBSD.org/src/commit/?id=b836604e126d5b3d0d3dee5da6c4168d3ec43fea

commit b836604e126d5b3d0d3dee5da6c4168d3ec43fea
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2026-10-07 17:55:21 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
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 <bsd.prog.mk>