devel/shtk: Update version 1.6=>1.7

- Moved man to share/man
- Adopt port as commit bit of jmmv has been safekept

Changelog: https://github.com/jmmv/shtk/releases/tag/shtk-1.7

Approved by:    portmgr (blanket)

3 files changed, 98 insertions, 91 deletions

diff --git a/devel/shtk/Makefile b/devel/shtk/Makefile
index cbd4d8114c16..99436a45fa15 100644
--- a/devel/shtk/Makefile
+++ b/devel/shtk/Makefile
@@ -1,35 +1,28 @@
 PORTNAME=	shtk
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \
-		LOCAL/jmmv
+MASTER_SITES=	https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
 
-MAINTAINER=	jmmv@FreeBSD.org
+MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Application toolkit for POSIX-compliant shell scripts
 WWW=		https://github.com/jmmv/shtk/
 
 LICENSE=	BSD3CLAUSE
 
+USES=	pathfix
+
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS TEST
 OPTIONS_DEFAULT=TEST
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-MAKE_FLAGS+=	pkgconfigdir=${PREFIX}/libdata/pkgconfig
-.if empty(PORT_OPTIONS:MDOCS)
-MAKE_FLAGS+=	doc_DATA=
-.endif
-.if empty(PORT_OPTIONS:MTEST)
-PLIST_SUB+=	TEST="@comment "
-.else
-PLIST_SUB+=	TEST=
-.endif
+DOCS_VARS_OFF=	MAKE_FLAGS+=doc_DATA=
 
-post-install:
-.if empty(PORT_OPTIONS:MTEST)
+post-install-TEST-off:
 	@${RM} -r ${STAGEDIR}${PREFIX}/tests
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/shtk/distinfo b/devel/shtk/distinfo
index c67f49ff3335..f46e3101dace 100644
--- a/devel/shtk/distinfo
+++ b/devel/shtk/distinfo
@@ -1,2 +1,3 @@
-SHA256 (shtk-1.6.tar.gz) = 2a3892ce6c624ae5d7a1d96b014fcff0ee6920a3f76ac0ab0b7d4ff16c7a7d0f
-SIZE (shtk-1.6.tar.gz) = 109423
+TIMESTAMP = 1708698591
+SHA256 (shtk-1.7.tar.gz) = 9386b7dbf1a28361eaf56dd1712385abdbdf3a02f03e17ccbf5579bf22695e27
+SIZE (shtk-1.7.tar.gz) = 118956
diff --git a/devel/shtk/pkg-plist b/devel/shtk/pkg-plist
index 983a0c00cd4f..90bd2d758d7c 100644
--- a/devel/shtk/pkg-plist
+++ b/devel/shtk/pkg-plist
@@ -1,79 +1,90 @@
 bin/shtk
 libdata/pkgconfig/shtk.pc
