Date: Tue, 20 May 2014 15:14:43 GMT From: Joseph Benden <joe@thrallingpenguin.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/190012: [patch] Add staging support to www/bacula-web Message-ID: <201405201514.s4KFEhfN069224@cgiserv.freebsd.org> Resent-Message-ID: <201405201520.s4KFK0oV008492@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.options.mk>
.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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405201514.s4KFEhfN069224>