CVS commit: pkgsrc/biology/molsketch

["pin" <pin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pin
Date:           Mon Feb 26 19:01:45 UTC 2024

Modified Files:
        pkgsrc/biology/molsketch: Makefile PLIST distinfo

Log Message:
biology/molsketch: update to 0.8.1

Version 0.8.1 -- Fluorine-13

After quite a while some minor improvements:
* improved handling of color (especially radical electrons)
* Windows build updated to Qt 6.6
* finally saying goodbye to QMake as a build system in favor of CMake

Hoping that with more automation the next release should come sooner.

pkgsrc changes: switch to Qt6.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/biology/molsketch/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/biology/molsketch/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/biology/molsketch/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/biology/molsketch/Makefile
diff -u pkgsrc/biology/molsketch/Makefile:1.21 pkgsrc/biology/molsketch/Makefile:1.22
--- pkgsrc/biology/molsketch/Makefile:1.21      Tue Nov 14 14:01:27 2023
+++ pkgsrc/biology/molsketch/Makefile   Mon Feb 26 19:01:45 2024
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2023/11/14 14:01:27 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2024/02/26 19:01:45 pin Exp $
 
-DISTNAME=      Molsketch-0.8.0-src
+DISTNAME=      Molsketch-0.8.1-src
 PKGNAME=       ${DISTNAME:S/-src//:tl}
-PKGREVISION=   6
 CATEGORIES=    biology
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=molsketch/}
 
@@ -13,14 +12,13 @@ LICENSE=    gnu-gpl-v2
 
 USE_TOOLS=     pkg-config
 
-USE_CMAKE=     yes
-
-WRKSRC=                ${WRKDIR}/${DISTNAME:S/-src//}
+WRKSRC=        ${WRKDIR}/${DISTNAME:S/-src//}
 USE_LANGUAGES= c c++
 
 # std::transform_reduce
 USE_CXX_FEATURES+=     parallelism_ts
 
+CMAKE_ARGS+=   -DMSK_QT6=true
 CMAKE_ARGS+=   -DMSK_PREFIX=${PREFIX:Q}
 CMAKE_ARGS+=   -DMSK_INSTALL_PREFIX=${PREFIX:Q}
 CMAKE_ARGS+=   -DMSK_INSTALL_DOCS=/share/doc/molsketch
@@ -32,10 +30,11 @@ post-install:
        ${RM} -rf ${DESTDIR}${PREFIX}/include/libmolsketch/molsketch_LIB_autogen
        ${RM} -rf ${DESTDIR}${PREFIX}/include/libmolsketch/CMakeFiles
 
-TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+TOOL_DEPENDS+= qt6-qttools-[0-9]*:../../devel/qt6-qttools
 
 .include "../../biology/openbabel/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtsvg/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../graphics/qt6-qtsvg/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/biology/molsketch/PLIST
diff -u pkgsrc/biology/molsketch/PLIST:1.3 pkgsrc/biology/molsketch/PLIST:1.4
--- pkgsrc/biology/molsketch/PLIST:1.3  Tue Apr 18 08:49:21 2023
+++ pkgsrc/biology/molsketch/PLIST      Mon Feb 26 19:01:45 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/04/18 08:49:21 pin Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/02/26 19:01:45 pin Exp $
 bin/molsketch
 include/libmolsketch/TextInputItem.h
 include/libmolsketch/abstractxmlobject.h
@@ -92,16 +92,8 @@ include/libmolsketch/settingsitem.h
 include/libmolsketch/stringify.h
 include/libmolsketch/sumformula.h
 include/libmolsketch/textitem.h
-include/libmolsketch/ui_alignrowdialog.h
-include/libmolsketch/ui_arrowpopup.h
-include/libmolsketch/ui_atompopup.h
-include/libmolsketch/ui_elementalignment.h
-include/libmolsketch/ui_fontchooser.h
-include/libmolsketch/ui_moleculepopup.h
-include/libmolsketch/ui_scenepropertieswidget.h
-include/libmolsketch/ui_typelistdialog.h
 include/libmolsketch/xmlobjectinterface.h
-lib/libmolsketch.so
+lib/libmskcore.so
 lib/libobabeliface.so
 share/applications/molsketch.desktop
 share/icons/hicolor/scalable/apps/molsketch.svg
@@ -110,4 +102,3 @@ share/icons/hicolor/scalable/mimetypes/a
 share/metainfo/net.sourceforge.molsketch.appdata.xml
 share/mime/packages/molsketch.xml
 share/pixmaps/molsketch.xpm
-@pkgdir include/libmolsketch/.qm

Index: pkgsrc/biology/molsketch/distinfo
diff -u pkgsrc/biology/molsketch/distinfo:1.7 pkgsrc/biology/molsketch/distinfo:1.8
--- pkgsrc/biology/molsketch/distinfo:1.7       Tue Apr 18 08:49:21 2023
+++ pkgsrc/biology/molsketch/distinfo   Mon Feb 26 19:01:45 2024
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.7 2023/04/18 08:49:21 pin Exp $
+$NetBSD: distinfo,v 1.8 2024/02/26 19:01:45 pin Exp $
 
-BLAKE2s (Molsketch-0.8.0-src.tar.gz) = 506c2e637e9f90222cc04e122138efc3cf678365429fbf3039dff1e42ba5afdb
-SHA512 (Molsketch-0.8.0-src.tar.gz) = 0b1adca5beb1d33c52ed1c0f5f26d7af3ce80d441b69961e8941e4954d775c59b1fd9100d0b60b021016d4b7df9ed72036ee210be337f9a5510fa9c7b6c99b22
-Size (Molsketch-0.8.0-src.tar.gz) = 1852026 bytes
-SHA1 (patch-libmolsketch_CMakeLists.txt) = 44dab7ed708a102a3e607114683b57c813b6fd5f
-SHA1 (patch-molsketch_CMakeLists.txt) = 97938942238df038b74587a77568feb5c6b336e2
-SHA1 (patch-obabeliface_CMakeLists.txt) = 7933a188cf56fbdea943d364050f432ee29413bb
+BLAKE2s (Molsketch-0.8.1-src.tar.gz) = 80c5ec20aae0559139bc0c0cbe28f3cec77639e8ff6af331aed63043bbd47654
+SHA512 (Molsketch-0.8.1-src.tar.gz) = c92f99276ff56f46a04f59218124ec3db911a8a8615632fe7642c1ab139cf083540da77b3a1c48176af0896bdd6ccadfd4ca5571e095f76fd96cf504ee3245fb
+Size (Molsketch-0.8.1-src.tar.gz) = 1852967 bytes