diff --git a/science/cgnslib/Makefile b/science/cgnslib/Makefile
index 233a534629bb..0611a1aff8d5 100644
--- a/science/cgnslib/Makefile
+++ b/science/cgnslib/Makefile
@@ -1,62 +1,63 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	cgnslib
-PORTVERSION=	4.1.2
+PORTVERSION=	4.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	CFD General Notation System library code
 
 LICENSE=	AS-IS
 LICENSE_NAME=	AS-IS
 LICENSE_FILE=	${WRKSRC}/license.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	CGNS
 GH_PROJECT=	CGNS
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
+#CMAKE_ARGS=	-DOpenGL_GL_PREFERENCE:STRING="GLVND"
+CMAKE_ARGS=	-DOpenGL_GL_PREFERENCE:STRING="LEGACY"
+FFLAGS+=	-fPIC -std=legacy
 TEST_TARGET=	test
-FFLAGS+=	-std=legacy
 
 OPTIONS_DEFINE=		FORTRAN HDF5 TESTS TOOLS
 OPTIONS_DEFAULT=	FORTRAN HDF5 TESTS TOOLS
 OPTIONS_SUB=		yes
 
 HDF5_DESC=		Enable HDF5 interface
 TESTS_DESC=		Enable test programs
 TOOLS_DESC=		Build the CGNSTools package
 
 FORTRAN_USES=		fortran
 FORTRAN_CMAKE_BOOL=	CGNS_ENABLE_FORTRAN
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 libsz.so:science/szip
 HDF5_CMAKE_BOOL=	CGNS_ENABLE_HDF5
 HDF5_CMAKE_ON=		-DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include"
 
 TESTS_CMAKE_BOOL=	CGNS_ENABLE_TESTS
 
 TOOLS_USES=		gl localbase tk xorg
 TOOLS_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig	\
 			libfreetype.so:print/freetype2
 TOOLS_USE=		GL=egl,gl,glu	\
 			XORG=ice,sm,x11,xau,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xft,xi,xinerama,xkbfile,xmu,xpm,xrandr,xrender,xres,xscrnsaver,xt,xtst,xv,xxf86vm
 TOOLS_CMAKE_BOOL=	CGNS_BUILD_CGNSTOOLS
 TOOLS_CMAKE_ON=		-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \
 			-DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}"
 
 post-install:
 	${RLN} ${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R} \
 		${STAGEDIR}${PREFIX}/lib/libcgns.so.${PORTVERSION:R:R}
 
 do-test:
 	cd ${TEST_WRKSRC} && \
 	${SETENV} ${TEST_ENV} ctest -C ${CMAKE_BUILD_TYPE}
 
 .include <bsd.port.mk>
diff --git a/science/cgnslib/distinfo b/science/cgnslib/distinfo
index 6d5bdbc70028..6df3776a3716 100644
--- a/science/cgnslib/distinfo
+++ b/science/cgnslib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1599987558
-SHA256 (CGNS-CGNS-v4.1.2_GH0.tar.gz) = 951653956f509b8a64040f1440c77f5ee0e6e2bf0a9eef1248d370f60a400050
-SIZE (CGNS-CGNS-v4.1.2_GH0.tar.gz) = 1416803
+TIMESTAMP = 1650459751
+SHA256 (CGNS-CGNS-v4.3.0_GH0.tar.gz) = 7709eb7d99731dea0dd1eff183f109eaef8d9556624e3fbc34dc5177afc0a032
+SIZE (CGNS-CGNS-v4.3.0_GH0.tar.gz) = 1472044
diff --git a/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt b/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt
index 49640d79f163..1449a3ba8ef1 100644
--- a/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt
+++ b/science/cgnslib/files/patch-src_cgnstools_cgnscalc_CMakeLists.txt
@@ -1,15 +1,15 @@
---- src/cgnstools/cgnscalc/CMakeLists.txt.orig	2020-08-18 19:44:35 UTC
+--- src/cgnstools/cgnscalc/CMakeLists.txt.orig	2021-04-22 21:09:36 UTC
 +++ src/cgnstools/cgnscalc/CMakeLists.txt
-@@ -77,10 +77,10 @@ else (WIN32)
- 	cgnscalc.sh
- 	DESTINATION bin
- 	RENAME cgnscalc)
-+  # Do not install as unitconv to avoid a conflicy with XCrySDen
+@@ -80,10 +80,10 @@ else (WIN32)
+   install(PROGRAMS
+ 	cgnscalc.desktop
+ 	DESTINATION bin)
++# Do not install as unitconv to avoid a conflict with XCrySDen
    install(PROGRAMS
  	unitconv.sh
 -	DESTINATION bin
 -	RENAME unitconv)
 +	DESTINATION bin)
