Update to 4.0-2.

4 files changed, 65 insertions, 59 deletions

diff --git a/math/metis-edf/Makefile b/math/metis-edf/Makefile
index 4c221f7f51a1..81aa2abb56c0 100644
--- a/math/metis-edf/Makefile
+++ b/math/metis-edf/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	metis-edf
-PORTVERSION=	4.0
+DISTVERSION=	4.0-2
 CATEGORIES=	math
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1.noarch
+DISTNAME=	${PORTNAME}-src-${DISTVERSION}.noarch
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Meshes partionning tool used by Code_Aster
@@ -24,7 +24,7 @@ REINPLACE_ARGS=	-i ""
 F77?=		f77
 FFLAGS?=	-O2
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 PROGS=		kmetis onmetis.exe pmetis
 
diff --git a/math/metis-edf/distinfo b/math/metis-edf/distinfo
index a573d2c06374..22edbd1a88d6 100644
--- a/math/metis-edf/distinfo
+++ b/math/metis-edf/distinfo
@@ -1,3 +1,3 @@
-MD5 (metis-edf-src-4.0-1.noarch.tar.gz) = 84cfd72d88b890125a57e67f49ea6404
-SHA256 (metis-edf-src-4.0-1.noarch.tar.gz) = cd873bd98b235d33b2b73bb117021687c78aa7497d35df1186773ea4c2586cc9
-SIZE (metis-edf-src-4.0-1.noarch.tar.gz) = 700480
+MD5 (metis-edf-src-4.0-2.noarch.tar.gz) = a0fc7c5d842f01602ee8082f7d6b773c
+SHA256 (metis-edf-src-4.0-2.noarch.tar.gz) = 242e7c5a0931b7eb59c4d7679436147514680e65e7015e59839c2a63d5afb10a
+SIZE (metis-edf-src-4.0-2.noarch.tar.gz) = 700618
diff --git a/math/metis-edf/files/patch-CONFIG::configure b/math/metis-edf/files/patch-CONFIG::configure
index 72bc1f1c3d14..075b4f85ad8a 100644
--- a/math/metis-edf/files/patch-CONFIG::configure
+++ b/math/metis-edf/files/patch-CONFIG::configure
@@ -1,53 +1,59 @@
---- CONFIG/configure.orig	Mon Dec 16 18:11:44 2002
-+++ CONFIG/configure	Tue Aug 12 22:47:59 2003
-@@ -4,6 +4,7 @@
- # SHELL defined by make (sh)
- 
- OS_TYPE=`uname -s`
-+ARCHI=`uname -p`
- if [ $OS_TYPE = "SunOS" ]; then
-  	OS_LEVEL=`uname -r`
-    OS_NIV=`echo $OS_LEVEL | awk -F'.' '{print $2}'`
-@@ -18,7 +19,7 @@
+--- CONFIG/configure.orig	Thu Dec 22 17:48:14 2005
++++ CONFIG/configure	Mon Jan  9 22:10:02 2006
+@@ -20,7 +20,7 @@
     if [ -z "$rtn" ] || [ "$rtn" = "y" -o "$rtn" = "Y" ]; then
        OS_TYPE=SunOS64
     fi
--elif [ $OS_TYPE != "OSF1" -a $OS_TYPE != "IRIX64" -a $OS_TYPE != "Linux" ]; then
-+elif [ $OS_TYPE != "OSF1" -a $OS_TYPE != "IRIX64" -a $OS_TYPE != "Linux" -a $OS_TYPE != "FreeBSD" ]; then
- 	echo " Operating system $OS_TYPE unknown on this distribution"
- 	echo " Installation failed !"
+-elif [ $OS_TYPE != "OSF1" -a $OS_TYPE != "IRIX64" -a $OS_TYPE != "Linux" -a $OS_TYPE != "CYGWIN_NT-5.1" ]; then
++elif [ $OS_TYPE != "OSF1" -a $OS_TYPE != "IRIX64" -a $OS_TYPE != "Linux" -a $OS_TYPE != "FreeBSD" -a $OS_TYPE != "CYGWIN_NT-5.1" ]; then
+    echo " Operating system $OS_TYPE unknown on this distribution"
+    echo " Installation failed !"
     exit 8
