3 files changed, 83 insertions, 32 deletions
diff --git a/devel/shtk/Makefile b/devel/shtk/Makefile
index 3869edee987..4d7bb1abfde 100644
--- a/devel/shtk/Makefile
+++ b/devel/shtk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2014/10/09 14:06:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2014/11/17 19:55:53 jmmv Exp $
 
-DISTNAME=	shtk-1.4
+DISTNAME=	shtk-1.6
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/jmmv/shtk/releases/download/${DISTNAME}/
 
@@ -15,19 +15,4 @@ USE_TOOLS=		pkg-config
 
 CONFIGURE_ARGS+=	SHTK_SHELL="${SH}"
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.shtk
-PKG_SUPPORTED_OPTIONS=	tests
-PKG_SUGGESTED_OPTIONS=	tests
-
-.include "../../mk/bsd.options.mk"
-
-.if $(PKG_OPTIONS:Mtests)
-.  include "../../devel/atf/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-atf=yes
-PLIST_SUBST+=		TESTS=
-.else
-CONFIGURE_ARGS+=	--with-atf=no
-PLIST_SUBST+=		TESTS=@comment
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/shtk/PLIST b/devel/shtk/PLIST
index dc3aed2c337..fde6f4fc7a5 100644
--- a/devel/shtk/PLIST
+++ b/devel/shtk/PLIST
@@ -1,7 +1,61 @@
-@comment $NetBSD: PLIST,v 1.3 2014/08/14 13:48:21 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/11/17 19:55:53 jmmv Exp $
 bin/shtk
 lib/pkgconfig/shtk.pc
 man/man1/shtk.1
+man/man3/shtk.3
+man/man3/shtk_bool.3
+man/man3/shtk_bool_check.3
+man/man3/shtk_cleanup.3
+man/man3/shtk_cleanup_register.3
+man/man3/shtk_cli.3
+man/man3/shtk_cli_dirname.3
+man/man3/shtk_cli_error.3
+man/man3/shtk_cli_info.3
+man/man3/shtk_cli_progname.3
+man/man3/shtk_cli_usage_error.3
+man/man3/shtk_cli_warning.3
+man/man3/shtk_config.3
+man/man3/shtk_config_get.3
+man/man3/shtk_config_get_bool.3
+man/man3/shtk_config_get_default.3
+man/man3/shtk_config_has.3
+man/man3/shtk_config_include.3
+man/man3/shtk_config_init.3
+man/man3/shtk_config_load.3
+man/man3/shtk_config_override.3
+man/man3/shtk_config_run_hook.3
+man/man3/shtk_config_set.3
+man/man3/shtk_config_unset.3
+man/man3/shtk_cvs.3
+man/man3/shtk_cvs_checkout.3
+man/man3/shtk_cvs_fetch.3
+man/man3/shtk_cvs_update.3
+man/man3/shtk_import.3
+man/man3/shtk_list.3
+man/man3/shtk_list_contains.3
+man/man3/shtk_list_filter.3
+man/man3/shtk_process.3
+man/man3/shtk_process_run.3
+man/man3/shtk_unittest.3
+man/man3/shtk_unittest_add_fixture.3
+man/man3/shtk_unittest_add_test.3
+man/man3/shtk_unittest_assert_command.3
+man/man3/shtk_unittest_assert_equal.3
+man/man3/shtk_unittest_assert_file.3
+man/man3/shtk_unittest_assert_not_equal.3
+man/man3/shtk_unittest_delayed_fail.3
+man/man3/shtk_unittest_expect_command.3
+man/man3/shtk_unittest_expect_equal.3
+man/man3/shtk_unittest_expect_file.3
+man/man3/shtk_unittest_expect_not_equal.3
+man/man3/shtk_unittest_fail.3
+man/man3/shtk_unittest_main.3
+man/man3/shtk_unittest_set_expected_failure.3
+man/man3/shtk_unittest_skip.3
+man/man3/shtk_version.3
+man/man3/shtk_version_at_least.3
+man/man3/shtk_version_at_most.3
+man/man3/shtk_version_is.3
 share/aclocal/shtk.m4
 share/doc/shtk/AUTHORS
 share/doc/shtk/COPYING
@@ -16,13 +70,25 @@ share/shtk/config.subr
 share/shtk/cvs.subr
 share/shtk/list.subr
 share/shtk/process.subr
-${TESTS}tests/shtk/Kyuafile
-${TESTS}tests/shtk/base_test
-${TESTS}tests/shtk/bool_test
-${TESTS}tests/shtk/cleanup_test
-${TESTS}tests/shtk/cli_test
-${TESTS}tests/shtk/config_test
-${TESTS}tests/shtk/cvs_test
-${TESTS}tests/shtk/list_test
-${TESTS}tests/shtk/process_test
-${TESTS}tests/shtk/shtk_test
+share/shtk/unittest.subr
+share/shtk/unittest/commands.subr
+share/shtk/unittest/files.subr
+share/shtk/unittest/operators.subr
+share/shtk/version.subr
+tests/shtk/Kyuafile
+tests/shtk/base_test
+tests/shtk/bool_test
+tests/shtk/cleanup_test
+tests/shtk/cli_test
+tests/shtk/config_test
+tests/shtk/cvs_test
+tests/shtk/list_test
+tests/shtk/process_test
+tests/shtk/shtk_test
+tests/shtk/unittest/Kyuafile
+tests/shtk/unittest/commands_test
+tests/shtk/unittest/files_test
+tests/shtk/unittest/operators_test
+tests/shtk/unittest_inttest
+tests/shtk/unittest_test
+tests/shtk/version_test
diff --git a/devel/shtk/distinfo b/devel/shtk/distinfo
index 343cb6167f9..bcdca9f5c1f 100644
--- a/devel/shtk/distinfo
+++ b/devel/shtk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2014/08/14 13:48:21 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2014/11/17 19:55:54 jmmv Exp $
 
-SHA1 (shtk-1.4.tar.gz) = 59f4937d0e0095f9c10c3b3e02f7b67b111f6912
-RMD160 (shtk-1.4.tar.gz) = b954c57879dd451509faaccd7e8e5b2616d5253c
-Size (shtk-1.4.tar.gz) = 79127 bytes
+SHA1 (shtk-1.6.tar.gz) = aa5d1f1290784b3d95a8a2d2e430f2be20d4bae0
+RMD160 (shtk-1.6.tar.gz) = 8089a82463c4e2e502c5252e6db8907ed98b0c11
+Size (shtk-1.6.tar.gz) = 109423 bytes