Attachment 236562 Details for Bug 266421 – Patch to update the port to 2.20.

[patch] Patch to update the port to 2.20.

calculix-ccx.patch (text/plain), 5.48 KB, created by rsmith on 2022-09-15 07:55:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rsmith

Created: 2022-09-15 07:55:39 UTC

Size: 5.48 KB

patch

obsolete

>diff -ruN -x .git calculix-ccx.orig/.gitignore calculix-ccx/.gitignore
>--- calculix-ccx.orig/.gitignore	1970-01-01 01:00:00.000000000 +0100
>+++ calculix-ccx/.gitignore	2022-09-14 20:33:25.783090000 +0200
>@@ -0,0 +1 @@
>+work
>diff -ruN -x .git calculix-ccx.orig/Makefile calculix-ccx/Makefile
>--- calculix-ccx.orig/Makefile	2022-07-20 18:27:01.399359000 +0200
>+++ calculix-ccx/Makefile	2022-09-14 20:44:11.842345000 +0200
>@@ -1,5 +1,5 @@
> PORTNAME=	ccx
>-PORTVERSION=	2.19
>+PORTVERSION=	2.20
> CATEGORIES=	cad
> MASTER_SITES=	http://www.dhondt.de/
> PKGNAMEPREFIX=	CalculiX-
>@@ -20,7 +20,7 @@
> 
> DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}
> DIST_HTM=	ccx_${PORTVERSION}.htm${EXTRACT_SUFX}
>-DIST_PS=	ccx_${PORTVERSION}.ps${EXTRACT_SUFX}
>+DIST_PDF=	ccx_${PORTVERSION}.pdf
> DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}
> 
> ALL_TARGET=	#Empty
>@@ -34,8 +34,8 @@
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDOCS}
>-DISTFILES+=	${DIST_HTM} ${DIST_PS}
>-EXTRACT_ONLY+=	${DIST_HTM} ${DIST_PS}
>+DISTFILES+=	${DIST_HTM} ${DIST_PDF}
>+EXTRACT_ONLY+=	${DIST_HTM}
> .endif
> 
> .if $(PORT_OPTIONS:MEXAMPLES)
>@@ -71,9 +71,8 @@
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \
> 		${STAGEDIR}${DOCSDIR}/ccx)
>-	${INSTALL_DATA} ${WRKDIR}/CalculiX/${CCX_VER}/doc/${CCX_VER}.ps \
>+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
> 		${STAGEDIR}${DOCSDIR}
>-	@${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/${CCX_VER}.ps
> 
> do-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>diff -ruN -x .git calculix-ccx.orig/distinfo calculix-ccx/distinfo
>--- calculix-ccx.orig/distinfo	2022-02-02 19:17:02.983023000 +0100
>+++ calculix-ccx/distinfo	2022-09-14 20:30:08.901575000 +0200
>@@ -1,9 +1,9 @@
>-TIMESTAMP = 1643749030
>-SHA256 (calculix/ccx_2.19.src.tar.bz2) = c75a69685811e7996c9428b491c82f0eff777cc9a0999f469d10156d75f26d07
>-SIZE (calculix/ccx_2.19.src.tar.bz2) = 1496204
>-SHA256 (calculix/ccx_2.19.htm.tar.bz2) = 22e0a0035c8e26b9cbc096eed2b8ba787bc926b1b1761f7acd69f9429ea435a4
>-SIZE (calculix/ccx_2.19.htm.tar.bz2) = 2661409
>-SHA256 (calculix/ccx_2.19.ps.tar.bz2) = d990c6908b6ca8a54e02d92f010b9db5cdb86d69bbf045b1b89385be12e39c8b
>-SIZE (calculix/ccx_2.19.ps.tar.bz2) = 5139648
>-SHA256 (calculix/ccx_2.19.test.tar.bz2) = e7376881f7a7e5f0730e2aaa9fd518665ba380cc9fae7140919050e7752cdc01
>-SIZE (calculix/ccx_2.19.test.tar.bz2) = 12397795
>+TIMESTAMP = 1663180208
>+SHA256 (calculix/ccx_2.20.src.tar.bz2) = 63bf6ea09e7edcae93e0145b1bb0579ea7ae82e046f6075a27c8145b72761bcf
>+SIZE (calculix/ccx_2.20.src.tar.bz2) = 1499901
>+SHA256 (calculix/ccx_2.20.htm.tar.bz2) = 51a0922f5cecc9fbe5880afb47c3b24ef90300fb800b4d10fb02b297e7c2b4c1
>+SIZE (calculix/ccx_2.20.htm.tar.bz2) = 2813857
>+SHA256 (calculix/ccx_2.20.pdf) = 684564dd9dbd18e3da4e3c4443b8546a99ba62b71dc7f88e31cfe80eab4d0e57
>+SIZE (calculix/ccx_2.20.pdf) = 5898196
>+SHA256 (calculix/ccx_2.20.test.tar.bz2) = 79848d88dd1e51839d1aed68fb547ff12ad3202c3561c02c2f3a8ceda0f2eb82
>+SIZE (calculix/ccx_2.20.test.tar.bz2) = 12636197
>diff -ruN -x .git calculix-ccx.orig/files/patch-Makefile calculix-ccx/files/patch-Makefile
>--- calculix-ccx.orig/files/patch-Makefile	2022-02-02 19:17:02.983984000 +0100
>+++ calculix-ccx/files/patch-Makefile	2022-09-14 20:33:00.469029000 +0200
>@@ -1,4 +1,4 @@
>---- Makefile.orig	2021-12-17 12:13:23 UTC
>+--- Makefile.orig	2022-07-31 16:06:31 UTC
> +++ Makefile
> @@ -1,9 +1,9 @@
>  
>@@ -14,19 +14,20 @@
>  
>  .c.o :
>  	$(CC) $(CFLAGS) -c $<
>-@@ -21,12 +21,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
>+@@ -21,12 +21,12 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
>  DIR=../../../SPOOLES.2.2
>  
>  LIBS = \
> -       $(DIR)/spooles.a \
> -	../../../ARPACK/libarpack_INTEL.a \
> -       -lpthread -lm -lc
>-+	-lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
>-+	-lpthread -lm
>++       -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
>++       -lpthread -lm
>  
>- ccx_2.19: $(OCCXMAIN) ccx_2.19.a  $(LIBS)
>--	./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
>-+	./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp
>++
>+ ccx_2.20: $(OCCXMAIN) ccx_2.20.a  $(LIBS)
>+-	./date.pl; $(CC) $(CFLAGS) -c ccx_2.20.c; $(FC)  -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.20.a $(LIBS) -fopenmp
>++	./date.pl; $(CC) $(CFLAGS) -c ccx_2.20.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.20.a $(LIBS) -fopenmp
>  
>- ccx_2.19.a: $(OCCXF) $(OCCXC)
>+ ccx_2.20.a: $(OCCXF) $(OCCXC)
>  	ar vr $@ $?
>diff -ruN -x .git calculix-ccx.orig/files/patch-date.pl calculix-ccx/files/patch-date.pl
>--- calculix-ccx.orig/files/patch-date.pl	2022-02-02 19:17:02.985291000 +0100
>+++ calculix-ccx/files/patch-date.pl	2022-09-14 20:33:00.471460000 +0200
>@@ -1,4 +1,4 @@
>---- date.pl.orig	2021-12-17 12:13:23 UTC
>+--- date.pl.orig	2022-07-31 16:06:31 UTC
> +++ date.pl
> @@ -1,6 +1,7 @@
>  #!/usr/bin/env perl
>@@ -7,5 +7,5 @@
> +use POSIX qw(strftime);
> +chomp(my $date = strftime("%Y-%m-%d", gmtime($ENV{SOURCE_DATE_EPOCH} || time)));
>  
>- # inserting the date into ccx_2.19.c
>+ # inserting the date into ccx_2.20.c
>  
>diff -ruN -x .git calculix-ccx.orig/pkg-plist calculix-ccx/pkg-plist
>--- calculix-ccx.orig/pkg-plist	2022-02-02 19:17:02.989840000 +0100
>+++ calculix-ccx/pkg-plist	2022-09-14 20:28:26.385675000 +0200
>@@ -3126,7 +3126,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
> %%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
> %%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
>-%%PORTDOCS%%%%DOCSDIR%%/ccx_2.19.ps.gz
>+%%PORTDOCS%%%%DOCSDIR%%/ccx_2.20.pdf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref

Flags:

rsmith: maintainer-approval+

Actions: View | Diff

Attachments on bug 266421: 236562