svn commit: r396584 - head/science/cdf

[Alexey Dokuchaev]

Author: danfe
Date: Thu Sep 10 16:31:33 2015
New Revision: 396584
URL: https://svnweb.freebsd.org/changeset/ports/396584

Log:
  Follow-up commit to r396576 since I've forgotten to fix some things:
  - Do not patch stuff in `pre-configure' target, do it in `post-patch'
  - It is our customary practice to mute ${REINPLACE_CMD} invocations
  - Do not (mis)use ${MAKE} when ${MAKE_CMD} should be used instead

Modified:
  head/science/cdf/Makefile

Modified: head/science/cdf/Makefile
==============================================================================
--- head/science/cdf/Makefile	Thu Sep 10 16:31:01 2015	(r396583)
+++ head/science/cdf/Makefile	Thu Sep 10 16:31:33 2015	(r396584)
@@ -29,9 +29,9 @@ PORTDOCS=	CDF_copyright.txt CHANGES.txt 
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-pre-configure:
+post-patch:
 .for def in ${DEFS}
-	${REINPLACE_CMD} -e 's|<path>|${PREFIX}|' \
+	@${REINPLACE_CMD} -e 's|<path>|${PREFIX}|' \
 		 ${WRKSRC}/src/definitions/definitions.${def}
 .endfor
 
@@ -46,7 +46,7 @@ post-install:
 	${SED} -i '' 's,${STAGEDIR},,g' ${STAGEDIR}${PREFIX}/bin/definitions.?
 
 regression-test: build
-	@${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} test -C ${BUILD_WRKSRC}
 
 .include <bsd.port.mk>