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

(-)calculix/Makefile (-1 / +1 lines)
Lines 1-5 Link Here
1 
PORTNAME=	calculix
 1 
PORTNAME=	calculix
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 
DISTFILES=	${DIST_SOURCES}
 5 
DISTFILES=	${DIST_SOURCES}
(-)calculix/distinfo (-9 / +9 lines)
Lines 1-9 Link Here
1 
TIMESTAMP = 1643750229
 1 
TIMESTAMP = 1663157421
2 
SHA256 (calculix/cgx_2.19.all.tar.bz2) = 598121372373b679a228c85d25c7e549489a38535d82f025acb750f831afe546
 2 
SHA256 (calculix/cgx_2.20.all.tar.bz2) = f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
3 
SIZE (calculix/cgx_2.19.all.tar.bz2) = 5706254
 3 
SIZE (calculix/cgx_2.20.all.tar.bz2) = 5700948
4 
SHA256 (calculix/cgx_2.19.exa.tar.bz2) = e87ad00b728e958e6c431799443030db684e86a026d83007b6c777f363ecb71c
 4 
SHA256 (calculix/cgx_2.20.exa.tar.bz2) = 3fc8520ec934f916c554693ddf46ff750de0dbc91df37790bb590926d05d12d0
5 
SIZE (calculix/cgx_2.19.exa.tar.bz2) = 3918398
 5 
SIZE (calculix/cgx_2.20.exa.tar.bz2) = 4207519
6 
SHA256 (calculix/cgx_2.19.htm.tar.bz2) = 8cbea1d807e58a9fce8bb21bb302f36939915b0979c1501ed31659ed400e2d8b
 6 
SHA256 (calculix/cgx_2.20.htm.tar.bz2) = 8eb979caa6d965a146e4b70bb288a07448e8de9d90b8c28b9a15030f4df80da0
7 
SIZE (calculix/cgx_2.19.htm.tar.bz2) = 378446
 7 
SIZE (calculix/cgx_2.20.htm.tar.bz2) = 380994
8 
SHA256 (calculix/cgx_2.19.pdf) = 4ea6d3477ddfa8e302595185d08b0d116da5ea12b53d745ad947bca88f14e5d8
 8 
SHA256 (calculix/cgx_2.20.pdf) = 8f01e61571cedee1d1fe045eac16b2839db5a8b044b914e7e781301b23fed53a
9 
SIZE (calculix/cgx_2.19.pdf) = 1492713
 9 
SIZE (calculix/cgx_2.20.pdf) = 1223026
(-)calculix/files/patch-cgx__2.19_src_pickFunktions.c (-11 lines)
Lines 1-11 Link Here
1 
--- cgx_2.19/src/pickFunktions.c.orig	2021-09-18 09:40:04 UTC
2 
+++ cgx_2.19/src/pickFunktions.c
3 
@@ -4594,7 +4594,7 @@ void moveLineEndPoint(int lineNr, int pntNr, double ll
4 
     else
5 
     {
6 
       printf("ERROR: selected point:%s is no line endpoint\n", point[pntNr].name);
7 
-      return(-1);
8 
+      return;
9 
     }
10 
     u=flag*llength;
11 
     u/=scale->w;
(-)calculix/files/patch-cgx__2.20_src_Makefile (+26 lines)
Line 0 Link Here
1 
--- cgx_2.20/src/Makefile.orig	2022-07-29 09:41:00 UTC
2 
+++ cgx_2.20/src/Makefile
3 
@@ -5,11 +5,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing -DSEMINIT \
4 
   -I/usr/include/GL \
5 
   -I../../libSNL/src \
6 
   -I../../glut-3.5/src \
7 
-  -I/usr/X11/include
8 
+  -I$(LOCALBASE)/include
9
10 
 LFLAGS = \
11 
-  -L/usr/lib64 -lGL -lGLU \
12 
-  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
13 
+  -L$(LOCALBASE)/lib -lGL -lGLU \
14 
+  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
15 
   -lm -lpthread -lrt
16
17
18 
@@ -67,7 +67,7 @@ OULIB = $(ULIB:.c=.o)
19 
 OUTIL = $(SUTIL:.c=.o)
20
21 
 cgx: $(OLIB) $(OUTIL) $(OULIB)
22 
-	g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
23 
+	${CXX}  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
24
25
26
(-)calculix/files/patch-cgx__VER_src_Makefile (-26 lines)
Lines 1-26 Link Here
1 
--- cgx_2.19/src/Makefile.orig	2021-03-11 17:35:46 UTC
2 
+++ cgx_2.19/src/Makefile
3 
@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing \
4 
   -I/usr/include/GL \
5 
   -I../../libSNL/src \
6 
   -I../../glut-3.5/src \
7 
-  -I/usr/X11/include
8 
+  -I$(LOCALBASE)/include
9
10 
 LFLAGS = \
11 
-  -L/usr/lib64 -lGL -lGLU \
12 
-  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
13 
+  -L$(LOCALBASE)/lib -lGL -lGLU \
14 
+  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
15 
   -lm -lpthread -lrt
16
17
18 
@@ -66,7 +66,7 @@ OULIB = $(ULIB:.c=.o)
19 
 OUTIL = $(SUTIL:.c=.o)
20
21 
 cgx: $(OLIB) $(OUTIL) $(OULIB)
22 
-	g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
23 
+	${CXX}  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
24
25
26
(-)calculix/pkg-plist (-1 / +1 lines)
Lines 324-330 Link Here
324 
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
 324 
%%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
325 
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
 325 
%%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
326 
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
 326 
%%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
327 
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.19.pdf
 327 
%%PORTDOCS%%%%DOCSDIR%%/cgx_2.20.pdf
328 
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
 328 
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
329 
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
 329 
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
330 
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U
 330 
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U

Return to bug 266422