- Fix installation path of webui configuration files

- Remove some obsolete files from pkg-list files
- Modify pkg-message file

PR:		253252
Reported by:	vrurg at lflat.org

6 files changed, 48 insertions, 34 deletions

diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index 254780bde7f8..ac7d1c3ef459 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=       bareos
 DISTVERSIONPREFIX=      Release/
 DISTVERSION=    20.0.0
+PORTREVISION=	1
 CATEGORIES?=    www sysutils
 PKGNAMESUFFIX= -webui
 
@@ -24,10 +25,11 @@ 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}
+		-Dwebuiconfdir=${PREFIX}/${ETCDIRWEBUI}
 
 SUB_FILES=	pkg-message
-PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
+SUB_LIST+=	ETCDIRWEBUI=${PREFIX}/${ETCDIRWEBUI}
+PLIST_SUB+=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} ETCDIRWEBUI=${ETCDIRWEBUI}
 
 OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	PGSQL
@@ -35,11 +37,17 @@ OPTIONS_DEFAULT=	PGSQL
 MYSQL_USE=		PHP=pdo_mysql
 PGSQL_USE=		PHP=pdo_pgsql
 
+ETCDIRWEBUI=		etc/${PORTNAME}${PKGNAMESUFFIX}
+
 post-extract:
 	${FIND} ${WRKSRC}/webui -name .gitignore -delete
 
+pre-install:
+	${FIND} ${WRKSRC}/webui -name *.in -delete
+
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}"
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
 	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
@@ -48,13 +56,13 @@ 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 ${STAGEDIR}${ETCDIR}/directors.ini
-	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${ETCDIR}/configuration.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/directors.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/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
+	${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/apache-bareos-webui.conf
+	${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}/nginx-bareos-webui.conf
 
 .include <bsd.port.mk>
diff --git a/www/bareos-webui/files/pkg-message.in b/www/bareos-webui/files/pkg-message.in
index 22b6f592e93f..ec5adb592717 100644
--- a/www/bareos-webui/files/pkg-message.in
+++ b/www/bareos-webui/files/pkg-message.in
@@ -3,13 +3,15 @@
   message: <<EOM
 bareos webui was installed
 
-Please note that everything has been installed in %%WWWDIR%%. You can
-look bareos-webui installation/configuration instructions at:
+Please note that everything has been installed in %%WWWDIR%% and 
+%%ETCDIRWEBUI%%. You can look bareos-webui installation/configuration 
+instructions at:
 
 https://docs.bareos.org/IntroductionAndTutorial/InstallingBareosWebui.html
 
-1) Configuration files (webserver and webui) are stored at %%ETCDIR%%
-2) This install some bareos-dir configuration samples at %%PREFIX%%/etc/bareos.
+1) Configuration files are stored at %%ETCDIRWEBUI%%
+2) Some webserver configuration samples are installed at %%ETCDIRWEBUI%%
+3) 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
diff --git a/www/bareos-webui/pkg-plist b/www/bareos-webui/pkg-plist
index 8400aeb488b6..b192c63930a6 100644
--- a/www/bareos-webui/pkg-plist
+++ b/www/bareos-webui/pkg-plist
@@ -1,18 +1,17 @@
 @owner %%WWWOWN%%
 @group %%WWWGRP%%
-%%ETCDIR%%/apache-bareos-webui.conf
+%%ETCDIRWEBUI%%/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
 @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
+@(,www,640) %%ETCDIRWEBUI%%/configuration.ini
+@(,www,640) %%ETCDIRWEBUI%%/directors.ini
+%%ETCDIRWEBUI%%/nginx-bareos-webui.conf
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config/application.config.php
 %%WWWDIR%%/config/autoload/README.md
 %%WWWDIR%%/config/autoload/global.php
-%%WWWDIR%%/config/autoload/global.php.in
 %%WWWDIR%%/init_autoloader.php
 %%WWWDIR%%/module/Application/Module.php
 %%WWWDIR%%/module/Application/autoload_classmap.php
@@ -64,9 +63,7 @@
 %%WWWDIR%%/module/Application/view/layout/install.phtml
 %%WWWDIR%%/module/Application/view/layout/json.phtml
 %%WWWDIR%%/module/Application/view/layout/layout.phtml
-%%WWWDIR%%/module/Application/view/layout/layout.phtml.in
 %%WWWDIR%%/module/Application/view/layout/login.phtml
-%%WWWDIR%%/module/Application/view/layout/login.phtml.in
 %%WWWDIR%%/module/Application/view/partial/breadcrumb.phtml
 %%WWWDIR%%/module/Application/view/partial/paginator.phtml
 %%WWWDIR%%/module/Auth/Module.php
