Attachment 142909 Details for Bug 190012 – file.diff

[patch] file.diff

file.diff (text/plain), 2.09 KB, created by joe on 2014-05-20 16:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-05-20 16:20:00 UTC

Size: 2.09 KB

patch

obsolete

>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 || :

Actions: View | Diff

Attachments on bug 190012: 142909 | 144168