Date: Thu, 1 Nov 2012 18:42:59 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r306816 - head/devel/atf Message-ID: <201211011842.qA1Igxio054127@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Nov 1 18:42:59 2012 New Revision: 306816 URL: http://svn.freebsd.org/changeset/ports/306816 Log: - Install tools by default to match the base version PR: ports/173224 Submitted by: Roman Naumann <namor@hemio.de> (maintainer) Feature safe: yes Modified: head/devel/atf/Makefile head/devel/atf/pkg-plist Modified: head/devel/atf/Makefile ============================================================================== --- head/devel/atf/Makefile Thu Nov 1 18:41:15 2012 (r306815) +++ head/devel/atf/Makefile Thu Nov 1 18:42:59 2012 (r306816) @@ -2,6 +2,7 @@ PORTNAME= atf PORTVERSION= 0.16 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE @@ -24,16 +25,37 @@ MAN4= atf-test-case.4 GNU_CONFIGURE= yes +OPTIONS_DEFINE= TOOLS +OPTIONS_DEFAULT=TOOLS +TOOLS_DESC= Enable deprecated tools + .include <bsd.port.pre.mk> .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 .endif +.if empty(PORT_OPTIONS:MEXAMPLES) + @${REINPLACE_CMD} -e 's|install-egDATA[^:]||' \ + -e 's|install-cssDATA[^:]||' ${WRKSRC}/Makefile.in +.endif @${REINPLACE_CMD} -e 's|@atf_pkgconfigdir@|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/Makefile.in Modified: head/devel/atf/pkg-plist ============================================================================== --- head/devel/atf/pkg-plist Thu Nov 1 18:41:15 2012 (r306815) +++ head/devel/atf/pkg-plist Thu Nov 1 18:42:59 2012 (r306816) @@ -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-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/tc_test 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/sh_helpers 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++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211011842.qA1Igxio054127>