Attachment 168640 Details for Bug 208301 – Update to version 2.10

[patch] Update to version 2.10

file_208301.txt (text/plain), 12.24 KB, created by Pedro F. Giffuni on 2016-03-26 03:46:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2016-03-26 03:46:36 UTC

Size: 12.24 KB

patch

obsolete

>Index: cad/calculix/Makefile
>===================================================================
>--- cad/calculix/Makefile	(revision 411914)
>+++ cad/calculix/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	CalculiX
>-PORTVERSION=	2.9
>+PORTVERSION=	2.10
> CATEGORIES=	cad
> MASTER_SITES=	http://www.dhondt.de/
> DISTFILES=	${DIST_SOURCES}
>@@ -40,7 +40,7 @@
> PSVIEWER?=	gv
> 
> OPTIONS_DEFINE=	METIS METIS_EDF DOCS EXAMPLES
>-OPTIONS_DEFAULT=METIS
>+OPTIONS_DEFAULT=METIS_EDF
> 
> OPTIONS_RADIO=  BLAS
> OPTIONS_RADIO_BLAS=     REFERENCE OBLAS
>Index: cad/calculix/distinfo
>===================================================================
>--- cad/calculix/distinfo	(revision 411914)
>+++ cad/calculix/distinfo	(working copy)
>@@ -1,16 +1,16 @@
>-SHA256 (calculix/ccx_2.9.src.tar.bz2) = 755e173cfb712c83cefef22cfa43f06caf495e5dffbecf8df3d47f3cf6e6d44d
>-SIZE (calculix/ccx_2.9.src.tar.bz2) = 951618
>-SHA256 (calculix/cgx_2.9.all.tar.bz2) = eccce9424a05396c218f1c8cb3c3e92ffd847d4c9e24e5fe7e5812688bcc1f69
>-SIZE (calculix/cgx_2.9.all.tar.bz2) = 1731082
>-SHA256 (calculix/ccx_2.9.test.tar.bz2) = 6a2d864c970189c8b350f28826e9d3b624e2b3c1bad9f7f0ed45ccb2343c12e3
>-SIZE (calculix/ccx_2.9.test.tar.bz2) = 9051620
>-SHA256 (calculix/cgx_2.9.exa.tar.bz2) = 7553005a384faadb702c3fc186fc48b26559ba1a52ecd662579990167514f6ec
>-SIZE (calculix/cgx_2.9.exa.tar.bz2) = 505174
>-SHA256 (calculix/ccx_2.9.htm.tar.bz2) = 2313229b854e2558524d521ff586df05947416f0ee31a6b15edc59334e65178d
>-SIZE (calculix/ccx_2.9.htm.tar.bz2) = 1903990
>-SHA256 (calculix/cgx_2.9.htm.tar.bz2) = f8f4585275902f99e785be3d7beb4b4eaeecea3ab2c4456114a5a715c9fec032
>-SIZE (calculix/cgx_2.9.htm.tar.bz2) = 278036
>-SHA256 (calculix/ccx_2.9.ps.tar.bz2) = 709ab11a2996d1b0af8eaf727c553abb8b650ad39d6b8cd26084c1942831e0d5
>-SIZE (calculix/ccx_2.9.ps.tar.bz2) = 2412304
>-SHA256 (calculix/cgx_2.9.pdf) = 722f379619c9560278eb9cde2fc0db125f8d3b4aec04b1456fbf7056c8f9228a
>-SIZE (calculix/cgx_2.9.pdf) = 1161271
>+SHA256 (calculix/ccx_2.10.src.tar.bz2) = 693497d19d8dd2a5376e64e038d5c248d87f0e2df46d409a83bf976596b319f5
>+SIZE (calculix/ccx_2.10.src.tar.bz2) = 1005712
>+SHA256 (calculix/cgx_2.10.all.tar.bz2) = 64810dab1c22152c7946282fac5763cc36b9e31e309f962c23b8bf8238537c7e
>+SIZE (calculix/cgx_2.10.all.tar.bz2) = 1702964
>+SHA256 (calculix/ccx_2.10.test.tar.bz2) = a5e00abc7f9b2a5a5f1a4f7b414617dc65cd0be9b2a66c93e20b5a25c1392a75
>+SIZE (calculix/ccx_2.10.test.tar.bz2) = 9083192
>+SHA256 (calculix/cgx_2.10.exa.tar.bz2) = 44f1155bc98f90447f22d39c5b3dfaf4a1a6def79a79e68e499b3ae4ee10b24c
>+SIZE (calculix/cgx_2.10.exa.tar.bz2) = 505638
>+SHA256 (calculix/ccx_2.10.htm.tar.bz2) = 28f09511d791016dadb9f9cce382789fc250dfa5a60b105cfc4c9c2008e437c2
>+SIZE (calculix/ccx_2.10.htm.tar.bz2) = 1909910
>+SHA256 (calculix/cgx_2.10.htm.tar.bz2) = 92655f32b9909c09414509f4f05aa7ff049321b8b0bbdec884d9b1fde90ab0fa
>+SIZE (calculix/cgx_2.10.htm.tar.bz2) = 282040
>+SHA256 (calculix/ccx_2.10.ps.tar.bz2) = 80981bcd35dae915e7493c08a8363d13df3889353464227f3964c833ca1fa7e1
>+SIZE (calculix/ccx_2.10.ps.tar.bz2) = 2542937
>+SHA256 (calculix/cgx_2.10.pdf) = b9bc56222496283948e151e3b1e07e4295cefba20ff9a567221bfbdb2c68b654
>+SIZE (calculix/cgx_2.10.pdf) = 1178710
>Index: cad/calculix/files/patch-ccx_VER+src+CalculiX.h
>===================================================================
>--- cad/calculix/files/patch-ccx_VER+src+CalculiX.h	(revision 411914)
>+++ cad/calculix/files/patch-ccx_VER+src+CalculiX.h	(working copy)
>@@ -1,5 +1,5 @@
>---- ccx_2.9/src/CalculiX.h.orig	2015-11-19 19:28:13 UTC
>-+++ ccx_2.9/src/CalculiX.h
>+--- ccx_2.10/src/CalculiX.h.orig	2016-03-05 11:18:02 UTC
>++++ ccx_2.10/src/CalculiX.h
> @@ -15,12 +15,14 @@
>  /*     along with this program; if not, write to the Free Software       */
>  /*     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.         */
>Index: cad/calculix/files/patch-ccx_VER+src+Makefile
>===================================================================
>--- cad/calculix/files/patch-ccx_VER+src+Makefile	(revision 411914)
>+++ cad/calculix/files/patch-ccx_VER+src+Makefile	(working copy)
>@@ -1,11 +1,11 @@
>---- ccx_2.9/src/Makefile.orig	2015-11-19 19:28:14 UTC
>-+++ ccx_2.9/src/Makefile
>-@@ -1,10 +1,10 @@
>+--- ccx_2.10/src/Makefile.orig	2016-03-05 11:18:03 UTC
>++++ ccx_2.10/src/Makefile
>+@@ -1,9 +1,9 @@
>  
>--CFLAGS = -Wall -O3  -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
>-+CFLAGS += -Wall -O3 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE
>- #FFLAGS = -Wall -O3 -fopenmp -fmax-stack-var-size=80000
>- FFLAGS = -Wall -O3 -fopenmp
>+-CFLAGS = -Wall -O3 -fopenmp -I ../../../SPOOLES.2.2 -DARCH="Linux" -DSPOOLES -DARPACK -DMATRIXSTORAGE
>+-FFLAGS = -Wall -O3 -fopenmp
>++CFLAGS += -O3 -fopenmp -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/spooles -DARCH="FreeBSD" -DSPOOLES -DARPACK -DMATRIXSTORAGE
>++FFLAGS += -O3 -fopenmp
>  
> -CC=cc
> -FC=gfortran
>@@ -14,7 +14,7 @@
>  
>  .c.o :
>  	$(CC) $(CFLAGS) -c $<
>-@@ -19,15 +19,10 @@ OCCXF = $(SCCXF:.f=.o)
>+@@ -18,15 +18,10 @@ OCCXF = $(SCCXF:.f=.o)
>  OCCXC = $(SCCXC:.c=.o)
>  OCCXMAIN = $(SCCXMAIN:.c=.o)
>  
>@@ -26,9 +26,9 @@
> -       -lpthread -lm -lc
> +LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
>  
>- ccx_2.9: $(OCCXMAIN) ccx_2.9.a  $(LIBS)
>--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a $(LIBS)
>-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.9.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.9.a -lpthread $(LIBS)
>+ ccx_2.10: $(OCCXMAIN) ccx_2.10.a  $(LIBS)
>+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a $(LIBS)
>++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.10.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.10.a -lpthread $(LIBS)
>  
>- ccx_2.9.a: $(OCCXF) $(OCCXC)
>+ ccx_2.10.a: $(OCCXF) $(OCCXC)
>  	ar vr $@ $?
>Index: cad/calculix/files/patch-cgx_VER+src+Makefile
>===================================================================
>--- cad/calculix/files/patch-cgx_VER+src+Makefile	(revision 411914)
>+++ cad/calculix/files/patch-cgx_VER+src+Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- cgx_2.9/src/Makefile.orig	2015-07-30 21:38:17 UTC
>-+++ cgx_2.9/src/Makefile
>+--- cgx_2.10/src/Makefile.orig	2016-01-13 11:41:40 UTC
>++++ cgx_2.10/src/Makefile
> @@ -1,14 +1,14 @@
>  CFLAGS = -O3 -Wall \
>    -I./ \
>Index: cad/calculix/files/patch-cgx_VER+src+cgx.h
>===================================================================
>--- cad/calculix/files/patch-cgx_VER+src+cgx.h	(revision 411914)
>+++ cad/calculix/files/patch-cgx_VER+src+cgx.h	(working copy)
>@@ -1,11 +1,11 @@
>---- cgx_2.9/src/cgx.h.orig	2015-11-14 14:00:48 UTC
>-+++ cgx_2.9/src/cgx.h
>+--- cgx_2.10/src/cgx.h.orig	2016-03-05 16:23:57 UTC
>++++ cgx_2.10/src/cgx.h
> @@ -83,8 +83,8 @@ rendering is done in the index-mode.
>-     "/usr/local/CalculiX/ccx_2.9/doc/ccx/ccx.html",\
>-     "/usr/local/CalculiX/cgx_2.9/doc/aflib/aflib.pdf"}
>+     "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
>+     "/usr/local/CalculiX/cgx_2.10/doc/aflib/aflib.pdf"}
>  #else
>--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.9/doc/cgx/cgx.html",\
>--    "/usr/local/CalculiX/ccx_2.9/doc/ccx/ccx.html"}
>+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
>+-    "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
> +   #define     HELPFILE        {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
> +     "/usr/local/share/doc/CalculiX/ccx/ccx.html"}
>  #endif
>Index: cad/calculix/pkg-plist
>===================================================================
>--- cad/calculix/pkg-plist	(revision 411914)
>+++ cad/calculix/pkg-plist	(working copy)
>@@ -677,16 +677,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/ccx/img1604.png
> %%PORTDOCS%%%%DOCSDIR%%/ccx/img1605.png
> %%PORTDOCS%%%%DOCSDIR%%/ccx/img1606.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1607.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1608.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1609.png
> %%PORTDOCS%%%%DOCSDIR%%/ccx/img161.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1610.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1611.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1612.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1613.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1614.png
>-%%PORTDOCS%%%%DOCSDIR%%/ccx/img1615.png
> %%PORTDOCS%%%%DOCSDIR%%/ccx/img162.png
> %%PORTDOCS%%%%DOCSDIR%%/ccx/img163.png
> %%PORTDOCS%%%%DOCSDIR%%/ccx/img164.png
>@@ -1986,7 +1977,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
> %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
> %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
>-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.9.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.10.ps.gz
> %%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
> %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
> %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
>@@ -2180,6 +2171,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node228.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node229.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node23.html
>+%%PORTDOCS%%%%DOCSDIR%%/cgx/node230.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node24.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node25.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
>@@ -2263,7 +2255,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
>-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.9.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.10.pdf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/RAE2822.hdr
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/airfoil/ISAAC/README
>@@ -2288,7 +2280,6 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/clean
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/lavff.fbd
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/lavffcyc.cvg
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/lavffcyc.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compressor/send.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dolfyn/README
>@@ -2304,18 +2295,23 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.fbd
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/latjm.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/glue/send.fbl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/all.fbd
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/ifwhiledemo.fbl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ifwhiledemo/writedemo.txt
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map2D.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/map3D.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/map/pressure.bak
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/README
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.cvg
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.fbd
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/flange.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/hcpy_1.png
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pressfit/send.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/result.frd
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/README
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbd
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.fbl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/swepElements/ring1.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/achtel2.dat.ref
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/achtel2.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/achtel29.dat.ref
>@@ -2475,6 +2471,8 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamidset.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamimpdy1.dat.ref
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamimpdy1.inp
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamimpdy1nodirect.dat.ref
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamimpdy1nodirect.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamimpdy2.dat.ref
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamimpdy2.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamlin.dat.ref
>@@ -2495,6 +2493,8 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldy.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldye.dat.ref
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldye.inp
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldynodirect.dat.ref
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldynodirect.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldyp.dat.ref
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldyp.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/beamnldype.dat.ref
>@@ -3044,7 +3044,6 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wire.dat.ref
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/test/wire.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/README
>-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.cvg
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/latimtrans.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/post.fbl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/therm/send.fbl

Actions: View | Diff

Attachments on bug 208301: 168640