Index: head/devel/kyua/Makefile =================================================================== --- head/devel/kyua/Makefile (revision 436311) +++ head/devel/kyua/Makefile (revision 436312) @@ -1,57 +1,58 @@ # $FreeBSD$ PORTNAME= kyua PORTVERSION= 0.13 PORTEPOCH= 3 +PORTREVISION= 1 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 LICENSE= BSD3CLAUSE LIB_DEPENDS= liblutok.so:devel/lutok LIB_DEPENDS+= libsqlite3.so:databases/sqlite3 RUN_DEPENDS:= ${BUILD_DEPENDS} CONFLICTS= kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]* GNU_CONFIGURE= yes USES= lua pkgconfig TESTS_USER= tests USERS= ${TESTS_USER} SUB_FILES= kyua.conf SUB_LIST= TESTS_USER=${TESTS_USER} OPTIONS_DEFINE= DOCS EXAMPLES TEST OPTIONS_DEFAULT=TEST OPTIONS_SUB= yes TEST_CONFIGURE_WITH= atf TEST_BUILD_DEPENDS= atf>=0.21:devel/atf TEST_RUN_DEPENDS= atf>=0.21:devel/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/ ${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \ ${STAGEDIR}${PREFIX}/tests/Kyuafile .include Index: head/devel/kyua/files/patch-utils_datetime.cpp =================================================================== --- head/devel/kyua/files/patch-utils_datetime.cpp (nonexistent) +++ head/devel/kyua/files/patch-utils_datetime.cpp (revision 436312) @@ -0,0 +1,23 @@ + +$FreeBSD$ + +--- utils/datetime.cpp.orig ++++ utils/datetime.cpp +@@ -590,11 +590,12 @@ + 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()); + } Property changes on: head/devel/kyua/files/patch-utils_datetime.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property