4 files changed, 79 insertions, 32 deletions

diff --git a/devel/llvm/Makefile b/devel/llvm/Makefile
index 61abc82bef7d..98b6a81dec47 100644
--- a/devel/llvm/Makefile
+++ b/devel/llvm/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME=	llvm
-PORTVERSION=	2.4
+PORTVERSION=	2.5
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
-DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Low Level Virtual Machine
 
+CONFLICTS=	llvm-2.4.s* llvm-2.6.r*
+
 .if defined(PACKAGE_BUILDING) || defined(MAINTAINER_MODE)
 BUILD_DEPENDS=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
@@ -32,7 +33,7 @@ CONFIGURE_ARGS+=	--enable-optimized
 .endif
 
 .if defined(NOPORTDOCS)
-DOCSRCDIR=	
+DOCSRCDIR=
 .else
 DOCSRCDIR=	docs
 .endif
@@ -40,7 +41,7 @@ DOCSRCDIR=	docs
 MAN1=		bugpoint.1 llc.1 lli.1 llvm-ar.1 \
 		llvm-as.1 llvm-bcanalyzer.1 llvm-config.1 llvm-db.1 \
 		llvm-dis.1 llvm-extract.1 llvm-ld.1 llvm-link.1 llvm-nm.1 \
-		llvm-prof.1 llvm-ranlib.1 llvmgcc.1 \
+		llvm-prof.1 llvm-ranlib.1 llvmc.1 llvmgcc.1 \
 		llvmgxx.1 opt.1 tblgen.1
 
 .include <bsd.port.pre.mk>
@@ -64,8 +65,6 @@ post-build:
 post-install:
 	cd ${WRKSRC}/docs/CommandGuide && \
 	    ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1/
-	@${RM} ${PREFIX}/bin/.dir \
-	   ${PREFIX}/lib/.dir
 
 TEST_CMD=	'(cd ${WRKSRC}/test; ${SETENV} ${MAKE_ENV} ${GMAKE} check)'
 regression-test: ${BUILD_COOKIE}
@@ -76,4 +75,30 @@ regression-test: ${BUILD_COOKIE}
 		${SH} -c ${TEST_CMD}; \
 	fi
 
+PLIST_FILE_LIST=	bin/bugpoint \
+			bin/gccas \
+			bin/gccld \
+			bin/llc \
+			bin/lli \
+			bin/llvm* \
+			bin/opt \
+			lib/LLVM* \
+			lib/libLLVM* \
+			lib/plugin_llvm*
+PLIST_DIR_LIST=		include/llvm-c \
+			include/llvm
+build-plist:
+	${RM} ${PLIST}
+	cd ${PREFIX} && \
+	    (ls ${PLIST_FILE_LIST}; ${FIND} ${PLIST_DIR_LIST} -type f) | \
+	    ${SORT} >> ${PLIST}
+	${FIND} ${DOCSDIR} -type f | \
+	    ${SED} -e 's|${DOCSDIR}|%%PORTDOCS%%%%DOCSDIR%%|' | ${SORT} >> ${PLIST}
+	cd ${PREFIX} && \
+	    ${FIND} ${PLIST_DIR_LIST} -type d | \
+	    ${SORT} -r | ${SED} -e 's|^|@dirrm |' >> ${PLIST}
+	${FIND} ${DOCSDIR} -type d | ${SORT} -r | \
+	    ${SED} -e 's|^|%%PORTDOCS%%@dirrm |' \
+	    -e 's|${DOCSDIR}|%%DOCSDIR%%|' >> ${PLIST}
+
 .include <bsd.port.post.mk>
diff --git a/devel/llvm/distinfo b/devel/llvm/distinfo
index f974429df6b4..745bcc4590ec 100644
--- a/devel/llvm/distinfo
+++ b/devel/llvm/distinfo
@@ -1,3 +1,3 @@
-MD5 (llvm-2.4.tar.gz) = bf43eee98c364fd79c7d2b72e645a15e
-SHA256 (llvm-2.4.tar.gz) = 5fc295b3cf3de019962aee3be1c5efb49d6bf5041dae59451f6c0f544eb36bdc
-SIZE (llvm-2.4.tar.gz) = 6344417
+MD5 (llvm-2.5.tar.gz) = 55df2ea8665c8094ad2ef85187b9fc74
+SHA256 (llvm-2.5.tar.gz) = 8f3d69e63bc5d1ee2c2ee49ff07ccb7e070070a0e937813d2a6179b9e2e173ed
+SIZE (llvm-2.5.tar.gz) = 6660609
diff --git a/devel/llvm/files/patch-Makefile b/devel/llvm/files/patch-Makefile
index 774f0db717fe..59fe73be2c8e 100644
--- a/devel/llvm/files/patch-Makefile
+++ b/devel/llvm/files/patch-Makefile
@@ -3,12 +3,12 @@ $FreeBSD$
 
 --- Makefile.orig
 +++ Makefile
