[144589] trunk/dports/math/octave-devel

[mcalhoun at macports.org]

Revision: 144589
          https://trac.macports.org/changeset/144589
Author:   mcalhoun at macports.org
Date:     2016-01-13 01:31:53 -0800 (Wed, 13 Jan 2016)
Log Message:
-----------
octave-devel, octave-devel-rc, octave-devel-release: force "octave-${version} --no-gui-libs" to call octave-cli-${version} instead of octave-cli

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-devel/files/patch-append_version_cli.diff

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-01-13 09:26:10 UTC (rev 144588)
+++ trunk/dports/math/octave-devel/Portfile	2016-01-13 09:31:53 UTC (rev 144589)
@@ -29,7 +29,7 @@
 
 if { ${name} eq ${subport} } {
     version         ${version_tip}
-    #revision        0
+    revision        1
     hg.tag          5a340d8458d6
 
     checksums-append               \
@@ -42,7 +42,7 @@
 
 subport octave-devel-rc {
     version         ${version_rc}
-    revision        1
+    revision        2
     hg.tag          20b17dda0e0c
 
     if {${version_rc} eq ${version_release}} {
@@ -67,7 +67,7 @@
 
 subport octave-devel-release {
     version         ${version_release}
-    revision        1
+    revision        2
     hg.tag          3ccc2d02e64b
 
     if {${version_release} eq ${version_rc}} {
@@ -130,6 +130,10 @@
 patchfiles-append   \
     patch-stdio.in.h.diff
 
+# force "${prefix}/bin/octave-${version} --no-gui-libs" to call octave-cli-${version} instead of octave-cli
+patchfiles-append   \
+    patch-append_version_cli.diff
+
 pre-patch {
     # code located in pre-patch because variants from PortGroup compilers must
     #    be evaluated before it can be determined if clang is being used

Added: trunk/dports/math/octave-devel/files/patch-append_version_cli.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-append_version_cli.diff	                        (rev 0)
+++ trunk/dports/math/octave-devel/files/patch-append_version_cli.diff	2016-01-13 09:31:53 UTC (rev 144589)
@@ -0,0 +1,11 @@
+--- 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"))
+         {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160113/e93cd69f/attachment.html>