From owner-svn-ports-all@FreeBSD.ORG  Sat Jun 28 04:44:36 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 5A0E1808;
 Sat, 28 Jun 2014 04:44:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (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 2D63421FF;
 Sat, 28 Jun 2014 04:44:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5S4iaQX022720;
 Sat, 28 Jun 2014 04:44:36 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5S4iZGh022718;
 Sat, 28 Jun 2014 04:44:35 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201406280444.s5S4iZGh022718@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 28 Jun 2014 04:44:35 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r359653 - head/www/bacula-web
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Jun 2014 04:44:36 -0000

Author: miwi
Date: Sat Jun 28 04:44:35 2014
New Revision: 359653
URL: http://svnweb.freebsd.org/changeset/ports/359653
QAT: https://qat.redports.org/buildarchive/r359653/

Log:
  - Stage support
  
  PR:		190012

Modified:
  head/www/bacula-web/Makefile
  head/www/bacula-web/pkg-plist

Modified: head/www/bacula-web/Makefile
==============================================================================
--- head/www/bacula-web/Makefile	Sat Jun 28 04:43:59 2014	(r359652)
+++ head/www/bacula-web/Makefile	Sat Jun 28 04:44:35 2014	(r359653)
@@ -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:

Modified: head/www/bacula-web/pkg-plist
==============================================================================
--- head/www/bacula-web/pkg-plist	Sat Jun 28 04:43:59 2014	(r359652)
+++ head/www/bacula-web/pkg-plist	Sat Jun 28 04:44:35 2014	(r359653)
@@ -1,4 +1,4 @@
-etc/bacula-web.conf.sample
+@sample etc/bacula-web.conf.sample
 www/bacula-web/CONTACT
 www/bacula-web/COPYING
 www/bacula-web/ChangeLog
@@ -221,3 +221,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 || :