From owner-svn-ports-all@freebsd.org Thu Aug 22 06:36:47 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7FA5FDF1C5; Thu, 22 Aug 2019 06:36:47 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46DZZ72mqhz46LS; Thu, 22 Aug 2019 06:36:47 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 383FD27FC0; Thu, 22 Aug 2019 06:36:47 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7M6al15001913; Thu, 22 Aug 2019 06:36:47 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7M6akbK001905; Thu, 22 Aug 2019 06:36:46 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201908220636.x7M6akbK001905@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Thu, 22 Aug 2019 06:36:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509584 - in head/math/mathgl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/math/mathgl: . files X-SVN-Commit-Revision: 509584 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2019 06:36:47 -0000 Author: yuri Date: Thu Aug 22 06:36:45 2019 New Revision: 509584 URL: https://svnweb.freebsd.org/changeset/ports/509584 Log: math/mathgl: Update 2.4.2.1 -> 2.4.4 Added: head/math/mathgl/files/patch-utils_CMakeLists.txt (contents, props changed) Modified: head/math/mathgl/Makefile head/math/mathgl/distinfo head/math/mathgl/files/patch-widgets_CMakeLists.txt head/math/mathgl/pkg-plist Modified: head/math/mathgl/Makefile ============================================================================== --- head/math/mathgl/Makefile Thu Aug 22 06:33:03 2019 (r509583) +++ head/math/mathgl/Makefile Thu Aug 22 06:36:45 2019 (r509584) @@ -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 Modified: head/math/mathgl/distinfo ============================================================================== --- head/math/mathgl/distinfo Thu Aug 22 06:33:03 2019 (r509583) +++ head/math/mathgl/distinfo Thu Aug 22 06:36:45 2019 (r509584) @@ -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 Added: head/math/mathgl/files/patch-utils_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/mathgl/files/patch-utils_CMakeLists.txt Thu Aug 22 06:36:45 2019 (r509584) @@ -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( Modified: head/math/mathgl/files/patch-widgets_CMakeLists.txt ============================================================================== --- head/math/mathgl/files/patch-widgets_CMakeLists.txt Thu Aug 22 06:33:03 2019 (r509583) +++ head/math/mathgl/files/patch-widgets_CMakeLists.txt Thu Aug 22 06:36:45 2019 (r509584) @@ -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}) Modified: head/math/mathgl/pkg-plist ============================================================================== --- head/math/mathgl/pkg-plist Thu Aug 22 06:33:03 2019 (r509583) +++ head/math/mathgl/pkg-plist Thu Aug 22 06:36:45 2019 (r509584) @@ -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