Attachment 34118 Details for Bug 55544 – metis-edf.diff

[patch] metis-edf.diff

metis-edf.diff (text/plain), 3.63 KB, created by Thierry Thomas on 2003-08-13 15:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2003-08-13 15:10:06 UTC

Size: 3.63 KB

patch

obsolete

>diff -urN cad/metis-edf.orig/Makefile cad/metis-edf/Makefile
>--- cad/metis-edf.orig/Makefile	Thu Jul 24 23:08:11 2003
>+++ cad/metis-edf/Makefile	Wed Aug 13 15:14:05 2003
>@@ -7,6 +7,7 @@
> 
> PORTNAME=	metis-edf
> PORTVERSION=	3
>+PORTREVISION=	1
> CATEGORIES=	cad
> MASTER_SITES=	http://www.code-aster.org/FICHIERS/metis/
> 
>@@ -16,10 +17,22 @@
> CONFLICTS=	metis-[0-9]*
> 
> ALL_TARGET=	default
>-MAKE_ENV+=	CC="${CC}" AR="${AR}" LD="${LD}" F77="${F77}"
>+MAKE_ENV+=	CC="${CC}" AR="${AR}" F77="${F77}" FFLAGS="${FFLAGS}"
> USE_REINPLACE=	yes
>+REINPLACE_ARGS=	-i ""
> 
> F77?=		f77
>+FFLAGS?=	-O2
>+
>+post-patch:
>+.if ${MACHINE_ARCH} != "i386"
>+	@${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
> 
> do-install:
> 	@${CP} ${WRKSRC}/CONFIG/onmetis.in ${WRKSRC}/onmetis
>diff -urN cad/metis-edf.orig/files/patch-CONFIG::configure cad/metis-edf/files/patch-CONFIG::configure
>--- cad/metis-edf.orig/files/patch-CONFIG::configure	Sun Jun 29 18:39:40 2003
>+++ cad/metis-edf/files/patch-CONFIG::configure	Wed Aug 13 15:04:47 2003
>@@ -1,6 +1,14 @@
> --- CONFIG/configure.orig	Mon Dec 16 18:11:44 2002
>-+++ CONFIG/configure	Sun Jun 29 14:58:48 2003
>-@@ -18,7 +18,7 @@
>++++ 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 @@
>     if [ -z "$rtn" ] || [ "$rtn" = "y" -o "$rtn" = "Y" ]; then
>        OS_TYPE=SunOS64
>     fi
>@@ -9,7 +17,7 @@
>  	echo " Operating system $OS_TYPE unknown on this distribution"
>  	echo " Installation failed !"
>     exit 8
>-@@ -30,14 +30,23 @@
>+@@ -30,14 +31,25 @@
>  # FOPTIONS : Fortran compiler options,
>  # LDOPTIONS : link options, AR : archiver
>  
>@@ -24,9 +32,11 @@
> +if [ $OS_TYPE = "FreeBSD" ]; then
> +   CC="$CC"
> +   F90="$F77"
>-+   LD="$LD"
>++   LD="$CC -v"
> +   COPTIONS="$CFLAGS"
>-+   LDOPTIONS="$LDFLAGS -lc -lg2c -L. -L.."
>++   OPTFLAGS=""
>++   FOPTIONS="$FFLAGS"
>++   LDOPTIONS="$LDFLAGS -L. -L.."
> +   AR="$AR rv"
> +else
> +   CC="cc"
>diff -urN cad/metis-edf.orig/files/patch-Lib::proto.h cad/metis-edf/files/patch-Lib::proto.h
>--- cad/metis-edf.orig/files/patch-Lib::proto.h	Thu Jan  1 01:00:00 1970
>+++ cad/metis-edf/files/patch-Lib::proto.h	Tue Aug 12 23:01:41 2003
>@@ -0,0 +1,12 @@
>+--- Lib/proto.h.orig	Thu Dec 12 13:47:59 2002
>++++ Lib/proto.h	Tue Aug 12 22:53:22 2003
>+@@ -456,7 +456,9 @@
>+  void saxpy(long, float, float *, long, float *, long); 
>+  void RandomPermute(long, idxtype *, long); 
>+  double drand48(); 
>++#if !defined(__FreeBSD__)
>+  void srand48(long); 
>++#endif
>+  long ispow2(long); 
>+  void InitRandom(long); 
>+  long log2(long); 
>diff -urN cad/metis-edf.orig/files/patch-Programs::Makefile cad/metis-edf/files/patch-Programs::Makefile
>--- cad/metis-edf.orig/files/patch-Programs::Makefile	Sun Jun 29 18:39:40 2003
>+++ cad/metis-edf/files/patch-Programs::Makefile	Wed Aug 13 15:10:51 2003
>@@ -1,11 +1,11 @@
> --- Programs/Makefile.orig	Thu Dec 12 13:47:59 2002
>-+++ Programs/Makefile	Sun Jun 29 15:39:26 2003
>-@@ -11,7 +11,7 @@
>++++ Programs/Makefile	Wed Aug 13 15:10:19 2003
>+@@ -5,7 +5,7 @@
>+ INCLUDES = -I../Lib 
>+ CFLAGS = $(COPTIONS) $(OPTFLAGS) $(INCLUDES)
>+ FFLAGS = $(FOPTIONS) $(OPTFLAGS) $(INCLUDES)
>+-LIBS = -lmetis -lm
>++LIBS = -lmetis -lm  -lg2c
>+ METISLIB = ../libmetis.a
>  
>- 
>- 
>--ONMETISOBJS = onmetis.o io.o smbfactor.o ecri11.o lect11.o lect00.o
>-+ONMETISOBJS = onmetis.o io.o smbfactor.o ecri11.o lect11.o lect00.o /usr/lib/crt1.o
>- 
>-

Actions: View | Diff

Attachments on bug 55544: 34118