From owner-freebsd-ports-bugs@FreeBSD.ORG Fri May 30 23:20: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 96136CC0 for ; Fri, 30 May 2014 23: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 72B0E2A83 for ; Fri, 30 May 2014 23: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 s4UNK0P3075441 for ; Fri, 30 May 2014 23: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 s4UNK0t1075440; Fri, 30 May 2014 23:20:00 GMT (envelope-from gnats) Resent-Date: Fri, 30 May 2014 23:20:00 GMT Resent-Message-Id: <201405302320.s4UNK0t1075440@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 8FEE1B94 for ; Fri, 30 May 2014 23:12:27 +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 7D0662A51 for ; Fri, 30 May 2014 23:12:27 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4UNCRhq031653 for ; Fri, 30 May 2014 23:12:27 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4UNCRmc031650; Fri, 30 May 2014 23:12:27 GMT (envelope-from nobody) Message-Id: <201405302312.s4UNCRmc031650@cgiserv.freebsd.org> Date: Fri, 30 May 2014 23:12:27 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190435: [patch] Add staging support to www/sit 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, 30 May 2014 23:20:00 -0000 >Number: 190435 >Category: ports >Synopsis: [patch] Add staging support to www/sit >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 30 23: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/sit. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/sit/Makefile b/www/sit/Makefile index 6ed5bd2..7fa1593 100644 --- a/www/sit/Makefile +++ b/www/sit/Makefile @@ -25,7 +25,6 @@ OPTIONS_DEFAULT= IMAP MBSTRING IMAP_DESC= Email Support MBSTRING_DESC= Inbound email feature -NO_STAGE= yes .include .if ${PORT_OPTIONS:MIMAP} @@ -41,17 +40,11 @@ USE_PHP+= ldap .endif do-install: - ${MKDIR} ${WWWDIR} + ${MKDIR} ${STAGEDIR}${WWWDIR} cd ${WRKSRC}; ${FIND} . \ - | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - ${CHMOD} -R ${BINMODE} ${WWWDIR} - ${FIND} ${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} - + | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR} + ${CHMOD} -R ${BINMODE} ${STAGEDIR}${WWWDIR} + ${FIND} ${STAGEDIR}${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE} @${CAT} ${PKGMESSAGE} -post-install: - @if [ -f ${WWWDIR}/config.inc.php ]; then \ - ${CP} -p ${WWWDIR}/config.inc.php ${WWWDIR}/config.inc.php.bak ; \ - fi - .include diff --git a/www/sit/pkg-plist b/www/sit/pkg-plist index 78b45a7..139a55a 100644 --- a/www/sit/pkg-plist +++ b/www/sit/pkg-plist @@ -34,7 +34,9 @@ %%WWWDIR%%/calendar/week_planner.js.php %%WWWDIR%%/calendar/year.inc.php %%WWWDIR%%/chart.php +@unexec if cmp -s %D/%%WWWDIR%%/config.inc.php %D/%%WWWDIR%%/config.inc-dist.php; then rm -f %D/%%WWWDIR%%/config.inc.php; fi %%WWWDIR%%/config.inc-dist.php +@exec cp -n %D/%F %B/config.inc.php %%WWWDIR%%/config.php %%WWWDIR%%/contact_add.php %%WWWDIR%%/contact_delete.php >Release-Note: >Audit-Trail: >Unformatted: