Index: head/science/molsketch/Makefile =================================================================== --- head/science/molsketch/Makefile (revision 568211) +++ head/science/molsketch/Makefile (revision 568212) @@ -1,31 +1,31 @@ # $FreeBSD$ PORTNAME= molsketch -DISTVERSION= 0.7.0 +DISTVERSION= 0.7.1 DISTVERSIONSUFFIX= -src CATEGORIES= science -MASTER_SITES= SF/${PORTNAME}/Molsketch/Oxygen%20${DISTVERSION}/ +MASTER_SITES= SF/${PORTNAME}/Molsketch/Oxygen-16%20${DISTVERSION}/ DISTNAME= Molsketch-${DISTVERSIONFULL} MAINTAINER= yuri@FreeBSD.org COMMENT= 2D molecule editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libopenbabel.so:science/openbabel -USES= cmake compiler:c++11-lang desktop-file-utils localbase:ldflags \ - pkgconfig qt:5 shared-mime-info -USE_QT= core gui network printsupport svg widgets buildtools_build qmake_build +USES= cmake:noninja compiler:c++11-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} WRKSRC= ${WRKDIR}/Molsketch-${DISTVERSION} OPTIONS_DEFINE= DOCS PORTDOCS= * .include Index: head/science/molsketch/distinfo =================================================================== --- head/science/molsketch/distinfo (revision 568211) +++ head/science/molsketch/distinfo (revision 568212) @@ -1,3 +1,3 @@ -TIMESTAMP = 1609181842 -SHA256 (Molsketch-0.7.0-src.tar.gz) = 2a8b181793f6df8892c55399c13674ecf688403ad402c9fead20f4916715bb9d -SIZE (Molsketch-0.7.0-src.tar.gz) = 1874764 +TIMESTAMP = 1615487958 +SHA256 (Molsketch-0.7.1-src.tar.gz) = 33a9afbcd058008aae07448c0ff945a561a0e693a195e383cfe7543fb180e95d +SIZE (Molsketch-0.7.1-src.tar.gz) = 1906008 Index: head/science/molsketch/files/patch-CMakeLists.txt =================================================================== --- head/science/molsketch/files/patch-CMakeLists.txt (revision 568211) +++ head/science/molsketch/files/patch-CMakeLists.txt (revision 568212) @@ -1,29 +1,20 @@ ---- CMakeLists.txt.orig 2018-08-15 17:18:23 UTC +--- CMakeLists.txt.orig 2021-03-07 18:40:16 UTC +++ CMakeLists.txt -@@ -39,7 +39,7 @@ configure_file("${CMAKE_MODULE_PATH}/cma +@@ -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") # Enabling debugging symbols -set(CMAKE_BUILD_TYPE Debug) +#set(CMAKE_BUILD_TYPE Debug) # Enabling shared libraries set(BUILD_SHARED_LIBS ON) -@@ -119,7 +119,7 @@ if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT - endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT APPLE ) - - if(NOT FORCEQt4) -- set(QTVERSIONSUFFIX "-qt5") -+ set(QTVERSIONSUFFIX "") - endif(NOT FORCEQt4) - - set(OBABEL_IFACE_NAME "libobabeliface${QTVERSIONSUFFIX}.so") -@@ -130,7 +130,7 @@ endif(WIN32 OR WIN64) +@@ -108,7 +108,7 @@ endif(WIN32 OR WIN64) add_definitions(-DOBABEL_IFACE_LOCATION="\\\"${MSK_INSTALL_LIBS}/${OBABEL_IFACE_NAME}\\\"") -set(CMAKE_INSTALL_PREFIX ${MSK_PREFIX}) +#set(CMAKE_INSTALL_PREFIX ${MSK_PREFIX}) ################ Adding subdirs add_subdirectory(libmolsketch) Index: head/science/molsketch/pkg-plist =================================================================== --- head/science/molsketch/pkg-plist (revision 568211) +++ head/science/molsketch/pkg-plist (revision 568212) @@ -1,90 +1,90 @@ bin/molsketch include/libmolsketch/TextInputItem.h include/libmolsketch/abstractxmlobject.h include/libmolsketch/actions/abstractitemaction.h include/libmolsketch/actions/abstractrecursiveitemaction.h include/libmolsketch/actions/alignmentaction.h include/libmolsketch/actions/arrowtypeaction.h include/libmolsketch/actions/arrowtypewidget.h include/libmolsketch/actions/bondtypeaction.h include/libmolsketch/actions/bondtypewidget.h include/libmolsketch/actions/coloraction.h include/libmolsketch/actions/deleteaction.h include/libmolsketch/actions/drawaction.h include/libmolsketch/actions/flipbondaction.h include/libmolsketch/actions/flipstereobondsaction.h include/libmolsketch/actions/frameaction.h include/libmolsketch/actions/frametypeaction.h include/libmolsketch/actions/frametypewidget.h include/libmolsketch/actions/genericaction.h include/libmolsketch/actions/incdecaction.h include/libmolsketch/actions/itemgrouptypeaction.h include/libmolsketch/actions/itemtypeaction.h include/libmolsketch/actions/itemtypeselectionaction.h include/libmolsketch/actions/itemtypewidget.h include/libmolsketch/actions/lineupaction.h include/libmolsketch/actions/linewidthaction.h include/libmolsketch/actions/mechanismarrowaction.h include/libmolsketch/actions/multiaction.h include/libmolsketch/actions/periodictablewidget.h include/libmolsketch/actions/reactionarrowaction.h include/libmolsketch/actions/ringaction.h include/libmolsketch/actions/rotateaction.h include/libmolsketch/actions/textaction.h include/libmolsketch/actions/transformcommand.h include/libmolsketch/actions/zlevelaction.h include/libmolsketch/arrow.h include/libmolsketch/arrowpopup.h include/libmolsketch/atom.h include/libmolsketch/atompopup.h include/libmolsketch/bond.h include/libmolsketch/boundingboxlinker.h include/libmolsketch/colorbutton.h include/libmolsketch/commands.h include/libmolsketch/constants.h include/libmolsketch/coordinatedelegate.h include/libmolsketch/coordinatemodel.h include/libmolsketch/coordinatetableview.h include/libmolsketch/electronsystem.h include/libmolsketch/element.h include/libmolsketch/elementalignment.h include/libmolsketch/fileio.h include/libmolsketch/fontchooser.h include/libmolsketch/frame.h include/libmolsketch/generics.h include/libmolsketch/graphicsitem.h include/libmolsketch/grid.h include/libmolsketch/helptextemptydock.h include/libmolsketch/helptextonemptylabel.h include/libmolsketch/librarymodel.h include/libmolsketch/libraryview.h include/libmolsketch/lonepair.h include/libmolsketch/math2d.h include/libmolsketch/molecule.h include/libmolsketch/moleculemodelitem.h include/libmolsketch/moleculepopup.h include/libmolsketch/molscene.h include/libmolsketch/molview.h include/libmolsketch/neighboralignment.h include/libmolsketch/propertiesdock.h include/libmolsketch/propertieswidget.h -include/libmolsketch/qtversionmacros.h +include/libmolsketch/qtdeprecations.h include/libmolsketch/radicalelectron.h include/libmolsketch/scenepropertieswidget.h include/libmolsketch/scenesettings.h include/libmolsketch/settingsconnector.h include/libmolsketch/settingsfacade.h include/libmolsketch/settingsitem.h include/libmolsketch/stringify.h include/libmolsketch/sumformula.h include/libmolsketch/textitem.h include/libmolsketch/xmlobjectinterface.h lib/molsketch/libmolsketch.so lib/molsketch/libobabeliface.so share/applications/molsketch.desktop share/icons/hicolor/scalable/apps/molsketch.svg share/icons/hicolor/scalable/mimetypes/application-x-molsketch-molecule.svg share/icons/hicolor/scalable/mimetypes/application-x-molsketch.svg share/metainfo/net.sourceforge.molsketch.appdata.xml share/mime/packages/molsketch.xml share/pixmaps/molsketch.xpm