add math/metis4 to math/Makefile; update math/metis to 5.0.2; add appropriate

CONFLICTS, LATEST_LINK, and PORTSCOUT; adjust dependent ports; explicitly
note the restrictive license of the metis ports (while here, append the MPI port to
*DEPENDS in math/parmetis, rather than using an assignment)

PR:		169578

18 files changed, 186 insertions, 104 deletions

diff --git a/UPDATING b/UPDATING
index e26471a8248b..6410a03f70ed 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20120709:
+  AFFECTS: users of math/metis
+  AUTHOR: bf@FreeBSD.org
+
+  The older version of metis has been moved to math/metis4, and
+  math/metis has been updated to 5.0.2.  Dependent ports still use
+  the old API, and the different versions of metis cannot coexist, so
+  most users should update with:
+
+  # portmaster -o math/metis4 math/metis
+  # portmaster -r math/metis4
+
+  or the equivalent.
+
 20120702:
   AFFECTS: users of databases/couchdb
   AUTHOR: crees@FreeBSD.org, Adam Strohl <adams-ports@ateamsystems.com>
diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 14e73fdb595f..1321f19e9632 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	CalculiX
 PORTVERSION=	2.4
+PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -30,7 +31,7 @@ COMMENT=	A Three-Dimensional Structural Finite Element Program
 
 LIB_DEPENDS=	arpack.1:${PORTSDIR}/math/arpack	\
 		spooles.1:${PORTSDIR}/math/spooles \
-		metis.1:${PORTSDIR}/math/metis	\
+		metis.1:${PORTSDIR}/math/metis4	\
 		taucs.1:${PORTSDIR}/math/taucs
 
 USE_BZIP2=	yes
diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext
index 2d440c1fe0c3..a7cb5f0b1de5 100644
--- a/cad/salome/Makefile.ext
+++ b/cad/salome/Makefile.ext
@@ -231,9 +231,9 @@ BUILD_DEPENDS+=		${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4
 
 #Dependency from metis & scotsch
 .if ${SAL_MODULE} == "med"
-. if exists(${LOCALBASE}/bin/graphchk)
-BUILD_DEPENDS+=		kmetis:${PORTSDIR}/math/metis
-RUN_DEPENDS+=		kmetis:${PORTSDIR}/math/metis
+. if exists(${LOCALBASE}/bin/oemetis)
+BUILD_DEPENDS+=		kmetis:${PORTSDIR}/math/metis4
+RUN_DEPENDS+=		kmetis:${PORTSDIR}/math/metis4
 . else
 BUILD_DEPENDS+=		kmetis:${PORTSDIR}/math/metis-edf
 RUN_DEPENDS+=		kmetis:${PORTSDIR}/math/metis-edf
diff --git a/math/Makefile b/math/Makefile
index c24adf81ad89..51ed4206ee19 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -233,6 +233,7 @@
     SUBDIR += mbasecalc
     SUBDIR += metis
     SUBDIR += metis-edf
+    SUBDIR += metis4
     SUBDIR += mingw32-libgmp
     SUBDIR += miracl
     SUBDIR += moo
diff --git a/math/metis/Makefile b/math/metis/Makefile
index 2175f2209ac9..e24afd1e2f10 100644
--- a/math/metis/Makefile
+++ b/math/metis/Makefile
@@ -6,55 +6,132 @@
 #
 
 PORTNAME=	metis
-PORTVERSION=	4.0.3
+PORTVERSION=	5.0.2
 CATEGORIES=	math
-MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/	\
-		http://www-users.cs.umn.edu/~karypis/metis/metis/files/
+MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A package for unstructured graph partitioning
 
-CONFLICTS=	metis-edf-[0-9]*
+LICENSE=	METIS
+LICENSE_NAME=	University of Minnesota METIS License
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	auto-accept
 
-USE_LDCONFIG=	yes
+CONFLICTS=	metis-4* metis-edf-[0-9]*
 
-PROGRAMS=	graphchk kmetis mesh2dual mesh2nodal	\
-		oemetis onmetis partnmesh partdmesh pmetis
+USE_CMAKE=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE =	OPENMP STATIC SHARED
+
+OPENMP_DESC=	multithreading via OpenMP
+#PROFILE_DESC=	profiling libraries
+SHARED_DESC=	shared library and dynamically-linked executables
+STATIC_DESC=	libmetis archive
+
+OPTIONS_DEFAULT=	SHARED STATIC
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOPENMP}
+.if !empty(CC:T:M*clang*)
+IGNORE =	: clang does not support OpenMP. Disable the OPENMP option or\
+		use another compiler
+.endif
+CMAKE_ARGS+=	-DOPENMP=1
+.endif
+
+#.if ${PORT_OPTIONS:MPROFILE}
+#.if !exists(/usr/lib/libc_p.a)
+#IGNORE =	: you have enabled the PROFILE option, but have not installed \
+#		the base system profiling libraries
+#.endif
+#ALL_TARGET_PROFILE=		metis
+#CMAKE_ARGS_PROFILE=		-DGPROF=1
+#PLIST_SUB+=			PROFILE=""
+##PROFILE_FLAGS ?=		-pg
+#WRKSRC_PROFILE =		${WRKSRC}_PROFILE
+#INSTALL_WRKSRC_PROFILE =	${WRKSRC_PROFILE}/libmetis
+#.else
+#PLIST_SUB+=			PROFILE="@comment "
+#.endif
+
+.if ${PORT_OPTIONS:MSHARED}
+ALL_TARGET_SHARED=	all
+CMAKE_ARGS_SHARED=	-DSHARED=1
+PLIST_SUB+=		SHARED=""
 .if ${ARCH} == "sparc64"
