Attachment 164279 Details for Bug 205346 – Port update

[patch] Port update

cad-calculix.diff (text/plain), 7.36 KB, created by Pedro F. Giffuni on 2015-12-15 19:28:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2015-12-15 19:28:23 UTC

Size: 7.36 KB

patch

obsolete

>Index: cad/calculix/Makefile
>===================================================================
>--- cad/calculix/Makefile	(revision 403791)
>+++ cad/calculix/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	CalculiX
>-PORTVERSION=	2.8
>+PORTVERSION=	2.9
> CATEGORIES=	cad
> MASTER_SITES=	http://www.dhondt.de/
> DISTFILES=	${DIST_SOURCES}
>@@ -12,8 +12,6 @@
> MAINTAINER=	maho@FreeBSD.org
> COMMENT=	Three-Dimensional Structural Finite Element Program
> 
>-BROKEN=		unfetchable
>-
> LICENSE=	GPLv2
> 
> LIB_DEPENDS=	libarpack.so:${PORTSDIR}/math/arpack	\
>@@ -41,7 +39,7 @@
> BROWSER?=	firefox
> PSVIEWER?=	gv
> 
>-OPTIONS_DEFINE=	METIS METIS_EDF DOCS EXAMPLES
>+OPTIONS_DEFINE=	METIS METIS_EDF DOCS
> OPTIONS_DEFAULT=METIS
> 
> OPTIONS_RADIO=  BLAS
>Index: cad/calculix/distinfo
>===================================================================
>--- cad/calculix/distinfo	(revision 403791)
>+++ cad/calculix/distinfo	(working copy)
>@@ -1,16 +1,16 @@
>-SHA256 (calculix/ccx_2.8.src.tar.bz2) = 4b1d032afbc7e24658824cd0dcf6b4279adb9b1788a0d75111b58cdc40219ced
>-SIZE (calculix/ccx_2.8.src.tar.bz2) = 918419
>-SHA256 (calculix/cgx_2.8.all.tar.bz2) = 8e605df835f62748b2d7bba00d7c9ef0a2b797fb7f4ba4a8614062c1f0ba0875
>-SIZE (calculix/cgx_2.8.all.tar.bz2) = 1657532
>-SHA256 (calculix/ccx_2.8.test.tar.bz2) = 192f7870ae462f35426d198b9c1ecb8876cd9fb8ad64e207e1c1b631709bf96d
>-SIZE (calculix/ccx_2.8.test.tar.bz2) = 8965915
>-SHA256 (calculix/cgx_2.8.exa.tar.bz2) = f5c51bef56682bf78f6f86275a125acc4e7124875fc53871549d335bd6612a8d
>-SIZE (calculix/cgx_2.8.exa.tar.bz2) = 492133
>-SHA256 (calculix/ccx_2.8.htm.tar.bz2) = 89559fdfe0ca46da4a61669dd4a4e19b992275a8be84d58d729f4dab7d3a03dd
>-SIZE (calculix/ccx_2.8.htm.tar.bz2) = 1720873
>-SHA256 (calculix/cgx_2.8.htm.tar.bz2) = de9da52f427c8cb2e9635c1a6f7e09a59bf2d4802b7a64fa1e4c197e8b75db59
>-SIZE (calculix/cgx_2.8.htm.tar.bz2) = 349398
>-SHA256 (calculix/ccx_2.8.ps.tar.bz2) = 9c71d21a474ca938156f532ba5f656840297148105975cffb871525f4bddc30a
>-SIZE (calculix/ccx_2.8.ps.tar.bz2) = 2359282
>-SHA256 (calculix/cgx_2.8.pdf) = 17ba0f2e341d37d9b94ea38c92b574b9cff4ffdc91a2e560611b1387ade12471
>-SIZE (calculix/cgx_2.8.pdf) = 1129372
>+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
>Index: cad/calculix/files/patch-ccx_VER+src+CalculiX.h
>===================================================================
>--- cad/calculix/files/patch-ccx_VER+src+CalculiX.h	(revision 403791)
>+++ cad/calculix/files/patch-ccx_VER+src+CalculiX.h	(working copy)
>@@ -1,5 +1,5 @@
>---- ccx_2.8/src/CalculiX.h.orig	2015-01-17 13:44:36.000000000 -0500
>-+++ ccx_2.8/src/CalculiX.h	2015-03-05 18:03:18.675496033 -0500
>+--- ccx_2.9/src/CalculiX.h.orig	2015-01-17 13:44:36.000000000 -0500
>++++ ccx_2.9/src/CalculiX.h	2015-03-05 18:03:18.675496033 -0500
> @@ -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 403791)
>+++ cad/calculix/files/patch-ccx_VER+src+Makefile	(working copy)
>@@ -1,9 +1,10 @@
>---- ccx_2.8/src/Makefile.orig	2015-01-17 13:44:37.000000000 -0500
>-+++ ccx_2.8/src/Makefile	2015-03-05 17:47:19.851561593 -0500
>-@@ -1,9 +1,9 @@
>+--- ccx_2.9/src/Makefile.orig	2015-11-19 19:28:14 UTC
>++++ ccx_2.9/src/Makefile
>+@@ -1,10 +1,10 @@
>  
> -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
>++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
>  
> -CC=cc
>@@ -13,7 +14,7 @@
>  
>  .c.o :
>  	$(CC) $(CFLAGS) -c $<
>-@@ -18,15 +18,10 @@
>+@@ -19,15 +19,10 @@ OCCXF = $(SCCXF:.f=.o)
>  OCCXC = $(SCCXC:.c=.o)
>  OCCXMAIN = $(SCCXMAIN:.c=.o)
>  
>@@ -25,9 +26,9 @@
> -       -lpthread -lm -lc
> +LIBS = -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% -lm
>  
>- ccx_2.8: $(OCCXMAIN) ccx_2.8.a  $(LIBS)
>--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.8.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8.a $(LIBS)
>-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.8.c; $(FC) -fopenmp -Wall -O3 -o $@ $(OCCXMAIN) ccx_2.8.a -lpthread $(LIBS)
>+ 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.8.a: $(OCCXF) $(OCCXC)
>+ ccx_2.9.a: $(OCCXF) $(OCCXC)
>  	ar vr $@ $?
>Index: cad/calculix/files/patch-cgx_VER+src+Makefile
>===================================================================
>--- cad/calculix/files/patch-cgx_VER+src+Makefile	(revision 403791)
>+++ cad/calculix/files/patch-cgx_VER+src+Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- cgx_2.8/src/Makefile.orig	2014-04-07 12:26:41.000000000 -0500
>-+++ cgx_2.8/src/Makefile	2015-03-05 17:51:21.124545473 -0500
>+--- cgx_2.9/src/Makefile.orig	2014-04-07 12:26:41.000000000 -0500
>++++ cgx_2.9/src/Makefile	2015-03-05 17:51:21.124545473 -0500
> @@ -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 403791)
>+++ cad/calculix/files/patch-cgx_VER+src+cgx.h	(working copy)
>@@ -1,11 +1,11 @@
>---- cgx_2.8/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
>-+++ cgx_2.8/src/cgx.h	2009-09-03 15:07:10.000000000 +0900
>+--- cgx_2.9/src/cgx.h.orig	2009-08-13 15:58:59.000000000 +0900
>++++ cgx_2.9/src/cgx.h	2009-09-03 15:07:10.000000000 +0900
> @@ -86,8 +86,8 @@
>                               "/yaprod/cae/application/CalculiX/doc/ccx_2.0/ccx.html"}
>    #endif
>  #else
>--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.8/doc/cgx/cgx.html",\
>--    "/usr/local/CalculiX/ccx_2.8/doc/ccx/ccx.html"}
>+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.9/doc/cgx/cgx.html",\
>+-    "/usr/local/CalculiX/ccx_2.9/doc/ccx/ccx.html"}
> +   #define     HELPFILE        {"%%DOCSDIR%%/cgx/cgx.html",\
> +     "%%DOCSDIR%%/ccx/ccx.html"}
>  #endif

Actions: View | Diff

Attachments on bug 205346: 164279 | 164280 | 164281