[106731] trunk/dports/gis/grass

[g5pw at macports.org]

Revision: 106731
          https://trac.macports.org/changeset/106731
Author:   g5pw at macports.org
Date:     2013-06-06 14:05:42 -0700 (Thu, 06 Jun 2013)
Log Message:
-----------
gis/grass:
  fix build with tcl8.6 (#38054 #37578 #37376)
  fix python build bug
  add wxwidgets variant
  add wxpython variant (#36904)

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

Added Paths:
-----------
    trunk/dports/gis/grass/files/patch-visualization_nviz_src-draw_c.diff

Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2013-06-06 20:33:10 UTC (rev 106730)
+++ trunk/dports/gis/grass/Portfile	2013-06-06 21:05:42 UTC (rev 106731)
@@ -44,11 +44,57 @@
 patchfiles \
     patch-Makefile.diff \
     patch-configure.diff \
-    patch-macosx_Makefile.diff
+    patch-macosx_Makefile.diff \
+    patch-visualization_nviz_src-draw_c.diff
 
+# List of all python scripts. Used later to ensure usage of python27 (and not
+# the currently active python)
+# Work around bug http://trac.osgeo.org/grass/ticket/1758
+depends_build-append    port:python27
+set python_scripts [ list \
+    doc/python/example_ctypes.py \
+    general/g.parser/test.py \
+    gui/scripts/g.change.gui.py \
+    gui/scripts/g.extension.py \
+    gui/scripts/g.extension.rebuild.all.py \
+    gui/scripts/v.type_wrapper.py \
+    gui/wxpython/gui_modules/gmodeler.py \
+    gui/wxpython/gui_modules/menuform.py \
+    gui/wxpython/scripts/d.rast3d.py \
+    gui/wxpython/scripts/p.cmd.py \
+    gui/wxpython/scripts/p.db.py \
+    gui/wxpython/scripts/p.mon.py \
+    gui/wxpython/scripts/p.rast.py \
+    gui/wxpython/scripts/p.vect.py \
+    imagery/i.atcorr/create_iwave.py \
+    lib/python/ctypes/ctypesgen.py \
+    lib/python/ctypes/ctypesgencore/__init__.py \
+    lib/python/ctypes/ctypesgencore/ctypedescs.py \
+    lib/python/ctypes/ctypesgencore/descriptions.py \
+    lib/python/ctypes/ctypesgencore/expressions.py \
+    lib/python/ctypes/ctypesgencore/messages.py \
+    lib/python/ctypes/ctypesgencore/options.py \
+    lib/python/ctypes/ctypesgencore/parser/__init__.py \
+    lib/python/ctypes/ctypesgencore/parser/cdeclarations.py \
+    lib/python/ctypes/ctypesgencore/parser/cgrammar.py \
+    lib/python/ctypes/ctypesgencore/parser/cparser.py \
+    lib/python/ctypes/ctypesgencore/parser/ctypesparser.py \
+    lib/python/ctypes/ctypesgencore/parser/datacollectingparser.py \
+    lib/python/ctypes/ctypesgencore/parser/pplexer.py \
+    lib/python/ctypes/ctypesgencore/parser/preprocessor.py \
+    lib/python/ctypes/ctypesgencore/printer/__init__.py \
+    lib/python/ctypes/ctypesgencore/printer/printer.py \
+    lib/python/ctypes/ctypesgencore/processor/__init__.py \
+    lib/python/ctypes/ctypesgencore/processor/dependencies.py \
+    lib/python/ctypes/ctypesgencore/processor/operations.py \
+    lib/python/ctypes/ctypesgencore/processor/pipeline.py ]
+
 post-patch {
    reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
       ${worksrcpath}/configure
+   foreach f $python_scripts {
+       reinplace "s|/usr/bin/env python|${prefix}/bin/python2.7|" $f
+   }
 }
 
 configure.ldflags-append -framework OpenGL -framework Accelerate
@@ -74,6 +120,8 @@
     --with-cxx \
     --with-x \
     --without-postgres \
+    --disable-python \
+    --disable-wxwidgets \
     --enable-largefile \
     --with-cairo \
     --with-cairo-includes=${prefix}/include/cairo \
@@ -88,6 +136,8 @@
 
 build.target    default
 
+build.args-append PYTHON=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
+
 variant mysql5 description {Add MySQL 5 support} {
     depends_lib-append    path:bin/mysql_config5:mysql5
     configure.args-append --with-mysql
@@ -144,6 +194,18 @@
                           --with-ffmpeglibs=${prefix}/lib
 }
 
+variant wxwidgets description {Add WXWidgets support} {
+    depends_lib-append	  port:wxwidgets30
+    configure.args-delete --disable-wxwidgets
+    configure.args-append --with-wxwidgets=${prefix}/bin/wx-config
+}
+
+variant wxPython requires wxwidgets description {Enable support for wxGUI Python extensions} {
+    depends_lib			  port:py27-wxpython30
+    configure.args-delete --disable-python
+    configure.args-append --with-python=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7-config
+}
+
 livecheck.type      regex
 livecheck.url       http://grass.osgeo.org/devel/svntags.php
 livecheck.regex     {GRASS ([0-9.]+):}

Added: trunk/dports/gis/grass/files/patch-visualization_nviz_src-draw_c.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-visualization_nviz_src-draw_c.diff	                        (rev 0)
+++ trunk/dports/gis/grass/files/patch-visualization_nviz_src-draw_c.diff	2013-06-06 21:05:42 UTC (rev 106731)
@@ -0,0 +1,11 @@
+--- visualization/nviz/src/draw.c	2008-12-19 21:29:59.000000000 +0100
++++ visualization/nviz/src/draw_new.c	2013-01-21 22:22:09.819456565 +0100
+@@ -32,7 +32,7 @@
+ void CancelFunc_Hook(void)
+ {
+     if (cancel_script != NULL) {
+-	TkCopyAndGlobalEval(cancel_interp, cancel_script);
++	Tcl_EvalEx(cancel_interp, cancel_script, -1, TCL_EVAL_GLOBAL);
+     }
+ }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130606/013f76ae/attachment.html>