[116166] trunk/dports/gis/grass/Portfile

[mojca at macports.org]

Revision: 116166
          https://trac.macports.org/changeset/116166
Author:   mojca at macports.org
Date:     2014-01-20 06:20:40 -0800 (Mon, 20 Jan 2014)
Log Message:
-----------
grass: replace hard-coded gcc with configure.cc (#32797)

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

Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2014-01-20 14:19:08 UTC (rev 116165)
+++ trunk/dports/gis/grass/Portfile	2014-01-20 14:20:40 UTC (rev 116166)
@@ -51,6 +51,12 @@
     patch-Makefile.diff \
     patch-ffmpeg.diff
 
+post-patch {
+    reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" ${worksrcpath}/configure
+    # http://trac.osgeo.org/grass/ticket/2169
+    reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/gem/Makefile
+}
+
 # List of all python scripts. Used later to ensure usage of python26/python27
 # (insteaf of the currently active python)
 # Work around bug http://trac.osgeo.org/grass/ticket/1758
@@ -325,7 +331,6 @@
     post-patch {
         # for some reason it fails if python_bin is not defined inside post-patch (figure out why)
         set python_bin ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
-        reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" ${worksrcpath}/configure
         reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
         foreach f $python_scripts {
             reinplace "s|/usr/bin/env python|${python_bin}|" $f
@@ -341,7 +346,6 @@
 
     post-patch {
         set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
-        reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" ${worksrcpath}/configure
         reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
         foreach f $python_scripts {
             reinplace "s|/usr/bin/env python|${python_bin}|" $f
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140120/8ad520bb/attachment-0001.html>