diff options
| -rw-r--r-- | devel/Makefile | 3 | ||||
| -rw-r--r-- | devel/atf-libs/DESCR | 6 | ||||
| -rw-r--r-- | devel/atf-libs/Makefile | 27 | ||||
| -rw-r--r-- | devel/atf-libs/PLIST | 108 | ||||
| -rw-r--r-- | devel/atf-libs/buildlink3.mk | 19 | ||||
| -rw-r--r-- | devel/atf/DESCR | 4 | ||||
| -rw-r--r-- | devel/atf/Makefile | 49 | ||||
| -rw-r--r-- | devel/atf/Makefile.common | 36 | ||||
| -rw-r--r-- | devel/atf/PLIST | 109 | ||||
| -rw-r--r-- | devel/atf/buildlink3.mk | 16 |
10 files changed, 227 insertions, 150 deletions
diff --git a/devel/Makefile b/devel/Makefile index 86dde2245e9..7d0e5ce943e 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1603 2012/06/16 15:59:21 taca Exp $ +# $NetBSD: Makefile,v 1.1604 2012/07/01 15:27:43 jmmv Exp $ # COMMENT= Development utilities @@ -52,6 +52,7 @@ SUBDIR+= at-spi SUBDIR+= at-spi2-atk SUBDIR+= at-spi2-core SUBDIR+= atf +SUBDIR+= atf-libs SUBDIR+= atk SUBDIR+= atkmm SUBDIR+= autoconf diff --git a/devel/atf-libs/DESCR b/devel/atf-libs/DESCR new file mode 100644 index 00000000000..fb4e868765c --- /dev/null +++ b/devel/atf-libs/DESCR @@ -0,0 +1,6 @@ +The atf-libs package provides the development libraries of the Automated +Testing Framework (ATF). These libraries allow developers to write test +programs that can later be run by the ATF tools (in the atf package) or, +preferably, by Kyua (in the kyua-cli package). + +The included libraries are: libatf-c, libatf-c++ and libatf-sh. diff --git a/devel/atf-libs/Makefile b/devel/atf-libs/Makefile new file mode 100644 index 00000000000..7913fa695af --- /dev/null +++ b/devel/atf-libs/Makefile @@ -0,0 +1,27 @@ +# $NetBSD: Makefile,v 1.1 2012/07/01 15:27:43 jmmv Exp $ +# + +.include "../../devel/atf/Makefile.common" +PKGNAME= ${DISTNAME:S/-/-libs-/} + +COMMENT:= ${COMMENT} - Libraries + +post-install: +.for tool in atf-config atf-report atf-run atf-version + rm -f ${DESTDIR}${PREFIX}/bin/${tool} + rm -f ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${tool}.1 + rm -rf ${DESTDIR}${PREFIX}/tests/atf/${tool} +.endfor +.for file in ${PKGMANDIR}/man5/atf-formats.5 \ + ${PKGMANDIR}/man7/atf.7 \ + share/atf/atf-run.hooks \ + share/doc/atf/ \ + share/examples/ \ + share/xml/ \ + share/xsl/ \ + tests/atf/Atffile \ + tests/atf/Kyuafile + rm -rf ${DESTDIR}${PREFIX}/${file} +.endfor + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/atf-libs/PLIST b/devel/atf-libs/PLIST new file mode 100644 index 00000000000..894978d2f36 --- /dev/null +++ b/devel/atf-libs/PLIST @@ -0,0 +1,108 @@ +@comment $NetBSD: PLIST,v 1.1 2012/07/01 15:27:43 jmmv Exp $ +bin/atf-sh +include/atf-c++.hpp +include/atf-c++/build.hpp +include/atf-c++/check.hpp +include/atf-c++/config.hpp +include/atf-c++/macros.hpp +include/atf-c++/tests.hpp +include/atf-c++/utils.hpp +include/atf-c.h +include/atf-c/build.h +include/atf-c/check.h +include/atf-c/config.h +include/atf-c/defs.h +include/atf-c/error.h +include/atf-c/error_fwd.h +include/atf-c/macros.h +include/atf-c/tc.h +include/atf-c/tp.h +include/atf-c/utils.h +lib/libatf-c++.la +lib/libatf-c.la +lib/pkgconfig/atf-c++.pc +lib/pkgconfig/atf-c.pc +lib/pkgconfig/atf-sh.pc +libexec/atf-check +man/man1/atf-check.1 +man/man1/atf-sh.1 +man/man1/atf-test-program.1 +man/man3/atf-c++-api.3 +man/man3/atf-c-api.3 +man/man3/atf-sh-api.3 +man/man4/atf-test-case.4 +share/aclocal/atf-c++.m4 +share/aclocal/atf-c.m4 +share/aclocal/atf-common.m4 +share/aclocal/atf-sh.m4 +share/atf/libatf-sh.subr +tests/atf/atf-c++/Atffile +tests/atf/atf-c++/Kyuafile +tests/atf/atf-c++/atf_c++_test +tests/atf/atf-c++/build_test +tests/atf/atf-c++/check_test +tests/atf/atf-c++/config_test +tests/atf/atf-c++/detail/Atffile +tests/atf/atf-c++/detail/Kyuafile +tests/atf/atf-c++/detail/application_test +tests/atf/atf-c++/detail/env_test +tests/atf/atf-c++/detail/exceptions_test +tests/atf/atf-c++/detail/expand_test +tests/atf/atf-c++/detail/fs_test +tests/atf/atf-c++/detail/parser_test +tests/atf/atf-c++/detail/process_test +tests/atf/atf-c++/detail/sanity_test +tests/atf/atf-c++/detail/text_test +tests/atf/atf-c++/detail/ui_test +tests/atf/atf-c++/macros_hpp_test.cpp +tests/atf/atf-c++/macros_test +tests/atf/atf-c++/pkg_config_test +tests/atf/atf-c++/tests_test +tests/atf/atf-c++/utils_test +tests/atf/atf-c/Atffile +tests/atf/atf-c/Kyuafile +tests/atf/atf-c/atf_c_test +tests/atf/atf-c/build_test +tests/atf/atf-c/check_test +tests/atf/atf-c/config_test +tests/atf/atf-c/detail/Atffile +tests/atf/atf-c/detail/Kyuafile +tests/atf/atf-c/detail/dynstr_test +tests/atf/atf-c/detail/env_test +tests/atf/atf-c/detail/fs_test +tests/atf/atf-c/detail/list_test +tests/atf/atf-c/detail/map_test +tests/atf/atf-c/detail/process_helpers +tests/atf/atf-c/detail/process_test +tests/atf/atf-c/detail/sanity_test +tests/atf/atf-c/detail/test_helpers_test +tests/atf/atf-c/detail/text_test +tests/atf/atf-c/detail/user_test +tests/atf/atf-c/error_test +tests/atf/atf-c/macros_h_test.c +tests/atf/atf-c/macros_test +tests/atf/atf-c/pkg_config_test +tests/atf/atf-c/tc_test +tests/atf/atf-c/tp_test +tests/atf/atf-c/utils_test +tests/atf/atf-sh/Atffile +tests/atf/atf-sh/Kyuafile +tests/atf/atf-sh/atf-check_test +tests/atf/atf-sh/atf_check_test +tests/atf/atf-sh/config_test +tests/atf/atf-sh/integration_test +tests/atf/atf-sh/misc_helpers +tests/atf/atf-sh/normalize_test +tests/atf/atf-sh/tc_test +tests/atf/atf-sh/tp_test +tests/atf/test-programs/Atffile +tests/atf/test-programs/Kyuafile +tests/atf/test-programs/c_helpers +tests/atf/test-programs/config_test +tests/atf/test-programs/cpp_helpers +tests/atf/test-programs/expect_test +tests/atf/test-programs/fork_test +tests/atf/test-programs/meta_data_test +tests/atf/test-programs/result_test +tests/atf/test-programs/sh_helpers +tests/atf/test-programs/srcdir_test diff --git a/devel/atf-libs/buildlink3.mk b/devel/atf-libs/buildlink3.mk new file mode 100644 index 00000000000..15c8bea1078 --- /dev/null +++ b/devel/atf-libs/buildlink3.mk @@ -0,0 +1,19 @@ +# $NetBSD: buildlink3.mk,v 1.1 2012/07/01 15:27:43 jmmv Exp $ + +BUILDLINK_TREE+= atf-libs + +.if !defined(ATF_LIBS_BUILDLINK3_MK) +ATF_LIBS_BUILDLINK3_MK:= + +# The ATF libraries have not been properly versioned until now because, by +# default, they were only installed as static libraries. However, for some +# obscure reason, the disabling of shared libraries is not working (at least +# under NetBSD with pkgsrc). Make sure we use a single API/ABI of the +# abi-libs package to prevent unexpected incompatibilities until the ATF +# libraries provide proper versioning on their own. +BUILDLINK_API_DEPENDS.atf-libs+= atf-libs>=0.15 +BUILDLINK_API_DEPENDS.atf-libs+= atf-libs<0.16 +BUILDLINK_PKGSRCDIR.atf-libs?= ../../devel/atf-libs +.endif # ATF_LIBS_BUILDLINK3_MK + +BUILDLINK_TREE+= -atf-libs diff --git a/devel/atf/DESCR b/devel/atf/DESCR index 07b0241dc4e..f2d98b381d0 100644 --- a/devel/atf/DESCR +++ b/devel/atf/DESCR @@ -13,3 +13,7 @@ in special, encourages end users to run them often: they do not need to have source trees around nor any other development tools installed to be able to certify that a given piece of software works on their machine as advertised. + +This package provides the deprecated atf-run and atf-report tools; please +use kyua-cli package instead. If you need the ATF libraries only (not the +tools), you can install the atf-libs package instead. diff --git a/devel/atf/Makefile b/devel/atf/Makefile index f0e652aed06..39a37687856 100644 --- a/devel/atf/Makefile +++ b/devel/atf/Makefile @@ -1,35 +1,34 @@ -# $NetBSD: Makefile,v 1.19 2012/02/26 17:25:06 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2012/07/01 15:27:43 jmmv Exp $ # -DISTNAME= atf-0.15 -CATEGORIES= devel -MASTER_SITES= http://kyua.googlecode.com/files/ +.include "Makefile.common" -MAINTAINER= jmmv@NetBSD.org -HOMEPAGE= http://code.google.com/p/kyua/wiki/ATF -COMMENT= Automated testing framework -LICENSE= 2-clause-bsd +PKGREVISION= 1 -PKG_DESTDIR_SUPPORT= user-destdir - -MAKE_JOBS_SAFE= yes - -GNU_CONFIGURE= yes -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes - -CONFIGURE_ARGS+= ATF_CONFSUBDIR= -CONFIGURE_ARGS+= ATF_SHELL=${SH:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} - -PKGCONFIG_OVERRIDE= data/atf-c.pc.in -PKGCONFIG_OVERRIDE+= data/atf-c++.pc.in -PKGCONFIG_OVERRIDE+= data/atf-sh.pc.in - -PKG_SYSCONFSUBDIR= atf +COMMENT:= ${COMMENT} - Runtime tools (deprecated) XML_ENTRIES= public "-//NetBSD//DTD ATF Tests Results 0.1//EN" \ ${PREFIX}/share/xml/atf/tests-results.dtd +post-install: +.for file in bin/atf-sh \ + include/ \ + lib/ \ + libexec/ \ + ${PKGMANDIR}/man1/atf-check.1 \ + ${PKGMANDIR}/man1/atf-sh.1 \ + ${PKGMANDIR}/man1/atf-test-program.1 \ + ${PKGMANDIR}/man3/ \ + ${PKGMANDIR}/man4/ \ + share/aclocal/ \ + share/atf/libatf-sh.subr \ + tests/atf/atf-c++ \ + tests/atf/atf-c \ + tests/atf/atf-sh \ + tests/atf/test-programs + rm -rf ${DESTDIR}${PREFIX}/${file} +.endfor + +.include "../../devel/atf-libs/buildlink3.mk" .include "../../textproc/xmlcatmgr/catalogs.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/atf/Makefile.common b/devel/atf/Makefile.common new file mode 100644 index 00000000000..a046bf6227c --- /dev/null +++ b/devel/atf/Makefile.common @@ -0,0 +1,36 @@ +# $NetBSD: Makefile.common,v 1.1 2012/07/01 15:27:43 jmmv Exp $ +# +# used by devel/atf/Makefile +# used by devel/atf-libs/Makefile + +DISTNAME= atf-0.15 +CATEGORIES= devel +MASTER_SITES= http://kyua.googlecode.com/files/ + +MAINTAINER= jmmv@NetBSD.org +HOMEPAGE= http://code.google.com/p/kyua/wiki/ATF +COMMENT= Automated testing framework +LICENSE= 2-clause-bsd + +PKG_DESTDIR_SUPPORT= user-destdir + +DISTINFO_FILE= ${.CURDIR}/../../devel/atf/distinfo + +MAKE_JOBS_SAFE= yes + +GNU_CONFIGURE= yes +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes + +CONFIGURE_ARGS+= ATF_CONFSUBDIR= +CONFIGURE_ARGS+= ATF_SHELL=${SH:Q} +CONFIGURE_ARGS+= --enable-unstable-shared +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} + +PKG_SYSCONFSUBDIR= atf + +PKGCONFIG_OVERRIDE= atf-c/atf-c.pc.in +PKGCONFIG_OVERRIDE+= atf-c++/atf-c++.pc.in +PKGCONFIG_OVERRIDE+= atf-sh/atf-sh.pc.in + +.include "../../mk/bsd.prefs.mk" diff --git a/devel/atf/PLIST b/devel/atf/PLIST index 202f9125439..e0840455432 100644 --- a/devel/atf/PLIST +++ b/devel/atf/PLIST @@ -1,52 +1,15 @@ -@comment $NetBSD: PLIST,v 1.17 2012/01/16 22:26:55 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.18 2012/07/01 15:27:43 jmmv Exp $ bin/atf-config bin/atf-report bin/atf-run -bin/atf-sh bin/atf-version -include/atf-c++.hpp -include/atf-c++/build.hpp -include/atf-c++/check.hpp -include/atf-c++/config.hpp -include/atf-c++/macros.hpp -include/atf-c++/tests.hpp -include/atf-c++/utils.hpp -include/atf-c.h -include/atf-c/build.h -include/atf-c/check.h -include/atf-c/config.h -include/atf-c/defs.h -include/atf-c/error.h -include/atf-c/error_fwd.h -include/atf-c/macros.h -include/atf-c/tc.h -include/atf-c/tp.h -include/atf-c/utils.h -lib/libatf-c++.la -lib/libatf-c.la -lib/pkgconfig/atf-c++.pc -lib/pkgconfig/atf-c.pc -lib/pkgconfig/atf-sh.pc -libexec/atf-check -man/man1/atf-check.1 man/man1/atf-config.1 man/man1/atf-report.1 man/man1/atf-run.1 -man/man1/atf-sh.1 -man/man1/atf-test-program.1 man/man1/atf-version.1 -man/man3/atf-c++-api.3 -man/man3/atf-c-api.3 -man/man3/atf-sh-api.3 -man/man4/atf-test-case.4 man/man5/atf-formats.5 man/man7/atf.7 -share/aclocal/atf-c++.m4 -share/aclocal/atf-c.m4 -share/aclocal/atf-common.m4 -share/aclocal/atf-sh.m4 share/atf/atf-run.hooks -share/atf/libatf-sh.subr share/doc/atf/AUTHORS share/doc/atf/COPYING share/doc/atf/NEWS @@ -58,55 +21,6 @@ share/xml/atf/tests-results.dtd share/xsl/atf/tests-results.xsl tests/atf/Atffile tests/atf/Kyuafile -tests/atf/atf-c++/Atffile -tests/atf/atf-c++/Kyuafile -tests/atf/atf-c++/atf_c++_test -tests/atf/atf-c++/build_test -tests/atf/atf-c++/check_test -tests/atf/atf-c++/config_test -tests/atf/atf-c++/detail/Atffile -tests/atf/atf-c++/detail/Kyuafile -tests/atf/atf-c++/detail/application_test -tests/atf/atf-c++/detail/env_test -tests/atf/atf-c++/detail/exceptions_test -tests/atf/atf-c++/detail/expand_test -tests/atf/atf-c++/detail/fs_test -tests/atf/atf-c++/detail/parser_test -tests/atf/atf-c++/detail/process_test -tests/atf/atf-c++/detail/sanity_test -tests/atf/atf-c++/detail/text_test -tests/atf/atf-c++/detail/ui_test -tests/atf/atf-c++/macros_hpp_test.cpp -tests/atf/atf-c++/macros_test -tests/atf/atf-c++/pkg_config_test -tests/atf/atf-c++/tests_test -tests/atf/atf-c++/utils_test -tests/atf/atf-c/Atffile -tests/atf/atf-c/Kyuafile -tests/atf/atf-c/atf_c_test -tests/atf/atf-c/build_test -tests/atf/atf-c/check_test -tests/atf/atf-c/config_test -tests/atf/atf-c/detail/Atffile -tests/atf/atf-c/detail/Kyuafile -tests/atf/atf-c/detail/dynstr_test -tests/atf/atf-c/detail/env_test -tests/atf/atf-c/detail/fs_test -tests/atf/atf-c/detail/list_test -tests/atf/atf-c/detail/map_test -tests/atf/atf-c/detail/process_helpers -tests/atf/atf-c/detail/process_test -tests/atf/atf-c/detail/sanity_test -tests/atf/atf-c/detail/test_helpers_test -tests/atf/atf-c/detail/text_test -tests/atf/atf-c/detail/user_test -tests/atf/atf-c/error_test -tests/atf/atf-c/macros_h_test.c -tests/atf/atf-c/macros_test -tests/atf/atf-c/pkg_config_test -tests/atf/atf-c/tc_test -tests/atf/atf-c/tp_test -tests/atf/atf-c/utils_test tests/atf/atf-config/Atffile tests/atf/atf-config/Kyuafile tests/atf/atf-config/integration_test @@ -134,24 +48,3 @@ tests/atf/atf-run/signals_test tests/atf/atf-run/test_program_test tests/atf/atf-run/user_test tests/atf/atf-run/zero_tcs_helper -tests/atf/atf-sh/Atffile -tests/atf/atf-sh/Kyuafile -tests/atf/atf-sh/atf-check_test -tests/atf/atf-sh/atf_check_test -tests/atf/atf-sh/config_test -tests/atf/atf-sh/integration_test -tests/atf/atf-sh/misc_helpers -tests/atf/atf-sh/normalize_test -tests/atf/atf-sh/tc_test -tests/atf/atf-sh/tp_test -tests/atf/test-programs/Atffile -tests/atf/test-programs/Kyuafile -tests/atf/test-programs/c_helpers -tests/atf/test-programs/config_test -tests/atf/test-programs/cpp_helpers -tests/atf/test-programs/expect_test -tests/atf/test-programs/fork_test -tests/atf/test-programs/meta_data_test -tests/atf/test-programs/result_test -tests/atf/test-programs/sh_helpers -tests/atf/test-programs/srcdir_test diff --git a/devel/atf/buildlink3.mk b/devel/atf/buildlink3.mk deleted file mode 100644 index 599fd0dc123..00000000000 --- a/devel/atf/buildlink3.mk +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.1 2011/06/14 13:55:15 jmmv Exp $ - -BUILDLINK_TREE+= atf - -.if !defined(ATF_BUILDLINK3_MK) -ATF_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.atf+= atf>=0.14 -# The atf-c and atf-c++ libraries are installed in their static form only, -# which means that we could have a build-time dependency only on atf... -# Unfortunately, test programs using atf-sh still need a full dependency. -#BUILDLINK_DEPMETHOD.atf?= build -BUILDLINK_PKGSRCDIR.atf?= ../../devel/atf -.endif # ATF_BUILDLINK3_MK - -BUILDLINK_TREE+= -atf |