From nobody Fri Oct 29 10:06:32 2021 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 C0F6D182D461; Fri, 29 Oct 2021 10:06:32 +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 4HgdPN51rdz4v5v; Fri, 29 Oct 2021 10:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 8C64E15394; Fri, 29 Oct 2021 10:06:32 +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 19TA6Wb3096937; Fri, 29 Oct 2021 10:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19TA6WHj096936; Fri, 29 Oct 2021 10:06:32 GMT (envelope-from git) Date: Fri, 29 Oct 2021 10:06:32 GMT Message-Id: <202110291006.19TA6WHj096936@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 E=C3=9Fer?= Subject: git: 4009f9a504cd - main - lang/ocaml: Remove redundant '-[0-9]*' from 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4009f9a504cd13580778f06819a311fc1025d3df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=4009f9a504cd13580778f06819a311fc1025d3df commit 4009f9a504cd13580778f06819a311fc1025d3df Author: Stefan Eßer AuthorDate: 2021-10-29 10:05:35 +0000 Commit: Stefan Eßer CommitDate: 2021-10-29 10:05:35 +0000 lang/ocaml: Remove redundant '-[0-9]*' from CONFLICTS Follow-up to previous commit: one occurance of "-[0-9]*" had been missed. Approved by: portmgr (blanket) --- lang/ocaml/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 35e38647cc97..813798316af0 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -94,7 +94,7 @@ CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib .else PLIST_SUB+= X11="@comment " SFX= -nox11 -CONFLICTS+= ocaml-[0-9]* +CONFLICTS+= ocaml CONFIGURE_ARGS+=-no-graph .endif