Index: head/deskutils/calibre/Makefile
===================================================================
--- head/deskutils/calibre/Makefile	(revision 528868)
+++ head/deskutils/calibre/Makefile	(revision 528869)
@@ -1,136 +1,137 @@
 # Created by: stas
 # $FreeBSD$
 
 PORTNAME=	calibre
 PORTVERSION=	4.12.0
 PORTREVISION=	2
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	Ebook management application
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libpoppler-qt5.so:graphics/poppler-qt5 \
 		libwmflite.so:graphics/libwmf \
 		libchm.so:misc/chmlib \
 		libicudata.so:devel/icu \
 		libpodofo.so:graphics/podofo \
 		libmtp.so:multimedia/libmtp \
 		libfreetype.so:print/freetype2 \
 		libhunspell-1.7.so:textproc/hunspell \
 		libhyphen.so:textproc/hyphen
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR}
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}css-parser>=1.0.4:www/py-css-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:www/py-beautifulsoup@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mechanize>=0:www/py-mechanize@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>=0:net/py-netifaces@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}apsw>=0:databases/py-apsw@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}regex>=0:textproc/py-regex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=0:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5-parser>=0.4.3:www/py-html5-parser@${PY_FLAVOR} \
 		pdftohtml:graphics/poppler-utils
 
 USES=		desktop-file-utils gettext-runtime gl gnome localbase:ldflags \
 		pkgconfig pyqt:5 qt:5 shared-mime-info shebangfix \
 		ssl tar:xz xorg
 USE_RC_SUBR=	calibre
