From owner-svn-ports-head@FreeBSD.ORG Sun Jul 13 15:30:09 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D20A5378; Sun, 13 Jul 2014 15:30:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A609D2F40; Sun, 13 Jul 2014 15:30:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6DFU9Ku031314; Sun, 13 Jul 2014 15:30:09 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6DFU90A031311; Sun, 13 Jul 2014 15:30:09 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201407131530.s6DFU90A031311@svn.freebsd.org> From: Kurt Jaeger Date: Sun, 13 Jul 2014 15:30:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361688 - in head/www/fcgiwrap: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Jul 2014 15:30:09 -0000 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 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"