From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 23 03:20:00 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 A420D5F4 for ; Fri, 23 May 2014 03:20: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 81EF32921 for ; Fri, 23 May 2014 03:20: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 s4N3K025011961 for ; Fri, 23 May 2014 03:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4N3K0aV011960; Fri, 23 May 2014 03:20:00 GMT (envelope-from gnats) Resent-Date: Fri, 23 May 2014 03:20:00 GMT Resent-Message-Id: <201405230320.s4N3K0aV011960@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 CE1C951A for ; Fri, 23 May 2014 03:12:06 +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 BC57D28DE for ; Fri, 23 May 2014 03:12:06 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4N3C6U3092467 for ; Fri, 23 May 2014 03:12:06 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4N3C6j8092459; Fri, 23 May 2014 03:12:06 GMT (envelope-from nobody) Message-Id: <201405230312.s4N3C6j8092459@cgiserv.freebsd.org> Date: Fri, 23 May 2014 03:12:06 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190130: [patch] Add staging support to www/habari 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: Fri, 23 May 2014 03:20:00 -0000 >Number: 190130 >Category: ports >Synopsis: [patch] Add staging support to www/habari >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: Fri May 23 03:20: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/habari. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/habari/Makefile b/www/habari/Makefile index 1fe0c48..a32ef4e 100644 --- a/www/habari/Makefile +++ b/www/habari/Makefile @@ -20,7 +20,6 @@ OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= MYSQL OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include .if ${PORT_OPTIONS:MMYSQL} @@ -41,17 +40,17 @@ post-patch: .endfor do-install: - @${MKDIR} ${WWWDIR} - ${INSTALL_DATA} ${WRKSRC}/index.php ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} + @${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR} .for f in system user - @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${WWWDIR}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${WWWDIR}) .endfor .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in LICENSE NOTICE README.md doc/MIT.txt - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor - @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} manual ${DOCSDIR}) + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} manual ${STAGEDIR}${DOCSDIR}) .endif .include >Release-Note: >Audit-Trail: >Unformatted: