ports/186593: [patch] graphics/png fails when CMAKE_NINJA is set

[Adam Weinberger]

>Number:         186593
>Category:       ports
>Synopsis:       [patch] graphics/png fails when CMAKE_NINJA is set
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 09 16:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Adam Weinberger
>Release:        FreeBSD 10.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #0: Sun Feb 2 21:58:45 EST 2014 root at apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386


	
>Description:

graphics/png fails when it's built with ninja. It dies while forcing you
to run the optional tests.

>How-To-Repeat:

[root at apnoea /usr/ports/BUILD/png] CMAKE_NINJA=yes make
===>  Building for png-1.5.17
ninja: no work to do.
make[2]: make[2]: don't know how to make test. Stop

make[2]: stopped in /usr/BUILD-ports/png/work/libpng-1.5.17
[: xTry: unexpected operator
*** Error code 1

Stop.
make[1]: stopped in /usr/BUILD-ports/png
*** Error code 1

Stop.
make: stopped in /usr/BUILD-ports/png

>Fix:

There are two possible fixes. The first is to use the attached patch,
which uses MAKE_CMD (which ninja.mk sets) instead of MAKE.

But the option I'd like to suggest is to stop forcing users to run the tests.
Just turn the post-build: into test: or wrap it in DEVELOPER or something.
Users are smart enough to figure out whether they want to waste cycles on
optional tests (hint: I bet they don't).

--- png.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 343514)
+++ Makefile	(working copy)
@@ -50,7 +50,7 @@
 		${WRKSRC}/CMakeLists.txt
 
 post-build:
-	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \
+	@(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test; then \
         if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \
             ${ECHO_MSG} "===> Compilation failed unexpectedly."; \
             (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \
--- png.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: