Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 17 Oct 2018 07:04:19 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r482273 - head/science/avogadrolibs
Message-ID:  <201810170704.w9H74Juc050502@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Wed Oct 17 07:04:19 2018
New Revision: 482273
URL: https://svnweb.freebsd.org/changeset/ports/482273

Log:
  science/avogadrolibs: Add options

Modified:
  head/science/avogadrolibs/Makefile
  head/science/avogadrolibs/pkg-plist

Modified: head/science/avogadrolibs/Makefile
==============================================================================
--- head/science/avogadrolibs/Makefile	Wed Oct 17 06:49:30 2018	(r482272)
+++ head/science/avogadrolibs/Makefile	Wed Oct 17 07:04:19 2018	(r482273)
@@ -2,6 +2,7 @@
 
 PORTNAME=	avogadrolibs
 DISTVERSION=	1.91.0
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,17 +11,55 @@ COMMENT=	Avogadro2 libraries for chemical editor and v
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp \
-		libMoleQueueClient.so:misc/molequeue \
-		libmsym.so:science/libmsym \
-		libsymspg.so:science/spglib
+LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp
 
-USES=		cmake:outsource compiler:c++11-lang eigen:3,build,run gl libarchive qt:5 # eigen needs to be 'run' because it is written into cmake files
+USES=		cmake:outsource compiler:c++11-lang eigen:3,build,run # eigen needs to be 'run' because it is written into cmake files
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenChemistry
-USE_QT=		core concurrent gui network widgets buildtools_build qmake_build
-USE_GL=		gl glew glu
 USE_LDCONFIG=	yes
+
+CMAKE_ON=	BUILD_SHARED_LIBS
+
+OPTIONS_DEFINE=		HDF5 LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB VTK
+OPTIONS_DEFAULT=	LIBARCHIVE LIBMSYM MOLEQUEUE OPENGL QT5 SPGLIB
+OPTIONS_SUB=		yes
+
+HDF5_CMAKE_BOOL=	USE_HDF5
+HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5 \
+			libsz.so:science/szip
+
+LIBARCHIVE_DESC=	Enable optional Libarchive features
+LIBARCHIVE_CMAKE_BOOL=	USE_LIBARCHIVE
+LIBARCHIVE_USES=	libarchive
+LIBARCHIVE_IMPLIES=	QT5
+
+LIBMSYM_DESC=		Enable optional features using libmsym
+LIBMSYM_CMAKE_BOOL=	USE_LIBMSYM
+LIBMSYM_LIB_DEPENDS=	libmsym.so:science/libmsym
+
+MOLEQUEUE_DESC=		Enable the MoleQueue dependent functionality
+MOLEQUEUE_CMAKE_BOOL=	USE_MOLEQUEUE
+MOLEQUEUE_LIB_DEPENDS=	libMoleQueueClient.so:misc/molequeue
+MOLEQUEUE_IMPLIES=	QT5
+
+OPENGL_CMAKE_BOOL=	USE_OPENGL
+OPENGL_USES=		gl
+OPENGL_USE=		GL=gl,glew,glu
+
+QT5_CMAKE_BOOL=		USE_QT
+QT5_USES=		qt:5
+QT5_USE=		QT=core,concurrent,gui,network,widgets,buildtools_build,qmake_build
+QT5_IMPLIES=		OPENGL
+
+SPGLIB_DESC=		Enable optional features using spglib
+SPGLIB_CMAKE_BOOL=	USE_SPGLIB
+SPGLIB_LIB_DEPENDS=	libsymspg.so:science/spglib
+
+VTK_DESC=		Enable libraries that use VTK
+VTK_CMAKE_BOOL=		USE_VTK
+VTK_LIB_DEPENDS=	libvtksys-8.1.so.1:math/vtk8
+VTK_IMPLIES=		QT5
+VTK_BROKEN=		Needs https://github.com/psavery/genXrdPattern, etc
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/share/doc

