science/avogadrolibs: Update 1.94.0 -> 1.95.1

4 files changed, 32 insertions, 37 deletions

diff --git a/science/avogadrolibs/Makefile b/science/avogadrolibs/Makefile
index ab11a29913cc..37dad2dca8c0 100644
--- a/science/avogadrolibs/Makefile
+++ b/science/avogadrolibs/Makefile
@@ -1,12 +1,7 @@
 PORTNAME=	avogadrolibs
-DISTVERSION=	1.94.0
-PORTREVISION=	2
+DISTVERSION=	1.95.1
 CATEGORIES=	science
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
-PATCHFILES=	cf9d82575796d5fcabb153bdebde26843d81d83e.patch:-p1 \
-		ea813f683cdd9865994c0ba94a24325e04b9f8fb.patch:-p1
-
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Avogadro2 libraries for chemical editor and visualization applications
 
diff --git a/science/avogadrolibs/distinfo b/science/avogadrolibs/distinfo
index 416457b04363..d81d8a9fd98a 100644
--- a/science/avogadrolibs/distinfo
+++ b/science/avogadrolibs/distinfo
@@ -1,11 +1,7 @@
-TIMESTAMP = 1622786812
-SHA256 (OpenChemistry-avogadrolibs-1.94.0_GH0.tar.gz) = 5e9efa3dd34a715e66afe33e61776fd87446f6076138b46109c319dea14bacff
-SIZE (OpenChemistry-avogadrolibs-1.94.0_GH0.tar.gz) = 10893919
+TIMESTAMP = 1644049029
+SHA256 (OpenChemistry-avogadrolibs-1.95.1_GH0.tar.gz) = 52817eebfc0cf700e5f6c0c4455b460618ec0dd7cb4ede5d8fabc5a2d73a7816
+SIZE (OpenChemistry-avogadrolibs-1.95.1_GH0.tar.gz) = 11015910
 SHA256 (OpenChemistry-molecules-b1e16c5_GH0.tar.gz) = 9aa48dd94022e022d2c9eb9802ba72a4bfd69c04a08a36d562bfffc7d24bf99b
 SIZE (OpenChemistry-molecules-b1e16c5_GH0.tar.gz) = 207309
 SHA256 (OpenChemistry-crystals-c3e2468_GH0.tar.gz) = db4ff16c3b5e6741914ae8b5e6e7b33b1f0e8b59d28916dab4e6fa9dd65fc633
 SIZE (OpenChemistry-crystals-c3e2468_GH0.tar.gz) = 151836
-SHA256 (cf9d82575796d5fcabb153bdebde26843d81d83e.patch) = b0ba5c14c71dde9978e3d3e8ab45bffb22816b94625377a64c9dad00137a7cac
-SIZE (cf9d82575796d5fcabb153bdebde26843d81d83e.patch) = 2669
-SHA256 (ea813f683cdd9865994c0ba94a24325e04b9f8fb.patch) = 629c2863588600fb6065f89e9b8c8c6912a4b906d124381e9793d3171994a425
-SIZE (ea813f683cdd9865994c0ba94a24325e04b9f8fb.patch) = 1400
diff --git a/science/avogadrolibs/files/patch-avogadro_qtplugins_insertfragment_CMakeLists.txt b/science/avogadrolibs/files/patch-avogadro_qtplugins_insertfragment_CMakeLists.txt
deleted file mode 100644
index b1ec8267b5e9..000000000000
--- a/science/avogadrolibs/files/patch-avogadro_qtplugins_insertfragment_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-- fix for https://github.com/OpenChemistry/avogadrolibs/issues/611
-
---- avogadro/qtplugins/insertfragment/CMakeLists.txt.orig	2021-06-02 21:02:35 UTC
-+++ avogadro/qtplugins/insertfragment/CMakeLists.txt
-@@ -45,8 +45,8 @@ ExternalProject_Add(crystals
-     BUILD_COMMAND ""
-     INSTALL_COMMAND ""
- )
-+endif()
- install(DIRECTORY "${AvogadroLibs_SOURCE_DIR}/../crystals"
- DESTINATION "${INSTALL_DATA_DIR}/avogadro2"
- PATTERN ".git" EXCLUDE
- )
--endif()
-\ No newline at end of file
diff --git a/science/avogadrolibs/pkg-plist b/science/avogadrolibs/pkg-plist
index 2289b4ad25a1..a34e864be5aa 100644
--- a/science/avogadrolibs/pkg-plist
+++ b/science/avogadrolibs/pkg-plist
@@ -1,3 +1,5 @@
+include/avogadro/core/angleiterator.h
+include/avogadro/core/angletools.h
 include/avogadro/core/array.h
 include/avogadro/core/atom.h
 include/avogadro/core/atomtyper-inline.h
