Date: Fri, 29 Oct 2021 10:06:32 GMT From: =?utf-8?Q?Stefan E=C3=9Fer?= <se@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4009f9a504cd - main - lang/ocaml: Remove redundant '-[0-9]*' from CONFLICTS Message-ID: <202110291006.19TA6WHj096936@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=4009f9a504cd13580778f06819a311fc1025d3df commit 4009f9a504cd13580778f06819a311fc1025d3df Author: Stefan Eßer <se@FreeBSD.org> AuthorDate: 2021-10-29 10:05:35 +0000 Commit: Stefan Eßer <se@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110291006.19TA6WHj096936>