diff --git a/www/bareos19-webui/Makefile b/www/bareos19-webui/Makefile
index 21cb50c2c5a7..1c30a51389ac 100644
--- a/www/bareos19-webui/Makefile
+++ b/www/bareos19-webui/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=       bareos
 DISTVERSIONPREFIX=      Release/
 DISTVERSION=    19.2.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES?=    www sysutils
 PKGNAMESUFFIX=	19-webui
 
@@ -25,11 +25,12 @@ 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//}
+			-Dwebuiconfdir=${PREFIX}/${ETCDIRWEBUI}
 
 SUB_FILES=		pkg-message
-PLIST_SUB+=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-ETCDIR=			${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX:S/19//}
+SUB_LIST+=		ETCDIRWEBUI=${PREFIX}/${ETCDIRWEBUI}
+PLIST_SUB+=		WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} ETCDIRWEBUI=${ETCDIRWEBUI}
+ETCDIRWEBUI=		etc/${PORTNAME}${PKGNAMESUFFIX:S/19//}
 
 OPTIONS_DEFINE=		MYSQL PGSQL
 OPTIONS_DEFAULT=	PGSQL
@@ -40,8 +41,12 @@ PGSQL_USE=		PHP=pdo_pgsql
 post-extract:
 	${FIND} ${WRKSRC}/webui -name .gitignore -delete
 
+pre-install:
+	${FIND} ${WRKSRC}/webui -name *.in -delete
+
 do-install:
 	@${ECHO} "Installing in ${WWWDIR}"
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${ETCDIRWEBUI}
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/console
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/bareos-dir.d/profile
 	@${MKDIR} ${STAGEDIR}${BAREOSWEB_HOME}
@@ -50,13 +55,13 @@ 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 ${STAGEDIR}${ETCDIR}/directors.ini
-	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}${ETCDIR}/configuration.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/directors.ini ${STAGEDIR}/${PREFIX}/${ETCDIRWEBUI}/directors.ini
+	${INSTALL_DATA} ${WRKSRC}/webui/install/configuration.ini ${STAGEDIR}/${PREFIX}/${ETCDIRWEBUI}/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
+	${INSTALL_DATA} ${WRKSRC}/webui/install/apache/bareos-webui.conf ${STAGEDIR}/${PREFIX}/${ETCDIRWEBUI}/apache-bareos-webui.conf
+	${INSTALL_DATA} ${WRKSRC}/webui/install/nginx/bareos-webui.conf ${STAGEDIR}/${PREFIX}/${ETCDIRWEBUI}/nginx-bareos-webui.conf
 
 .include <bsd.port.mk>
diff --git a/www/bareos19-webui/files/pkg-message.in b/www/bareos19-webui/files/pkg-message.in
index dc0918e0385b..ec5adb592717 100644
--- a/www/bareos19-webui/files/pkg-message.in
+++ b/www/bareos19-webui/files/pkg-message.in
@@ -3,14 +3,16 @@
   message: <<EOM
 bareos webui was installed
 
-Please note that everything has been installed in %%WWWDIR%%. You can
-look bareos-webui installation/configuration instructions at:
+Please note that everything has been installed in %%WWWDIR%% and 
+%%ETCDIRWEBUI%%. You can look bareos-webui installation/configuration 
+instructions at:
 
 https://docs.bareos.org/IntroductionAndTutorial/InstallingBareosWebui.html
 
-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
+1) Configuration files are stored at %%ETCDIRWEBUI%%
+2) Some webserver configuration samples are installed at %%ETCDIRWEBUI%%
+3) 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
 }
diff --git a/www/bareos19-webui/pkg-plist b/www/bareos19-webui/pkg-plist
index 7d7b517ed041..ce470f678fc0 100644
--- a/www/bareos19-webui/pkg-plist
+++ b/www/bareos19-webui/pkg-plist
@@ -1,13 +1,13 @@
 @owner %%WWWOWN%%
 @group %%WWWGRP%%
-%%ETCDIR%%/apache-bareos-webui.conf
+%%ETCDIRWEBUI%%/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
 @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
+@(,www,640) %%ETCDIRWEBUI%%/configuration.ini
+@(,www,640) %%ETCDIRWEBUI%%/directors.ini
+%%ETCDIRWEBUI%%/nginx-bareos-webui.conf
 %%WWWDIR%%/composer.json
 %%WWWDIR%%/config/application.config.php
 %%WWWDIR%%/config/autoload/README.md