From nobody Fri Sep 09 15:19:11 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 4MPKQl3LB2z4bdPx; Fri, 9 Sep 2022 15:19:11 +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 4MPKQl2V2Mz3r1h; Fri, 9 Sep 2022 15:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662736751; 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=3LUdW/miV+oIp5/Pf1n0eMwpnYW6XK9/0fz4emdPm/Y=; b=X+mS5x3050JRbENCDyVrEmHjrE8PZwxgXexXvmUeSoX21Zw4nq9jt4rxLTM6W818sd2k/T qaghjfq6PJHtOeRJbuafDss81T7LL6EZm6EoyVR3Doqn6dXJglCNXqYkChmGEjuBYGfnrk pkBkt47a9Ej+yLZzL0xTqiI/zfm0662AmQg/YUrubxAejKGcGJnrPP5CWa140s0omnnodI ogkBmbcz40GI37SuEne0r2rq8A7qbgOBtZpx6m4qYQ3msS0Dz7TK/j7S2emUi90GfPG1Mi IGW+EE5hMOKguKCMqofsum5LDeQQ09GsZUqCMVXfoDTx1w3e+nKbArnAZIGk/w== 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 4MPKQl1YNjz1FSt; Fri, 9 Sep 2022 15:19:11 +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 289FJBkp095613; Fri, 9 Sep 2022 15:19:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 289FJBiI095612; Fri, 9 Sep 2022 15:19:11 GMT (envelope-from git) Date: Fri, 9 Sep 2022 15:19:11 GMT Message-Id: <202209091519.289FJBiI095612@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 096a9baeef9f - main - security/krb5-*: Bring CONFLICTS up to current status 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 096a9baeef9f45bd2ae0e963585bdab9f31a3864 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662736751; 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=3LUdW/miV+oIp5/Pf1n0eMwpnYW6XK9/0fz4emdPm/Y=; b=tpm+hHganGGCqd+5LMw6RxiVwcEHPrpJoLT/nl6uW4TryoP1v5sc+RYaKp5idNf7xpB76s o/VAUyFOKbLtO3sO5J5VL2Q0Jp8nDDnAoyLf9BllrgIbRutACWoI7TT7Pjeve2qpRTCCte vonOnELzblxLNH82SqsDrfwzaaxzBiz/O/mNWlDs7alXNFzvo9vDwtvw6VQ+zz9eNp3ZDe oOBpFZNqbPyFWXW7Af6bg57ibPT/XxbBNRGDeSIaW1NPXoJqtImu5NF20ibM6pYUwsUM7R HoMRJoKYhyQ0PrpFLyf4i8W5ooyMHsI0IBJhoNscZ+LPlOqH82mjfmtxs3rQRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662736751; a=rsa-sha256; cv=none; b=d1+2olt6xWa54pRth90ce+QKBj9j9qu9QHix4k5zkacBHyAEk8nHThtjGUvVgayiwTO9RJ UafsZt5Shy+IQH1DRRskyi4U8Amd3kUWmHK/6I+ugcU+shYiUMRaL4DBj2HJznEwvsxqzl c99fQN1LZdUWAQ5AiFQ6VUXSywFgJM1z7EvJD9jjtjRj+S1cYhiBobc013wzNAMon/m4p3 fyDRQ3i91K+JwHJQst3r+lsNtv8jXEFTYykiAfuj3c3YII6WDYN1M/G3jlRntpKezh3IGJ 6UpfJ/0rlnKHobGRDUgWz4PfrVUKmYC9Re/yrlsszAb5mOQN7WeT086ldObhZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=096a9baeef9f45bd2ae0e963585bdab9f31a3864 commit 096a9baeef9f45bd2ae0e963585bdab9f31a3864 Author: Cy Schubert AuthorDate: 2022-09-09 15:16:28 +0000 Commit: Cy Schubert CommitDate: 2022-09-09 15:19:05 +0000 security/krb5-*: Bring CONFLICTS up to current status Clean up CONFLICTS bitrot. MFH: 2022Q3 --- security/krb5-118/Makefile | 2 +- security/krb5-119/Makefile | 2 +- security/krb5-120/Makefile | 2 +- security/krb5-appl/Makefile | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/security/krb5-118/Makefile b/security/krb5-118/Makefile index a049a6928a2c..aa59adb40e57 100644 --- a/security/krb5-118/Makefile +++ b/security/krb5-118/Makefile @@ -18,7 +18,7 @@ WWW= https://web.mit.edu/kerberos/ LICENSE= MIT -CONFLICTS= heimdal krb5 krb5-* +CONFLICTS= heimdal krb5 krb5-119 krb5-120 CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-119/Makefile b/security/krb5-119/Makefile index eecb26afd8ea..e0668fe68b6b 100644 --- a/security/krb5-119/Makefile +++ b/security/krb5-119/Makefile @@ -15,7 +15,7 @@ WWW= https://web.mit.edu/kerberos/ LICENSE= MIT -CONFLICTS= heimdal krb5 krb5-* +CONFLICTS= heimdal krb5 krb5-118 krb5-120 CONFLICTS_BUILD= boringssl KERBEROSV_URL= http://web.mit.edu/kerberos/ diff --git a/security/krb5-120/Makefile b/security/krb5-120/Makefile index 3e2f32c8f309..d7fd0095f7a3 100644 --- a/security/krb5-120/Makefile +++ b/security/krb5-120/Makefile @@ -15,7 +15,7 @@ WWW= https://web.mit.edu/kerberos/ LICENSE= MIT -CONFLICTS= heimdal krb5 krb5-* +CONFLICTS= heimdal krb5 krb5-11* CONFLICTS_BUILD= boringssl IGNORE_SSL= libressl libressl-devel diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile index 7ba8d0f4ee01..e56467604614 100644 --- a/security/krb5-appl/Makefile +++ b/security/krb5-appl/Makefile @@ -14,8 +14,7 @@ WWW= https://web.mit.edu/kerberos/ BUILD_DEPENDS= krb5-config:security/krb5 -CONFLICTS= krb4 krb5-1.[0-7].* heimdal srp \ - bsdftpd-ssl +CONFLICTS= heimdal srp bsdftpd-ssl KERBEROSV_URL= http://web.mit.edu/kerberos/ USES= autoreconf gmake ncurses perl5 gssapi:mit ssl