- Update to 18.2.6

3 files changed, 40 insertions, 33 deletions

diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index 2a051a49b1e8..fcb200b6ae8b 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
-PORTNAME=	bareos-webui
-PORTVERSION=	17.2.5
-PORTREVISION=	1
-DISTVERSIONPREFIX=	Release/
-CATEGORIES=	www sysutils
+PORTNAME=       bareos
+DISTVERSIONPREFIX=      Release/
+DISTVERSION=    18.2.6
+CATEGORIES?=    www sysutils
+PKGNAMESUFFIX= -webui
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	PHP-Frontend to manage Bareos over the web
 
 LICENSE=	AGPLv3+
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/webui/LICENSE
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	bareos
-GH_PROJECT=	bareos-webui
 
 USES=		php
 USE_PHP=	openssl gettext ctype hash json session iconv
@@ -34,28 +32,33 @@ PGSQL_USE=		PHP=pdo_pgsql
 ZENDFRAMEWORK_RUN_DEPENDS=	${LOCALBASE}/share/ZendFramework/bin/classmap_generator.php:www/zend-framework
 
 post-extract:
-	${RM} ${WRKSRC}/config/autoload/.gitignore
-	${RM} ${WRKSRC}/data/cache/.gitignore
-	${RM} ${WRKSRC}/vendor/.gitignore
+	${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
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|g' ${WRKSRC}/config/autoload/global.php
+	@${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/etc/|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
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
 	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} "config data module public vendor" \
+	cd ${WRKSRC}/webui && ${COPYTREE_SHARE} "config data module public vendor" \
 		${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.php ${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/composer* ${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/phpunit.xml ${STAGEDIR}${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/install/directors.ini ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/install/configuration.ini ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/install/bareos/bareos-dir.d/console/admin.conf.example ${STAGEDIR}${ETCDIR}/bareos-dir.d/console/admin.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/install/bareos/bareos-dir.d/profile/webui-admin.conf ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile/webui-admin.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/install/apache/bareos-webui.conf ${STAGEDIR}${ETCDIR}/apache-bareos-webui.conf
-	${INSTALL_DATA} ${WRKSRC}/install/nginx/bareos-webui.conf ${STAGEDIR}${ETCDIR}/nginx-bareos-webui.conf
+	${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/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/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
 
 .include <bsd.port.mk>
diff --git a/www/bareos-webui/distinfo b/www/bareos-webui/distinfo
index ff91fe963f7e..afc8f3bd407c 100644
--- a/www/bareos-webui/distinfo
+++ b/www/bareos-webui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526592137
-SHA256 (bareos-bareos-webui-Release-17.2.5_GH0.tar.gz) = 3ebac295c2cc5b4b0c33c5fe7737c0d5b43c76709687f615db16ca900053265d
-SIZE (bareos-bareos-webui-Release-17.2.5_GH0.tar.gz) = 2592123
+TIMESTAMP = 1557382995
+SHA256 (bareos-bareos-Release-18.2.6_GH0.tar.gz) = 43ff0546d4d5486bc70db90ccb7fb1f6a3ac3f9b7293de010d2c300b548056d8
+SIZE (bareos-bareos-Release-18.2.6_GH0.tar.gz) = 9991951
diff --git a/www/bareos-webui/pkg-plist b/www/bareos-webui/pkg-plist
index 595b935ebce2..00d7d35b648e 100644
--- a/www/bareos-webui/pkg-plist
+++ b/www/bareos-webui/pkg-plist
@@ -1,11 +1,11 @@
 @owner %%WWWOWN%%
 @group %%WWWGRP%%
 %%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
 %%ETCDIR%%/nginx-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
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config/application.config.php
 %%WWWDIR%%/config/autoload/README.md
@@ -15,8 +15,6 @@
 %%WWWDIR%%/module/Application/Module.php
 %%WWWDIR%%/module/Application/autoload_classmap.php
 %%WWWDIR%%/module/Application/config/module.config.php
-%%WWWDIR%%/module/Application/language/Makefile.am
-%%WWWDIR%%/module/Application/language/Makefile.in
 %%WWWDIR%%/module/Application/language/cn_CN.mo
 %%WWWDIR%%/module/Application/language/cn_CN.po
 %%WWWDIR%%/module/Application/language/cs_CZ.mo
@@ -29,10 +27,14 @@
 %%WWWDIR%%/module/Application/language/es_ES.po
 %%WWWDIR%%/module/Application/language/fr_FR.mo
 %%WWWDIR%%/module/Application/language/fr_FR.po
+%%WWWDIR%%/module/Application/language/hu_HU.mo
+%%WWWDIR%%/module/Application/language/hu_HU.po
 %%WWWDIR%%/module/Application/language/it_IT.mo
 %%WWWDIR%%/module/Application/language/it_IT.po
 %%WWWDIR%%/module/Application/language/nl_BE.mo
 %%WWWDIR%%/module/Application/language/nl_BE.po
+%%WWWDIR%%/module/Application/language/pt_BR.mo
+%%WWWDIR%%/module/Application/language/pt_BR.po
 %%WWWDIR%%/module/Application/language/ru_RU.mo
 %%WWWDIR%%/module/Application/language/ru_RU.po
 %%WWWDIR%%/module/Application/language/sk_SK.mo
@@ -238,8 +240,6 @@
 %%WWWDIR%%/public/js/jstree.js
 %%WWWDIR%%/public/js/jstree.min.js
 %%WWWDIR%%/public/js/jstreegrid.js
-%%WWWDIR%%/public/js/locale/Makefile.am
-%%WWWDIR%%/public/js/locale/Makefile.in
 %%WWWDIR%%/public/js/locale/cn_CN/LC_MESSAGES/cn_CN.mo
 %%WWWDIR%%/public/js/locale/cn_CN/LC_MESSAGES/cn_CN.po
 %%WWWDIR%%/public/js/locale/cs_CZ/LC_MESSAGES/cs_CZ.mo
@@ -252,17 +252,20 @@
 %%WWWDIR%%/public/js/locale/es_ES/LC_MESSAGES/es_ES.po
 %%WWWDIR%%/public/js/locale/fr_FR/LC_MESSAGES/fr_FR.mo
 %%WWWDIR%%/public/js/locale/fr_FR/LC_MESSAGES/fr_FR.po
+%%WWWDIR%%/public/js/locale/hu_HU/LC_MESSAGES/hu_HU.mo
+%%WWWDIR%%/public/js/locale/hu_HU/LC_MESSAGES/hu_HU.po
 %%WWWDIR%%/public/js/locale/it_IT/LC_MESSAGES/it_IT.mo
 %%WWWDIR%%/public/js/locale/it_IT/LC_MESSAGES/it_IT.po
 %%WWWDIR%%/public/js/locale/nl_BE/LC_MESSAGES/nl_BE.mo
 %%WWWDIR%%/public/js/locale/nl_BE/LC_MESSAGES/nl_BE.po
+%%WWWDIR%%/public/js/locale/pt_BR/LC_MESSAGES/pt_BR.mo
+%%WWWDIR%%/public/js/locale/pt_BR/LC_MESSAGES/pt_BR.po
 %%WWWDIR%%/public/js/locale/ru_RU/LC_MESSAGES/ru_RU.mo
 %%WWWDIR%%/public/js/locale/ru_RU/LC_MESSAGES/ru_RU.po
 %%WWWDIR%%/public/js/locale/sk_SK/LC_MESSAGES/sk_SK.mo
 %%WWWDIR%%/public/js/locale/sk_SK/LC_MESSAGES/sk_SK.po
 %%WWWDIR%%/public/js/locale/tr_TR/LC_MESSAGES/tr_TR.mo
 %%WWWDIR%%/public/js/locale/tr_TR/LC_MESSAGES/tr_TR.po
-%%WWWDIR%%/public/js/locale/webui-datatables.pot
 %%WWWDIR%%/public/js/moment-timezone-with-data.js
 %%WWWDIR%%/public/js/moment-timezone-with-data.min.js
 %%WWWDIR%%/public/js/moment-with-locales.js
@@ -1947,6 +1950,7 @@
 %%WWWDIR%%/vendor/zendframework/zend-view/src/Variables.php
 %%WWWDIR%%/vendor/zendframework/zend-view/src/View.php
 %%WWWDIR%%/vendor/zendframework/zend-view/src/ViewEvent.php
+%%WWWDIR%%/version.php
+@dir %%WWWDIR%%/data/cache
 @owner
 @group
-@dir %%WWWDIR%%/data/cache