@@ -8,14 +10,18 @@ include/avogadro/core/avogadrocoreexport.h
 include/avogadro/core/basisset.h
 include/avogadro/core/bond.h
 include/avogadro/core/color3f.h
+include/avogadro/core/connectedgroup.h
 include/avogadro/core/coordinateblockgenerator.h
 include/avogadro/core/coordinateset.h
 include/avogadro/core/crystaltools.h
 include/avogadro/core/cube.h
+include/avogadro/core/dihedraliterator.h
 include/avogadro/core/elements.h
 include/avogadro/core/gaussianset.h
 include/avogadro/core/gaussiansettools.h
 include/avogadro/core/graph.h
+include/avogadro/core/layer.h
+include/avogadro/core/layermanager.h
 include/avogadro/core/matrix.h
 include/avogadro/core/mesh.h
 include/avogadro/core/molecule.h
@@ -23,6 +29,7 @@ include/avogadro/core/mutex.h
 include/avogadro/core/nameatomtyper.h
 include/avogadro/core/residue.h
 include/avogadro/core/ringperceiver.h
+include/avogadro/core/secondarystructure.h
 include/avogadro/core/sharedmutex.h
 include/avogadro/core/slaterset.h
 include/avogadro/core/slatersettools.h
@@ -62,6 +69,7 @@ include/avogadro/io/xyzformat.h
 %%QT5%%include/avogadro/molequeue/molequeuewidget.h
 %%QT5%%include/avogadro/qtgui/avogadroqtguiexport.h
 %%QT5%%include/avogadro/qtgui/backgroundfileformat.h
+%%QT5%%include/avogadro/qtgui/colorbutton.h
 %%QT5%%include/avogadro/qtgui/containerwidget.h
 %%QT5%%include/avogadro/qtgui/customelementdialog.h
 %%QT5%%include/avogadro/qtgui/elementtranslator.h
@@ -72,6 +80,8 @@ include/avogadro/io/xyzformat.h
 %%QT5%%include/avogadro/qtgui/hydrogentools.h
 %%QT5%%include/avogadro/qtgui/interfacescript.h
 %%QT5%%include/avogadro/qtgui/interfacewidget.h
+%%QT5%%include/avogadro/qtgui/jsonwidget.h
+%%QT5%%include/avogadro/qtgui/layermodel.h
 %%QT5%%include/avogadro/qtgui/meshgenerator.h
 %%QT5%%include/avogadro/qtgui/molecule.h
 %%QT5%%include/avogadro/qtgui/moleculemodel.h
@@ -79,7 +89,9 @@ include/avogadro/io/xyzformat.h
 %%QT5%%include/avogadro/qtgui/periodictableview.h
 %%QT5%%include/avogadro/qtgui/persistentatom.h
 %%QT5%%include/avogadro/qtgui/persistentbond.h
+%%QT5%%include/avogadro/qtgui/pluginlayermanager.h
 %%QT5%%include/avogadro/qtgui/pythonscript.h
+%%QT5%%include/avogadro/qtgui/rwlayermanager.h
 %%QT5%%include/avogadro/qtgui/rwmolecule.h
 %%QT5%%include/avogadro/qtgui/sceneplugin.h
 %%QT5%%include/avogadro/qtgui/scenepluginmodel.h
@@ -107,8 +119,12 @@ include/avogadro/quantumio/nwchemlog.h
 %%OPENGL%%include/avogadro/rendering/avogadrogl.h
 %%OPENGL%%include/avogadro/rendering/avogadrorendering.h
 %%OPENGL%%include/avogadro/rendering/avogadrorenderingexport.h
+%%OPENGL%%include/avogadro/rendering/beziergeometry.h
+%%OPENGL%%include/avogadro/rendering/bsplinegeometry.h
 %%OPENGL%%include/avogadro/rendering/bufferobject.h
 %%OPENGL%%include/avogadro/rendering/camera.h
+%%OPENGL%%include/avogadro/rendering/cartoongeometry.h
+%%OPENGL%%include/avogadro/rendering/curvegeometry.h
 %%OPENGL%%include/avogadro/rendering/cylindergeometry.h
 %%OPENGL%%include/avogadro/rendering/drawable.h
 %%OPENGL%%include/avogadro/rendering/geometrynode.h
@@ -137,11 +153,12 @@ include/avogadro/quantumio/nwchemlog.h
 %%OPENGL%%include/avogadro/rendering/vrmlvisitor.h
 %%QT5%%lib/avogadro2/libgwavi.a
 %%QT5%%lib/avogadro2/scripts/commands/scale.py
