- Upgrade to 4.1.1;

- Use aster's distfiles.

5 files changed, 72 insertions, 18 deletions

diff --git a/math/metis-edf/Makefile b/math/metis-edf/Makefile
index ce67ebd66967..98d63d6f53c7 100644
--- a/math/metis-edf/Makefile
+++ b/math/metis-edf/Makefile
@@ -6,17 +6,22 @@
 #
 
 PORTNAME=	metis-edf
-DISTVERSION=	4.0-3
-PORTREVISION=	2
+DISTVERSIONPREFIX=	full-src-
+DISTVERSION=	4.1-1
+DISTVERSIONSUFFIX=	.noarch
 CATEGORIES=	math
-MASTER_SITES=	http://www.code-aster.org/FICHIERS/
-DISTNAME=	${PORTNAME}-${DISTVERSION}.noarch
+MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
+DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meshes partionning tool used by Code_Aster
 
 CONFLICTS=	metis-[0-9]*
 
+ASTER_VER=	9.4.0
+ASTER_DISTVERSION=	${ASTER_VER}-2
+EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
+
 ALL_TARGET=	default
 MAKE_ENV+=	AR="${AR}"
 REINPLACE_ARGS=	-i ""
@@ -27,6 +32,7 @@ FFLAGS+=	-O2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 PROGS=		kmetis onmetis.exe pmetis
+DOCS=		CHANGES Doc/manual.ps README_Code_Aster
 
 MACHINEARCH=	${ARCH}
 FORTRANLIBS=	-lgfortranbegin -lgfortran
@@ -34,32 +40,43 @@ GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 
 .include <bsd.port.pre.mk>
 
