Attachment #236562 for bug #266421

View | Details | Raw Unified | Return to bug 266421
Collapse All | Expand All

Line 0 Link Here

(-)calculix-ccx/.gitignore (+1 lines)
	1	work




PORTNAME=	ccx
PORTVERSION=	2.20
CATEGORIES=	cad
MASTER_SITES=	http://www.dhondt.de/
PKGNAMEPREFIX=	CalculiX-


DIST_SOURCES=	ccx_${PORTVERSION}.src${EXTRACT_SUFX}
DIST_HTM=	ccx_${PORTVERSION}.htm${EXTRACT_SUFX}
DIST_PDF=	ccx_${PORTVERSION}.pdf
DIST_EXAMPLES=	ccx_${PORTVERSION}.test${EXTRACT_SUFX}

ALL_TARGET=	#Empty

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS}
DISTFILES+=	${DIST_HTM} ${DIST_PDF}
EXTRACT_ONLY+=	${DIST_HTM}
.endif

.if $(PORT_OPTIONS:MEXAMPLES)

	@${MKDIR} ${STAGEDIR}${DOCSDIR}
	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \
		${STAGEDIR}${DOCSDIR}/ccx)
	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
		${STAGEDIR}${DOCSDIR}
	@${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/${CCX_VER}.ps

do-install-EXAMPLES-on:
	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

Lines 1-9 Link Here

(-)calculix-ccx/distinfo (-9 / +9 lines)
1	TIMESTAMP = 1643749030	1	TIMESTAMP = 1663180208
2	SHA256 (calculix/ccx_2.19.src.tar.bz2) = c75a69685811e7996c9428b491c82f0eff777cc9a0999f469d10156d75f26d07	2	SHA256 (calculix/ccx_2.20.src.tar.bz2) = 63bf6ea09e7edcae93e0145b1bb0579ea7ae82e046f6075a27c8145b72761bcf
3	SIZE (calculix/ccx_2.19.src.tar.bz2) = 1496204	3	SIZE (calculix/ccx_2.20.src.tar.bz2) = 1499901
4	SHA256 (calculix/ccx_2.19.htm.tar.bz2) = 22e0a0035c8e26b9cbc096eed2b8ba787bc926b1b1761f7acd69f9429ea435a4	4	SHA256 (calculix/ccx_2.20.htm.tar.bz2) = 51a0922f5cecc9fbe5880afb47c3b24ef90300fb800b4d10fb02b297e7c2b4c1
5	SIZE (calculix/ccx_2.19.htm.tar.bz2) = 2661409	5	SIZE (calculix/ccx_2.20.htm.tar.bz2) = 2813857
6	SHA256 (calculix/ccx_2.19.ps.tar.bz2) = d990c6908b6ca8a54e02d92f010b9db5cdb86d69bbf045b1b89385be12e39c8b	6	SHA256 (calculix/ccx_2.20.pdf) = 684564dd9dbd18e3da4e3c4443b8546a99ba62b71dc7f88e31cfe80eab4d0e57
7	SIZE (calculix/ccx_2.19.ps.tar.bz2) = 5139648	7	SIZE (calculix/ccx_2.20.pdf) = 5898196
8	SHA256 (calculix/ccx_2.19.test.tar.bz2) = e7376881f7a7e5f0730e2aaa9fd518665ba380cc9fae7140919050e7752cdc01	8	SHA256 (calculix/ccx_2.20.test.tar.bz2) = 79848d88dd1e51839d1aed68fb547ff12ad3202c3561c02c2f3a8ceda0f2eb82
9	SIZE (calculix/ccx_2.19.test.tar.bz2) = 12397795	9	SIZE (calculix/ccx_2.20.test.tar.bz2) = 12636197

Lines 1-4 Link Here

(-)calculix-ccx/files/patch-Makefile (-8 / +9 lines)
1	--- Makefile.orig 2021-12-17 12:13:23 UTC	1	--- Makefile.orig 2022-07-31 16:06:31 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -1,9 +1,9 @@	3	@@ -1,9 +1,9 @@
4		4
Lines 14-32 Link Here
14		14
15	.c.o :	15	.c.o :
16	$(CC) $(CFLAGS) -c $<	16	$(CC) $(CFLAGS) -c $<
17	@@ -21,12 +21,11 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)	17	@@ -21,12 +21,12 @@ OCCXMAIN = $(SCCXMAIN:.c=.o)
18	DIR=../../../SPOOLES.2.2	18	DIR=../../../SPOOLES.2.2
19		19
20	LIBS = \	20	LIBS = \
21	- $(DIR)/spooles.a \	21	- $(DIR)/spooles.a \
22	- ../../../ARPACK/libarpack_INTEL.a \	22	- ../../../ARPACK/libarpack_INTEL.a \
23	- -lpthread -lm -lc	23	- -lpthread -lm -lc
24	+ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \	24	+ -lspooles -larpack %%BLAS_LIBS%% %%LAPACK_LIBS%% \
25	+ -lpthread -lm	25	+ -lpthread -lm
26		26
27	ccx_2.19: $(OCCXMAIN) ccx_2.19.a $(LIBS)	27	+
28	- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp	28	ccx_2.20: $(OCCXMAIN) ccx_2.20.a $(LIBS)
29	+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.19.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.19.a $(LIBS) -fopenmp	29	- ./date.pl; $(CC) $(CFLAGS) -c ccx_2.20.c; $(FC) -Wall -O2 -o $@ $(OCCXMAIN) ccx_2.20.a $(LIBS) -fopenmp
		30	+ ./date.pl; $(CC) $(CFLAGS) -c ccx_2.20.c; $(FC) $(FFLAGS) -o $@ $(OCCXMAIN) ccx_2.20.a $(LIBS) -fopenmp
