From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 22 17:40:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 D111F301 for ; Thu, 22 May 2014 17:40:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 ADCF8290F for ; Thu, 22 May 2014 17:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MHe0i3083024 for ; Thu, 22 May 2014 17:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4MHe0VE083022; Thu, 22 May 2014 17:40:00 GMT (envelope-from gnats) Resent-Date: Thu, 22 May 2014 17:40:00 GMT Resent-Message-Id: <201405221740.s4MHe0VE083022@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Joseph Benden Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36C6C2A4 for ; Thu, 22 May 2014 17:36:14 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B7B728E1 for ; Thu, 22 May 2014 17:36:14 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4MHaDTe056928 for ; Thu, 22 May 2014 17:36:13 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4MHaDCA056925; Thu, 22 May 2014 17:36:13 GMT (envelope-from nobody) Message-Id: <201405221736.s4MHaDCA056925@cgiserv.freebsd.org> Date: Thu, 22 May 2014 17:36:13 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190118: [patch] Add staging support to www/grails X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 May 2014 17:40:01 -0000 >Number: 190118 >Category: ports >Synopsis: [patch] Add staging support to www/grails >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 22 17:40:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Joseph Benden >Release: FreeBSD 11 >Organization: >Environment: FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014 root@lucy:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Adds staging support to www/grails. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/grails/Makefile b/www/grails/Makefile index 59c450f..41ea3a8 100644 --- a/www/grails/Makefile +++ b/www/grails/Makefile @@ -29,27 +29,26 @@ PLIST_FILES= ${SCRIPTFILES:S,^,bin/,} \ PLIST_DIRS= ${DATADIR:S,${PREFIX}/,,}/bin SUB_FILES= edit-startGrails.sed pkg-message -NO_STAGE= yes do-install: @${ECHO_MSG} -n ">> Installing data files in ${DATADIR}..." @cd ${WRKSRC} \ - && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${DATADIR}/{} \; \ - && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${DATADIR}/{} \; + && ${FIND} ${DATAFILES} -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \; \ + && ${FIND} ${DATAFILES} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \; @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Installing and symlinking executables..." - @${MKDIR} ${DATADIR}/bin + @${MKDIR} ${STAGEDIR}${DATADIR}/bin @${REINPLACE_CMD} -f ${WRKDIR}/edit-startGrails.sed ${WRKSRC}/bin/startGrails .for file in ${SCRIPTFILES} @${ECHO_MSG} -n " ${file}" - @${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${DATADIR}/bin/${file} - @${LN} -fs ${DATADIR}/bin/${file} ${PREFIX}/bin/${file} + @${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${STAGEDIR}${DATADIR}/bin/${file} + @${LN} -fs ${DATADIR}/bin/${file} ${STAGEDIR}${PREFIX}/bin/${file} .endfor @${ECHO_MSG} " [ DONE ]" .if !defined(NOPORTDOCS) @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..." @cd ${WRKSRC}/doc \ - && ${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \; \ - && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${DOCSDIR}/{} \; + && ${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \ + && ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \; @${ECHO_MSG} " [ DONE ]" .endif >Release-Note: >Audit-Trail: >Unformatted: