From owner-svn-ports-head@FreeBSD.ORG Sat Aug 9 13:54:08 2014 Return-Path: Delivered-To: svn-ports-head@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 81818DAF for ; Sat, 9 Aug 2014 13:54:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5642A2CFC for ; Sat, 9 Aug 2014 13:54:08 +0000 (UTC) Received: from marino (uid 1323) (envelope-from marino@FreeBSD.org) id 28a8 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Sat, 09 Aug 2014 13:54:08 +0000 From: John Marino Date: Sat, 9 Aug 2014 13:54:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364443 - in head/www/bacula-web: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e62800.28a8.6181a5aa@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Aug 2014 13:54:08 -0000 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%%/.