Attachment #199601 for bug #231843





PORTNAME=	kyua
PORTVERSION=	0.13
PORTEPOCH=	3
PORTREVISION=	4
PORTEPOCH=	3
CATEGORIES=	devel
MASTER_SITES=	https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
		LOCAL/jmmv

LICENSE=	BSD3CLAUSE

LIB_DEPENDS=	liblutok.so:devel/lutok

USES=		lua pkgconfig sqlite

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


OPTIONS_DEFINE=	DOCS EXAMPLES TEST
OPTIONS_DEFAULT=TEST

OPTIONS_SUB=		yes

DOCS_VARS_OFF=		MAKE_FLAGS+=doc_DATA=
EXAMPLES_VARS_OFF=	MAKE_FLAGS+=dist_examples_DATA=
TEST_BUILD_DEPENDS=	atf>=0.21:devel/atf
TEST_CONFIGURE_WITH=	atf
TEST_RUN_DEPENDS=	atf>=0.21:devel/atf

CONFIGURE_ARGS=	--without-doxygen --docdir=${DOCSDIR}
MAKE_FLAGS+=	examplesdir=${EXAMPLESDIR} pkgdatadir=${DATADIR}
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
	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top ${STAGEDIR}${PREFIX}/tests/Kyuafile
		${STAGEDIR}${PREFIX}/tests/Kyuafile

.include <bsd.port.mk>

Lines 1-6 Link Here

(-)./files/patch-utils_datetime.cpp (-2 / +2 lines)
1	--- utils/datetime.cpp.orig	1	--- utils/datetime.cpp.orig 2016-08-26 10:09:37 UTC
2	+++ utils/datetime.cpp	2	+++ utils/datetime.cpp
3	@@ -590,11 +590,12 @@	3	@@ -590,11 +590,12 @@ datetime::timestamp::operator-=(const da
4	datetime::delta	4	datetime::delta
5	datetime::timestamp::operator-(const datetime::timestamp& other) const	5	datetime::timestamp::operator-(const datetime::timestamp& other) const
6	{	6	{

Lines 1-4 Link Here

(-)./files/patch-utils_datetime__test.cpp (-1 / +1 lines)
1	--- utils/datetime_test.cpp.orig 2017-04-08 05:25:26 UTC	1	--- utils/datetime_test.cpp.orig 2016-08-26 10:09:37 UTC
2	+++ utils/datetime_test.cpp	2	+++ utils/datetime_test.cpp
3	@@ -532,11 +532,11 @@ ATF_TEST_CASE_BODY(timestamp__subtractio	3	@@ -532,11 +532,11 @@ ATF_TEST_CASE_BODY(timestamp__subtractio
4	ATF_REQUIRE_EQ(datetime::delta(100, 0), ts3 - ts1);	4	ATF_REQUIRE_EQ(datetime::delta(100, 0), ts3 - ts1);

Return to bug 231843

Lines 2-9 Link Here

(-)./Makefile (-22 / +11 lines)
2		2
3	PORTNAME= kyua	3	PORTNAME= kyua
4	PORTVERSION= 0.13	4	PORTVERSION= 0.13
5	PORTEPOCH= 3
6	PORTREVISION= 4	5	PORTREVISION= 4
		6	PORTEPOCH= 3
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \	8	MASTER_SITES= https://github.com/jmmv/kyua/releases/download/${PORTNAME}-${PORTVERSION}/ \
9	LOCAL/jmmv	9	LOCAL/jmmv
Lines 14-26 COMMENT= Testing framework for infrastru Link Here
14	LICENSE= BSD3CLAUSE	14	LICENSE= BSD3CLAUSE
15		15
16	LIB_DEPENDS= liblutok.so:devel/lutok	16	LIB_DEPENDS= liblutok.so:devel/lutok
17	LIB_DEPENDS+= libsqlite3.so:databases/sqlite3	17
		18	USES= lua pkgconfig sqlite
18		19
19	CONFLICTS= kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*	20	CONFLICTS= kyua-atf-compat-[0-9]* kyua-cli-[0-9]* kyua-testers-[0-9]*
20		21
21	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
22	USES= lua pkgconfig
23
24	TESTS_USER= tests	23	TESTS_USER= tests
25	USERS= ${TESTS_USER}	24	USERS= ${TESTS_USER}
26	SUB_FILES= kyua.conf	25	SUB_FILES= kyua.conf
Lines 28-57 SUB_LIST= TESTS_USER=${TESTS_USER} Link Here
28		27
29	OPTIONS_DEFINE= DOCS EXAMPLES TEST	28	OPTIONS_DEFINE= DOCS EXAMPLES TEST
30	OPTIONS_DEFAULT=TEST	29	OPTIONS_DEFAULT=TEST
31
32	OPTIONS_SUB= yes	30	OPTIONS_SUB= yes
33	TEST_CONFIGURE_WITH= atf	31
		32	DOCS_VARS_OFF= MAKE_FLAGS+=doc_DATA=
		33	EXAMPLES_VARS_OFF= MAKE_FLAGS+=dist_examples_DATA=
34	TEST_BUILD_DEPENDS= atf>=0.21:devel/atf	34	TEST_BUILD_DEPENDS= atf>=0.21:devel/atf
		35	TEST_CONFIGURE_WITH= atf
35	TEST_RUN_DEPENDS= atf>=0.21:devel/atf	36	TEST_RUN_DEPENDS= atf>=0.21:devel/atf
36		37
37	.include <bsd.port.options.mk>	38	CONFIGURE_ARGS= --without-doxygen --docdir=${DOCSDIR}
38		39	MAKE_FLAGS+= examplesdir=${EXAMPLESDIR} pkgdatadir=${DATADIR}
39	CONFIGURE_ARGS+= --without-doxygen
40	CONFIGURE_ARGS+= --docdir=${DOCSDIR}
41	MAKE_FLAGS+= examplesdir=${EXAMPLESDIR}
42	MAKE_FLAGS+= pkgdatadir=${DATADIR}
43
44	.if ! ${PORT_OPTIONS:MDOCS}
45	MAKE_FLAGS+= doc_DATA=
46	.endif
47	.if ! ${PORT_OPTIONS:MEXAMPLES}
48	MAKE_FLAGS+= dist_examples_DATA=
49	.endif
50		40
51	post-install:	41	post-install:
52	${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua/	42	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua/
53	${INSTALL_DATA} ${WRKDIR}/kyua.conf ${STAGEDIR}${PREFIX}/etc/kyua/kyua.conf.sample	43	${INSTALL_DATA} ${WRKDIR}/kyua.conf ${STAGEDIR}${PREFIX}/etc/kyua/kyua.conf.sample
54	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \	44	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top ${STAGEDIR}${PREFIX}/tests/Kyuafile
55	${STAGEDIR}${PREFIX}/tests/Kyuafile
56		45
57	.include <bsd.port.mk>	46	.include <bsd.port.mk>