<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b0d11a433a915af0e0f4069c6c272677b94c3e3a">https://github.com/macports/macports-ports/commit/b0d11a433a915af0e0f4069c6c272677b94c3e3a</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b0d11a4 gwyddion: update to 2.50
</span>b0d11a4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b0d11a433a915af0e0f4069c6c272677b94c3e3a
</span>Author: System Administrator <root@Egal.digitalis.org>
AuthorDate: Fri Feb 9 23:28:26 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> gwyddion: update to 2.50
</span>---
science/gwyddion/Portfile | 24 +++++++++++++++---------
science/gwyddion/files/gwyddion.quartz | 2 --
2 files changed, 15 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/Portfile b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd4d4ea..8765c0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,12 +3,11 @@
</span> PortSystem 1.0
name gwyddion
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.48
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.50
</span> # revision 1
categories science x11
platforms darwin
license gpl-2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# revision 1
</span> maintainers rowue gwyddion.net:yeti
description Software for SPM Analysis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,13 +16,12 @@ long_description \
</span> visualization and analysis. It uses gtk2 for the user interface.
homepage http://gwyddion.net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# master_sites sourceforge
</span> master_sites sourceforge:project/gwyddion/gwyddion/${version}
use_xz yes
use_parallel_build yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 9d3fa861bad2b3df43383e2ca3deacf5111bf2a9484ba31523960ba650e13185 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f7b0ac9844c493109e6bca22a9abd7dffa13bff2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 a511b528bfc0fbd53d0d867ece37ce4bf84c0989f75e535631ce60cff77b48ad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4f4e53e625aff385ee226ac392c420e614236657
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,8 +35,9 @@ depends_lib port:gtk2 \
</span> port:gtkglext
configure.args --disable-desktop-file-update \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-include=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --x-lib=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-x \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --x-libraries=${prefix}/lib
</span>
variant quartz description { Build gwyddion with quartz gl support } {
depends_lib-append port:gtk-osx-application-gtk2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,8 +60,7 @@ variant debug description { Enable debugging } {
</span> post-destroot {
xinstall -m 755 -d ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
if {[variant_isset quartz]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${filespath}/gwyddion.quartz ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PREFIX@|${prefix}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/bin/gwyddion ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
</span> } else {
xinstall ${filespath}/gwyddion ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +74,14 @@ post-destroot {
</span> move ${destroot}${prefix}/lib/python2.7/site-packages/gwy.la ${destroot}${python.site_packages}
}
xinstall -m 755 -d ${destroot}${applications_dir}/gwyddion.app/Contents/Resources
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set linkdirs {ui pixmaps gradients glmaterials}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach linkdir $linkdirs {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/gwyddion/$linkdir ${destroot}${applications_dir}/gwyddion.app/Contents/Resources/$linkdir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/lib/gwyddion/modules ${destroot}${applications_dir}/gwyddion.app/Contents/Resources/modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/share/locale ${destroot}${applications_dir}/gwyddion.app/Contents/Resources/locale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> xinstall -m 0644 ${filespath}/gwyddion.icns ${destroot}${applications_dir}/gwyddion.app/Contents/Resources
xinstall -m 0644 ${filespath}/Info.plist ${destroot}${applications_dir}/gwyddion.app/Contents/
reinplace "s|@VERSION@|${version}|" ${destroot}${applications_dir}/gwyddion.app/Contents/Info.plist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/files/gwyddion.quartz b/science/gwyddion/files/gwyddion.quartz
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 894a4ea..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gwyddion/files/gwyddion.quartz
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,2 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/bash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exec @PREFIX@/bin/gwyddion
</span></pre><pre style='margin:0'>
</pre>