Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 15 Jan 2019 12:52:47 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r490369 - in head/math/metis: . files
Message-ID:  <201901151252.x0FCqlNO018009@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
 
 .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)
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901151252.x0FCqlNO018009>