-@@ -18,7 +18,7 @@
- #   6. Build tools, runtime, docs.
- #
- DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
--        tools runtime docs
-+        tools runtime %%DOCSRCDIR%%
+@@ -24,7 +24,7 @@
+   OPTIONAL_DIRS :=
+ else
+   DIRS := lib/System lib/Support utils lib/VMCore lib tools/llvm-config \
+-          tools runtime docs
++          tools runtime %%DOCSRCDIR%%
+   OPTIONAL_DIRS := examples projects bindings
+ endif
  
- OPTIONAL_DIRS := examples projects bindings
- EXTRA_DIST := test llvm.spec include win32 Xcode
diff --git a/devel/llvm/pkg-plist b/devel/llvm/pkg-plist
index dadfcaf45a93..7da13f24fff8 100644
--- a/devel/llvm/pkg-plist
+++ b/devel/llvm/pkg-plist
@@ -3,7 +3,6 @@ bin/gccas
 bin/gccld
 bin/llc
 bin/lli
-bin/llvmc2
 bin/llvm-ar
 bin/llvm-as
 bin/llvm-bcanalyzer
@@ -17,6 +16,7 @@ bin/llvm-nm
 bin/llvm-prof
 bin/llvm-ranlib
 bin/llvm-stub
+bin/llvmc
 bin/opt
 include/llvm-c/Analysis.h
 include/llvm-c/BitReader.h
@@ -24,10 +24,9 @@ include/llvm-c/BitWriter.h
 include/llvm-c/Core.h
 include/llvm-c/ExecutionEngine.h
 include/llvm-c/LinkTimeOptimizer.h
-include/llvm-c/Transforms/Scalar.h
 include/llvm-c/Target.h
+include/llvm-c/Transforms/Scalar.h
 include/llvm-c/lto.h
-include/llvm/AbstractTypeUser.h
 include/llvm/ADT/APFloat.h
 include/llvm/ADT/APInt.h
 include/llvm/ADT/APSInt.h
@@ -45,6 +44,7 @@ include/llvm/ADT/ImmutableSet.h
 include/llvm/ADT/IndexedMap.h
 include/llvm/ADT/IntrusiveRefCntPtr.h
 include/llvm/ADT/OwningPtr.h
+include/llvm/ADT/PointerIntPair.h
 include/llvm/ADT/PostOrderIterator.h
 include/llvm/ADT/PriorityQueue.h
 include/llvm/ADT/SCCIterator.h
@@ -71,15 +71,17 @@ include/llvm/ADT/hash_set.cmake
 include/llvm/ADT/hash_set.h
 include/llvm/ADT/ilist.h
 include/llvm/ADT/ilist_node.h
-include/llvm/ADT/iterator
 include/llvm/ADT/iterator.cmake
 include/llvm/ADT/iterator.h
+include/llvm/AbstractTypeUser.h
 include/llvm/Analysis/AliasAnalysis.h
 include/llvm/Analysis/AliasSetTracker.h
 include/llvm/Analysis/CFGPrinter.h
 include/llvm/Analysis/CallGraph.h
+include/llvm/Analysis/CaptureTracking.h
 include/llvm/Analysis/ConstantFolding.h
 include/llvm/Analysis/ConstantsScanner.h
+include/llvm/Analysis/DebugInfo.h
 include/llvm/Analysis/DominatorInternals.h
 include/llvm/Analysis/Dominators.h
 include/llvm/Analysis/FindUsedTypes.h
@@ -122,21 +124,24 @@ include/llvm/Bitcode/ReaderWriter.h
 include/llvm/Bitcode/Serialization.h
 include/llvm/Bitcode/SerializationFwd.h
 include/llvm/Bitcode/Serialize.h
