Date: Thu, 29 Jun 2017 09:52:21 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444637 - head/math/parmetis Message-ID: <201706290952.v5T9qLMR028183@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Thu Jun 29 09:52:21 2017 New Revision: 444637 URL: https://svnweb.freebsd.org/changeset/ports/444637 Log: - Update to 4.0.3 - Convert to options helpers - Add fixes to make OPENMPI option compile PR: 219750 Submitted by: pfg@ Modified: head/math/parmetis/Makefile head/math/parmetis/distinfo Modified: head/math/parmetis/Makefile ============================================================================== --- head/math/parmetis/Makefile Thu Jun 29 09:50:09 2017 (r444636) +++ head/math/parmetis/Makefile Thu Jun 29 09:52:21 2017 (r444637) @@ -2,15 +2,13 @@ # $FreeBSD$ PORTNAME= ParMetis -PORTVERSION= 4.0 -PORTREVISION= 11 +PORTVERSION= 4.0.3 CATEGORIES= math parallel -MASTER_SITES= http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/%SUBDIR%/ -MASTER_SITE_SUBDIR= . OLD +MASTER_SITES= http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/ DISTNAME= ${PORTNAME:tl}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org -COMMENT= 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,6 +18,15 @@ LICENSE_PERMS= auto-accept OPTIONS_DEFINE= OPENMPI DOCS OPENMPI_DESC= Use openmpi instead of mpich2 +OPENMPI_BUILD_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi +OPENMPI_RUN_DEPENDS= ${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi +OPENMPI_VARS= MPICC=${LOCALBASE}/mpi/openmpi/bin/mpicc \ + MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpicxx +OPENMPI_BUILD_DEPENDS_OFF= ${LOCALBASE}/bin/mpicc:net/mpich2 +OPENMPI_RUN_DEPENDS_OFF= ${LOCALBASE}/bin/mpirun:net/mpich2 +OPENMPI_VARS_OFF= MPICC=${LOCALBASE}/bin/mpicc \ + MPICXX=${LOCALBASE}/bin/mpicxx + USES= cmake:noninja gmake PLIST_FILES= include/parmetis/metis.h \ @@ -30,16 +37,6 @@ PLIST_FILES= include/parmetis/metis.h \ .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MOPENMPI} -BUILD_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi -RUN_DEPENDS+= ${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi -MPICC= ${LOCALBASE}/mpi/openmpi/bin/mpicc -.else -BUILD_DEPENDS+= ${LOCALBASE}/bin/mpicc:net/mpich2 -RUN_DEPENDS+= ${LOCALBASE}/bin/mpirun:net/mpich2 -MPICC= ${LOCALBASE}/bin/mpicc -.endif - post-patch: @${REINPLACE_CMD} -e \ 's|BUILDDIR =.*|BUILDDIR = build| ; \ @@ -47,10 +44,20 @@ post-patch: s|$$(MAKEFLAGS)||' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e \ 's|"-O3"|""|' ${WRKSRC}/metis/GKlib/GKlibSystem.cmake +.if ((${ARCH}=="amd64") || (${ARCH}=="aarch64") || (${ARCH}=="sparc64") || (${ARCH}=="ppc64") || (${ARCH}=="ia64")) + @${REINPLACE_CMD}-e \ + 's|IDXTYPEWIDTH 32|IDXTYPEWIDTH 64|' \ + ${WRKSRC}/metis/include/metis.h +.endif +post-patch-OPENMPI-on: + @${REINPLACE_CMD} -e \ + '/target_link_libraries(.* parmetis)/s/\(parmetis\)/& -lexecinfo/' \ + ${WRKSRC}/programs/CMakeLists.txt + do-configure: @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \ - ${MAKEFILE} config prefix="${PREFIX}" cc="${MPICC}" + ${MAKEFILE} config prefix="${PREFIX}" cc="${MPICC}" cxx="${MPICXX}" do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/parmetis \ @@ -63,6 +70,7 @@ do-install: ${STAGEDIR}${PREFIX}/lib/parmetis ${INSTALL_DATA} ${WRKSRC}/build/libparmetis/libparmetis.a \ ${STAGEDIR}${PREFIX}/lib/parmetis + ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/math/parmetis/distinfo ============================================================================== --- head/math/parmetis/distinfo Thu Jun 29 09:50:09 2017 (r444636) +++ head/math/parmetis/distinfo Thu Jun 29 09:52:21 2017 (r444637) @@ -1,2 +1,3 @@ -SHA256 (parmetis-4.0.tar.gz) = 6f936a0552cdb1de485e5d9e3e8f0b4588abc24cee732da0b1f5c69e246a9a62 -SIZE (parmetis-4.0.tar.gz) = 5567866 +TIMESTAMP = 1496443330 +SHA256 (parmetis-4.0.3.tar.gz) = f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f +SIZE (parmetis-4.0.3.tar.gz) = 5567670
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706290952.v5T9qLMR028183>