3 files changed, 10 insertions, 13 deletions

diff --git a/www/spawn-fcgi/Makefile b/www/spawn-fcgi/Makefile
index 91abaaa05d5b..747585aba146 100644
--- a/www/spawn-fcgi/Makefile
+++ b/www/spawn-fcgi/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spawn-fcgi
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/ \
 		http://mirrors.cat.pdx.edu/lighttpd/
diff --git a/www/spawn-fcgi/distinfo b/www/spawn-fcgi/distinfo
index c17e148903b3..ac39949e1716 100644
--- a/www/spawn-fcgi/distinfo
+++ b/www/spawn-fcgi/distinfo
@@ -1,3 +1,3 @@
-MD5 (spawn-fcgi-1.6.0.tar.bz2) = 06fcafdb87aeb5dc9b8f0f91632ae748
-SHA256 (spawn-fcgi-1.6.0.tar.bz2) = 8321de784b3c4d3108d49795029aae2acdc6b2eee8fce7c2837989762f9e04f3
-SIZE (spawn-fcgi-1.6.0.tar.bz2) = 69691
+MD5 (spawn-fcgi-1.6.2.tar.bz2) = f74a8f4d8e379c53926b5eeef84b381c
+SHA256 (spawn-fcgi-1.6.2.tar.bz2) = fd9b790dc7692985fcf552e4b6349b0d6872b822450169719192d7a73f6565c0
+SIZE (spawn-fcgi-1.6.2.tar.bz2) = 73169
diff --git a/www/spawn-fcgi/files/spawn-fcgi.sh.in b/www/spawn-fcgi/files/spawn-fcgi.sh.in
index c866331c810f..e94a31c4fa8b 100644
--- a/www/spawn-fcgi/files/spawn-fcgi.sh.in
+++ b/www/spawn-fcgi/files/spawn-fcgi.sh.in
@@ -14,7 +14,7 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 : ${spawn_fcgi_enable="NO"}
-: ${spawn_fcgi_app=""}
+: ${spawn_fcgi_app="%%LOCALBASE%%/bin/php-cgi"}
 : ${spawn_fcgi_pidfile="/var/run/spawn-fcgi.pid"}
 : ${spawn_fcgi_user="www"}
 : ${spawn_fcgi_group="www"}
@@ -22,12 +22,14 @@ load_rc_config $name
 : ${spawn_fcgi_bindport="9000"}
 : ${spawn_fcgi_children="5"}
 : ${spawn_fcgi_max_requests="1000"}
+: ${spawn_fcgi_web_server_addrs=""}
 : ${spawn_fcgi_allowed_env=""}
-
+: ${spawn_fcgi_path_env="/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin"}
 
 command="/usr/local/bin/spawn-fcgi"
 command_args="-u ${spawn_fcgi_user} -g ${spawn_fcgi_group} -a ${spawn_fcgi_bindaddr} -p ${spawn_fcgi_bindport} -P ${spawn_fcgi_pidfile} -- ${spawn_fcgi_app}"
 pidfile=${spawn_fcgi_pidfile}
+procname=${spawn_fcgi_app}
 
 _allowed_env="PATH USER PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS FCGI_WEB_SERVER_ADDRS"
 _allowed_env="${_allowed_env} ${spawn_fcgi_allowed_env}"
@@ -40,10 +42,11 @@ spawn_fcgi_start_precmd()
 {
     touch ${pidfile}
     chown ${spawn_fcgi_user}:${spawn_fcgi_group} ${pidfile}
-    export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin
+    export PATH=${spawn_fcgi_path_env}
     export PHP_FCGI_CHILDREN=${spawn_fcgi_children}
     export PHP_FCGI_MAX_REQUESTS=${spawn_fastcgi_max_requests}
     export USER=${spawn_fcgi_user}
+    export FCGI_WEB_SERVER_ADDRS=${spawn_fcgi_web_server_addrs}
     E=
     for i in ${_allowed_env}; do
         eval _val="\$$i"
@@ -55,12 +58,6 @@ spawn_fcgi_start_precmd()
     command="env - ${E} ${command}"
 }
 
-spawn_fcgi_stop_cmd()
-{
-    read rc_pid < ${pidfile}
-    kill ${sig_stop} ${rc_pid}
-}
-
 spawn_fcgi_stop_postcmd()
 {
     rm -f ${pidfile}