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

mcalhoun at macports.org mcalhoun at macports.org
Wed Jan 13 01:44:55 PST 2016 

Revision: 144591
          https://trac.macports.org/changeset/144591
Author:   mcalhoun at macports.org
Date:     2016-01-13 01:44:55 -0800 (Wed, 13 Jan 2016)
Log Message:
-----------
octave-devel, octave-devel-rc, octave-devel-release: do not rename info files
renaming prevents octave from finding them for its internal documentation

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile
    trunk/dports/math/octave-devel/files/octave-devel
    trunk/dports/math/octave-devel/files/octave-devel-rc
    trunk/dports/math/octave-devel/files/octave-devel-release

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-01-13 09:40:56 UTC (rev 144590)
+++ trunk/dports/math/octave-devel/Portfile	2016-01-13 09:44:55 UTC (rev 144591)
@@ -29,7 +29,7 @@
 
 if { ${name} eq ${subport} } {
     version         ${version_tip}
-    revision        2
+    revision        3
     hg.tag          5a340d8458d6
 
     checksums-append               \
@@ -42,7 +42,7 @@
 
 subport octave-devel-rc {
     version         ${version_rc}
-    revision        3
+    revision        4
     hg.tag          20b17dda0e0c
 
     if {${version_rc} eq ${version_release}} {
@@ -67,7 +67,7 @@
 
 subport octave-devel-release {
     version         ${version_release}
-    revision        3
+    revision        4
     hg.tag          3ccc2d02e64b
 
     if {${version_release} eq ${version_rc}} {
@@ -240,6 +240,10 @@
     -clang34        \
     -clang33
 
+# help prevent conflicts with various octave ports
+configure.args-append \
+    --infodir=${prefix}/share/info/octave_${version}
+
 # offscreen rendering with OpenGL via osmesa would be nice to have, but the following
 #    causes a segmentation fault:
 #    h = figure ("visible", "off"); fn = tempname (); sombrero (); __osmesa_print__ (h, fn, "svg");
@@ -601,14 +605,6 @@
         move ${destroot}${prefix}/share/man/man1/${bin}.1 ${destroot}${prefix}/share/man/man1/${bin}-${version}.1
     }
 
-    # put version nubmer in info files
-    foreach name {liboctave octave} {
-        move ${destroot}${prefix}/share/info/${name}.info  ${destroot}${prefix}/share/info/${name}-${version}.info
-    }
-    foreach suffix {1 2 3 4 5 6 7 8 9} {
-        move ${destroot}${prefix}/share/info/octave.info-${suffix}  ${destroot}${prefix}/share/info/octave-${version}.info-${suffix}
-    }
-
     # put any startup commands in ${destroot}${prefix}/share/octave/${version}/m/startup/octaverc
     # see https://www.gnu.org/software/octave/doc/interpreter/Startup-Files.html
     file delete ${destroot}${prefix}/share/octave/site/m/startup/octaverc

Modified: trunk/dports/math/octave-devel/files/octave-devel
===================================================================
--- trunk/dports/math/octave-devel/files/octave-devel	2016-01-13 09:40:56 UTC (rev 144590)
+++ trunk/dports/math/octave-devel/files/octave-devel	2016-01-13 09:44:55 UTC (rev 144591)
@@ -6,17 +6,17 @@
 share/man/man1/octave-cli-4.1.0+.1.gz
 share/man/man1/octave-config-4.1.0+.1.gz
 share/man/man1/octave-4.1.0+.1.gz
-share/info/liboctave-4.1.0+.info
-share/info/octave-4.1.0+.info
-share/info/octave-4.1.0+.info-1
-share/info/octave-4.1.0+.info-2
-share/info/octave-4.1.0+.info-3
-share/info/octave-4.1.0+.info-4
-share/info/octave-4.1.0+.info-5
-share/info/octave-4.1.0+.info-6
-share/info/octave-4.1.0+.info-7
-share/info/octave-4.1.0+.info-8
-share/info/octave-4.1.0+.info-9
+share/info/octave_4.1.0+/liboctave.info
+share/info/octave_4.1.0+/octave.info
+share/info/octave_4.1.0+/octave.info-1
+share/info/octave_4.1.0+/octave.info-2
+share/info/octave_4.1.0+/octave.info-3
+share/info/octave_4.1.0+/octave.info-4
+share/info/octave_4.1.0+/octave.info-5
+share/info/octave_4.1.0+/octave.info-6
+share/info/octave_4.1.0+/octave.info-7
+share/info/octave_4.1.0+/octave.info-8
+share/info/octave_4.1.0+/octave.info-9
 share/octave/4.1.0+/appdata/www.octave.org-octave.appdata.xml
 share/octave/4.1.0+/icons/hicolor/16x16/apps/octave.png
 share/octave/4.1.0+/icons/hicolor/22x22/apps/octave.png

Modified: trunk/dports/math/octave-devel/files/octave-devel-rc
===================================================================
--- trunk/dports/math/octave-devel/files/octave-devel-rc	2016-01-13 09:40:56 UTC (rev 144590)
+++ trunk/dports/math/octave-devel/files/octave-devel-rc	2016-01-13 09:44:55 UTC (rev 144591)
@@ -1,30 +1,30 @@
-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/liboctave-4.0.1.info
-share/info/octave-4.0.1.info
-share/info/octave-4.0.1.info-1
-share/info/octave-4.0.1.info-2
-share/info/octave-4.0.1.info-3
-share/info/octave-4.0.1.info-4
-share/info/octave-4.0.1.info-5
-share/info/octave-4.0.1.info-6
-share/info/octave-4.0.1.info-7
-share/info/octave-4.0.1.info-8
-share/info/octave-4.0.1.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
+bin/mkoctfile-4.0.1-rc1
+bin/octave-4.0.1-rc1
+bin/octave-cli-4.0.1-rc1
+bin/octave-config-4.0.1-rc1
+share/man/man1/mkoctfile-4.0.1-rc1.1.gz
+share/man/man1/octave-cli-4.0.1-rc1.1.gz
+share/man/man1/octave-config-4.0.1-rc1.1.gz
+share/man/man1/octave-4.0.1-rc1.1.gz
+share/info/octave_4.0.1-rc1/liboctave.info
+share/info/octave_4.0.1-rc1/octave.info
+share/info/octave_4.0.1-rc1/octave.info-1
+share/info/octave_4.0.1-rc1/octave.info-2
+share/info/octave_4.0.1-rc1/octave.info-3
+share/info/octave_4.0.1-rc1/octave.info-4
+share/info/octave_4.0.1-rc1/octave.info-5
+share/info/octave_4.0.1-rc1/octave.info-6
+share/info/octave_4.0.1-rc1/octave.info-7
+share/info/octave_4.0.1-rc1/octave.info-8
+share/info/octave_4.0.1-rc1/octave.info-9
+share/octave/4.0.1-rc1/appdata/www.octave.org-octave.appdata.xml
+share/octave/4.0.1-rc1/icons/hicolor/16x16/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/22x22/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/24x24/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/32x32/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/48x48/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/64x64/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/128x128/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/256x256/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/512x512/apps/octave.png
+share/octave/4.0.1-rc1/icons/hicolor/scalable/apps/octave.svg

Modified: trunk/dports/math/octave-devel/files/octave-devel-release
===================================================================
--- trunk/dports/math/octave-devel/files/octave-devel-release	2016-01-13 09:40:56 UTC (rev 144590)
+++ trunk/dports/math/octave-devel/files/octave-devel-release	2016-01-13 09:44:55 UTC (rev 144591)
@@ -6,17 +6,17 @@
 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/liboctave-4.0.0.info
-share/info/octave-4.0.0.info
-share/info/octave-4.0.0.info-1
-share/info/octave-4.0.0.info-2
-share/info/octave-4.0.0.info-3
-share/info/octave-4.0.0.info-4
-share/info/octave-4.0.0.info-5
-share/info/octave-4.0.0.info-6
-share/info/octave-4.0.0.info-7
-share/info/octave-4.0.0.info-8
-share/info/octave-4.0.0.info-9
+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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160113/cb5944b2/attachment.html>

More information about the macports-changes mailing list