Index: head/math/mathgl/Makefile =================================================================== --- head/math/mathgl/Makefile (revision 509583) +++ head/math/mathgl/Makefile (revision 509584) @@ -1,74 +1,73 @@ # $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 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgif.so:graphics/giflib \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ libhpdf.so:print/libharu \ libltdl.so:devel/libltdl \ 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 .for v in double gif glut gsl hdf5 jpeg ltdl mgl2 opengl pdf png zlib CMAKE_ARGS+= -Denable-${v}=ON .endfor .for v in doc-info doc-html lgpl mgltex CMAKE_ARGS+= -Denable-${v}=OFF .endfor OPTIONS_DEFINE= PYTHON MPI OPTIONS_GROUP= GRAPHICS OPTIONS_GROUP_GRAPHICS= QT5 FLTK WXGTK OPTIONS_RADIO= THREADS OPTIONS_RADIO_THREADS= PTHREADS OPENMP OPTIONS_DEFAULT= QT5 OPTIONS_SUB= yes GRAPHICS_DESC= Graphics support PTHREADS_DESC= Enable POSIX threads support (broken, fix pending release) OPENMP_DESC= Parallel processing support via OpenMP (broken, cmake bug) FLTK_DESC= Enable fltk widget PLIST_SUB= SHLIB_VER=7.5.0 PYTHON_CMAKE_BOOL= enable-python PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 \ ${PYNUMPY} PYTHON_RUN_DEPENDS= ${PYNUMPY} MPI_CMAKE_BOOL= enable-mpi MPI_LIB_DEPENDS= libmpi.so:net/openmpi QT5_CMAKE_BOOL= enable-qt5 QT5_USE= QT=core,gui,opengl,printsupport,widgets,buildtools_build,qmake_build QT5_USES= desktop-file-utils qt:5 shared-mime-info FLTK_CMAKE_BOOL= enable-fltk FLTK_LIB_DEPENDS= libfltk.so:x11-toolkits/fltk FLTK_USE= XORG=ice,sm,x11,xext WXGTK_CMAKE_BOOL= wx WXGTK_USE= WX=3.0+ PTHREADS_CMAKE_BOOL= enable-pthread OPENMP_CMAKE_BOOL= enable-openmp post-patch-FLTK-on: @${REINPLACE_CMD} -e 's|#include Index: head/math/mathgl/distinfo =================================================================== --- head/math/mathgl/distinfo (revision 509583) +++ head/math/mathgl/distinfo (revision 509584) @@ -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 Index: head/math/mathgl/files/patch-utils_CMakeLists.txt =================================================================== --- head/math/mathgl/files/patch-utils_CMakeLists.txt (nonexistent) +++ head/math/mathgl/files/patch-utils_CMakeLists.txt (revision 509584) @@ -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( Property changes on: head/math/mathgl/files/patch-utils_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/mathgl/files/patch-widgets_CMakeLists.txt =================================================================== --- head/math/mathgl/files/patch-widgets_CMakeLists.txt (revision 509583) +++ head/math/mathgl/files/patch-widgets_CMakeLists.txt (revision 509584) @@ -1,32 +1,32 @@ ---- 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}) - target_include_directories(mgl-fltk-static SYSTEM PUBLIC ${FLTK_INCLUDE_DIR}) + #target_include_directories(mgl-fltk-static SYSTEM PUBLIC ${FLTK_INCLUDE_DIR}) target_link_libraries(mgl-fltk mgl ${FLTK_LIBRARIES}) - target_link_libraries(mgl-fltk-static mgl-static ${FLTK_LIBRARIES}) + #target_link_libraries(mgl-fltk-static mgl-static ${FLTK_LIBRARIES}) endif(MGL_HAVE_FLTK) if(MGL_HAVE_GLUT) mgl_add_lib(glut glut.cpp ../include/mgl2/glut.h) target_include_directories(mgl-glut SYSTEM PUBLIC ${GLUT_INCLUDE_DIR}) - target_include_directories(mgl-glut-static SYSTEM PUBLIC ${GLUT_INCLUDE_DIR}) + #target_include_directories(mgl-glut-static SYSTEM PUBLIC ${GLUT_INCLUDE_DIR}) target_link_libraries(mgl-glut mgl ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}) - target_link_libraries(mgl-glut-static mgl-static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}) + #target_link_libraries(mgl-glut-static mgl-static ${GLUT_LIBRARIES} ${OPENGL_LIBRARIES}) endif(MGL_HAVE_GLUT) if(MGL_HAVE_WX) mgl_add_lib(wx wx.cpp ../include/mgl2/wx.h) include(${wxWidgets_USE_FILE}) target_link_libraries(mgl-wx mgl ${wxWidgets_LIBRARIES}) - target_link_libraries(mgl-wx-static mgl-static ${wxWidgets_LIBRARIES}) + #target_link_libraries(mgl-wx-static mgl-static ${wxWidgets_LIBRARIES}) endif(MGL_HAVE_WX) add_subdirectory( qt4 ) Index: head/math/mathgl/pkg-plist =================================================================== --- head/math/mathgl/pkg-plist (revision 509583) +++ head/math/mathgl/pkg-plist (revision 509584) @@ -1,87 +1,90 @@ %%QT5%%bin/mglconv %%QT5%%bin/mglview %%QT5%%bin/udav %%FLTK%%bin/mgllab +bin/mgltask include/mgl2/Fl_MathGL.h include/mgl2/abstract.h include/mgl2/addon.h include/mgl2/base.h include/mgl2/base_cf.h include/mgl2/canvas.h include/mgl2/canvas_cf.h include/mgl2/canvas_wnd.h include/mgl2/config.h include/mgl2/cont.h include/mgl2/data.h include/mgl2/data_cf.h include/mgl2/datac.h include/mgl2/datac_cf.h include/mgl2/define.h include/mgl2/dllexport.h include/mgl2/eval.h include/mgl2/evalc.h include/mgl2/fit.h include/mgl2/font.h include/mgl2/glut.h include/mgl2/gsl.fs include/mgl2/mathgl.fs include/mgl2/mgl.fs include/mgl2/mgl.h include/mgl2/mgl_cf.h include/mgl2/mgl_pas.pas include/mgl2/mglplot.fs include/mgl2/mpi.h include/mgl2/opengl.h include/mgl2/other.h include/mgl2/parser.h include/mgl2/pde.h include/mgl2/plot.h include/mgl2/prim.h %%QT5%%include/mgl2/qmathgl.h %%QT5%%include/mgl2/qt.h %%FLTK%%include/mgl2/fltk.h include/mgl2/surf.h include/mgl2/thread.h include/mgl2/type.h 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 %%QT5%%lib/libmgl2-qt.so.%%SHLIB_VER%% %%QT5%%lib/libmgl2-qt5.so %%QT5%%lib/libmgl2-qt5.so.%%SHLIB_VER%% %%FLTK%%lib/libmgl2-fltk.so %%FLTK%%lib/libmgl2-fltk.so.%%SHLIB_VER%% %%MPI%%lib/libmgl2-mpi.so %%MPI%%lib/libmgl2-mpi.so.%%SHLIB_VER%% %%FLTK%%lib/libmgl2-wnd.so %%FLTK%%lib/libmgl2-wnd.so.%%SHLIB_VER%% lib/libmgl2.so lib/libmgl2.so.%%SHLIB_VER%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/_mathgl.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/mathgl.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/mathgl.pyc %%QT5%%share/applications/udav.desktop %%FLTK%%share/applications/mgllab.desktop share/locale/es/LC_MESSAGES/mathgl.mo share/locale/ru/LC_MESSAGES/mathgl.mo %%DATADIR%%/fonts/STIX.vfmb %%DATADIR%%/fonts/adventor.vfmb %%DATADIR%%/fonts/bonum.vfmb %%DATADIR%%/fonts/cursor.vfmb %%DATADIR%%/fonts/heros.vfmb %%DATADIR%%/fonts/heroscn.vfmb %%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