<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/97d2fd0566579f5f41400ccb164a8920929d4639">https://github.com/macports/macports-ports/commit/97d2fd0566579f5f41400ccb164a8920929d4639</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 97d2fd0 ocatve: stop modifying OCTAVE_VERSION variable
</span>97d2fd0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 97d2fd0566579f5f41400ccb164a8920929d4639
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Wed Jun 13 14:24:17 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> ocatve: stop modifying OCTAVE_VERSION variable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Modifying OCTAVE_VERSION caused problems
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/56624
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/56659
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56659
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Instead, attempt to prevent unnecessary revbumps by changing the
</span><span style='display:block; white-space:pre;color:#404040;'> identification names of libraries
</span>---
math/octave/Portfile | 30 +++++++++++------------------
math/octave/files/patch-versions-devel.diff | 20 -------------------
math/octave/files/patch-versions.diff | 20 -------------------
3 files changed, 11 insertions(+), 59 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3774edb..917fdd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ compiler.blacklist-append {*gcc-4.6} {clang < 700}
</span> name octave
version 4.4.0
set package_version 4.x.x
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories math science
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,26 +86,11 @@ post-patch {
</span> set configure_file configure.ac
}
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__PACKAGE_VERSION|${package_version}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure_file}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span> "s|__MACPORTS_canonical_host_type__|${short_host_name}|g" \
${configure_file}
reinplace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|__MACPORTS__PACKAGE_VERSION|${package_version}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/main.in.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span> "s|__MACPORTS_canonical_host_type__|${short_host_name}|g" \
build-aux/subst-default-vals.in.sh
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/56624
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set version_file libinterp/version.in.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set version_file liboctave/version.in.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|%OCTAVE_VERSION%|\"${version}\"|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${version_file}
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,11 +502,11 @@ variant app description "build application bundle to launch ${subport}" {
</span> if { [variant_isset qt4] || [variant_isset qt5] } {
puts ${script} "#!/bin/sh"
puts ${script} ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${script} "${prefix}/bin/octave-${package_version} --gui \"\$@\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "${prefix}/bin/octave-${version} --gui \"\$@\""
</span> } else {
puts ${script} "#!/usr/bin/osascript"
puts ${script} ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${script} "tell application \"Terminal\" to do script \"${prefix}/bin/octave-${package_version} --no-gui-libs; exit\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "tell application \"Terminal\" to do script \"${prefix}/bin/octave-${version} --no-gui-libs; exit\""
</span> }
close ${script}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -651,7 +636,14 @@ post-destroot {
</span> # install the libc++ fix, no matter if used or not, since it is
# required for projects including these headers.
xinstall -m 644 ${worksrcpath}/liboctave/operators/libcxx-fix.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/${name}-${package_version}/${name}/libcxx-fix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/${name}-${version}/${name}/libcxx-fix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # do not force upgrade of every dependency every time the version changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liboctave.5.dylib liboctgui.3.dylib liboctinterp.5.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/lib/octave/${package_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ../${version}/${lib} ${destroot}${prefix}/lib/octave/${package_version}/${lib}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -id ${prefix}/lib/octave/${package_version}/${lib} ${destroot}${prefix}/lib/octave/${version}/${lib}"
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-versions-devel.diff b/math/octave/files/patch-versions-devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bc76091..d343836 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-versions-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-versions-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,28 +9,8 @@
</span> DEFAULT_PAGER="@DEFAULT_PAGER@"
EXEEXT="@EXEEXT@"
man1ext="@man1ext@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main.in.cc.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main.in.cc 2018-05-19 10:32:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_bindir = get_octave_bindir ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_archlibdir = get_octave_archlibdir ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_cli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ = octave_bindir + dir_sep_char + "octave-cli-__MACPORTS__PACKAGE_VERSION";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (HAVE_OCTAVE_QT_GUI)
</span> --- configure.ac.orig 2018-05-20 10:22:18.000000000 -0700
+++ configure.ac 2018-05-20 10:24:18.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_PATCH_VERSION=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl PACKAGE_VERSION is set by the AC_INIT VERSION argument.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OCTAVE_VERSION="$PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OCTAVE_VERSION="__MACPORTS__PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_COPYRIGHT="Copyright (C) 2018 John W. Eaton and others."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> @@ -97,37 +97,37 @@
## This path usually includes the Octave version and configuration name, so
## that configurations for multiple versions of Octave may be installed at once.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-versions.diff b/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7e397b9..3ff764e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,28 +9,8 @@
</span> DEFAULT_PAGER="@DEFAULT_PAGER@"
EXEEXT="@EXEEXT@"
man1ext="@man1ext@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/main.in.cc.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/main.in.cc 2018-05-19 10:32:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_bindir = get_octave_bindir ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_archlibdir = get_octave_archlibdir ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_cli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ = octave_bindir + dir_sep_char + "octave-cli-__MACPORTS__PACKAGE_VERSION";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (HAVE_OCTAVE_QT_GUI)
</span> --- configure.orig 2018-04-30 10:03:56.000000000 -0700
+++ configure 2018-05-20 10:18:36.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5110,7 +5110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_MINOR_VERSION=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_PATCH_VERSION=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OCTAVE_VERSION="$PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OCTAVE_VERSION="__MACPORTS__PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_COPYRIGHT="Copyright (C) 2018 John W. Eaton and others."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> @@ -8051,7 +8051,7 @@
## This path usually includes the Octave version and configuration name, so
## that configurations for multiple versions of Octave may be installed at once.
</pre><pre style='margin:0'>
</pre>