From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 20 15: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 BFC2EEFF for ; Tue, 20 May 2014 15: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 9CF042037 for ; Tue, 20 May 2014 15: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 s4KFK0hS008493 for ; Tue, 20 May 2014 15: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 s4KFK0oV008492; Tue, 20 May 2014 15:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 20 May 2014 15:20:00 GMT Resent-Message-Id: <201405201520.s4KFK0oV008492@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 [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 C27E9BF6 for ; Tue, 20 May 2014 15:14:43 +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 965882FE6 for ; Tue, 20 May 2014 15:14:43 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s4KFEhVs069226 for ; Tue, 20 May 2014 15:14:43 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s4KFEhfN069224; Tue, 20 May 2014 15:14:43 GMT (envelope-from nobody) Message-Id: <201405201514.s4KFEhfN069224@cgiserv.freebsd.org> Date: Tue, 20 May 2014 15:14:43 GMT From: Joseph Benden To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/190012: [patch] Add staging support to www/bacula-web 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: Tue, 20 May 2014 15:20:00 -0000 >Number: 190012 >Category: ports >Synopsis: [patch] Add staging support to www/bacula-web >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: Tue May 20 15: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/bacula-web. >How-To-Repeat: >Fix: Patch attached with submission follows: diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile index 313922b..9a1f539 100644 --- a/www/bacula-web/Makefile +++ b/www/bacula-web/Makefile @@ -22,7 +22,6 @@ OPTIONS_DEFAULT= PGSQL SUB_FILES= pkg-message -NO_STAGE= yes .include .if ${PORT_OPTIONS:MPGSQL} @@ -39,17 +38,15 @@ USE_PHP+= mysql do-install: @${ECHO} "Installing in ${PREFIX}/www/bacula-web" - ${MKDIR} ${PREFIX}/www/bacula-web - ${CP} -R ${WRKSRC}/bacula-web/* ${PREFIX}/www/bacula-web - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${PREFIX}/www/bacula-web - if [ -f ${PREFIX}/www/bacula-web/configs/bacula.conf ]; then \ - ${CP} ${PREFIX}/www/bacula-web/configs/bacula.conf ${PREFIX}/etc/bacula-web.conf.sample; \ - ${RM} -rf ${PREFIX}/www/bacula-web/configs; \ - fi + ${MKDIR} ${STAGEDIR}${PREFIX}/www/bacula-web + ${CP} -R ${WRKSRC}/bacula-web/* ${STAGEDIR}${PREFIX}/www/bacula-web + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${PREFIX}/www/bacula-web + ${MV} ${STAGEDIR}${PREFIX}/www/bacula-web/configs/bacula.conf ${STAGEDIR}${PREFIX}/etc/bacula-web.conf.sample; \ + ${RM} -rf ${STAGEDIR}${PREFIX}/www/bacula-web/configs; \ if [ ! -f /var/bacula-web/templates_c ]; then \ - ${MKDIR} /var/bacula-web/templates_c; \ - ${CHOWN} -R ${WWWOWN}:${WWWGRP} /var/bacula-web/templates_c; \ + ${MKDIR} ${STAGEDIR}/var/bacula-web/templates_c; \ + ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}/var/bacula-web/templates_c; \ fi post-install: diff --git a/www/bacula-web/pkg-plist b/www/bacula-web/pkg-plist index 344a7b4..f644be3 100644 --- a/www/bacula-web/pkg-plist +++ b/www/bacula-web/pkg-plist @@ -1,4 +1,6 @@ +@unexec if cmp -s %D/etc/bacula.conf %D/etc/bacula-web.conf.sample; then rm -f %D/etc/bacula.conf; fi etc/bacula-web.conf.sample +@exec cp -n %D/%F %B/bacula.conf www/bacula-web/CONTACT www/bacula-web/COPYING www/bacula-web/ChangeLog @@ -221,3 +223,5 @@ www/bacula-web/tsmarty2c.php @dirrm www/bacula-web/external_packages/phplot @dirrm www/bacula-web/external_packages @dirrm www/bacula-web +@unexec rmdir "/var/bacula-web/templates_c" >/dev/null 2>&1 || : +@unexec rmdir "/var/bacula-web" >/dev/null 2>&1 || : >Release-Note: >Audit-Trail: >Unformatted: