Index: head/www/trac-devel/Makefile
===================================================================
--- head/www/trac-devel/Makefile	(revision 560854)
+++ head/www/trac-devel/Makefile	(revision 560855)
@@ -1,62 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	trac
 DISTVERSION=	1.5.2
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	http://ftp.edgewall.com/pub/trac/ \
 		ftp://ftp.edgewall.com/pub/trac/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	Trac-${DISTVERSION}
 
 MAINTAINER=	samm@FreeBSD.org
 COMMENT=	Enhanced wiki and issue tracking system for software projects
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=2.3.4:devel/py-babel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.10:devel/py-Jinja2@${PY_FLAVOR}
 
 # some tests are failing with 3.8
 USES=		python:3.7
 
 CONFLICTS_INSTALL=	trac
 
 USE_PYTHON=	distutils autoplist
 USE_RC_SUBR=	tracd
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
 PORTEXAMPLES=	*
 PORTDATA=	*
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=		DOCUTILS PYGMENTS TZ SVN GIT EXAMPLES TEXTILE
-OPTIONS_DEFAULT=	DOCUTILS PYGMENTS TZ SVN SQLITE TEXTILE
+OPTIONS_DEFINE=		DOCUTILS PYGMENTS TZ SVN GIT EXAMPLES TEXTILE FCGI
+OPTIONS_DEFAULT=	DOCUTILS PYGMENTS TZ SVN SQLITE TEXTILE FCGI
 OPTIONS_RADIO=		DATABASE
 OPTIONS_RADIO_DATABASE=	PGSQL SQLITE MYSQL
 DOCUTILS_DESC=		Allow additional text markup
 PYGMENTS_DESC=		Use generic syntax highlighter
 TEXTILE_DESC=		Support for the Textile markup
 TZ_DESC=		Process Time Zones
 SVN_DESC=		Enable SVN support
 GIT_DESC=		Enable GIT support
+FCGI_DESC=		Enable FastCGI support
 
 DOCUTILS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.14:textproc/py-docutils@${PY_FLAVOR}
 PYGMENTS_RUN_DEPENDS=	${PY_PYGMENTS}
 TZ_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
 PGSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${PY_FLAVOR}
 SQLITE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR}
 SVN_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${PY_FLAVOR}
 GIT_RUN_DEPENDS=	git:devel/git
 TEXTILE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}textile>0:www/py-textile@${PY_FLAVOR}
+FCGI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flup6>0:www/py-flup6@${PY_FLAVOR}
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/sample-plugins
 	${FIND} ${WRKSRC}/contrib -type f -maxdepth 1 -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR}/ \;
 	(cd ${WRKSRC}/sample-plugins && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/sample-plugins)
 
 .include <bsd.port.mk>
Index: head/www/trac-devel/files/tracd.in
===================================================================
--- head/www/trac-devel/files/tracd.in	(revision 560854)
+++ head/www/trac-devel/files/tracd.in	(revision 560855)
@@ -1,61 +1,61 @@
 #!/bin/sh
 #
 # tracd startup
 #
 # $FreeBSD$
 
 # PROVIDE: tracd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 #
 # Add the following lines to /etc/rc.conf to enable or configure tracd:
 # tracd_enable (bool):		Set to "NO" by default.
 #				Set it to "YES" to enable tracd.
 # tracd_listen (str):		The host name or IP address to bind tracd to.
 #				By default tracd listens 0.0.0.0, i.e. all the
 #				available addresses on all interfaces.
 # tracd_port (str):		The port number to bind to, 80 by default.
 # tracd_pidfile (str):		When daemonizing, file to which to write pid
 #				if not to /var/run/tracd.pid.
 # tracd_envdir (str):		Directory of the project environments. Set to
 #				"/home/trac" by default.
 # tracd_env (str):		The project environment name while using single
 # 				environment mode. The default is empty, meaning
 #				multiproject mode.
 # tracd_args (str):		Extra arguments passed to tracd startup
 # 				command. Empty by default.
 #
 
 . /etc/rc.subr
 
 name="tracd"
 rcvar=tracd_enable
 
 tracd_enable=${tracd_enable:-"NO"}
 tracd_listen=${tracd_listen:-"0.0.0.0"}
 tracd_port=${tracd_port:-"80"}
 tracd_pidfile=${tracd_pidfile:-"/var/run/tracd.pid"}
 tracd_envdir=${tracd_envdir:-"/home/trac"}
-tracd_env=${tracd_env:-""}
+tracd_tracenv=${tracd_tracenv:-""}
 tracd_args=${tracd_args:-""}
 
 load_rc_config ${name}
 
 command_args="--daemonize --hostname=${tracd_listen} --port=${tracd_port}"
 command_args="${command_args} --pidfile=${tracd_pidfile} ${tracd_args}"
 
 required_dirs=${tracd_envdir}
 pidfile=${tracd_pidfile}
 
-if [ -z "${tracd_env}" ]; then
+if [ -z "${tracd_tracenv}" ]; then
 	_trac_env="--env-parent-dir ${tracd_envdir}"
 else
-	_trac_env="${tracd_envdir}/${tracd_env}"
+	_trac_env="${tracd_envdir}/${tracd_tracenv}"
 	command_args="${command_args} --single-env"
 fi
 
 command_args="%%PREFIX%%/bin/tracd ${command_args} ${_trac_env}"
 command="%%PYTHON_CMD%%"
 
 run_rc_command $1