svn commit: r466168 - in branches/2018Q2/cad/calculix: . files

[Thomas Zander]

Author: riggs
Date: Sun Apr  1 15:38:48 2018
New Revision: 466168
URL: https://svnweb.freebsd.org/changeset/ports/466168

Log:
  MFH: r466167
  
  Fix build with clang 6.x, pet portlint
  
  PR:		227148
  Submitted by:	pfg (maintainer)
  
  Approved by:	ports-secteam (riggs)

Added:
  branches/2018Q2/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
     - copied unchanged from r466167, head/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp
Modified:
  branches/2018Q2/cad/calculix/Makefile
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/cad/calculix/Makefile
==============================================================================
--- branches/2018Q2/cad/calculix/Makefile	Sun Apr  1 15:36:23 2018	(r466167)
+++ branches/2018Q2/cad/calculix/Makefile	Sun Apr  1 15:38:48 2018	(r466168)
@@ -15,9 +15,9 @@ COMMENT=	Three-Dimensional Structural Finite Element P
 
 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}

Copied: branches/2018Q2/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp (from r466167, head/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q2/cad/calculix/files/patch-cgx__VER_src_uselibSNL.cpp	Sun Apr  1 15:38:48 2018	(r466168, copy of r466167, head/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 */