Revision
149072
Author
mcalhoun@macports.org
Date
2016-05-28 07:58:20 -0700 (Sat, 28 May 2016)

Log Message

octave family: xinstall should not use -p when installing directories (possible fix for #51424)

Modified Paths

Diff

Modified: trunk/dports/math/octave/Portfile (149071 => 149072)


--- trunk/dports/math/octave/Portfile	2016-05-28 13:06:30 UTC (rev 149071)
+++ trunk/dports/math/octave/Portfile	2016-05-28 14:58:20 UTC (rev 149072)
@@ -356,9 +356,9 @@
     set appName Octave.app
 
     post-build {
-        xinstall -d -p -m 0755 ${worksrcpath}/${appName}/Contents
-        xinstall -d -p -m 0755 ${worksrcpath}/${appName}/Contents/Resources
-        xinstall -d -p -m 0755 ${worksrcpath}/${appName}/Contents/MacOS
+        xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents
+        xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents/Resources
+        xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents/MacOS
 
         set script [open "${worksrcpath}/${appName}/Contents/MacOS/Octave" w 0755]
         if { [variant_isset qt4gui] } {

Modified: trunk/dports/math/octave-devel/Portfile (149071 => 149072)


--- trunk/dports/math/octave-devel/Portfile	2016-05-28 13:06:30 UTC (rev 149071)
+++ trunk/dports/math/octave-devel/Portfile	2016-05-28 14:58:20 UTC (rev 149072)
@@ -508,9 +508,9 @@
     set appName Octave_${version}.app
 
     post-build {
-        xinstall -d -p -m 0755 ${worksrcpath}/${appName}/Contents
-        xinstall -d -p -m 0755 ${worksrcpath}/${appName}/Contents/Resources
-        xinstall -d -p -m 0755 ${worksrcpath}/${appName}/Contents/MacOS
+        xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents
+        xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents/Resources
+        xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents/MacOS
 
         set script [open "${worksrcpath}/${appName}/Contents/MacOS/Octave" w 0755]
         if { [variant_isset qt4gui] } {
@@ -673,12 +673,12 @@
         ${destroot}${prefix}/share/appdata/www.octave.org-octave.appdata.xml \
         ${destroot}${prefix}/share/octave/${version}/appdata/
     foreach num {16 22 24 32 48 64 128 256 512} {
-        xinstall -d -m 0755 -p ${destroot}${prefix}/share/octave/${version}/icons/hicolor/${num}x${num}/apps
+        xinstall -d -m 0755 ${destroot}${prefix}/share/octave/${version}/icons/hicolor/${num}x${num}/apps
         move \
             ${destroot}${prefix}/share/icons/hicolor/${num}x${num}/apps/octave.png \
             ${destroot}${prefix}/share/octave/${version}/icons/hicolor/${num}x${num}/apps/octave.png
     }
-    xinstall -d -m 0755 -p ${destroot}${prefix}/share/octave/${version}/icons/hicolor/scalable/apps
+    xinstall -d -m 0755 ${destroot}${prefix}/share/octave/${version}/icons/hicolor/scalable/apps
     move \
         ${destroot}${prefix}/share/icons/hicolor/scalable/apps/octave.svg \
         ${destroot}${prefix}/share/octave/${version}/icons/hicolor/scalable/apps/octave.svg