From owner-cvs-all@FreeBSD.ORG Sun Mar 28 19:25:24 2010 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A5F25106566C for ; Sun, 28 Mar 2010 19:25:24 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with ESMTP id 491D88FC17 for ; Sun, 28 Mar 2010 19:25:23 +0000 (UTC) Received: (qmail 9234 invoked by uid 399); 28 Mar 2010 19:25:23 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 28 Mar 2010 19:25:23 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4BAFAD22.1040500@FreeBSD.org> Date: Sun, 28 Mar 2010 12:25:22 -0700 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.1.7) Gecko/20100218 Thunderbird/3.0.1 MIME-Version: 1.0 To: "Philip M. Gollucci" References: <201003280444.o2S4itYu051220@repoman.freebsd.org> <4BAEE654.4070104@p6m7g8.com> <4BAEF684.7010900@FreeBSD.org> <4BAF818B.9060708@p6m7g8.com> In-Reply-To: <4BAF818B.9060708@p6m7g8.com> X-Enigmail-Version: 1.0.1 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/www/apache13-modssl Makefile ports/www/apache13-modssl/files apache.in ports/www/apache20 Makefile ports/www/apache20/files apache2.sh.in ports/www/nginx Makefile ports/www/nginx/files nginx.sh.in ports/www/nginx-devel Makefile ... X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 19:25:24 -0000 On 03/28/10 09:19, Philip M. Gollucci wrote: > I'm tempted to say we make the USE_RC_* more smart or get people to copy > it into files/ at updates but eidontcareeitherway You can't ask people to do the latter because ports/ may be read only. However, here is a start at a patch to make SUB_FILES smarter about this: --- /home/dougb/ports/Mk/bsd.port.mk 2010-03-28 11:34:48.000000000 -0700 +++ /usr/ports/Mk/bsd.port.mk 2010-03-28 12:20:14.000000000 -0700 @@ -5715,10 +5715,15 @@ apply-slist: .if defined(SUB_FILES) .for file in ${SUB_FILES} -.if !exists(${FILESDIR}/${file}.in) +.if exists(${FILESDIR}/${file}.in) +subfile=${FILESDIR}/${file}.in +.elif exists(${file}.in) +subfile=${file}.in +.endif +.if !exists(${subfile}) @${ECHO_MSG} "** Missing ${FILESDIR}/${file}.in for ${PKGNAME}."; exit 1 .else - @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${FILESDIR}/${file}.in > ${WRKDIR}/${file} + @${SED} ${_SUB_LIST_TEMP} -e '/^@comment /d' ${subfile} > ${WRKDIR}/${file:T} .endif .endfor .for i in pkg-message pkg-install pkg-deinstall pkg-req With that patch I get the dreaded "unassociated shell command" error, and I have no idea why, and I have no more time to fool with it. If someone smarter about makefiles than I am wanted to take that up, it would allow people to specify a full path to the file like this: USE_RC_SUBR= ${WRKSRC}/foo/bar/scriptname Doug -- ... and that's just a little bit of history repeating. -- Propellerheads Improve the effectiveness of your Internet presence with a domain name makeover! http://SupersetSolutions.com/