From nobody Thu Aug 18 12:17:34 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 4M7kRL5dR0z4ZMDM; Thu, 18 Aug 2022 12:17:34 +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 4M7kRL5Djtz3n6y; Thu, 18 Aug 2022 12:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660825054; 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=P1tdxBbyWf7BF1F4C0ZuOqD6qQ6oMaeojKfaxMxYeyw=; b=ijifL8wJd6aj2kAkTqw12wUuQtpvF2J0N0WpOfyHwJ97fW0XTANiLSHbnosVEPeAnDsR5R zJZA/oVH6IPhvGi7BpDD8U9yi8VWgwQ4OJlZ0LpFSJzrAI1EkBbhQdxZKo+st4BmJu2Ju9 SNW1q/dZsJdPF6DcEEC2/purQTuuWWfWNUbUMlOJwzE0J6+EhiB2NEw0nIJ2G/89omtTBb HJuxJQSYMPjB+jF62JiKyuzzqNPURJaU/iyjaB7c2xnqdjXXtPG+pWzrW35TArXHNJGhrw CNDfWV0XQAPwbQ7uY+URrwqXID9HAPSCppj+jUkvaWdCvp61Ds7YfkGgPZxFVg== 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 4M7kRL4Jclz1S8n; Thu, 18 Aug 2022 12:17:34 +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 27ICHYqi083901; Thu, 18 Aug 2022 12:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27ICHYvm083900; Thu, 18 Aug 2022 12:17:34 GMT (envelope-from git) Date: Thu, 18 Aug 2022 12:17:34 GMT Message-Id: <202208181217.27ICHYvm083900@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 72ec4c86d5e5 - main - sysutils/bacula11-server: Fix CONFLICTS 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 72ec4c86d5e5effb26fe66688ee5e46ddba6e3f8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660825054; 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=P1tdxBbyWf7BF1F4C0ZuOqD6qQ6oMaeojKfaxMxYeyw=; b=v/58+VUGiZ+I4WZy9pmoEmXEkxLKx7cJI+TJwZm/8SsJ/dkfyMVun+IYWgO8d+CFBWsifd MvQSJsLLQy3SZYhQWT8wJsmgk8ePt7sgtFgdVmXtU3106kJTOxp5ZMWRfsB4UL5T8APW5R B3RzLx8SWUfC3FfHzWFzPc6S6hxRAvVmKysyMMVbAtScJhoODm2/ayJETPARBdE5KBVOAv +K4MWXMbeLG+BXbyTFM9KlogpC5NzSBcYpGlwVVSWETXy/SU4AZtKtRDIv7VCOKeCFOMmd BLUByFYj6vzgYsWs5cbqxbf0qIgdeSEq/9440dz84epqMPoGNFG1jy8Om2/vfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660825054; a=rsa-sha256; cv=none; b=IInsTUqdWtMOhkihvpGqwY1pMz/25gC8J41DwFxe8082Vi+fHDyXRPFSD4w+fbYejn/fh1 3dWlQEaay4+eGwbYsmwneIpUVo1PaTKGiPFVipvZy+0RCMdSDMYBuhH2Q60IqpWTrdujIq LFwWEUAYzfdTU6yEJ/tP9g4j8yghehrM6MHpUd+Mf1ulJ65sB6uXE9v4IXUgW7rwNroNJ9 UxR46POjPDCAxvPs+dbvqqdfdsOIZzYVhyUMBH0om2NaXUAJz0lNerMdQx6uJ1zbvlM+Qd fupIbGcjwO7DughdDZe4uHCjhn8Em5SiLha3gVfaE6+t39U6aniHvxrMAHR5Mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=72ec4c86d5e5effb26fe66688ee5e46ddba6e3f8 commit 72ec4c86d5e5effb26fe66688ee5e46ddba6e3f8 Author: Dan Langille AuthorDate: 2022-08-18 12:15:56 +0000 Commit: Dan Langille CommitDate: 2022-08-18 12:15:56 +0000 sysutils/bacula11-server: Fix CONFLICTS Add sysutuls/bacula13-server to CONFLICTS --- sysutils/bacula11-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/bacula11-server/Makefile b/sysutils/bacula11-server/Makefile index 5c9fcc793cc6..641fb1f2c9aa 100644 --- a/sysutils/bacula11-server/Makefile +++ b/sysutils/bacula11-server/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES+= cpe libtool readline shebangfix ssl SHEBANG_FILES= src/cats/make_catalog_backup.pl.in scripts/baculabackupreport.in -CONFLICTS?= bacula9-server bacula-server +CONFLICTS?= bacula-11-server bacula9-server bacula-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2