summaryrefslogtreecommitdiff
path: root/lang/ocaml-nox11
diff options
context:
space:
mode:
authorJean-Yves Lefort <jylefort@FreeBSD.org>2005-06-27 14:10:29 +0000
committerJean-Yves Lefort <jylefort@FreeBSD.org>2005-06-27 14:10:29 +0000
commit15a3316accd23724fd52e624d9340cb60e54ed28 (patch)
treed33a6d1f67b8cf225c9eb78c11465a145d28b766 /lang/ocaml-nox11
parentAdd metaocaml. (diff)
Conflicts with metaocaml.
Notes
Notes: svn path=/head/; revision=138064
Diffstat (limited to 'lang/ocaml-nox11')
-rw-r--r--lang/ocaml-nox11/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lang/ocaml-nox11/Makefile b/lang/ocaml-nox11/Makefile
index 1fd7640a8e10..d482f97bd1f0 100644
--- a/lang/ocaml-nox11/Makefile
+++ b/lang/ocaml-nox11/Makefile
@@ -13,7 +13,7 @@ COMMENT= Objective Caml compiler and programming environment (no X11)
MASTERDIR= ${.CURDIR}/../ocaml
-CONFLICTS= ocaml-[0-9]* ocaml-notk-[0-9]*
+CONFLICTS= metaocaml-[0-9]* ocaml-[0-9]* ocaml-notk-[0-9]*
WITHOUT_X11= yes