Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Dec 2020 17:40:58 +0000 (UTC)
From:      Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559386 - in head/www/bareos19-webui: . files
Message-ID:  <202012271740.0BRHew6x022846@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: acm
Date: Sun Dec 27 17:40:57 2020
New Revision: 559386
URL: https://svnweb.freebsd.org/changeset/ports/559386

Log:
  - Copy bareos-* to bareos19-* preparing for update bareos to 20.0.0
  - Clean port [1]
  
  PR:		250440
  Submitted by:	brad  at  facefault.org [1]

Added:
  head/www/bareos19-webui/
     - copied from r559378, head/www/bareos-webui/
Modified:
  head/www/bareos19-webui/Makefile
  head/www/bareos19-webui/files/pkg-message.in
  head/www/bareos19-webui/pkg-plist

Modified: head/www/bareos19-webui/Makefile
==============================================================================
--- head/www/bareos-webui/Makefile	Sun Dec 27 17:29:33 2020	(r559378)
+++ head/www/bareos19-webui/Makefile	Sun Dec 27 17:40:57 2020	(r559386)
@@ -3,8 +3,9 @@
 PORTNAME=       bareos
 DISTVERSIONPREFIX=      Release/
 DISTVERSION=    19.2.9
+PORTREVISION=	1
 CATEGORIES?=    www sysutils
-PKGNAMESUFFIX= -webui
+PKGNAMESUFFIX=	19-webui
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	PHP-Frontend to manage Bareos over the web
@@ -14,37 +15,31 @@ LICENSE_FILE=	${WRKSRC}/webui/LICENSE
 
 USE_GITHUB=	yes
 
-USES=		php
-USE_PHP=	openssl gettext ctype hash json session iconv
+USES=		cmake gettext php:build
+USE_PHP=	ctype gettext hash iconv json openssl session
 NO_BUILD=	yes
 NO_ARCH=	yes
 
-SUB_FILES=	pkg-message
-PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-SUB_LIST=	BAREOSWEBUIDIR=${WWWDIR}
+CMAKE_SOURCE_PATH=	${WRKSRC}/webui
+CMAKE_INSTALL_PREFIX=	${STAGEDIR}
+CMAKE_ARGS+=		-DSHARE_INSTALL_PREFIX:PATH=${PREFIX}/www \
+			-DCMAKE_INSTALL_FULL_SYSCONFDIR:PATH=${PREFIX}/etc \
+			-Dsysconfdir=${PREFIX}/etc \
+			-Dwebuiconfdir=${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX:S/19//}
 
-OPTIONS_DEFINE=		MYSQL PGSQL ZENDFRAMEWORK
+SUB_FILES=		pkg-message
+PLIST_SUB+=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+ETCDIR=			${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX:S/19//}
+
+OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	PGSQL
-ZENDFRAMEWORK_DESC=	Install zend framework
 
 MYSQL_USE=		PHP=pdo_mysql
 PGSQL_USE=		PHP=pdo_pgsql
-ZENDFRAMEWORK_RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
 
 post-extract:
-	${RM} ${WRKSRC}/webui/config/autoload/.gitignore
-	${RM} ${WRKSRC}/webui/data/cache/.gitignore
-	${RM} ${WRKSRC}/webui/vendor/.gitignore
-	${MV} ${WRKSRC}/webui/version.php.in ${WRKSRC}/webui/version.php
-	${MV} ${WRKSRC}/webui/config/autoload/global.php.in ${WRKSRC}/webui/config/autoload/global.php
-	${MV} ${WRKSRC}/webui/module/Application/view/layout/layout.phtml.in ${WRKSRC}/webui/module/Application/view/layout/layout.phtml
-	${MV} ${WRKSRC}/webui/module/Application/view/layout/login.phtml.in ${WRKSRC}/webui/module/Application/view/layout/login.phtml
+	${FIND} ${WRKSRC}/webui -name .gitignore -delete
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' -e 's|@WEBUICONFDIR@|${ETCDIR}|g' -e \
-		's|@dirport@|9101|g' ${WRKSRC}/webui/config/autoload/global.php
-	@${REINPLACE_CMD} -e 's|@BAREOS_FULL_VERSION@|${PORTVERSION}|g' ${WRKSRC}/webui/version.php
-
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}"
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
@@ -55,10 +50,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/webui/*.php ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/composer* ${STAGEDIR}${WWWDIR}
 	${INSTALL_DATA} ${WRKSRC}/webui/phpunit.xml ${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini.in ${STAGEDIR}${ETCDIR}/directors.ini
-	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini.in ${STAGEDIR}${ETCDIR}/configuration.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini ${STAGEDIR}${ETCDIR}/directors.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${ETCDIR}/configuration.ini
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
+        ${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-limited.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-limited.conf.sample
+        ${INSTALL_DATA} ${WRKSRC}/webui/install/bareos/bareos-dir.d/profile/webui-readonly.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-readonly.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}${ETCDIR}/apache-bareos-webui.conf
 	${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}${ETCDIR}/nginx-bareos-webui.conf
 

Modified: head/www/bareos19-webui/files/pkg-message.in
==============================================================================
--- head/www/bareos-webui/files/pkg-message.in	Sun Dec 27 17:29:33 2020	(r559378)
+++ head/www/bareos19-webui/files/pkg-message.in	Sun Dec 27 17:40:57 2020	(r559386)
@@ -3,13 +3,15 @@
   message: <<EOM
 bareos webui was installed
 
-Please note that everything has been installed in %%BAREOSWEBUIDIR%%. You can
+Please note that everything has been installed in %%WWWDIR%%. You can
 look bareos-webui installation/configuration instructions at:
 
-https://github.com/bareos/bareos-webui/blob/master/doc/INSTALL.md
+https://docs.bareos.org/IntroductionAndTutorial/InstallingBareosWebui.html
 
-1) Configuration files are stored at %%ETCDIR%%
-2) Bacula-webgui needs www/zend-framework port with PGSQL or MYSQL support.
+1) Configuration files (webserver and webui) are stored at %%ETCDIR%%
+2) This install some bareos-dir configuration samples at %%PREFIX%%/etc/bareos.
+   Don't forget change permissions to user/group used by bareos-dir on server
+   where it is installed
 EOM
 }
 ]

Modified: head/www/bareos19-webui/pkg-plist
==============================================================================
--- head/www/bareos-webui/pkg-plist	Sun Dec 27 17:29:33 2020	(r559378)
+++ head/www/bareos19-webui/pkg-plist	Sun Dec 27 17:40:57 2020	(r559386)
@@ -3,8 +3,10 @@
 %%ETCDIR%%/apache-bareos-webui.conf
 @sample(,www,640) %%ETCDIR%%/bareos-dir.d/console/admin.conf.sample
 @sample(,www,640) %%ETCDIR%%/bareos-dir.d/profile/webui-admin.conf.sample
-%%ETCDIR%%/configuration.ini
-%%ETCDIR%%/directors.ini
+@sample(,www,640) %%ETCDIR%%/bareos-dir.d/profile/webui-limited.conf.sample
+@sample(,www,640) %%ETCDIR%%/bareos-dir.d/profile/webui-readonly.conf.sample
+@(,www,640) %%ETCDIR%%/configuration.ini
+@(,www,640) %%ETCDIR%%/directors.ini
 %%ETCDIR%%/nginx-bareos-webui.conf
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config/application.config.php



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012271740.0BRHew6x022846>