From owner-svn-ports-all@freebsd.org  Thu Sep 10 16:31:34 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7075DA01770;
 Thu, 10 Sep 2015 16:31:34 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6127A1482;
 Thu, 10 Sep 2015 16:31:34 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8AGVYHg082070;
 Thu, 10 Sep 2015 16:31:34 GMT (envelope-from danfe@FreeBSD.org)
Received: (from danfe@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8AGVY2d082069;
 Thu, 10 Sep 2015 16:31:34 GMT (envelope-from danfe@FreeBSD.org)
Message-Id: <201509101631.t8AGVY2d082069@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: danfe set sender to
 danfe@FreeBSD.org using -f
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Thu, 10 Sep 2015 16:31:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396584 - head/science/cdf
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Sep 2015 16:31:34 -0000

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>