<!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>[147651] 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/147651">147651</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-04-11 10:59:26 -0700 (Mon, 11 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-devel-release: update version 4.0.0->4.0.1; fixes #51100</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelPortfile">trunk/dports/math/octave-devel/Portfile</a></li>
<li><a href="#trunkdportsmathoctavedevelfilesoctavedevelrelease">trunk/dports/math/octave-devel/files/octave-devel-release</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelfilesoctaveclangclassdefpatch">trunk/dports/math/octave-devel/files/octave-clang-classdef.patch</a></li>
<li><a href="#trunkdportsmathoctavedevelfilesosmesa_mac_fixpatch">trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch</a></li>
<li><a href="#trunkdportsmathoctavedevelfilespatchappend_version_clidiff">trunk/dports/math/octave-devel/files/patch-append_version_cli.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 (147650 => 147651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/Portfile 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/Portfile 2016-04-11 17:59:26 UTC (rev 147651)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #fetch.type hg
</span><span class="cx"> #hg.url http://hg.savannah.gnu.org/hgweb/octave/
</span><span class="cx">
</span><del>-set version_release 4.0.0
</del><ins>+set version_release 4.0.1
</ins><span class="cx"> set version_rc 4.0.1-rc4
</span><span class="cx"> set version_tip 4.1.0+
</span><span class="cx">
</span><span class="lines">@@ -71,37 +71,25 @@
</span><span class="cx">
</span><span class="cx"> subport octave-devel-release {
</span><span class="cx"> version ${version_release}
</span><del>- revision 7
- hg.tag 3ccc2d02e64b
</del><ins>+ #revision 0
+ hg.tag 5162cdfb56d8
</ins><span class="cx">
</span><span class="cx"> if {${version_release} eq ${version_rc}} {
</span><span class="cx"> conflicts-append octave-devel-release
</span><span class="cx"> }
</span><span class="cx">
</span><del>- # see http://savannah.gnu.org/bugs/?41178
- patchfiles-append \
- octave-clang-classdef.patch
-
</del><span class="cx"> # see http://savannah.gnu.org/bugs/?func=detailitem&item_id=46592
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> patch-e870a68742a6.diff
</span><span class="cx">
</span><del>- # allow osmesa support to at least compile
- patchfiles-append \
- osmesa_mac_fix.patch
-
- # force "${prefix}/bin/octave-${version} --no-gui-libs" to call octave-cli-${version} instead of octave-cli
- patchfiles-append \
- patch-append_version_cli.diff
-
</del><span class="cx"> # see http://savannah.gnu.org/bugs/?41027
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> octave-bug_41027.patch
</span><span class="cx">
</span><span class="cx"> checksums-append \
</span><span class="cx"> ${hg.tag}${extract.suffix} \
</span><del>- rmd160 4bbcc004ffdde859b0735e602aac2d01388d0b2c \
- sha256 2a4017a03ca80c280b5d39cf88af8954c7bfdbf1b3b40b9f09d3bd4bd1dd6040
</del><ins>+ rmd160 64c48708d456e8efb48877af6443a2c637f3d3a6 \
+ sha256 8b6b93d2fe830f7aa5b446856105436c51547e1ff8fe47a4184ea535bdd370d1
</ins><span class="cx">
</span><span class="cx"> livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\nrelease-"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsmathoctavedevelfilesoctaveclangclassdefpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/octave-devel/files/octave-clang-classdef.patch (147650 => 147651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/files/octave-clang-classdef.patch 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/octave-clang-classdef.patch 2016-04-11 17:59:26 UTC (rev 147651)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-# HG changeset patch
-# User akira noda <you.akira.noda@gmail.com>
-# Date 1440176752 14400
-# Fri Aug 21 13:05:52 2015 -0400
-# Node ID 03a20edfe1c7f147e7adcface83025351b8f31c9
-# Parent 0fe7133da8ceb02744b3288841927f586b9a514c
-Fix compilation of classdef with the clang compiler (bug #41178)
-
-* ov-classdef.cc, ov-classdef.h (cdef_object_scalar::mark_as_constructed):
-Move function definition out of header file to avoid dependency on incomplete
-type, compilation error with clang.
-
-diff --git a/libinterp/octave-value/ov-classdef.cc b/libinterp/octave-value/ov-classdef.cc
---- a/libinterp/octave-value/ov-classdef.cc
-+++ libinterp/octave-value/ov-classdef.cc
-@@ -1946,6 +1946,12 @@ cdef_object_scalar::is_partially_constru
- return true;
- }
-
-+void
-+cdef_object_scalar::mark_as_constructed (const cdef_class& cls)
-+{
-+ ctor_list.erase (cls);
-+}
-+
- handle_cdef_object::~handle_cdef_object (void)
- {
- #if DEBUG_TRACE
-diff --git a/libinterp/octave-value/ov-classdef.h b/libinterp/octave-value/ov-classdef.h
---- a/libinterp/octave-value/ov-classdef.h
-+++ libinterp/octave-value/ov-classdef.h
-@@ -438,7 +438,7 @@ public:
-
- void mark_as_constructed (void) { ctor_list.clear (); }
-
-- void mark_as_constructed (const cdef_class& cls) { ctor_list.erase (cls); }
-+ void mark_as_constructed (const cdef_class& cls);
-
- bool is_constructed (void) const { return ctor_list.empty (); }
-
</del></span></pre></div>
<a id="trunkdportsmathoctavedevelfilesoctavedevelrelease"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-devel/files/octave-devel-release (147650 => 147651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/files/octave-devel-release 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/octave-devel-release 2016-04-11 17:59:26 UTC (rev 147651)
</span><span class="lines">@@ -1,30 +1,30 @@
</span><del>-bin/mkoctfile-4.0.0
-bin/octave-4.0.0
-bin/octave-cli-4.0.0
-bin/octave-config-4.0.0
-share/man/man1/mkoctfile-4.0.0.1.gz
-share/man/man1/octave-cli-4.0.0.1.gz
-share/man/man1/octave-config-4.0.0.1.gz
-share/man/man1/octave-4.0.0.1.gz
-share/info/octave_4.0.0/liboctave.info
-share/info/octave_4.0.0/octave.info
-share/info/octave_4.0.0/octave.info-1
-share/info/octave_4.0.0/octave.info-2
-share/info/octave_4.0.0/octave.info-3
-share/info/octave_4.0.0/octave.info-4
-share/info/octave_4.0.0/octave.info-5
-share/info/octave_4.0.0/octave.info-6
-share/info/octave_4.0.0/octave.info-7
-share/info/octave_4.0.0/octave.info-8
-share/info/octave_4.0.0/octave.info-9
-share/octave/4.0.0/appdata/www.octave.org-octave.appdata.xml
-share/octave/4.0.0/icons/hicolor/16x16/apps/octave.png
-share/octave/4.0.0/icons/hicolor/22x22/apps/octave.png
-share/octave/4.0.0/icons/hicolor/24x24/apps/octave.png
-share/octave/4.0.0/icons/hicolor/32x32/apps/octave.png
-share/octave/4.0.0/icons/hicolor/48x48/apps/octave.png
-share/octave/4.0.0/icons/hicolor/64x64/apps/octave.png
-share/octave/4.0.0/icons/hicolor/128x128/apps/octave.png
-share/octave/4.0.0/icons/hicolor/256x256/apps/octave.png
-share/octave/4.0.0/icons/hicolor/512x512/apps/octave.png
-share/octave/4.0.0/icons/hicolor/scalable/apps/octave.svg
</del><ins>+bin/mkoctfile-4.0.1
+bin/octave-4.0.1
+bin/octave-cli-4.0.1
+bin/octave-config-4.0.1
+share/man/man1/mkoctfile-4.0.1.1.gz
+share/man/man1/octave-cli-4.0.1.1.gz
+share/man/man1/octave-config-4.0.1.1.gz
+share/man/man1/octave-4.0.1.1.gz
+share/info/octave_4.0.1/liboctave.info
+share/info/octave_4.0.1/octave.info
+share/info/octave_4.0.1/octave.info-1
+share/info/octave_4.0.1/octave.info-2
+share/info/octave_4.0.1/octave.info-3
+share/info/octave_4.0.1/octave.info-4
+share/info/octave_4.0.1/octave.info-5
+share/info/octave_4.0.1/octave.info-6
+share/info/octave_4.0.1/octave.info-7
+share/info/octave_4.0.1/octave.info-8
+share/info/octave_4.0.1/octave.info-9
+share/octave/4.0.1/appdata/www.octave.org-octave.appdata.xml
+share/octave/4.0.1/icons/hicolor/16x16/apps/octave.png
+share/octave/4.0.1/icons/hicolor/22x22/apps/octave.png
+share/octave/4.0.1/icons/hicolor/24x24/apps/octave.png
+share/octave/4.0.1/icons/hicolor/32x32/apps/octave.png
+share/octave/4.0.1/icons/hicolor/48x48/apps/octave.png
+share/octave/4.0.1/icons/hicolor/64x64/apps/octave.png
+share/octave/4.0.1/icons/hicolor/128x128/apps/octave.png
+share/octave/4.0.1/icons/hicolor/256x256/apps/octave.png
+share/octave/4.0.1/icons/hicolor/512x512/apps/octave.png
+share/octave/4.0.1/icons/hicolor/scalable/apps/octave.svg
</ins></span></pre></div>
<a id="trunkdportsmathoctavedevelfilesosmesa_mac_fixpatch"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch (147650 => 147651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/osmesa_mac_fix.patch 2016-04-11 17:59:26 UTC (rev 147651)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-diff -Naur a/libinterp/dldfcn/__osmesa_print__.cc b/libinterp/dldfcn/__osmesa_print__.cc
---- libinterp/dldfcn/__osmesa_print__.cc 2015-05-23 16:21:53.000000000 +0200
-+++ libinterp/dldfcn/__osmesa_print__.cc 2015-10-05 21:08:50.000000000 +0200
-@@ -27,6 +27,12 @@
- #include <config.h>
- #endif
-
-+#if defined (HAVE_OSMESA_H)
-+#include "osmesa.h"
-+#elif defined (HAVE_GL_OSMESA_H)
-+#include "GL/osmesa.h"
-+#endif
-+
- #include "oct-locbuf.h"
- #include "unwind-prot.h"
-
-@@ -36,12 +42,6 @@
- #include "graphics.h"
- #include "gripes.h"
-
--#if defined (HAVE_OSMESA_H)
--#include "osmesa.h"
--#elif defined (HAVE_GL_OSMESA_H)
--#include "GL/osmesa.h"
--#endif
--
- #if defined (HAVE_OSMESA) && defined (HAVE_OPENGL)
- static void
- close_fcn (FILE *f)
</del></span></pre></div>
<a id="trunkdportsmathoctavedevelfilespatchappend_version_clidiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/octave-devel/files/patch-append_version_cli.diff (147650 => 147651)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/files/patch-append_version_cli.diff 2016-04-11 17:06:46 UTC (rev 147650)
+++ trunk/dports/math/octave-devel/files/patch-append_version_cli.diff 2016-04-11 17:59:26 UTC (rev 147651)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- src/main.in.cc.orig 2016-01-09 14:14:07.000000000 -0700
-+++ src/main.in.cc 2016-01-09 14:16:05.000000000 -0700
-@@ -462,7 +462,7 @@
-
- start_gui = false;
- gui_libs = false;
-- file = octave_bindir + dir_sep_char + "octave-cli";
-+ file = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
- }
- else if (! strcmp (argv[i], "--no-gui"))
- {
</del></span></pre>
</div>
</div>
</body>
</html>