diff options
author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-06-27 14:10:29 +0000 |
---|---|---|
committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-06-27 14:10:29 +0000 |
commit | 15a3316accd23724fd52e624d9340cb60e54ed28 (patch) | |
tree | d33a6d1f67b8cf225c9eb78c11465a145d28b766 /lang/ocaml | |
parent | Add metaocaml. (diff) |
Conflicts with metaocaml.
Notes
Notes:
svn path=/head/; revision=138064
Diffstat (limited to 'lang/ocaml')
-rw-r--r-- | lang/ocaml/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 599232c17b18..47f443fdb35a 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -17,21 +17,23 @@ PKGNAMESUFFIX= ${SFX} MAINTAINER?= marwan.burelle@lri.fr COMMENT?= The Objective Caml compiler and programming environment +CONFLICTS= metaocaml-[0-9]* + .if defined(WITHOUT_X11) PLIST_SUB+= X11="@comment " TK="@comment " WITHOUT_TK= yes SFX= -nox11 -CONFLICTS= ocaml-[0-9]* ocaml-notk-[0-9]* +CONFLICTS+= ocaml-[0-9]* ocaml-notk-[0-9]* .else PLIST_SUB+= X11="" USE_XLIB= yes .if defined(WITHOUT_TK) PLIST_SUB+= TK="@comment " SFX= -notk -CONFLICTS= ocaml-[0-9]* ocaml-nox11-[0-9]* +CONFLICTS+= ocaml-[0-9]* ocaml-nox11-[0-9]* .else PLIST_SUB+= TK="" -CONFLICTS= ocaml-nox11-[0-9]* ocaml-notk-[0-9]* +CONFLICTS+= ocaml-nox11-[0-9]* ocaml-notk-[0-9]* BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.4:${PORTSDIR}/lang/tcl84 \ ${LOCALBASE}/include/tk8.4:${PORTSDIR}/x11-toolkits/tk84 |