<!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>[147181] trunk/dports/devel/codeblocks</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/147181">147181</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2016-03-30 06:11:37 -0700 (Wed, 30 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>codeblocks: upgrade to version 16.01</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksPortfile">trunk/dports/devel/codeblocks/Portfile</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsdkconfigmanagercpp">trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcodeblocksPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/Portfile (147180 => 147181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/Portfile 2016-03-30 13:08:49 UTC (rev 147180)
+++ trunk/dports/devel/codeblocks/Portfile 2016-03-30 13:11:37 UTC (rev 147181)
</span><span class="lines">@@ -2,21 +2,11 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup github 1.0
</del><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><del>-# alternative unofficial mirror to allow fetching from a tarball
-# or: https://cgit.jenslody.de/codeblocks/snapshot/codeblocks-<checksum>.tar.xz
-github.setup obfuscated codeblocks_sf 33d975c
</del><span class="cx"> name codeblocks
</span><del>-version 13.12
-revision 3
</del><ins>+version 16.01
</ins><span class="cx">
</span><del>-# fetch.type svn
-# svn.url https://svn.code.sf.net/p/codeblocks/code/trunk
-# svn.revision 10305
-# worksrcdir trunk
-
</del><span class="cx"> platforms darwin freebsd
</span><span class="cx"> categories devel aqua x11
</span><span class="cx"> license GPL-3+
</span><span class="lines">@@ -30,23 +20,30 @@
</span><span class="cx"> extensible and configurable.
</span><span class="cx">
</span><span class="cx"> homepage http://www.codeblocks.org/
</span><ins>+master_sites sourceforge:project/codeblocks/Sources/${version}
</ins><span class="cx">
</span><del>-checksums rmd160 9af61b95628df2cbab91335f51f2402444c1e64c \
- sha256 730be0560e57e9b3de8e7ad29f90e6794b6ba78bfc6429e49439c4975b178d02
</del><ins>+distname ${name}_${version}
+worksrcdir ${name}-${version}.release
</ins><span class="cx">
</span><del>-depends_build port:autoconf \
- port:automake \
- port:libtool \
- port:pkgconfig
</del><ins>+checksums rmd160 e98b034eb8d6cf52a89312f2d5eaa10b17f1355e \
+ sha256 30fb9d206df4ab3c2e2fec2451a0a7c9723bfed9a673cc9be71e881c529d5a03
</ins><span class="cx">
</span><ins>+depends_build port:pkgconfig
+
</ins><span class="cx"> depends_lib port:boost \
</span><span class="cx"> port:hunspell
</span><span class="cx">
</span><del>-patchfiles patch-sdk-configmanager.cpp
-
</del><ins>+# TODO: for a weird reason CB tries to run autotools and fails
+# once a bug is fixed, we'll no longer need these dependencies
+depends_build-append \
+ port:autoconf \
+ port:automake \
+ port:libtool
</ins><span class="cx"> use_autoconf yes
</span><span class="cx"> autoconf.cmd ./bootstrap
</span><span class="cx">
</span><ins>+patchfiles patch-sdk-configmanager.cpp
+
</ins><span class="cx"> # FileManager requires "gamin" to be installed when using wxGTK,
</span><span class="cx"> # not sure whether it works with Carbon/Cocoa at all,
</span><span class="cx"> # so it was disabled for now
</span><span class="lines">@@ -59,8 +56,8 @@
</span><span class="cx"> system "strip -S ${destroot}${prefix}/lib/libcodeblocks*.dylib || true"
</span><span class="cx"> system "strip -S ${destroot}${prefix}/lib/libwxsmithlib*.so || true"
</span><span class="cx"> system "strip -S ${destroot}${prefix}/lib/libwxsmithlib*.dylib || true"
</span><del>- system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.so || true"
- system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.dylib || true"
</del><ins>+# system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.so || true"
+# system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.dylib || true"
</ins><span class="cx"> system "strip -S ${destroot}${prefix}/lib/codeblocks/plugins/*.so"
</span><span class="cx">
</span><span class="cx"> set appPath ${destroot}${applications_dir}/CodeBlocks.app/Contents
</span><span class="lines">@@ -101,14 +98,6 @@
</span><span class="cx"> configure.args-append --disable-pch
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# TODO: keep the old variants/descriptions?
-# variant aqua / x11
-# variant aqua conflicts x11 description "Use the wxMac port of wxWidgets"
-# variant x11 description "Use the wxGTK port of wxWidgets"
-
-variant aqua {}
-variant x11 {}
-
</del><span class="cx"> variant wxwidgets30 conflicts wxwidgets28 wxgtk30 wxgtk28 description {Use Cocoa-based wxWidgets 3.0} {
</span><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><span class="lines">@@ -168,15 +157,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk30] && ![variant_isset wxgtk28]} {
</span><del>- if {[variant_isset aqua]} {
- default_variants +wxwidgets28
- } elseif {[variant_isset x11]} {
- default_variants +wxgtk28
- } else {
- default_variants +wxwidgets30
- }
</del><ins>+ default_variants +wxwidgets30
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}/downloads/source
</span><del>-livecheck.regex <p>${name}_(\[0-9.\]+)-\\d+${extract.suffix}</p>
</del><ins>+livecheck.regex <p>${name}_(\[0-9.\]+)${extract.suffix}</p>
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsdkconfigmanagercpp"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp (147180 => 147181)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2016-03-30 13:08:49 UTC (rev 147180)
+++ trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2016-03-30 13:11:37 UTC (rev 147181)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> --- src/sdk/configmanager.cpp.orig
</span><span class="cx"> +++ src/sdk/configmanager.cpp
</span><del>-@@ -1504,8 +1504,10 @@ void ConfigManager::InitPaths()
</del><ins>+@@ -1503,8 +1503,10 @@ void ConfigManager::InitPaths()
</ins><span class="cx"> #ifdef CB_AUTOCONF
</span><span class="cx"> if (plugin_path_global.IsEmpty())
</span><span class="cx"> {
</span></span></pre>
</div>
</div>
</body>
</html>