cad/calculix : update to version 2.16.1

Reported by:	portscout
Approved by:	thierry (mentor, implicit)

5 files changed, 18 insertions, 17 deletions

diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile
index 5ca781c5118f..4e989ec35d27 100644
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calculix
-PORTVERSION=	2.16
+PORTVERSION=	2.16.1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.dhondt.de/
 DISTFILES=	${DIST_SOURCES}
@@ -22,7 +22,7 @@ USE_GL=		gl glu # uses its own glut
 
 DIST_SOURCES=	cgx_${PORTVERSION}.all${EXTRACT_SUFX}
 DIST_HTM=	cgx_${PORTVERSION}.htm${EXTRACT_SUFX}
-DIST_PDF=	cgx_${PORTVERSION}.pdf
+DIST_PDF=	cgx_2.16.pdf
 DIST_EXAMPLES=	cgx_${PORTVERSION}.exa${EXTRACT_SUFX}
 
 WRKSRC=		${WRKDIR}/CalculiX
@@ -75,7 +75,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/cgx
 	@(cd ${WRKSRC}/${CGX_VER}/doc/cgx && ${COPYTREE_SHARE} . \
 	  ${STAGEDIR}${DOCSDIR}/cgx)
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/cgx_${PORTVERSION}.pdf \
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DIST_PDF} \
 	  ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
diff --git a/cad/calculix/distinfo b/cad/calculix/distinfo
index 9592ec1db31c..2691b1db46f2 100644
--- a/cad/calculix/distinfo
+++ b/cad/calculix/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1577502634
-SHA256 (calculix/cgx_2.16.all.tar.bz2) = 8389dbe31aa2d371f45f921743f39e91979e8bebb6cf43d5e645331c2f036ca1
-SIZE (calculix/cgx_2.16.all.tar.bz2) = 5500475
-SHA256 (calculix/cgx_2.16.exa.tar.bz2) = 3dedf12eefa72604144229bdda533b29235bbe6dea66a92b2e0127eee52d9dca
-SIZE (calculix/cgx_2.16.exa.tar.bz2) = 3927640
-SHA256 (calculix/cgx_2.16.htm.tar.bz2) = 3755d29c1975c99c575efc64453a6641039831733ffe940d1ba2b48794961177
-SIZE (calculix/cgx_2.16.htm.tar.bz2) = 370067
+TIMESTAMP = 1579642636
+SHA256 (calculix/cgx_2.16.1.all.tar.bz2) = 0125efb8dfe47c920b266d8c6a326677eae3967a113a75c079405c1d9415cb54
+SIZE (calculix/cgx_2.16.1.all.tar.bz2) = 5574753
+SHA256 (calculix/cgx_2.16.1.exa.tar.bz2) = 3bf64df5cc63eef1c2f3bc4a8fed292fe76c5fe2e035857bf51ef8578a04d57f
+SIZE (calculix/cgx_2.16.1.exa.tar.bz2) = 3914261
+SHA256 (calculix/cgx_2.16.1.htm.tar.bz2) = ed0107b6aa6a020ae616a9ffee8f02115a587d9482e6c599d8ab914bc68b4524
+SIZE (calculix/cgx_2.16.1.htm.tar.bz2) = 369390
 SHA256 (calculix/cgx_2.16.pdf) = b6d63ec1cddd1901de758eb18a68e1f123270cf0257042b10a0f364106e509f7
 SIZE (calculix/cgx_2.16.pdf) = 1426769
diff --git a/cad/calculix/files/patch-cgx__VER_src_Makefile b/cad/calculix/files/patch-cgx__VER_src_Makefile
index 7cb995ef7e45..bfdecf7ae9df 100644
--- a/cad/calculix/files/patch-cgx__VER_src_Makefile
+++ b/cad/calculix/files/patch-cgx__VER_src_Makefile
@@ -1,5 +1,5 @@
---- cgx_2.16/src/Makefile.orig	2017-03-11 16:25:39 UTC
-+++ cgx_2.16/src/Makefile
+--- cgx_2.16.1/src/Makefile.orig	2017-03-11 16:25:39 UTC
++++ cgx_2.16.1/src/Makefile
 @@ -4,11 +4,11 @@ CFLAGS = -O2 -Wall \
    -I/usr/include/GL \
    -I../../libSNL/src \
diff --git a/cad/calculix/files/patch-cgx__VER_src_cgx.h b/cad/calculix/files/patch-cgx__VER_src_cgx.h
index 7e23e5a22742..73e2124f77c9 100644
--- a/cad/calculix/files/patch-cgx__VER_src_cgx.h
+++ b/cad/calculix/files/patch-cgx__VER_src_cgx.h
@@ -1,10 +1,10 @@
---- cgx_2.16/src/cgx.h.orig	2017-04-28 10:12:50 UTC
-+++ cgx_2.16/src/cgx.h
+--- cgx_2.16.1/src/cgx.h.orig	2017-04-28 10:12:50 UTC
++++ cgx_2.16.1/src/cgx.h
 @@ -89,8 +89,8 @@ rendering is done in the index-mode.
      "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html",\
-     "/usr/local/CalculiX/cgx_2.16/doc/aflib/aflib.pdf"}
+     "/usr/local/CalculiX/cgx_2.16.1/doc/aflib/aflib.pdf"}
  #else
--  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.16/doc/cgx/cgx.html",\
+-  #define     HELPFILE        {"/usr/local/CalculiX/cgx_2.16.1/doc/cgx/cgx.html",\
 -    "/usr/local/CalculiX/ccx_2.16/doc/ccx/ccx.html"}
 +  #define     HELPFILE        {"/usr/local/share/doc/CalculiX/cgx/cgx.html",\
 +    "/usr/local/share/doc/CalculiX/ccx/ccx.html"}
diff --git a/cad/calculix/pkg-plist b/cad/calculix/pkg-plist
index 5ef1fae033c8..a54e05f7bf23 100644
--- a/cad/calculix/pkg-plist
+++ b/cad/calculix/pkg-plist
@@ -1,5 +1,4 @@
 bin/cgx
-%%PORTDOCS%%%%DOCSDIR%%/cgx/WARNINGS
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.css
 %%PORTDOCS%%%%DOCSDIR%%/cgx/cgx.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/images.aux
@@ -230,6 +229,8 @@ bin/cgx
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node26.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node260.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node261.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node262.html
+%%PORTDOCS%%%%DOCSDIR%%/cgx/node263.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node27.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node28.html
 %%PORTDOCS%%%%DOCSDIR%%/cgx/node29.html