<!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>[135776] 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/135776">135776</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-05-02 12:22:21 -0700 (Sat, 02 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>codeblocks: upgrade to the latest SVN revision with many patches integrated upstream (#40390)</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="#trunkdportsdevelcodeblocksfilespatchconfiguremallocdiff">trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsdkconfigmanagercpp">trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcincludeMakefilediff">trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksfilespatchMakefilediff">trunk/dports/devel/codeblocks/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchconfigurehunspelldiff">trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchconfigurenodebugdiff">trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcpluginscontribNassiShneidermanNassiViewcppdiff">trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcsdkwxscintillasrcscintillasrcCallTiphdiff">trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcsrcMakefileindiff">trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.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 (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/Portfile 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/Portfile 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -6,8 +6,17 @@
</span><span class="cx">
</span><span class="cx"> name codeblocks
</span><span class="cx"> version 13.12
</span><del>-set release 1
-revision 1
</del><ins>+# set release 1
+revision 2
+
+fetch.type svn
+svn.url https://svn.code.sf.net/p/codeblocks/code/trunk
+svn.revision 10251
+worksrcdir trunk
+
+# alternative unofficial mirror to allow fetching from a tarball
+# github.setup obfuscated codeblocks_sf ...
+
</ins><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">@@ -20,28 +29,30 @@
</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><ins>+# master_sites http://download.berlios.de/codeblocks/ \
+# sourceforge:codeblocks
+# distname ${name}_${version}-${release}
+# worksrcdir ${name}-${version}
+# checksums rmd160 e5e469431b792687ba029689b1107a0d735bce8b \
+# sha256 772450046e8c8ba2ea0086acf433a46b83e6254fae64df9c8ca132a22f949610
</ins><span class="cx">
</span><del>-# TODO: maybe more dependencies are needed in this version, please help complete the list (see also the list below)
-depends_build path:bin/pkg-config:pkgconfig
</del><ins>+depends_build port:autoconf \
+ port:automake \
+ port:libtool \
+ port:pkgconfig
+
</ins><span class="cx"> depends_lib port:boost \
</span><span class="cx"> port:hunspell
</span><span class="cx">
</span><del>-patchfiles patch-Makefile.diff \
- patch-src-src-Makefile.in.diff \
- patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff \
- patch-configure-hunspell.diff \
- patch-configure-nodebug.diff \
- patch-configure-malloc.diff
</del><ins>+patchfiles patch-configure-malloc.diff \
+ patch-src-include-Makefile.diff
</ins><span class="cx">
</span><span class="cx"> # not sure what this patch was used for
</span><span class="cx"> # patch-sdk-configmanager.cpp
</span><span class="cx">
</span><ins>+use_autoconf yes
+autoconf.cmd ./bootstrap
+
</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">@@ -104,26 +115,51 @@
</span><span class="cx"> variant aqua {}
</span><span class="cx"> variant x11 {}
</span><span class="cx">
</span><del>-variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use wxWidgets 3.0 (experimental)} {
</del><ins>+variant wxwidgets30 conflicts wxwidgets28 wxgtk30 wxgtk28 description {Use Cocoa-based wxWidgets 3.0} {
</ins><span class="cx"> wxWidgets.use wxWidgets-3.0
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><del>- patchfiles-append patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
</del><ins>+ post-patch {
+ file mkdir "${worksrcpath}/m4"
+ file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+ }
</ins><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant wxwidgets28 conflicts wxwidgets30 wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
</del><ins>+variant wxwidgets28 conflicts wxwidgets30 wxgtk30 wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
</ins><span class="cx"> wxWidgets.use wxWidgets-2.8
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><del>- patchfiles-append patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
</del><span class="cx"> configure.args-append --with-wxdir=${wxWidgets.wxdir}
</span><ins>+ post-patch {
+ file mkdir "${worksrcpath}/m4"
+ file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+ }
</ins><span class="cx">
</span><span class="cx"> if {${wxWidgets.sdk} ne ""} {
</span><span class="cx"> configure.sdkroot ${wxWidgets.sdk}
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-variant wxgtk28 conflicts wxwidgets30 wxwidgets28 description {Use wxWidgets 2.8 with GTK} {
</del><ins>+
+variant wxgtk30 conflicts wxwidgets30 wxwidgets28 wxgtk28 description {Use wxWidgets 3.0 with GTK} {
+ wxWidgets.use wxGTK-3.0
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxdir=${wxWidgets.wxdir}
+ post-patch {
+ file mkdir "${worksrcpath}/m4"
+ file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+ }
+}
+
+variant wxgtk28 conflicts wxwidgets30 wxwidgets28 wxgtk30 description {Use wxWidgets 2.8 with GTK} {
</ins><span class="cx"> wxWidgets.use wxGTK-2.8
</span><ins>+ depends_lib-append port:${wxWidgets.port}
+ post-patch {
+ file mkdir "${worksrcpath}/m4"
+ file copy "${wxWidgets.prefix}/share/aclocal/wxwin.m4" "${worksrcpath}/m4"
+ }
+ configure.args-append --with-wxdir=${wxWidgets.wxdir}
+}
</ins><span class="cx">
</span><ins>+if {[variant_isset wxgtk28] || [variant_isset wxgtk30]} {
</ins><span class="cx"> # TODO: someone needs to do a careful check of this list of dependencies
</span><span class="cx"> # codeblocks ends up linking against these, but it is quite possible that
</span><span class="cx"> # some of them are also needed when liking against Carbon/Cocoa-based wxWidgets
</span><span class="lines">@@ -146,12 +182,10 @@
</span><span class="cx"> port:xorg-libXi \
</span><span class="cx"> port:xorg-libXinerama \
</span><span class="cx"> port:xorg-libXrandr \
</span><del>- port:xrender \
- port:${wxWidgets.port}
- configure.args-append --with-wxdir=${wxWidgets.wxdir}
</del><ins>+ port:xrender
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
</del><ins>+if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk30] && ![variant_isset wxgtk28]} {
</ins><span class="cx"> if {[variant_isset aqua]} {
</span><span class="cx"> default_variants +wxwidgets28
</span><span class="cx"> } elseif {[variant_isset x11]} {
</span></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilesREADME"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/README (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/README 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/README 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,30 +1,13 @@
</span><span class="cx"> Summary of issues that need to be properly fixed upstream:
</span><del>- * http://forums.codeblocks.org/index.php/topic,18394.0.html
- * https://trac.macports.org/ticket/40390
-
-
- * https://sourceforge.net/p/codeblocks/tickets/12/
- http://developer.berlios.de/bugs/?func=detailbug&bug_id=19136&group_id=5358
- patch-src-src-Makefile.in.diff
- * hardcoded libcodeblocks.la -> libcodeblocks.dylib
- * https://sourceforge.net/p/codeblocks/tickets/9/
- http://developer.berlios.de/bugs/?func=detailbug&bug_id=19110&group_id=5358
- patch-nodebug.diff
- * remove LDFLAGS="-Wl,--no-undefined" (which also overwrites other LDFLAGS)
- it should be LDFLAGS="... $LDFLAGS"
</del><span class="cx"> * https://sourceforge.net/p/codeblocks/tickets/11/
</span><del>- http://developer.berlios.de/bugs/?func=detailbug&bug_id=19114&group_id=5358
- patch-malloc.diff
</del><ins>+ patch-configure-malloc.diff
</ins><span class="cx"> * test for sys/malloc.h instead of malloc.h
</span><del>- * https://sourceforge.net/p/codeblocks/tickets/10/
- http://developer.berlios.de/bugs/?func=detailbug&bug_id=19135&group_id=5358
- reinplace "s|CB_HUNSPELL_LIBS =|CB_HUNSPELL_LIBS = -lhunspell-1.3.0|"
- * missing support for detection of hunspell on Mac
- * https://sourceforge.net/p/codeblocks/tickets/8/
- http://developer.berlios.de/bugs/?func=detailbug&bug_id=19139&group_id=5358
- patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff
- * wxIcon doesn't work on Mac
</del><span class="cx">
</span><del>- * patch-Makefile.diff
</del><ins>+Patches written by afb (review and submit upstream):
+ * patch-src-include-Makefile.diff
</ins><span class="cx"> * patch-sdk-configmanager.cpp
</span><span class="cx">
</span><ins>+See also:
+ * http://forums.codeblocks.org/index.php/topic,18394.0.html
+ * http://forums.codeblocks.org/index.php/topic,18727.0.html
+ * https://trac.macports.org/ticket/40390
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-Makefile.diff (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-Makefile.diff 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-Makefile.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,87 +0,0 @@
</span><del>-sent 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 \
-#@@ -176,16 +177,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>
<a id="trunkdportsdevelcodeblocksfilespatchconfigurehunspelldiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,305 +0,0 @@
</span><del>-https://sourceforge.net/p/codeblocks/tickets/10/
-http://developer.berlios.de/bugs/?group_id=5358&func=detailbug&bug_id=19135
-
---- configure.orig
-+++ configure
-@@ -21530,6 +21530,269 @@ fi
-
- MACSETFILE="\$(SETFILE)"
- ;;
-+ *wx_osx*)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: wxOSX" >&5
-+$as_echo "wxOSX" >&6; }
-+
-+ if test "x$BUILD_SPELLCHECKER_TRUE" = "x" ; then
-+
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_prog_HAVE_PKG_CONFIG+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ if test -n "$HAVE_PKG_CONFIG"; then
-+ ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_HAVE_PKG_CONFIG="yes"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ test -z "$ac_cv_prog_HAVE_PKG_CONFIG" && ac_cv_prog_HAVE_PKG_CONFIG="no"
-+fi
-+fi
-+HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
-+if test -n "$HAVE_PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PKG_CONFIG" >&5
-+$as_echo "$HAVE_PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_PKG_CONFIG+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-+if test -n "$PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-+$as_echo "$PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+fi
-+if test -z "$ac_cv_path_PKG_CONFIG"; then
-+ ac_pt_PKG_CONFIG=$PKG_CONFIG
-+ # Extract the first word of "pkg-config", so it can be a program name with args.
-+set dummy pkg-config; ac_word=$2
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $ac_pt_PKG_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+ done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-+if test -n "$ac_pt_PKG_CONFIG"; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+ if test "x$ac_pt_PKG_CONFIG" = x; then
-+ PKG_CONFIG=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ PKG_CONFIG=$ac_pt_PKG_CONFIG
-+ fi
-+else
-+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-+fi
-+
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=0.9.0
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ else
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ PKG_CONFIG=""
-+ fi
-+fi
-+
-+ if test "x$HAVE_PKG_CONFIG" = "xyes"; then
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HUNSPELL" >&5
-+$as_echo_n "checking for HUNSPELL... " >&6; }
-+
-+if test -n "$HUNSPELL_CFLAGS"; then
-+ pkg_cv_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$HUNSPELL_LIBS"; then
-+ pkg_cv_HUNSPELL_LIBS="$HUNSPELL_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hunspell" 2>&1`
-+ else
-+ HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hunspell" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$HUNSPELL_PKG_ERRORS" >&5
-+
-+ as_fn_error $? "Package requirements (hunspell) were not met:
-+
-+$HUNSPELL_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+Alternatively, you may set the environment variables HUNSPELL_CFLAGS
-+and HUNSPELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details." "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+Alternatively, you may set the environment variables HUNSPELL_CFLAGS
-+and HUNSPELL_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+ HUNSPELL_CFLAGS=$pkg_cv_HUNSPELL_CFLAGS
-+ HUNSPELL_LIBS=$pkg_cv_HUNSPELL_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+fi
-+ fi
-+ fi
-+ CB_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
-+ CB_HUNSPELL_LIBS="$HUNSPELL_LIBS"
-+ ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: other" >&5
- $as_echo "other" >&6; }
-#--- configure.ac.orig
-#+++ configure.ac
-#@@ -223,6 +223,27 @@ case $WX_BASENAME in
-# AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
-# MACSETFILE="\$(SETFILE)"
-# ;;
-#+ *wx_osx*)
-#+ AC_MSG_RESULT(wxOSX)
-#+
-#+ if test "x$BUILD_SPELLCHECKER_TRUE" = "x" ; then
-#+
-#+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
-#+ ifdef([PKG_CHECK_MODULES],[],[
-#+ define([PKG_CHECK_MODULES],
-#+ [ echo "You don't have pkg.m4 properly installed" >&2
-#+ exit 1
-#+ ])
-#+ ])
-#+ PKG_PROG_PKG_CONFIG
-#+
-#+ if test "x$HAVE_PKG_CONFIG" = "xyes"; then
-#+ PKG_CHECK_MODULES([HUNSPELL], [hunspell])
-#+ fi
-#+ fi
-#+ CB_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
-#+ CB_HUNSPELL_LIBS="$HUNSPELL_LIBS"
-#+ ;;
-# *)
-# AC_MSG_RESULT(other)
-# ;;
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchconfiguremallocdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,24 +1,24 @@
</span><span class="cx"> https://sourceforge.net/p/codeblocks/tickets/11/
</span><del>-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19114&group_id=5358
---- configure.orig
-+++ configure
-@@ -16967,7 +16967,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
</del><ins>+
+#--- 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])
</ins><span class="cx">
</span><del>- 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
-#@@ -36,7 +36,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 sys/malloc.h])
-#
-# dnl Checks for typedefs, structures, and compiler characteristics.
-# AC_HEADER_STDBOOL
</del><ins>+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchconfigurenodebugdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-https://sourceforge.net/p/codeblocks/tickets/9/
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19110&group_id=5358
-
-the files where these LDFLAGS would cause problems:
-* src/build_tools/autorevision/Makefile
-* src/sdk/Makefile
-* src/src/Makefile
-#--- acinclude.m4.orig
-#+++ acinclude.m4
-#@@ -69,12 +69,10 @@ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (defau
-# if test "x$enable_debug" = "xyes"; then
-# CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
-# CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
-#- LDFLAGS="-Wl,--no-undefined"
-# AC_MSG_RESULT(yes)
-# else
-# CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
-# CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-#- LDFLAGS="-Wl,--no-undefined"
-# AC_MSG_RESULT(no)
-# fi
-# ])
---- configure.orig
-+++ configure
-@@ -11932,13 +11932,11 @@ fi
- if test "x$enable_debug" = "xyes"; then
- CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
- CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
-- LDFLAGS="-Wl,--no-undefined"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
- CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
- CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-- LDFLAGS="-Wl,--no-undefined"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsdkconfigmanagercpp"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-sdk-configmanager.cpp 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+written by afb
+
</ins><span class="cx"> --- src/sdk/configmanager.cpp.orig
</span><span class="cx"> +++ src/sdk/configmanager.cpp
</span><span class="cx"> @@ -1442,8 +1442,10 @@ void ConfigManager::InitPaths()
</span></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcincludeMakefiledifffromrev135597trunkdportsdevelcodeblocksfilespatchMakefilediff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff (from rev 135597, trunk/dports/devel/codeblocks/files/patch-Makefile.diff) (0 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-src-include-Makefile.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+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.
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcpluginscontribNassiShneidermanNassiViewcppdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-https://sourceforge.net/p/codeblocks/tickets/8/
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19139&group_id=5358
-
-This patch might not work with wxGTK, but it's needed for wxMAC and wxOSX (2.8 and 3.0).
-It needs to be fixed upstream, but a better patch is needed to deal with the problem.
-See also http://docs.wxwidgets.org/2.9.5/overview_bitmap.html
-
---- src/plugins/contrib/NassiShneiderman/NassiView.cpp.orig
-+++ src/plugins/contrib/NassiShneiderman/NassiView.cpp
-@@ -1048,15 +1048,9 @@
-
- if ( dataptr )
- {
-- #if defined(__WXMSW__)
- wxCursor copycursor(dnd_copy_cur_xpm);
- wxCursor movecursor(dnd_move_cur_xpm);
- wxCursor nonecursor(dnd_none_cur_xpm);
-- #else
-- wxIcon copycursor(dnd_copy_cur_xpm);
-- wxIcon movecursor(dnd_move_cur_xpm);
-- wxIcon nonecursor(dnd_none_cur_xpm);
-- #endif
- //wxDragResult result;
-
- wxDropSource dndSource(m_diagramwindow, copycursor, movecursor, nonecursor);
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcsdkwxscintillasrcscintillasrcCallTiphdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-Fixed upstream in https://sourceforge.net/p/codeblocks/code/9504/
---- src/sdk/wxscintilla/src/scintilla/src/CallTip.h.orig
-+++ src/sdk/wxscintilla/src/scintilla/src/CallTip.h
-@@ -8,6 +8,8 @@
- #ifndef CALLTIP_H
- #define CALLTIP_H
-
-+#include <string>
-+
- #ifdef SCI_NAMESPACE
- namespace Scintilla {
- #endif
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcsrcMakefileindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.diff (135775 => 135776)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.diff 2015-05-02 19:10:53 UTC (rev 135775)
+++ trunk/dports/devel/codeblocks/files/patch-src-src-Makefile.in.diff 2015-05-02 19:22:21 UTC (rev 135776)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-https://sourceforge.net/p/codeblocks/tickets/12/
-https://developer.berlios.de/bugs/?func=detailbug&bug_id=19136&group_id=5358
-https://trac.macports.org/ticket/40531
---- src/src/Makefile.in.orig
-+++ src/src/Makefile.in
-@@ -416,7 +416,7 @@ AM_CPPFLAGS = $(WX_CXXFLAGS) \
-
- # wxAUI uses GTK+ libraries on wxGTK
- # codeblocks_LDFLAGS = $(WX_GTK2_LIBS)
--codeblocks_LDADD = ../sdk/libcodeblocks.la \
-+codeblocks_LDADD = ../sdk/.libs/libcodeblocks.dylib \
- $(WX_LIBS) \
- $(WX_GTK2_LIBS)
-
</del></span></pre>
</div>
</div>
</body>
</html>