svn commit: r424156 - in head: Mk/Uses devel/caf devel/yajl math/ceres-solver textproc/cmark

[Jan Beich]

Author: jbeich
Date: Tue Oct 18 11:20:01 2016
New Revision: 424156
URL: https://svnweb.freebsd.org/changeset/ports/424156

Log:
  Adjust TEST_WRKSRC for USES=[cq]make:outsource
  
  Approved by:	rakuco
  Differential Revision:	https://reviews.freebsd.org/D8274

Modified:
  head/Mk/Uses/cmake.mk   (contents, props changed)
  head/Mk/Uses/qmake.mk   (contents, props changed)
  head/devel/caf/Makefile   (contents, props changed)
  head/devel/yajl/Makefile   (contents, props changed)
  head/math/ceres-solver/Makefile   (contents, props changed)
  head/textproc/cmark/Makefile   (contents, props changed)

Modified: head/Mk/Uses/cmake.mk
==============================================================================
--- head/Mk/Uses/cmake.mk	Tue Oct 18 11:11:51 2016	(r424155)
+++ head/Mk/Uses/cmake.mk	Tue Oct 18 11:20:01 2016	(r424156)
@@ -103,6 +103,7 @@ _CMAKE_MSG=		"===>  Performing out-of-so
 CONFIGURE_WRKSRC=	${WRKDIR}/.build
 BUILD_WRKSRC?=		${CONFIGURE_WRKSRC}
 INSTALL_WRKSRC?=	${CONFIGURE_WRKSRC}
+TEST_WRKSRC?=		${CONFIGURE_WRKSRC}
 .endif
 
 .if !target(do-configure)

Modified: head/Mk/Uses/qmake.mk
==============================================================================
--- head/Mk/Uses/qmake.mk	Tue Oct 18 11:11:51 2016	(r424155)
+++ head/Mk/Uses/qmake.mk	Tue Oct 18 11:20:01 2016	(r424156)
@@ -90,6 +90,7 @@ _QMAKE_WRKSRC?=	${CONFIGURE_WRKSRC}
 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

Modified: head/devel/caf/Makefile
==============================================================================
--- head/devel/caf/Makefile	Tue Oct 18 11:11:51 2016	(r424155)
+++ head/devel/caf/Makefile	Tue Oct 18 11:20:01 2016	(r424156)
@@ -18,7 +18,6 @@ LDFLAGS+=	-pthread
 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}

Modified: head/devel/yajl/Makefile
==============================================================================
--- head/devel/yajl/Makefile	Tue Oct 18 11:11:51 2016	(r424155)
+++ head/devel/yajl/Makefile	Tue Oct 18 11:20:01 2016	(r424156)
@@ -20,7 +20,6 @@ USES=		cmake:outsource
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 TEST_TARGET=	test test-api
-TEST_WRKSRC=	${BUILD_WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s,share/pkgconfig,libdata/pkgconfig,g" \

Modified: head/math/ceres-solver/Makefile
==============================================================================
--- head/math/ceres-solver/Makefile	Tue Oct 18 11:11:51 2016	(r424155)
+++ head/math/ceres-solver/Makefile	Tue Oct 18 11:20:01 2016	(r424156)
@@ -60,8 +60,6 @@ SCHUR_CMAKE_BOOL=	SCHUR_SPECIALIZATIONS
 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

Modified: head/textproc/cmark/Makefile
==============================================================================
--- head/textproc/cmark/Makefile	Tue Oct 18 11:11:51 2016	(r424155)
+++ head/textproc/cmark/Makefile	Tue Oct 18 11:20:01 2016	(r424156)
@@ -18,7 +18,6 @@ USES=		cmake:outsource python:3,test
 USE_LDCONFIG=	yes
 
 TEST_TARGET=	test
-TEST_WRKSRC=	${BUILD_WRKSRC}
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man