Modified: head/science/avogadrolibs/pkg-plist
==============================================================================
--- head/science/avogadrolibs/pkg-plist	Wed Oct 17 06:49:30 2018	(r482272)
+++ head/science/avogadrolibs/pkg-plist	Wed Oct 17 07:04:19 2018	(r482273)
@@ -4,7 +4,7 @@ include/avogadro/core/atomtyper-inline.h
 include/avogadro/core/atomtyper.h
 include/avogadro/core/avogadrocore.h
 include/avogadro/core/avogadrocoreexport.h
-include/avogadro/core/avospglib.h
+%%SPGLIB%%include/avogadro/core/avospglib.h
 include/avogadro/core/basisset.h
 include/avogadro/core/bond.h
 include/avogadro/core/color3f.h
@@ -42,55 +42,56 @@ include/avogadro/io/dcdformat.h
 include/avogadro/io/fileformat.h
 include/avogadro/io/fileformatmanager.h
 include/avogadro/io/gromacsformat.h
+%%HDF5%%include/avogadro/io/hdf5dataformat.h
 include/avogadro/io/lammpsformat.h
 include/avogadro/io/mdlformat.h
 include/avogadro/io/pdbformat.h
 include/avogadro/io/trrformat.h
 include/avogadro/io/vaspformat.h
 include/avogadro/io/xyzformat.h
