[138232] trunk/dports/science/gwyddion

[elelay at macports.org]

Revision: 138232
          https://trac.macports.org/changeset/138232
Author:   elelay at macports.org
Date:     2015-07-02 12:08:45 -0700 (Thu, 02 Jul 2015)
Log Message:
-----------
gwyddion: depend on gtk-osx-application-gtk2

Modified Paths:
--------------
    trunk/dports/science/gwyddion/Portfile

Added Paths:
-----------
    trunk/dports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff

Modified: trunk/dports/science/gwyddion/Portfile
===================================================================
--- trunk/dports/science/gwyddion/Portfile	2015-07-02 19:05:59 UTC (rev 138231)
+++ trunk/dports/science/gwyddion/Portfile	2015-07-02 19:08:45 UTC (rev 138232)
@@ -37,7 +37,8 @@
                     --x-lib=${prefix}/lib
 
 variant quartz description { Build gwyddion with quartz gl support } {
-    depends_lib-append    port:gtk-osx-application
+    depends_lib-append    port:gtk-osx-application-gtk2
+    patchfiles-append     patch-gtk-osx-application-gtk2.diff
 }
 
 variant pygwy description { Build gwyddion with python support } {

Added: trunk/dports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff
===================================================================
--- trunk/dports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff	                        (rev 0)
+++ trunk/dports/science/gwyddion/files/patch-gtk-osx-application-gtk2.diff	2015-07-02 19:08:45 UTC (rev 138232)
@@ -0,0 +1,46 @@
+--- 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="$GTK_MAC_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration-gtk2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration" 2>/dev/null`
++  pkg_cv_GTK_MAC_CFLAGS=`$PKG_CONFIG --cflags "gtk-mac-integration-gtk2" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -19634,12 +19634,12 @@
+         pkg_cv_GTK_MAC_LIBS="$GTK_MAC_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-mac-integration-gtk2\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "gtk-mac-integration-gtk2") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration" 2>/dev/null`
++  pkg_cv_GTK_MAC_LIBS=`$PKG_CONFIG --libs "gtk-mac-integration-gtk2" 2>/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 "gtk-mac-integration"`
++	        GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk-mac-integration-gtk2"`
+         else
+-	        GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-mac-integration"`
++	        GTK_MAC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk-mac-integration-gtk2"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GTK_MAC_PKG_ERRORS" >&5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150702/1e2ab54d/attachment.html>