<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[138007] users/elelay/ports</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/138007">138007</a></dd>
<dt>Author</dt> <dd>elelay@macports.org</dd>
<dt>Date</dt> <dd>2015-06-25 12:57:55 -0700 (Thu, 25 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>changes for gwyddion gtk-osx-application-gtk2</pre>

<h3>Added Paths</h3>
<ul>
<li>users/elelay/ports/science/</li>
<li>users/elelay/ports/science/gwyddion/</li>
<li><a href="#userselelayportssciencegwyddionPortfile">users/elelay/ports/science/gwyddion/Portfile</a></li>
<li>users/elelay/ports/science/gwyddion/files/</li>
<li><a href="#userselelayportssciencegwyddionfilesInfoplist">users/elelay/ports/science/gwyddion/files/Info.plist</a></li>
<li><a href="#userselelayportssciencegwyddionfilesgwyddion">users/elelay/ports/science/gwyddion/files/gwyddion</a></li>
<li><a href="#userselelayportssciencegwyddionfilesgwyddionicns">users/elelay/ports/science/gwyddion/files/gwyddion.icns</a></li>
<li><a href="#userselelayportssciencegwyddionfilesgwyddionquartz">users/elelay/ports/science/gwyddion/files/gwyddion.quartz</a></li>
<li><a href="#userselelayportssciencegwyddionfilespatchgtkosxapplicationgtk2diff">users/elelay/ports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="userselelayportssciencegwyddionPortfile"></a>
<div class="addfile"><h4>Added: users/elelay/ports/science/gwyddion/Portfile (0 => 138007)</h4>
<pre class="diff"><span>
<span class="info">--- users/elelay/ports/science/gwyddion/Portfile                                (rev 0)
+++ users/elelay/ports/science/gwyddion/Portfile        2015-06-25 19:57:55 UTC (rev 138007)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+
+name                gwyddion
+version             2.41
+categories          science x11
+platforms           darwin
+license             gpl-2
+# revision            1
+maintainers         rowue gwyddion.net:yeti
+description         Software for SPM Analysis
+
+long_description \
+    Gwyddion is a modular program for SPM (scanning probe microscopy) data \
+    visualization and analysis. It uses gtk2 for the user interface.
+
+homepage            http://gwyddion.net
+# master_sites        sourceforge
+master_sites        sourceforge:project/gwyddion/gwyddion/${version}
+use_xz              yes
+use_parallel_build  yes
+
+checksums           sha256  dcccba56231d6553ded5ba3613f70e4b71f4365e6482e65c69b4eea8bb4d8afa \
+                    rmd160  cb5e9aa32a28d339c31d41dadfbe8c64d8581fd9
+
+depends_build       port:pkgconfig
+
+depends_lib         port:gtk2 \
+                    port:libxml2 \
+                    port:fftw-3 \
+                    port:gtkglext
+
+configure.args      --disable-desktop-file-update \
+                    --x-include=${prefix}/include \
+                    --x-lib=${prefix}/lib
+
+variant quartz description { Build gwyddion with quartz gl support } {
+    depends_lib-append    port:gtk-osx-application-gtk2
+    patchfiles-append     patch-gtk-osx-application-gtk2.diff
+}
+
+variant pygwy description { Build gwyddion with python support } {
+    ui_msg &quot;For console python support you have to set DYLD_FALLBACK_LIBRARY_PATH to $prefix/lib&quot;
+    set python.prefix     ${frameworks_dir}/Python.framework/Versions/2.7
+    configure.pkg_config_path ${python.prefix}/lib/pkgconfig
+    depends_lib-append    port:py-pygtk \
+                          port:python27
+    configure.cflags-append -I${python.prefix}/include
+}
+
+variant debug description { Enable debugging } {
+    configure.cflags-append &quot;-O0 -g&quot;
+}
+
+post-destroot {
+    xinstall -m 755 -d ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
+    if {[variant_isset quartz]} {
+        xinstall ${filespath}/gwyddion.quartz ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+        reinplace &quot;s|@PREFIX@|${prefix}|&quot; ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+    } else {
+        xinstall ${filespath}/gwyddion ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
+        reinplace &quot;s|@APPDIR@|${applications_dir}|&quot; ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+        reinplace &quot;s|@PREFIX@|${prefix}|&quot; ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+    }
+    if {[variant_isset pygwy]} {
+            set python.prefix   ${frameworks_dir}/Python.framework/Versions/2.7
+            set python.site_packages    ${python.prefix}/lib/python2.7/site-packages/
+        xinstall -m 755 -d ${destroot}${python.site_packages}
+        move ${destroot}${prefix}/lib/python2.7/site-packages/gwy.so ${destroot}${python.site_packages}
+        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
+    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 &quot;s|@VERSION@|${version}|&quot; ${destroot}${applications_dir}/gwyddion.app/Contents/Info.plist
+    system &quot;echo 'APPL????' &gt; ${destroot}${applications_dir}/gwyddion.app/Contents/PkgInfo&quot;
+}
+
+post-activate {
+        system &quot;${prefix}/bin/update-mime-database ${prefix}/share/mime ; true&quot;
+}
+
+platform darwin 8 {
+        post-activate {
+                if {[file exists ${prefix}/lib/pkgconfig/gl.pc]} {
+            if {![variant_isset quartz]} {
+                            ui_msg &quot;openGL support currently requires you to use MacPorts' X11 server (xorg-server) rather than Apple's.&quot;
+            }
+                }
+        }
+}
</ins><span class="cx">Property changes on: users/elelay/ports/science/gwyddion/Portfile
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="userselelayportssciencegwyddionfilesInfoplist"></a>
<div class="binary"><h4>Added: users/elelay/ports/science/gwyddion/files/Info.plist</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: users/elelay/ports/science/gwyddion/files/Info.plist
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="userselelayportssciencegwyddionfilesgwyddion"></a>
<div class="addfile"><h4>Added: users/elelay/ports/science/gwyddion/files/gwyddion (0 => 138007)</h4>
<pre class="diff"><span>
<span class="info">--- users/elelay/ports/science/gwyddion/files/gwyddion                                (rev 0)
+++ users/elelay/ports/science/gwyddion/files/gwyddion        2015-06-25 19:57:55 UTC (rev 138007)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+#!/bin/bash
+if [ -x @APPDIR@/X11.app/Contents/MacOS/X11 ]; then
+        open -a @APPDIR@/X11.app/Contents/MacOS/X11 @PREFIX@/bin/gwyddion
+elif [ -x /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 ]; then
+        open -a /Applications/Utilities/XQuartz.app/Contents/MacOS/X11 @PREFIX@/bin/gwyddion
+else 
+        open -a /Applications/Utilities/X11.app/Contents/MacOS/X11 @PREFIX@/bin/gwyddion
+fi
</ins><span class="cx">Property changes on: users/elelay/ports/science/gwyddion/files/gwyddion
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="userselelayportssciencegwyddionfilesgwyddionicns"></a>
<div class="binary"><h4>Added: users/elelay/ports/science/gwyddion/files/gwyddion.icns</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: users/elelay/ports/science/gwyddion/files/gwyddion.icns
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="userselelayportssciencegwyddionfilesgwyddionquartz"></a>
<div class="addfile"><h4>Added: users/elelay/ports/science/gwyddion/files/gwyddion.quartz (0 => 138007)</h4>
<pre class="diff"><span>
<span class="info">--- users/elelay/ports/science/gwyddion/files/gwyddion.quartz                                (rev 0)
+++ users/elelay/ports/science/gwyddion/files/gwyddion.quartz        2015-06-25 19:57:55 UTC (rev 138007)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+#!/bin/bash
+exec @PREFIX@/bin/gwyddion
</ins><span class="cx">Property changes on: users/elelay/ports/science/gwyddion/files/gwyddion.quartz
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
<a id="userselelayportssciencegwyddionfilespatchgtkosxapplicationgtk2diff"></a>
<div class="addfile"><h4>Added: users/elelay/ports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff (0 => 138007)</h4>
<pre class="diff"><span>
<span class="info">--- users/elelay/ports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff                                (rev 0)
+++ users/elelay/ports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff        2015-06-25 19:57:55 UTC (rev 138007)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+--- configure.old        2015-06-25 21:54:31.000000000 +0200
++++ configure        2015-06-25 21:54:48.000000000 +0200
+@@ -19616,12 +19616,12 @@
+         pkg_cv_GTK_MAC_CFLAGS=&quot;$GTK_MAC_CFLAGS&quot;
+     else
+         if test -n &quot;$PKG_CONFIG&quot; &amp;&amp; \
+-    { { $as_echo &quot;$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \&quot;gtk-mac-integration\&quot;&quot;; } &gt;&amp;5
+-  ($PKG_CONFIG --exists --print-errors &quot;gtk-mac-integration&quot;) 2&gt;&amp;5
++    { { $as_echo &quot;$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \&quot;gtk-mac-integration-gtk2\&quot;&quot;; } &gt;&amp;5
++  ($PKG_CONFIG --exists --print-errors &quot;gtk-mac-integration-gtk2&quot;) 2&gt;&amp;5
+   ac_status=$?
+   $as_echo &quot;$as_me:${as_lineno-$LINENO}: \$? = $ac_status&quot; &gt;&amp;5
+   test $ac_status = 0; }; then
+-  pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags &quot;gtk-mac-integration&quot; 2&gt;/dev/null`
++  pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags &quot;gtk-mac-integration-gtk2&quot; 2&gt;/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -19634,12 +19634,12 @@
+         pkg_cv_GTK_MAC_LIBS=&quot;$GTK_MAC_LIBS&quot;
+     else
+         if test -n &quot;$PKG_CONFIG&quot; &amp;&amp; \
+-    { { $as_echo &quot;$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \&quot;gtk-mac-integration\&quot;&quot;; } &gt;&amp;5
+-  ($PKG_CONFIG --exists --print-errors &quot;gtk-mac-integration&quot;) 2&gt;&amp;5
++    { { $as_echo &quot;$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \&quot;gtk-mac-integration-gtk2\&quot;&quot;; } &gt;&amp;5
++  ($PKG_CONFIG --exists --print-errors &quot;gtk-mac-integration-gtk2&quot;) 2&gt;&amp;5
+   ac_status=$?
+   $as_echo &quot;$as_me:${as_lineno-$LINENO}: \$? = $ac_status&quot; &gt;&amp;5
+   test $ac_status = 0; }; then
+-  pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs &quot;gtk-mac-integration&quot; 2&gt;/dev/null`
++  pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs &quot;gtk-mac-integration-gtk2&quot; 2&gt;/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -19658,9 +19658,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-                GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors &quot;gtk-mac-integration&quot;`
++                GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors &quot;gtk-mac-integration-gtk2&quot;`
+         else
+-                GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors &quot;gtk-mac-integration&quot;`
++                GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors &quot;gtk-mac-integration-gtk2&quot;`
+         fi
+         # Put the nasty error message in config.log where it belongs
+         echo &quot;$GTK_MAC_PKG_ERRORS&quot; &gt;&amp;5
</ins></span></pre>
</div>
</div>

</body>
</html>