-PICFLAG?=	-fPIC
+SHARED_FLAGS?=		-fPIC
+.else
+SHARED_FLAGS?=		-fpic
+.endif
+SHLIB_MAJOR?=		2
+CMAKE_ARGS+=		-DSHLIB_MAJOR="${SHLIB_MAJOR}"
+USE_LDCONFIG=		yes
+WRKSRC_SHARED=		${WRKSRC}_SHARED
+INSTALL_WRKSRC_SHARED=	${WRKSRC_SHARED}
 .else
-PICFLAG?=	-fpic
+PLIST_SUB+=		SHARED="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MSTATIC}
+ALL_TARGET_STATIC=	metis
+PLIST_SUB+=		STATIC=""
+WRKSRC_STATIC=		${WRKSRC}
+INSTALL_WRKSRC_STATIC=	${WRKSRC_STATIC}/libmetis
+.else
+PLIST_SUB+=		STATIC="@comment "
 .endif
 
 post-patch:
-	${CP} -R ${WRKSRC} ${WRKSRC}_SHARED
+	@${REINPLACE_CMD} -e "/^# Add compiler flags/,/^$$/d" \
+	-e "/^check_include_file(execinfo.h/d" \
+	${WRKSRC}/GKlib/GKlibSystem.cmake
+	@${REINPLACE_CMD} -e "\|/home/karypis/|d" \
+	${WRKSRC}/programs/CMakeLists.txt
+.for o in SHARED #PROFILE
+.if ${PORT_OPTIONS:M${o}}
+	@${CP} -R ${WRKSRC} ${WRKSRC_${o}}
+.endif
+.endfor
+
+do-configure:
+.for o in SHARED STATIC #PROFILE
+.if ${PORT_OPTIONS:M${o}}
+	@${PRINTF} "\n\nConfiguring ${o}:\n\n\n"
+	@cd ${WRKSRC_${o}}; ${SETENV} ${CMAKE_ENV} ${CMAKE_BIN} \
+	${CMAKE_ARGS:C|${CFLAGS}|& ${${o}_FLAGS}|g} ${CMAKE_ARGS_${o}} \
+	-DGKLIB_PATH="${WRKSRC_${o}}/GKlib" ${CMAKE_SOURCE_PATH}
+.endif
+.endfor
 
 do-build:
