Upgrade to a snapshot of svn rev r65789.

Improve the patch for format string checking. [1]
Correctly refect that this is a 2.6 snapshot since 2.5 has been branched.

Submitted by:	ed [1]

4 files changed, 38 insertions, 14 deletions

diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile
index 7fc9098fd578..d9ae40763892 100644
--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	llvm
-DISTVERSION=	2.4.r${SVN_REV}
+DISTVERSION=	2.6.r${SVN_REV}
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -25,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=	65584
+SVN_REV=	65789
 .endif
 
 GNU_CONFIGURE=	yes
@@ -59,9 +59,15 @@ FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 
 do-fetch:
 	${MKDIR} ${WRKDIR}
-	svn export -r ${SVN_REV} http://llvm.org/svn/llvm-project/llvm/trunk ${WRKSRC}
-	svn export -r ${SVN_REV} http://llvm.org/svn/llvm-project/cfe/trunk  ${WRKSRC}/tools/clang
+	svn export -r ${SVN_REV} \
+	    http://llvm.org/svn/llvm-project/llvm/trunk ${WRKSRC}
+	svn export -r ${SVN_REV} \
+	    http://llvm.org/svn/llvm-project/cfe/trunk ${WRKSRC}/tools/clang
 	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
+.if ${USER} == brooks
+	scp ${DISTDIR}/${DISTNAME}.tar.bz2 \
+	    freefall.freebsd.org:public_distfiles/
+.endif
 .endif
 
 post-patch:
diff --git a/devel/llvm-devel/distinfo b/devel/llvm-devel/distinfo
index 699ff9e85ac9..eea20533eae9 100644
--- a/devel/llvm-devel/distinfo
+++ b/devel/llvm-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (llvm-2.4.r65584.tar.bz2) = 837bf9c9e57fbc9798fec1119292f50a
-SHA256 (llvm-2.4.r65584.tar.bz2) = 25019db210a408e73961e4d2376c8d4f63f81dd3121ba5925ac17b286a880799
-SIZE (llvm-2.4.r65584.tar.bz2) = 7224647
+MD5 (llvm-2.6.r65789.tar.bz2) = a7f60281ca6cd1e8a3ff3297c17466e8
+SHA256 (llvm-2.6.r65789.tar.bz2) = 289ea550e253ecbb10d4ba088a1634edee92e3f6088cc0d37aca58f44eb144c2
+SIZE (llvm-2.6.r65789.tar.bz2) = 7232241
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 3a43558971dc..4fc9a0d8e991 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,11 +3,28 @@ $FreeBSD$
 
 --- tools/clang/lib/Sema/SemaChecking.cpp.orig
 +++ tools/clang/lib/Sema/SemaChecking.cpp
-@@ -643,6 +643,7 @@
-     case 'G':
-     case 'a':
-     case 'A':
-+    case 'b':
-     case 'c':
-     case 'C':
+@@ -699,7 +699,6 @@
+     case 'u': 
+     case 'x':
+     case 'X':
+-    case 'D':
+     case 'O':
+     case 'U':
+     case 'e':
+@@ -715,9 +714,16 @@
      case 'S':
+     case 's':
+     case 'p': 
++    case 'r':
++    case 'y':
+       ++numConversions;
+       CurrentState = state_OrdChr;
+       break;
++    case 'b':
++    case 'D':
++      numConversions += 2;
++      CurrentState = state_OrdChr;
++      break;
+ 
+     // CHECK: Are we using "%n"?  Issue a warning.
+     case 'n': {
diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist
index 6aa1ef7ad437..1810d3025074 100644
--- a/devel/llvm-devel/pkg-plist
+++ b/devel/llvm-devel/pkg-plist
@@ -466,6 +466,7 @@ lib/plugin_llvmc_Clang.o
 %%DOCSDIR%%/html/GetElementPtr.html
 %%DOCSDIR%%/html/GettingStarted.html
 %%DOCSDIR%%/html/GettingStartedVS.html
+%%DOCSDIR%%/html/GoldPlugin.html
 %%DOCSDIR%%/html/HowToReleaseLLVM.html
 %%DOCSDIR%%/html/HowToSubmitABug.html
 %%DOCSDIR%%/html/InternalsManual.html