-include/avogadro/molequeue/avogadromolequeueexport.h
-include/avogadro/molequeue/batchjob.h
-include/avogadro/molequeue/inputgenerator.h
-include/avogadro/molequeue/inputgeneratordialog.h
-include/avogadro/molequeue/inputgeneratorwidget.h
-include/avogadro/molequeue/molequeuedialog.h
-include/avogadro/molequeue/molequeuemanager.h
-include/avogadro/molequeue/molequeuequeuelistmodel.h
-include/avogadro/molequeue/molequeuewidget.h
-include/avogadro/qtgui/avogadroqtguiexport.h
-include/avogadro/qtgui/containerwidget.h
-include/avogadro/qtgui/customelementdialog.h
-include/avogadro/qtgui/elementtranslator.h
-include/avogadro/qtgui/extensionplugin.h
-include/avogadro/qtgui/filebrowsewidget.h
-include/avogadro/qtgui/fileformatdialog.h
-include/avogadro/qtgui/generichighlighter.h
-include/avogadro/qtgui/hydrogentools.h
-include/avogadro/qtgui/interfacescript.h
-include/avogadro/qtgui/interfacewidget.h
-include/avogadro/qtgui/meshgenerator.h
-include/avogadro/qtgui/molecule.h
-include/avogadro/qtgui/moleculemodel.h
-include/avogadro/qtgui/multiviewwidget.h
-include/avogadro/qtgui/periodictableview.h
-include/avogadro/qtgui/persistentatom.h
-include/avogadro/qtgui/persistentbond.h
-include/avogadro/qtgui/pythonscript.h
-include/avogadro/qtgui/rwmolecule.h
-include/avogadro/qtgui/sceneplugin.h
-include/avogadro/qtgui/scenepluginmodel.h
-include/avogadro/qtgui/scriptloader.h
-include/avogadro/qtgui/toolplugin.h
-include/avogadro/qtgui/utilities.h
-include/avogadro/qtgui/viewfactory.h
-include/avogadro/qtopengl/activeobjects.h
-include/avogadro/qtopengl/avogadroqtopenglexport.h
-include/avogadro/qtopengl/glwidget.h
-include/avogadro/qtopengl/qttextrenderstrategy.h
-include/avogadro/qtplugins/avogadroqtpluginsexport.h
-include/avogadro/qtplugins/avogadrostaticqtplugins.h
-include/avogadro/qtplugins/pluginfactory.h
-include/avogadro/qtplugins/pluginmanager.h
+%%MOLEQUEUE%%include/avogadro/molequeue/avogadromolequeueexport.h
+%%MOLEQUEUE%%include/avogadro/molequeue/batchjob.h
+%%MOLEQUEUE%%include/avogadro/molequeue/inputgenerator.h
+%%MOLEQUEUE%%include/avogadro/molequeue/inputgeneratordialog.h
+%%MOLEQUEUE%%include/avogadro/molequeue/inputgeneratorwidget.h
+%%MOLEQUEUE%%include/avogadro/molequeue/molequeuedialog.h
+%%MOLEQUEUE%%include/avogadro/molequeue/molequeuemanager.h
+%%MOLEQUEUE%%include/avogadro/molequeue/molequeuequeuelistmodel.h
+%%MOLEQUEUE%%include/avogadro/molequeue/molequeuewidget.h
+%%QT5%%include/avogadro/qtgui/avogadroqtguiexport.h
+%%QT5%%include/avogadro/qtgui/containerwidget.h
+%%QT5%%include/avogadro/qtgui/customelementdialog.h
+%%QT5%%include/avogadro/qtgui/elementtranslator.h
+%%QT5%%include/avogadro/qtgui/extensionplugin.h
+%%QT5%%include/avogadro/qtgui/filebrowsewidget.h
+%%QT5%%include/avogadro/qtgui/fileformatdialog.h
+%%QT5%%include/avogadro/qtgui/generichighlighter.h
+%%QT5%%include/avogadro/qtgui/hydrogentools.h
+%%QT5%%include/avogadro/qtgui/interfacescript.h
+%%QT5%%include/avogadro/qtgui/interfacewidget.h
+%%QT5%%include/avogadro/qtgui/meshgenerator.h
+%%QT5%%include/avogadro/qtgui/molecule.h
+%%QT5%%include/avogadro/qtgui/moleculemodel.h
+%%QT5%%include/avogadro/qtgui/multiviewwidget.h
+%%QT5%%include/avogadro/qtgui/periodictableview.h
+%%QT5%%include/avogadro/qtgui/persistentatom.h
+%%QT5%%include/avogadro/qtgui/persistentbond.h
+%%QT5%%include/avogadro/qtgui/pythonscript.h
+%%QT5%%include/avogadro/qtgui/rwmolecule.h
+%%QT5%%include/avogadro/qtgui/sceneplugin.h
+%%QT5%%include/avogadro/qtgui/scenepluginmodel.h
+%%QT5%%include/avogadro/qtgui/scriptloader.h
+%%QT5%%include/avogadro/qtgui/toolplugin.h
+%%QT5%%include/avogadro/qtgui/utilities.h
+%%QT5%%include/avogadro/qtgui/viewfactory.h
+%%QT5%%include/avogadro/qtopengl/activeobjects.h
+%%QT5%%include/avogadro/qtopengl/avogadroqtopenglexport.h
+%%QT5%%include/avogadro/qtopengl/glwidget.h
+%%QT5%%include/avogadro/qtopengl/qttextrenderstrategy.h
+%%QT5%%include/avogadro/qtplugins/avogadroqtpluginsexport.h
+%%QT5%%include/avogadro/qtplugins/avogadrostaticqtplugins.h
+%%QT5%%include/avogadro/qtplugins/pluginfactory.h
+%%QT5%%include/avogadro/qtplugins/pluginmanager.h
 include/avogadro/quantumio/avogadroquantumioexport.h
 include/avogadro/quantumio/gamessus.h
 include/avogadro/quantumio/gaussiancube.h
@@ -99,82 +100,82 @@ include/avogadro/quantumio/molden.h
 include/avogadro/quantumio/mopacaux.h
 include/avogadro/quantumio/nwchemjson.h
 include/avogadro/quantumio/nwchemlog.h
