From nobody Sun Dec 29 08:59:52 2024 X-Original-To: dev-commits-ports-all@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 4YLY8T0bmsz5k4CK; Sun, 29 Dec 2024 08:59:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YLY8S6cKmz4Hqt; Sun, 29 Dec 2024 08:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735462792; 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=ri0G+OJxoNPNCEQbK/mqubaodKBfXf0ZqRpezcwVmgw=; b=Mt36bimAHX8H4sYmXWq8ZjdJXrtJxoEveCpmcdCPl22myvHu4wRWuLjoEQNE06NI7RT/fA p1SSPCFFb7qs7ms5ZRbzu9JqPwzRBgYCByLAcHsE5Uva52axVOPBvFUiA70uK8qjL27+U4 W9IcfDLw4FctzD36n9Bd3xpoUIOJVmsfsCVALvHnSlbtp+mGDAzoLc4XzM+97PN7zNtXMq mMylLciEqJQUz6kLLE/mCQV25tC3uOlqiKzQtRkz2ZxZPRepAVJN3ntRuIVrgZjcyM6dS8 r4JQaUNJaUhQM0Zzjv0sfLXcA9RJ1eAm9EhLpb48u0XMosy43sfe208XeOigcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735462792; 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=ri0G+OJxoNPNCEQbK/mqubaodKBfXf0ZqRpezcwVmgw=; b=b5Fqr3iGZmVT67eOG7/DfGzwJU5VbOPq+OW2G/EfnN9ZIgxvyqFqJ9GH5VIYVM1vcf6Ywu cjjhshH89un5DbcjzzwOEwLBk/6Pra6URLs0X/jftGKggwYLWBp5wlJ2ea4oq4e9XXZF0J M5MZ9DWxpHUvarXROJVBdcBVJWVVJCzP6McuV9CMD1fsbaIy7VLiE+ScK5xPGeOkvhUFZO q3mE2aqePfXOuSlcAKTf4hHaL3MhsCG4B1jyby526b2K0dPusgfYnhRE+P4UQaVXmIhYgF pcW8oWlPfznthDHpiZnGc1JJOsOk9DMB1xs3oqcwTxR+tdrrz4L4IvSiQ2l6SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735462792; a=rsa-sha256; cv=none; b=E1NR1dY75CT+UO/sOvAGpirOJ5wvR+VU48IdkxFhTa5JEUDK61QeL84frTcn9JTkMMaDZj ugHXdgCV+8IsauVdV3coyc/XAor8jFTJx8C0hH93uXitC2gHZIcpAMNond3PFX3tGGN/lu 3KeyFE+8n9dNEBU3oNf4rJraeMsX+NHl7yUSzMyNczXoH4aawaTb9ZcQRHN5F1pdt5KuU5 I2ZHY0celEPYaCTcyQ/MYkGencnuna6Fex5LIyr+u7QOG7mMHnGJOsNvaNjJ8q/b1YJ8xh GKQsYnV8AhYjcf2FvzRDSjKs5Xl55hKw1hkEsws0kt/maQ1wivz3vir9buFJNA== 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 4YLY8S2lKDz139R; Sun, 29 Dec 2024 08:59:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BT8xqQe009001; Sun, 29 Dec 2024 08:59:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BT8xqcQ008998; Sun, 29 Dec 2024 08:59:52 GMT (envelope-from git) Date: Sun, 29 Dec 2024 08:59:52 GMT Message-Id: <202412290859.4BT8xqcQ008998@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: a210e2864bad - main - sysutils/bareos23-traymonitor: Fix name collisions List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: a210e2864bad3a38c640de261e6c7854f083bd2c Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=a210e2864bad3a38c640de261e6c7854f083bd2c commit a210e2864bad3a38c640de261e6c7854f083bd2c Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-12-29 08:59:10 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-12-29 08:59:10 +0000 sysutils/bareos23-traymonitor: Fix name collisions Reported by: antoine --- sysutils/bareos23-traymonitor/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sysutils/bareos23-traymonitor/Makefile b/sysutils/bareos23-traymonitor/Makefile index 05e6ac730f44..c2187714733f 100644 --- a/sysutils/bareos23-traymonitor/Makefile +++ b/sysutils/bareos23-traymonitor/Makefile @@ -1,5 +1,4 @@ -PORTREVISION= 0 -PKGNAMESUFFIX= 23-traymonitor +PORTREVISION= 1 COMMENT= Backup archiving recovery open sourced (traymonitor) @@ -19,13 +18,13 @@ qt5_CONFLICTS= bareos-traymonitor-qt6 qt6_CONFLICTS= bareos-traymonitor-qt5 .if ${FLAVOR} == qt6 -PKGNAMESUFFIX= -traymonitor-qt6 +PKGNAMESUFFIX= 23-traymonitor-qt6 USES+= qt:6 USE_QT= base:run declarative:build tools:build CMAKE_ARGS+= -Dbat-qt6=yes .else -PKGNAMESUFFIX= -traymonitor-qt5 +PKGNAMESUFFIX= 23-traymonitor-qt5 LIB_DEPENDS+= libqwt5-qt5.so:x11-toolkits/qwt5-qt5 USES+= qt:5