4 files changed, 35 insertions, 22 deletions

diff --git a/math/metis-edf/Makefile b/math/metis-edf/Makefile
index 2e079a5be9e6..d27ed72c0ac5 100644
--- a/math/metis-edf/Makefile
+++ b/math/metis-edf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	metis-edf
 DISTVERSIONPREFIX=	full-src-
-DISTVERSION=	4.1-1
+DISTVERSION=	4.1-2
 DISTVERSIONSUFFIX=	.noarch
 PORTREVISION=	1
 CATEGORIES=	math
@@ -19,8 +19,8 @@ COMMENT=	Meshes partionning tool used by Code_Aster
 
 CONFLICTS=	metis-[0-9]*
 
-ASTER_VER=	9.4.0
-ASTER_DISTVERSION=	${ASTER_VER}-2
+ASTER_VER=	10.1.0
+ASTER_DISTVERSION=	${ASTER_VER}-4
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
 
 ALL_TARGET=	default
@@ -31,7 +31,7 @@ REINPLACE_ARGS=	-i ""
 USE_FORTRAN=	yes
 FFLAGS+=	-O2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+WRKSRC=		${WRKDIR}/${PORTNAME:C/-/_/}-${PORTVERSION:R}
 
 PROGS=		kmetis onmetis.exe pmetis
 DOCS=		CHANGES Doc/manual.ps README_Code_Aster
@@ -44,7 +44,7 @@ GCCLIBDIR=	-L`${CAT} ${WRKSRC}/LIBDIR` -L`${CAT} ${WRKSRC}/LIBDIR`/../../..
 
 post-extract:
 	(cd ${WRKDIR} &&	\
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME}-${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME:C/-/_/}-${DISTVERSION}${DISTVERSIONSUFFIX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS})
 
 pre-configure:
 .if ${MACHINEARCH} != "i386"
@@ -58,13 +58,14 @@ pre-configure:
 	${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
+	${REINPLACE_CMD} -e 's|$$prefix|${PREFIX}/bin|' ${WRKSRC}/CONFIG/onmetis.in
+	${REINPLACE_CMD} -e 's|$$prefix|${WRKSRC}|' ${WRKSRC}/onmetis
 
 do-install:
 	${CP} ${WRKSRC}/CONFIG/onmetis.in ${WRKSRC}/onmetis
 	${REINPLACE_CMD} -e "s#HOME_METIS#${PREFIX}/bin#" ${WRKSRC}/onmetis
 	${INSTALL_SCRIPT} ${WRKSRC}/onmetis ${PREFIX}/bin
+	${REINPLACE_CMD} -e 's|${WRKSRC}|${PREFIX}/bin|' ${PREFIX}/bin/onmetis
 	${INSTALL_PROGRAM} ${PROGS:S|^|${WRKSRC}/|} ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libmetis.a ${PREFIX}/lib
 
diff --git a/math/metis-edf/distinfo b/math/metis-edf/distinfo
index e8345165e666..74854df498b7 100644
--- a/math/metis-edf/distinfo
+++ b/math/metis-edf/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (aster-full-src-10.1.0-4.noarch.tar.gz) = 49fe55a0a46491124c16965a2db59c5e
+SHA256 (aster-full-src-10.1.0-4.noarch.tar.gz) = c72f82abadb627925cbc5cbf9909f969e4c60f29325a62d78664eb03a860468a
+SIZE (aster-full-src-10.1.0-4.noarch.tar.gz) = 163690307
diff --git a/math/metis-edf/files/patch-CONFIG_onmetis.in b/math/metis-edf/files/patch-CONFIG_onmetis.in
index d6671aa4ce9c..e04195c98c55 100644
--- a/math/metis-edf/files/patch-CONFIG_onmetis.in
+++ b/math/metis-edf/files/patch-CONFIG_onmetis.in
@@ -1,14 +1,22 @@
---- CONFIG/onmetis.in.orig	2008-12-16 13:28:55.000000000 +0100
-+++ CONFIG/onmetis.in	2009-01-19 21:56:08.000000000 +0100
+--- CONFIG/onmetis.in.orig	2009-12-03 11:35:06.000000000 +0100
++++ CONFIG/onmetis.in	2010-01-31 13:41:59.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 @@
+@@ -8,17 +8,8 @@
+ #  $3 : result file (default fort.85)
+ #
  # install directory
- METIS_INSTALL=HOME_METIS
+-set_prefix() {
+-   local this=`readlink -n -f $1`
+-   prefix=`dirname $this`
+-}
+-
+-set_prefix $0
+ METIS_INSTALL=$prefix
  
 -LD_LIBRARY_PATH=LD_LIB_PATH_VALUE:$LD_LIBRARY_PATH
 -export LD_LIBRARY_PATH
diff --git a/math/metis-edf/files/patch-onmetis b/math/metis-edf/files/patch-onmetis
index 6f6df1230299..d8c19fd0e4f8 100644
--- a/math/metis-edf/files/patch-onmetis
+++ b/math/metis-edf/files/patch-onmetis
@@ -1,17 +1,21 @@
---- onmetis.orig	2008-12-16 13:27:51.000000000 +0100
-+++ onmetis	2009-01-19 21:52:01.000000000 +0100
+--- onmetis.orig	2009-12-03 14:51:21.000000000 +0100
++++ onmetis	2010-01-31 13:43:11.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 @@
+@@ -8,12 +8,6 @@
+ #  $3 : result file (default fort.85)
+ #
  # 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
+-set_prefix() {
+-   local this=`readlink -n -f $1`
+-   prefix=`dirname $this`
+-}
 -
- repinit=`pwd`
- tmp_metis=$repinit/dir_metis
+-set_prefix $0
+ METIS_INSTALL=$prefix
  
+ LD_LIBRARY_PATH=LD_LIB_PATH_VALUE:$LD_LIBRARY_PATH