Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 13 Jul 2014 15:30:09 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361688 - in head/www/fcgiwrap: . files
Message-ID:  <201407131530.s6DFU90A031311@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: pi
Date: Sun Jul 13 15:30:08 2014
New Revision: 361688
URL: http://svnweb.freebsd.org/changeset/ports/361688
QAT: https://qat.redports.org/buildarchive/r361688/

Log:
  www/fcgiwrap: fix rc script, strip sbin/fcgiwrap
  
  PR:		186638
  Submitted by:	johan@stromnet.se
  Approved by:	freebsd@skysmurf.nl (maintainer)

Modified:
  head/www/fcgiwrap/Makefile
  head/www/fcgiwrap/files/fcgiwrap.in

Modified: head/www/fcgiwrap/Makefile
==============================================================================
--- head/www/fcgiwrap/Makefile	Sun Jul 13 14:53:17 2014	(r361687)
+++ head/www/fcgiwrap/Makefile	Sun Jul 13 15:30:08 2014	(r361688)
@@ -2,6 +2,7 @@
 
 PORTNAME=	fcgiwrap
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	GH \
 		http://www.skysmurf.nl/comp/FreeBSD/distfiles/
@@ -32,4 +33,7 @@ PLIST_FILES=	sbin/fcgiwrap man/man8/fcgi
 post-patch:
 	@${REINPLACE_CMD} 's/@prefix@@mandir@/@mandir@/' ${WRKSRC}/Makefile.in
 
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/fcgiwrap
+
 .include <bsd.port.mk>

Modified: head/www/fcgiwrap/files/fcgiwrap.in
==============================================================================
--- head/www/fcgiwrap/files/fcgiwrap.in	Sun Jul 13 14:53:17 2014	(r361687)
+++ head/www/fcgiwrap/files/fcgiwrap.in	Sun Jul 13 15:30:08 2014	(r361688)
@@ -96,7 +96,7 @@ if [ -n "$2" ]; then
 		eval fcgiwrap_fib="\${fcgiwrap_${profile}_fib:-${fcgiwrap_fib}}"
 		eval fcgiwrap_user="\${fcgiwrap_${profile}_user:-${fcgiwrap_user}}"
 		eval fcgiwrap_socket="\${fcgiwrap_${profile}_socket:?}"
-		eval fcgiwrap_flags="\${fcgiwrap_${profile}_flags:-${fciwrap_flags}}"
+		eval fcgiwrap_flags="\${fcgiwrap_${profile}_flags:-${fcgiwrap_flags}}"
 	else
 		echo "$0: extra argument ignored"
 	fi
@@ -117,6 +117,10 @@ else
 	fi
 fi
 
-command_args="-f -p ${pidfile} ${procname} -s ${fcgiwrap_socket}"
+# run_rc_command would send ${name}_flags as parameters to $command (daemon)
+# This ensures they are actually passed to fcgiwrap instead.
+actual_fcgiwrap_flags="${fcgiwrap_flags}"
+fcgiwrap_flags=""
+command_args="-f -p ${pidfile} ${procname} -s ${fcgiwrap_socket} ${actual_fcgiwrap_flags}"
 
 run_rc_command "$1"

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407131530.s6DFU90A031311>