diff options
| author | jylefort <jylefort@FreeBSD.org> | 2005-06-27 22:10:29 +0800 |
|---|---|---|
| committer | jylefort <jylefort@FreeBSD.org> | 2005-06-27 22:10:29 +0800 |
| commit | 7743059a40483a4abe5d897c4695126d2d37be3c (patch) | |
| tree | 277aa3c2c12e78a974363f72121e2258a4c0af7e /lang | |
| parent | a12ed1f22e9ee75267ed0196aea2045abbd364f4 (diff) | |
| download | freebsd-ports-gnome-7743059a40483a4abe5d897c4695126d2d37be3c.tar.gz freebsd-ports-gnome-7743059a40483a4abe5d897c4695126d2d37be3c.tar.zst freebsd-ports-gnome-7743059a40483a4abe5d897c4695126d2d37be3c.zip | |
Conflicts with metaocaml.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ocaml-nox11/Makefile | 2 | ||||
| -rw-r--r-- | lang/ocaml/Makefile | 8 |
2 files changed, 6 insertions, 4 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 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 |