[60033] trunk/dports/science/gwyddion
rowue at macports.org
rowue at macports.org
Thu Oct 29 17:12:27 PDT 2009
Revision: 60033
http://trac.macports.org/changeset/60033
Author: rowue at macports.org
Date: 2009-10-29 17:12:26 -0700 (Thu, 29 Oct 2009)
Log Message:
-----------
Added support for quartz-gl
Modified Paths:
--------------
trunk/dports/science/gwyddion/Portfile
Added Paths:
-----------
trunk/dports/science/gwyddion/files/gwyddion.quartz
trunk/dports/science/gwyddion/files/patch-libgwydgets-gwy3dview.c.diff
Modified: trunk/dports/science/gwyddion/Portfile
===================================================================
--- trunk/dports/science/gwyddion/Portfile 2009-10-30 00:10:02 UTC (rev 60032)
+++ trunk/dports/science/gwyddion/Portfile 2009-10-30 00:12:26 UTC (rev 60033)
@@ -7,6 +7,7 @@
version 2.17
categories science x11
platforms darwin
+revison 1
maintainers rowue gwyddion.net:yeti
description Software for SPM Analysis
@@ -38,11 +39,28 @@
patch-configure.diff \
app-ige-mag-menu.c.diff
+variant no_x11 description { Build gwyddion with quartz gl support} {
+ patchfiles-delete patch-app-Makefile.am.diff \
+ patch-app-mac_integration.c.diff \
+ patch-configure.ac.diff \
+ patch-configure.diff \
+ app-ige-mag-menu.c.diff
+
+ patchfiles-append patch-libgwydgets-gwy3dview.c.diff
+
+}
+
+
post-destroot {
xinstall -m 755 -d ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
- xinstall ${filespath}/gwyddion ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
- reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
- reinplace "s|@PREFIX@|${prefix}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+ if {[variant_isset no_x11]} {
+ xinstall ${filespath}/gwyddion.quartz ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+ reinplace "s|@PREFIX@|${prefix}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+ } else {
+ xinstall ${filespath}/gwyddion ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
+ reinplace "s|@APPDIR@|${applications_dir}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+ reinplace "s|@PREFIX@|${prefix}|" ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS/gwyddion
+ }
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/
@@ -57,7 +75,9 @@
platform darwin 8 {
post-activate {
if {[file exists ${prefix}/lib/pkgconfig/gl.pc]} {
- ui_msg "openGL support currently requires you to use MacPorts' X11 server (xorg-server) rather than Apple's."
+ if {![variant_isset no_x11]} {
+ ui_msg "openGL support currently requires you to use MacPorts' X11 server (xorg-server) rather than Apple's."
+ }
}
}
}
Added: trunk/dports/science/gwyddion/files/gwyddion.quartz
===================================================================
--- trunk/dports/science/gwyddion/files/gwyddion.quartz (rev 0)
+++ trunk/dports/science/gwyddion/files/gwyddion.quartz 2009-10-30 00:12:26 UTC (rev 60033)
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec @PREFIX@/bin/gwyddion
Property changes on: trunk/dports/science/gwyddion/files/gwyddion.quartz
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/dports/science/gwyddion/files/patch-libgwydgets-gwy3dview.c.diff
===================================================================
--- trunk/dports/science/gwyddion/files/patch-libgwydgets-gwy3dview.c.diff (rev 0)
+++ trunk/dports/science/gwyddion/files/patch-libgwydgets-gwy3dview.c.diff 2009-10-30 00:12:26 UTC (rev 60033)
@@ -0,0 +1,14 @@
+--- libgwydgets/gwy3dview.c.orig 2009-04-14 14:50:50.000000000 +0200
++++ libgwydgets/gwy3dview.c 2009-10-21 16:50:55.000000000 +0200
+@@ -40,7 +40,11 @@
+ #endif
+
+ #ifdef HAVE_GTKGLEXT
++#ifndef GDK_WINDOWING_QUARTZ
+ #include <GL/gl.h>
++#else
++#include <OpenGL/gl.h>
++#endif
+ #endif
+
+ #include <libgwyddion/gwymacros.h>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091029/3b46904c/attachment.html>
More information about the macports-changes
mailing list