kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Conflicts with metaocaml.

Browse source
This commit is contained in:
Jean-Yves Lefort 2005-06-27 14:10:29 +00:00
parent 4506d92ae6
commit 15a3316acc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=138064
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lang/ocaml-nox11/Makefile
View file

@ -13,7 +13,7 @@ COMMENT= Objective Caml compiler and programming environment (no X11)
MASTERDIR= ${.CURDIR}/../ocaml 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 WITHOUT_X11= yes

8
lang/ocaml/Makefile
View file

@ -17,21 +17,23 @@ PKGNAMESUFFIX= ${SFX}
MAINTAINER?= marwan.burelle@lri.fr MAINTAINER?= marwan.burelle@lri.fr
COMMENT?= The Objective Caml compiler and programming environment COMMENT?= The Objective Caml compiler and programming environment
CONFLICTS= metaocaml-[0-9]*
.if defined(WITHOUT_X11) .if defined(WITHOUT_X11)
PLIST_SUB+= X11="@comment " TK="@comment " PLIST_SUB+= X11="@comment " TK="@comment "
WITHOUT_TK= yes WITHOUT_TK= yes
SFX= -nox11 SFX= -nox11
CONFLICTS= ocaml-[0-9]* ocaml-notk-[0-9]* CONFLICTS+= ocaml-[0-9]* ocaml-notk-[0-9]*
.else .else
PLIST_SUB+= X11="" PLIST_SUB+= X11=""
USE_XLIB= yes USE_XLIB= yes
.if defined(WITHOUT_TK) .if defined(WITHOUT_TK)
PLIST_SUB+= TK="@comment " PLIST_SUB+= TK="@comment "
SFX= -notk SFX= -notk
CONFLICTS= ocaml-[0-9]* ocaml-nox11-[0-9]* CONFLICTS+= ocaml-[0-9]* ocaml-nox11-[0-9]*
.else .else
PLIST_SUB+= TK="" 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 \ BUILD_DEPENDS+= ${LOCALBASE}/include/tcl8.4:${PORTSDIR}/lang/tcl84 \
${LOCALBASE}/include/tk8.4:${PORTSDIR}/x11-toolkits/tk84 ${LOCALBASE}/include/tk8.4:${PORTSDIR}/x11-toolkits/tk84