From nobody Fri Jan 21 13:58:39 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 03F481964523; Fri, 21 Jan 2022 13:58:40 +0000 (UTC) (envelope-from git@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 4JgLZR6WtCz3LSX; Fri, 21 Jan 2022 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642773519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XCShCsWq9IGQDB1vETu9xEjZY/bE9vMGeIpSsn0d7DA=; b=Hs0LtcwCmnIdUybnoJHyMbFhllUNnoKCh/jUiE/QF4FTth/w/kbtfbTa5KCkyLJ13HkXsq d0TVHVVV0xbWlwMLSEH4DA48FASZVscQZeSif5tzzkwPLxHaMdKQphNgwC/I4fX/SBhSVZ zAUb/wwDOG5q95rlUpNLipwfXSnhPxvEg0juOXIJpmRJZfO+y8S09slHYQmHRTVHS0p/iY tXKx1MJc3zXDZuVZ7tP4Qpama/evZkY5NW4WrgdgGliTiAE/3AqDS+IvDY8nZROHCbNKL6 ZqOl6nH8+p4EBJmaPR1rb5z9o/DYQRYDmHPIGvZI6+Q06HZssjQCKJWfrF3wyg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BBF9E1CCE5; Fri, 21 Jan 2022 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20LDwdWr021397; Fri, 21 Jan 2022 13:58:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20LDwd6E021396; Fri, 21 Jan 2022 13:58:39 GMT (envelope-from git) Date: Fri, 21 Jan 2022 13:58:39 GMT Message-Id: <202201211358.20LDwd6E021396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: d08bba2732e3 - main - sysutils/bareos20-traymonitor: Fix build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d08bba2732e35ad81fd13451960ff13b968621d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642773519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XCShCsWq9IGQDB1vETu9xEjZY/bE9vMGeIpSsn0d7DA=; b=QtviuJqc0WO8Io/9NsPSYJWSlf0ku12wIeMGnzfIwaAOeRi1dGqTaqRtcDkWtCaWds847C F2lzD81WRW6Jys89Cf0aYlMxiueLKPrDPea7tLKr8rQzNRaC7vj89EWisNtGoc7KdeIuym v2oaf5WMYhctS5Tl0E4fozOAApLhJr8FjL2pz5r7tNcSEf47viZ+eAg863lElzBMoWeYkE IBgS8ADDI3DbOnvCaP6mKzx0ZH7tKLB57byjcZaiLH7Lfs07q3lqKoQGW0vmEsAbBM3JYd 4Hag1BTRDysWYD1hwoegWI/PLT3dpedLu5qon5SgOwwJu1WmpwOXxKhpEzaVwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642773519; a=rsa-sha256; cv=none; b=xxPd9QEzNaNJb0mdrw69DRrNX8nvTqBsfglFaIq/klWfb5uCZvWPFZOVRsbdMVSp7+07eN x0tmU3F/KV+MWu7/oVyYhNJTd3MySY3XigVW3dtdyuHtLNPMRseouEJuyybPjzQLGsKuCX 6r69NH3LRdMsuTY8JV6lfPvlO/zA9qgMQ3xDZ1zxmNPeCN0RJJSWPa5qoo2Z8qwjPNJkCU YWe//NTLR7PvPXH0dsxQYlPyspFZ4uUnQORg1uUzwIIolwSfydhoX6W8FYOP1q3snYuUIo 4hF/J08jI9hUx+KBjFniuvcCeCEfKxpfleyg6b/fneT48pSPF0HPqv8M/gVD0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=d08bba2732e35ad81fd13451960ff13b968621d7 commit d08bba2732e35ad81fd13451960ff13b968621d7 Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-01-21 13:57:41 +0000 Commit: Jose Alonso Cardenas Marquez 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