30		31
31	ccx_2.19.a: $(OCCXF) $(OCCXC)	32	ccx_2.20.a: $(OCCXF) $(OCCXC)
32	ar vr $@ $?	33	ar vr $@ $?

Lines 1-4 Link Here

(-)calculix-ccx/files/patch-date.pl (-2 / +2 lines)
1	--- date.pl.orig 2021-12-17 12:13:23 UTC	1	--- date.pl.orig 2022-07-31 16:06:31 UTC
2	+++ date.pl	2	+++ date.pl
3	@@ -1,6 +1,7 @@	3	@@ -1,6 +1,7 @@
4	#!/usr/bin/env perl	4	#!/usr/bin/env perl
Lines 7-11 Link Here
7	+use POSIX qw(strftime);	7	+use POSIX qw(strftime);
8	+chomp(my $date = strftime("%Y-%m-%d", gmtime($ENV{SOURCE_DATE_EPOCH} \|\| time)));	8	+chomp(my $date = strftime("%Y-%m-%d", gmtime($ENV{SOURCE_DATE_EPOCH} \|\| time)));
9		9
10	# inserting the date into ccx_2.19.c	10	# inserting the date into ccx_2.20.c
11		11

Lines 3126-3132 Link Here

(-)calculix-ccx/pkg-plist (-1 / +1 lines)
3126	%%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html	3126	%%PORTDOCS%%%%DOCSDIR%%/ccx/node97.html
3127	%%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html	3127	%%PORTDOCS%%%%DOCSDIR%%/ccx/node98.html
3128	%%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html	3128	%%PORTDOCS%%%%DOCSDIR%%/ccx/node99.html
3129	%%PORTDOCS%%%%DOCSDIR%%/ccx_2.19.ps.gz	3129	%%PORTDOCS%%%%DOCSDIR%%/ccx_2.20.pdf
3130	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref	3130	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.dat.ref
3131	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp	3131	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel2.inp
3132	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref	3132	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/achtel29.dat.ref

Return to bug 266421

Lines 1-5 Link Here

(-)calculix-ccx/Makefile (-6 / +5 lines)
1	PORTNAME= ccx	1	PORTNAME= ccx
2	PORTVERSION= 2.19	2	PORTVERSION= 2.20
3	CATEGORIES= cad	3	CATEGORIES= cad
4	MASTER_SITES= http://www.dhondt.de/	4	MASTER_SITES= http://www.dhondt.de/
5	PKGNAMEPREFIX= CalculiX-	5	PKGNAMEPREFIX= CalculiX-
Lines 20-26 Link Here
20		20
21	DIST_SOURCES= ccx_${PORTVERSION}.src${EXTRACT_SUFX}	21	DIST_SOURCES= ccx_${PORTVERSION}.src${EXTRACT_SUFX}
22	DIST_HTM= ccx_${PORTVERSION}.htm${EXTRACT_SUFX}	22	DIST_HTM= ccx_${PORTVERSION}.htm${EXTRACT_SUFX}
23	DIST_PS= ccx_${PORTVERSION}.ps${EXTRACT_SUFX}	23	DIST_PDF= ccx_${PORTVERSION}.pdf
24	DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX}	24	DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX}
25		25
26	ALL_TARGET= #Empty	26	ALL_TARGET= #Empty
Lines 34-41 Link Here
34	.include <bsd.port.options.mk>	34	.include <bsd.port.options.mk>
35		35
36	.if ${PORT_OPTIONS:MDOCS}	36	.if ${PORT_OPTIONS:MDOCS}
37	DISTFILES+= ${DIST_HTM} ${DIST_PS}	37	DISTFILES+= ${DIST_HTM} ${DIST_PDF}
38	EXTRACT_ONLY+= ${DIST_HTM} ${DIST_PS}	38	EXTRACT_ONLY+= ${DIST_HTM}
39	.endif	39	.endif
40		40
41	.if $(PORT_OPTIONS:MEXAMPLES)	41	.if $(PORT_OPTIONS:MEXAMPLES)
Lines 71-79 Link Here
71	@${MKDIR} ${STAGEDIR}${DOCSDIR}	71	@${MKDIR} ${STAGEDIR}${DOCSDIR}
72	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \	72	@(cd ${WRKDIR}/CalculiX/${CCX_VER}/doc/ccx && ${COPYTREE_SHARE} . \
73	${STAGEDIR}${DOCSDIR}/ccx)	73	${STAGEDIR}${DOCSDIR}/ccx)
74	${INSTALL_DATA} ${WRKDIR}/CalculiX/${CCX_VER}/doc/${CCX_VER}.ps \	74	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
75	${STAGEDIR}${DOCSDIR}	75	${STAGEDIR}${DOCSDIR}
76	@${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/${CCX_VER}.ps
77		76
78	do-install-EXAMPLES-on:	77	do-install-EXAMPLES-on:
79	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	78	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}