-@@ -30,14 +31,25 @@
- # FOPTIONS : Fortran compiler options,
- # LDOPTIONS : link options, AR : archiver
- 
--CC="cc"
--F90="f90"
--LD="$F90"
--COPTIONS=""
--FOPTIONS=""
--LDOPTIONS="-L. -L.."
--OPTFLAGS="-O"
--AR="ar rv"
-+if [ $OS_TYPE = "FreeBSD" ]; then
-+   CC="$CC"
-+   F90="$F77"
-+   LD="$CC -v"
-+   COPTIONS="$CFLAGS"
+@@ -52,6 +52,15 @@
+     F90_TEMP="g77"
+     LD_TEMP="g77"
+   fi
++elif [ $OS_TYPE = "FreeBSD" ]; then
++   CC_TEMP="$CC"
++   F90_TEMP="$F77"
++   LD_TEMP="$CC -v"
++   COPTIONS_TEMP="$CFLAGS"
 +   OPTFLAGS=""
-+   FOPTIONS="$FFLAGS"
-+   LDOPTIONS="$LDFLAGS -L. -L.."
-+   AR="$AR rv"
-+else
-+   CC="cc"
-+   F90="f90"
-+   LD="$F90"
-+   COPTIONS=""
-+   FOPTIONS=""
-+   LDOPTIONS="-L. -L.."
-+   OPTFLAGS="-O"
-+   AR="ar rv"
-+fi
- if [ $OS_TYPE = "Linux" ]; then
-    CC="gcc"
-    F90="g77"
++   FOPTIONS_TEMP="$FFLAGS"
++   LDOPTIONS_TEMP="$LDFLAGS -L. -L.."
++   AR_TEMP="$AR rv"
+ elif [ $OS_TYPE = "CYGWIN_NT-5.1" ]; then
+   CC_TEMP="gcc"
+   F90_TEMP="g77"
+@@ -76,31 +85,6 @@
+ if [ -f Makefile.in ]; then
+    rm -f Makefile.in
+ fi
+-
+-
+-
+-if [ "$CC" != "" ] ; then
+- CC_TEMP=$CC
+-fi
+-if [ "$F77" != "" ] ; then
+- F90_TEMP=$F77
+-fi
+-if [ "$LD" != "" ] ; then
+- LD_TEMP=$LD
+-fi
+-if [ "$CFLAGS" != "" ] ; then
+- COPTIONS_TEMP=$CFLAGS
+-fi
+-if [ "$FFLAGS" != "" ] ; then
+- FOPTIONS_TEMP=$FFLAGS
+-fi
+-if [ "$LDFLAGS" != "" ] ; then
+- LDOPTIONS_TEMP="$LDFLAGS -L. -L.."
+-fi
+-if [ "$AR" != "" ] ; then
+- AR_TEMP=$AR
+-fi
+-
+ 
+ cat << EOF > Makefile.in
+ # Generated by CONFIG/configure
diff --git a/math/metis-edf/files/patch-Programs::Makefile b/math/metis-edf/files/patch-Programs::Makefile
index fccd5479424e..ed1ddc472c82 100644
--- a/math/metis-edf/files/patch-Programs::Makefile
+++ b/math/metis-edf/files/patch-Programs::Makefile
@@ -1,11 +1,11 @@
---- Programs/Makefile.orig	Thu Dec 12 13:47:59 2002
-+++ Programs/Makefile	Wed Aug 13 15:10:19 2003
+--- Programs/Makefile.orig	Thu Dec 22 14:13:25 2005
++++ Programs/Makefile	Mon Jan  9 22:03:11 2006
 @@ -5,7 +5,7 @@
  INCLUDES = -I../Lib 
- CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
- FFLAGS = $(FOPTIONS) $(OPTFLAGS) $(INCLUDES)
+ CFLAGS = $(COPTIONS) $(INCLUDES)
+ FFLAGS = $(FOPTIONS) $(INCLUDES)
 -LIBS = -lmetis -lm
-+LIBS = -lmetis -lm  -lg2c
++LIBS = -lmetis -lm -lg2c
  METISLIB = ../libmetis.a