diff --git a/devel/llvm29/Makefile b/devel/llvm29/Makefile index 1b94a3cb818d..ed5c7c6ba6ac 100644 --- a/devel/llvm29/Makefile +++ b/devel/llvm29/Makefile @@ -24,7 +24,10 @@ BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash BUILD_DEPENDS+= f2c:${PORTSDIR}/lang/f2c .endif -CONFLICTS= llvm-* +CONFLICTS= llvm-[23]* llvm-devel-[23]* llvm31-3* + +DEPRECATED= Exists to support lang/llvm-gcc4 port which will be removed +EXPIRATION_DATE= 2013-02-01 GNU_CONFIGURE= yes USE_GCC= 4.2+ diff --git a/lang/llvm-gcc4/Makefile b/lang/llvm-gcc4/Makefile index 6c72cc870ae5..537616baff1e 100644 --- a/lang/llvm-gcc4/Makefile +++ b/lang/llvm-gcc4/Makefile @@ -23,7 +23,7 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils CONFLICTS= llvm-devel-[0-9]* llvm-2.[0-5]* DEPRECATED= Development ended upstream. Switch to dragonegg once available -EXPIRATION_DATE= 2012-06-01 +EXPIRATION_DATE= 2013-02-01 GNU_CONFIGURE= yes USE_BISON= build