From 537c8664fd10db188ab79d5ce780aa481fa39ca0 Mon Sep 17 00:00:00 2001
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 1 Apr 2018 15:38:48 +0000
Subject: [PATCH] MFH: r466167

Fix build with clang 6.x, pet portlint

PR:		227148
Submitted by:	pfg (maintainer)

Approved by:	ports-secteam (riggs)
---
 cad/calculix/Makefile                         |  4 ++--
 .../files/patch-cgx__VER_src_uselibSNL.cpp    | 20 +++++++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 083c687a76d5..f08476e127d6 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -15,10 +15,10 @@ COMMENT=	Three-Dimensional Structural Finite Element Program
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	ccx:cad/calculix-ccx
-
 BROKEN_FreeBSD_10=	Does not build with clang on FreeBSD 10, causes segfaults when built with gcc
 
+RUN_DEPENDS=	ccx:cad/calculix-ccx
+
 DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
 DIST_HTM=	cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
 DIST_PDF=	cgx_${PORTVERSION}.pdf
diff --git a/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp b/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
new file mode 100644
index 000000000000..c8f9ebf10bad
--- /dev/null
+++ b/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
@@ -0,0 +1,20 @@
+--- cgx_2.13/src/uselibSNL.cpp.orig	2017-10-07 09:58:00 UTC
++++ cgx_2.13/src/uselibSNL.cpp
+@@ -934,7 +934,7 @@ int createBlendedNurbs(int nr, Points **
+   // (5)   create the cgx nurbs
+   // printf(" create blended nurbs\n"); 
+   buffer[0]='S';
+-  buffer[1]=(char)NULL;
++  buffer[1]='\0';
+   getNewName( name, buffer );
+   for (i=0; i<MAX_LINE_LENGTH; i++) sname[i]=name[i];
+   if(printFlag) printf ("store NURS Nr:%d Name:%s\n", anzGeo->nurs+1, name);
+@@ -1012,7 +1012,7 @@ int createBlendedNurbs(int nr, Points **
+     for (j=0; j<nurbs[nr].v_npnt; j++)
+     {
+       buffer[0]='p';
+-      buffer[1]=(char)NULL;
++      buffer[1]='\0';
+       getNewName( name, buffer );
+       nurbs[nr].ctlpnt[i][j]  = pnt( name, surface->controlPoints()[ index ].x(), surface->controlPoints()[ index ].y(), surface->controlPoints()[ index ].z(), 0);
+       point=*pntpntr;  /* update pointer */