Upgrade to 5.1.12b.

5 files changed, 77 insertions, 44 deletions

diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 8a1db7b1a9e2..dd4aad2f68f0 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -6,53 +6,75 @@
 #
 
 PORTNAME=	scotch
-PORTVERSION=	5.0.6
-PORTREVISION=	5
+DISTVERSION=	5.1.12b_esmumps
 CATEGORIES=	cad science
-MASTER_SITES=	http://gforge.inria.fr/frs/download.php/3795/
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	https://gforge.inria.fr/frs/download.php/28978/
+DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A package for graph and mesh partitioning and sparse matrix ordering
 
+LICENSE=	CeCILL_C
+LICENSE_NAME=	CeCILL-C
+LICENSE_FILE=	${WRKSRC}/doc/CeCILL-C_V1-en.txt
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
+CONFLICTS=	gbase-0.* gmap-2006.*
+
 USE_GMAKE=	yes
 .if defined(MAINTAINER_MODE)
 USE_FORTRAN=	yes
 .endif
 
-WRKSRC=		${WRKDIR}/${DISTNAME:R}
+WRKSRC=		${WRKDIR}/${DISTNAME:C/b_/_/}
 BUILD_WRKSRC=	${WRKSRC}/src
-INSTALL_WRKSRC=	${WRKSRC}/bin
 ALL_TARGET=	scotch
 
+CFLAGS+=	-I${LOCALBASE}/include
+
 VER=		${PORTVERSION:R}
 BINS=		acpl amk_ccc amk_fft2 amk_grf amk_hy amk_m2 amk_p2 atst	\
-		gbase gcv gmap gmk_hy gmk_m2 gmk_m3 gmk_msh gmk_ub2 gmtst gord\
-		gotst gout gtst mcv mmk_m2 mmk_m3 mord mtst
-INCS=		common.h scotch.h scotchf.h
-LIBS=		libcommon.a libscotch.a libscotcherr.a libscotcherrcom.a\
-		libscotchmetis.a
+		gbase gcv gmap gmk_hy gmk_m2 gmk_m3 gmk_msh gmk_ub2	\
+		gmtst gord gotst gout gpart gscat gtst mcv mmk_m2 mmk_m3\
+		mord mtst
+INCS=		esmumps.h scotch.h scotchf.h
+LIBS=		libesmumps.a libscotch.a libscotcherr.a libscotcherrexit.a libscotchmetis.a
 LICDOCS=	CeCILL-C_V1-en.txt CeCILL-C_V1-fr.txt
-PORTDOCS=	scotch_user${VER}.pdf
-EXAMPLES=	scotch_example.f
+DOCVER=		${PORTVERSION:R:R:R}
+PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf
+EXAMPLES=	scotch_example_1.f scotch_example_2.f90
+
+MAN1=		acpl.1 amk_ccc.1 amk_fft2.1 amk_grf.1 amk_hy.1 amk_m2.1 amk_p2.1	\
+		atst.1 dggath.1 dgmap.1 dgord.1 dgpart.1 dgscat.1 dgtst.1 gbase.1 gcv.1	\
+		gmap.1 gmk_hy.1 gmk_m2.1 gmk_m3.1 gmk_msh.1 gmk_ub2.1 gmtst.1 gord.1	\
+		gotst.1 gout.1 gpart.1 gtst.1 mcv.1 mmk_m2.1 mmk_m3.1 mord.1 mtst.1
 
 PKGMESSAGE=	${WRKSRC}/LICENSE_en.txt
 
 .if !defined(WITHOUT_MPI)
-BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
-RUN_DEPENDS+=	${LOCALBASE}/lib/libmpich.so:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	mpich.2:${PORTSDIR}/net/mpich2
 
 ALL_TARGET+=	ptscotch
+MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin PTHREAD_LIBS=${PTHREAD_LIBS}
 
 INCS+=		ptscotch.h ptscotchf.h
