Index: head/science/vipster/Makefile
===================================================================
--- head/science/vipster/Makefile	(revision 558899)
+++ head/science/vipster/Makefile	(revision 558900)
@@ -1,52 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	vipster
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.18b.20200514
-PORTREVISION=	3
+DISTVERSION=	1.19.1b-14
+DISTVERSIONSUFFIX=	-g7168a1b
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Crystalline and molecular structure visualisation program
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	cli11>0:devel/cli11 \
+BUILD_DEPENDS=	catch>0:devel/catch \
+		cli11>0:devel/cli11 \
 		libfmt>0:devel/libfmt \
 		nlohmann-json>0:devel/nlohmann-json
 
 USES=		cmake compiler:c++17-lang
+USE_GL=		gl
+USE_LDCONFIG=	yes
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	sgsaenger
-GH_TAGNAME=	714970a148bc8f6801c8e98120aa884da6ca801c
-USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		DESKTOP LAMMPS PYTHON
 OPTIONS_DEFAULT=	DESKTOP
 OPTIONS_SUB=		yes
 
-CMAKE_OFF=		VIPSTER_PYWIDGET
+CMAKE_OFF=		VIPSTER_DOWNLOAD_DEPENDENCIES
 
 DESKTOP_DESC=		Build QT-based desktop app
 DESKTOP_CMAKE_BOOL=	VIPSTER_DESKTOP
 DESKTOP_USES=		qt:5
 DESKTOP_USE=		QT=core,gui,widgets,buildtools_build,qmake_build
 
 LAMMPS_DESC=		Interactive LAMMPS in desktop app
 LAMMPS_CMAKE_BOOL=	VIPSTER_LAMMPS
 LAMMPS_IMPLIES=		DESKTOP
-LAMMPS_BROKEN=		https://github.com/sgsaenger/vipster/issues/39
+LAMMPS_LIB_DEPENDS=	libfftw3.so:math/fftw3 \
+			liblammps.so:science/lammps \
+			libmpi.so:net/openmpi
+LAMMPS_CONFLICTS_BUILD=	mpich
 
-PYTHON_CMAKE_BOOL=	PYTHON PYSHELL
+PYTHON_CMAKE_BOOL=	VIPSTER_PYLIB VIPSTER_PYWIDGET
 PYTHON_BROKEN=		Bundles pybind11: https://github.com/sgsaenger/vipster/issues/23
 
 PORTSCOUT=	limit:^[0-9][0-9a-z\.]*$$
 
 do-test:
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DTESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
Index: head/science/vipster/distinfo
===================================================================
--- head/science/vipster/distinfo	(revision 558899)
+++ head/science/vipster/distinfo	(revision 558900)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589483915
-SHA256 (sgsaenger-vipster-v1.18b.20200514-714970a148bc8f6801c8e98120aa884da6ca801c_GH0.tar.gz) = bf322f838c263c766e7cadca0be6f49d83f0c67279a997ccd9989793150b01ce
-SIZE (sgsaenger-vipster-v1.18b.20200514-714970a148bc8f6801c8e98120aa884da6ca801c_GH0.tar.gz) = 995285
+TIMESTAMP = 1608634398
+SHA256 (sgsaenger-vipster-v1.19.1b-14-g7168a1b_GH0.tar.gz) = 132a343289ca79e398f81bd503bccd05a2d280d313ea8106f32810cd7cce4258
+SIZE (sgsaenger-vipster-v1.19.1b-14-g7168a1b_GH0.tar.gz) = 3512824
Index: head/science/vipster/pkg-plist
===================================================================
--- head/science/vipster/pkg-plist	(revision 558899)
+++ head/science/vipster/pkg-plist	(revision 558900)
@@ -1,44 +1,59 @@
 %%DESKTOP%%bin/vipster
 include/vipster/atom.h
+include/vipster/atom.py.h
 include/vipster/bond.h
+include/vipster/bond.py.h
 include/vipster/configfile.h
+include/vipster/configfile.py.h
 include/vipster/crystal.h
 include/vipster/data.h
+include/vipster/data.py.h
 include/vipster/fileio.h
+include/vipster/fileio.py.h
 include/vipster/filter.h
 include/vipster/global.h
-include/vipster/io/data.h
-include/vipster/io/parameters.h
-include/vipster/io/plugin.h
-include/vipster/io/plugin.py.h
-include/vipster/io/plugins/cpmdinput.h
-include/vipster/io/plugins/cube.h
-include/vipster/io/plugins/lmpinput.h
-include/vipster/io/plugins/lmptrajec.h
-include/vipster/io/plugins/orca.h
-include/vipster/io/plugins/poscar.h
-include/vipster/io/plugins/pwinput.h
-include/vipster/io/plugins/pwoutput.h
-include/vipster/io/plugins/xsf.h
-include/vipster/io/plugins/xyz.h
-include/vipster/io/presets.h
-include/vipster/io/util.h
+include/vipster/global.py.h
+include/vipster/iotuple.h
+include/vipster/ioutil.h
 include/vipster/kpoints.h
+include/vipster/kpoints.py.h
 include/vipster/molecule.h
+include/vipster/molecule.py.h
 include/vipster/namedenum.h
+include/vipster/parameters.h
+include/vipster/parameters.py.h
 include/vipster/periodictable.h
-include/vipster/pyvipster.h
+include/vipster/periodictable.py.h
+include/vipster/plugin.h
+include/vipster/plugin.py.h
+include/vipster/plugins/cpmdinput.h
+include/vipster/plugins/cube.h
+include/vipster/plugins/json.h
+include/vipster/plugins/lmpinput.h
+include/vipster/plugins/lmptrajec.h
+include/vipster/plugins/orca.h
+include/vipster/plugins/poscar.h
+include/vipster/plugins/pwinput.h
+include/vipster/plugins/pwoutput.h
+include/vipster/plugins/xsf.h
+include/vipster/plugins/xyz.h
+include/vipster/presets.h
+include/vipster/presets.py.h
 include/vipster/settings.h
 include/vipster/staticmap.h
 include/vipster/step.h
+include/vipster/step.py.h
 include/vipster/stepbase.h
 include/vipster/stepformatter.h
 include/vipster/stepselection.h
 include/vipster/vec.h
+include/vipster/vec.py.h
 include/vipster/version.h
+lib/cmake/Vipster-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Vipster.cmake
 lib/libvipster.so
 lib/libvipster.so.1
-lib/libvipster.so.1.19
-%%DESKTOP%%share/applications/vipster.desktop
-%%DESKTOP%%share/icons/hicolor/128x128/apps/vipster.png
-%%DESKTOP%%share/metainfo/vipster.appdata.xml
+lib/libvipster.so.1.19.1
+share/applications/com.github.sgsaenger.vipster.desktop
+share/icons/hicolor/128x128/apps/vipster.png
+share/metainfo/com.github.sgsaenger.vipster.appdata.xml