Index: head/science/vipster/Makefile
===================================================================
--- head/science/vipster/Makefile	(revision 534269)
+++ head/science/vipster/Makefile	(revision 534270)
@@ -1,55 +1,43 @@
 # $FreeBSD$
 
 PORTNAME=	vipster
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.18b-75
-DISTVERSIONSUFFIX=	-gfa5853f
-PORTREVISION=	1
+DISTVERSION=	1.18b-174
+DISTVERSIONSUFFIX=	-gb555fa4
 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 \
+		nlohmann-json>0:devel/nlohmann-json
+
 USES=		cmake compiler
 USE_GITHUB=	yes
 GH_ACCOUNT=	sgsaenger
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=		DESKTOP PYTHON
 OPTIONS_DEFAULT=	DESKTOP
 OPTIONS_SUB=		yes
 
 DESKTOP_DESC=		Build QT-based desktop app
 DESKTOP_CMAKE_BOOL=	DESKTOP
 DESKTOP_USES=		qt:5
 DESKTOP_USE=		QT=core,gui,widgets,buildtools_build,qmake_build
 
-PYTHON_CMAKE_BOOL=	PYTHON
+PYTHON_CMAKE_BOOL=	PYTHON PYSHELL
 PYTHON_BROKEN=		Bundles pybind11: https://github.com/sgsaenger/vipster/issues/23
 
-# use clang from ports because older clang (clang-6) lacks the c++17 feature std::mmap::extract
-
-.include <bsd.port.pre.mk>
-
-.if ${CHOSEN_COMPILER_TYPE} == clang
-LLVM_VER=	${LLVM_DEFAULT}
-BUILD_DEPENDS+=	clang${LLVM_VER}:devel/llvm${LLVM_VER}
-CPP=		clang-cpp${LLVM_VER}
-CC=		clang${LLVM_VER}
-CXX=		clang++${LLVM_VER}
-.else
-USE_GCC=	yes
-.endif
-
 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.post.mk>
+.include <bsd.port.mk>
Index: head/science/vipster/distinfo
===================================================================
--- head/science/vipster/distinfo	(revision 534269)
+++ head/science/vipster/distinfo	(revision 534270)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577938644
-SHA256 (sgsaenger-vipster-v1.18b-75-gfa5853f_GH0.tar.gz) = f8796af4e85db5e176222fb1c5f28d71f4b64557681cbb50109c5e929beeda29
-SIZE (sgsaenger-vipster-v1.18b-75-gfa5853f_GH0.tar.gz) = 1205340
+TIMESTAMP = 1588838192
+SHA256 (sgsaenger-vipster-v1.18b-174-gb555fa4_GH0.tar.gz) = 8f9b2b246dcc4906ad816271acc71cafab17099361ec7abf8cfff1735fa58f60
+SIZE (sgsaenger-vipster-v1.18b-174-gb555fa4_GH0.tar.gz) = 970043
Index: head/science/vipster/pkg-plist
===================================================================
--- head/science/vipster/pkg-plist	(revision 534269)
+++ head/science/vipster/pkg-plist	(revision 534270)
@@ -1,49 +1,44 @@
 %%DESKTOP%%bin/vipster
 include/vipster/atom.h
 include/vipster/bond.h
 include/vipster/cell.h
 include/vipster/configfile.h
 include/vipster/crystal.h
 include/vipster/data.h
+include/vipster/fileio.h
 include/vipster/global.h
-include/vipster/io.h
-include/vipster/io/configs.h
-include/vipster/io/cpmdinput/config.h
-include/vipster/io/cpmdinput/param.h
-include/vipster/io/cpmdinput/plugin.h
-include/vipster/io/cube/plugin.h
-include/vipster/io/fmt.h
-include/vipster/io/lmpinput/config.h
-include/vipster/io/lmpinput/plugin.h
-include/vipster/io/lmptrajec/plugin.h
-include/vipster/io/orca/param.h
-include/vipster/io/orca/plugin.h
+include/vipster/io/data.h
 include/vipster/io/parameters.h
 include/vipster/io/plugin.h
-include/vipster/io/poscar/config.h
-include/vipster/io/poscar/plugin.h
-include/vipster/io/pwinput/config.h
-include/vipster/io/pwinput/param.h
-include/vipster/io/pwinput/plugin.h
-include/vipster/io/pwoutput/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/io/xsf/plugin.h
-include/vipster/io/xyz/config.h
-include/vipster/io/xyz/plugin.h
 include/vipster/kpoints.h
 include/vipster/molecule.h
+include/vipster/namedenum.h
 include/vipster/periodictable.h
 include/vipster/pyvipster.h
 include/vipster/settings.h
+include/vipster/staticmap.h
 include/vipster/step.h
 include/vipster/stepconst.h
 include/vipster/stepmutable.h
 include/vipster/stepsel.h
 include/vipster/vec.h
 include/vipster/version.h
 lib/libvipster.so
 lib/libvipster.so.1
 lib/libvipster.so.1.18
 %%DESKTOP%%share/applications/vipster.desktop
 %%DESKTOP%%share/icons/hicolor/128x128/apps/vipster.png
 %%DESKTOP%%share/metainfo/vipster.appdata.xml