From owner-svn-ports-all@FreeBSD.ORG Tue Jun 24 22:34:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C319FE2C; Tue, 24 Jun 2014 22:34:28 +0000 (UTC) Received: from svn.freebsd.org (svn.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 A40402732; Tue, 24 Jun 2014 22:34:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OMYSLK091789; Tue, 24 Jun 2014 22:34:28 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5OMYSUh091783; Tue, 24 Jun 2014 22:34:28 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201406242234.s5OMYSUh091783@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 24 Jun 2014 22:34:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359153 - in head/databases: postgresql84-server postgresql91-server postgresql92-server 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 22:34:28 -0000 Author: bapt Date: Tue Jun 24 22:34:27 2014 New Revision: 359153 URL: http://svnweb.freebsd.org/changeset/ports/359153 QAT: https://qat.redports.org/buildarchive/r359153/ Log: Properly call MAKE_CMD Modified: head/databases/postgresql84-server/Makefile head/databases/postgresql91-server/Makefile head/databases/postgresql92-server/Makefile Modified: head/databases/postgresql84-server/Makefile ============================================================================== --- head/databases/postgresql84-server/Makefile Tue Jun 24 22:32:38 2014 (r359152) +++ head/databases/postgresql84-server/Makefile Tue Jun 24 22:34:27 2014 (r359153) @@ -245,12 +245,12 @@ pre-build: . if defined(SERVER_ONLY) @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL . endif - @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks + @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks .endif do-build: @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) @@ -274,7 +274,7 @@ post-patch: do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${INSTALL_TARGET}; \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ @@ -284,7 +284,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-local + @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ @@ -296,7 +296,7 @@ do-install: check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ - cd ${WRKSRC}; ${GMAKE} check ;\ + cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ Modified: head/databases/postgresql91-server/Makefile ============================================================================== --- head/databases/postgresql91-server/Makefile Tue Jun 24 22:32:38 2014 (r359152) +++ head/databases/postgresql91-server/Makefile Tue Jun 24 22:34:27 2014 (r359153) @@ -242,9 +242,9 @@ pre-build: .if !defined(NO_BUILD) && !target(do-build) do-build: - @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks + @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) @@ -266,7 +266,7 @@ post-patch: do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${INSTALL_TARGET}; \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ @@ -276,7 +276,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-local + @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ @@ -288,7 +288,7 @@ do-install: check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ - cd ${WRKSRC}; ${GMAKE} check ;\ + cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\ Modified: head/databases/postgresql92-server/Makefile ============================================================================== --- head/databases/postgresql92-server/Makefile Tue Jun 24 22:32:38 2014 (r359152) +++ head/databases/postgresql92-server/Makefile Tue Jun 24 22:34:27 2014 (r359153) @@ -241,9 +241,9 @@ pre-build: .if !defined(NO_BUILD) && !target(do-build) do-build: - @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${GMAKE} symlinks + @ cd ${WRKSRC}/src/backend && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} symlinks @ for dir in ${BUILD_DIRS}; do \ - cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${GMAKE}; \ + cd ${WRKSRC}/$${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD}; \ done . if exists(${FILESDIR}/pkg-message${COMPONENT}.in) @@ -265,7 +265,7 @@ post-patch: do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} ${INSTALL_TARGET}; \ + ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${INSTALL_TARGET}; \ done . if defined(SERVER_ONLY) @ ${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql ;\ @@ -275,7 +275,7 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${PG_USER} . endif # SERVER_ONLY . if defined(CLIENT_ONLY) - @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-local + @ cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} install-local . endif @ if [ -r ${PKGMESSAGE} ]; then \ ${MKDIR} ${STAGEDIR}${DOCSDIR} ;\ @@ -287,7 +287,7 @@ do-install: check: @if [ `id -u` != 0 ] ; then \ ${ECHO} "Running postgresql regressions tests" ;\ - cd ${WRKSRC}; ${GMAKE} check ;\ + cd ${WRKSRC}; ${MAKE_CMD} check ;\ else \ ${ECHO} "You cannot run regression tests when postgresql is built as user root." ; \ ${ECHO} "Clean and rebuild the port as a regular user to run the tests." ;\