Index: head/science/dftbplus/Makefile
===================================================================
--- head/science/dftbplus/Makefile	(revision 535960)
+++ head/science/dftbplus/Makefile	(revision 535961)
@@ -1,71 +1,72 @@
 # $FreeBSD$
 
 PORTNAME=	dftbplus
 DISTVERSION=	19.1
+PORTREVISION=	1
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DFTB+: Package for performing fast atomistic simulations
 
 LICENSE=	GPLv3 # main code is under LGPL3+, the bundled dftd3-lib is under GPLv1+, this makes the result GPLv3 (based on https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility)
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-08-15
 BROKEN_powerpc64=	fails to compile: lbfgs.f90:18:19: Cannot find an intrinsic module named 'ieee_arithmetic' at (1)
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack
 RUN_DEPENDS=	${PYNUMPY}
 
-USES=		compiler:gcc-c++11-lib fortran gmake python:2.7 shebangfix
+USES=		compiler:gcc-c++11-lib fortran gmake python shebangfix
 SHEBANG_FILES=	tools/dptools/bin/* tools/misc/* utils/srcmanip/* utils/build/* external/fypp/bin/* utils/get_opt_externals \
 		external/fypp/bin/fypp utils/test/testlist_to_fypp test/prog/dftb+/bin/tagdiff
 SHEBANG_GLOB=	*.py
 USE_GITHUB=	yes
 GH_TUPLE=	dftbplus:mpifx:099ff75:mpifx/external/mpifx/origin \
 		dftbplus:scalapackfx:86cd6e4:scalapackfx/external/scalapackfx/origin \
 		dftbplus:dftd3-lib:00504a9:dftd3/external/dftd3/origin \
 		dftbplus:testparams:1601609:testparams/external/slakos/origin
 MAKEFILE=	makefile
 TEST_TARGET=	test
 
 FFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-llapack -lblas -lgfortran -lm
 
 MAKE_ARGS=	PYTHON=${PYTHON_CMD} FC=${FC} FXX=${FC} LN=${CC} \
 		INSTALLDIR=${STAGEDIR}${PREFIX} FREEBSD_PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS} --root=${STAGEDIR}"
+
+BINARY_ALIAS=		python=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		DFTD3 MPI SOCKETS ARPACK
 OPTIONS_DEFAULT=	DFTD3 MPI SOCKETS
 
 DFTD3_DESC=		Build with libdft3
 DFTD3_MAKE_ARGS=	WITH_DFTD3=1
 DFTD3_MAKE_ARGS_OFF=	WITH_DFTD3=0
 
 MPI_MAKE_ARGS=		WITH_MPI=1
 MPI_MAKE_ARGS_OFF=	WITH_MPI=0
 MPI_LIB_DEPENDS=	libmpich.so:net/mpich \
 			libscalapack.so:math/scalapack
 MPI_LDFLAGS=		${LOCALBASE}/lib/libmpich.so ${LOCALBASE}/lib/libmpifort.so ${LOCALBASE}/lib/libmpi.so
 
 SOCKETS_DESC=		Build with sockets library
 SOCKETS_MAKE_ARGS=	WITH_SOCKETS=1
 SOCKETS_MAKE_ARGS_OFF=	WITH_SOCKETS=0
 SOCKETS_BINARY_ALIAS=	gcc=${CC}
 
 ARPACK_DESC=		Build with ARPACK for large eigenvalue problems
 ARPACK_MAKE_ARGS=	WITH_ARPACK=1
 ARPACK_MAKE_ARGS_OFF=	WITH_ARPACK=0
 ARPACK_LIB_DEPENDS=	libarpack.so:math/arpack-ng
 ARPACK_PREVENTS=	MPI # ARPACK is only used in a single-core application
 
 MAKE_JOBS_UNSAFE=	yes # race conditions when some options are ON
 
 post-extract:
 	@${RM} ${WRKSRC}/external/scalapackfx/origin/test/psyr_result.dat.orig
 	@cd ${WRKSRC} && ${CP} sys/make.x86_64-linux-gnu make.arch
 
 post-install:
 	@cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} dftb+ modes waveplot
 
 .include <bsd.port.mk>
Index: head/science/dftbplus/pkg-plist
===================================================================
--- head/science/dftbplus/pkg-plist	(revision 535960)
+++ head/science/dftbplus/pkg-plist	(revision 535961)
@@ -1,51 +1,51 @@
 bin/dftb+
 bin/dp_bands
 bin/dp_dos
 bin/gen2cif
 bin/gen2xyz
 bin/makecube
 bin/modes
 bin/repeatgen
 bin/straingen
 bin/waveplot
 bin/xyz2gen
 %%PYTHON_SITELIBDIR%%/dptools-19.1-py%%PYTHON_VER%%.egg-info
 %%PYTHON_SITELIBDIR%%/dptools/__init__.py
-%%PYTHON_SITELIBDIR%%/dptools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dptools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/bandout.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/bandout.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/cif.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/cif.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/gen.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/gen.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/geometry.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/geometry.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/grids.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/grids.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/gridsio.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/gridsio.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/xyz.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/__pycache__/xyz.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/dptools/bandout.py
-%%PYTHON_SITELIBDIR%%/dptools/bandout.pyc
-%%PYTHON_SITELIBDIR%%/dptools/bandout.pyo
 %%PYTHON_SITELIBDIR%%/dptools/cif.py
-%%PYTHON_SITELIBDIR%%/dptools/cif.pyc
-%%PYTHON_SITELIBDIR%%/dptools/cif.pyo
 %%PYTHON_SITELIBDIR%%/dptools/common.py
-%%PYTHON_SITELIBDIR%%/dptools/common.pyc
-%%PYTHON_SITELIBDIR%%/dptools/common.pyo
 %%PYTHON_SITELIBDIR%%/dptools/gen.py
-%%PYTHON_SITELIBDIR%%/dptools/gen.pyc
-%%PYTHON_SITELIBDIR%%/dptools/gen.pyo
 %%PYTHON_SITELIBDIR%%/dptools/geometry.py
-%%PYTHON_SITELIBDIR%%/dptools/geometry.pyc
-%%PYTHON_SITELIBDIR%%/dptools/geometry.pyo
 %%PYTHON_SITELIBDIR%%/dptools/grids.py
-%%PYTHON_SITELIBDIR%%/dptools/grids.pyc
-%%PYTHON_SITELIBDIR%%/dptools/grids.pyo
 %%PYTHON_SITELIBDIR%%/dptools/gridsio.py
-%%PYTHON_SITELIBDIR%%/dptools/gridsio.pyc
-%%PYTHON_SITELIBDIR%%/dptools/gridsio.pyo
 %%PYTHON_SITELIBDIR%%/dptools/scripts/__init__.py
-%%PYTHON_SITELIBDIR%%/dptools/scripts/__init__.pyc
-%%PYTHON_SITELIBDIR%%/dptools/scripts/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/repeatgen.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/repeatgen.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/straingen.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/dptools/scripts/__pycache__/straingen.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/dptools/scripts/common.py
-%%PYTHON_SITELIBDIR%%/dptools/scripts/common.pyc
-%%PYTHON_SITELIBDIR%%/dptools/scripts/common.pyo
 %%PYTHON_SITELIBDIR%%/dptools/scripts/repeatgen.py
-%%PYTHON_SITELIBDIR%%/dptools/scripts/repeatgen.pyc
-%%PYTHON_SITELIBDIR%%/dptools/scripts/repeatgen.pyo
 %%PYTHON_SITELIBDIR%%/dptools/scripts/straingen.py
-%%PYTHON_SITELIBDIR%%/dptools/scripts/straingen.pyc
-%%PYTHON_SITELIBDIR%%/dptools/scripts/straingen.pyo
 %%PYTHON_SITELIBDIR%%/dptools/xyz.py
-%%PYTHON_SITELIBDIR%%/dptools/xyz.pyc
-%%PYTHON_SITELIBDIR%%/dptools/xyz.pyo