-	@cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} \
-	COPTIONS="${CFLAGS}" LDOPTIONS="${LDFLAGS}" \
-	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS}
-	@cd ${WRKSRC}_SHARED ; ${SETENV} ${MAKE_ENV} \
-	COPTIONS="${CFLAGS} ${PICFLAG}" LDOPTIONS="${LDFLAGS} ${PICFLAG}" \
-	${MAKE} ${_MAKE_JOBS} ${MAKE_ARGS} ; \
-	${LD} -Bshareable -o libmetis.so.1 -x -soname libmetis.so.1 \
-	--whole-archive libmetis.a --no-whole-archive
+.for o in SHARED STATIC #PROFILE
+.if ${PORT_OPTIONS:M${o}}
+	@${PRINTF} "\n\nBuilding ${o}:\n\n\n"
+	@cd ${WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
+	${MAKE_ARGS} ${ALL_TARGET_${o}}
+.endif
+.endfor
 
 check regression-test test: build
-	cd ${WRKSRC}/Graphs ; ./mtest 4elt.graph
+	cd ${WRKSRC_SHARED}/graphs ; ../programs/gpmetis ./4elt.graph 5
 
 do-install:
-	cd ${WRKSRC} ; ${INSTALL_PROGRAM} ${PROGRAMS} ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/include/metis
-	${INSTALL_DATA} ${WRKSRC}/Lib/*.h    ${PREFIX}/include/metis
-	${INSTALL_DATA} ${WRKSRC}/libmetis.a ${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}_SHARED/libmetis.so.1 ${PREFIX}/lib
-	${LN} -sf libmetis.so.1 ${PREFIX}/lib/libmetis.so
-
-.ifndef NOPORTDOCS
+.for o in SHARED STATIC #PROFILE
+.if ${PORT_OPTIONS:M${o}}
+	@${PRINTF} "\n\nInstalling ${o}:\n\n\n"
+	@cd ${INSTALL_WRKSRC_${o}}; ${SETENV} ${MAKE_ENV} ${MAKE} ${_MAKE_JOBS} \
+	${MAKE_ARGS} install
+.endif
+.endfor
+
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	manual.pdf
+
+post-install:
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Doc/manual.ps ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/metis/distinfo b/math/metis/distinfo
index 078e2e51ce5c..0f522bd21e19 100644
--- a/math/metis/distinfo
+++ b/math/metis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (metis-4.0.3.tar.gz) = 5efa35de80703c1b2c4d0de080fafbcf4e0d363a21149a1ad2f96e0144841a55
-SIZE (metis-4.0.3.tar.gz) = 522624
+SHA256 (metis-5.0.2.tar.gz) = f79790676ca2ce3dfa9d5e2d74801e91d92415664ede2c2fc18fc49d4a161981
+SIZE (metis-5.0.2.tar.gz) = 4963532
diff --git a/math/metis/files/patch-Makefile.in b/math/metis/files/patch-Makefile.in
deleted file mode 100644
index 3cafe0fbbea9..000000000000
--- a/math/metis/files/patch-Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- Makefile.in.orig	2006-08-31 08:22:01.000000000 -0400
-+++ Makefile.in	2012-03-15 12:48:32.000000000 -0400
-@@ -1,21 +1,16 @@
- 
- # Which compiler to use
--CC = cc
- 
- # What optimization level to use
--OPTFLAGS = -O2 
- 
- # What options to be used by the compiler
--COPTIONS = 
- 
- # What options to be used by the loader
--LDOPTIONS = 
- 
- # What archiving to use
--AR = ar rv
-+AR += ${ARFLAGS}
- 
- # What to use for indexing the archive
--RANLIB = ranlib
- #RANLIB = ar -ts
- #RANLIB = 
- 
diff --git a/math/metis/files/patch-libmetis__CMakeLists.txt b/math/metis/files/patch-libmetis__CMakeLists.txt
new file mode 100644
index 000000000000..268dc32d564c
--- /dev/null
+++ b/math/metis/files/patch-libmetis__CMakeLists.txt
@@ -0,0 +1,12 @@
+--- libmetis/CMakeLists.txt.orig	2011-06-22 13:47:13.000000000 -0400
++++ libmetis/CMakeLists.txt	2012-07-07 11:05:47.000000000 -0400
+@@ -4,6 +4,9 @@
+ file(GLOB metis_sources *.c)
+ # Build libmetis.
+ add_library(metis ${METIS_LIBRARY_TYPE} ${GKlib_sources} ${metis_sources})
++if(SHARED)
++  set_target_properties(metis PROPERTIES SOVERSION ${SHLIB_MAJOR})
++endif()
+ if(UNIX)
+   target_link_libraries(metis m)
+ endif()
diff --git a/math/metis/pkg-descr b/math/metis/pkg-descr
index 5b4615380726..8323971f5309 100644
--- a/math/metis/pkg-descr
+++ b/math/metis/pkg-descr
@@ -1,10 +1,10 @@
 METIS is a set of serial programs for partitioning graphs,
-partitioning finite element meshes, and producing fill reducing
+partitioning finite element meshes, and producing fill-reducing
 orderings for sparse matrices. The algorithms implemented in METIS are
 based on the multilevel recursive-bisection, multilevel k-way, and
 multi-constraint partitioning schemes developed in our lab.
 
-METIS provides high quality partitions, is extremely fast, and
-produces low fill orderings.
+METIS provides high-quality partitions, is extremely fast, and
+produces low-fill orderings.
 
 WWW: http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
diff --git a/math/metis/pkg-plist b/math/metis/pkg-plist
index ebcb4534b1c8..9b65ce081b31 100644
--- a/math/metis/pkg-plist
+++ b/math/metis/pkg-plist
@@ -1,21 +1,10 @@
-bin/graphchk
-bin/kmetis
-bin/mesh2dual
-bin/mesh2nodal
-bin/oemetis
-bin/onmetis
-bin/partdmesh
-bin/partnmesh
-bin/pmetis
-lib/libmetis.a
-lib/libmetis.so
-lib/libmetis.so.1
-include/metis/defs.h
-include/metis/macros.h
-include/metis/metis.h
-include/metis/proto.h
-include/metis/rename.h
-include/metis/struct.h
-@dirrm include/metis
-%%PORTDOCS%%%%DOCSDIR%%/manual.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%SHARED%%bin/cmpfillin
+%%SHARED%%bin/gpmetis
+%%SHARED%%bin/graphchk
+%%SHARED%%bin/m2gmetis
+%%SHARED%%bin/mpmetis
+%%SHARED%%bin/ndmetis
+%%SHARED%%include/metis.h
+%%STATIC%%lib/libmetis.a
+%%SHARED%%lib/libmetis.so
+%%SHARED%%lib/libmetis.so.2
diff --git a/math/metis4/Makefile b/math/metis4/Makefile
index 2175f2209ac9..928576d41b33 100644
--- a/math/metis4/Makefile
+++ b/math/metis4/Makefile
@@ -7,17 +7,24 @@
 
 PORTNAME=	metis
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	math
-MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/	\
-		http://www-users.cs.umn.edu/~karypis/metis/metis/files/
+MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A package for unstructured graph partitioning
 
-CONFLICTS=	metis-edf-[0-9]*
+LICENSE=	METIS
+LICENSE_NAME=	University of Minnesota METIS License
+LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_PERMS=	auto-accept
+
+CONFLICTS=	metis-5* metis-edf-[0-9]*
 
 USE_LDCONFIG=	yes
 
+LATEST_LINK=	metis4
+PORTSCOUT=	limit:4.*
 PROGRAMS=	graphchk kmetis mesh2dual mesh2nodal	\
 		oemetis onmetis partnmesh partdmesh pmetis
 
diff --git a/math/metis4/pkg-descr b/math/metis4/pkg-descr
index 5b4615380726..8323971f5309 100644
--- a/math/metis4/pkg-descr
+++ b/math/metis4/pkg-descr
@@ -1,10 +1,10 @@
 METIS is a set of serial programs for partitioning graphs,
-partitioning finite element meshes, and producing fill reducing
+partitioning finite element meshes, and producing fill-reducing
 orderings for sparse matrices. The algorithms implemented in METIS are
 based on the multilevel recursive-bisection, multilevel k-way, and
 multi-constraint partitioning schemes developed in our lab.
 
-METIS provides high quality partitions, is extremely fast, and
-produces low fill orderings.
+METIS provides high-quality partitions, is extremely fast, and
+produces low-fill orderings.
 
 WWW: http://glaros.dtc.umn.edu/gkhome/metis/metis/overview
diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index 803bdad04f0a..6ddf1c522678 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -43,7 +43,7 @@ FFLAGS+=	-O3 -ffast-math
 .endif
 
 .ifdef WITH_METIS
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmetis.a:${PORTSDIR}/math/metis
+BUILD_DEPENDS+=	${LOCALBASE}/bin/oemetis:${PORTSDIR}/math/metis4
 MAKE_ENV+=	ORDERINGSF=-Dmetis
 .endif
 
diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index 60167fe0e340..ce3ee812a496 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ParMetis
 PORTVERSION=	4.0
+PORTREVISION=	1
 CATEGORIES=	math parallel
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. OLD
@@ -15,6 +16,11 @@ DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	A package for parallel (mpi) unstructured graph partitioning
 
+LICENSE=	METIS
+LICENSE_NAME=	University of Minnesota METIS License
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+LICENSE_PERMS=	auto-accept
+
 OPTIONS=	OPENMPI "Use openmpi instead of mpich2" off
 
 USE_CMAKE=	yes
@@ -28,12 +34,12 @@ PLIST_DIRS=	include/parmetis lib/parmetis
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_OPENMPI)
-BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
-RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpicc:${PORTSDIR}/net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 MPICC=		${LOCALBASE}/mpi/openmpi/bin/mpicc
 .else
-BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
+RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
 MPICC=		${LOCALBASE}/bin/mpicc
 .endif
 
diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile
index f73822a57e33..eb34bf450b19 100644
--- a/math/suitesparse/Makefile
+++ b/math/suitesparse/Makefile
@@ -19,7 +19,7 @@ LICENSE=	GPLv2 LGPL21
 LICENSE_COMB=	multi
 
 .if defined (WITH_METIS)
-LIB_DEPENDS=	metis:${PORTSDIR}/math/metis
+LIB_DEPENDS=	metis.1:${PORTSDIR}/math/metis4
 
 RESTRICTED=	GPL and METIS licenses are contradictory
 .endif
diff --git a/math/taucs/Makefile b/math/taucs/Makefile
index cba0ab59a340..e107f36b9643 100644
--- a/math/taucs/Makefile
+++ b/math/taucs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	taucs
 PORTVERSION=	2.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	http://www.tau.ac.il/~stoledo/taucs/${PORTVERSION}/
 DISTNAME=	${PORTNAME}
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	C library of sparse linear solvers
 
-LIB_DEPENDS=	metis.1:${PORTSDIR}/math/metis
+LIB_DEPENDS=	metis.1:${PORTSDIR}/math/metis4
 
 HAS_CONFIGURE=	yes
 USE_FORTRAN=	yes
diff --git a/science/ecs/Makefile b/science/ecs/Makefile
index 883d4c0e2517..921fd9b391b0 100644
--- a/science/ecs/Makefile
+++ b/science/ecs/Makefile
@@ -67,11 +67,11 @@ MAN1=	cs_io_dump.1 cs_partition.1 cs_preprocess-config.1 cs_preprocess.1
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/bin/partdmesh)
-# The regular metis is there, cannot depends on metis-edf
-LIB_DEPENDS+=	metis.1:${PORTSDIR}/math/metis
+# The regular metis is present, so we cannot depend on metis-edf
+LIB_DEPENDS+=	metis.1:${PORTSDIR}/math/metis4
 .else
 # Prefer metis-edf to avoid conflict with Code_Aster
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libmetis.a:${PORTSDIR}/math/metis-edf
+BUILD_DEPENDS+=	${LOCALBASE}/bin/onmetis.exe:${PORTSDIR}/math/metis-edf
 .endif
 
 .if ${ARCH} == "i386"
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index 87b4f36fe46d..2bcf129fbaa2 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+=	--with-mpi=no
 .endif
 
 .if defined(WITH_METIS)
-LIB_DEPENDS+=	metis:${PORTSDIR}/math/metis
+LIB_DEPENDS+=	metis.1:${PORTSDIR}/math/metis4
 CONFIGURE_ARGS+=	--with-metis=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/metis
 .else
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=	--with-chaco=no
 .endif
 
 .if defined(WITH_GINAC)
-LIB_DEPENDS+=	metis:${PORTSDIR}/math/metis \
+LIB_DEPENDS+=	metis.1:${PORTSDIR}/math/metis4 \
 		ginac:${PORTSDIR}/math/GiNaC
 CONFIGURE_ARGS+=	--with-ginac=yes
 CPPFLAGS+=	-I${LOCALBASE}/include/metis