-   install(FILES
- 	cgnscalc.tcl
- 	unitconv.tcl
+   install(PROGRAMS
+ 	unitconv.desktop
+ 	DESTINATION bin)
diff --git a/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix b/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix
index b4b8eb9e1ba6..bdcc9d48aa26 100644
--- a/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix
+++ b/science/cgnslib/files/patch-src_cgnstools_cgnscalc_Makefile.unix
@@ -1,14 +1,15 @@
---- src/cgnstools/cgnscalc/Makefile.unix.orig	2020-08-18 19:44:35 UTC
+--- src/cgnstools/cgnscalc/Makefile.unix.orig	2021-04-22 21:09:36 UTC
 +++ src/cgnstools/cgnscalc/Makefile.unix
-@@ -45,8 +45,9 @@ install-prog :
- 	@echo "installing cgnscalc shell scripts to $(BIN_INSTALL_DIR)"
+@@ -46,9 +46,10 @@ install-prog :
  	@$(INSTALL_PROG) cgnscalc.sh $(BIN_INSTALL_DIR)/cgnscalc
- 	@chmod +x $(BIN_INSTALL_DIR)/cgnscalc
+ 	@$(INSTALL_PROG) cgnscalc.desktop $(BIN_INSTALL_DIR)/
+ 	@chmod +x $(BIN_INSTALL_DIR)/cgnscalc  $(BIN_INSTALL_DIR)/cgnscalc.desktop
 -	@$(INSTALL_PROG) unitconv.sh $(BIN_INSTALL_DIR)/unitconv
--	@chmod +x $(BIN_INSTALL_DIR)/unitconv
-+	# Do not install as unitconv to avoid a conflicy with XCrySDen
++	# Do not install as unitconv to avoid a conflict with XCrySDen
 +	@$(INSTALL_PROG) unitconv.sh $(BIN_INSTALL_DIR)/unitconv.sh
-+	@chmod +x $(BIN_INSTALL_DIR)/unitconv.sh
+ 	@$(INSTALL_PROG) unitconv.desktop $(BIN_INSTALL_DIR)/
+-	@chmod +x $(BIN_INSTALL_DIR)/unitconv  $(BIN_INSTALL_DIR)/unitconv.desktop
++	@chmod +x $(BIN_INSTALL_DIR)/unitconv.sh  $(BIN_INSTALL_DIR)/unitconv.desktop
  	@if [ ! -f $(EXE_INSTALL_DIR)/cgconfig ] ; then \
  	  echo "installing configuration file to $(EXE_INSTALL_DIR)"; \
  	  $(INSTALL_DATA) ../cgconfig $(EXE_INSTALL_DIR)/cgconfig; \
diff --git a/science/cgnslib/files/patch-src_cgnstools_cgnscalc_unitconv.desktop b/science/cgnslib/files/patch-src_cgnstools_cgnscalc_unitconv.desktop
new file mode 100644
index 000000000000..44ad57c81167
--- /dev/null
+++ b/science/cgnslib/files/patch-src_cgnstools_cgnscalc_unitconv.desktop
@@ -0,0 +1,9 @@
+--- src/cgnstools/cgnscalc/unitconv.desktop.orig	2021-04-22 21:09:36 UTC
++++ src/cgnstools/cgnscalc/unitconv.desktop
+@@ -6,5 +6,5 @@ Name=CGNSunitconv
+ GenericName=Unit conversions tool
+ Terminal=false
+ Categories=Development;
+-Exec="./unitconv"
++Exec="./unitconv.sh"
+ Icon=../share/cgnstools/unitconv.png
diff --git a/science/cgnslib/pkg-plist b/science/cgnslib/pkg-plist
index 86ebc71c99af..e6a28741f291 100644
--- a/science/cgnslib/pkg-plist
+++ b/science/cgnslib/pkg-plist
@@ -1,103 +1,111 @@
 %%HDF5%%bin/adf2hdf
-%%HDF5%%bin/hdf2adf
 %%TOOLS%%bin/cgconfig
 %%TOOLS%%bin/cgnscalc
+%%TOOLS%%bin/cgnscalc.desktop
+bin/cgnscheck
+bin/cgnscompress
+bin/cgnsconvert
+bin/cgnsdiff
+bin/cgnslist
+bin/cgnsnames
 %%TOOLS%%bin/cgnsnodes
+%%TOOLS%%bin/cgnsnodes.desktop
 %%TOOLS%%bin/cgnsplot
+%%TOOLS%%bin/cgnsplot.desktop
 %%TOOLS%%bin/cgnstools/aflr3_to_cgns
 %%TOOLS%%bin/cgnstools/calcwish
 %%TOOLS%%bin/cgnstools/cgiowish
+%%TOOLS%%bin/cgnstools/cgns_info
 %%TOOLS%%bin/cgnstools/cgns_to_aflr3
 %%TOOLS%%bin/cgnstools/cgns_to_fast
 %%TOOLS%%bin/cgnstools/cgns_to_plot3d
 %%TOOLS%%bin/cgnstools/cgns_to_tecplot
 %%TOOLS%%bin/cgnstools/cgns_to_vtk
 %%TOOLS%%bin/cgnstools/convert_dataclass
 %%TOOLS%%bin/cgnstools/convert_location
 %%TOOLS%%bin/cgnstools/convert_variables
 %%TOOLS%%bin/cgnstools/extract_subset
 %%TOOLS%%bin/cgnstools/fast_to_cgns
 %%TOOLS%%bin/cgnstools/interpolate_cgns
 %%TOOLS%%bin/cgnstools/patran_to_cgns
 %%TOOLS%%bin/cgnstools/plot3d_to_cgns
 %%TOOLS%%bin/cgnstools/plotwish
 %%TOOLS%%bin/cgnstools/tecplot_to_cgns
 %%TOOLS%%bin/cgnstools/tetgen_to_cgns
 %%TOOLS%%bin/cgnstools/update_ngon
 %%TOOLS%%bin/cgnstools/vgrid_to_cgns
+bin/cgnsupdate
 %%TOOLS%%bin/cgnsview
+%%TOOLS%%bin/cgnsview.desktop
+%%HDF5%%bin/hdf2adf
+%%TOOLS%%bin/unitconv.desktop
 %%TOOLS%%bin/unitconv.sh
-bin/cgnscheck
-bin/cgnscompress
-bin/cgnsconvert
-bin/cgnsdiff
-bin/cgnslist
-bin/cgnsnames
-bin/cgnsupdate
 %%FORTRAN%%include/cgns.mod
 include/cgnsBuild.defs
 include/cgns_io.h
 include/cgnsconfig.h
 include/cgnslib.h
 include/cgnstypes.h
 include/cgnstypes_f.h
 include/cgnstypes_f03.h
 include/cgnswin_f.h
+lib/cmake/cgns/cgns-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/cgns/cgns-targets.cmake
 lib/libcgns.a
 lib/libcgns.so
 lib/libcgns.so.4
-lib/libcgns.so.4.1
+lib/libcgns.so.4.3
 %%TOOLS%%share/cgnstools/aflr3.tcl
 %%TOOLS%%share/cgnstools/balloon.tcl
 %%TOOLS%%share/cgnstools/cgns-icon.xbm
 %%TOOLS%%share/cgnstools/cgns-mask.xbm
 %%TOOLS%%share/cgnstools/cgns.ico
 %%TOOLS%%share/cgnstools/cgns.png
 %%TOOLS%%share/cgnstools/cgns.tcl
 %%TOOLS%%share/cgnstools/cgnscalc-icon.xbm
 %%TOOLS%%share/cgnstools/cgnscalc-mask.xbm
 %%TOOLS%%share/cgnstools/cgnscalc.ico
 %%TOOLS%%share/cgnstools/cgnscalc.png
 %%TOOLS%%share/cgnstools/cgnscalc.tcl
 %%TOOLS%%share/cgnstools/cgnsnodes.tcl
 %%TOOLS%%share/cgnstools/cgnsplot-icon.xbm
 %%TOOLS%%share/cgnstools/cgnsplot-mask.xbm
 %%TOOLS%%share/cgnstools/cgnsplot.ico
 %%TOOLS%%share/cgnstools/cgnsplot.png
 %%TOOLS%%share/cgnstools/cgnsplot.tcl
 %%TOOLS%%share/cgnstools/cgnsview.tcl
 %%TOOLS%%share/cgnstools/color.tcl
 %%TOOLS%%share/cgnstools/combobox.tcl
 %%TOOLS%%share/cgnstools/config.tcl
 %%TOOLS%%share/cgnstools/conserved.cnv
 %%TOOLS%%share/cgnstools/convert.tcl
 %%TOOLS%%share/cgnstools/dialog.tcl
 %%TOOLS%%share/cgnstools/dimensional.cnv
 %%TOOLS%%share/cgnstools/editfile.tcl
 %%TOOLS%%share/cgnstools/export.tcl
 %%TOOLS%%share/cgnstools/fast.tcl
 %%TOOLS%%share/cgnstools/filesel.tcl
 %%TOOLS%%share/cgnstools/findfile.tcl
 %%TOOLS%%share/cgnstools/frame.tcl
 %%TOOLS%%share/cgnstools/help.tcl
 %%TOOLS%%share/cgnstools/import.tcl
 %%TOOLS%%share/cgnstools/menubar.tcl
 %%TOOLS%%share/cgnstools/patran.tcl
 %%TOOLS%%share/cgnstools/plot3d.tcl
 %%TOOLS%%share/cgnstools/primitive.cnv
 %%TOOLS%%share/cgnstools/tclIndex
 %%TOOLS%%share/cgnstools/tclreg.tcl
 %%TOOLS%%share/cgnstools/tecplot.tcl
 %%TOOLS%%share/cgnstools/tetgen.tcl
 %%TOOLS%%share/cgnstools/tkdir.tcl
 %%TOOLS%%share/cgnstools/tools.tcl
 %%TOOLS%%share/cgnstools/tree.tcl
 %%TOOLS%%share/cgnstools/unitconv.ico
 %%TOOLS%%share/cgnstools/unitconv.png
 %%TOOLS%%share/cgnstools/unitconv.tcl
 %%TOOLS%%share/cgnstools/unitconv.xbm
 %%TOOLS%%share/cgnstools/units.tcl
 %%TOOLS%%share/cgnstools/util.tcl
 %%TOOLS%%share/cgnstools/utilities.mnu
 %%TOOLS%%share/cgnstools/vgrid.tcl
 %%TOOLS%%share/cgnstools/vtk.tcl