3 files changed, 40 insertions, 35 deletions
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 08bf15d9d750..2a5c71fa7383 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmsh
-DISTVERSION=	4.1.3
-PORTREVISION=	1
+DISTVERSION=	4.2.1
 CATEGORIES=	cad
 MASTER_SITES=	http://gmsh.info/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index 01f1eea91b43..879960afbad2 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548346312
-SHA256 (gmsh/gmsh-4.1.3-source.tgz) = bd4e4108437a25bd7a917570a6d3801d23eea49df7c78937a90c7a1637f54d5d
-SIZE (gmsh/gmsh-4.1.3-source.tgz) = 12689442
+TIMESTAMP = 1552320526
+SHA256 (gmsh/gmsh-4.2.1-source.tgz) = 1f11481e68900dc256f88aaed18d03e93b416ba01e9e8c3dc3f6d59a211f0561
+SIZE (gmsh/gmsh-4.2.1-source.tgz) = 12736068
diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist
index 578121bb9e79..039b7a93d026 100644
--- a/cad/gmsh/pkg-plist
+++ b/cad/gmsh/pkg-plist
@@ -1,14 +1,41 @@
 bin/gmsh
 bin/onelab.py
 man/man1/gmsh.1.gz
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
-%%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/bgmesh.pos
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/image.png
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t1.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t10.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t11.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t12.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t13.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t13_data.msh
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t14.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t15.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t16.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t17.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t17.pos
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t2.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t3.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t4.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t5.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t6.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t7.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t8.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/t9.geo
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/view1.pos
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/view2.pos
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/view3.pos
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/view4.pos
+%%PORTDOCS%%%%DOCSDIR%%/tutorial/view5.msh
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/CMakeLists.txt
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/adapt_mesh.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/adapt_mesh.py
+%%PORTDOCS%%%%DOCSDIR%%/demos/api/as1-tu-203.stp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/boolean.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/boolean.py
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/crack.py
@@ -17,8 +44,11 @@ man/man1/gmsh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/discrete.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/discrete.jl
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/discrete.py
+%%PORTDOCS%%%%DOCSDIR%%/demos/api/edges.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/explore.cpp
+%%PORTDOCS%%%%DOCSDIR%%/demos/api/explore.jl
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/explore.py
+%%PORTDOCS%%%%DOCSDIR%%/demos/api/faces.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/gui.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/gui.jl
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/gui.py
@@ -44,6 +74,7 @@ man/man1/gmsh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/spherical_surf.py
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/spline.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/spline.py
+%%PORTDOCS%%%%DOCSDIR%%/demos/api/step_assembly.py
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/t1.c
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/t1.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/t1.jl
@@ -74,6 +105,7 @@ man/man1/gmsh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/view.py
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/viewlist.cpp
 %%PORTDOCS%%%%DOCSDIR%%/demos/api/viewlist.py
+%%PORTDOCS%%%%DOCSDIR%%/demos/boolean/as1-tu-203.stp
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/baffles.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/boolean.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/chamfer.geo
@@ -108,6 +140,7 @@ man/man1/gmsh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/simple7.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/spherical_surf.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/spline.geo
+%%PORTDOCS%%%%DOCSDIR%%/demos/boolean/step_assembly.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/surface_filling.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/thicksolid.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/boolean/thrusections.geo
@@ -129,7 +162,6 @@ man/man1/gmsh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/antenna.i1
 %%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/cone.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/cube.geo
-%%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/fields.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/filter.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/hex.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/homology.geo
@@ -155,29 +187,3 @@ man/man1/gmsh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/demos/simple_geo/transfinite.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/struct/Exists_GetForced.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/struct/struct.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/bgmesh.pos
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/image.png
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t1.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t10.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t11.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t12.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t13.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t13_data.msh
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t14.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t15.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t16.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t17.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t17.pos
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t2.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t3.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t4.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t5.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t6.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t7.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t8.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/t9.geo
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/view1.pos
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/view2.pos
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/view3.pos
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/view4.pos
-%%PORTDOCS%%%%DOCSDIR%%/tutorial/view5.msh