Attachment 236563 Details for Bug 266422 – patch to update the port to 2.20.

[patch] patch to update the port to 2.20.

calculix.patch (text/plain), 5.00 KB, created by rsmith on 2022-09-15 08:00:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rsmith

Created: 2022-09-15 08:00:22 UTC

Size: 5.00 KB

patch

obsolete

>diff -ruN -x .git calculix.orig/Makefile calculix/Makefile
>--- calculix.orig/Makefile	2022-07-20 18:27:01.400677000 +0200
>+++ calculix/Makefile	2022-09-14 14:10:16.681111000 +0200
>@@ -1,5 +1,5 @@
> PORTNAME=	calculix
>-PORTVERSION=	2.19
>+PORTVERSION=	2.20
> CATEGORIES=	cad
> MASTER_SITES=	http://www.dhondt.de/
> DISTFILES=	${DIST_SOURCES}
>diff -ruN -x .git calculix.orig/distinfo calculix/distinfo
>--- calculix.orig/distinfo	2022-02-02 19:17:02.992496000 +0100
>+++ calculix/distinfo	2022-09-14 14:10:21.708927000 +0200
>@@ -1,9 +1,9 @@
>-TIMESTAMP = 1643750229
>-SHA256 (calculix/cgx_2.19.all.tar.bz2) = 598121372373b679a228c85d25c7e549489a38535d82f025acb750f831afe546
>-SIZE (calculix/cgx_2.19.all.tar.bz2) = 5706254
>-SHA256 (calculix/cgx_2.19.exa.tar.bz2) = e87ad00b728e958e6c431799443030db684e86a026d83007b6c777f363ecb71c
>-SIZE (calculix/cgx_2.19.exa.tar.bz2) = 3918398
>-SHA256 (calculix/cgx_2.19.htm.tar.bz2) = 8cbea1d807e58a9fce8bb21bb302f36939915b0979c1501ed31659ed400e2d8b
>-SIZE (calculix/cgx_2.19.htm.tar.bz2) = 378446
>-SHA256 (calculix/cgx_2.19.pdf) = 4ea6d3477ddfa8e302595185d08b0d116da5ea12b53d745ad947bca88f14e5d8
>-SIZE (calculix/cgx_2.19.pdf) = 1492713
>+TIMESTAMP = 1663157421
>+SHA256 (calculix/cgx_2.20.all.tar.bz2) = f4c840c3633718547e33f86b2d7bc6b35608dd8d6cbf9fa192cecef34f2dc908
>+SIZE (calculix/cgx_2.20.all.tar.bz2) = 5700948
>+SHA256 (calculix/cgx_2.20.exa.tar.bz2) = 3fc8520ec934f916c554693ddf46ff750de0dbc91df37790bb590926d05d12d0
>+SIZE (calculix/cgx_2.20.exa.tar.bz2) = 4207519
>+SHA256 (calculix/cgx_2.20.htm.tar.bz2) = 8eb979caa6d965a146e4b70bb288a07448e8de9d90b8c28b9a15030f4df80da0
>+SIZE (calculix/cgx_2.20.htm.tar.bz2) = 380994
>+SHA256 (calculix/cgx_2.20.pdf) = 8f01e61571cedee1d1fe045eac16b2839db5a8b044b914e7e781301b23fed53a
>+SIZE (calculix/cgx_2.20.pdf) = 1223026
>diff -ruN -x .git calculix.orig/files/patch-cgx__2.19_src_pickFunktions.c calculix/files/patch-cgx__2.19_src_pickFunktions.c
>--- calculix.orig/files/patch-cgx__2.19_src_pickFunktions.c	2022-02-02 19:17:02.992761000 +0100
>+++ calculix/files/patch-cgx__2.19_src_pickFunktions.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- cgx_2.19/src/pickFunktions.c.orig	2021-09-18 09:40:04 UTC
>-+++ cgx_2.19/src/pickFunktions.c
>-@@ -4594,7 +4594,7 @@ void moveLineEndPoint(int lineNr, int pntNr, double ll
>-     else
>-     {
>-       printf("ERROR: selected point:%s is no line endpoint\n", point[pntNr].name);
>--      return(-1);
>-+      return;
>-     }
>-     u=flag*llength;
>-     u/=scale->w;
>diff -ruN -x .git calculix.orig/files/patch-cgx__2.20_src_Makefile calculix/files/patch-cgx__2.20_src_Makefile
>--- calculix.orig/files/patch-cgx__2.20_src_Makefile	1970-01-01 01:00:00.000000000 +0100
>+++ calculix/files/patch-cgx__2.20_src_Makefile	2022-09-15 09:43:17.603397000 +0200
>@@ -0,0 +1,26 @@
>+--- cgx_2.20/src/Makefile.orig	2022-07-29 09:41:00 UTC
>++++ cgx_2.20/src/Makefile
>+@@ -5,11 +5,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing -DSEMINIT \
>+   -I/usr/include/GL \
>+   -I../../libSNL/src \
>+   -I../../glut-3.5/src \
>+-  -I/usr/X11/include 
>++  -I$(LOCALBASE)/include 
>+ 
>+ LFLAGS = \
>+-  -L/usr/lib64 -lGL -lGLU \
>+-  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
>++  -L$(LOCALBASE)/lib -lGL -lGLU \
>++  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
>+   -lm -lpthread -lrt
>+ 
>+ 
>+@@ -67,7 +67,7 @@ OULIB = $(ULIB:.c=.o)
>+ OUTIL = $(SUTIL:.c=.o)
>+ 
>+ cgx: $(OLIB) $(OUTIL) $(OULIB)
>+-	g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
>++	${CXX}  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
>+ 
>+ 
>+ 
>diff -ruN -x .git calculix.orig/files/patch-cgx__VER_src_Makefile calculix/files/patch-cgx__VER_src_Makefile
>--- calculix.orig/files/patch-cgx__VER_src_Makefile	2022-02-02 19:17:02.994114000 +0100
>+++ calculix/files/patch-cgx__VER_src_Makefile	1970-01-01 01:00:00.000000000 +0100
>@@ -1,26 +0,0 @@
>---- cgx_2.19/src/Makefile.orig	2021-03-11 17:35:46 UTC
>-+++ cgx_2.19/src/Makefile
>-@@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall -Wno-narrowing \
>-   -I/usr/include/GL \
>-   -I../../libSNL/src \
>-   -I../../glut-3.5/src \
>--  -I/usr/X11/include 
>-+  -I$(LOCALBASE)/include 
>- 
>- LFLAGS = \
>--  -L/usr/lib64 -lGL -lGLU \
>--  -L/usr/X11R6/lib64 -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
>-+  -L$(LOCALBASE)/lib -lGL -lGLU \
>-+  -lX11 -lXi -lXmu -lXext -lXt -lSM -lICE \
>-   -lm -lpthread -lrt
>- 
>- 
>-@@ -66,7 +66,7 @@ OULIB = $(ULIB:.c=.o)
>- OUTIL = $(SUTIL:.c=.o)
>- 
>- cgx: $(OLIB) $(OUTIL) $(OULIB)
>--	g++  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
>-+	${CXX}  $(OULIB)  $(OLIB) $(OUTIL)  $(CFLAGS) $(LFLAGS) -o  $@
>- 
>- 
>- 
>diff -ruN -x .git calculix.orig/pkg-plist calculix/pkg-plist
>--- calculix.orig/pkg-plist	2022-02-02 19:17:02.995639000 +0100
>+++ calculix/pkg-plist	2022-09-14 14:50:02.122643000 +0200
>@@ -324,7 +324,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node97.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node98.html
> %%PORTDOCS%%%%DOCSDIR%%/cgx/node99.html
>-%%PORTDOCS%%%%DOCSDIR%%/cgx_2.19.pdf
>+%%PORTDOCS%%%%DOCSDIR%%/cgx_2.20.pdf
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/README
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/T
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/OpenFOAM/couette/0.00100001/U

Actions: View | Diff

Attachments on bug 266422: 236563