7 files changed, 52 insertions, 17 deletions

diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index dad895cb91b1..f6a57297bdae 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clang
-PORTVERSION=	3.3.r${SVN_REV}
+PORTVERSION=	3.4.r${SVN_REV}
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -144,6 +144,7 @@ post-build:
 	@cd ${WRKSRC}/tools/clang/docs/tools && ${GMAKE} clang.1
 
 post-install:
+	@${LN} -sf clang ${PREFIX}/bin/clang-cpp
 	@${INSTALL_SCRIPT} ${WRKSRC}/tools/clang/tools/scan-build/ccc-analyzer \
 		${WRKSRC}/tools/clang/tools/scan-build/c++-analyzer \
 		${WRKSRC}/tools/clang/tools/scan-build/scan-build \
@@ -176,6 +177,7 @@ PLIST_FILE_LIST=	bin/ccc-analyzer \
 			bin/clang \
 			bin/clang++ \
 			bin/clang-check \
+			bin/clang-cpp \
 			bin/clang-tblgen \
 			bin/scan-build \
 			bin/scan-view \
diff --git a/lang/clang-devel/distinfo b/lang/clang-devel/distinfo
index dca346bd7aaa..989c86a4f0cc 100644
--- a/lang/clang-devel/distinfo
+++ b/lang/clang-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (clang-3.3.r176188.tar.bz2) = 53a48aac61e89f3c69645f9e13770193a00064a12c424a2da5531a5c849a2b5e
-SIZE (clang-3.3.r176188.tar.bz2) = 7316256
-SHA256 (llvm-3.3.r176188.tar.bz2) = e07abe94b4f1e69011b0143a5d46525d975f5a82c561909d456b126ecd393684
-SIZE (llvm-3.3.r176188.tar.bz2) = 10035353
+SHA256 (clang-3.4.r181598.tar.bz2) = 7669c414c1a5bd78cf213afc2b93bb7ba44793a469f2ac33097b3394f27a865c
+SIZE (clang-3.4.r181598.tar.bz2) = 7634906
+SHA256 (llvm-3.4.r181598.tar.bz2) = 55aa9032e687ffa6bf108b3f059287e563dc5d78516c3ea3908a5a16f0f410aa
+SIZE (llvm-3.4.r181598.tar.bz2) = 10550408
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
new file mode 100644
index 000000000000..31432876d6ee
--- /dev/null
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Basic_Targets.cpp
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/clang/lib/Basic/Targets.cpp.orig
++++ tools/clang/lib/Basic/Targets.cpp
+@@ -271,6 +271,8 @@
+           break;
+         case llvm::Triple::mips:
+         case llvm::Triple::mipsel:
++        case llvm::Triple::mips64:
++        case llvm::Triple::mips64el:
+         case llvm::Triple::ppc:
+         case llvm::Triple::ppc64:
+           this->MCountName = "_mcount";
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile b/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile
index 789ee4e09995..7583968f79e0 100644
--- a/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile
@@ -1,14 +1,14 @@
 
-$FreeBSD: /tmp/pcvs/ports/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile,v 1.2 2010-10-08 14:00:31 brooks Exp $
+$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
+@@ -19,7 +19,7 @@
+ 
+ HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/$(CLANG_VERSION)/include
  
 -HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))
-+HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*mm*.h))
++HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*intrin*.h))
  
  OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS))
  
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 7a7f03b8b02c..3a9fb4717f79 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -4,6 +4,7 @@ bin/ccc-analyzer
 bin/clang
 bin/clang++
 bin/clang-check
+bin/clang-cpp
 bin/clang-tblgen
 bin/scan-build
 bin/scan-view
@@ -21,6 +22,7 @@ include/clang/AST/ASTContext.h
 include/clang/AST/ASTDiagnostic.h
 include/clang/AST/ASTImporter.h
 include/clang/AST/ASTMutationListener.h
+include/clang/AST/ASTTypeTraits.h
 include/clang/AST/ASTUnresolvedSet.h
 include/clang/AST/ASTVector.h
 include/clang/AST/Attr.h
@@ -57,6 +59,7 @@ include/clang/AST/DeclGroup.h
 include/clang/AST/DeclLookups.h
 include/clang/AST/DeclNodes.inc
 include/clang/AST/DeclObjC.h
+include/clang/AST/DeclOpenMP.h
 include/clang/AST/DeclTemplate.h
 include/clang/AST/DeclVisitor.h
 include/clang/AST/DeclarationName.h
@@ -102,7 +105,6 @@ include/clang/ASTMatchers/ASTMatchFinder.h
 include/clang/ASTMatchers/ASTMatchers.h
 include/clang/ASTMatchers/ASTMatchersInternal.h
 include/clang/ASTMatchers/ASTMatchersMacros.h
-include/clang/ASTMatchers/ASTTypeTraits.h
 include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
 include/clang/Analysis/Analyses/Dominators.h
 include/clang/Analysis/Analyses/FormatString.h
@@ -134,12 +136,14 @@ include/clang/Basic/AttrKinds.h
 include/clang/Basic/AttrList.inc
 include/clang/Basic/Builtins.def
 include/clang/Basic/Builtins.h
