From owner-svn-ports-all@freebsd.org Tue Jan 8 20:04:05 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 61441148929D; Tue, 8 Jan 2019 20:04:05 +0000 (UTC) (envelope-from cy@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 095387561C; Tue, 8 Jan 2019 20:04:05 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EFCC64BED; Tue, 8 Jan 2019 20:04:04 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x08K44UO095940; Tue, 8 Jan 2019 20:04:04 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x08K44qN095939; Tue, 8 Jan 2019 20:04:04 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201901082004.x08K44qN095939@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Tue, 8 Jan 2019 20:04:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489736 - head/security/krb5-115 X-SVN-Group: ports-head X-SVN-Commit-Author: cy X-SVN-Commit-Paths: head/security/krb5-115 X-SVN-Commit-Revision: 489736 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 095387561C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2019 20:04:05 -0000 Author: cy Date: Tue Jan 8 20:04:04 2019 New Revision: 489736 URL: https://svnweb.freebsd.org/changeset/ports/489736 Log: Correct CONFLICTS. MFH: 2019Q1 Modified: head/security/krb5-115/Makefile Modified: head/security/krb5-115/Makefile ============================================================================== --- head/security/krb5-115/Makefile Tue Jan 8 20:02:54 2019 (r489735) +++ head/security/krb5-115/Makefile Tue Jan 8 20:04:04 2019 (r489736) @@ -17,7 +17,7 @@ COMMENT= MIT implementation of RFC 4120 network authe LICENSE= MIT -CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[34]-[0-9]* \ +CONFLICTS= heimdal-[0-9]* srp-[0-9]* krb5-11[346]-[0-9]* \ krb5-1.[0-9]* krb5-devel-* CONFLICTS_BUILD= boringssl-*