svn commit: r344497 - in head/devel: . kyua kyua-cli kyua/files

Sat Feb 15 23:45:23 UTC 2014

Author: jmmv (src committer)
Date: Sat Feb 15 23:45:22 2014
New Revision: 344497
URL: http://svnweb.freebsd.org/changeset/ports/344497
QAT: https://qat.redports.org/buildarchive/r344497/

Log:
  Turn devel/kyua into a meta-port and add devel/kyua-cli.
  
  The existing devel/kyua package should have been named devel/kyua-cli to
  match the upstream structure.  Do the rename now and make devel/kyua be
  a meta-port that depends on all kyua packages.
  
  Because there is no version number to represent Kyua as a whole (that's
  a problem I have to resolve upstream somehow), bump the epoch of
  devel/kyua and use today's date as the version.
  
  No entry should be necessary in MOVED because upgrading to the new
  meta-port should do the right thing.
  
  Approved by:	bdrewery

Added:
  head/devel/kyua-cli/
     - copied from r344496, head/devel/kyua/
Deleted:
  head/devel/kyua/distinfo
  head/devel/kyua/files/
Modified:
  head/devel/Makefile
  head/devel/kyua-cli/Makefile
  head/devel/kyua/Makefile
  head/devel/kyua/pkg-plist

Modified: head/devel/Makefile
==============================================================================

--- head/devel/Makefile	Sat Feb 15 23:31:42 2014	(r344496)
+++ head/devel/Makefile	Sat Feb 15 23:45:22 2014	(r344497)
@@ -911,6 +911,7 @@
     SUBDIR += kyra
     SUBDIR += kyua
     SUBDIR += kyua-atf-compat
+    SUBDIR += kyua-cli
     SUBDIR += kyua-testers
     SUBDIR += lasi
     SUBDIR += lcov

Modified: head/devel/kyua-cli/Makefile
==============================================================================
--- head/devel/kyua/Makefile	Sat Feb 15 23:31:42 2014	(r344496)
+++ head/devel/kyua-cli/Makefile	Sat Feb 15 23:45:22 2014	(r344497)
@@ -1,13 +1,11 @@
 # Created by: Alan Somers <asomers at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	kyua
+PORTNAME=	kyua-cli
 PORTVERSION=	0.8
-PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PROJECTHOST=	kyua
-DISTNAME=	kyua-cli-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	jmmv at FreeBSD.org
 COMMENT=	Kyua (automated testing framework) - Command line interface

Modified: head/devel/kyua/Makefile
==============================================================================
--- head/devel/kyua/Makefile	Sat Feb 15 23:31:42 2014	(r344496)
+++ head/devel/kyua/Makefile	Sat Feb 15 23:45:22 2014	(r344497)
@@ -1,55 +1,37 @@
-# Created by: Alan Somers <asomers at FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kyua
-PORTVERSION=	0.8
-PORTREVISION=	2
+PORTVERSION=	20140215
+PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-PROJECTHOST=	kyua
-DISTNAME=	kyua-cli-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	jmmv at FreeBSD.org
-COMMENT=	Kyua (automated testing framework) - Command line interface
+COMMENT=	Kyua (automated testing framework) - Meta-port
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	liblutok.so.3:${PORTSDIR}/devel/lutok
-LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
-BUILD_DEPENDS=	kyua-testers>=0.2:${PORTSDIR}/devel/kyua-testers
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+RUN_DEPENDS+=	${LOCALBASE}/bin/atf2kyua:${PORTSDIR}/devel/kyua-atf-compat
+RUN_DEPENDS+=	${LOCALBASE}/bin/kyua:${PORTSDIR}/devel/kyua-cli
+RUN_DEPENDS+=	${LOCALBASE}/libexec/kyua-atf-tester:${PORTSDIR}/devel/kyua-testers
 
-GNU_CONFIGURE=	yes
-USES=		pkgconfig
+NO_BUILD=	yes
+NO_MTREE=	yes
 
-TESTS_USER=	tests
-USERS=		${TESTS_USER}
-SUB_FILES=	kyua.conf
-SUB_LIST=	TESTS_USER=${TESTS_USER}
+do-install:	# empty
 
-OPTIONS_DEFINE=	DOCS EXAMPLES TEST
+pre-everything::
+	@${ECHO_MSG} "This is a meta-port, meaning that it just depends on its subparts of the port."
+	@${ECHO_MSG} "It won't build and install all the parts until you have typed make install"
 
