4 files changed, 32 insertions, 40 deletions

diff --git a/lang/clang-cheri/Makefile b/lang/clang-cheri/Makefile
index 5a09e5304ce7..e9461fa55945 100644
--- a/lang/clang-cheri/Makefile
+++ b/lang/clang-cheri/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	clang-cheri
-PORTVERSION=	3.4.20140423
-PORTREVISION=	1
+PORTVERSION=	3.4.20140505
 CATEGORIES=	lang devel
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	brooks
@@ -85,6 +84,10 @@ FIRST_COMMAND=	${COMMANDS:C/^/XXXX/1:MXXXX*:C/^XXXX//}
 
 .include <bsd.port.pre.mk>
 
+.if ${CHOSEN_COMPILER_TYPE} == "gcc"
+BROKEN=	build errors when C++11 compiler is gcc
+.endif
+
 .if defined(BOOTSTRAP) || defined(SVN_FETCH)
 FETCH_DEPENDS+= svn:${PORTSDIR}/devel/subversion
 
diff --git a/lang/clang-cheri/distinfo b/lang/clang-cheri/distinfo
index c32348183fcc..0f93b7984b65 100644
--- a/lang/clang-cheri/distinfo
+++ b/lang/clang-cheri/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clang-cheri-3.4.20140423.tar.bz2) = fa4a5271dc6acb7045176f15517fd98701f4bc0e5b42349bc688e2f2893219c4
-SIZE (clang-cheri-3.4.20140423.tar.bz2) = 30947350
+SHA256 (clang-cheri-3.4.20140505.tar.bz2) = 55d8a7404a975acbc70c34378572e45e92211a2b1a05d7615148a54a853ed70d
+SIZE (clang-cheri-3.4.20140505.tar.bz2) = 31363046
diff --git a/lang/clang-cheri/files/patch-tools_lldb_scripts_Python_finish-swig-Python-LLDB.sh b/lang/clang-cheri/files/patch-tools__lldb__scripts__Python__build-swig-Python.sh
index 02b66dfeb500..b8a522e0ccd5 100644
--- a/lang/clang-cheri/files/patch-tools_lldb_scripts_Python_finish-swig-Python-LLDB.sh
+++ b/lang/clang-cheri/files/patch-tools__lldb__scripts__Python__build-swig-Python.sh
@@ -1,29 +1,25 @@
-
-$FreeBSD$
-
---- tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh.orig
-+++ tools/lldb/scripts/Python/finish-swig-Python-LLDB.sh
-@@ -34,6 +34,9 @@
- debug_flag=$5
- makefile_flag=$6
+--- ./tools/lldb/scripts/Python/build-swig-Python.sh.orig	2014-05-05 20:41:29.801563675 +0000
++++ ./tools/lldb/scripts/Python/build-swig-Python.sh	2014-05-05 20:42:49.410572418 +0000
+@@ -20,6 +20,8 @@
+ makefile_flag=$7
+ dependency_flag=$8
  
-+# /usr/bin/env python
 +PYTHON=${PYTHON_EXECUTABLE:-/usr/bin/env python}
 +
- # If we don't want Python, then just do nothing here.
- # Note, at present iOS doesn't have Python, so if you're building for iOS be sure to
- # set LLDB_DISABLE_PYTHON to 1.
-@@ -55,7 +58,7 @@
+ if [ -n "$makefile_flag" -a "$makefile_flag" = "-m" ]
+ then
+     MakefileCalled=1
+@@ -292,7 +294,7 @@
+     fi
  fi
  
- OS_NAME=`uname -s`
--PYTHON_VERSION=`/usr/bin/env python --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'`
-+PYTHON_VERSION=`${PYTHON} --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'`
- 
- 
- if [ $Debug -eq 1 ]
-@@ -100,9 +103,9 @@
+-python_version=`/usr/bin/env python --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'`
++python_version=`${PYTHON} --version 2>&1 | sed -e 's,Python ,,' -e 's,[.][0-9],,2' -e 's,[a-z][a-z][0-9],,'`
  
+ if [ $MakefileCalled -eq 0 ]
+ then
+@@ -300,9 +302,9 @@
+ else
      if [ -n "${PYTHON_INSTALL_DIR}" ]
      then
 -        framework_python_dir=`/usr/bin/env python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(True, False, \"${PYTHON_INSTALL_DIR}\");"`/lldb
@@ -34,3 +30,12 @@ $FreeBSD$
      fi
  fi
  
+@@ -353,7 +355,7 @@
+ current_dir=`pwd`
+ if [ -f "${current_dir}/modify-python-lldb.py" ]
+ then
+-    /usr/bin/env python ${current_dir}/modify-python-lldb.py ${CONFIG_BUILD_DIR}
++    ${PYTHON} ${current_dir}/modify-python-lldb.py ${CONFIG_BUILD_DIR}
+ fi
+ 
+ 
diff --git a/lang/clang-cheri/files/patch-tools_lldb_scripts_CMakeLists.txt b/lang/clang-cheri/files/patch-tools_lldb_scripts_CMakeLists.txt
deleted file mode 100644
index fdb6c85bb208..000000000000
--- a/lang/clang-cheri/files/patch-tools_lldb_scripts_CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- tools/lldb/scripts/CMakeLists.txt.orig
-+++ tools/lldb/scripts/CMakeLists.txt
-@@ -8,8 +8,8 @@
-   DEPENDS ${SWIG_INPUTS}
-   # swig was directly invoked on Windows (where the Python API is not being generated) but on other platforms, we need to run the *swig-wrapper-classes.sh shell-scripts.
-   #COMMAND swig -c++ -shadow -python -I${LLDB_SOURCE_DIR}/include -I./. -outdir ${LLDB_SOURCE_DIR}/scripts/Python  -o ${LLDB_SOURCE_DIR}/source/LLDBWrapPython.cpp ${LLDB_SOURCE_DIR}/scripts/lldb.swig
--  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/build-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m
--  COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/finish-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m
-+  COMMAND env PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/build-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m
-+  COMMAND env PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/finish-swig-wrapper-classes.sh ${LLDB_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR} -m
-   COMMENT "Building lldb python wrapper")
- set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp PROPERTIES GENERATED 1)
-