svn commit: r560855 - in head/www/trac-devel: . files

[Oleksii Samorukov]

Author: samm
Date: Sat Jan  9 12:28:16 2021
New Revision: 560855
URL: https://svnweb.freebsd.org/changeset/ports/560855

Log:
  www/trac-devel: fix rc script and add dependency
  
  - Add optional runtime dependency to support FCGI protocol.
  - Rename tracd_env to tracd_tracenv. Key <service>_env is reserved in rc.d
    for the environment variables.
  - Bump portrevision

Modified:
  head/www/trac-devel/Makefile
  head/www/trac-devel/files/tracd.in

Modified: head/www/trac-devel/Makefile
==============================================================================
--- head/www/trac-devel/Makefile	Sat Jan  9 12:14:02 2021	(r560854)
+++ head/www/trac-devel/Makefile	Sat Jan  9 12:28:16 2021	(r560855)
@@ -2,6 +2,7 @@
 
 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/
@@ -33,8 +34,8 @@ 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
@@ -43,6 +44,7 @@ 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}
@@ -53,6 +55,7 @@ MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mysqlclient>
 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

Modified: head/www/trac-devel/files/tracd.in
==============================================================================
--- head/www/trac-devel/files/tracd.in	Sat Jan  9 12:14:02 2021	(r560854)
+++ head/www/trac-devel/files/tracd.in	Sat Jan  9 12:28:16 2021	(r560855)
@@ -37,7 +37,7 @@ 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}
@@ -48,10 +48,10 @@ command_args="${command_args} --pidfile=${tracd_pidfil
 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