<!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>[136514] 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/136514">136514</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-05-19 23:03:24 -0700 (Tue, 19 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>codeblocks: upgrade to the latest version from SVN (patches integrated upstream)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksPortfile">trunk/dports/devel/codeblocks/Portfile</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilesREADME">trunk/dports/devel/codeblocks/files/README</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsdkconfigmanagercpp">trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksfilespatchconfiguremallocdiff">trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcincludeMakefilediff">trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcodeblocksPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/Portfile (136513 => 136514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/Portfile 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/Portfile 2015-05-20 06:03:24 UTC (rev 136514)
</span><span class="lines">@@ -2,24 +2,25 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup github 1.0
</ins><span class="cx"> PortGroup wxWidgets 1.0
</span><span class="cx">
</span><ins>+# 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
</ins><span class="cx"> name codeblocks
</span><span class="cx"> version 13.12
</span><del>-# set release 1
-revision 2
</del><ins>+revision 3
</ins><span class="cx">
</span><del>-fetch.type svn
-svn.url https://svn.code.sf.net/p/codeblocks/code/trunk
-svn.revision 10251
-worksrcdir trunk
</del><ins>+# fetch.type svn
+# svn.url https://svn.code.sf.net/p/codeblocks/code/trunk
+# svn.revision 10305
+# worksrcdir trunk
</ins><span class="cx">
</span><del>-# alternative unofficial mirror to allow fetching from a tarball
-# github.setup obfuscated codeblocks_sf ...
-
</del><span class="cx"> platforms darwin freebsd
</span><span class="cx"> categories devel aqua x11
</span><span class="cx"> license GPL-3+
</span><ins>+license_noconflict boost
</ins><span class="cx"> # I'm looking for a volunteer to take the port over
</span><span class="cx"> maintainers mojca openmaintainer
</span><span class="cx"> description Open Source, Cross-platform, Free C/C++/D IDE
</span><span class="lines">@@ -29,13 +30,10 @@
</span><span class="cx"> extensible and configurable.
</span><span class="cx">
</span><span class="cx"> homepage http://www.codeblocks.org/
</span><del>-# master_sites http://download.berlios.de/codeblocks/ \
-# sourceforge:codeblocks
-# distname ${name}_${version}-${release}
-# worksrcdir ${name}-${version}
-# checksums rmd160 e5e469431b792687ba029689b1107a0d735bce8b \
-# sha256 772450046e8c8ba2ea0086acf433a46b83e6254fae64df9c8ca132a22f949610
</del><span class="cx">
</span><ins>+checksums rmd160 9af61b95628df2cbab91335f51f2402444c1e64c \
+ sha256 730be0560e57e9b3de8e7ad29f90e6794b6ba78bfc6429e49439c4975b178d02
+
</ins><span class="cx"> depends_build port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:libtool \
</span><span class="lines">@@ -44,12 +42,8 @@
</span><span class="cx"> depends_lib port:boost \
</span><span class="cx"> port:hunspell
</span><span class="cx">
</span><del>-patchfiles patch-configure-malloc.diff \
- patch-src-include-Makefile.diff
</del><ins>+patchfiles patch-sdk-configmanager.cpp
</ins><span class="cx">
</span><del>-# not sure what this patch was used for
-# patch-sdk-configmanager.cpp
-
</del><span class="cx"> use_autoconf yes
</span><span class="cx"> autoconf.cmd ./bootstrap
</span><span class="cx">
</span><span class="lines">@@ -118,21 +112,15 @@
</span><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><del>- post-patch {
- file mkdir "${worksrcpath}/m4"
- file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
- }
</del><ins>+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
</ins><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant wxwidgets28 conflicts wxwidgets30 wxgtk30 wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
</span><span class="cx"> wxWidgets.use wxWidgets-2.8
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><ins>+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
</ins><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><del>- post-patch {
- file mkdir "${worksrcpath}/m4"
- file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
- }
</del><span class="cx">
</span><span class="cx"> if {${wxWidgets.sdk} ne ""} {
</span><span class="cx"> configure.sdkroot ${wxWidgets.sdk}
</span><span class="lines">@@ -142,20 +130,14 @@
</span><span class="cx"> variant wxgtk30 conflicts wxwidgets30 wxwidgets28 wxgtk28 description {Use wxWidgets 3.0 with GTK} {
</span><span class="cx"> wxWidgets.use wxGTK-3.0
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><ins>+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
</ins><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><del>- post-patch {
- file mkdir "${worksrcpath}/m4"
- file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant wxgtk28 conflicts wxwidgets30 wxwidgets28 wxgtk30 description {Use wxWidgets 2.8 with GTK} {
</span><span class="cx"> wxWidgets.use wxGTK-2.8
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><del>- post-patch {
- file mkdir "${worksrcpath}/m4"
- file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
- }
</del><ins>+ autoconf.env-append ACLOCAL_PATH=${wxWidgets.prefix}/share/aclocal
</ins><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilesREADME"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/README (136513 => 136514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/README 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/README 2015-05-20 06:03:24 UTC (rev 136514)
</span><span class="lines">@@ -1,10 +1,7 @@
</span><span class="cx"> Summary of issues that need to be properly fixed upstream:
</span><del>- * https://sourceforge.net/p/codeblocks/tickets/11/
- patch-configure-malloc.diff
- * test for sys/malloc.h instead of malloc.h
</del><ins>+ (currently none)
</ins><span class="cx">
</span><del>-Patches written by afb (review and submit upstream):
- * patch-src-include-Makefile.diff
</del><ins>+Patches written by afb (submit upstream):
</ins><span class="cx"> * patch-sdk-configmanager.cpp
</span><span class="cx">
</span><span class="cx"> See also:
</span></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchconfiguremallocdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff (136513 => 136514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff 2015-05-20 06:03:24 UTC (rev 136514)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-https://sourceforge.net/p/codeblocks/tickets/11/
-
-#--- configure.orig
-#+++ configure
-#@@ -16967,7 +16967,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
-#
-# fi
-#
-#-for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h
-#+for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h
-# do :
-# as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-# ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
---- configure.ac.orig
-+++ configure.ac
-@@ -41,7 +41,7 @@ AC_PROG_LIBTOOL
- dnl Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
--AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h])
-+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h sys/malloc.h malloc/malloc.h])
-
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_HEADER_STDBOOL
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsdkconfigmanagercpp"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp (136513 => 136514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2015-05-20 06:03:24 UTC (rev 136514)
</span><span class="lines">@@ -1,16 +1,18 @@
</span><span class="cx"> written by afb
</span><span class="cx">
</span><ins>+properly sets the directory where CB looks for plugins
+
</ins><span class="cx"> --- src/sdk/configmanager.cpp.orig
</span><span class="cx"> +++ src/sdk/configmanager.cpp
</span><del>-@@ -1442,8 +1442,10 @@ void ConfigManager::InitPaths()
</del><ins>+@@ -1504,8 +1504,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><del>-- if(platform::windows || platform::macosx)
-+ if(platform::windows)
</del><ins>+- if (platform::windows || platform::macosx)
++ if (platform::windows)
</ins><span class="cx"> ConfigManager::plugin_path_global = data_path_global;
</span><del>-+ else if(platform::macosx)
</del><ins>++ else if (platform::macosx)
</ins><span class="cx"> + ConfigManager::plugin_path_global = res_path + _T("/lib/codeblocks/plugins");
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- ConfigManager::plugin_path_global = wxStandardPathsBase::Get().GetPluginsDir() + _T("/plugins");
</del><ins>+ // It seems we can not longer rely on wxStandardPathsBase::Get().GetPluginsDir(),
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcincludeMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff (136513 => 136514)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff 2015-05-20 03:11:57 UTC (rev 136513)
+++ trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff 2015-05-20 06:03:24 UTC (rev 136514)
</span><span class="lines">@@ -1,88 +0,0 @@
</span><del>-written by afb
-
---- src/include/Makefile.am.orig
-+++ src/include/Makefile.am
-@@ -1,13 +1,14 @@
- SUBDIRS = scripting tinyxml
-
- if PRECOMPILE_HEADERS
--BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
-- $(top_builddir)/src/include/sdk_precomp.h.gch
-+BUILT_SOURCES = sdk.h.gch \
-+ sdk_precomp.h.gch
- else
- BUILT_SOURCES =
- endif
-
- AM_CPPFLAGS = $(WX_CXXFLAGS) \
-+ -I$(top_builddir)/src/include \
- -I$(top_srcdir)/src/include \
- -I$(top_srcdir)/src/sdk/wxscintilla/include \
- -I$(top_srcdir)/src/include/tinyxml \
-@@ -175,16 +176,16 @@ ALLHEADERS = annoyingdialog.h \
-
- sdk_HEADERS = $(ALLHEADERS)
-
--$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
-- -rm -f $(top_builddir)/src/include/sdk.h.gch
-- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
-+sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
-+ -rm -f sdk.h.gch
-+ $(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
-
--$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
-- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-+sdk_precomp.h.gch: $(ALLHEADERS)
-+ -rm -f sdk_precomp.h.gch
-+ $(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-
- clean-local:
-- -rm -f $(top_builddir)/src/include/sdk.h.gch
-- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-+ -rm -f sdk.h.gch
-+ -rm -f sdk_precomp.h.gch
-
- EXTRA_DIST = autorevision.h
-#--- src/include/Makefile.in.orig
-#+++ src/include/Makefile.in
-#@@ -362,10 +362,11 @@ top_builddir = @top_builddir@
-# top_srcdir = @top_srcdir@
-# SUBDIRS = scripting tinyxml
-# @PRECOMPILE_HEADERS_FALSE@BUILT_SOURCES =
-#-@PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
-#-@PRECOMPILE_HEADERS_TRUE@ $(top_builddir)/src/include/sdk_precomp.h.gch
-#+@PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = sdk.h.gch \
-#+@PRECOMPILE_HEADERS_TRUE@ sdk_precomp.h.gch
-#
-# AM_CPPFLAGS = $(WX_CXXFLAGS) \
-#+ -I$(top_builddir)/src/include \
-# -I$(top_srcdir)/src/include \
-# -I$(top_srcdir)/src/sdk/wxscintilla/include \
-# -I$(top_srcdir)/src/include/tinyxml \
-#@@ -929,17 +930,17 @@ uninstall-am: uninstall-sdkHEADERS
-# uninstall-sdkHEADERS
-#
-#
-#-$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
-#- -rm -f $(top_builddir)/src/include/sdk.h.gch
-#- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
-#+sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
-#+ -rm -f sdk.h.gch
-#+ $(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
-#
-#-$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
-#- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-#- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-#+sdk_precomp.h.gch: $(ALLHEADERS)
-#+ -rm -f sdk_precomp.h.gch
-#+ $(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
-#
-# clean-local:
-#- -rm -f $(top_builddir)/src/include/sdk.h.gch
-#- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
-#+ -rm -f sdk.h.gch
-#+ -rm -f sdk_precomp.h.gch
-#
-# # Tell versions [3.59,3.63) of GNU make to not export all variables.
-# # Otherwise a system limit (for SysV at least) may be exceeded.
</del></span></pre>
</div>
</div>
</body>
</html>