[118750] trunk/dports/gis/qgis

[vince at macports.org]

Revision: 118750
          https://trac.macports.org/changeset/118750
Author:   vince at macports.org
Date:     2014-04-10 07:19:39 -0700 (Thu, 10 Apr 2014)
Log Message:
-----------
Add some environment variables for the processing plug-in to work better when launched from the Finder

Modified Paths:
--------------
    trunk/dports/gis/qgis/Portfile

Added Paths:
-----------
    trunk/dports/gis/qgis/files/
    trunk/dports/gis/qgis/files/patch-app_info_plist_in.diff

Modified: trunk/dports/gis/qgis/Portfile
===================================================================
--- trunk/dports/gis/qgis/Portfile	2014-04-10 12:33:29 UTC (rev 118749)
+++ trunk/dports/gis/qgis/Portfile	2014-04-10 14:19:39 UTC (rev 118750)
@@ -29,6 +29,8 @@
                     sha1    0e319fc07235b780f258a497db6883a7bf3e93c9 \
                     rmd160  389e53e52b0dc47c17a8d7891114bfd037dcd5f3
 
+patchfiles          patch-app_info_plist_in.diff
+
 worksrcdir          ${name}-${version}
 
 depends_lib-append  port:libiconv \
@@ -52,13 +54,8 @@
 
 
 post-patch {
-    if {![variant_isset grass]} {
-        reinplace -E "s|@@@|${prefix}/bin|" \
-            ${worksrcpath}/mac/app.info.plist.in
-    } else {
-        reinplace -E "s|@@@|${prefix}/bin:${prefix}/share/grass-6.4.3/bin|" \
-            ${worksrcpath}/mac/app.info.plist.in
-    }
+    reinplace -E "s|@@@|${prefix}|g" \
+        ${worksrcpath}/mac/app.info.plist.in
 }
 # Overrides default
 
@@ -166,7 +163,7 @@
 
 variant grass               description "Build Grass (6.43) plugin" {
 
-    depends_lib-append      port:grass
+    #depends_lib-append      port:grass
     configure.args-append   \
                 "-DGRASS_PREFIX=${prefix}/share/grass-6.4.3"
 }

Added: trunk/dports/gis/qgis/files/patch-app_info_plist_in.diff
===================================================================
--- trunk/dports/gis/qgis/files/patch-app_info_plist_in.diff	                        (rev 0)
+++ trunk/dports/gis/qgis/files/patch-app_info_plist_in.diff	2014-04-10 14:19:39 UTC (rev 118750)
@@ -0,0 +1,24 @@
+--- mac/app.info.plist.in.orig	2014-04-10 11:12:31.000000000 +0200
++++ mac/app.info.plist.in	2014-04-10 11:14:33.000000000 +0200
+@@ -26,6 +26,21 @@
+ 	<string>6.0</string>
+ 	<key>CSResourcesFileMapped</key>
+ 	<true/>
++    <key>LSEnvironment</key>
++    <dict>
++        <key>PATH</key>
++        <string>/bin:/usr/bin:/usr/sbin:@@@/bin:@@@/sbin</string>
++        <key>GRASS_SH</key>
++        <string>/bin/sh</string>
++        <key>GRASS_PROJSHARE</key>
++        <string>/opt/local/lib/proj47/share/proj</string>
++        <key>GRASS_VERSION</key>
++        <string>6.4.3</string>
++        <key>GRASS_LD_LIBRARY_PATH</key>
++        <string>/opt/local/share/grass-6.4.3/lib</string>
++        <key>GRASS_PERL</key>
++        <string>/opt/local/bin/perl</string>
++    </dict>
+ 	<key>CFBundleDocumentTypes</key>
+ 	<array>
+ 		<dict>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140410/86adeefb/attachment.html>