git: 6963b8318f56 - main - devel/kyua: Switch to FreeBSD upstream

The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6963b8318f5627ab2ffdeb25478cc7bae7a97f40

commit 6963b8318f5627ab2ffdeb25478cc7bae7a97f40
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2024-01-03 05:23:52 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2024-01-03 05:27:55 +0000

    devel/kyua: Switch to FreeBSD upstream
    
    - As per the recent discussion switch to the FreeBSD upstream
    - For now resetting MAINTAINER to myself with ci@ hat on but anyone from
      ci@ feel free to commit
    - Pet port{clippy|fmt}
    
    PR:             276071
    Approved by:    jmmv (private mail)
---
 devel/kyua/Makefile                             | 11 ++++++-----
 devel/kyua/distinfo                             |  6 +++---
 devel/kyua/files/patch-utils_datetime.cpp       | 20 --------------------
 devel/kyua/files/patch-utils_datetime__test.cpp | 19 -------------------
 devel/kyua/pkg-plist                            |  1 +
 5 files changed, 10 insertions(+), 47 deletions(-)

diff --git a/devel/kyua/Makefile b/devel/kyua/Makefile
index bab190f32c06..b3f3b1439b3e 100644
--- a/devel/kyua/Makefile
+++ b/devel/kyua/Makefile
@@ -1,10 +1,8 @@
 PORTNAME=	kyua
-PORTVERSION=	0.13
-PORTREVISION=	6
+DISTVERSION=	0.13
+PORTREVISION=	7
 PORTEPOCH=	3
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
-		LOCAL/jmmv
 
 MAINTAINER=	jmmv@FreeBSD.org
 COMMENT=	Testing framework for infrastructure software
@@ -14,7 +12,10 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	liblutok.so:devel/lutok
 
-USES=		lua pkgconfig sqlite
+USES=		autoreconf lua pkgconfig sqlite
+USE_GITHUB=	yes
+GH_ACCOUNT=	freebsd
+GH_TAGNAME=	84c8ec8
 USE_CXXSTD=	gnu++11
 
 GNU_CONFIGURE=	yes
diff --git a/devel/kyua/distinfo b/devel/kyua/distinfo
index 26a95a748056..798778e849c3 100644
--- a/devel/kyua/distinfo
+++ b/devel/kyua/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472222340
-SHA256 (kyua-0.13.tar.gz) = db6e5d341d5cf7e49e50aa361243e19087a00ba33742b0855d2685c0b8e721d6
-SIZE (kyua-0.13.tar.gz) = 663776
+TIMESTAMP = 1704159547
+SHA256 (freebsd-kyua-0.13-84c8ec8_GH0.tar.gz) = 3d80730f9bc3ad23fa79cba5fe418c4b0ffc0326101ecce18441c1d18e26198f
+SIZE (freebsd-kyua-0.13-84c8ec8_GH0.tar.gz) = 508997
diff --git a/devel/kyua/files/patch-utils_datetime.cpp b/devel/kyua/files/patch-utils_datetime.cpp
deleted file mode 100644
index 899a1b9ca619..000000000000
--- a/devel/kyua/files/patch-utils_datetime.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- utils/datetime.cpp.orig	2016-08-26 10:09:37 UTC
-+++ utils/datetime.cpp
-@@ -590,11 +590,12 @@ datetime::timestamp::operator-=(const da
- datetime::delta
- datetime::timestamp::operator-(const datetime::timestamp& other) const
- {
--    if ((*this) < other) {
--        throw std::runtime_error(
--            F("Cannot subtract %s from %s as it would result in a negative "
--              "datetime::delta, which are not supported") % other % (*this));
--    }
-+    /*
-+     * XXX-BD: gettimeofday isn't necessicarily monotonic so return the
-+     * smallest non-zero delta if time went backwards.
-+     */
-+    if ((*this) < other)
-+        return datetime::delta::from_microseconds(1);
-     return datetime::delta::from_microseconds(to_microseconds() -
-                                               other.to_microseconds());
- }
diff --git a/devel/kyua/files/patch-utils_datetime__test.cpp b/devel/kyua/files/patch-utils_datetime__test.cpp
deleted file mode 100644
index cf6af9b370f5..000000000000
--- a/devel/kyua/files/patch-utils_datetime__test.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- utils/datetime_test.cpp.orig	2016-08-26 10:09:37 UTC
-+++ utils/datetime_test.cpp
-@@ -532,11 +532,11 @@ ATF_TEST_CASE_BODY(timestamp__subtractio
-     ATF_REQUIRE_EQ(datetime::delta(100, 0), ts3 - ts1);
-     ATF_REQUIRE_EQ(datetime::delta(99, 999988), ts3 - ts2);
- 
--    ATF_REQUIRE_THROW_RE(
--        std::runtime_error,
--        "Cannot subtract 1291970850123456us from 1291970750123468us "
--        ".*negative datetime::delta.*not supported",
--        ts2 - ts3);
-+    /*
-+     * NOTE (ngie): behavior change for
-+     * https://github.com/jmmv/kyua/issues/155 .
-+     */
-+    ATF_REQUIRE_EQ(datetime::delta::from_microseconds(1), ts2 - ts3);
- }
- 
- 
diff --git a/devel/kyua/pkg-plist b/devel/kyua/pkg-plist
index 08ff3dcb0c01..4f1b389980d6 100644
--- a/devel/kyua/pkg-plist
+++ b/devel/kyua/pkg-plist
@@ -160,6 +160,7 @@ man/man5/kyuafile.5.gz
 %%TEST%%tests/kyua/utils/process/child_test
 %%TEST%%tests/kyua/utils/process/deadline_killer_test
 %%TEST%%tests/kyua/utils/process/exceptions_test
+%%TEST%%tests/kyua/utils/process/executor_pid_test
 %%TEST%%tests/kyua/utils/process/executor_test
 %%TEST%%tests/kyua/utils/process/fdstream_test
 %%TEST%%tests/kyua/utils/process/helpers