3 files changed, 43 insertions, 10 deletions

diff --git a/math/parmetis/Makefile b/math/parmetis/Makefile
index 29bba9c364d2..f04796b2f6d8 100644
--- a/math/parmetis/Makefile
+++ b/math/parmetis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ParMetis
 PORTVERSION=	4.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math parallel
 MASTER_SITES=	http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/
 DISTNAME=	${PORTNAME:tl}-${PORTVERSION}
@@ -16,8 +16,12 @@ LICENSE_NAME=	University of Minnesota METIS License
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LICENSE_PERMS=	auto-accept
 
-OPTIONS_DEFINE=	OPENMPI DOCS
+USES=		cmake:noninja gmake
+USE_LDCONFIG=	${PREFIX}/lib/parmetis
+
+OPTIONS_DEFINE=	OPENMPI DOCS STATIC
 OPENMPI_DESC=	Use openmpi instead of mpich
+OPTIONS_SUB=	yes
 
 OPENMPI_BUILD_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpicc:net/openmpi
 OPENMPI_RUN_DEPENDS=		${LOCALBASE}/mpi/openmpi/bin/mpirun:net/openmpi
@@ -28,17 +32,14 @@ OPENMPI_RUN_DEPENDS_OFF=	${LOCALBASE}/bin/mpirun:net/mpich
 OPENMPI_VARS_OFF=		MPICC=${LOCALBASE}/bin/mpicc \
 				MPICXX=${LOCALBASE}/bin/mpicxx
 
-USES=		cmake:noninja gmake
+STATIC_DESC=			Do not build and install shared library
+STATIC_VARS_OFF=		SH_FLAG="shared=1"
 
-PLIST_FILES=	include/parmetis/metis.h \
-		include/parmetis/parmetis.h \
-		lib/parmetis/libmetis.a \
-		lib/parmetis/libparmetis.a \
-		${DOCSDIR}/manual.pdf
+CFLAGS+=	-fPIC
 
 .include <bsd.port.options.mk>
 
-post-patch:
+pre-configure:
 	@${REINPLACE_CMD} -e \
 		's|BUILDDIR =.*|BUILDDIR = build| ; \
 		 s|make -C|$$(MAKE) -C| ; \
@@ -56,7 +57,7 @@ post-patch:
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-		${MAKEFILE} config prefix="${PREFIX}" cc="${MPICC}" cxx="${MPICXX}"
+		${MAKEFILE} config prefix="${PREFIX}" cc="${MPICC}" cxx="${MPICXX}" ${SH_FLAG}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/parmetis \
@@ -65,10 +66,20 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/parmetis.h \
 		${WRKSRC}/metis/include/metis.h \
 		${STAGEDIR}${PREFIX}/include/parmetis
+.if ${PORT_OPTIONS:MSTATIC}
 	${INSTALL_DATA} ${WRKSRC}/build/libmetis/libmetis.a \
 		${STAGEDIR}${PREFIX}/lib/parmetis
 	${INSTALL_DATA} ${WRKSRC}/build/libparmetis/libparmetis.a \
 		${STAGEDIR}${PREFIX}/lib/parmetis
+.else
+	${INSTALL_DATA} ${WRKSRC}/build/libmetis/libmetis.so \
+		${STAGEDIR}${PREFIX}/lib/parmetis/libmetis.so.2
+	${INSTALL_LIB} ${WRKSRC}/build/libparmetis/libparmetis.so \
+		${STAGEDIR}${PREFIX}/lib/parmetis/libparmetis.so.2
+	cd ${STAGEDIR}${PREFIX}/lib/parmetis &&	\
+		${LN} -sf libmetis.so.2 ${STAGEDIR}${PREFIX}/lib/parmetis/libmetis.so && \
+		${LN} -sf libparmetis.so.2 ${STAGEDIR}${PREFIX}/lib/parmetis/libparmetis.so
+.endif
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/manual/manual.pdf ${STAGEDIR}${DOCSDIR}
 
diff --git a/math/parmetis/files/patch-CMakeLists.txt b/math/parmetis/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..fbdbe348b487
--- /dev/null
+++ b/math/parmetis/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2013-03-30 16:24:50 UTC
++++ CMakeLists.txt
+@@ -19,8 +19,10 @@ execute_process(COMMAND ${CMAKE_COMMAND}
+ # Prepare libraries.
+ if(SHARED)
+   set(ParMETIS_LIBRARY_TYPE SHARED)
++  set(METIS_LIBRARY_TYPE SHARED)
+ else()
+   set(ParMETIS_LIBRARY_TYPE STATIC)
++  set(METIS_LIBRARY_TYPE STATIC)
+ endif()
+ 
+ include(${GKLIB_PATH}/GKlibSystem.cmake)
diff --git a/math/parmetis/pkg-plist b/math/parmetis/pkg-plist
new file mode 100644
index 000000000000..a7b45f0eadc1
--- /dev/null
+++ b/math/parmetis/pkg-plist
@@ -0,0 +1,9 @@
+include/parmetis/metis.h
+include/parmetis/parmetis.h
+%%STATIC%%lib/parmetis/libmetis.a
+%%NO_STATIC%%lib/parmetis/libmetis.so
+%%NO_STATIC%%lib/parmetis/libmetis.so.2
+%%STATIC%%lib/parmetis/libparmetis.a
+%%NO_STATIC%%lib/parmetis/libparmetis.so
+%%NO_STATIC%%lib/parmetis/libparmetis.so.2
+%%DOCSDIR%%/manual.pdf