9 files changed, 45 insertions, 27 deletions

diff --git a/devel/clang/Makefile b/devel/clang/Makefile
index 00f282ed3f02..a07989493ba3 100644
--- a/devel/clang/Makefile
+++ b/devel/clang/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clang
 PORTVERSION=	2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/devel/clang/files/patch-tools_clang_lib_Headers_Makefile b/devel/clang/files/patch-tools_clang_lib_Headers_Makefile
new file mode 100644
index 000000000000..3495644fd523
--- /dev/null
+++ b/devel/clang/files/patch-tools_clang_lib_Headers_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/devel/clang/files/Attic/patch-tools_clang_lib_Headers_Makefile,v 1.1 2010-02-16 18:27:16 brooks Exp $
+
+--- 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 := $(notdir $(wildcard $(PROJ_SRC_DIR)/*mm*.h))
+ 
+ OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS))
+ 
diff --git a/devel/clang/pkg-plist b/devel/clang/pkg-plist
index 1387c22cc5fe..20a7a0d350e2 100644
--- a/devel/clang/pkg-plist
+++ b/devel/clang/pkg-plist
@@ -2,17 +2,9 @@ bin/ccc-analyzer
 bin/clang
 bin/scan-build
 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/stdarg.h
-lib/clang/1.0/include/stdbool.h
-lib/clang/1.0/include/stddef.h
-lib/clang/1.0/include/stdint.h
-lib/clang/1.0/include/tgmath.h
 lib/clang/1.0/include/tmmintrin.h
 lib/clang/1.0/include/xmmintrin.h
 libexec/clang-cc
diff --git a/lang/clang-devel/Makefile b/lang/clang-devel/Makefile
index 00f282ed3f02..a07989493ba3 100644
--- a/lang/clang-devel/Makefile
+++ b/lang/clang-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clang
 PORTVERSION=	2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile b/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile
new file mode 100644
index 000000000000..a131848ac069
--- /dev/null
+++ b/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/lang/clang-devel/files/patch-tools_clang_lib_Headers_Makefile,v 1.1 2010-02-16 18:27:16 brooks Exp $
+
+--- 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 := $(notdir $(wildcard $(PROJ_SRC_DIR)/*mm*.h))
+ 
+ OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS))
+ 
diff --git a/lang/clang-devel/pkg-plist b/lang/clang-devel/pkg-plist
index 1387c22cc5fe..20a7a0d350e2 100644
--- a/lang/clang-devel/pkg-plist
+++ b/lang/clang-devel/pkg-plist
@@ -2,17 +2,9 @@ bin/ccc-analyzer
 bin/clang
 bin/scan-build
 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/stdarg.h
-lib/clang/1.0/include/stdbool.h
-lib/clang/1.0/include/stddef.h
-lib/clang/1.0/include/stdint.h
-lib/clang/1.0/include/tgmath.h
 lib/clang/1.0/include/tmmintrin.h
 lib/clang/1.0/include/xmmintrin.h
 libexec/clang-cc
diff --git a/lang/clang/Makefile b/lang/clang/Makefile
index 00f282ed3f02..a07989493ba3 100644
--- a/lang/clang/Makefile
+++ b/lang/clang/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clang
 PORTVERSION=	2.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel lang
 MASTER_SITES=	http://llvm.org/releases/${PORTVERSION}/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/lang/clang/files/patch-tools_clang_lib_Headers_Makefile b/lang/clang/files/patch-tools_clang_lib_Headers_Makefile
new file mode 100644
index 000000000000..09bfad734365
--- /dev/null
+++ b/lang/clang/files/patch-tools_clang_lib_Headers_Makefile
@@ -0,0 +1,14 @@
+
+$FreeBSD: /tmp/pcvs/ports/lang/clang/files/patch-tools_clang_lib_Headers_Makefile,v 1.1 2010-02-16 18:27:16 brooks Exp $
+
+--- 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 := $(notdir $(wildcard $(PROJ_SRC_DIR)/*mm*.h))
+ 
+ OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS))
+ 
diff --git a/lang/clang/pkg-plist b/lang/clang/pkg-plist
index 1387c22cc5fe..20a7a0d350e2 100644
--- a/lang/clang/pkg-plist
+++ b/lang/clang/pkg-plist
@@ -2,17 +2,9 @@ bin/ccc-analyzer
 bin/clang
 bin/scan-build
 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/stdarg.h
-lib/clang/1.0/include/stdbool.h
-lib/clang/1.0/include/stddef.h
-lib/clang/1.0/include/stdint.h
-lib/clang/1.0/include/tgmath.h
 lib/clang/1.0/include/tmmintrin.h
 lib/clang/1.0/include/xmmintrin.h
 libexec/clang-cc