From nobody Fri Jun 24 06:38:23 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 CE78C8A393B; Fri, 24 Jun 2022 06:38:23 +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 4LTnWM4DdXz4m79; Fri, 24 Jun 2022 06:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656052703; 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=SKkTL1iOuuwTJaoahhhLoL0rjDgcdeoprrasD1TXjOw=; b=DQDgpx9FgD6wTjTEpKg5yuQIgofF68ri/hBTylLRVjEwb/Y76d71OvW11ZCI2wFxhrRHCv fx6O6xGmlLSkKuGUyuX0TLz4hIaUu29iIX2FDyeZAcbh/Pth/rD27wpj8oMnUMMTrUCbmk K/7uddOtTOvPRAlsGzIJTua/m5nS099WkaZVZL6Suk0CA7h+G6ljiuc5whH9X3etesSwLo cNPP2wIrmAQG2MSoglaMkMgNIk6c1gzHJ9EFPzzaqU1K3K5CiruOsvzkJ0JDUmF8zBFg+S h2FDvNruSMdRdIHNFGq8uC9WpeyhTpR1Z0ewiXqPQYNBPYe9+wsoyCRniAlzBg== 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 6DF0C2165; Fri, 24 Jun 2022 06:38:23 +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 25O6cNIM021138; Fri, 24 Jun 2022 06:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25O6cN74021137; Fri, 24 Jun 2022 06:38:23 GMT (envelope-from git) Date: Fri, 24 Jun 2022 06:38:23 GMT Message-Id: <202206240638.25O6cN74021137@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan=20E=C3=9Fer?= Subject: git: 8e62ddf310e7 - main - devel/courier-unicode: remove bogus CONFLICTS entry 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e62ddf310e746b28d441f113d1aa7d1eb447452 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656052703; 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=SKkTL1iOuuwTJaoahhhLoL0rjDgcdeoprrasD1TXjOw=; b=ZtaGMJiv438ukR2TsouhMhg6hPRPL7q2a0fAw738V4Z2hhP0K2SRHWDbD0JzMYlYJJv1K2 3+0EF4dZFkoVWlt2B/olezFYL9v4FCnJ+G4O7g8IqEFDaV90aiev0E3/Pzn0g/pv0OPZSD jLqaM5hccy+mtsZiBHnPOdNOa/A7nUx2blr2EoxKLBF+Bw8Zd1qylzyY1iY1v9SNdtpHqW atOIRO6hYYQg2FWxtngNVJ5b6Z4hGKfr6wak/5N7GXWK+9+5ojPS8lsDfdVPq811w8/a0h uW7xMWSu1TwZ+U7B3+sJsO4kEGJQz0uiHYdpwQzeOcAWAtXY+FYXsrN9z8ZIRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656052703; a=rsa-sha256; cv=none; b=wwA559jSyfIU+fIayzi6ajjcEdpJWtCuGXlVxfiNPr6YHvUsat92w3LeTTEoZdBIoUu0fk HAppJx9j0NfVGUXpysGzjPZ2b9GqAn738Fu8vXUexw1aKjpKFEaVnFJIB+lMO7CnzEq9km srRvZZSWp6/q4iwcvdl7HTeTp/k2HxnAEZ9/UDkm6hTzwg9i7KwOqyzC/VhPdLqpQZicoq gsN9Y67egjsbzJ8pyFi03ifbmOhXvT5CRf+WfucGNnU5fzwmrGtV+Xn/MVPpK6P4cqWzKX U0ngaByeeZ4y71DhTa5SmiqAhvDIPgJZLPHzT++Tn5uZm45OJkNxavWOWAJulA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=8e62ddf310e746b28d441f113d1aa7d1eb447452 commit 8e62ddf310e746b28d441f113d1aa7d1eb447452 Author: Stefan Eßer AuthorDate: 2022-06-24 06:30:08 +0000 Commit: Stefan Eßer CommitDate: 2022-06-24 06:30:08 +0000 devel/courier-unicode: remove bogus CONFLICTS entry Due to CONFLICTS=libunicode this port could not be built or installed on system that already had libunicode installed. Since both of these ports are dependencies of other ports, only ports depending on one or the other could be installed at a time. I have verified that there is no build or install conflict, and the libunicode port is not marked as conflicting with this port. In order to allow ports depending on courier-unicode and libunicode to be installed at the same time, I'm removing the bogus CONFLICTS entry. Approved by: portmgr (implicit) --- devel/courier-unicode/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/devel/courier-unicode/Makefile b/devel/courier-unicode/Makefile index 8c68ae3afe73..fe7e47d8ba5b 100644 --- a/devel/courier-unicode/Makefile +++ b/devel/courier-unicode/Makefile @@ -8,8 +8,6 @@ COMMENT= Courier implementation of Unicode Standard related algorithms LICENSE= GPLv3 -CONFLICTS= libunicode - USES= compiler:c++11-lang iconv libtool localbase:ldflags \ perl5 tar:bzip2 USE_PERL5= build