From owner-svn-ports-all@FreeBSD.ORG Fri Nov 21 22:41:20 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF94790B; Fri, 21 Nov 2014 22:41:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BB5E2847; Fri, 21 Nov 2014 22:41:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALMfKkZ020142; Fri, 21 Nov 2014 22:41:20 GMT (envelope-from jmmv@FreeBSD.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALMfK0A020133; Fri, 21 Nov 2014 22:41:20 GMT (envelope-from jmmv@FreeBSD.org) Message-Id: <201411212241.sALMfK0A020133@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jmmv set sender to jmmv@FreeBSD.org using -f From: Julio Merino Date: Fri, 21 Nov 2014 22:41:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r373021 - head/devel/shtk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 22:41:21 -0000 Author: jmmv (src committer) Date: Fri Nov 21 22:41:19 2014 New Revision: 373021 URL: https://svnweb.freebsd.org/changeset/ports/373021 QAT: https://qat.redports.org/buildarchive/r373021/ Log: Update devel/shtk to 1.6: Released on 2014-11-17. * Added the unittest module, a framework with which to implement robust test programs purely in shell. This new module supports defining test programs as a collection of standalone test cases or test fixtures; supports assert-syle vs. expect-style checks; and provides advanced checks to simplify the implementation of tests cases for command-line utilities. unittest-based test programs can be trivially plugged into the Kyua testing framework. * Added manual pages for all public API functions. See shtk(3) for an introduction and follow all linked pages for details. All docstrings have been removed from the code in favor of the manual pages. * Added the shtk_config_include function so that configuration files can source other files using relative (or absolute) paths. * Removed 'set -e' calls from shtk and from any generated scripts. It is the user who should be enabling this feature if he chooses to because 'set -e' may have suprising and inconsistent behavior in large scripts (and shtk can be defined as large). Differential Revision: https://reviews.freebsd.org/D1178 Approved by: bapt Modified: head/devel/shtk/Makefile head/devel/shtk/distinfo head/devel/shtk/pkg-plist Modified: head/devel/shtk/Makefile ============================================================================== --- head/devel/shtk/Makefile Fri Nov 21 22:33:00 2014 (r373020) +++ head/devel/shtk/Makefile Fri Nov 21 22:41:19 2014 (r373021) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= shtk -PORTVERSION= 1.5 -PORTREVISION= 2 +PORTVERSION= 1.6 CATEGORIES= devel MASTER_SITES= https://github.com/jmmv/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ \ LOCAL/jmmv @@ -10,18 +9,28 @@ MASTER_SITES= https://github.com/jmmv/${ MAINTAINER= jmmv@freebsd.org COMMENT= Application toolkit for POSIX-compliant shell scripts -LICENSE= BSD +LICENSE= BSD3CLAUSE GNU_CONFIGURE= yes -MAKE_ARGS= pkgconfigdir=${PREFIX}/libdata/pkgconfig +OPTIONS_DEFINE= DOCS TEST +OPTIONS_DEFAULT=TEST -OPTIONS_DEFINE= TEST -OPTIONS_DEFAULT= TEST -OPTIONS_SUB= yes -TEST_CONFIGURE_WITH= atf -TEST_BUILD_DEPENDS= atf>=0.20:${PORTSDIR}/devel/atf -TEST_RUN_DEPENDS= atf>=0.20:${PORTSDIR}/devel/atf -TEST_USES= pkgconfig +.include + +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 + +post-install: +.if empty(PORT_OPTIONS:MTEST) + @${RM} -rf ${STAGEDIR}${PREFIX}/tests +.endif .include Modified: head/devel/shtk/distinfo ============================================================================== --- head/devel/shtk/distinfo Fri Nov 21 22:33:00 2014 (r373020) +++ head/devel/shtk/distinfo Fri Nov 21 22:41:19 2014 (r373021) @@ -1,2 +1,2 @@ -SHA256 (shtk-1.5.tar.gz) = aabd8a8e708a25f10e271b6af88c39d5176afe59f318d44963b8b1fa66f393d8 -SIZE (shtk-1.5.tar.gz) = 84555 +SHA256 (shtk-1.6.tar.gz) = 2a3892ce6c624ae5d7a1d96b014fcff0ee6920a3f76ac0ab0b7d4ff16c7a7d0f +SIZE (shtk-1.6.tar.gz) = 109423 Modified: head/devel/shtk/pkg-plist ============================================================================== --- head/devel/shtk/pkg-plist Fri Nov 21 22:33:00 2014 (r373020) +++ head/devel/shtk/pkg-plist Fri Nov 21 22:41:19 2014 (r373021) @@ -1,11 +1,65 @@ 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 -share/doc/shtk/AUTHORS -share/doc/shtk/COPYING -share/doc/shtk/NEWS -share/doc/shtk/README +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README share/shtk/base.subr share/shtk/bool.subr share/shtk/bootstrap.subr @@ -15,6 +69,10 @@ 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 %%TEST%%tests/shtk/Kyuafile %%TEST%%tests/shtk/base_test @@ -26,4 +84,10 @@ share/shtk/version.subr %%TEST%%tests/shtk/list_test %%TEST%%tests/shtk/process_test %%TEST%%tests/shtk/shtk_test +%%TEST%%tests/shtk/unittest/Kyuafile +%%TEST%%tests/shtk/unittest/commands_test +%%TEST%%tests/shtk/unittest/files_test +%%TEST%%tests/shtk/unittest/operators_test +%%TEST%%tests/shtk/unittest_inttest +%%TEST%%tests/shtk/unittest_test %%TEST%%tests/shtk/version_test