Index: head/Mk/Uses/cmake.mk =================================================================== --- head/Mk/Uses/cmake.mk +++ head/Mk/Uses/cmake.mk @@ -103,6 +103,7 @@ CONFIGURE_WRKSRC= ${WRKDIR}/.build BUILD_WRKSRC?= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC?= ${CONFIGURE_WRKSRC} +TEST_WRKSRC?= ${CONFIGURE_WRKSRC} .endif .if !target(do-configure) Index: head/Mk/Uses/qmake.mk =================================================================== --- head/Mk/Uses/qmake.mk +++ head/Mk/Uses/qmake.mk @@ -90,6 +90,7 @@ CONFIGURE_WRKSRC= ${WRKDIR}/.build BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC} +TEST_WRKSRC= ${BUILD_WRKSRC} QMAKE_SOURCE_PATH?= ${WRKSRC} .else QMAKE_SOURCE_PATH?= # empty Index: head/devel/caf/Makefile =================================================================== --- head/devel/caf/Makefile +++ head/devel/caf/Makefile @@ -18,7 +18,6 @@ USES= cmake:outsource compiler:c++11-lang USE_LDCONFIG= yes TEST_TARGET= test -TEST_WRKSRC= ${BUILD_WRKSRC} USE_GITHUB= yes GH_ACCOUNT= actor-framework GH_PROJECT= ${GH_ACCOUNT} Index: head/devel/yajl/Makefile =================================================================== --- head/devel/yajl/Makefile +++ head/devel/yajl/Makefile @@ -20,7 +20,6 @@ PLIST_SUB= VERSION=${PORTVERSION} TEST_TARGET= test test-api -TEST_WRKSRC= ${BUILD_WRKSRC} post-patch: @${REINPLACE_CMD} -e "s,share/pkgconfig,libdata/pkgconfig,g" \ Index: head/math/ceres-solver/Makefile =================================================================== --- head/math/ceres-solver/Makefile +++ head/math/ceres-solver/Makefile @@ -60,8 +60,6 @@ TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= test ARGS="-V" TEST_IMPLIES= GFLAGS -# XXX Move to USES=cmake -TEST_VARS= TEST_WRKSRC="${CONFIGURE_WRKSRC}" LAPACK_DESC= Linear Algebra PACKage LAPACK_USES= fortran # LDFLAGS Index: head/textproc/cmark/Makefile =================================================================== --- head/textproc/cmark/Makefile +++ head/textproc/cmark/Makefile @@ -18,7 +18,6 @@ USE_LDCONFIG= yes TEST_TARGET= test -TEST_WRKSRC= ${BUILD_WRKSRC} CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man