From nobody Thu Aug 18 12:17:33 2022 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 4M7kRK4y9fz4ZM4y; Thu, 18 Aug 2022 12:17:33 +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 4M7kRK4D82z3n6N; Thu, 18 Aug 2022 12:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660825053; 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=K6fN/aOO6nCa/TQto2Qjjs00b8a2XhYwVd48ZRY/ovg=; b=gX+pS/lii4WlDqdA/7DC1ktBMmbBQAFnbUq2NWndg+Xr6xnQgO1HVPsm/HZ4feNPNMTP0T ujp6bCJWCEgC9vJrJ8m/892pz/4oxpk9AwKUisrvF5gcfuY6XPbHhJKWS11zeFs2A5nMuW qetL5ewqUjADHYqbl49YEa0aAZYVEFYHNB8U8cpF4KkE4h+8PGd2eL/gx8FrmhpBjJgWdn Yv9oPhRDrZ8VDBAvUZ/9P/r8oIX8acp4VmPVJxGSz0SoXTrZsN1lIJnXmck7Gftu/Id9qF EDwFTj+wloKql3E1rmycraM4Qx5txqIB8yLiwzDVNEzwwGO1z9hsN2J+Dxaw6w== 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 4M7kRK3HB3z1Rps; Thu, 18 Aug 2022 12:17:33 +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 27ICHXf8083877; Thu, 18 Aug 2022 12:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27ICHX1Z083876; Thu, 18 Aug 2022 12:17:33 GMT (envelope-from git) Date: Thu, 18 Aug 2022 12:17:33 GMT Message-Id: <202208181217.27ICHX1Z083876@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: 244f8f5fc10a - main - sysutils/bacula13-server: Fix CONFLICTS 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 244f8f5fc10aad262466ad3a539034ce02310ae9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660825053; 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=K6fN/aOO6nCa/TQto2Qjjs00b8a2XhYwVd48ZRY/ovg=; b=p6f3jxdJaRJtiDPFLkD17adplTi2XZ6pL4JyFM4BHJHNaUpVpACOO87NOdlP0Dh3FZXAL+ euhIfhzA23/+6YV9z6d4tTwfk0FduiysW2R2P4kwEVzDYe9G54Y0tcFzqE4D8FDVnMEe8Y qGYYnq1eD+kvUPBBTcMuMDwUhbGWxLZQd90hGoI0jvnUbUO8VLj/FxRzpHKtCfJ5tbxo0y uQs5YUFYVdGVPiFEGDxhQgxbuCD/Mn2QuQLPKQNsIL95oC4p3sJgqGAXfRxSfrmjykMEGM h3F5H68LvkQ+WQ8VnKAEeytmA4y3q7T5aTZce6WhW0/p/v/5nWHHcJeyko/aIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660825053; a=rsa-sha256; cv=none; b=rb3qvTVa3orFgaA+lbkIoJ5LeffnfSHjb52pps6/7c1z68x8IKu8nM8Y2rQlUkMsWh9Eyr D+Rk7USacVin4ADfhtezUKZWhGE3kuL+oLgg+KT58fULhIFWrYK8WxTBy3/IzSkEH+IsPV xyi2snNsyJgp+/6+RlIYuNwQqJuK8Zhb/3XiLZ3yPXPN3QpQWL9YHDc9EeiT0+q3Hrr7jI GEnGwI/0/UEQSaK89LPIeUPi8RsWQb3mr/3+/ENDuNBpkMzz/uQseMroLPYaXEhApzdoY4 2oladJZmJxkiL4T29kUTq8CHnrBP8nvTT6gVQ4H0+/Hr/CRu0zYp6MQDzITt2w== 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=244f8f5fc10aad262466ad3a539034ce02310ae9 commit 244f8f5fc10aad262466ad3a539034ce02310ae9 Author: Dan Langille AuthorDate: 2022-08-18 12:14:26 +0000 Commit: Dan Langille CommitDate: 2022-08-18 12:14:26 +0000 sysutils/bacula13-server: Fix CONFLICTS bacula13-server should conflict with bacula11-server, not itself. --- sysutils/bacula13-server/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/bacula13-server/Makefile b/sysutils/bacula13-server/Makefile index 6465bd3e9646..f9449f98ceea 100644 --- a/sysutils/bacula13-server/Makefile +++ b/sysutils/bacula13-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?= bacula13-server bacula9-server bacula-server +CONFLICTS?= bacula11-server bacula9-server bacula-server LIB_DEPENDS+= liblzo2.so:archivers/lzo2