diff -udprN /usr/ports/devel/kyua/Makefile ./Makefile
--- /usr/ports/devel/kyua/Makefile	2017-05-24 14:34:19.000000000 +0000
+++ ./Makefile	2018-10-01 08:24:14.477779000 +0000
@@ -2,8 +2,8 @@
 
 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
@@ -13,14 +13,13 @@ COMMENT=	Testing framework for infrastru
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	liblutok.so:devel/lutok
-LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
+LIB_DEPENDS=	liblutok.so:devel/lutok libsqlite3.so:databases/sqlite3
+
+USES=		lua pkgconfig
 
 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
@@ -28,30 +27,20 @@ SUB_LIST=	TESTS_USER=${TESTS_USER}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES TEST
 OPTIONS_DEFAULT=TEST
+OPTIONS_SUB=	yes
 
-OPTIONS_SUB=		yes
-TEST_CONFIGURE_WITH=	atf
+DOCS_VARS=		MAKE_FLAGS+=doc_DATA=
+EXAMPLES_VARS=		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
 
-.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
+CONFIGURE_ARGS=	--without-doxygen --docdir=${DOCSDIR}
+MAKE_FLAGS+=	examplesdir=${EXAMPLESDIR} pkgdatadir=${DATADIR}
 
 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/kyua/
+	@${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
+	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top ${STAGEDIR}${PREFIX}/tests/Kyuafile
 
 .include <bsd.port.mk>
diff -udprN /usr/ports/devel/kyua/files/patch-utils_datetime.cpp ./files/patch-utils_datetime.cpp
--- /usr/ports/devel/kyua/files/patch-utils_datetime.cpp	2017-04-21 07:35:13.000000000 +0000
+++ ./files/patch-utils_datetime.cpp	2018-10-01 07:09:02.812746000 +0000
@@ -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
  {
diff -udprN /usr/ports/devel/kyua/files/patch-utils_datetime__test.cpp ./files/patch-utils_datetime__test.cpp
--- /usr/ports/devel/kyua/files/patch-utils_datetime__test.cpp	2017-04-21 07:38:30.000000000 +0000
+++ ./files/patch-utils_datetime__test.cpp	2018-10-01 07:08:09.772154000 +0000
@@ -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);
diff -udprN /usr/ports/devel/kyua/pkg-plist ./pkg-plist
--- /usr/ports/devel/kyua/pkg-plist	2017-05-24 14:34:19.000000000 +0000
+++ ./pkg-plist	2018-10-01 08:06:47.967610000 +0000
@@ -21,13 +21,6 @@ man/man5/kyuafile.5.gz
 %%DATADIR%%/store/migrate_v1_v2.sql
 %%DATADIR%%/store/migrate_v2_v3.sql
 %%DATADIR%%/store/schema_v3.sql
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Kyuafile.top
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kyua.conf
 %%TEST%%tests/Kyuafile
 %%TEST%%tests/kyua/Kyuafile
 %%TEST%%tests/kyua/bootstrap/Kyuafile