+include/clang/Basic/BuiltinsAArch64.def
 include/clang/Basic/BuiltinsARM.def
 include/clang/Basic/BuiltinsHexagon.def
 include/clang/Basic/BuiltinsMips.def
 include/clang/Basic/BuiltinsNVPTX.def
 include/clang/Basic/BuiltinsPPC.def
 include/clang/Basic/BuiltinsX86.def
+include/clang/Basic/CapturedStmt.h
 include/clang/Basic/CharInfo.h
 include/clang/Basic/CommentOptions.h
 include/clang/Basic/Diagnostic.h
@@ -176,6 +180,8 @@ include/clang/Basic/ObjCRuntime.h
 include/clang/Basic/OnDiskHashTable.h
 include/clang/Basic/OpenCL.h
 include/clang/Basic/OpenCLExtensions.def
+include/clang/Basic/OpenMPKinds.def
+include/clang/Basic/OpenMPKinds.h
 include/clang/Basic/OperatorKinds.def
 include/clang/Basic/OperatorKinds.h
 include/clang/Basic/OperatorPrecedence.h
@@ -270,13 +276,13 @@ include/clang/Lex/HeaderSearchOptions.h
 include/clang/Lex/LexDiagnostic.h
 include/clang/Lex/Lexer.h
 include/clang/Lex/LiteralSupport.h
+include/clang/Lex/MacroArgs.h
 include/clang/Lex/MacroInfo.h
 include/clang/Lex/ModuleLoader.h
 include/clang/Lex/ModuleMap.h
 include/clang/Lex/MultipleIncludeOpt.h
 include/clang/Lex/PPCallbacks.h
 include/clang/Lex/PPConditionalDirectiveRecord.h
-include/clang/Lex/PPMutationListener.h
 include/clang/Lex/PTHLexer.h
 include/clang/Lex/PTHManager.h
 include/clang/Lex/Pragma.h
@@ -288,6 +294,7 @@ include/clang/Lex/ScratchBuffer.h
 include/clang/Lex/Token.h
 include/clang/Lex/TokenConcatenation.h
 include/clang/Lex/TokenLexer.h
+include/clang/Parse/AttrExprArgs.inc
 include/clang/Parse/AttrLateParsed.inc
 include/clang/Parse/ParseAST.h
 include/clang/Parse/ParseDiagnostic.h
@@ -403,18 +410,30 @@ lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_aes.h
 lib/clang/%%CLANG_RELEASE%%/include/__wmmintrin_pclmul.h
 lib/clang/%%CLANG_RELEASE%%/include/ammintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/arm_neon.h
+lib/clang/%%CLANG_RELEASE%%/include/avx2intrin.h
+lib/clang/%%CLANG_RELEASE%%/include/avxintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/bmi2intrin.h
+lib/clang/%%CLANG_RELEASE%%/include/bmiintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/emmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/f16cintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/fma4intrin.h
+lib/clang/%%CLANG_RELEASE%%/include/fmaintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/immintrin.h
-lib/clang/%%CLANG_RELEASE%%/include/mm3dnow.h
-lib/clang/%%CLANG_RELEASE%%/include/mm_malloc.h
+lib/clang/%%CLANG_RELEASE%%/include/lzcntintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/mmintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/module.map
 lib/clang/%%CLANG_RELEASE%%/include/nmmintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/pmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/popcntintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/prfchwintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/rdseedintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/rtmintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/smmintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/tmmintrin.h
 lib/clang/%%CLANG_RELEASE%%/include/wmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/x86intrin.h
 lib/clang/%%CLANG_RELEASE%%/include/xmmintrin.h
+lib/clang/%%CLANG_RELEASE%%/include/xopintrin.h
 lib/libclang.a
 lib/libclang.so
 lib/libclangARCMigrate.a
diff --git a/lang/dragonegg-devel46/Makefile b/lang/dragonegg-devel46/Makefile
index 21b5228d795b..58c4ca0f176e 100644
--- a/lang/dragonegg-devel46/Makefile
+++ b/lang/dragonegg-devel46/Makefile
@@ -2,7 +2,7 @@
 #
 
 PORTNAME=	dragonegg46
-PORTVERSION=	3.3.r${SVN_REV}
+PORTVERSION=	3.4.r${SVN_REV}
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
diff --git a/lang/dragonegg-devel46/distinfo b/lang/dragonegg-devel46/distinfo
index 867764d6cca8..69386cf6d0d7 100644
--- a/lang/dragonegg-devel46/distinfo
+++ b/lang/dragonegg-devel46/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dragonegg-3.3.r176188.tar.bz2) = 82c78674138653bfdbb95687865663e5b9ddf23d3c37049d69fef1579806c563
-SIZE (dragonegg-3.3.r176188.tar.bz2) = 396332
+SHA256 (dragonegg-3.4.r181598.tar.bz2) = ac6aecd923a743a07a8ebde3b483255ef20158f715efdca8b50d5aa474e4adc1
+SIZE (dragonegg-3.4.r181598.tar.bz2) = 395308