-OPTIONS_SUB=		yes
-TEST_CONFIGURE_WITH=	atf
+.include <bsd.port.pre.mk>
 
-.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=
+.if make(package)
+.if !defined(DEPENDS_TARGET:Mpackage) || empty(DEPENDS_TARGET:Mpackage)
+DEPENDS_TARGET="package"
 .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/
-	${INSTALL_DATA} ${WRKSRC}/examples/Kyuafile.top \
-		${STAGEDIR}${PREFIX}/tests/Kyuafile
-
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/kyua/pkg-plist
==============================================================================
--- head/devel/kyua/pkg-plist	Sat Feb 15 23:31:42 2014	(r344496)
+++ head/devel/kyua/pkg-plist	Sat Feb 15 23:45:22 2014	(r344497)
@@ -1,187 +1 @@
-bin/kyua
-etc/kyua/kyua.conf
-man/man1/kyua-about.1.gz
-man/man1/kyua-config.1.gz
-man/man1/kyua-db-exec.1.gz
-man/man1/kyua-db-migrate.1.gz
-man/man1/kyua-debug.1.gz
-man/man1/kyua-help.1.gz
-man/man1/kyua-list.1.gz
-man/man1/kyua-report-html.1.gz
-man/man1/kyua-report.1.gz
-man/man1/kyua-test.1.gz
-man/man1/kyua.1.gz
-man/man5/kyua.conf.5.gz
-man/man5/kyuafile.5.gz
-man/man7/kyua-build-root.7.gz
-man/man7/kyua-test-filters.7.gz
-%%DATADIR%%/misc/context.html
-%%DATADIR%%/misc/index.html
-%%DATADIR%%/misc/report.css
-%%DATADIR%%/misc/test_result.html
-%%DATADIR%%/store/migrate_v1_v2.sql
-%%DATADIR%%/store/schema_v2.sql
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Kyuafile.top
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/kyua.conf
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%TEST%%tests/Kyuafile
-%%TEST%%tests/kyua-cli/Kyuafile
-%%TEST%%tests/kyua-cli/bootstrap/Kyuafile
-%%TEST%%tests/kyua-cli/bootstrap/atf_helpers
-%%TEST%%tests/kyua-cli/bootstrap/plain_helpers
-%%TEST%%tests/kyua-cli/bootstrap/testsuite
-%%TEST%%tests/kyua-cli/cli/Kyuafile
-%%TEST%%tests/kyua-cli/cli/cmd_about_test
-%%TEST%%tests/kyua-cli/cli/cmd_config_test
-%%TEST%%tests/kyua-cli/cli/cmd_db_exec_test
-%%TEST%%tests/kyua-cli/cli/cmd_db_migrate_test
-%%TEST%%tests/kyua-cli/cli/cmd_debug_test
-%%TEST%%tests/kyua-cli/cli/cmd_help_test
-%%TEST%%tests/kyua-cli/cli/cmd_list_test
-%%TEST%%tests/kyua-cli/cli/cmd_report_html_test
-%%TEST%%tests/kyua-cli/cli/cmd_report_test
-%%TEST%%tests/kyua-cli/cli/cmd_test_test
-%%TEST%%tests/kyua-cli/cli/common_test
-%%TEST%%tests/kyua-cli/cli/config_test
-%%TEST%%tests/kyua-cli/cli/main_test
-%%TEST%%tests/kyua-cli/engine/Kyuafile
-%%TEST%%tests/kyua-cli/engine/action_test
-%%TEST%%tests/kyua-cli/engine/config_test
-%%TEST%%tests/kyua-cli/engine/context_test
-%%TEST%%tests/kyua-cli/engine/drivers/Kyuafile
-%%TEST%%tests/kyua-cli/engine/drivers/debug_test_test
-%%TEST%%tests/kyua-cli/engine/drivers/list_tests_helpers
-%%TEST%%tests/kyua-cli/engine/drivers/list_tests_test
-%%TEST%%tests/kyua-cli/engine/drivers/run_tests_test
-%%TEST%%tests/kyua-cli/engine/drivers/scan_action_test
-%%TEST%%tests/kyua-cli/engine/exceptions_test
-%%TEST%%tests/kyua-cli/engine/filters_test
-%%TEST%%tests/kyua-cli/engine/kyuafile_test
-%%TEST%%tests/kyua-cli/engine/metadata_test
-%%TEST%%tests/kyua-cli/engine/test_case_atf_helpers
-%%TEST%%tests/kyua-cli/engine/test_case_plain_helpers
-%%TEST%%tests/kyua-cli/engine/test_case_test
-%%TEST%%tests/kyua-cli/engine/test_program_test
-%%TEST%%tests/kyua-cli/engine/test_result_test
-%%TEST%%tests/kyua-cli/engine/testers_test
-%%TEST%%tests/kyua-cli/examples/Kyuafile
-%%TEST%%tests/kyua-cli/examples/syntax_test
-%%TEST%%tests/kyua-cli/integration/Kyuafile
-%%TEST%%tests/kyua-cli/integration/cmd_about_test
-%%TEST%%tests/kyua-cli/integration/cmd_config_test
-%%TEST%%tests/kyua-cli/integration/cmd_db_exec_test
-%%TEST%%tests/kyua-cli/integration/cmd_db_migrate_test
-%%TEST%%tests/kyua-cli/integration/cmd_debug_test
-%%TEST%%tests/kyua-cli/integration/cmd_help_test
-%%TEST%%tests/kyua-cli/integration/cmd_list_test
-%%TEST%%tests/kyua-cli/integration/cmd_report_html_test
-%%TEST%%tests/kyua-cli/integration/cmd_report_test
-%%TEST%%tests/kyua-cli/integration/cmd_test_test
-%%TEST%%tests/kyua-cli/integration/global_test
-%%TEST%%tests/kyua-cli/integration/helpers/bad_test_program
-%%TEST%%tests/kyua-cli/integration/helpers/bogus_test_cases
-%%TEST%%tests/kyua-cli/integration/helpers/config
-%%TEST%%tests/kyua-cli/integration/helpers/expect_all_pass
-%%TEST%%tests/kyua-cli/integration/helpers/expect_some_fail
-%%TEST%%tests/kyua-cli/integration/helpers/interrupts
-%%TEST%%tests/kyua-cli/integration/helpers/metadata
-%%TEST%%tests/kyua-cli/integration/helpers/simple_all_pass
-%%TEST%%tests/kyua-cli/integration/helpers/simple_some_fail
-%%TEST%%tests/kyua-cli/store/Kyuafile
-%%TEST%%tests/kyua-cli/store/backend_test
-%%TEST%%tests/kyua-cli/store/dbtypes_test
-%%TEST%%tests/kyua-cli/store/exceptions_test
-%%TEST%%tests/kyua-cli/store/metadata_test
-%%TEST%%tests/kyua-cli/store/schema_inttest
-%%TEST%%tests/kyua-cli/store/schema_v1.sql
-%%TEST%%tests/kyua-cli/store/testdata_v1.sql
-%%TEST%%tests/kyua-cli/store/testdata_v2.sql
-%%TEST%%tests/kyua-cli/store/transaction_test
-%%TEST%%tests/kyua-cli/utils/Kyuafile
-%%TEST%%tests/kyua-cli/utils/auto_array_test
-%%TEST%%tests/kyua-cli/utils/cmdline/Kyuafile
-%%TEST%%tests/kyua-cli/utils/cmdline/base_command_test
-%%TEST%%tests/kyua-cli/utils/cmdline/commands_map_test
-%%TEST%%tests/kyua-cli/utils/cmdline/exceptions_test
-%%TEST%%tests/kyua-cli/utils/cmdline/globals_test
-%%TEST%%tests/kyua-cli/utils/cmdline/options_test
-%%TEST%%tests/kyua-cli/utils/cmdline/parser_test
-%%TEST%%tests/kyua-cli/utils/cmdline/ui_test
-%%TEST%%tests/kyua-cli/utils/config/Kyuafile
-%%TEST%%tests/kyua-cli/utils/config/exceptions_test
-%%TEST%%tests/kyua-cli/utils/config/keys_test
-%%TEST%%tests/kyua-cli/utils/config/lua_module_test
-%%TEST%%tests/kyua-cli/utils/config/nodes_test
-%%TEST%%tests/kyua-cli/utils/config/parser_test
-%%TEST%%tests/kyua-cli/utils/config/tree_test
-%%TEST%%tests/kyua-cli/utils/datetime_test
-%%TEST%%tests/kyua-cli/utils/env_test
-%%TEST%%tests/kyua-cli/utils/format/Kyuafile
-%%TEST%%tests/kyua-cli/utils/format/exceptions_test
-%%TEST%%tests/kyua-cli/utils/format/formatter_test
-%%TEST%%tests/kyua-cli/utils/fs/Kyuafile
-%%TEST%%tests/kyua-cli/utils/fs/auto_cleaners_test
-%%TEST%%tests/kyua-cli/utils/fs/exceptions_test
-%%TEST%%tests/kyua-cli/utils/fs/lua_module_test
-%%TEST%%tests/kyua-cli/utils/fs/operations_test
-%%TEST%%tests/kyua-cli/utils/fs/path_test
-%%TEST%%tests/kyua-cli/utils/logging/Kyuafile
-%%TEST%%tests/kyua-cli/utils/logging/macros_test
-%%TEST%%tests/kyua-cli/utils/logging/operations_test
-%%TEST%%tests/kyua-cli/utils/memory_test
-%%TEST%%tests/kyua-cli/utils/optional_test
-%%TEST%%tests/kyua-cli/utils/passwd_test
-%%TEST%%tests/kyua-cli/utils/process/Kyuafile
-%%TEST%%tests/kyua-cli/utils/process/child_test
-%%TEST%%tests/kyua-cli/utils/process/exceptions_test
-%%TEST%%tests/kyua-cli/utils/process/fdstream_test
-%%TEST%%tests/kyua-cli/utils/process/helpers
-%%TEST%%tests/kyua-cli/utils/process/status_test
-%%TEST%%tests/kyua-cli/utils/process/systembuf_test
-%%TEST%%tests/kyua-cli/utils/sanity_test
-%%TEST%%tests/kyua-cli/utils/signals/Kyuafile
-%%TEST%%tests/kyua-cli/utils/signals/exceptions_test
-%%TEST%%tests/kyua-cli/utils/signals/interrupts_test
-%%TEST%%tests/kyua-cli/utils/signals/misc_test
-%%TEST%%tests/kyua-cli/utils/signals/programmer_test
-%%TEST%%tests/kyua-cli/utils/sqlite/Kyuafile
-%%TEST%%tests/kyua-cli/utils/sqlite/c_gate_test
-%%TEST%%tests/kyua-cli/utils/sqlite/database_test
-%%TEST%%tests/kyua-cli/utils/sqlite/exceptions_test
-%%TEST%%tests/kyua-cli/utils/sqlite/statement_test
-%%TEST%%tests/kyua-cli/utils/sqlite/transaction_test
-%%TEST%%tests/kyua-cli/utils/stream_test
-%%TEST%%tests/kyua-cli/utils/text/Kyuafile
-%%TEST%%tests/kyua-cli/utils/text/exceptions_test
-%%TEST%%tests/kyua-cli/utils/text/operations_test
-%%TEST%%tests/kyua-cli/utils/text/table_test
-%%TEST%%tests/kyua-cli/utils/text/templates_test
-%%TEST%%tests/kyua-cli/utils/units_test
-%%TEST%%@dirrm tests/kyua-cli/utils/text
-%%TEST%%@dirrm tests/kyua-cli/utils/sqlite
-%%TEST%%@dirrm tests/kyua-cli/utils/signals
-%%TEST%%@dirrm tests/kyua-cli/utils/process
-%%TEST%%@dirrm tests/kyua-cli/utils/logging
-%%TEST%%@dirrm tests/kyua-cli/utils/fs
-%%TEST%%@dirrm tests/kyua-cli/utils/format
-%%TEST%%@dirrm tests/kyua-cli/utils/config
-%%TEST%%@dirrm tests/kyua-cli/utils/cmdline
-%%TEST%%@dirrm tests/kyua-cli/utils
-%%TEST%%@dirrm tests/kyua-cli/store
-%%TEST%%@dirrm tests/kyua-cli/integration/helpers
-%%TEST%%@dirrm tests/kyua-cli/integration
-%%TEST%%@dirrm tests/kyua-cli/examples
-%%TEST%%@dirrm tests/kyua-cli/engine/drivers
-%%TEST%%@dirrm tests/kyua-cli/engine
-%%TEST%%@dirrm tests/kyua-cli/cli
-%%TEST%%@dirrm tests/kyua-cli/bootstrap
-%%TEST%%@dirrm tests/kyua-cli
- at dirrm %%DATADIR%%/store
- at dirrm %%DATADIR%%/misc
- at dirrm %%DATADIR%%
- at dirrm etc/kyua
+ at comment This packing list left intentionally empty
