From owner-svn-ports-head@FreeBSD.ORG  Fri Dec 27 22:56:51 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 0DD20A0A;
 Fri, 27 Dec 2013 22:56:51 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id D488217B8;
 Fri, 27 Dec 2013 22:56:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRMuoxn063284;
 Fri, 27 Dec 2013 22:56:50 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRMuojP063283;
 Fri, 27 Dec 2013 22:56:50 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201312272256.rBRMuojP063283@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Fri, 27 Dec 2013 22:56:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r337822 - head/math/parmetis
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Dec 2013 22:56:51 -0000

Author: marino
Date: Fri Dec 27 22:56:50 2013
New Revision: 337822
URL: http://svnweb.freebsd.org/changeset/ports/337822

Log:
  math/parmetis: Unbreak on FreeBSD 10+
  
  ParMetis requires both cmake and gmake.  Apparently gmake sets ${MAKE}
  to value of "make" if undefined, and this causes the bmake to be launched
  for subdirectories rather than gmake.  That's the cause of the build
  failure for FreeBSD 10+.  The eventual fix using MAKE_ARGS took me hours
  to figure out, this drove me crazy!
  
  Fix covered by portmgr general blanket for ports modernization (bmake).

Modified:
  head/math/parmetis/Makefile

Modified: head/math/parmetis/Makefile
==============================================================================
--- head/math/parmetis/Makefile	Fri Dec 27 22:39:23 2013	(r337821)
+++ head/math/parmetis/Makefile	Fri Dec 27 22:56:50 2013	(r337822)
@@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR=	. OLD
 DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
-COMMENT=	A package for parallel (mpi) unstructured graph partitioning
+COMMENT=	Package for parallel (mpi) unstructured graph partitioning
 
 LICENSE=	METIS
 LICENSE_NAME=	University of Minnesota METIS License
@@ -20,9 +20,9 @@ LICENSE_PERMS=	auto-accept
 OPTIONS_DEFINE=	OPENMPI DOCS
 OPENMPI_DESC=	Use openmpi instead of mpich2
 
-USES=		cmake
-USE_GMAKE=	yes
+USES=		cmake gmake
 
+MAKE_ARGS+=	MAKEFLAGS=MAKE=${GMAKE}
 PORTDOCS=	manual.pdf
 PLIST_FILES=	include/parmetis/parmetis.h \
 		lib/parmetis/libmetis.a lib/parmetis/libparmetis.a
@@ -44,12 +44,12 @@ MPICC=		${LOCALBASE}/bin/mpicc
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|BUILDDIR =.*|BUILDDIR = build| ; \
-		 s|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile
+		 s|make -C|${MAKE_CMD} -C|' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e \
 		's|"-O3"|""|' ${WRKSRC}/metis/GKlib/GKlibSystem.cmake
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} config prefix="${PREFIX}" cc="${MPICC}"
 
 do-install: