From owner-svn-ports-head@freebsd.org Sat Feb 27 07:05:22 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7421C55DC5A; Sat, 27 Feb 2021 07:05:22 +0000 (UTC) (envelope-from tobik@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dncwy2tD3z4WBk; Sat, 27 Feb 2021 07:05:22 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5139C19B89; Sat, 27 Feb 2021 07:05:22 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11R75MUG022450; Sat, 27 Feb 2021 07:05:22 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11R75LIn022448; Sat, 27 Feb 2021 07:05:21 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202102270705.11R75LIn022448@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sat, 27 Feb 2021 07:05:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566671 - in head/devel/kyua: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/devel/kyua: . files X-SVN-Commit-Revision: 566671 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Feb 2021 07:05:22 -0000 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@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 - -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);