+include/llvm/CMakeLists.txt
 include/llvm/CallGraphSCCPass.h
 include/llvm/CallingConv.h
 include/llvm/CodeGen/AsmPrinter.h
 include/llvm/CodeGen/BreakCriticalMachineEdge.h
 include/llvm/CodeGen/CallingConvLower.h
 include/llvm/CodeGen/DAGISelHeader.h
+include/llvm/CodeGen/DebugLoc.h
 include/llvm/CodeGen/DwarfWriter.h
 include/llvm/CodeGen/ELFRelocation.h
 include/llvm/CodeGen/FastISel.h
 include/llvm/CodeGen/FileWriters.h
 include/llvm/CodeGen/GCMetadata.h
 include/llvm/CodeGen/GCMetadataPrinter.h
-include/llvm/CodeGen/GCs.h
 include/llvm/CodeGen/GCStrategy.h
+include/llvm/CodeGen/GCs.h
 include/llvm/CodeGen/IntrinsicLowering.h
+include/llvm/CodeGen/LatencyPriorityQueue.h
 include/llvm/CodeGen/LinkAllAsmWriterComponents.h
 include/llvm/CodeGen/LinkAllCodegenComponents.h
 include/llvm/CodeGen/LiveInterval.h
@@ -169,6 +174,9 @@ include/llvm/CodeGen/RegisterCoalescer.h
 include/llvm/CodeGen/RegisterScavenging.h
 include/llvm/CodeGen/RuntimeLibcalls.h
 include/llvm/CodeGen/ScheduleDAG.h
+include/llvm/CodeGen/ScheduleDAGInstrs.h
+include/llvm/CodeGen/ScheduleDAGSDNodes.h
+include/llvm/CodeGen/ScheduleHazardRecognizer.h
 include/llvm/CodeGen/SchedulerRegistry.h
 include/llvm/CodeGen/SelectionDAG.h
 include/llvm/CodeGen/SelectionDAGISel.h
@@ -180,7 +188,6 @@ include/llvm/CompilerDriver/Common.td
 include/llvm/CompilerDriver/CompilationGraph.h
 include/llvm/CompilerDriver/Plugin.h
 include/llvm/CompilerDriver/Tool.h
-include/llvm/CompilerDriver/Tools.td
 include/llvm/Config/alloca.h
 include/llvm/Config/config.h
 include/llvm/Config/config.h.cmake
@@ -211,11 +218,12 @@ include/llvm/IntrinsicInst.h
 include/llvm/Intrinsics.gen
 include/llvm/Intrinsics.h
 include/llvm/Intrinsics.td
-include/llvm/IntrinsicsAlpha.td
 include/llvm/IntrinsicsARM.td
+include/llvm/IntrinsicsAlpha.td
 include/llvm/IntrinsicsCellSPU.td
 include/llvm/IntrinsicsPowerPC.td
 include/llvm/IntrinsicsX86.td
+include/llvm/IntrinsicsXCore.td
 include/llvm/LinkAllPasses.h
 include/llvm/LinkAllVMCore.h
 include/llvm/Linker.h
@@ -243,7 +251,6 @@ include/llvm/Support/DataFlow.h
 include/llvm/Support/DataTypes.h
 include/llvm/Support/DataTypes.h.cmake
 include/llvm/Support/Debug.h
-include/llvm/Support/DebugInfoBuilder.h
 include/llvm/Support/Dwarf.h
 include/llvm/Support/DynamicLinker.h
 include/llvm/Support/ELF.h
@@ -265,10 +272,11 @@ include/llvm/Support/OutputBuffer.h
 include/llvm/Support/PassNameParser.h
 include/llvm/Support/PatternMatch.h
 include/llvm/Support/PluginLoader.h
-include/llvm/Support/raw_ostream.h
+include/llvm/Support/PredIteratorCache.h
 include/llvm/Support/Recycler.h
 include/llvm/Support/RecyclingAllocator.h
 include/llvm/Support/Registry.h
+include/llvm/Support/RegistryParser.h
 include/llvm/Support/SlowOperationInformer.h
 include/llvm/Support/StableBasicBlockNumbering.h
 include/llvm/Support/Streams.h
@@ -276,6 +284,7 @@ include/llvm/Support/StringPool.h
 include/llvm/Support/SystemUtils.h
 include/llvm/Support/TargetFolder.h
 include/llvm/Support/Timer.h
+include/llvm/Support/raw_ostream.h
 include/llvm/Support/type_traits.h
 include/llvm/SymbolTableListTraits.h
 include/llvm/System/Alarm.h
