<!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>[148706] trunk/dports/math/octave-devel</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/148706">148706</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-05-15 03:49:49 -0700 (Sun, 15 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-devel, octave-devel-rc, octave-devel-release: update build system; should not affect build itself</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelPortfile">trunk/dports/math/octave-devel/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelfilespatchstdioinhdiff">trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavedevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-devel/Portfile (148705 => 148706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/Portfile 2016-05-15 10:45:33 UTC (rev 148705)
+++ trunk/dports/math/octave-devel/Portfile 2016-05-15 10:49:49 UTC (rev 148706)
</span><span class="lines">@@ -108,12 +108,12 @@
</span><span class="cx"> select.file ${filespath}/${subport}
</span><span class="cx">
</span><span class="cx"> # check http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg/rev for latest version
</span><del>-set hg_gnu_tag 7f19e7f2afa2
</del><ins>+set hg_gnu_tag 4a3a7c6111c8
</ins><span class="cx">
</span><span class="cx"> checksums-append \
</span><span class="cx"> ${hg_gnu_tag}${extract.suffix} \
</span><del>- rmd160 9d906212fdb4201f8592da10524606dadb3f50e3 \
- sha256 85add8ce0c53e8868d903c28c407d864ca54bd42e8d472e09b1a1bb4b105b741
</del><ins>+ rmd160 367b2811b5d4e3bab5ed22382c4ecfed808335e7 \
+ sha256 39f09d2000654d0d75a95b756fdd0724f869dfe65ef08f47814fbad230e8b25c
</ins><span class="cx">
</span><span class="cx"> master_sites http://hg.savannah.gnu.org/hgweb/octave/archive:octave \
</span><span class="cx"> http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg/archive:gnulib
</span><span class="lines">@@ -131,10 +131,6 @@
</span><span class="cx"> move ${worksrcpath}/../gnulib-hg-${hg_gnu_tag} ${worksrcpath}/gnulib-hg
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# see http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/stdio.in.h?id=d6176702c3ffb6c56e6620397470e1b3bd540b10
-patchfiles-append \
- patch-stdio.in.h.diff
-
</del><span class="cx"> pre-patch {
</span><span class="cx"> # code located in pre-patch because variants from PortGroup compilers must
</span><span class="cx"> # be evaluated before it can be determined if clang is being used
</span></span></pre></div>
<a id="trunkdportsmathoctavedevelfilespatchstdioinhdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff (148705 => 148706)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff 2016-05-15 10:45:33 UTC (rev 148705)
+++ trunk/dports/math/octave-devel/files/patch-stdio.in.h.diff 2016-05-15 10:49:49 UTC (rev 148706)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-From d6176702c3ffb6c56e6620397470e1b3bd540b10 Mon Sep 17 00:00:00 2001
-From: Jonathan Perkin <jperkin@joyent.com>
-Date: Thu, 04 Jun 2015 11:10:34 +0000
-Subject: stdio: Don't redefine gets when using C++
-
-We've hit this failure a few times in pkgsrc with packages which embed gnulib,
-an example being the latest gnutls:
-
- ../../src/gl/stdio.h:1034:1: error: 'char* gets(char*)' conflicts with a previous declaration
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- ^
-
- /opt/tools/gcc49/lib/gcc/x86_64-sun-solaris2.11/4.9.2/include-fixed/iso/stdio_iso.h:259:14: note: previous declaration 'char* std::gets(char*)'
- extern char *gets(char *);
- ^
-
-Full build log is here:
-
- http://us-east.manta.joyent.com/pkgsrc/public/reports/upstream-trunk32/20150602.2233/gnutls-3.3.15/build.log
-
-We've fixed it a few different ways over time:
-
- https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/devel/m4/patches/patch-lib_stdio.in.h
- https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/math/octave/patches/patch-libgnu_stdio.in.h
- https://github.com/joyent/pkgsrc/blob/joyent/release/2015Q1/security/gnutls/patches/patch-gl_stdio.in.h
-
-but the cleanest fix appears to be the last, so I am proposing it here for
-inclusion upstream.
-
-Message-Id: <20150604111034.GG66573@joyent.com>
-Signed-off-by: Eric Blake <eblake@redhat.com>
----
-(limited to 'lib/stdio.in.h')
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index fa6b595..476dee1 100644
---- a/lib/stdio.in.h
-+++ gnulib-hg/lib/stdio.in.h
-@@ -723,11 +723,10 @@ _GL_WARN_ON_USE (getline, "getline is unportable - "
- so any use of gets warrants an unconditional warning; besides, C11
- removed it. */
- #undef gets
--#if HAVE_RAW_DECL_GETS
-+#if HAVE_RAW_DECL_GETS && !defined __cplusplus
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
-
--
- #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
- struct obstack;
- /* Grow an obstack with formatted output. Return the number of
---
-cgit v0.9.0.2
</del></span></pre>
</div>
</div>
</body>
</html>