-man/man1/shtk.1.gz
-man/man3/shtk.3.gz
-man/man3/shtk_bool.3.gz
-man/man3/shtk_bool_check.3.gz
-man/man3/shtk_cleanup.3.gz
-man/man3/shtk_cleanup_register.3.gz
-man/man3/shtk_cli.3.gz
-man/man3/shtk_cli_dirname.3.gz
-man/man3/shtk_cli_error.3.gz
-man/man3/shtk_cli_info.3.gz
-man/man3/shtk_cli_progname.3.gz
-man/man3/shtk_cli_usage_error.3.gz
-man/man3/shtk_cli_warning.3.gz
-man/man3/shtk_config.3.gz
-man/man3/shtk_config_get.3.gz
-man/man3/shtk_config_get_bool.3.gz
-man/man3/shtk_config_get_default.3.gz
-man/man3/shtk_config_has.3.gz
-man/man3/shtk_config_include.3.gz
-man/man3/shtk_config_init.3.gz
-man/man3/shtk_config_load.3.gz
-man/man3/shtk_config_override.3.gz
-man/man3/shtk_config_run_hook.3.gz
-man/man3/shtk_config_set.3.gz
-man/man3/shtk_config_unset.3.gz
-man/man3/shtk_cvs.3.gz
-man/man3/shtk_cvs_checkout.3.gz
-man/man3/shtk_cvs_fetch.3.gz
-man/man3/shtk_cvs_update.3.gz
-man/man3/shtk_import.3.gz
-man/man3/shtk_list.3.gz
-man/man3/shtk_list_contains.3.gz
-man/man3/shtk_list_filter.3.gz
-man/man3/shtk_process.3.gz
-man/man3/shtk_process_run.3.gz
-man/man3/shtk_unittest.3.gz
-man/man3/shtk_unittest_add_fixture.3.gz
-man/man3/shtk_unittest_add_test.3.gz
-man/man3/shtk_unittest_assert_command.3.gz
-man/man3/shtk_unittest_assert_equal.3.gz
-man/man3/shtk_unittest_assert_file.3.gz
-man/man3/shtk_unittest_assert_not_equal.3.gz
-man/man3/shtk_unittest_delayed_fail.3.gz
-man/man3/shtk_unittest_expect_command.3.gz
-man/man3/shtk_unittest_expect_equal.3.gz
-man/man3/shtk_unittest_expect_file.3.gz
-man/man3/shtk_unittest_expect_not_equal.3.gz
-man/man3/shtk_unittest_fail.3.gz
-man/man3/shtk_unittest_main.3.gz
-man/man3/shtk_unittest_set_expected_failure.3.gz
-man/man3/shtk_unittest_skip.3.gz
-man/man3/shtk_version.3.gz
-man/man3/shtk_version_at_least.3.gz
-man/man3/shtk_version_at_most.3.gz
-man/man3/shtk_version_is.3.gz
 share/aclocal/shtk.m4
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-share/shtk/base.subr
-share/shtk/bool.subr
-share/shtk/bootstrap.subr
-share/shtk/cleanup.subr
-share/shtk/cli.subr
-share/shtk/config.subr
-share/shtk/cvs.subr
-share/shtk/list.subr
-share/shtk/process.subr
-share/shtk/unittest.subr
-share/shtk/unittest/commands.subr
-share/shtk/unittest/files.subr
-share/shtk/unittest/operators.subr
-share/shtk/version.subr
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+share/man/man1/shtk.1.gz
+share/man/man3/shtk.3.gz
+share/man/man3/shtk_abort.3.gz
+share/man/man3/shtk_bool.3.gz
+share/man/man3/shtk_bool_check.3.gz
+share/man/man3/shtk_cleanup.3.gz
+share/man/man3/shtk_cleanup_register.3.gz
+share/man/man3/shtk_cli.3.gz
+share/man/man3/shtk_cli_debug.3.gz
+share/man/man3/shtk_cli_dirname.3.gz
+share/man/man3/shtk_cli_error.3.gz
+share/man/man3/shtk_cli_info.3.gz
+share/man/man3/shtk_cli_log_level.3.gz
+share/man/man3/shtk_cli_progname.3.gz
+share/man/man3/shtk_cli_set_log_level.3.gz
+share/man/man3/shtk_cli_usage_error.3.gz
+share/man/man3/shtk_cli_warning.3.gz
+share/man/man3/shtk_config.3.gz
+share/man/man3/shtk_config_get.3.gz
+share/man/man3/shtk_config_get_bool.3.gz
+share/man/man3/shtk_config_get_default.3.gz
+share/man/man3/shtk_config_has.3.gz
+share/man/man3/shtk_config_include.3.gz
+share/man/man3/shtk_config_init.3.gz
+share/man/man3/shtk_config_load.3.gz
+share/man/man3/shtk_config_override.3.gz
+share/man/man3/shtk_config_run_hook.3.gz
+share/man/man3/shtk_config_set.3.gz
+share/man/man3/shtk_config_unset.3.gz
+share/man/man3/shtk_cvs.3.gz
+share/man/man3/shtk_cvs_checkout.3.gz
+share/man/man3/shtk_cvs_fetch.3.gz
+share/man/man3/shtk_cvs_update.3.gz
+share/man/man3/shtk_fs.3.gz
+share/man/man3/shtk_fs_join_paths.3.gz
+share/man/man3/shtk_fs_normalize_path.3.gz
+share/man/man3/shtk_hw.3.gz
+share/man/man3/shtk_hw_ncpus.3.gz
+share/man/man3/shtk_import.3.gz
+share/man/man3/shtk_list.3.gz
+share/man/man3/shtk_list_contains.3.gz
+share/man/man3/shtk_list_filter.3.gz
+share/man/man3/shtk_process.3.gz
+share/man/man3/shtk_process_run.3.gz
+share/man/man3/shtk_unittest.3.gz
+share/man/man3/shtk_unittest_add_fixture.3.gz
+share/man/man3/shtk_unittest_add_test.3.gz
+share/man/man3/shtk_unittest_assert_command.3.gz
+share/man/man3/shtk_unittest_assert_equal.3.gz
+share/man/man3/shtk_unittest_assert_file.3.gz
+share/man/man3/shtk_unittest_assert_not_equal.3.gz
+share/man/man3/shtk_unittest_delayed_fail.3.gz
+share/man/man3/shtk_unittest_expect_command.3.gz
+share/man/man3/shtk_unittest_expect_equal.3.gz
+share/man/man3/shtk_unittest_expect_file.3.gz
+share/man/man3/shtk_unittest_expect_not_equal.3.gz
+share/man/man3/shtk_unittest_fail.3.gz
+share/man/man3/shtk_unittest_main.3.gz
+share/man/man3/shtk_unittest_set_expected_failure.3.gz
+share/man/man3/shtk_unittest_skip.3.gz
+share/man/man3/shtk_version.3.gz
+share/man/man3/shtk_version_at_least.3.gz
+share/man/man3/shtk_version_at_most.3.gz
+share/man/man3/shtk_version_is.3.gz
+%%DATADIR%%/base.subr
+%%DATADIR%%/bool.subr
+%%DATADIR%%/bootstrap.subr
+%%DATADIR%%/cleanup.subr
+%%DATADIR%%/cli.subr
+%%DATADIR%%/config.subr
+%%DATADIR%%/cvs.subr
+%%DATADIR%%/fs.subr
+%%DATADIR%%/hw.subr
+%%DATADIR%%/list.subr
+%%DATADIR%%/process.subr
+%%DATADIR%%/unittest.subr
+%%DATADIR%%/unittest/commands.subr
+%%DATADIR%%/unittest/files.subr
+%%DATADIR%%/unittest/operators.subr
+%%DATADIR%%/version.subr
 %%TEST%%tests/shtk/Kyuafile
 %%TEST%%tests/shtk/base_test
 %%TEST%%tests/shtk/bool_test
@@ -81,6 +92,8 @@ share/shtk/version.subr
 %%TEST%%tests/shtk/cli_test
 %%TEST%%tests/shtk/config_test
 %%TEST%%tests/shtk/cvs_test
+%%TEST%%tests/shtk/fs_test
+%%TEST%%tests/shtk/hw_test
 %%TEST%%tests/shtk/list_test
 %%TEST%%tests/shtk/process_test
 %%TEST%%tests/shtk/shtk_test