svn commit: r566671 - in head/devel/kyua: . files

[Tobias Kortkamp]

Author: tobik
Date: Sat Feb 27 07:05:21 2021
New Revision: 566671
URL: https://svnweb.freebsd.org/changeset/ports/566671

Log:
  devel/kyua: Pet portlint
  
  Also while here replace MAKE_FLAGS with MAKE_ARGS and since the
  submission was almost there also pet portclippy.
  
  PR:		231843
  Submitted by:	takefu at airport.fm
  Approved by:	jmmv (maintainer timeout, >2 years)

Modified:
  head/devel/kyua/Makefile
  head/devel/kyua/files/patch-utils_datetime.cpp
  head/devel/kyua/files/patch-utils_datetime__test.cpp

Modified: head/devel/kyua/Makefile
==============================================================================
--- head/devel/kyua/Makefile	Sat Feb 27 06:56:50 2021	(r566670)
+++ head/devel/kyua/Makefile	Sat Feb 27 07:05:21 2021	(r566671)
@@ -2,8 +2,8 @@
 
 PORTNAME=	kyua
 PORTVERSION=	0.13
-PORTEPOCH=	3
 PORTREVISION=	5
+PORTEPOCH=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
 		LOCAL/jmmv
@@ -14,44 +14,37 @@ COMMENT=	Testing framework for infrastructure software
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	liblutok.so:devel/lutok
-LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 
-CONFLICTS=	kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*
+USES=		lua pkgconfig sqlite
 
 GNU_CONFIGURE=	yes
-USES=		lua pkgconfig
+CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
+		--without-doxygen
+MAKE_ARGS=	examplesdir=${EXAMPLESDIR} \
+		pkgdatadir=${DATADIR}
 
-TESTS_USER=	tests
-USERS=		${TESTS_USER}
-GROUPS=		tests
+CONFLICTS=	kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*
+
 SUB_FILES=	kyua.conf
-SUB_LIST=	TESTS_USER=${TESTS_USER}
+_TESTS_USER=	tests
+SUB_LIST=	TESTS_USER=${_TESTS_USER}
+USERS=		${_TESTS_USER}
+GROUPS=		tests
 
-OPTIONS_DEFINE=	DOCS EXAMPLES TEST
-OPTIONS_DEFAULT=TEST
-
+OPTIONS_DEFINE=		DOCS EXAMPLES TEST
+OPTIONS_DEFAULT=	TEST
 OPTIONS_SUB=		yes
-TEST_CONFIGURE_WITH=	atf
+
+DOCS_MAKE_ARGS_OFF=	doc_DATA=
+EXAMPLES_MAKE_ARGS_OFF=	dist_examples_DATA=
 TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
 TEST_RUN_DEPENDS=	atf>=0.21:devel/atf
+TEST_CONFIGURE_WITH=	atf
 
-.include <bsd.port.options.mk>
-
-CONFIGURE_ARGS+=	--without-doxygen
-CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
-MAKE_FLAGS+=	examplesdir=${EXAMPLESDIR}
-MAKE_FLAGS+=	pkgdatadir=${DATADIR}
-
-.if ! ${PORT_OPTIONS:MDOCS}
-MAKE_FLAGS+=	doc_DATA=
-.endif
-.if ! ${PORT_OPTIONS:MEXAMPLES}
-MAKE_FLAGS+=	dist_examples_DATA=
-.endif
-
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua/
-	${INSTALL_DATA} ${WRKDIR}/kyua.conf ${STAGEDIR}${PREFIX}/etc/kyua/kyua.conf.sample
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua
+	${INSTALL_DATA} ${WRKDIR}/kyua.conf \
+		${STAGEDIR}${PREFIX}/etc/kyua/kyua.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \
 		${STAGEDIR}${PREFIX}/tests/Kyuafile
 

Modified: head/devel/kyua/files/patch-utils_datetime.cpp
==============================================================================
--- head/devel/kyua/files/patch-utils_datetime.cpp	Sat Feb 27 06:56:50 2021	(r566670)
+++ head/devel/kyua/files/patch-utils_datetime.cpp	Sat Feb 27 07:05:21 2021	(r566671)
@@ -1,6 +1,6 @@
---- utils/datetime.cpp.orig
+--- utils/datetime.cpp.orig	2016-08-26 10:09:37 UTC
 +++ utils/datetime.cpp
-@@ -590,11 +590,12 @@
+@@ -590,11 +590,12 @@ datetime::timestamp::operator-=(const da
  datetime::delta
  datetime::timestamp::operator-(const datetime::timestamp& other) const
  {

Modified: head/devel/kyua/files/patch-utils_datetime__test.cpp
==============================================================================
--- head/devel/kyua/files/patch-utils_datetime__test.cpp	Sat Feb 27 06:56:50 2021	(r566670)
+++ head/devel/kyua/files/patch-utils_datetime__test.cpp	Sat Feb 27 07:05:21 2021	(r566671)
@@ -1,4 +1,4 @@
---- utils/datetime_test.cpp.orig	2017-04-08 05:25:26 UTC
+--- 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);