-include/avogadro/rendering/avogadrogl.h
-include/avogadro/rendering/avogadrorendering.h
-include/avogadro/rendering/avogadrorenderingexport.h
-include/avogadro/rendering/bufferobject.h
-include/avogadro/rendering/camera.h
-include/avogadro/rendering/cylindergeometry.h
-include/avogadro/rendering/drawable.h
-include/avogadro/rendering/geometrynode.h
-include/avogadro/rendering/geometryvisitor.h
-include/avogadro/rendering/glrenderer.h
-include/avogadro/rendering/glrendervisitor.h
-include/avogadro/rendering/groupnode.h
-include/avogadro/rendering/linestripgeometry.h
-include/avogadro/rendering/meshgeometry.h
-include/avogadro/rendering/node.h
-include/avogadro/rendering/povrayvisitor.h
-include/avogadro/rendering/primitive.h
-include/avogadro/rendering/scene.h
-include/avogadro/rendering/shader.h
-include/avogadro/rendering/shaderprogram.h
-include/avogadro/rendering/spheregeometry.h
-include/avogadro/rendering/textlabel2d.h
-include/avogadro/rendering/textlabel3d.h
-include/avogadro/rendering/textlabelbase.h
-include/avogadro/rendering/textproperties.h
-include/avogadro/rendering/textrenderstrategy.h
-include/avogadro/rendering/texture2d.h
-include/avogadro/rendering/transformnode.h
-include/avogadro/rendering/visitor.h
-include/avogadro/rendering/volumegeometry.h
-include/avogadro/rendering/vrmlvisitor.h
-lib/avogadro2/scripts/formatScripts/cclibScript.py
-lib/avogadro2/scripts/formatScripts/zyx.py
-lib/avogadro2/scripts/workflows/scale.py
-lib/avogadro2/staticplugins/BallStick.a
-lib/avogadro2/staticplugins/BondCentric.a
-lib/avogadro2/staticplugins/Bonding.a
-lib/avogadro2/staticplugins/CoordinateEditor.a
-lib/avogadro2/staticplugins/CopyPaste.a
-lib/avogadro2/staticplugins/Crystal.a
-lib/avogadro2/staticplugins/CrystalScene.a
-lib/avogadro2/staticplugins/CustomElements.a
-lib/avogadro2/staticplugins/Editor.a
-lib/avogadro2/staticplugins/GamessInput.a
-lib/avogadro2/staticplugins/Hydrogens.a
-lib/avogadro2/staticplugins/ImportPQR.a
-lib/avogadro2/staticplugins/LammpsInput.a
-lib/avogadro2/staticplugins/Licorice.a
-lib/avogadro2/staticplugins/LineFormatInput.a
-lib/avogadro2/staticplugins/Manipulator.a
-lib/avogadro2/staticplugins/MeasureTool.a
-lib/avogadro2/staticplugins/Meshes.a
-lib/avogadro2/staticplugins/MolecularProperties.a
-lib/avogadro2/staticplugins/Navigator.a
-lib/avogadro2/staticplugins/NetworkDatabases.a
-lib/avogadro2/staticplugins/OpenBabel.a
-lib/avogadro2/staticplugins/OverlayAxes.a
-lib/avogadro2/staticplugins/POVRay.a
-lib/avogadro2/staticplugins/PlayerTool.a
-lib/avogadro2/staticplugins/PluginDownloader.a
-lib/avogadro2/staticplugins/QuantumInput.a
-lib/avogadro2/staticplugins/ScriptFileFormats.a
-lib/avogadro2/staticplugins/Select.a
-lib/avogadro2/staticplugins/Selection.a
-lib/avogadro2/staticplugins/SpaceGroup.a
-lib/avogadro2/staticplugins/Spectra.a
-lib/avogadro2/staticplugins/Surfaces.a
-lib/avogadro2/staticplugins/Symmetry.a
-lib/avogadro2/staticplugins/SymmetryScene.a
-lib/avogadro2/staticplugins/ThreeDMol.a
-lib/avogadro2/staticplugins/VRML.a
-lib/avogadro2/staticplugins/VanDerWaals.a
-lib/avogadro2/staticplugins/VanDerWaalsAO.a
-lib/avogadro2/staticplugins/Wireframe.a
-lib/avogadro2/staticplugins/Workflows.a
-lib/avogadro2/staticplugins/apbs.a
+%%OPENGL%%include/avogadro/rendering/avogadrogl.h
+%%OPENGL%%include/avogadro/rendering/avogadrorendering.h
+%%OPENGL%%include/avogadro/rendering/avogadrorenderingexport.h
+%%OPENGL%%include/avogadro/rendering/bufferobject.h
+%%OPENGL%%include/avogadro/rendering/camera.h
+%%OPENGL%%include/avogadro/rendering/cylindergeometry.h
+%%OPENGL%%include/avogadro/rendering/drawable.h
+%%OPENGL%%include/avogadro/rendering/geometrynode.h
+%%OPENGL%%include/avogadro/rendering/geometryvisitor.h
+%%OPENGL%%include/avogadro/rendering/glrenderer.h
+%%OPENGL%%include/avogadro/rendering/glrendervisitor.h
+%%OPENGL%%include/avogadro/rendering/groupnode.h
+%%OPENGL%%include/avogadro/rendering/linestripgeometry.h
+%%OPENGL%%include/avogadro/rendering/meshgeometry.h
+%%OPENGL%%include/avogadro/rendering/node.h
+%%OPENGL%%include/avogadro/rendering/povrayvisitor.h
+%%OPENGL%%include/avogadro/rendering/primitive.h
+%%OPENGL%%include/avogadro/rendering/scene.h
+%%OPENGL%%include/avogadro/rendering/shader.h
+%%OPENGL%%include/avogadro/rendering/shaderprogram.h
+%%OPENGL%%include/avogadro/rendering/spheregeometry.h
+%%OPENGL%%include/avogadro/rendering/textlabel2d.h
+%%OPENGL%%include/avogadro/rendering/textlabel3d.h
+%%OPENGL%%include/avogadro/rendering/textlabelbase.h
+%%OPENGL%%include/avogadro/rendering/textproperties.h
+%%OPENGL%%include/avogadro/rendering/textrenderstrategy.h
+%%OPENGL%%include/avogadro/rendering/texture2d.h
+%%OPENGL%%include/avogadro/rendering/transformnode.h
+%%OPENGL%%include/avogadro/rendering/visitor.h
+%%OPENGL%%include/avogadro/rendering/volumegeometry.h
+%%OPENGL%%include/avogadro/rendering/vrmlvisitor.h
+%%MOLEQUEUE%%lib/avogadro2/scripts/formatScripts/cclibScript.py
+%%MOLEQUEUE%%lib/avogadro2/scripts/formatScripts/zyx.py
+%%QT5%%lib/avogadro2/scripts/workflows/scale.py
+%%QT5%%lib/avogadro2/staticplugins/BallStick.a
+%%QT5%%lib/avogadro2/staticplugins/BondCentric.a
+%%QT5%%lib/avogadro2/staticplugins/Bonding.a
+%%QT5%%lib/avogadro2/staticplugins/CoordinateEditor.a
+%%QT5%%lib/avogadro2/staticplugins/CopyPaste.a
+%%QT5%%lib/avogadro2/staticplugins/Crystal.a
+%%QT5%%lib/avogadro2/staticplugins/CrystalScene.a
+%%QT5%%lib/avogadro2/staticplugins/CustomElements.a
+%%QT5%%lib/avogadro2/staticplugins/Editor.a
+%%MOLEQUEUE%%lib/avogadro2/staticplugins/GamessInput.a
+%%QT5%%lib/avogadro2/staticplugins/Hydrogens.a
+%%QT5%%lib/avogadro2/staticplugins/ImportPQR.a
+%%QT5%%lib/avogadro2/staticplugins/LammpsInput.a
+%%QT5%%lib/avogadro2/staticplugins/Licorice.a
+%%QT5%%lib/avogadro2/staticplugins/LineFormatInput.a
+%%QT5%%lib/avogadro2/staticplugins/Manipulator.a
+%%QT5%%lib/avogadro2/staticplugins/MeasureTool.a
+%%QT5%%lib/avogadro2/staticplugins/Meshes.a
+%%QT5%%lib/avogadro2/staticplugins/MolecularProperties.a
+%%QT5%%lib/avogadro2/staticplugins/Navigator.a
+%%QT5%%lib/avogadro2/staticplugins/NetworkDatabases.a
+%%QT5%%lib/avogadro2/staticplugins/OpenBabel.a
+%%QT5%%lib/avogadro2/staticplugins/OverlayAxes.a
+%%QT5%%lib/avogadro2/staticplugins/POVRay.a
+%%QT5%%lib/avogadro2/staticplugins/PlayerTool.a
+%%LIBARCHIVE%%lib/avogadro2/staticplugins/PluginDownloader.a
+%%MOLEQUEUE%%lib/avogadro2/staticplugins/QuantumInput.a
+%%MOLEQUEUE%%lib/avogadro2/staticplugins/ScriptFileFormats.a
+%%QT5%%lib/avogadro2/staticplugins/Select.a
+%%QT5%%lib/avogadro2/staticplugins/Selection.a
+%%LIBMSYM%%lib/avogadro2/staticplugins/SpaceGroup.a
+%%QT5%%lib/avogadro2/staticplugins/Spectra.a
+%%QT5%%lib/avogadro2/staticplugins/Surfaces.a
+%%LIBMSYM%%lib/avogadro2/staticplugins/Symmetry.a
+%%LIBMSYM%%lib/avogadro2/staticplugins/SymmetryScene.a
+%%QT5%%lib/avogadro2/staticplugins/ThreeDMol.a
+%%QT5%%lib/avogadro2/staticplugins/VRML.a
+%%QT5%%lib/avogadro2/staticplugins/VanDerWaals.a
+%%QT5%%lib/avogadro2/staticplugins/VanDerWaalsAO.a
+%%QT5%%lib/avogadro2/staticplugins/Wireframe.a
+%%QT5%%lib/avogadro2/staticplugins/Workflows.a
+%%MOLEQUEUE%%lib/avogadro2/staticplugins/apbs.a
 lib/cmake/avogadrolibs/AvogadroLibsConfig.cmake
 lib/cmake/avogadrolibs/AvogadroLibsConfigVersion.cmake
 lib/cmake/avogadrolibs/AvogadroLibsTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -189,22 +190,22 @@ lib/libAvogadroCore.so.1.91.0
 lib/libAvogadroIO.so
 lib/libAvogadroIO.so.1
 lib/libAvogadroIO.so.1.91.0
