From nobody Fri Jan 24 09:03:42 2025 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 4YfX0t5WMzz5l5Dx; Fri, 24 Jan 2025 09:03:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YfX0t2T0dz3hsN; Fri, 24 Jan 2025 09:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737709422; 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=bz3/XGbAaEPPlUHU/wpeVTwMPcoFcinFVWxtTFVz8wY=; b=D8zVhJUvsexsYqFAIZDG/E9fM5oioCdL2MM6uKBoT2qQoNWAaBNQAbKjZ6R/A+tDExNd+j 4oj2BLpnzSbNWKTxF1Kxfk6mH+6YIgeSIW3/mlz1agt2ktqJ76jsaqOQg4osbqFmMetI+W lX6ZkfmNFZLehgjQZvFqMhSJFZyl7EQ8h+cl7LIWAx3M9z9YVAaj2+QCzKAEZ9LFCBgvJt IZMtKqs/v3LB8z+pQUKdzN9zfDhRvvPO8T+KFsX8dn4HHAjq23ablHNXDG19qpziMKU9I5 Kujwjja98/89Y0uRE1qSX2J214y0DD0TdzUeJPdIf1sV2bDFA4bMM3EquAbByQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737709422; 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=bz3/XGbAaEPPlUHU/wpeVTwMPcoFcinFVWxtTFVz8wY=; b=npo3YyuMY1lnvQ5qaVtsW+ox5ZrFmOZV4wua/+rv70H53skgZVxbcRoLHg0mm4nPRUQneG HXHgBdlgQR0+uhMG2SGikvRrCUZf5BsTxe1PYSIovsbZROvcYEnGhM0I6bRrxFWuROVRa4 xVbsjqXXA4WWCU5SOPJ+qXoLBa5XaksQBDH2ESmiuBk2oKOZabGh5jx2j1pc7r91r6EuCR a2UbMuRZOlLWfdSol4GmDzUWQJxPvd9jiUvy9eteTcJm9j9B6ERZOp7NGHCkmAOLpQf8V8 o4fhXJTqleMXlHf3YthlvYdbQ/XxRnVgHKCWB2T9VCgiJGAtTDRPrmxhFjEFIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737709422; a=rsa-sha256; cv=none; b=q21YkbnjlqQusy6M+Y4qdVIjYb7y4u3S8KPNKWiOJyS71jnzoOE3dUOI+ewjM4xLuC2Os7 dvI1Wn7f0G6UEYjP4bJUbfq/0b9x0ITrGjXTO8EKYoMRLrxiWDpH/vSOSxoWLDJcHPh5M9 by3PLHeH+NejKVJaqA6JgMANd/2Qx1lxS/A6HD5t5xnUIR9yNvLGWxqsQf0V1fE6HD+Oxv 3LW1yzWc35YT6DNrQqa55ngwRR0uhmM9CX2BWPG+eeNZeq9Yv0wB/8Q3gCxUf5W01eTkmL t7Gtitr3yhUZWbZAk600rMP/ojW5I1GS3uZR+8fT8lR8HMeZ9WkHI5LqctNDUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YfX0t1gTmz3PZ; Fri, 24 Jan 2025 09:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50O93gF2087304; Fri, 24 Jan 2025 09:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50O93g0R087301; Fri, 24 Jan 2025 09:03:42 GMT (envelope-from git) Date: Fri, 24 Jan 2025 09:03:42 GMT Message-Id: <202501240903.50O93g0R087301@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: 06026b86c671 - main - =?utf-8?Q?science/molsketch: update 0.7.3 =E2=86=92 0.8.1?= 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 06026b86c67133826d795bfad2f3993e02ce3ce0 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=06026b86c67133826d795bfad2f3993e02ce3ce0 commit 06026b86c67133826d795bfad2f3993e02ce3ce0 Author: Yuri Victorovich AuthorDate: 2025-01-24 09:03:22 +0000 Commit: Yuri Victorovich CommitDate: 2025-01-24 09:03:39 +0000 science/molsketch: update 0.7.3 → 0.8.1 --- science/molsketch/Makefile | 8 ++++---- science/molsketch/distinfo | 6 +++--- science/molsketch/files/patch-CMakeLists.txt | 15 +++------------ science/molsketch/files/patch-buildvariables | 6 +++--- science/molsketch/pkg-plist | 15 ++++++++++++++- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/science/molsketch/Makefile b/science/molsketch/Makefile index 86ebc612e5df..36882dc5b57b 100644 --- a/science/molsketch/Makefile +++ b/science/molsketch/Makefile @@ -1,5 +1,5 @@ PORTNAME= molsketch -DISTVERSION= 0.7.3 +DISTVERSION= 0.8.1 DISTVERSIONSUFFIX= -src CATEGORIES= science MASTER_SITES= SF/${PORTNAME}/Molsketch/ @@ -14,17 +14,17 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libopenbabel.so:science/openbabel -USES= cmake:noninja compiler:c++14-lang desktop-file-utils localbase:ldflags \ +USES= cmake:noninja compiler:c++17-lang desktop-file-utils localbase:ldflags \ pkgconfig qt:5 shared-mime-info # build fails with ninja, see https://sourceforge.net/p/molsketch/bugs/41/ USE_QT= core gui network printsupport svg widgets buildtools:build linguisttools:build qmake:build USE_LDCONFIG= ${PREFIX}/lib/molsketch CMAKE_ARGS= -DMSK_PREFIX:STRING=${PREFIX} -NO_WRKSUBDIR= yes - OPTIONS_DEFINE= DOCS +WRKSRC= ${WRKDIR}/Molsketch-${DISTVERSION} + PORTDOCS= * .include diff --git a/science/molsketch/distinfo b/science/molsketch/distinfo index 752188b0df98..43a093c33158 100644 --- a/science/molsketch/distinfo +++ b/science/molsketch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664224961 -SHA256 (Molsketch-0.7.3-src.tar.gz) = 79c8e7c7d00246d7d9da4a11742dba02de3f96e701220709c16772e58178b44d -SIZE (Molsketch-0.7.3-src.tar.gz) = 1907433 +TIMESTAMP = 1737708866 +SHA256 (Molsketch-0.8.1-src.tar.gz) = eb016f977024b6ff11804748d8436c29a9652a5632fdff13b26e42d0507f8a02 +SIZE (Molsketch-0.8.1-src.tar.gz) = 1852967 diff --git a/science/molsketch/files/patch-CMakeLists.txt b/science/molsketch/files/patch-CMakeLists.txt index 9aff1b2f1865..240c51f139eb 100644 --- a/science/molsketch/files/patch-CMakeLists.txt +++ b/science/molsketch/files/patch-CMakeLists.txt @@ -1,17 +1,8 @@ ---- CMakeLists.txt.orig 2021-03-07 18:40:16 UTC +--- CMakeLists.txt.orig 2024-02-25 11:23:17 UTC +++ CMakeLists.txt -@@ -36,7 +36,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake_uninstall.cm - add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") +@@ -119,7 +119,7 @@ add_definitions(-DOBABEL_IFACE_LOCATION="${MSK_INSTALL - # Enabling debugging symbols --set(CMAKE_BUILD_TYPE Debug) -+#set(CMAKE_BUILD_TYPE Debug) - - # Enabling shared libraries - set(BUILD_SHARED_LIBS ON) -@@ -108,7 +108,7 @@ endif(WIN32 OR WIN64) - - add_definitions(-DOBABEL_IFACE_LOCATION="\\\"${MSK_INSTALL_LIBS}/${OBABEL_IFACE_NAME}\\\"") + add_definitions(-DOBABEL_IFACE_LOCATION="${MSK_INSTALL_LIBS}/${OBABEL_IFACE_NAME}") -set(CMAKE_INSTALL_PREFIX ${MSK_PREFIX}) +#set(CMAKE_INSTALL_PREFIX ${MSK_PREFIX}) diff --git a/science/molsketch/files/patch-buildvariables b/science/molsketch/files/patch-buildvariables index ce8d1cc1f811..dc8502e4355a 100644 --- a/science/molsketch/files/patch-buildvariables +++ b/science/molsketch/files/patch-buildvariables @@ -1,9 +1,9 @@ ---- buildvariables.orig 2018-10-24 03:59:40 UTC +--- buildvariables.orig 2023-04-14 16:04:22 UTC +++ buildvariables -@@ -2,6 +2,6 @@ +@@ -1,6 +1,6 @@ + "Global prefix";MSK_PREFIX;/usr;"C:/Program\ Files/MolsKetch" "Executable destination dir";MSK_INSTALL_BINS;/bin;/bin "Headers destination dir";MSK_INSTALL_INCLUDES;/include;/include - "Documentation destination dir";MSK_INSTALL_DOCS;/share/doc/molsketch;/doc -"Libraries (64bit) destination dir";MSK_INSTALL_LIBS64;/lib64/molsketch;/lib +"Libraries (64bit) destination dir";MSK_INSTALL_LIBS64;/lib/molsketch;/lib "Libraries (32bit) destination dir";MSK_INSTALL_LIBS;/lib/molsketch;/lib diff --git a/science/molsketch/pkg-plist b/science/molsketch/pkg-plist index 9a1f3aeac0a0..fe9d00f0e4db 100644 --- a/science/molsketch/pkg-plist +++ b/science/molsketch/pkg-plist @@ -33,6 +33,7 @@ include/libmolsketch/actions/rotateaction.h include/libmolsketch/actions/textaction.h include/libmolsketch/actions/transformcommand.h include/libmolsketch/actions/zlevelaction.h +include/libmolsketch/alignment.h include/libmolsketch/arrow.h include/libmolsketch/arrowpopup.h include/libmolsketch/atom.h @@ -45,6 +46,10 @@ include/libmolsketch/constants.h include/libmolsketch/coordinatedelegate.h include/libmolsketch/coordinatemodel.h include/libmolsketch/coordinatetableview.h +include/libmolsketch/core/coreatom.h +include/libmolsketch/core/corebond.h +include/libmolsketch/core/coremolecule.h +include/libmolsketch/debuggable.h include/libmolsketch/electronsystem.h include/libmolsketch/element.h include/libmolsketch/elementalignment.h @@ -56,6 +61,7 @@ include/libmolsketch/graphicsitem.h include/libmolsketch/grid.h include/libmolsketch/helptextemptydock.h include/libmolsketch/helptextonemptylabel.h +include/libmolsketch/iconutils.h include/libmolsketch/librarymodel.h include/libmolsketch/libraryview.h include/libmolsketch/lonepair.h @@ -66,6 +72,13 @@ include/libmolsketch/moleculepopup.h include/libmolsketch/molscene.h include/libmolsketch/molview.h include/libmolsketch/neighboralignment.h +include/libmolsketch/painting/paintable.h +include/libmolsketch/painting/paintableaggregate.h +include/libmolsketch/painting/regulartextbox.h +include/libmolsketch/painting/stackedtextbox.h +include/libmolsketch/painting/textbox.h +include/libmolsketch/painting/textfield.h +include/libmolsketch/painting/textline.h include/libmolsketch/propertiesdock.h include/libmolsketch/propertieswidget.h include/libmolsketch/qtdeprecations.h @@ -79,7 +92,7 @@ include/libmolsketch/stringify.h include/libmolsketch/sumformula.h include/libmolsketch/textitem.h include/libmolsketch/xmlobjectinterface.h -lib/molsketch/libmolsketch.so +lib/molsketch/libmskcore.so lib/molsketch/libobabeliface.so share/applications/molsketch.desktop share/icons/hicolor/scalable/apps/molsketch.svg