From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 31 00:20:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E9DBA6B4 for ; Wed, 31 Oct 2012 00:20:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id BC2378FC15 for ; Wed, 31 Oct 2012 00:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q9V0K0Na051178 for ; Wed, 31 Oct 2012 00:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q9V0K008051177; Wed, 31 Oct 2012 00:20:00 GMT (envelope-from gnats) Resent-Date: Wed, 31 Oct 2012 00:20:00 GMT Resent-Message-Id: <201210310020.q9V0K008051177@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Roman Naumann Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3696B5E2 for ; Wed, 31 Oct 2012 00:16:02 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 128B68FC0C for ; Wed, 31 Oct 2012 00:16:02 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q9V0G1CH097446 for ; Wed, 31 Oct 2012 00:16:01 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id q9V0G1VX097445; Wed, 31 Oct 2012 00:16:01 GMT (envelope-from nobody) Message-Id: <201210310016.q9V0G1VX097445@red.freebsd.org> Date: Wed, 31 Oct 2012 00:16:01 GMT From: Roman Naumann To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/173224: [patch] add option to devel/atf to allow building some tools X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Oct 2012 00:20:01 -0000 >Number: 173224 >Category: ports >Synopsis: [patch] add option to devel/atf to allow building some tools >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Oct 31 00:20:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Roman Naumann >Release: 9.0 >Organization: >Environment: >Description: Recently (yesterday) the Advanced Testing Framework port was added (see ports/173197 ). As some may have noticed, there are some tools missing, though. Upstream (http://code.google.com/p/kyua/wiki/ATF#Status_of_the_ATF_project) explains that ATF is to be steadily replaced by a rewrite called Kyua. The missing tools are already deprecated in ATF because a Kyua replacement is available. The attached patch adds an option the the port to build these tools. To my knowledge, the ATF import into 10-CURRENT imported these the deprecated tools too. Since they are default on 10-CURRENT, they are also enabled by default in the port with this patch. I bumped the PORTREVISION so that the package gets rebuild (defaults changed after all). Thanks to bdrewery@ who wrote most of this patch. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: Makefile =================================================================== --- Makefile (revision 306677) +++ Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= atf PORTVERSION= 0.16 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE @@ -24,12 +25,29 @@ GNU_CONFIGURE= yes +OPTIONS_DEFINE= TOOLS +OPTIONS_DEFAULT=TOOLS +TOOLS_DESC= Enable deprecated tools + .include .if ${OSVERSION} >= 1000021 IGNORE= is already in the base system .endif +.if ${PORT_OPTIONS:MTOOLS} +CONFIGURE_ARGS+= --enable-tools +PLIST_SUB+= TOOLS="" +MAN1+= atf-config.1 \ + atf-report.1 \ + atf-run.1 \ + atf-version.1 +MAN5+= atf-formats.5 +MAN7+= atf.7 +.else +PLIST_SUB+= TOOLS="@comment " +.endif + post-patch: .if empty(PORT_OPTIONS:MDOCS) @${REINPLACE_CMD} -e 's|install-docDATA[^:]||' ${WRKSRC}/Makefile.in Index: pkg-plist =================================================================== --- pkg-plist (revision 306677) +++ pkg-plist (working copy) @@ -1,4 +1,8 @@ +%%TOOLS%%bin/atf-config +%%TOOLS%%bin/atf-report +%%TOOLS%%bin/atf-run bin/atf-sh +%%TOOLS%%bin/atf-version include/atf-c++.hpp include/atf-c++/build.hpp include/atf-c++/check.hpp @@ -33,11 +37,18 @@ share/aclocal/atf-c.m4 share/aclocal/atf-common.m4 share/aclocal/atf-sh.m4 +%%TOOLS%%%%DATADIR%%/atf-run.hooks %%DATADIR%%/libatf-sh.subr %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +%%TOOLS%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/atf-run.hooks +%%TOOLS%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/common.conf +%%TOOLS%%%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests-results.css +%%TOOLS%%share/xml/atf/tests-results.dtd +%%TOOLS%%share/xsl/atf/tests-results.xsl +%%TOOLS%%tests/atf/Atffile tests/atf/Kyuafile tests/atf/atf-c++/Atffile tests/atf/atf-c++/Kyuafile @@ -90,6 +101,33 @@ tests/atf/atf-c/tp_test tests/atf/atf-c/unused_test.c tests/atf/atf-c/utils_test +%%TOOLS%%tests/atf/atf-config/Atffile +%%TOOLS%%tests/atf/atf-config/Kyuafile +%%TOOLS%%tests/atf/atf-config/integration_test +%%TOOLS%%tests/atf/atf-report/Atffile +%%TOOLS%%tests/atf/atf-report/Kyuafile +%%TOOLS%%tests/atf/atf-report/fail_helper +%%TOOLS%%tests/atf/atf-report/integration_test +%%TOOLS%%tests/atf/atf-report/misc_helpers +%%TOOLS%%tests/atf/atf-report/pass_helper +%%TOOLS%%tests/atf/atf-report/reader_test +%%TOOLS%%tests/atf/atf-run/Atffile +%%TOOLS%%tests/atf/atf-run/Kyuafile +%%TOOLS%%tests/atf/atf-run/atffile_test +%%TOOLS%%tests/atf/atf-run/bad_metadata_helper +%%TOOLS%%tests/atf/atf-run/config_test +%%TOOLS%%tests/atf/atf-run/expect_helpers +%%TOOLS%%tests/atf/atf-run/fs_test +%%TOOLS%%tests/atf/atf-run/integration_test +%%TOOLS%%tests/atf/atf-run/io_test +%%TOOLS%%tests/atf/atf-run/misc_helpers +%%TOOLS%%tests/atf/atf-run/pass_helper +%%TOOLS%%tests/atf/atf-run/requirements_test +%%TOOLS%%tests/atf/atf-run/several_tcs_helper +%%TOOLS%%tests/atf/atf-run/signals_test +%%TOOLS%%tests/atf/atf-run/test_program_test +%%TOOLS%%tests/atf/atf-run/user_test +%%TOOLS%%tests/atf/atf-run/zero_tcs_helper tests/atf/atf-sh/Atffile tests/atf/atf-sh/Kyuafile tests/atf/atf-sh/atf-check_test @@ -113,12 +151,19 @@ tests/atf/test-programs/srcdir_test @dirrm tests/atf/test-programs @dirrm tests/atf/atf-sh +%%TOOLS%%@dirrm tests/atf/atf-run +%%TOOLS%%@dirrm tests/atf/atf-report +%%TOOLS%%@dirrm tests/atf/atf-config @dirrm tests/atf/atf-c/detail @dirrm tests/atf/atf-c++/detail @dirrm tests/atf/atf-c++ @dirrm tests/atf/atf-c @dirrm tests/atf @dirrm tests +%%TOOLS%%@dirrm share/xsl/atf +%%TOOLS%%@dirrm share/xsl +%%TOOLS%%@dirrm share/xml/atf +%%TOOLS%%%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%DATADIR%% @dirrm include/atf-c++ >Release-Note: >Audit-Trail: >Unformatted: