svn commit: r364443 - in head/www/bacula-web: . files

[John Marino]

Author: marino
Date: Sat Aug  9 13:54:07 2014
New Revision: 364443
URL: http://svnweb.freebsd.org/changeset/ports/364443
QAT: https://qat.redports.org/buildarchive/r364443/

Log:
  www/bacula-web: Fix pkg-message for non-default location installations
  
  I noticed in the commit diff that the pkg-message did not account for
  non-default values of BACULAWEB_HOME, but rather assumed the equivalent
  of %%WWWDIR%% (and didn't even use that!).  Add a new substition so that
  the pkg-message message is correct for non-default locations.
  
  PR:		191583

Modified:
  head/www/bacula-web/Makefile
  head/www/bacula-web/files/pkg-message.in

Modified: head/www/bacula-web/Makefile
==============================================================================
--- head/www/bacula-web/Makefile	Sat Aug  9 13:50:09 2014	(r364442)
+++ head/www/bacula-web/Makefile	Sat Aug  9 13:54:07 2014	(r364443)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bacula-web
 DISTVERSION=	6.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils www
 MASTER_SITES=	http://www.bacula-web.org/files/bacula-web.org/downloads/
 
@@ -21,6 +22,7 @@ BACULAWEB_HOME?=${WWWDIR}
 BASE=		${BACULAWEB_HOME:S|${PREFIX}/||}
 SUB_FILES=	pkg-message
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} BASE=${BASE}
+SUB_LIST=	BASE=${BASE}
 
 OPTIONS_DEFINE=		MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	PGSQL

Modified: head/www/bacula-web/files/pkg-message.in
==============================================================================
--- head/www/bacula-web/files/pkg-message.in	Sat Aug  9 13:50:09 2014	(r364442)
+++ head/www/bacula-web/files/pkg-message.in	Sat Aug  9 13:54:07 2014	(r364443)
@@ -3,18 +3,18 @@
 *                         POST INSTALL CONFIGURATION                  *
 ***********************************************************************
 
-Please note that everything has been installed in %%PREFIX%%/www/bacula-web.
+Please note that everything has been installed in %%BASE%%.
 
-You need to copy %%PREFIX%%/www/bacula-web/application/config/config.php.sample to 
-%%PREFIX%%/www/bacula-web/application/config/config.php and modify with your preferences.
+You need to copy %%BASE%%/application/config/config.php.sample to 
+%%BASE%%/application/config/config.php and modify with your preferences.
 
 You will probably want to add an alias to your httpd.conf file, something
 like this:
 
-	Alias /bacula-web "%%PREFIX%%/www/bacula-web/"
+	Alias /bacula-web "%%BASE%%/"
 
 And restart Apache.
 
 Alternatively, you can create a host dedicated to bacula-web and use
-a DocumentRoot of %%PREFIX%%/www/bacula-web.
+a DocumentRoot of %%BASE%%/.