Date: Fri, 21 Jan 2022 13:58:39 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d08bba2732e3 - main - sysutils/bareos20-traymonitor: Fix build Message-ID: <202201211358.20LDwd6E021396@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=d08bba2732e35ad81fd13451960ff13b968621d7 commit d08bba2732e35ad81fd13451960ff13b968621d7 Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2022-01-21 13:57:41 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2022-01-21 13:57:41 +0000 sysutils/bareos20-traymonitor: Fix build Reported by: pkg-fallout --- sysutils/bareos20-server/Makefile.common | 4 ++-- sysutils/bareos20-traymonitor/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sysutils/bareos20-server/Makefile.common b/sysutils/bareos20-server/Makefile.common index 7bad4fc0eb8d..468bc7e31743 100644 --- a/sysutils/bareos20-server/Makefile.common +++ b/sysutils/bareos20-server/Makefile.common @@ -8,7 +8,7 @@ post-build: .endif pre-install: -.if ${PKGNAMESUFFIX} == "-traymonitor" +.if ${PKGNAMESUFFIX} == "20-traymonitor" . for d in client director monitor storage ${MKDIR} ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d} ${FIND} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d} -type f -name '*.conf' -exec ${MV} -v {} {}.sample \; @@ -25,7 +25,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/filed/static-bareos-fd ${STAGEDIR}${PREFIX}/sbin/bareos-fd-static ${INSTALL_PROGRAM} ${WRKSRC}/src/console/static-bconsole ${STAGEDIR}${PREFIX}/sbin/bconsole-static .endif -.if ${PKGNAMESUFFIX} == "-traymonitor" +.if ${PKGNAMESUFFIX} == "20-traymonitor" # Install config files and preserve existing ones .for d in client director monitor storage ${INSTALL_SCRIPT} ${WRKSRC}/core/src/defaultconfigs/tray-monitor.d/${d}/*.sample ${STAGEDIR}${ETCDIR}/tray-monitor.d/${d}/ diff --git a/sysutils/bareos20-traymonitor/Makefile b/sysutils/bareos20-traymonitor/Makefile index 73cf8bec30be..ff5270b3176d 100644 --- a/sysutils/bareos20-traymonitor/Makefile +++ b/sysutils/bareos20-traymonitor/Makefile @@ -4,7 +4,7 @@ PKGNAMESUFFIX= 20-traymonitor COMMENT= Backup archiving recovery open sourced (traymonitor) LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 \ - libbareos.so:sysutils/bareos-client + libbareos.so:sysutils/bareos20-client CONFLICTS= bareos-traymonitor bareos18-traymonitor bareos19-traymonitor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201211358.20LDwd6E021396>