From owner-svn-ports-all@freebsd.org Fri Feb 19 18:56:24 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AFF96537578; Fri, 19 Feb 2021 18:56:24 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dj1544ZY4z4rtR; Fri, 19 Feb 2021 18:56:24 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9004610F51; Fri, 19 Feb 2021 18:56:24 +0000 (UTC) (envelope-from acm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11JIuOOq021401; Fri, 19 Feb 2021 18:56:24 GMT (envelope-from acm@FreeBSD.org) Received: (from acm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11JIuNQF021395; Fri, 19 Feb 2021 18:56:23 GMT (envelope-from acm@FreeBSD.org) Message-Id: <202102191856.11JIuNQF021395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: acm set sender to acm@FreeBSD.org using -f From: Jose Alonso Cardenas Marquez Date: Fri, 19 Feb 2021 18:56:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r566092 - in head/www: bareos-webui bareos-webui/files bareos19-webui bareos19-webui/files X-SVN-Group: ports-head X-SVN-Commit-Author: acm X-SVN-Commit-Paths: in head/www: bareos-webui bareos-webui/files bareos19-webui bareos19-webui/files X-SVN-Commit-Revision: 566092 X-SVN-Commit-Repository: ports 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.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Feb 2021 18:56:24 -0000 Author: acm Date: Fri Feb 19 18:56:22 2021 New Revision: 566092 URL: https://svnweb.freebsd.org/changeset/ports/566092 Log: - 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 Modified: head/www/bareos-webui/Makefile head/www/bareos-webui/files/pkg-message.in head/www/bareos-webui/pkg-plist head/www/bareos19-webui/Makefile head/www/bareos19-webui/files/pkg-message.in head/www/bareos19-webui/pkg-plist Modified: head/www/bareos-webui/Makefile ============================================================================== --- head/www/bareos-webui/Makefile Fri Feb 19 18:24:40 2021 (r566091) +++ head/www/bareos-webui/Makefile Fri Feb 19 18:56:22 2021 (r566092) @@ -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 Modified: head/www/bareos-webui/files/pkg-message.in ============================================================================== --- head/www/bareos-webui/files/pkg-message.in Fri Feb 19 18:24:40 2021 (r566091) +++ head/www/bareos-webui/files/pkg-message.in Fri Feb 19 18:56:22 2021 (r566092) @@ -3,13 +3,15 @@ message: < Modified: head/www/bareos19-webui/files/pkg-message.in ============================================================================== --- head/www/bareos19-webui/files/pkg-message.in Fri Feb 19 18:24:40 2021 (r566091) +++ head/www/bareos19-webui/files/pkg-message.in Fri Feb 19 18:56:22 2021 (r566092) @@ -3,14 +3,16 @@ message: <