+SUB_LIST+=	PYTHON_VERSION=${PYTHON_VERSION}
 USE_PYQT=	core gui network sip svg webengine widgets xmlpatterns
 USE_QT=		buildtools_build core dbus gui qmake_build widgets
 USE_GL=		egl gl
 USE_GNOME=	glib20
 USE_XORG=	xrender xext x11
 
 EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
 SHEBANG_GLOB=	*.sh *.py *.recipe
 python_OLD_CMD=	"/usr/bin/env python2" "/usr/bin/env  python2" "/usr/bin/env  python" /bin/python2 \
 		/usr/bin/python2 ${PYTHON_BIN}
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
 		FC_LIB_DIR="${LOCALBASE}/lib" \
 		OVERRIDE_CFLAGS="${CFLAGS}" \
 		OVERRIDE_LDFLAGS="${LDFLAGS}" \
 		PODOFO_LIB_DIR="${LOCALBASE}/lib" \
 		PODOFO_INC_DIR="${LOCALBASE}/include/podofo" \
 		WITH_USB=yes \
 		CALIBRE_CONFIG_DIRECTORY=${WRKDIR}/calibre-config \
 		XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
 		XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
 		XDG_UTILS_INSTALL_MODE=system \
 		QMAKE=${QMAKE} \
 		SIP_BIN=${SIP} \
 		SIP_DIR=${PYQT_SIPDIR}
 
 OPTIONS_SINGLE= 	PYTHON
 OPTIONS_SINGLE_PYTHON=	PYTHON2 PYTHON3
 OPTIONS_DEFAULT=	PYTHON2
 OPTINS_SUB=		yes
 
 PYTHON2_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR} 
 PYTHON2_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow6>=0:graphics/py-pillow6@${PY_FLAVOR}
 PYTHON2_USES=		python:2.7
 PYTHON2_VARS=		PYTHON_BIN=${LOCALBASE}/bin/python2 \
 			DEPRECATED="Uses deprecated version of python" \
 			EXPIRATION_DATE=2020-09-15
 PYTHON2_PLIST_SUB=	SODIR=""
 
 PYTHON3_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
 PYTHON3_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR}
 PYTHON3_USES=		python:3.5+
 PYTHON3_VARS=		PYTHON_BIN=${LOCALBASE}/bin/python3
 PYTHON3_MAKE_ENV=	CALIBRE_PY3_PORT=1
 PYTHON3_PLIST_SUB=	SODIR="3/"
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|#!/usr/bin/env python{py_major_version}|#!${PYTHON_CMD}|" \
 			-e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \
 			-e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \
 		${WRKSRC}/setup/install.py \
 		${WRKSRC}/src/calibre/gui2/dialogs/custom_recipes.py \
 		${WRKSRC}/src/calibre/gui2/preferences/tweaks.py
 
 do-build:
 	@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} build)
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor \
 		${STAGEDIR}${PREFIX}/share/applications \
 		${STAGEDIR}${PREFIX}/share/desktop-directories \
 		${STAGEDIR}${PREFIX}/share/mime/packages
 	# Create this file to avoid what looks like a bug in xdg-desktop-menu
 	@${TOUCH} ${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} install --prefix ${PREFIX} \
 		--staging-root ${STAGEDIR}${PREFIX})
 	@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall \
 		${STAGEDIR}${PREFIX}/share/applications/defaults.list
 	@${RMDIR} ${STAGEDIR}${PREFIX}/share/desktop-directories
 
 do-install-PYTHON2-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
 
 do-install-PYTHON3-on:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/3/*
 
 .include <bsd.port.mk>
Index: head/deskutils/calibre/files/calibre.in
===================================================================
--- head/deskutils/calibre/files/calibre.in	(revision 528868)
+++ head/deskutils/calibre/files/calibre.in	(revision 528869)
@@ -1,72 +1,72 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: calibre
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable calibre_server:
 #
 # calibre_enable (bool):        Set it to "YES" to enable calibre
 #                               Default is "NO".
 # calibre_port (int):		port that calibre_server listens on
 #				Default is 8080
 # calibre_user (string):	user that calibre_server runs as
 #				Default is calibre
 # calibre_home (string):	home directory for calibre_server
 #				Default is the home directory of calibre_user
 # calibre_url_prefix (string):  prefix to append to all URLs
 #				default is unset
 # calibre_logfile (string):	log file location
 #				Default /var/log/calibre-server/calibre-server.log
 # calibre_logsize (int):	size of log file before being rotated in MBs
 #				Default 10 MB
 # calibre_flags (string):	Any further flags to customize configuration
 #				Default empty
 # calibre_library (string):	path to library folder to serve content from
 #
 #
 ##########################################################
 
 . /etc/rc.subr
 
 export PATH=$PATH:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin
 
 name=calibre
 rcvar=calibre_enable
 
 load_rc_config $name
 
 : ${calibre_enable:=NO}
 : ${calibre_user:=calibre}
 : ${calibre_library:=/nonexistent}
 : ${calibre_logfile:=/var/log/calibre-server/calibre-server.log}
 : ${calibre_logsize:=10}
 
 pidfile=/var/run/${name}/${name}.pid
 command=%%PREFIX%%/bin/calibre-server
-command_interpreter=%%LOCALBASE%%/bin/python2.7
+command_interpreter=%%LOCALBASE%%/bin/%%PYTHON_VERSION%%
 required_dirs=${calibre_library}
 
 start_precmd=calibre_prestart
 
 calibre_home=${calibre_home:-$(getent passwd ${calibre_user} | awk -F: '{print $6}')}
 calibre_env="${calibre_env} HOME=${calibre_home:-/nonexistent}"
 
 if [ ! -z "${calibre_port}" ]; then
 	command_args="${command_args} --port=${calibre_port}"
 fi
 if [ ! -z "${calibre_url_prefix}" ]; then
 	command_args="${command_args} --url-prefix=${calibre_url_prefix}"
 fi
 
 command_args="${command_args} --log ${calibre_logfile} --pidfile ${pidfile} --max-log-size ${calibre_logsize} --daemonize ${calibre_library}"
 
 calibre_prestart()
 {
 	install -d -o ${calibre_user} -m 755 /var/run/${name}
 	install -d -o ${calibre_user} -m 755 `dirname ${calibre_logfile}`
 }
 
 run_rc_command "$1"