- Upgrade to 1.61.0;

- Fix build with Triangle;

- Quote NO_CDROM.

5 files changed, 33 insertions, 9 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index d4326bea8f6e..b7a996a6ce99 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmsh
-PORTVERSION=	1.60.1
-PORTREVISION=	1
+PORTVERSION=	1.61.0
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -43,7 +42,7 @@ ALL_TARGET=	all utils
 MAN1=		gmsh.1
 
 .if !defined(WITHOUT_TRIANGLE)
-NO_CDROM=	Triangle must not be sold for profit
+NO_CDROM=	"Triangle must not be sold for profit"
 .endif
 
 .include <bsd.port.pre.mk>
@@ -54,7 +53,8 @@ CONFIGURE_ARGS+=	--disable-netgen	# Problem with Netgen & gcc-295
 
 post-extract:
 .if !defined(WITHOUT_TRIANGLE)
-	${CP} `cd ${TRIANGLE_PORTDIR}; ${MAKE} -V WRKSRC`/triangle.* ${WRKSRC}/Triangle
+	${CP} `cd ${TRIANGLE_PORTDIR}; ${MAKE} -V WRKSRC`/triangle.*	\
+		${WRKSRC}/contrib/Triangle
 .endif
 
 pre-configure:
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index f3c112a3dece..bca26e310b6d 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmsh-1.60.1-source.tgz) = 5f1442e5231bf256cdbdc74fec8ee92e
-SHA256 (gmsh-1.60.1-source.tgz) = c1eb563db206fe1c35651f24bf670498bd5e9cd95b3c1c22ed865c9683ccfcf4
-SIZE (gmsh-1.60.1-source.tgz) = 1933563
+MD5 (gmsh-1.61.0-source.tgz) = 769c74d6ae502b6d6e47ee58c4471d66
+SHA256 (gmsh-1.61.0-source.tgz) = a67d1e2fc8834fc3a35b696364d77a92d93fd072f55c11c61f683366c9d5c5a0
+SIZE (gmsh-1.61.0-source.tgz) = 2132569
diff --git a/cad/gmsh/files/patch-Mesh__2D_Mesh_Triangle.cpp b/cad/gmsh/files/patch-Mesh__2D_Mesh_Triangle.cpp
new file mode 100644
index 000000000000..ed5c717ea633
--- /dev/null
+++ b/cad/gmsh/files/patch-Mesh__2D_Mesh_Triangle.cpp
@@ -0,0 +1,10 @@
+--- Mesh/2D_Mesh_Triangle.cpp.orig	Sat Jan  1 23:01:53 2005
++++ Mesh/2D_Mesh_Triangle.cpp	Mon Nov 28 15:40:08 2005
+@@ -36,6 +36,7 @@
+ 
+ #define ANSI_DECLARATORS
+ #define REAL double
++#define VOID void
+ 
+ extern "C"
+ {
diff --git a/cad/gmsh/files/patch-Plugin__Triangulate.cpp b/cad/gmsh/files/patch-Plugin__Triangulate.cpp
new file mode 100644
index 000000000000..dab2ddc9d42a
--- /dev/null
+++ b/cad/gmsh/files/patch-Plugin__Triangulate.cpp
@@ -0,0 +1,10 @@
+--- Plugin/Triangulate.cpp.orig	Thu Mar  3 20:42:54 2005
++++ Plugin/Triangulate.cpp	Mon Nov 28 15:47:20 2005
+@@ -98,6 +98,7 @@
+ 
+ #define ANSI_DECLARATORS
+ #define REAL double
++#define VOID void
+ 
+ extern "C"
+ {
diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist
index b4fc5dd6d6fb..568af4518d7b 100644
--- a/cad/gmsh/pkg-plist
+++ b/cad/gmsh/pkg-plist
@@ -21,7 +21,9 @@ bin/mshsort
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/antenna.geo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/antenna.i1
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/cube.geo
+%%PORTDOCS%%%%EXAMPLESDIR%%/demos/encode.script
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/filter.geo
+%%PORTDOCS%%%%EXAMPLESDIR%%/demos/hex.geo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/isosurf.script
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/lowmem-anim.geo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/machine.geo
@@ -32,9 +34,11 @@ bin/mshsort
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/piece-extr.geo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/piece.geo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/primitives.pos
+%%PORTDOCS%%%%EXAMPLESDIR%%/demos/pripyrtet.geo
+%%PORTDOCS%%%%EXAMPLESDIR%%/demos/rotate.script
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere-discrete.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere-stl.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere-stl.stl
+%%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere-surf.msh
+%%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere-surf.stl
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere.geo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/splines.geo
 %%PORTDOCS%%%%EXAMPLESDIR%%/demos/title.script