Attachment 38704 Details for Bug 61180 – file.diff

[patch] file.diff

file.diff (text/plain), 5.77 KB, created by Thierry Thomas on 2004-01-10 19:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2004-01-10 19:20:06 UTC

Size: 5.77 KB

patch

obsolete

>diff -urN math/freefem++.orig/Makefile math/freefem++/Makefile
>--- math/freefem++.orig/Makefile	Tue Dec 16 23:52:53 2003
>+++ math/freefem++/Makefile	Sat Jan 10 17:53:31 2004
>@@ -6,9 +6,10 @@
> #
> 
> PORTNAME=	freefem++
>-PORTVERSION=	1.36
>+PORTVERSION=	1.37
> CATEGORIES=	math science
>-MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/Gamma/freefem/
>+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/Gamma/freefem/	\
>+		http://mule.ann.jussieu.fr/~hecht/ftp/freefem/
> DISTNAME=	FreeFem++v${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -42,7 +43,7 @@
> 	@${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}
> .endfor
> 	@${ECHO_MSG} "===>  Documentation installed in ${DOCSDIR}."
>-.for direx in "" -bug -eigen -tutorial
>+.for direx in "" -bug -eigen -load -mpi -tutorial
> 	@${MKDIR} ${EXAMPLESDIR}/${direx:S/-//}
> 	@for sample in `${LS} ${WRKSRC}/examples++${direx}` ; do	\
> 		${INSTALL_DATA} ${WRKSRC}/examples++${direx}/$$sample	\
>diff -urN math/freefem++.orig/distinfo math/freefem++/distinfo
>--- math/freefem++.orig/distinfo	Tue Dec  9 22:15:53 2003
>+++ math/freefem++/distinfo	Fri Jan  9 23:06:27 2004
>@@ -1 +1 @@
>-MD5 (FreeFem++v1.36.tar.gz) = ca98127c028251bdf32fb2aa228bd89b
>+MD5 (FreeFem++v1.37.tar.gz) = 89414fed9fd5f0ced3c1790702214dec
>diff -urN math/freefem++.orig/files/patch-src::Makefile-linux math/freefem++/files/patch-src::Makefile-linux
>--- math/freefem++.orig/files/patch-src::Makefile-linux	Sun Dec  7 04:13:41 2003
>+++ math/freefem++/files/patch-src::Makefile-linux	Sat Jan 10 17:54:09 2004
>@@ -1,30 +1,35 @@
>---- src/Makefile-linux.orig	Thu Jan  2 14:30:30 2003
>-+++ src/Makefile-linux	Thu Oct 23 23:42:32 2003
>-@@ -1,16 +1,15 @@
>+--- src/Makefile-linux.orig	Fri Jan  9 09:17:19 2004
>++++ src/Makefile-linux	Sat Jan 10 17:52:42 2004
>+@@ -1,18 +1,18 @@
>+-LIBLOCAL = -ldl # for dlopen (see load.cpp and man dlopen)
> -LIBX11= -L/usr/X11R6/lib -lX11 -lm 
> -INCLUDEX11 = /usr/X11R6/include
> -CXX=g++      #C++ compiler 
> -CXXMPI=mpiCC   # compilation with mpi
> -OOPTFLAGS= -O  # compilation with optimisation
> +# $FreeBSD: ports/math/freefem++/files/patch-src::Makefile-linux,v 1.1 2003/12/07 03:13:41 pav Exp $
>-+LIBX11= -L$(X11BASE)/lib -lX11 -lm 
>++#LIBLOCAL = -ldl # for dlopen (see load.cpp and man dlopen)
>++LIBX11= -L$(X11BASE)/lib -lX11 -lm
> +INCLUDEX11 = $(X11BASE)/include
> +OOPTFLAGS= -Wno-deprecated
>  GOPTFLAGS= -g  # compilation with debugging 
>  #--------------------------------------------------
>  #  the flag of eigen value part with arpack++ tools
>  #-------------------------------------------------
>+-ARPACKDIR=../../arpack/ARPACK  #  here the arpack dir is at same level of FreeFem++v... dir
>  EIGEN= eigenvalue.o
>--LIBARPACK= -L../../arpack/ARPACK -larpack_linux -llapack -lblas
>+-LIBARPACK= -L$(ARPACKDIR) -larpack_linux -llapack -lblas
> -LIBF77= -lg2c
>--INCARPACKPP = -DEIGENVALUE -I../../arpack/arpack++/include
>+-INCARPACKPP = -DEIGENVALUE -I../arpack/include # the FreeFem++ arpack++ files (in freefem tree)
> +LIBARPACK= -L$(LOCALBASE)/lib ${LOCALBASE}/lib/libarpack.a -lalapack -lf77blas -lcblas -latlas
> +LIBF77= -lg2c -lm
>-+INCARPACKPP = -DEIGENVALUE -I$(LOCALBASE)/include/ARPACK++
>++INCARPACKPP = -DEIGENVALUE -I$(LOCALBASE)/include/ARPACK++ 
>++IUMFPACK= -DUMFPACK -I$(LOCALBASE)/include/UMFPACK -I$(LOCALBASE)/include/AMD
>++LIBUMFPACK= -L$(LOCALBASE)/lib -lumfpack -lamd
>  # ------------------------------
>  # compilation flags of FreeFem++ 
>  # ------------------------------
>-@@ -29,7 +28,7 @@
>+@@ -31,7 +31,7 @@
>  # ---------------------------
>  #  install and compile dir.
>  # ----------------------
>diff -urN math/freefem++.orig/pkg-plist math/freefem++/pkg-plist
>--- math/freefem++.orig/pkg-plist	Tue Dec  9 22:15:53 2003
>+++ math/freefem++/pkg-plist	Sat Jan 10 00:04:38 2004
>@@ -9,7 +9,6 @@
> %%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P1.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P1b.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P2.edp
>-%%PORTDOCS%%%%EXAMPLESDIR%%/NSP1P2-1.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/Richard.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/aaRT.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/aaa-adp.edp
>@@ -34,17 +33,26 @@
> %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/BeamEigenValueperio.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/LapEigenValue.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/LapnosymEigenValue.edp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/eigen/Stokes-eigen.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/all.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/eigen/neuman.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/funct.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/include.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/lap_mat.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/lapacienprecon.edp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/load/load.edp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/load/load.link
>+%%PORTDOCS%%%%EXAMPLESDIR%%/load/myfunction.cpp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/mpi/essai.edp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/mpi/schwarz-b.edp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/mpi/schwarz-c.edp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/mpi/schwarz.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/parareal.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/testFE.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/testadp.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/teste.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/FE.edp
>+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/LapDG.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/LaplaceP1.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/LaplaceP1P2h.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/LaplaceP1bis.edp
>@@ -90,11 +98,12 @@
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/schwarz-no-overlap.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/schwarz-overlap.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/tablefunction.edp
>-%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/truncmesh.edp
> %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/xyf
> %%PORTDOCS%%%%EXAMPLESDIR%%/wafer-heating-laser-axi.edp
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bug
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/eigen
>+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/load
>+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/mpi
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tutorial
> %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>--- freefem++.diff ends here ---

Actions: View | Diff

Attachments on bug 61180: 38704