-LIBS+=		libptscotch.a libptscotcherr.a
-BINS+=		dgord dgscat dgtst
+LIBS+=		libptesmumps.a libptscotch.a libptscotcherr.a libptscotcherrexit.a	\
+		libptscotchparmetis.a
+BINS+=		dggath dgmap dgord dgpart dgscat dgtst
 
 PLIST_SUB+=	MPI=""
 .else
 PLIST_SUB+=	MPI="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+MF=	i686
+.else
+MF=	x86-64
+.endif
+
 pre-everything::
 .if !defined(WITHOUT_MPI)
 	@${ECHO_MSG}
@@ -61,17 +83,21 @@ pre-everything::
 .endif
 
 pre-configure:
-	${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.freebsd	\
+	${REINPLACE_CMD} -e 's/-lthread/$(PTHREAD_LIBS)/;s/-lpthread/$(PTHREAD_LIBS)/'	\
+		-e 's/CLIBFLAGS	=/CLIBFLAGS	= -fPIC/'	\
+		${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd
+	${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd	\
 		${WRKSRC}/src/Makefile.inc
 	${REINPLACE_CMD} -e 's|in subdirectory "doc"|under ${DATADIR}|'	\
 		${WRKSRC}/LICENSE_en.txt
 
 do-install:
-	${INSTALL_PROGRAM} ${BINS:S|^|${INSTALL_WRKSRC}/|} ${PREFIX}/bin
-	${INSTALL_DATA} ${INCS:S|^|${INSTALL_WRKSRC}/|} ${PREFIX}/include
-	${INSTALL_DATA} ${LIBS:S|^|${INSTALL_WRKSRC}/|} ${PREFIX}/lib
+	${INSTALL_PROGRAM} ${BINS:S|^|${WRKSRC}/bin/|} ${PREFIX}/bin
+	${INSTALL_DATA} ${INCS:S|^|${WRKSRC}/include/|} ${PREFIX}/include
+	${INSTALL_DATA} ${LIBS:S|^|${WRKSRC}/lib/|} ${PREFIX}/lib
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${LICDOCS:S|^|${WRKSRC}/doc/|} ${DATADIR}
+	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/man/man1/|} ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
@@ -79,7 +105,7 @@ do-install:
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}/grf ${EXAMPLESDIR}/tgt
-	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/doc/|} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${EXAMPLESDIR}/tgt
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
@@ -95,8 +121,8 @@ regression-test:	install
 	(amk_ccc 3 | acpl - ${WRKDIR}/ccc3.tgt &&	\
 	${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz |	\
 	gmap - ${WRKDIR}/ccc3.tgt ${WRKDIR}/brol.map)
-	(cd ${WRKSRC}/doc &&	\
-	${FC} -o scotch_test scotch_example.f	\
+	(cd ${WRKSRC}/examples &&	\
+	${FC} -o scotch_test scotch_example_1.f	\
 		-I${PREFIX}/include -L${PREFIX}/lib -lscotch -lscotcherr -lm	\
 	&& ./scotch_test)
 . if !defined(WITHOUT_MPI)
@@ -104,4 +130,4 @@ regression-test:	install
 . endif
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/cad/scotch/distinfo b/cad/scotch/distinfo
index b3bab1a9d07c..b03abea68b4d 100644
--- a/cad/scotch/distinfo
+++ b/cad/scotch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (scotch_5.0.6.tar.gz) = 53e5d8bc79b37c025ca3e6c036f58ad75cf2672e937d6c9ce4b7a29f6ef711b7
-SIZE (scotch_5.0.6.tar.gz) = 3433705
+SHA256 (scotch_5.1.12b_esmumps.tar.gz) = 82654e63398529cd3bcc8eefdd51d3b3161c0429bb11770e31f8eb0c3790db6e
+SIZE (scotch_5.1.12b_esmumps.tar.gz) = 3989632
diff --git a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.freebsd b/cad/scotch/files/patch-src_Make.inc_Makefile.inc.freebsd
deleted file mode 100644
index 73ed345cebed..000000000000
--- a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.freebsd
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Make.inc/Makefile.inc.freebsd.orig	2010-02-15 11:04:45.000000000 +0600
-+++ src/Make.inc/Makefile.inc.freebsd	2010-02-15 11:05:03.000000000 +0600
-@@ -7,8 +7,8 @@
- ARFLAGS	= -ruv
- CAT	= cat
- CCP     = mpicc
--CFLAGS	+= -I. -I../../bin -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD
--LDFLAGS	+= -L../../bin -lm
-+CFLAGS	+= -I. -I../../bin -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_PTHREAD -fPIC
-+LDFLAGS	+= -L../../bin -lm -fPIC
- CP	= cp
- LEX	= flex
- MV	= mv
diff --git a/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64_pc_freebsd b/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64_pc_freebsd
new file mode 100644
index 000000000000..72afc206d116
--- /dev/null
+++ b/cad/scotch/files/patch-src_Make.inc_Makefile.inc.x86-64_pc_freebsd
@@ -0,0 +1,11 @@
+--- src/Make.inc/Makefile.inc.x86-64_pc_freebsd.orig	2011-01-06 22:39:49.000000000 +0100
++++ src/Make.inc/Makefile.inc.x86-64_pc_freebsd	2012-04-14 12:13:39.000000000 +0200
+@@ -9,7 +9,7 @@
+ CCS		= cc
+ CCP		= mpicc
+ CCD		= cc
+-CFLAGS		+= -std -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64
++CFLAGS		+= -std=c99 -fPIC -DCOMMON_FILE_COMPRESS_GZ -DCOMMON_PTHREAD -DCOMMON_RANDOM_FIXED_SEED -DSCOTCH_RENAME -DSCOTCH_RENAME_PARSER -DSCOTCH_PTHREAD -Drestrict=__restrict -DIDXSIZE64
+ CLIBFLAGS	=
+ LDFLAGS		+= -lz -lm -lthread
+ CP		= cp
diff --git a/cad/scotch/pkg-plist b/cad/scotch/pkg-plist
index 61a38427a009..ef917927760c 100644
--- a/cad/scotch/pkg-plist
+++ b/cad/scotch/pkg-plist
@@ -6,7 +6,10 @@ bin/amk_hy
 bin/amk_m2
 bin/amk_p2
 bin/atst
+%%MPI%%bin/dggath
+%%MPI%%bin/dgmap
 %%MPI%%bin/dgord
+%%MPI%%bin/dgpart
 %%MPI%%bin/dgscat
 %%MPI%%bin/dgtst
 bin/gbase
@@ -21,23 +24,28 @@ bin/gmtst
 bin/gord
 bin/gotst
 bin/gout
+bin/gpart
+bin/gscat
 bin/gtst
 bin/mcv
 bin/mmk_m2
 bin/mmk_m3
 bin/mord
 bin/mtst
-include/common.h
+include/esmumps.h
 %%MPI%%include/ptscotch.h
 %%MPI%%include/ptscotchf.h
 include/scotch.h
 include/scotchf.h
-lib/libcommon.a
+lib/libesmumps.a
+%%MPI%%lib/libptesmumps.a
 %%MPI%%lib/libptscotch.a
 %%MPI%%lib/libptscotcherr.a
+%%MPI%%lib/libptscotcherrexit.a
+%%MPI%%lib/libptscotchparmetis.a
 lib/libscotch.a
 lib/libscotcherr.a
-lib/libscotcherrcom.a
+lib/libscotcherrexit.a
 lib/libscotchmetis.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
@@ -47,7 +55,8 @@ lib/libscotchmetis.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.xyz.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example.f
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example_1.f
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example_2.f90
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/SP2_16.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h1.tgt