@@ -295,7 +304,9 @@ include/llvm/System/TimeValue.h
 include/llvm/Target/DarwinTargetAsmInfo.h
 include/llvm/Target/ELFTargetAsmInfo.h
 include/llvm/Target/SubtargetFeature.h
+include/llvm/Target/Target.td
 include/llvm/Target/TargetAsmInfo.h
+include/llvm/Target/TargetCallingConv.td
 include/llvm/Target/TargetData.h
 include/llvm/Target/TargetELFWriterInfo.h
 include/llvm/Target/TargetFrameInfo.h
@@ -309,6 +320,8 @@ include/llvm/Target/TargetMachine.h
 include/llvm/Target/TargetMachineRegistry.h
 include/llvm/Target/TargetOptions.h
 include/llvm/Target/TargetRegisterInfo.h
+include/llvm/Target/TargetSchedule.td
+include/llvm/Target/TargetSelectionDAG.td
 include/llvm/Target/TargetSubtarget.h
 include/llvm/Transforms/IPO.h
 include/llvm/Transforms/IPO/InlinerPass.h
@@ -331,12 +344,13 @@ include/llvm/Use.h
 include/llvm/User.h
 include/llvm/Value.h
 include/llvm/ValueSymbolTable.h
-lib/LLVMAlpha.o
 lib/LLVMARMAsmPrinter.o
 lib/LLVMARMCodeGen.o
+lib/LLVMAlphaAsmPrinter.o
+lib/LLVMAlphaCodeGen.o
 lib/LLVMCBackend.o
-lib/LLVMCBase.o
-lib/LLVMCellSPU.o
+lib/LLVMCellSPUAsmPrinter.o
+lib/LLVMCellSPUCodeGen.o
 lib/LLVMCppBackend.o
 lib/LLVMExecutionEngine.o
 lib/LLVMHello.a
@@ -346,14 +360,16 @@ lib/LLVMHello.so.0
 lib/LLVMIA64.o
 lib/LLVMInterpreter.o
 lib/LLVMJIT.o
-lib/LLVMMips.o
 lib/LLVMMSIL.o
+lib/LLVMMips.o
 lib/LLVMPIC16.o
 lib/LLVMPowerPCAsmPrinter.o
 lib/LLVMPowerPCCodeGen.o
-lib/LLVMSparc.o
+lib/LLVMSparcAsmPrinter.o
+lib/LLVMSparcCodeGen.o
 lib/LLVMX86AsmPrinter.o
 lib/LLVMX86CodeGen.o
+lib/LLVMXCore.o
 lib/libLLVMAnalysis.a
 lib/libLLVMArchive.a
 lib/libLLVMAsmParser.a
@@ -373,11 +389,14 @@ lib/libLLVMTarget.a
 lib/libLLVMTransformUtils.a
 lib/libLLVMipa.a
 lib/libLLVMipo.a
+lib/plugin_llvmc_Base.o
+lib/plugin_llvmc_Clang.o
 %%PORTDOCS%%%%DOCSDIR%%/html.tar.gz
 %%PORTDOCS%%%%DOCSDIR%%/html/AliasAnalysis.html
 %%PORTDOCS%%%%DOCSDIR%%/html/BitCodeFormat.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Bugpoint.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CFEBuildInstrs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CMake.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CodeGenerator.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CodingStandards.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/bugpoint.html
@@ -396,6 +415,7 @@ lib/libLLVMipo.a
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-nm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-prof.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvm-ranlib.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmgcc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/llvmgxx.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/manpage.css
@@ -403,6 +423,7 @@ lib/libLLVMipo.a
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandGuide/tblgen.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CommandLine.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CompilerDriver.html
+%%PORTDOCS%%%%DOCSDIR%%/html/CompilerDriverTutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/html/CompilerWriterInfo.html
 %%PORTDOCS%%%%DOCSDIR%%/html/DeveloperPolicy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ExceptionHandling.html
@@ -471,6 +492,7 @@ lib/libLLVMipo.a
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvm-nm.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvm-prof.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvm-ranlib.ps
+%%PORTDOCS%%%%DOCSDIR%%/ps/llvmc.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvmgcc.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/llvmgxx.ps
 %%PORTDOCS%%%%DOCSDIR%%/ps/opt.ps
@@ -494,8 +516,8 @@ lib/libLLVMipo.a
 @dirrm include/llvm-c
 @dirrm include/llvm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/img
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/CommandGuide
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%