From nobody Wed Dec 08 19:30:35 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D54AF18D0EFC; Wed, 8 Dec 2021 19:30:36 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J8S1m0SpZz3M25; Wed, 8 Dec 2021 19:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C190F18E3B; Wed, 8 Dec 2021 19:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B8JUZB3073147; Wed, 8 Dec 2021 19:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B8JUZNP073146; Wed, 8 Dec 2021 19:30:35 GMT (envelope-from git) Date: Wed, 8 Dec 2021 19:30:35 GMT Message-Id: <202112081930.1B8JUZNP073146@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: a6797ded5413 - main - math/mathgl: Update 2.4.4 -> 2.5 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a6797ded5413c1ed9a74f7a9073fb4f290a51133 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638991836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I+RlD23FwtNqsuT2rmy8OT6XH4wQr2/yPx3PAb0aTHg=; b=Ph/xZ5JtkDOKaUSYZgetEQNWUmf/AHvho0xzukSqmsVgjd5FVKWEQLAHG5HQE+6w6yWPnW 7YJxyi7IcYPMOgB8oMB2QA6ImR3RR36la3ZIgC/61PeGlPIyf5PuAx4QIGADmsDOCGTcb0 W2wRef3mbXNZxJ3Yd4BRTSNW2POmEkjoAc9R5MLoyJy92KfEgMP8yb7SubP1wq7GMoe2VR BzJ9cEOlG7kIo0EFcZ2ZLngQPXkzn1iRkkkPcYnFMnGTeAkA2PF4q0q/eynnfiWcDdTSed kHD37+sSu7UxYVaZoMC+GxjCtYpnzjoEGBy+plISK9RAp4Ht5L5DyV2FTwD4AA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638991836; a=rsa-sha256; cv=none; b=DJ+PKYAjHVLIRxCYv9vR8XrYGbJb4a4c+XthI1i/cYjXl+TyWkD44gUA7NLl/jVXIsC3gz Ra9FxtkygFSUxkJdPiuGCizhxaWYwuwR7WaMeXLJhvm/tvKwsBvvMqYN6b7XZHp6Q3MVMf Psxfb2CPKJvr324gVk/9qS/WTpPen+JB/ceL90u393FWMhLvzt4Gi3to3Po42dEh7Laww8 WgxiyskGzVQxbFcRiOFjC3QfUM4Y/3dpMf0VL4K0dOYHvWvjO85t6m56KGT/DhntqjVRqU jpxYa+Ek0MUudEhrvDdK7BodqmHHXb2eM7MV6f9p19ftk0vaS58XZ/Aah2Y96A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6797ded5413c1ed9a74f7a9073fb4f290a51133 commit a6797ded5413c1ed9a74f7a9073fb4f290a51133 Author: Yuri Victorovich AuthorDate: 2021-12-08 19:29:41 +0000 Commit: Yuri Victorovich CommitDate: 2021-12-08 19:30:25 +0000 math/mathgl: Update 2.4.4 -> 2.5 Reported by: portscout --- math/mathgl/Makefile | 28 ++++++--- math/mathgl/distinfo | 6 +- math/mathgl/files/patch-CMakeLists.txt | 80 ++++++++++++------------- math/mathgl/files/patch-examples_CMakeLists.txt | 4 +- math/mathgl/files/patch-utils_CMakeLists.txt | 23 ++++--- math/mathgl/pkg-plist | 18 +++--- 6 files changed, 89 insertions(+), 70 deletions(-) diff --git a/math/mathgl/Makefile b/math/mathgl/Makefile index 3f66cddfd36a..59b887e9e9e6 100644 --- a/math/mathgl/Makefile +++ b/math/mathgl/Makefile @@ -1,6 +1,5 @@ PORTNAME= mathgl -DISTVERSION= 2.4.4 -PORTREVISION= 4 +DISTVERSION= 2.5 CATEGORIES= math graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/ @@ -42,7 +41,7 @@ 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 +PLIST_SUB= SHLIB_VER=7.6.0 PYTHON_CMAKE_BOOL= enable-python PYTHON_BUILD_DEPENDS= swig:devel/swig \ @@ -56,19 +55,30 @@ 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 + +.if ! ${PORT_OPTIONS:MFLTK} && ! ${PORT_OPTIONS:MQT5} +PLIST_SUB+= FLTK_OR_QT5="@comment " +.else +PLIST_SUB+= FLTK_OR_QT5="" +.endif + +.if ${PORT_OPTIONS:MFLTK} && ${PORT_OPTIONS:MQT5} +PLIST_SUB+= FLTK_AND_QT5="" +.else +PLIST_SUB+= FLTK_AND_QT5="@comment " +.endif .include diff --git a/math/mathgl/distinfo b/math/mathgl/distinfo index 468012eb8ba4..8172e725317a 100644 --- a/math/mathgl/distinfo +++ b/math/mathgl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1566445015 -SHA256 (mathgl-2.4.4.tar.gz) = 0e5977196635962903eaff9b2f759e5b89108339b6e71427036c92bfaf3149e9 -SIZE (mathgl-2.4.4.tar.gz) = 23917716 +TIMESTAMP = 1638983654 +SHA256 (mathgl-2.5.tar.gz) = f58178a31f35cc5a75ed3ef1dce8cdaf4102903e69672ef38cebfe648ba927db +SIZE (mathgl-2.5.tar.gz) = 23974688 diff --git a/math/mathgl/files/patch-CMakeLists.txt b/math/mathgl/files/patch-CMakeLists.txt index 0c9c6cf573db..5fd78614de4b 100644 --- a/math/mathgl/files/patch-CMakeLists.txt +++ b/math/mathgl/files/patch-CMakeLists.txt @@ -1,45 +1,45 @@ ---- CMakeLists.txt.orig 2018-03-21 16:48:13 UTC +--- CMakeLists.txt.orig 2021-12-08 05:59:54 UTC +++ CMakeLists.txt -@@ -74,13 +74,13 @@ function(mgl_add_lib mgl_tmp_lib) - set(mgl_src_lst ${ARGV}) - list(REMOVE_AT mgl_src_lst 0) - add_library(${mgllib} SHARED ${mgl_src_lst}) -- add_library(${mgllib}-static STATIC ${mgl_src_lst}) -+ #add_library(${mgllib}-static STATIC ${mgl_src_lst}) - set_target_properties(${mgllib} PROPERTIES SOVERSION ${MathGL_SOVERSION}) - set_target_properties(${mgllib} PROPERTIES DEFINE_SYMBOL "mgl_EXPORTS") - set_target_properties(${mgllib} PROPERTIES C_VISIBILITY_PRESET hidden) - set_target_properties(${mgllib} PROPERTIES CXX_VISIBILITY_PRESET hidden) - set_target_properties(${mgllib} PROPERTIES VISIBILITY_INLINES_HIDDEN 1) -- target_compile_definitions(${mgllib}-static PUBLIC MGL_STATIC_DEFINE) -+ #target_compile_definitions(${mgllib}-static PUBLIC MGL_STATIC_DEFINE) - if(MSVC) - set(mgl_lib_static "-static") - if(CMAKE_BUILD_TYPE STREQUAL "Debug") -@@ -91,18 +91,18 @@ function(mgl_add_lib mgl_tmp_lib) - elseif(MSVC) - set(mgl_lib_static) - set_target_properties(${mgllib} PROPERTIES CLEAN_DIRECT_OUTPUT 1) -- set_target_properties(${mgllib}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) -+ #set_target_properties(${mgllib}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - endif(MSVC) - if(enable-mgl2) - set_target_properties(${mgllib} PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_end}") -- set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_static}${mgl_lib_end}") -+ #set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_static}${mgl_lib_end}") - else(enable-mgl2) - set_target_properties(${mgllib} PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_end}") -- set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_static}${mgl_lib_end}") -+ #set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_static}${mgl_lib_end}") - endif(enable-mgl2) +@@ -78,13 +78,13 @@ function(mgl_add_lib mgl_tmp_lib) + set(mgl_src_lst ${ARGV}) + list(REMOVE_AT mgl_src_lst 0) + add_library(${mgllib} SHARED ${mgl_src_lst}) +- add_library(${mgllib}-static STATIC ${mgl_src_lst}) ++ #add_library(${mgllib}-static STATIC ${mgl_src_lst}) + set_target_properties(${mgllib} PROPERTIES SOVERSION ${MathGL_SOVERSION}) + set_target_properties(${mgllib} PROPERTIES DEFINE_SYMBOL "mgl_EXPORTS") + set_target_properties(${mgllib} PROPERTIES C_VISIBILITY_PRESET hidden) + set_target_properties(${mgllib} PROPERTIES CXX_VISIBILITY_PRESET hidden) + set_target_properties(${mgllib} PROPERTIES VISIBILITY_INLINES_HIDDEN 1) +- target_compile_definitions(${mgllib}-static PUBLIC MGL_STATIC_DEFINE) ++ #target_compile_definitions(${mgllib}-static PUBLIC MGL_STATIC_DEFINE) + if(MSVC) + set(mgl_lib_static "-static") + set (CMAKE_DEBUG_POSTFIX "d") +@@ -98,18 +98,18 @@ function(mgl_add_lib mgl_tmp_lib) + elseif(MSVC) + set(mgl_lib_static) + set_target_properties(${mgllib} PROPERTIES CLEAN_DIRECT_OUTPUT 1) +- set_target_properties(${mgllib}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) ++ #set_target_properties(${mgllib}-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) + endif(MSVC) + if(enable-mgl2) + set_target_properties(${mgllib} PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_end}") +- set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_static}${mgl_lib_end}") ++ #set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib2}${mgl_lib_static}${mgl_lib_end}") + else(enable-mgl2) + set_target_properties(${mgllib} PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_end}") +- set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_static}${mgl_lib_end}") ++ #set_target_properties(${mgllib}-static PROPERTIES OUTPUT_NAME "${mgllib}${mgl_lib_static}${mgl_lib_end}") + endif(enable-mgl2) - install( -- TARGETS ${mgllib} ${mgllib}-static -+ TARGETS ${mgllib} - EXPORT MathGLTargets - RUNTIME DESTINATION ${MathGL_INSTALL_BIN_DIR} - ARCHIVE DESTINATION ${MathGL_INSTALL_LIB_DIR} -@@ -738,7 +738,7 @@ if(NOT enable-lgpl) + install( +- TARGETS ${mgllib} ${mgllib}-static ++ TARGETS ${mgllib} + EXPORT MathGLTargets + RUNTIME DESTINATION ${MathGL_INSTALL_BIN_DIR} + ARCHIVE DESTINATION ${MathGL_INSTALL_LIB_DIR} +@@ -808,7 +808,7 @@ if(NOT enable-lgpl) add_subdirectory( lang ) endif(enable-python OR enable-lua OR enable-octave) add_subdirectory( utils ) diff --git a/math/mathgl/files/patch-examples_CMakeLists.txt b/math/mathgl/files/patch-examples_CMakeLists.txt index 7a9351ac05f3..265f4eda1daf 100644 --- a/math/mathgl/files/patch-examples_CMakeLists.txt +++ b/math/mathgl/files/patch-examples_CMakeLists.txt @@ -1,6 +1,6 @@ ---- examples/CMakeLists.txt.orig 2018-03-22 07:29:50 UTC +--- examples/CMakeLists.txt.orig 2021-12-08 05:59:56 UTC +++ examples/CMakeLists.txt -@@ -3,7 +3,7 @@ file(COPY ${CMAKE_SOURCE_DIR}/examples/E +@@ -4,7 +4,7 @@ file(COPY ${CMAKE_SOURCE_DIR}/examples/Equirectangular file(COPY ${CMAKE_SOURCE_DIR}/examples/samples.cpp DESTINATION ${CMAKE_BINARY_DIR}/examples) file(COPY ${CMAKE_SOURCE_DIR}/examples/wnd_samples.cpp DESTINATION ${CMAKE_BINARY_DIR}/examples) add_executable(mgl_example wnd_samples.cpp full_test.cpp samples.cpp) diff --git a/math/mathgl/files/patch-utils_CMakeLists.txt b/math/mathgl/files/patch-utils_CMakeLists.txt index ffdfd50dd52e..538ee9847082 100644 --- a/math/mathgl/files/patch-utils_CMakeLists.txt +++ b/math/mathgl/files/patch-utils_CMakeLists.txt @@ -1,15 +1,24 @@ ---- utils/CMakeLists.txt.orig 2019-08-22 06:18:05 UTC +--- utils/CMakeLists.txt.orig 2021-12-08 05:59:57 UTC +++ utils/CMakeLists.txt -@@ -13,7 +13,7 @@ set(link_type -static) - else(MSVC) - set(link_type) +@@ -7,7 +7,7 @@ set(link_type) endif(MSVC) + + add_executable(mgltask mgltask.cpp) +-target_link_libraries(mgltask mgl${link_type} ${getopt_lib-static}) ++target_link_libraries(mgltask mgl${link_type} ${getopt_lib}) + install( + TARGETS mgltask + EXPORT MathGLTargets +@@ -15,7 +15,7 @@ install( + ) + + add_executable(mglconv mglconv.cpp) -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( +@@ -23,7 +23,7 @@ install( ) add_executable(mgl.cgi mglcgi.cpp) @@ -18,7 +27,7 @@ install( TARGETS mgl.cgi EXPORT MathGLTargets -@@ -34,7 +34,7 @@ mgl_po_src(mglconv.cpp mglview.cpp mglcgi.cpp) +@@ -36,7 +36,7 @@ mgl_po_src(mglconv.cpp mglview.cpp mglcgi.cpp mgltask. if(MGL_HAVE_FLTK) add_definitions(-DUSE_FLTK) add_executable(mglview mglview.cpp) @@ -27,7 +36,7 @@ install( TARGETS mglview EXPORT MathGLTargets -@@ -46,10 +46,10 @@ else(MGL_HAVE_FLTK) +@@ -48,10 +48,10 @@ else(MGL_HAVE_FLTK) add_executable(mglview mglview.cpp) if(enable-qt5) include(../scripts/qt5.cmake) diff --git a/math/mathgl/pkg-plist b/math/mathgl/pkg-plist index 511c8c3439c1..0b5a08110f9e 100644 --- a/math/mathgl/pkg-plist +++ b/math/mathgl/pkg-plist @@ -1,8 +1,8 @@ -%%QT5%%bin/mglconv -%%QT5%%bin/mglview -%%QT5%%bin/udav +%%FLTK%%bin/mglconv +%%FLTK_OR_QT5%%bin/mglview %%FLTK%%bin/mgllab bin/mgltask +%%QT5%%bin/udav include/mgl2/Fl_MathGL.h include/mgl2/abstract.h include/mgl2/addon.h @@ -50,10 +50,10 @@ 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/MathGL2Config.cmake +lib/cmake/mathgl2/MathGL2ConfigVersion.cmake +lib/cmake/mathgl2/MathGLTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/mathgl2/MathGLTargets.cmake lib/cmake/mathgl2/mathgl2-config.cmake lib/libmgl2-glut.so lib/libmgl2-glut.so.%%SHLIB_VER%% @@ -65,8 +65,8 @@ lib/libmgl2-glut.so.%%SHLIB_VER%% %%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%% +%%FLTK_AND_QT5%%lib/libmgl2-wnd.so +%%FLTK_AND_QT5%%lib/libmgl2-wnd.so.%%SHLIB_VER%% lib/libmgl2.so lib/libmgl2.so.%%SHLIB_VER%% %%PYTHON%%%%PYTHON_SITELIBDIR%%/_mathgl.so