svn commit: r310187 - in head: devel devel/llvm31 lang lang/clang31

[Brooks Davis]

Author: brooks
Date: Thu Jan 10 16:19:44 2013
New Revision: 310187
URL: http://svnweb.freebsd.org/changeset/ports/310187

Log:
  In preparation for updating llvm and clang to 3.2, create temporary
  ports of 3.1 so ports that don't yet work with 3.2 continue to work.

Added:
  head/devel/llvm31/
     - copied from r310164, head/devel/llvm/
  head/lang/clang31/
     - copied from r310165, head/lang/clang/
Modified:
  head/devel/Makefile
  head/devel/llvm31/Makefile
  head/lang/Makefile
  head/lang/clang31/Makefile

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Thu Jan 10 16:09:49 2013	(r310186)
+++ head/devel/Makefile	Thu Jan 10 16:19:44 2013	(r310187)
@@ -1122,6 +1122,7 @@
     SUBDIR += llvm
     SUBDIR += llvm-devel
     SUBDIR += llvm29
+    SUBDIR += llvm31
     SUBDIR += lmdbg
     SUBDIR += lndir
     SUBDIR += lockfree-malloc

Modified: head/devel/llvm31/Makefile
==============================================================================
--- head/devel/llvm/Makefile	Wed Jan  9 21:58:12 2013	(r310164)
+++ head/devel/llvm31/Makefile	Thu Jan 10 16:19:44 2013	(r310187)
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	llvm
+PORTNAME=	llvm31
 PORTVERSION=	3.1
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+DISTNAME=	llvm-${PORTVERSION}.src
 
 MAINTAINER=	brooks at FreeBSD.org
 COMMENT=	Low Level Virtual Machine
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	bash:${PORTSDIR}/shells/b
 BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .endif
 
-CONFLICTS=	llvm-devel-[23]* llvm-etoile-2*
+CONFLICTS=	llvm-[3]* llvm-devel-[23]* llvm29-*
 
 GNU_CONFIGURE=	yes
 USE_GCC=	4.2+

Modified: head/lang/Makefile
==============================================================================
--- head/lang/Makefile	Thu Jan 10 16:09:49 2013	(r310186)
+++ head/lang/Makefile	Thu Jan 10 16:19:44 2013	(r310187)
@@ -31,6 +31,7 @@
     SUBDIR += cint
     SUBDIR += clang
     SUBDIR += clang-devel
+    SUBDIR += clang31
     SUBDIR += clay
     SUBDIR += clisp
     SUBDIR += clojure

Modified: head/lang/clang31/Makefile
==============================================================================
--- head/lang/clang/Makefile	Wed Jan  9 23:28:19 2013	(r310165)
+++ head/lang/clang31/Makefile	Thu Jan 10 16:19:44 2013	(r310187)
@@ -5,12 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	clang
+PORTNAME=	clang31
 PORTVERSION=	3.1
-PORTREVISION=	2
 CATEGORIES=	lang devel
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}.src
+DISTNAME=	clang-${PORTVERSION}.src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${LLVM_SOURCE}
 EXTRACT_ONLY=	${LLVM_SOURCE}
@@ -18,7 +17,7 @@ EXTRACT_ONLY=	${LLVM_SOURCE}
 MAINTAINER=	brooks at FreeBSD.org
 COMMENT=	C, Objective-C, and (alpha-quality) C++ compiler
 
-CONFLICTS=	clang-devel-[23]*
+CONFLICTS=	clang-[23]* clang-devel-[23]*
 
 CLANG_NAME=	clang-${PORTVERSION}.src
 CLANG_SOURCE=	${CLANG_NAME}${EXTRACT_SUFX}
@@ -29,8 +28,8 @@ WRKSRC=		${WRKDIR}/${LLVM_NAME}
 BUILD_WRKSRC=	${WRKSRC}/tools/clang
 INSTALL_WRKSRC=	${WRKSRC}/tools/clang
 
-BUILD_DEPENDS+=	llvm>=${PORTVERSION}:${PORTSDIR}/devel/llvm
-RUN_DEPENDS+=	llvm>=${PORTVERSION}:${PORTSDIR}/devel/llvm
+BUILD_DEPENDS+=	llvm31>=${PORTVERSION}:${PORTSDIR}/devel/llvm
+RUN_DEPENDS+=	llvm31>=${PORTVERSION}:${PORTSDIR}/devel/llvm
 .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif