<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/11a34826896d4995f84b1428120a0e622d14a1ec">https://github.com/macports/macports-ports/commit/11a34826896d4995f84b1428120a0e622d14a1ec</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 11a34826896d4995f84b1428120a0e622d14a1ec
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 11 11:08:14 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    octave PG: whitespace changes
</span>---
 _resources/port1.0/group/octave-1.0.tcl | 95 +++++++++++++++------------------
 1 file changed, 44 insertions(+), 51 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/octave-1.0.tcl b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 0dbe835..eeee365 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,6 @@ proc universal_setup {args} {
</span> }
 
 proc octave.setup {module version} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     global octave.module
 
     octave.module               ${module}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -101,20 +100,17 @@ proc octave.setup {module version} {
</span> }
 
 post-extract {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     # rename the effective worksrcdir to always be ${octave.module}
 
     set worksrcdir_name [exec /bin/ls ${workpath} | grep -v -E "^\\."]
     if {[string equal ${worksrcdir_name} ${octave.module}] == 0} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        # work-around for case-insensitive file systems when the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # extract directory name is the same as the octave module name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # except for letter case; should always work no matter if the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # file system is case-insensitive or case-sensitive.
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        # work-around for case-insensitive file systems when the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # extract directory name is the same as the octave module name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # except for letter case; should always work no matter if the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # file system is case-insensitive or case-sensitive.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   move ${workpath}/${worksrcdir_name} ${workpath}/tmp-${worksrcdir_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   move ${workpath}/tmp-${worksrcdir_name} ${workpath}/${octave.module}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        move ${workpath}/${worksrcdir_name} ${workpath}/tmp-${worksrcdir_name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        move ${workpath}/tmp-${worksrcdir_name} ${workpath}/${octave.module}
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,30 +121,30 @@ pre-configure {
</span>     system -W ${workpath} "/usr/bin/tar cvfz ${distname}.tar.gz ${octave.module}"
 
     if { [variant_exists universal] && [variant_isset universal] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        global merger_configure_env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   global merger_configure_args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        global merger_configure_env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        global merger_configure_args
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           OCTAVE_ARCH=${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lappend merger_configure_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                OCTAVE_ARCH=${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       set merger_configure_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           "'try; pkg build -verbose -nodeps ${workpath}/tmp-build-${arch} ${workpath}/${distname}.tar.gz; catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set merger_configure_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                "'try; pkg build -verbose -nodeps ${workpath}/tmp-build-${arch} ${workpath}/${distname}.tar.gz; catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span> 
     } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        configure.env-append OCTAVE_ARCH=${build_arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   configure.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       "'try; pkg build -verbose -nodeps ${workpath}/tmp-build ${workpath}/${distname}.tar.gz; catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   # fortran arch flag is not set automatically
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       configure.fflags-append -m64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       configure.fflags-append -m32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.env-append OCTAVE_ARCH=${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            "'try; pkg build -verbose -nodeps ${workpath}/tmp-build ${workpath}/${distname}.tar.gz; catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # fortran arch flag is not set automatically
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {${build_arch} eq "x86_64" || ${build_arch} eq "ppc64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.fflags-append -m64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.fflags-append -m32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span>     }
 
     configure.cmd /usr/bin/arch -arch \$OCTAVE_ARCH ${prefix}/bin/octave-cli
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -165,7 +161,6 @@ build.args
</span> build.post_args
 
 pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     set octave_api_version [exec "${prefix}/bin/octave-config" -p API_VERSION]
 
     destroot.cmd /usr/bin/arch -arch \$OCTAVE_ARCH ${prefix}/bin/octave-cli
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,34 +181,32 @@ pre-destroot {
</span>     }
 
     if { [variant_exists universal] && [variant_isset universal] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        global merger_destroot_env
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   global merger_destroot_args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        global merger_destroot_env
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        global merger_destroot_args
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            set octave_install_share ${destroot}-${arch}${prefix}/share/octave/packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       set octave_install_lib   ${destroot}-${arch}${prefix}/lib/octave/packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       set octave_tgz_file ${workpath}/tmp-build-${arch}/[exec /bin/ls ${workpath}/tmp-build-${arch}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set octave_install_share ${destroot}-${arch}${prefix}/share/octave/packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set octave_install_lib   ${destroot}-${arch}${prefix}/lib/octave/packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set octave_tgz_file ${workpath}/tmp-build-${arch}/[exec /bin/ls ${workpath}/tmp-build-${arch}]
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            lappend merger_destroot_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           OCTAVE_ARCH=${arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            lappend merger_destroot_env(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                OCTAVE_ARCH=${arch}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            destroot.args
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.args
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            set merger_destroot_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           "'try;pkg prefix ${octave_install_share} ${octave_install_lib}; pkg install -verbose -nodeps -local ${octave_tgz_file}; delete(\"~/.octave_packages\"); catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            set merger_destroot_args(${arch}) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                "'try;pkg prefix ${octave_install_share} ${octave_install_lib}; pkg install -verbose -nodeps -local ${octave_tgz_file}; delete(\"~/.octave_packages\"); catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span> 
     } else {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        set octave_install_share ${destroot}${prefix}/share/octave/packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set octave_install_lib   ${destroot}${prefix}/lib/octave/packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set octave_tgz_file ${workpath}/tmp-build/[exec /bin/ls ${workpath}/tmp-build]
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        set octave_install_share ${destroot}${prefix}/share/octave/packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set octave_install_lib   ${destroot}${prefix}/lib/octave/packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   set octave_tgz_file ${workpath}/tmp-build/[exec /bin/ls ${workpath}/tmp-build]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   destroot.env-append OCTAVE_ARCH=${build_arch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot.env-append OCTAVE_ARCH=${build_arch}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        destroot.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-       "'try; pkg prefix ${octave_install_share} ${octave_install_lib}; pkg install -verbose -nodeps -local ${octave_tgz_file}; catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        destroot.args \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            "'try; pkg prefix ${octave_install_share} ${octave_install_lib}; pkg install -verbose -nodeps -local ${octave_tgz_file}; catch; disp(lasterror.message); exit(1); end_try_catch;'"
</span>     }
 
     destroot.post_args
</pre><pre style='margin:0'>

</pre>