<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128634] trunk/dports/lang/llvm-3.6</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128634">128634</a></dd>
<dt>Author</dt> <dd>jeremyhu@macports.org</dd>
<dt>Date</dt> <dd>2014-11-24 12:37:09 -0800 (Mon, 24 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>{clang,llvm}-3.6: Bump to trunk <a href="https://trac.macports.org/changeset/222672">r222672</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangllvm36Portfile">trunk/dports/lang/llvm-3.6/Portfile</a></li>
<li><a href="#trunkdportslangllvm36filesclangformatpatch">trunk/dports/lang/llvm-3.6/files/clang-format.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangllvm36Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/Portfile (128633 => 128634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/Portfile 2014-11-24 20:29:44 UTC (rev 128633)
+++ trunk/dports/lang/llvm-3.6/Portfile 2014-11-24 20:37:09 UTC (rev 128634)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> fetch.type svn
</span><del>-svn.revision 216817
</del><ins>+svn.revision 222672
</ins><span class="cx">
</span><span class="cx"> set compiler_rt_rev ${svn.revision}
</span><span class="cx"> set libcxx_rev ${svn.revision}
</span></span></pre></div>
<a id="trunkdportslangllvm36filesclangformatpatch"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/llvm-3.6/files/clang-format.patch (128633 => 128634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/llvm-3.6/files/clang-format.patch 2014-11-24 20:29:44 UTC (rev 128633)
+++ trunk/dports/lang/llvm-3.6/files/clang-format.patch 2014-11-24 20:37:09 UTC (rev 128634)
</span><span class="lines">@@ -1,6 +1,20 @@
</span><del>---- a/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2012-04-20 10:09:40.000000000 -0700
-@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+diff -Naurp trunk.orig/Makefile trunk/Makefile
+--- trunk.orig/Makefile 2014-11-24 11:32:24.000000000 -0800
++++ trunk/Makefile 2014-11-24 11:34:41.000000000 -0800
+@@ -71,7 +71,8 @@ ifeq ($(MAKECMDGOALS),install-clang)
+ tools/clang/tools/libclang \
+ tools/clang/tools/c-index-test \
+ tools/clang/runtime tools/clang/docs \
+- tools/clang/include tools/clang/lib
++ tools/clang/include tools/clang/lib \
++ tools/clang/tools/clang-format
+ OPTIONAL_DIRS :=
+ NO_INSTALL = 1
+ endif
+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript
+--- trunk.orig/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format-bbedit.applescript 2014-11-24 11:34:41.000000000 -0800
+@@ -15,7 +15,7 @@ tell application "BBEdit"
</ins><span class="cx"> end tell
</span><span class="cx">
</span><span class="cx"> set filePath to urlToPOSIXPath(fileURL)
</span><span class="lines">@@ -9,9 +23,10 @@
</span><span class="cx">
</span><span class="cx"> tell application "BBEdit"
</span><span class="cx"> -- "set contents of text document 1 to newContents" scrolls to the bottom while
</span><del>---- a/tools/clang/tools/clang-format/clang-format-diff.py 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-diff.py 2012-04-20 10:09:40.000000000 -0700
-@@ -15,7 +15,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py trunk/tools/clang/tools/clang-format/clang-format-diff.py
+--- trunk.orig/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format-diff.py 2014-11-24 11:34:41.000000000 -0800
+@@ -32,7 +32,7 @@ import sys
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="lines">@@ -20,11 +35,23 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def main():
</span><ins>+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py trunk/tools/clang/tools/clang-format/clang-format-sublime.py
+--- trunk.orig/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format-sublime.py 2014-11-24 11:34:41.000000000 -0800
+@@ -18,7 +18,7 @@ import sublime_plugin
+ import subprocess
</ins><span class="cx">
</span><del>---- a/tools/clang/tools/clang-format/clang-format.el 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format.el 2012-04-20 10:09:40.000000000 -0700
-@@ -13,7 +13,7 @@ ifeq ($(HOST_OS),Darwin)
</del><ins>+ # Change this to the full path if clang-format is not on the path.
+-binary = 'clang-format'
++binary = '@CLANG_FORMAT_PATH@'
</ins><span class="cx">
</span><ins>+ # Change this to format according to other formatting styles. See the output of
+ # 'clang-format --help' for a list of supported styles. The default looks for
+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.el trunk/tools/clang/tools/clang-format/clang-format.el
+--- trunk.orig/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format.el 2014-11-24 11:34:41.000000000 -0800
+@@ -13,7 +13,7 @@
+
</ins><span class="cx"> ;; *Location of the clang-format binary. If it is on your PATH, a full path name
</span><span class="cx"> ;; need not be specified.
</span><span class="cx"> -(defvar clang-format-binary "clang-format")
</span><span class="lines">@@ -32,39 +59,15 @@
</span><span class="cx">
</span><span class="cx"> (defun clang-format-region ()
</span><span class="cx"> "Use clang-format to format the currently active region."
</span><del>---- a/tools/clang/tools/clang-format/clang-format.py 2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format.py 2012-04-20 10:09:40.000000000 -0700
-@@ -24,7 +24,7 @@ ifeq ($(HOST_OS),Darwin)
- import vim
</del><ins>+diff -Naurp trunk.orig/tools/clang/tools/clang-format/clang-format.py trunk/tools/clang/tools/clang-format/clang-format.py
+--- trunk.orig/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:31:46.000000000 -0800
++++ trunk/tools/clang/tools/clang-format/clang-format.py 2014-11-24 11:35:39.000000000 -0800
+@@ -25,7 +25,7 @@ import vim
</ins><span class="cx">
</span><ins>+ # set g:clang_format_path to the path to clang-format if it is not on the path
</ins><span class="cx"> # Change this to the full path if clang-format is not on the path.
</span><span class="cx"> -binary = 'clang-format'
</span><span class="cx"> +binary = '@CLANG_FORMAT_PATH@'
</span><ins>+ if vim.eval('exists("g:clang_format_path")') == "1":
+ binary = vim.eval('g:clang_format_path')
</ins><span class="cx">
</span><del>- # Change this to format according to other formatting styles. See the output of
- # 'clang-format --help' for a list of supported styles. The default looks for
-
---- a/tools/clang/tools/clang-format/clang-format-sublime.py2011-07-09 14:35:58.000000000 -0700
-+++ b/tools/clang/tools/clang-format/clang-format-sublime.py 2012-04-20 10:09:40.000000000 -0700
-@@ -18,7 +18,7 @@ ifeq ($(HOST_OS),Darwin)
- import subprocess
-
- # Change this to the full path if clang-format is not on the path.
--binary = 'clang-format'
-+binary = '@CLANG_FORMAT_PATH@'
-
- # Change this to format according to other formatting styles. See the output of
- # 'clang-format --help' for a list of supported styles. The default looks for
---- a/Makefile 2013-10-02 08:42:23.000000000 -0700
-+++ b/Makefile 2013-10-24 10:57:33.000000000 -0700
-@@ -70,8 +70,9 @@ ifeq ($(MAKECMDGOALS),install-clang)
- DIRS := tools/clang/tools/driver tools/clang/lib/Headers \
- tools/clang/tools/libclang \
- tools/clang/tools/c-index-test \
- tools/clang/runtime tools/clang/docs \
-- tools/clang/include tools/clang/lib
-+ tools/clang/include tools/clang/lib \
-+ tools/clang/tools/clang-format
- OPTIONAL_DIRS :=
- NO_INSTALL = 1
- endif
</del></span></pre>
</div>
</div>
</body>
</html>