+post-extract:
+	(cd ${WRKDIR} &&	\
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
+
 pre-configure:
 .if ${MACHINEARCH} != "i386"
-	@${FIND} ${WRKSRC} -type f -name "*.c" -o -name "*.h" | ${XARGS}	\
+	${FIND} ${WRKSRC} -type f -name "*.c" -o -name "*.h" | ${XARGS}	\
 		${REINPLACE_CMD} -e "s|long int|int|g"				\
 			-e "s|long|int|g"					\
 			-e "s|\(%[[:digit:]]\)ld|\1d|g"				\
 			-e "s|\(%[[:digit:]]\.[[:digit:]]\)le|\1e|g"		\
 			-e "s|%ld|%d|g"
 .endif
-	@${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
-	@${REINPLACE_CMD} -e 's|%%FORTRANLIBS%%|${FORTRANLIBS}|g' -e 's|%%GCCLIBDIR%%|${GCCLIBDIR}|g' ${WRKSRC}/Programs/Makefile
+	${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
+	${REINPLACE_CMD} -e 's|%%FORTRANLIBS%%|${FORTRANLIBS}|g' -e 's|%%GCCLIBDIR%%|${GCCLIBDIR}|g'\
+		${WRKSRC}/Programs/Makefile
+	${REINPLACE_CMD} -e 's|/home01/courtois/PKG/BUILD/METIS/metis-edf-${PORTVERSION:R}|${WRKSRC}|'\
+		${WRKSRC}/onmetis
 
 do-install:
-	@${CP} ${WRKSRC}/CONFIG/onmetis.in ${WRKSRC}/onmetis
-	@${REINPLACE_CMD} -e "s#HOME_METIS#${PREFIX}/bin#" ${WRKSRC}/onmetis
+	${CP} ${WRKSRC}/CONFIG/onmetis.in ${WRKSRC}/onmetis
+	${REINPLACE_CMD} -e "s#HOME_METIS#${PREFIX}/bin#" ${WRKSRC}/onmetis
 	${INSTALL_SCRIPT} ${WRKSRC}/onmetis ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${PROGS:S|^|${WRKSRC}/|} ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libmetis.a ${PREFIX}/lib
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Doc/manual.ps ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}
+. for df in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${df} ${DOCSDIR}
+. endfor
 	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/Test/fort.81 ${EXAMPLESDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/Test/fort.81 ${EXAMPLESDIR}
 	@${ECHO_MSG} "===> Test file installed in ${EXAMPLESDIR}."
 .endif
 
diff --git a/math/metis-edf/distinfo b/math/metis-edf/distinfo
index b17c7061ccda..e8345165e666 100644
--- a/math/metis-edf/distinfo
+++ b/math/metis-edf/distinfo
@@ -1,3 +1,3 @@
-MD5 (metis-edf-4.0-3.noarch.tar.gz) = d549e470b33f468079de23052b971509
-SHA256 (metis-edf-4.0-3.noarch.tar.gz) = 65604cc49cf55d9f6a5f09a7fc78d89be91411b78120a2359645e586ac197145
-SIZE (metis-edf-4.0-3.noarch.tar.gz) = 700612
+MD5 (aster-full-src-9.4.0-2.noarch.tar.gz) = d28a1aee23413239166e77d4e934395a
+SHA256 (aster-full-src-9.4.0-2.noarch.tar.gz) = ab46cac1f1606c1cacda35befd0a8c7992bd2c4568e2f0b59f26676dd5fe38f3
+SIZE (aster-full-src-9.4.0-2.noarch.tar.gz) = 149933404
diff --git a/math/metis-edf/files/patch-CONFIG_onmetis.in b/math/metis-edf/files/patch-CONFIG_onmetis.in
new file mode 100644
index 000000000000..d6671aa4ce9c
--- /dev/null
+++ b/math/metis-edf/files/patch-CONFIG_onmetis.in
@@ -0,0 +1,18 @@
+--- CONFIG/onmetis.in.orig	2008-12-16 13:28:55.000000000 +0100
++++ CONFIG/onmetis.in	2009-01-19 21:56:08.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! /bin/sh
+ #
+ # shell-script to call METIS from CODE_ASTER
+ #  $1 : data file for METIS (numerotation)
+@@ -10,9 +10,6 @@
+ # install directory
+ METIS_INSTALL=HOME_METIS
+ 
+-LD_LIBRARY_PATH=LD_LIB_PATH_VALUE:$LD_LIBRARY_PATH
+-export LD_LIBRARY_PATH
+-
+ repinit=`pwd`
+ tmp_metis=$repinit/dir_metis
+ 
diff --git a/math/metis-edf/files/patch-onmetis b/math/metis-edf/files/patch-onmetis
new file mode 100644
index 000000000000..6f6df1230299
--- /dev/null
+++ b/math/metis-edf/files/patch-onmetis
@@ -0,0 +1,17 @@
+--- onmetis.orig	2008-12-16 13:27:51.000000000 +0100
++++ onmetis	2009-01-19 21:52:01.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#! /bin/sh
+ #
+ # shell-script to call METIS from CODE_ASTER
+ #  $1 : data file for METIS (numerotation)
+@@ -10,8 +10,6 @@
+ # install directory
+ METIS_INSTALL=/home01/courtois/PKG/BUILD/METIS/metis-edf-4.1
+ 
+-export LD_LIBRARY_PATH=/usr/share/lsf/6.2/linux2.6-glibc2.3-ia64/lib:/opt/intelruntime:/opt/mpi/mpibull2-1.3.5-1.t/lib/drivers/qxelan:/opt/mpi/mpibull2-1.3.5-1.t/lib/:/opt/mpi/mpibull2-1.3.5-1.t/lib/mpianalyser/modules:/usr/share/lsf/6.2/linux2.6-glibc2.3-ia64/lib:/usr/lib:/usr/lib64:/opt/mpi/mpibull2-1.3.5-1.t/lib/pmi:$LD_LIBRARY_PATH
+-
+ repinit=`pwd`
+ tmp_metis=$repinit/dir_metis
+ 
diff --git a/math/metis-edf/pkg-plist b/math/metis-edf/pkg-plist
index fc3d46f66745..c7edb5cb8833 100644
--- a/math/metis-edf/pkg-plist
+++ b/math/metis-edf/pkg-plist
@@ -3,7 +3,9 @@ bin/onmetis
 bin/onmetis.exe
 bin/pmetis
 lib/libmetis.a
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/README_Code_Aster
 %%PORTDOCS%%%%DOCSDIR%%/manual.ps
-%%PORTDOCS%%%%EXAMPLESDIR%%/fort.81
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fort.81
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%