From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 19 16:20:03 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org 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 420C8926 for ; Mon, 19 May 2014 16:20:03 +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 1F45A2B4D for ; Mon, 19 May 2014 16:20:03 +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 s4JGK2S9069837 for ; Mon, 19 May 2014 16:20:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4JGK259069836; Mon, 19 May 2014 16:20:02 GMT (envelope-from gnats) Resent-Date: Mon, 19 May 2014 16:20:02 GMT Resent-Message-Id: <201405191620.s4JGK259069836@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 DF9F87FC for ; Mon, 19 May 2014 16:16:26 +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 B34672B26 for ; Mon, 19 May 2014 16:16:26 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JGGQIC099207 for ; Mon, 19 May 2014 16:16:26 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4JGGQHn099204; Mon, 19 May 2014 16:16:26 GMT (envelope-from nobody) Message-Id: <201405191616.s4JGGQHn099204@cgiserv.freebsd.org> Date: Mon, 19 May 2014 16:16:26 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/189957: [patch] Add staging support to www/yahoo-ui 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: Mon, 19 May 2014 16:20:03 -0000 >Number: 189957 >Category: ports >Synopsis: [patch] Add staging support to www/yahoo-ui >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: Mon May 19 16:20:02 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/yahoo-ui. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/yahoo-ui/Makefile b/www/yahoo-ui/Makefile index e44ba5a..677e7b9 100644 --- a/www/yahoo-ui/Makefile +++ b/www/yahoo-ui/Makefile @@ -24,7 +24,6 @@ NO_BUILD= yes OPTIONS_DEFINE= APACHE DOCS EXAMPLES -NO_STAGE= yes .include .if ${PORT_OPTIONS:MAPACHE} @@ -65,22 +64,22 @@ post-patch: .SILENT do-install: @cd ${WRKSRC} && ${COPYTREE_SHARE} "assets build index.html \ - tests" ${WWWDIR} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} + tests" ${STAGEDIR}${WWWDIR} + @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} @${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} \ ${WWWDIR:S|^${PREFIX}/|%D/|}' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 + @${FIND} ${STAGEDIR}${WWWDIR} -type f -print0 | ${XARGS} -0 ${CHMOD} 644 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type f -print0 | \ ${XARGS} -0 ${CHMOD} 644' >> ${TMPPLIST} - @${FIND} ${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${STAGEDIR}${WWWDIR} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_CMD} '@exec ${FIND} ${WWWDIR} -type d -print0 | \ ${XARGS} -0 ${CHMOD} 755' >> ${TMPPLIST} post-install: .if ${PORT_OPTIONS:MAPACHE} .if !defined(MAINTAINER_MODE) - @if [ -d "${CONFDIR}" ]; then \ - ${CP} ${WRKDIR}/${CONF} ${CONFDIR}; \ + @if [ -d "${STAGEDIR}${CONFDIR}" ]; then \ + ${CP} ${WRKDIR}/${CONF} ${STAGEDIR}${CONFDIR}; \ else \ ${ECHO_MSG} "" ; \ ${ECHO_MSG} "Please check your Apache 2.x installation -" ; \ @@ -93,10 +92,10 @@ post-install: @${CAT} ${PKGMESSAGE} .endif .if ${PORT_OPTIONS:MDOCS} - @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${DOCSDIR} + @cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .endif .if ${PORT_OPTIONS:MNLS} - @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR} + @cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} .endif .include >Release-Note: >Audit-Trail: >Unformatted: