5 files changed, 54 insertions, 10 deletions

diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile
index 0e112e6e4a15..8350ddde4c4d 100644
--- a/math/mathgl/Makefile
+++ b/math/mathgl/Makefile
@@ -1,10 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	mathgl
-DISTVERSION=	2.4.2.1
-PORTREVISION=	5
+DISTVERSION=	2.4.4
 CATEGORIES=	math graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION:R}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Library for high-quality scientific data visualization
@@ -20,7 +19,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 		libpng.so:graphics/png \
 		libsz.so:science/szip
 
-USES=		cmake compiler:c++11-lang gettext-runtime jpeg python:2.7
+USES=		cmake compiler:c++11-lang gettext-runtime gl jpeg python:2.7
 USE_GL=		gl glu glut
 USE_XORG=	xi xmu
 USE_LDCONFIG=	yes
diff --git a/math/mathgl/distinfo b/math/mathgl/distinfo
index 4a857cb5f519..468012eb8ba4 100644
--- a/math/mathgl/distinfo
+++ b/math/mathgl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1522484931
-SHA256 (mathgl-2.4.2.1.tar.gz) = e0334b2454a95642c6925eac68f5dcda2bdff3cc42d63707ee2657d9c1279f35
-SIZE (mathgl-2.4.2.1.tar.gz) = 22675308
+TIMESTAMP = 1566445015
+SHA256 (mathgl-2.4.4.tar.gz) = 0e5977196635962903eaff9b2f759e5b89108339b6e71427036c92bfaf3149e9
+SIZE (mathgl-2.4.4.tar.gz) = 23917716
diff --git a/math/mathgl/files/patch-utils_CMakeLists.txt b/math/mathgl/files/patch-utils_CMakeLists.txt
new file mode 100644
index 000000000000..ffdfd50dd52e
--- /dev/null
+++ b/math/mathgl/files/patch-utils_CMakeLists.txt
@@ -0,0 +1,42 @@
+--- utils/CMakeLists.txt.orig	2019-08-22 06:18:05 UTC
++++ utils/CMakeLists.txt
+@@ -13,7 +13,7 @@ set(link_type -static)
+ else(MSVC)
+ set(link_type)
+ endif(MSVC)
+-target_link_libraries(mglconv mgl${link_type} ${getopt_lib-static})
++target_link_libraries(mglconv mgl${link_type} ${getopt_lib})
+ install(
+ 	TARGETS mglconv
+ 	EXPORT MathGLTargets
+@@ -21,7 +21,7 @@ install(
+ )
+ 
+ add_executable(mgl.cgi mglcgi.cpp)
+-target_link_libraries(mgl.cgi mgl-static)
++target_link_libraries(mgl.cgi mgl)
+ install(
+ 	TARGETS mgl.cgi
+ 	EXPORT MathGLTargets
+@@ -34,7 +34,7 @@ mgl_po_src(mglconv.cpp mglview.cpp mglcgi.cpp)
+ if(MGL_HAVE_FLTK)
+ 	add_definitions(-DUSE_FLTK)
+ 	add_executable(mglview mglview.cpp)
+-	target_link_libraries(mglview mgl-fltk ${getopt_lib-static} ${FLTK_LIBRARIES})
++	target_link_libraries(mglview mgl-fltk ${getopt_lib} ${FLTK_LIBRARIES})
+ 	install(
+ 		TARGETS mglview
+ 		EXPORT MathGLTargets
+@@ -46,10 +46,10 @@ else(MGL_HAVE_FLTK)
+ 		add_executable(mglview mglview.cpp)
+ 		if(enable-qt5)
+ 			include(../scripts/qt5.cmake)
+-			target_link_libraries(mglview mgl-qt5${link_type} ${getopt_lib-static} ${MGL_QT5_LIBS})
++			target_link_libraries(mglview mgl-qt5${link_type} ${getopt_lib} ${MGL_QT5_LIBS})
+ 		else(enable-qt5)
+ 			include(../scripts/qt4.cmake)
+-			target_link_libraries(mglview mgl-qt4${link_type} ${getopt_lib-static} ${MGL_QT4_LIBS})
++			target_link_libraries(mglview mgl-qt4${link_type} ${getopt_lib} ${MGL_QT4_LIBS})
+ 		endif(enable-qt5)
+ 
+ 		install(
diff --git a/math/mathgl/files/patch-widgets_CMakeLists.txt b/math/mathgl/files/patch-widgets_CMakeLists.txt
index 9e2b5f99d998..321fe9475571 100644
--- a/math/mathgl/files/patch-widgets_CMakeLists.txt
+++ b/math/mathgl/files/patch-widgets_CMakeLists.txt
@@ -1,6 +1,6 @@
---- widgets/CMakeLists.txt.orig	2017-07-20 06:27:56 UTC
+--- widgets/CMakeLists.txt.orig	2019-07-08 18:56:57 UTC
 +++ widgets/CMakeLists.txt
-@@ -3,24 +3,24 @@ include(GenerateExportHeader)
+@@ -7,24 +7,24 @@ endif(MSVC)
  if(MGL_HAVE_FLTK)
  	mgl_add_lib(fltk fltk.cpp  image.cpp  image.h ../include/mgl2/fltk.h ../include/mgl2/Fl_MathGL.h)
  	target_include_directories(mgl-fltk SYSTEM PUBLIC ${FLTK_INCLUDE_DIR})
diff --git a/math/mathgl/pkg-plist b/math/mathgl/pkg-plist
index 74f4806303b0..511c8c3439c1 100644
--- a/math/mathgl/pkg-plist
+++ b/math/mathgl/pkg-plist
@@ -2,6 +2,7 @@
 %%QT5%%bin/mglview
 %%QT5%%bin/udav
 %%FLTK%%bin/mgllab
+bin/mgltask
 include/mgl2/Fl_MathGL.h
 include/mgl2/abstract.h
 include/mgl2/addon.h
@@ -47,10 +48,13 @@ include/mgl2/vect.h
 include/mgl2/vectors.fs
 include/mgl2/volume.h
 include/mgl2/wnd.h
+include/mgl2/wnd_cf.h
+lib/cgi-bin/mgl.cgi
 lib/cmake/mathgl/MathGL2Config.cmake
 lib/cmake/mathgl/MathGL2ConfigVersion.cmake
 lib/cmake/mathgl/MathGLTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/mathgl/MathGLTargets.cmake
+lib/cmake/mathgl2/mathgl2-config.cmake
 lib/libmgl2-glut.so
 lib/libmgl2-glut.so.%%SHLIB_VER%%
 %%QT5%%lib/libmgl2-qt.so
@@ -81,7 +85,6 @@ share/locale/ru/LC_MESSAGES/mathgl.mo
 %%DATADIR%%/fonts/pagella.vfmb
 %%DATADIR%%/fonts/schola.vfmb
 %%DATADIR%%/fonts/termes.vfmb
-%%DATADIR%%/mgl.cgi
 %%QT5%%share/mime/packages/mgl.xml
 %%QT5%%share/pixmaps/udav.png
 %%QT5%%share/udav/udav_ru.qm