7 files changed, 61 insertions, 22 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 789e5aa4189c..0d2e7eaafdd7 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	llvm
 DISTVERSION=	2.6.r${SVN_REV}
-PORTREVISION=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -26,7 +25,7 @@ BUILD_DEPENDS+=	f2c:${PORTSDIR}/lang/f2c
 .if defined(BOOTSTRAP)
 SVN_REV!=	svn info http://llvm.org/svn/llvm-project/ | grep Revision | cut -d' ' -f2
 .else
-SVN_REV=	65789
+SVN_REV=	65948
 .endif
 
 GNU_CONFIGURE=	yes
@@ -118,7 +117,8 @@ build-plist:
 	cd ${PREFIX} && \
 	    (ls ${MANUAL_BINS} bin/llvm* bin/ccclib/* ${MANUAL_LIBS} \
 		lib/LLVM* lib/libLLVM* lib/plugin_llvm* lib/libclang* ; \
-	     ${FIND} include/llvm-c -type f; ${FIND} include/llvm -type f) | \
+	     ${FIND} include/llvm-c -type f; ${FIND} include/llvm lib/clang \
+	      -type f) | \
 	    ${SORT} >> ${PLIST}
 	${FIND} ${DATADIR} -type f | ${SORT} | \
 	    ${SED} -e 's|${DATADIR}|%%DATADIR%%|' >> ${PLIST}
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index eea20533eae9..65f033cd0f57 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (llvm-2.6.r65789.tar.bz2) = a7f60281ca6cd1e8a3ff3297c17466e8
-SHA256 (llvm-2.6.r65789.tar.bz2) = 289ea550e253ecbb10d4ba088a1634edee92e3f6088cc0d37aca58f44eb144c2
-SIZE (llvm-2.6.r65789.tar.bz2) = 7232241
+MD5 (llvm-2.6.r65948.tar.bz2) = 48c196f89d87a5df3f8405cdf7ba4821
+SHA256 (llvm-2.6.r65948.tar.bz2) = c47c1b35d5c42c60e47c5c334ebf1e6ae4f7878ff1f39949d19f841436573913
+SIZE (llvm-2.6.r65948.tar.bz2) = 7246621
diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Headers_Makefile b/devel/llvm-devel/files/patch-tools_clang_lib_Headers_Makefile
new file mode 100644
index 000000000000..da8c78141363
--- /dev/null
+++ b/devel/llvm-devel/files/patch-tools_clang_lib_Headers_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Headers/Makefile.orig
++++ tools/clang/lib/Headers/Makefile
+@@ -13,7 +13,7 @@
+ # FIXME: Get version from a common place.
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.0/include
+ 
+-HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
++HEADERS := $(filter-out std%.h,$(notdir $(wildcard $(PROJ_SRC_DIR)/*.h)))
+ 
+ OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS))
+ 
diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Makefile b/devel/llvm-devel/files/patch-tools_clang_lib_Makefile
deleted file mode 100644
index ca13a25a9887..000000000000
--- a/devel/llvm-devel/files/patch-tools_clang_lib_Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- tools/clang/lib/Makefile.orig
-+++ tools/clang/lib/Makefile
-@@ -8,7 +8,7 @@
- ##===----------------------------------------------------------------------===##
- LEVEL = ../../..
- 
--PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Rewrite Driver
-+PARALLEL_DIRS = Basic Lex Parse AST Sema CodeGen Analysis Rewrite Driver
- 
- include $(LEVEL)/Makefile.common
- 
diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
index 4fc9a0d8e991..9fdff9849f44 100644
--- a/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
+++ b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp
@@ -3,7 +3,16 @@ $FreeBSD$
 
 --- tools/clang/lib/Sema/SemaChecking.cpp.orig
 +++ tools/clang/lib/Sema/SemaChecking.cpp
-@@ -699,7 +699,6 @@
+@@ -142,7 +142,7 @@
+ 
+   // Printf checking.
+   if (const FormatAttr *Format = FDecl->getAttr<FormatAttr>()) {
+-    if (Format->getType() == "printf") {
++    if (Format->getType() == "printf" || Format->getType() == "printf0") {
+       bool HasVAListArg = Format->getFirstArg() == 0;
+       if (!HasVAListArg) {
+         if (const FunctionProtoType *Proto 
+@@ -701,7 +701,6 @@
      case 'u': 
      case 'x':
      case 'X':
@@ -11,7 +20,7 @@ $FreeBSD$
      case 'O':
      case 'U':
      case 'e':
-@@ -715,9 +714,16 @@
+@@ -717,9 +716,16 @@
      case 'S':
      case 's':
      case 'p': 
diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaDeclAttr.cpp b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaDeclAttr.cpp
new file mode 100644
index 000000000000..35879d4021aa
--- /dev/null
+++ b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaDeclAttr.cpp
@@ -0,0 +1,17 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Sema/SemaDeclAttr.cpp.orig
++++ tools/clang/lib/Sema/SemaDeclAttr.cpp
+@@ -1011,7 +1011,10 @@
+   default: break;
+   case 5: Supported = !memcmp(Format, "scanf", 5); break;
+   case 6: Supported = !memcmp(Format, "printf", 6); break;
+-  case 7: Supported = !memcmp(Format, "strfmon", 7); break;
++  case 7:
++    Supported = (!memcmp(Format, "strfmon", 7) ||
++                 !memcmp(Format, "printf0", 7));
++    break;
+   case 8:
+     Supported = (is_strftime = !memcmp(Format, "strftime", 8)) ||
+                 (is_NSString = !memcmp(Format, "NSString", 8)) ||
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 90b038cb6434..b8e43c62a878 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -208,6 +208,8 @@ include/llvm/CodeGen/ValueTypes.td
 include/llvm/CompilerDriver/Action.h
 include/llvm/CompilerDriver/Common.td
 include/llvm/CompilerDriver/CompilationGraph.h
+include/llvm/CompilerDriver/Error.h
+include/llvm/CompilerDriver/Main.inc
 include/llvm/CompilerDriver/Plugin.h
 include/llvm/CompilerDriver/Tool.h
 include/llvm/Config/alloca.h
@@ -390,6 +392,16 @@ lib/LLVMSparcCodeGen.o
 lib/LLVMX86AsmPrinter.o
 lib/LLVMX86CodeGen.o
 lib/LLVMXCore.o
+lib/clang/1.0/include/emmintrin.h
+lib/clang/1.0/include/float.h
+lib/clang/1.0/include/iso646.h
+lib/clang/1.0/include/limits.h
+lib/clang/1.0/include/mm_malloc.h
+lib/clang/1.0/include/mmintrin.h
+lib/clang/1.0/include/pmmintrin.h
+lib/clang/1.0/include/tgmath.h
+lib/clang/1.0/include/tmmintrin.h
+lib/clang/1.0/include/xmmintrin.h
 lib/libLLVMAnalysis.a
 lib/libLLVMArchive.a
 lib/libLLVMAsmParser.a
@@ -416,6 +428,7 @@ lib/libclangAnalysis.a
 lib/libclangBasic.a
 lib/libclangCodeGen.a
 lib/libclangDriver.a
+lib/libclangFrontend.a
 lib/libclangLex.a
 lib/libclangParse.a
 lib/libclangRewrite.a