<!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>[118550] trunk/dports/devel/codeblocks/files</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/118550">118550</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-04-04 06:30:02 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>codeblocks: don't patch automake files to avoid triggering autoconf tools</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksfilespatchMakefilediff">trunk/dports/devel/codeblocks/files/patch-Makefile.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchmallocdiff">trunk/dports/devel/codeblocks/files/patch-malloc.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchnodebugdiff">trunk/dports/devel/codeblocks/files/patch-nodebug.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcpluginscontribsource_exporterMakefilediff">trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcodeblocksfilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-Makefile.diff (118549 => 118550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-Makefile.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-Makefile.diff 2014-04-04 13:30:02 UTC (rev 118550)
</span><span class="lines">@@ -1,48 +1,48 @@
</span><span class="cx"> sent by afb
</span><del>---- 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
</del><ins>+#--- 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
</ins><span class="cx"> --- src/include/Makefile.in.orig
</span><span class="cx"> +++ src/include/Makefile.in
</span><span class="cx"> @@ -362,10 +362,11 @@ top_builddir = @top_builddir@
</span></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchmallocdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-malloc.diff (118549 => 118550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-malloc.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-malloc.diff 2014-04-04 13:30:02 UTC (rev 118550)
</span><span class="lines">@@ -10,14 +10,14 @@
</span><span class="cx"> do :
</span><span class="cx"> as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
</span><span class="cx"> ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
</span><del>---- 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>+#--- 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
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchnodebugdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-nodebug.diff (118549 => 118550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-nodebug.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-nodebug.diff 2014-04-04 13:30:02 UTC (rev 118550)
</span><span class="lines">@@ -4,21 +4,21 @@
</span><span class="cx"> # * src/build_tools/autorevision/Makefile
</span><span class="cx"> # * src/sdk/Makefile
</span><span class="cx"> # * src/src/Makefile
</span><del>---- 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
- ])
</del><ins>+#--- 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
+# ])
</ins><span class="cx"> --- configure.orig
</span><span class="cx"> +++ configure
</span><span class="cx"> @@ -11932,13 +11932,11 @@ fi
</span></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcpluginscontribsource_exporterMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff (118549 => 118550)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff 2014-04-04 13:27:03 UTC (rev 118549)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff 2014-04-04 13:30:02 UTC (rev 118550)
</span><span class="lines">@@ -1,16 +1,16 @@
</span><span class="cx"> This is only needed for wxGTK-based installation
</span><span class="cx"> http://developer.berlios.de/bugs/?func=detailbug&bug_id=19116&group_id=5358
</span><del>---- src/plugins/contrib/source_exporter/Makefile.am.orig
-+++ src/plugins/contrib/source_exporter/Makefile.am
-@@ -12,7 +12,7 @@ pluginlib_LTLIBRARIES = libexporter.la
-
- libexporter_la_CPPFLAGS = -DwxPDF_USE_WXMODULE=0
-
--libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
-+libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -lfontconfig
-
- libexporter_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la \
- wxPdfDocument/libwxPdfDocument.la
</del><ins>+#--- src/plugins/contrib/source_exporter/Makefile.am.orig
+#+++ src/plugins/contrib/source_exporter/Makefile.am
+#@@ -12,7 +12,7 @@ pluginlib_LTLIBRARIES = libexporter.la
+#
+# libexporter_la_CPPFLAGS = -DwxPDF_USE_WXMODULE=0
+#
+#-libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+#+libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -lfontconfig
+#
+# libexporter_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la \
+# wxPdfDocument/libwxPdfDocument.la
</ins><span class="cx"> --- src/plugins/contrib/source_exporter/Makefile.in.orig
</span><span class="cx"> +++ src/plugins/contrib/source_exporter/Makefile.in
</span><span class="cx"> @@ -392,7 +392,7 @@ INCLUDES = $(WX_CXXFLAGS) \
</span></span></pre>
</div>
</div>
</body>
</html>