Revision: 149057 https://trac.macports.org/changeset/149057 Author: mcalhoun@macports.org Date: 2016-05-27 05:30:37 -0700 (Fri, 27 May 2016) Log Message: ----------- octave family: generate icons with XCode prior to 4.5 (#51487) Modified Paths: -------------- trunk/dports/math/octave/Portfile trunk/dports/math/octave-devel/Portfile Modified: trunk/dports/math/octave/Portfile =================================================================== --- trunk/dports/math/octave/Portfile 2016-05-27 10:36:16 UTC (rev 149056) +++ trunk/dports/math/octave/Portfile 2016-05-27 12:30:37 UTC (rev 149057) @@ -346,6 +346,12 @@ variant app description "build application bundle to launch ${subport}" { depends_build-append port:ImageMagick + if {[vercmp ${xcodeversion} 4.5] < 0} { + # need a way to generate icns file for XCode prior to 4.5 + # see #51487 + depends_build-append port:libicns + } + global appName set appName Octave.app @@ -412,7 +418,14 @@ system -W ${worksrcpath} "${prefix}/bin/convert -background transparent -resize ${hres}x${hres} -density ${hdenw}x${hdenh} ${svg} Octave.iconset/icon_${res}x${res}@2x.png" } - system -W ${worksrcpath} "/usr/bin/iconutil -c icns -o ${appName}/Contents/Resources/Octave.icns Octave.iconset" + if {[vercmp ${xcodeversion} 4.5] >= 0} { + system -W ${worksrcpath} "/usr/bin/iconutil -c icns -o ${appName}/Contents/Resources/Octave.icns Octave.iconset" + } else { + # /usr/bin/iconutil introduced in XCode 4.5 + # see #51487 + system -W ${worksrcpath}/Octave.iconset \ + "${prefix}/bin/png2icns ${worksrcpath}/${appName}/Contents/Resources/Octave.icns icon_16x16.png icon_32x32.png icon_128x128.png icon_256x256.png icon_512x512.png" + } } post-destroot { Modified: trunk/dports/math/octave-devel/Portfile =================================================================== --- trunk/dports/math/octave-devel/Portfile 2016-05-27 10:36:16 UTC (rev 149056) +++ trunk/dports/math/octave-devel/Portfile 2016-05-27 12:30:37 UTC (rev 149057) @@ -498,6 +498,12 @@ variant app description "build application bundle to launch ${subport}" { depends_build-append port:ImageMagick + if {[vercmp ${xcodeversion} 4.5] < 0} { + # need a way to generate icns file for XCode prior to 4.5 + # see #51487 + depends_build-append port:libicns + } + global appName set appName Octave_${version}.app @@ -564,7 +570,14 @@ system -W ${worksrcpath} "${prefix}/bin/convert -background transparent -resize ${hres}x${hres} -density ${hdenw}x${hdenh} ${svg} Octave.iconset/icon_${res}x${res}@2x.png" } - system -W ${worksrcpath} "/usr/bin/iconutil -c icns -o ${appName}/Contents/Resources/Octave.icns Octave.iconset" + if {[vercmp ${xcodeversion} 4.5] >= 0} { + system -W ${worksrcpath} "/usr/bin/iconutil -c icns -o ${appName}/Contents/Resources/Octave.icns Octave.iconset" + } else { + # /usr/bin/iconutil introduced in XCode 4.5 + # see #51487 + system -W ${worksrcpath}/Octave.iconset \ + "${prefix}/bin/png2icns ${worksrcpath}/${appName}/Contents/Resources/Octave.icns icon_16x16.png icon_32x32.png icon_128x128.png icon_256x256.png icon_512x512.png" + } } post-destroot {