- Update to 4.0

PR:		ports/160126
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 40 insertions, 58 deletions

diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index 7c803b0bf3b8..6065a8cc0623 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -6,38 +6,57 @@
 #
 
 PORTNAME=	ParMetis
-PORTVERSION=	3.1
-PORTREVISION=	6
+PORTVERSION=	4.0
 CATEGORIES=	math parallel
-MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/
+MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/%SUBDIR%/
+MASTER_SITE_SUBDIR=	. OLD
+DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A package for parallel (mpi) unstructured graph partitioning
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
+OPTIONS=	OPENMPI "Use openmpi instead of mpich2" off
 
-.if !defined(WITH_OPENMPI)
-RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
-BUILD_DEPENDS=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-.else
-RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+USE_CMAKE=	yes
+USE_GMAKE=	yes
+
+PORTDOCS=	manual.pdf
+PLIST_FILES=	include/parmetis/parmetis.h \
+		lib/parmetis/libmetis.a lib/parmetis/libparmetis.a
+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
-MAKE_ARGS += CC=${LOCALBASE}/mpi/openmpi/bin/mpicc LD=${LOCALBASE}/mpi/openmpi/bin/mpicc 
+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
+MPICC=		${LOCALBASE}/bin/mpicc
 .endif
 
-ALL_TARGET=
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|BUILDDIR =.*|BUILDDIR = build| ; \
+		 s|make -C|$$(MAKE) -C|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|"-O3"|""|' ${WRKSRC}/metis/GKlib/GKlibSystem.cmake
+
+do-configure:
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} config prefix="${PREFIX}" cc="${MPICC}"
 
 do-install:
-	@${MKDIR} ${PREFIX}/lib/parmetis
-	${INSTALL_DATA} ${WRKSRC}/libmetis.a ${PREFIX}/lib/parmetis
-	${INSTALL_DATA} ${WRKSRC}/libparmetis.a ${PREFIX}/lib/parmetis
 	@${MKDIR} ${PREFIX}/include/parmetis
-	${INSTALL_DATA} ${WRKSRC}/parmetis.h    ${PREFIX}/include/parmetis
+	${INSTALL_DATA} ${WRKSRC}/include/parmetis.h ${PREFIX}/include/parmetis
+	@${MKDIR} ${PREFIX}/lib/parmetis
+	${INSTALL_DATA} ${WRKSRC}/build/libmetis/libmetis.a ${PREFIX}/lib/parmetis
+	${INSTALL_DATA} ${WRKSRC}/build/libparmetis/libparmetis.a ${PREFIX}/lib/parmetis
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Manual/manual.ps ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Manual/manual.pdf ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/math/parmetis/distinfo b/math/parmetis/distinfo
index 80130bd174be..7ebd92a87ff0 100644
--- a/math/parmetis/distinfo
+++ b/math/parmetis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ParMetis-3.1.tar.gz) = 11485828fe25436dc6d41cb048bc4b744969b51d4b751996007612aa95d5ff16
-SIZE (ParMetis-3.1.tar.gz) = 5286085
+SHA256 (parmetis-4.0.tar.gz) = 6f936a0552cdb1de485e5d9e3e8f0b4588abc24cee732da0b1f5c69e246a9a62
+SIZE (parmetis-4.0.tar.gz) = 5567866
diff --git a/math/parmetis/files/patch-aa b/math/parmetis/files/patch-aa
deleted file mode 100644
index a5f3a2aa61ef..000000000000
--- a/math/parmetis/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- ParMETISLib/stdheaders.h.orig	Wed Oct  8 11:34:41 2003
-+++ ParMETISLib/stdheaders.h	Wed Oct  8 11:34:53 2003
-@@ -14,7 +14,6 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#include <malloc.h>
- #include <string.h>
- #include <ctype.h>
- #include <math.h>
diff --git a/math/parmetis/files/patch-ab b/math/parmetis/files/patch-ab
deleted file mode 100644
index 09756660bccf..000000000000
--- a/math/parmetis/files/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in.orig	Mon Jun 10 15:07:32 2002
-+++ Makefile.in	Mon Jun 10 15:08:55 2002
-@@ -1,6 +1,6 @@
- 
- # Which compiler to use
--CC = mpicc
-+CC = ${LOCALBASE}/bin/mpicc
- 
- 
- # What optimization level to use
-@@ -13,7 +13,7 @@
- COPTIONS = 
- 
- # Which loader to use
--LD = mpicc
-+LD = ${LOCALBASE}/bin/mpicc
- 
- # In which directories to look for any additional libraries
- LIBDIR = 
diff --git a/math/parmetis/pkg-plist b/math/parmetis/pkg-plist
deleted file mode 100644
index a40deff11594..000000000000
--- a/math/parmetis/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/parmetis/parmetis.h
-lib/parmetis/libmetis.a
-lib/parmetis/libparmetis.a
-%%PORTDOCS%%%%DOCSDIR%%/manual.ps
-%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
-@dirrm include/parmetis
-@dirrm lib/parmetis
-%%PORTDOCS%%@dirrm %%DOCSDIR%%