-%%QT5%%lib/avogadro2/scripts/formatScripts/cclibScript.py
 %%QT5%%lib/avogadro2/scripts/formatScripts/zyx.py
+%%QT5%%lib/avogadro2/staticplugins/ApplyColors.a
 %%QT5%%lib/avogadro2/staticplugins/BallStick.a
 %%QT5%%lib/avogadro2/staticplugins/BondCentric.a
 %%QT5%%lib/avogadro2/staticplugins/Bonding.a
+%%QT5%%lib/avogadro2/staticplugins/Cartoons.a
 %%QT5%%lib/avogadro2/staticplugins/CoordinateEditor.a
 %%QT5%%lib/avogadro2/staticplugins/CopyPaste.a
 %%QT5%%lib/avogadro2/staticplugins/Cp2kInput.a
@@ -155,6 +172,7 @@ include/avogadro/quantumio/nwchemlog.h
 %%QT5%%lib/avogadro2/staticplugins/Hydrogens.a
 %%QT5%%lib/avogadro2/staticplugins/ImportPQR.a
 %%QT5%%lib/avogadro2/staticplugins/InsertFragment.a
+%%QT5%%lib/avogadro2/staticplugins/Label.a
 %%QT5%%lib/avogadro2/staticplugins/LammpsInput.a
 %%QT5%%lib/avogadro2/staticplugins/Licorice.a
 %%QT5%%lib/avogadro2/staticplugins/LineFormatInput.a
@@ -171,6 +189,7 @@ include/avogadro/quantumio/nwchemlog.h
 %%QT5%%lib/avogadro2/staticplugins/POVRay.a
 %%QT5%%lib/avogadro2/staticplugins/PlayerTool.a
 %%LIBARCHIVE%%lib/avogadro2/staticplugins/PluginDownloader.a
+%%QT5%%lib/avogadro2/staticplugins/PropertyTables.a
 %%QT5%%lib/avogadro2/staticplugins/QuantumInput.a
 %%QT5%%lib/avogadro2/staticplugins/ResetView.a
 %%QT5%%lib/avogadro2/staticplugins/SVG.a
@@ -199,28 +218,28 @@ lib/cmake/avogadrolibs/FindLibArchive.cmake
 lib/cmake/avogadrolibs/Findlibmsym.cmake
 lib/libAvogadroCore.so
 lib/libAvogadroCore.so.1
-lib/libAvogadroCore.so.1.94.0
+lib/libAvogadroCore.so.1.95.1
 lib/libAvogadroIO.so
 lib/libAvogadroIO.so.1
-lib/libAvogadroIO.so.1.94.0
+lib/libAvogadroIO.so.1.95.1
 %%QT5%%lib/libAvogadroMoleQueue.so
 %%QT5%%lib/libAvogadroMoleQueue.so.1
-%%QT5%%lib/libAvogadroMoleQueue.so.1.94.0
+%%QT5%%lib/libAvogadroMoleQueue.so.1.95.1
 %%QT5%%lib/libAvogadroQtGui.so
 %%QT5%%lib/libAvogadroQtGui.so.1
-%%QT5%%lib/libAvogadroQtGui.so.1.94.0
+%%QT5%%lib/libAvogadroQtGui.so.1.95.1
 %%QT5%%lib/libAvogadroQtOpenGL.so
 %%QT5%%lib/libAvogadroQtOpenGL.so.1
-%%QT5%%lib/libAvogadroQtOpenGL.so.1.94.0
+%%QT5%%lib/libAvogadroQtOpenGL.so.1.95.1
 %%QT5%%lib/libAvogadroQtPlugins.so
 %%QT5%%lib/libAvogadroQtPlugins.so.1
-%%QT5%%lib/libAvogadroQtPlugins.so.1.94.0
+%%QT5%%lib/libAvogadroQtPlugins.so.1.95.1
 lib/libAvogadroQuantumIO.so
 lib/libAvogadroQuantumIO.so.1
-lib/libAvogadroQuantumIO.so.1.94.0
+lib/libAvogadroQuantumIO.so.1.95.1
 %%OPENGL%%lib/libAvogadroRendering.so
 %%OPENGL%%lib/libAvogadroRendering.so.1
-%%OPENGL%%lib/libAvogadroRendering.so.1.94.0
+%%OPENGL%%lib/libAvogadroRendering.so.1.95.1
 %%QT5%%share/avogadro2/crystals/README.md
 %%QT5%%share/avogadro2/crystals/antimonides/AlSb.cif
 %%QT5%%share/avogadro2/crystals/antimonides/GaSb.cif