From owner-svn-ports-head@freebsd.org Tue Jan 15 12:52:48 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7D97148A1F1; Tue, 15 Jan 2019 12:52:47 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7A9EE86664; Tue, 15 Jan 2019 12:52:47 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 673881B21A; Tue, 15 Jan 2019 12:52:47 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0FCqlkA018011; Tue, 15 Jan 2019 12:52:47 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0FCqlNO018009; Tue, 15 Jan 2019 12:52:47 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201901151252.x0FCqlNO018009@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Tue, 15 Jan 2019 12:52:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r490369 - in head/math/metis: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/math/metis: . files X-SVN-Commit-Revision: 490369 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7A9EE86664 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.956,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2019 12:52:48 -0000 Author: swills Date: Tue Jan 15 12:52:46 2019 New Revision: 490369 URL: https://svnweb.freebsd.org/changeset/ports/490369 Log: math/metis: update IDXTYPEWIDTH to 64 on 64 bit platforms While here, pet portlint PR: 219749 Submitted by: pfg Modified: head/math/metis/Makefile (contents, props changed) head/math/metis/files/patch-programs_CMakeLists.txt (contents, props changed) Modified: head/math/metis/Makefile ============================================================================== --- head/math/metis/Makefile Tue Jan 15 12:35:35 2019 (r490368) +++ head/math/metis/Makefile Tue Jan 15 12:52:46 2019 (r490369) @@ -3,7 +3,7 @@ PORTNAME= metis PORTVERSION= 5.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= math MASTER_SITES= http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ @@ -12,10 +12,10 @@ COMMENT= Package for unstructured graph partitioning LICENSE= APACHE20 -CONFLICTS= metis4-4* metis-edf-[0-9]* - USES= cmake:noninja compiler:c11 +CONFLICTS= metis4-4* metis-edf-[0-9]* + OPTIONS_DEFINE= OPENMP SHARED STATIC DOCS OPENMP_DESC= multithreading via OpenMP @@ -30,8 +30,8 @@ BINS= cmpfillin gpmetis graphchk m2gmetis mpmetis ndme .include .if ${PORT_OPTIONS:MOPENMP} +USES+= compiler:openmp CMAKE_ARGS+= -DOPENMP=1 -USE_GCC= any .endif .if ${PORT_OPTIONS:MSHARED} @@ -67,6 +67,11 @@ pre-configure: ${WRKSRC}/GKlib/GKlibSystem.cmake @${REINPLACE_CMD} -e "\|/home/karypis/|d" \ ${WRKSRC}/programs/CMakeLists.txt +.if ((${ARCH}=="amd64") || (${ARCH}=="aarch64") || (${ARCH}=="sparc64") || (${ARCH}=="ppc64") || (${ARCH}=="ia64")) + @${REINPLACE_CMD}-e \ + 's|IDXTYPEWIDTH 32|IDXTYPEWIDTH 64|' \ + ${WRKSRC}/include/metis.h +.endif .for o in SHARED #PROFILE .if ${PORT_OPTIONS:M${o}} @${CP} -R ${WRKSRC} ${WRKSRC_${o}} Modified: head/math/metis/files/patch-programs_CMakeLists.txt ============================================================================== --- head/math/metis/files/patch-programs_CMakeLists.txt Tue Jan 15 12:35:35 2019 (r490368) +++ head/math/metis/files/patch-programs_CMakeLists.txt Tue Jan 15 12:52:46 2019 (r490369) @@ -1,6 +1,6 @@ --- programs/CMakeLists.txt.orig 2013-03-30 16:24:45 UTC +++ programs/CMakeLists.txt -@@ -13,9 +13,14 @@ foreach(prog gpmetis ndmetis mpmetis m2g +@@ -13,9 +13,14 @@ foreach(prog gpmetis ndmetis mpmetis m2gmetis graphchk # target_link_libraries(${prog} metis profiler) endforeach(prog)