-lib/libAvogadroMoleQueue.so
-lib/libAvogadroMoleQueue.so.1
-lib/libAvogadroMoleQueue.so.1.91.0
-lib/libAvogadroQtGui.so
-lib/libAvogadroQtGui.so.1
-lib/libAvogadroQtGui.so.1.91.0
-lib/libAvogadroQtOpenGL.so
-lib/libAvogadroQtOpenGL.so.1
-lib/libAvogadroQtOpenGL.so.1.91.0
-lib/libAvogadroQtPlugins.so
-lib/libAvogadroQtPlugins.so.1
-lib/libAvogadroQtPlugins.so.1.91.0
+%%MOLEQUEUE%%lib/libAvogadroMoleQueue.so
+%%MOLEQUEUE%%lib/libAvogadroMoleQueue.so.1
+%%MOLEQUEUE%%lib/libAvogadroMoleQueue.so.1.91.0
+%%QT5%%lib/libAvogadroQtGui.so
+%%QT5%%lib/libAvogadroQtGui.so.1
+%%QT5%%lib/libAvogadroQtGui.so.1.91.0
+%%QT5%%lib/libAvogadroQtOpenGL.so
+%%QT5%%lib/libAvogadroQtOpenGL.so.1
+%%QT5%%lib/libAvogadroQtOpenGL.so.1.91.0
+%%QT5%%lib/libAvogadroQtPlugins.so
+%%QT5%%lib/libAvogadroQtPlugins.so.1
+%%QT5%%lib/libAvogadroQtPlugins.so.1.91.0
 lib/libAvogadroQuantumIO.so
 lib/libAvogadroQuantumIO.so.1
 lib/libAvogadroQuantumIO.so.1.91.0
-lib/libAvogadroRendering.so
-lib/libAvogadroRendering.so.1
-lib/libAvogadroRendering.so.1.91.0
+%%OPENGL%%lib/libAvogadroRendering.so
+%%OPENGL%%lib/libAvogadroRendering.so.1
+%%OPENGL%%lib/libAvogadroRendering.so.1.91.0
 lib/liblibgwavi.a



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810170704.w9H74Juc050502>