[121097] users/mojca/ports

mojca at macports.org mojca at macports.org
Tue Jun 17 06:30:11 PDT 2014


Revision: 121097
          https://trac.macports.org/changeset/121097
Author:   mojca at macports.org
Date:     2014-06-17 06:30:11 -0700 (Tue, 17 Jun 2014)
Log Message:
-----------
mojca/grass: version 7.0.0beta2 with wxwidgets30

Modified Paths:
--------------
    users/mojca/ports/gis/grass/Portfile
    users/mojca/ports/gis/grass/files/patch-configure.diff
    users/mojca/ports/gis/grass/files/patch-ffmpeg.diff
    users/mojca/ports/gis/grass/files/patch-is_void.diff

Added Paths:
-----------
    users/mojca/ports/gis/
    users/mojca/ports/gis/grass/
    users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff
    users/mojca/ports/gis/grass/files/patch-lib-init-grass.sh.diff

Removed Paths:
-------------
    users/mojca/ports/gis/grass/files/patch-Makefile.diff
    users/mojca/ports/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff
    users/mojca/ports/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff
    users/mojca/ports/gis/grass/files/patch-lib-init-grass.src.diff
    users/mojca/ports/gis/grass/files/patch-macosx_Makefile.diff

Modified: users/mojca/ports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/Portfile	2014-06-17 13:30:11 UTC (rev 121097)
@@ -6,8 +6,7 @@
 
 name              grass
 epoch             1
-version           6.4.3
-revision          3
+version           7.0.0beta2
 maintainers       nomaintainer
 categories        gis
 license           GPL-2+
@@ -20,8 +19,8 @@
 homepage          http://grass.osgeo.org/
 master_sites      ${homepage}grass[join [lrange [split ${version} .] 0 1] {}]/source/
 
-checksums         rmd160  bdbd671972730701aa8213c2041abe31a68eea4c \
-                  sha256  5d29d322a262330894aa046845e6790258cd6e3f95b28c350ed7839810672ed6
+checksums         rmd160  bfc01c12afa8929fc17568359551861cd413089b \
+                  sha256  b360de82f9683f04383f03c4b584287be233fa76d05b0cb1f50d57d2de5cffdd
 
 depends_build     port:pkgconfig
 depends_lib       port:fftw-3 \
@@ -43,97 +42,157 @@
 
 patchfiles \
     patch-configure.diff \
-    patch-gui-wxpython-core-globalvar.py.diff \
-    patch-gui-wxpython-gui_core-ghelp.py.diff \
+    patch-include-Make-Install.make.diff \
     patch-is_void.diff \
-    patch-lib-init-grass.src.diff \
-    patch-macosx_Makefile.diff \
-    patch-Makefile.diff \
+    patch-lib-init-grass.sh.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
+    # 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
 set python_scripts [ list \
+    doc/gui/wxpython/example/dialogs.py \
+    doc/gui/wxpython/example/frame.py \
+    doc/gui/wxpython/example/g.gui.example.py \
+    doc/gui/wxpython/example/toolbars.py \
     doc/python/m.distance.py \
     doc/python/raster_example_ctypes.py \
     doc/python/vector_example_ctypes.py \
+    general/g.mapsets/g.mapsets_picker.py \
     general/g.parser/test.py \
     gui/scripts/d.rast3d.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/compat/__init__.py \
-    gui/wxpython/compat/subprocess.py \
+    gui/scripts/d.wms.py \
+    gui/wxpython/animation/__init__.py \
+    gui/wxpython/animation/anim.py \
+    gui/wxpython/animation/controller.py \
+    gui/wxpython/animation/data.py \
+    gui/wxpython/animation/dialogs.py \
+    gui/wxpython/animation/frame.py \
+    gui/wxpython/animation/g.gui.animation.py \
+    gui/wxpython/animation/mapwindow.py \
+    gui/wxpython/animation/nviztask.py \
+    gui/wxpython/animation/provider.py \
+    gui/wxpython/animation/temporal_manager.py \
+    gui/wxpython/animation/toolbars.py \
+    gui/wxpython/animation/utils.py \
+    gui/wxpython/core/__init__.py \
     gui/wxpython/core/debug.py \
     gui/wxpython/core/gcmd.py \
+    gui/wxpython/core/gconsole.py \
+    gui/wxpython/core/giface.py \
     gui/wxpython/core/globalvar.py \
-    gui/wxpython/core/menudata.py \
+    gui/wxpython/core/layerlist.py \
+    gui/wxpython/core/menutree.py \
     gui/wxpython/core/render.py \
     gui/wxpython/core/settings.py \
+    gui/wxpython/core/toolboxes.py \
+    gui/wxpython/core/treemodel.py \
     gui/wxpython/core/units.py \
     gui/wxpython/core/utils.py \
     gui/wxpython/core/workspace.py \
-    gui/wxpython/create__init__.py \
+    gui/wxpython/core/ws.py \
+    gui/wxpython/dbmgr/__init__.py \
+    gui/wxpython/dbmgr/base.py \
     gui/wxpython/dbmgr/dialogs.py \
+    gui/wxpython/dbmgr/g.gui.dbmgr.py \
     gui/wxpython/dbmgr/manager.py \
     gui/wxpython/dbmgr/sqlbuilder.py \
     gui/wxpython/dbmgr/vinfo.py \
+    gui/wxpython/gcp/__init__.py \
+    gui/wxpython/gcp/g.gui.gcp.py \
     gui/wxpython/gcp/manager.py \
     gui/wxpython/gcp/mapdisplay.py \
+    gui/wxpython/gcp/statusbar.py \
     gui/wxpython/gcp/toolbars.py \
     gui/wxpython/gis_set.py \
+    gui/wxpython/gis_set_error.py \
+    gui/wxpython/gmodeler/__init__.py \
     gui/wxpython/gmodeler/dialogs.py \
     gui/wxpython/gmodeler/frame.py \
+    gui/wxpython/gmodeler/g.gui.gmodeler.py \
+    gui/wxpython/gmodeler/giface.py \
     gui/wxpython/gmodeler/menudata.py \
     gui/wxpython/gmodeler/model.py \
     gui/wxpython/gmodeler/preferences.py \
     gui/wxpython/gmodeler/toolbars.py \
+    gui/wxpython/gui_core/__init__.py \
     gui/wxpython/gui_core/dialogs.py \
     gui/wxpython/gui_core/forms.py \
     gui/wxpython/gui_core/ghelp.py \
     gui/wxpython/gui_core/goutput.py \
     gui/wxpython/gui_core/gselect.py \
     gui/wxpython/gui_core/mapdisp.py \
-    gui/wxpython/gui_core/mapwindow.py \
     gui/wxpython/gui_core/menu.py \
     gui/wxpython/gui_core/preferences.py \
     gui/wxpython/gui_core/prompt.py \
+    gui/wxpython/gui_core/pystc.py \
+    gui/wxpython/gui_core/query.py \
+    gui/wxpython/gui_core/simplelmgr.py \
     gui/wxpython/gui_core/toolbars.py \
+    gui/wxpython/gui_core/treeview.py \
     gui/wxpython/gui_core/widgets.py \
+    gui/wxpython/iclass/__init__.py \
+    gui/wxpython/iclass/dialogs.py \
+    gui/wxpython/iclass/digit.py \
+    gui/wxpython/iclass/frame.py \
+    gui/wxpython/iclass/g.gui.iclass.py \
+    gui/wxpython/iclass/plots.py \
+    gui/wxpython/iclass/statistics.py \
+    gui/wxpython/iclass/toolbars.py \
     gui/wxpython/icons/__init__.py \
-    gui/wxpython/icons/grass2_icons.py \
     gui/wxpython/icons/grass_icons.py \
     gui/wxpython/icons/icon.py \
-    gui/wxpython/icons/silk_icons.py \
+    gui/wxpython/iscatt/__init__.py \
+    gui/wxpython/iscatt/controllers.py \
+    gui/wxpython/iscatt/core_c.py \
+    gui/wxpython/iscatt/dialogs.py \
+    gui/wxpython/iscatt/frame.py \
+    gui/wxpython/iscatt/iscatt_core.py \
+    gui/wxpython/iscatt/plots.py \
+    gui/wxpython/iscatt/toolbars.py \
+    gui/wxpython/lmgr/__init__.py \
     gui/wxpython/lmgr/frame.py \
+    gui/wxpython/lmgr/giface.py \
     gui/wxpython/lmgr/layertree.py \
     gui/wxpython/lmgr/menudata.py \
     gui/wxpython/lmgr/pyshell.py \
     gui/wxpython/lmgr/toolbars.py \
+    gui/wxpython/location_wizard/__init__.py \
     gui/wxpython/location_wizard/base.py \
     gui/wxpython/location_wizard/dialogs.py \
     gui/wxpython/location_wizard/wizard.py \
+    gui/wxpython/mapdisp/__init__.py \
     gui/wxpython/mapdisp/frame.py \
     gui/wxpython/mapdisp/gprint.py \
     gui/wxpython/mapdisp/main.py \
-    gui/wxpython/mapdisp/mapwindow.py \
-    gui/wxpython/mapdisp/overlays.py \
     gui/wxpython/mapdisp/statusbar.py \
+    gui/wxpython/mapdisp/test_mapdisp.py \
     gui/wxpython/mapdisp/toolbars.py \
+    gui/wxpython/mapswipe/__init__.py \
+    gui/wxpython/mapswipe/dialogs.py \
+    gui/wxpython/mapswipe/frame.py \
+    gui/wxpython/mapswipe/g.gui.mapswipe.py \
+    gui/wxpython/mapswipe/mapwindow.py \
+    gui/wxpython/mapswipe/toolbars.py \
+    gui/wxpython/mapwin/__init__.py \
+    gui/wxpython/mapwin/analysis.py \
+    gui/wxpython/mapwin/base.py \
+    gui/wxpython/mapwin/buffered.py \
+    gui/wxpython/mapwin/decorations.py \
+    gui/wxpython/mapwin/graphics.py \
+    gui/wxpython/modules/__init__.py \
     gui/wxpython/modules/colorrules.py \
     gui/wxpython/modules/extensions.py \
     gui/wxpython/modules/histogram.py \
     gui/wxpython/modules/mcalc_builder.py \
-    gui/wxpython/modules/ogc_services.py \
     gui/wxpython/modules/vclean.py \
+    gui/wxpython/nviz/__init__.py \
     gui/wxpython/nviz/animation.py \
     gui/wxpython/nviz/main.py \
     gui/wxpython/nviz/mapwindow.py \
@@ -141,35 +200,60 @@
     gui/wxpython/nviz/tools.py \
     gui/wxpython/nviz/workspace.py \
     gui/wxpython/nviz/wxnviz.py \
+    gui/wxpython/psmap/__init__.py \
     gui/wxpython/psmap/dialogs.py \
     gui/wxpython/psmap/frame.py \
+    gui/wxpython/psmap/g.gui.psmap.py \
     gui/wxpython/psmap/instructions.py \
     gui/wxpython/psmap/menudata.py \
     gui/wxpython/psmap/toolbars.py \
     gui/wxpython/psmap/utils.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 \
+    gui/wxpython/rlisetup/__init__.py \
+    gui/wxpython/rlisetup/frame.py \
+    gui/wxpython/rlisetup/functions.py \
+    gui/wxpython/rlisetup/g.gui.rlisetup.py \
+    gui/wxpython/rlisetup/sampling_frame.py \
+    gui/wxpython/rlisetup/wizard.py \
     gui/wxpython/scripts/vkrige.py \
+    gui/wxpython/timeline/__init__.py \
+    gui/wxpython/timeline/frame.py \
+    gui/wxpython/timeline/g.gui.timeline.py \
+    gui/wxpython/tools/build_modules_xml.py \
     gui/wxpython/tools/update_menudata.py \
+    gui/wxpython/vdigit/__init__.py \
     gui/wxpython/vdigit/dialogs.py \
+    gui/wxpython/vdigit/g.gui.vdigit.py \
     gui/wxpython/vdigit/main.py \
     gui/wxpython/vdigit/mapwindow.py \
     gui/wxpython/vdigit/preferences.py \
     gui/wxpython/vdigit/toolbars.py \
     gui/wxpython/vdigit/wxdigit.py \
     gui/wxpython/vdigit/wxdisplay.py \
+    gui/wxpython/vnet/__init__.py \
+    gui/wxpython/vnet/dialogs.py \
+    gui/wxpython/vnet/toolbars.py \
+    gui/wxpython/vnet/vnet_core.py \
+    gui/wxpython/vnet/vnet_data.py \
+    gui/wxpython/vnet/vnet_utils.py \
+    gui/wxpython/vnet/widgets.py \
+    gui/wxpython/web_services/__init__.py \
+    gui/wxpython/web_services/cap_interface.py \
+    gui/wxpython/web_services/dialogs.py \
+    gui/wxpython/web_services/widgets.py \
     gui/wxpython/wxgui.py \
+    gui/wxpython/wxplot/__init__.py \
     gui/wxpython/wxplot/base.py \
     gui/wxpython/wxplot/dialogs.py \
+    gui/wxpython/wxplot/histogram.py \
     gui/wxpython/wxplot/profile.py \
+    gui/wxpython/wxplot/scatter.py \
     imagery/i.atcorr/create_iwave.py \
+    lib/init/grass.py \
+    lib/init/prompt.py \
     lib/python/__init__.py \
-    lib/python/array.py \
-    lib/python/core.py \
     lib/python/ctypes/__init__.py \
+    lib/python/ctypes/arraystats.py \
+    lib/python/ctypes/cluster.py \
     lib/python/ctypes/ctypesgen.py \
     lib/python/ctypes/ctypesgencore/__init__.py \
     lib/python/ctypes/ctypesgencore/ctypedescs.py \
@@ -199,13 +283,276 @@
     lib/python/ctypes/ctypesgencore/processor/dependencies.py \
     lib/python/ctypes/ctypesgencore/processor/operations.py \
     lib/python/ctypes/ctypesgencore/processor/pipeline.py \
+    lib/python/ctypes/date.py \
+    lib/python/ctypes/dbmi.py \
+    lib/python/ctypes/display.py \
+    lib/python/ctypes/g3d.py \
+    lib/python/ctypes/gis.py \
+    lib/python/ctypes/gmath.py \
+    lib/python/ctypes/grass.py \
+    lib/python/ctypes/imagery.py \
     lib/python/ctypes/loader.py \
+    lib/python/ctypes/nviz.py \
+    lib/python/ctypes/ogsf.py \
     lib/python/ctypes/preamble.py \
-    lib/python/db.py \
-    lib/python/grass__init__.py \
-    lib/python/raster.py \
-    lib/python/task.py \
-    lib/python/vector.py ]
+    lib/python/ctypes/proj.py \
+    lib/python/ctypes/raster.py \
+    lib/python/ctypes/raster3d.py \
+    lib/python/ctypes/stats.py \
+    lib/python/ctypes/trans.py \
+    lib/python/ctypes/vector.py \
+    lib/python/ctypes/vedit.py \
+    lib/python/imaging/__init__.py \
+    lib/python/imaging/images2avi.py \
+    lib/python/imaging/images2gif.py \
+    lib/python/imaging/images2ims.py \
+    lib/python/imaging/images2swf.py \
+    lib/python/pydispatch/__init__.py \
+    lib/python/pydispatch/dispatcher.py \
+    lib/python/pydispatch/errors.py \
+    lib/python/pydispatch/robust.py \
+    lib/python/pydispatch/robustapply.py \
+    lib/python/pydispatch/saferef.py \
+    lib/python/pydispatch/signal.py \
+    lib/python/pygrass/__init__.py \
+    lib/python/pygrass/docs/conf.py \
+    lib/python/pygrass/errors.py \
+    lib/python/pygrass/functions.py \
+    lib/python/pygrass/gis/__init__.py \
+    lib/python/pygrass/gis/region.py \
+    lib/python/pygrass/messages/__init__.py \
+    lib/python/pygrass/modules/__init__.py \
+    lib/python/pygrass/modules/grid/__init__.py \
+    lib/python/pygrass/modules/grid/grid.py \
+    lib/python/pygrass/modules/grid/patch.py \
+    lib/python/pygrass/modules/grid/split.py \
+    lib/python/pygrass/modules/interface/__init__.py \
+    lib/python/pygrass/modules/interface/flag.py \
+    lib/python/pygrass/modules/interface/module.py \
+    lib/python/pygrass/modules/interface/parameter.py \
+    lib/python/pygrass/modules/interface/read.py \
+    lib/python/pygrass/modules/interface/typedict.py \
+    lib/python/pygrass/modules/shortcuts.py \
+    lib/python/pygrass/orderdict.py \
+    lib/python/pygrass/raster/__init__.py \
+    lib/python/pygrass/raster/abstract.py \
+    lib/python/pygrass/raster/buffer.py \
+    lib/python/pygrass/raster/category.py \
+    lib/python/pygrass/raster/history.py \
+    lib/python/pygrass/raster/raster_type.py \
+    lib/python/pygrass/raster/rowio.py \
+    lib/python/pygrass/raster/segment.py \
+    lib/python/pygrass/shell/__init__.py \
+    lib/python/pygrass/shell/conversion.py \
+    lib/python/pygrass/shell/show.py \
+    lib/python/pygrass/tests/__init__.py \
+    lib/python/pygrass/tests/benchmark.py \
+    lib/python/pygrass/tests/set_mapset.py \
+    lib/python/pygrass/vector/__init__.py \
+    lib/python/pygrass/vector/abstract.py \
+    lib/python/pygrass/vector/basic.py \
+    lib/python/pygrass/vector/find.py \
+    lib/python/pygrass/vector/geometry.py \
+    lib/python/pygrass/vector/sql.py \
+    lib/python/pygrass/vector/table.py \
+    lib/python/pygrass/vector/vector_type.py \
+    lib/python/script/__init__.py \
+    lib/python/script/array.py \
+    lib/python/script/core.py \
+    lib/python/script/db.py \
+    lib/python/script/raster.py \
+    lib/python/script/raster3d.py \
+    lib/python/script/task.py \
+    lib/python/script/vector.py \
+    lib/python/temporal/__init__.py \
+    lib/python/temporal/abstract_dataset.py \
+    lib/python/temporal/abstract_map_dataset.py \
+    lib/python/temporal/abstract_space_time_dataset.py \
+    lib/python/temporal/aggregation.py \
+    lib/python/temporal/base.py \
+    lib/python/temporal/c_libraries_interface.py \
+    lib/python/temporal/core.py \
+    lib/python/temporal/datetime_math.py \
+    lib/python/temporal/extract.py \
+    lib/python/temporal/factory.py \
+    lib/python/temporal/gui_support.py \
+    lib/python/temporal/list_stds.py \
+    lib/python/temporal/mapcalc.py \
+    lib/python/temporal/metadata.py \
+    lib/python/temporal/open_stds.py \
+    lib/python/temporal/register.py \
+    lib/python/temporal/sampling.py \
+    lib/python/temporal/space_time_datasets.py \
+    lib/python/temporal/spatial_extent.py \
+    lib/python/temporal/spatial_topology_dataset_connector.py \
+    lib/python/temporal/spatio_temporal_relationships.py \
+    lib/python/temporal/stds_export.py \
+    lib/python/temporal/stds_import.py \
+    lib/python/temporal/temporal_algebra.py \
+    lib/python/temporal/temporal_extent.py \
+    lib/python/temporal/temporal_granularity.py \
+    lib/python/temporal/temporal_raster3d_algebra.py \
+    lib/python/temporal/temporal_raster_algebra.py \
+    lib/python/temporal/temporal_raster_base_algebra.py \
+    lib/python/temporal/temporal_raster_operator.py \
+    lib/python/temporal/temporal_topology_dataset_connector.py \
+    lib/python/temporal/temporal_vector_algebra.py \
+    lib/python/temporal/temporal_vector_operator.py \
+    lib/python/temporal/unit_tests.py \
+    lib/python/temporal/unittests_register.py \
+    lib/python/temporal/unittests_temporal_raster3d_algebra.py \
+    lib/python/temporal/unittests_temporal_raster_algebra.py \
+    lib/python/temporal/univar_statistics.py \
+    locale/grass_po_stats.py \
+    man/build_check.py \
+    man/build_check_rest.py \
+    man/build_class.py \
+    man/build_class_rest.py \
+    man/build_full_index.py \
+    man/build_full_index_rest.py \
+    man/build_html.py \
+    man/build_index.py \
+    man/build_index_rest.py \
+    man/build_keywords.py \
+    man/build_rest.py \
+    man/build_topics.py \
+    man/sphinx/conf.py \
+    raster/r.gwflow/valid_calc_7x7.py \
+    raster/r.gwflow/valid_calc_excavation.py \
+    raster/r.solute.transport/example.py \
+    raster/r.solute.transport/seguin_verify.py \
+    raster/r.solute.transport/seguin_verify_well.py \
+    scripts/d.correlate/d.correlate.py \
+    scripts/d.out.file/d.out.file.py \
+    scripts/d.polar/d.polar.py \
+    scripts/d.rast.edit/d.rast.edit.py \
+    scripts/d.rast.leg/d.rast.leg.py \
+    scripts/d.redraw/d.redraw.py \
+    scripts/d.shadedmap/d.shadedmap.py \
+    scripts/d.vect.thematic/d.vect.thematic.py \
+    scripts/db.dropcolumn/db.dropcolumn.py \
+    scripts/db.droptable/db.droptable.py \
+    scripts/db.in.ogr/db.in.ogr.py \
+    scripts/db.out.ogr/db.out.ogr.py \
+    scripts/db.test/db.test.py \
+    scripts/db.univar/db.univar.py \
+    scripts/g.extension/g.extension.py \
+    scripts/g.extension.all/g.extension.all.py \
+    scripts/g.manual/g.manual.py \
+    scripts/i.image.mosaic/i.image.mosaic.py \
+    scripts/i.in.spotvgt/i.in.spotvgt.py \
+    scripts/i.landsat.rgb/i.landsat.rgb.py \
+    scripts/i.oif/i.oif.py \
+    scripts/i.pansharpen/i.pansharpen.py \
+    scripts/i.spectral/i.spectral.py \
+    scripts/i.tasscap/i.tasscap.py \
+    scripts/m.proj/m.proj.py \
+    scripts/r.blend/r.blend.py \
+    scripts/r.buffer.lowmem/r.buffer.lowmem.py \
+    scripts/r.colors.stddev/r.colors.stddev.py \
+    scripts/r.fillnulls/r.fillnulls.py \
+    scripts/r.grow/r.grow.py \
+    scripts/r.in.aster/r.in.aster.py \
+    scripts/r.in.srtm/r.in.srtm.py \
+    scripts/r.in.wms/r.in.wms.py \
+    scripts/r.in.wms/wms_base.py \
+    scripts/r.in.wms/wms_cap_parsers.py \
+    scripts/r.in.wms/wms_drv.py \
+    scripts/r.in.wms/wms_gdal_drv.py \
+    scripts/r.mask/r.mask.py \
+    scripts/r.out.xyz/r.out.xyz.py \
+    scripts/r.pack/r.pack.py \
+    scripts/r.plane/r.plane.py \
+    scripts/r.reclass.area/r.reclass.area.py \
+    scripts/r.rgb/r.rgb.py \
+    scripts/r.tileset/r.tileset.py \
+    scripts/r.unpack/r.unpack.py \
+    scripts/r3.in.xyz/r3.in.xyz.py \
+    scripts/v.build.all/v.build.all.py \
+    scripts/v.centroids/v.centroids.py \
+    scripts/v.convert.all/v.convert.all.py \
+    scripts/v.db.addcolumn/v.db.addcolumn.py \
+    scripts/v.db.addtable/v.db.addtable.py \
+    scripts/v.db.dropcolumn/v.db.dropcolumn.py \
+    scripts/v.db.droprow/v.db.droprow.py \
+    scripts/v.db.droptable/v.db.droptable.py \
+    scripts/v.db.join/v.db.join.py \
+    scripts/v.db.reconnect.all/v.db.reconnect.all.py \
+    scripts/v.db.renamecolumn/v.db.renamecolumn.py \
+    scripts/v.db.univar/v.db.univar.py \
+    scripts/v.db.update/v.db.update.py \
+    scripts/v.dissolve/v.dissolve.py \
+    scripts/v.in.e00/v.in.e00.py \
+    scripts/v.in.geonames/v.in.geonames.py \
+    scripts/v.in.gns/v.in.gns.py \
+    scripts/v.in.gps/v.in.gps.py \
+    scripts/v.in.lines/v.in.lines.py \
+    scripts/v.in.mapgen/v.in.mapgen.py \
+    scripts/v.in.sites.all/v.in.sites.all.py \
+    scripts/v.in.wfs/v.in.wfs.py \
+    scripts/v.krige/v.krige.py \
+    scripts/v.out.gps/v.out.gps.py \
+    scripts/v.pack/v.pack.py \
+    scripts/v.rast.stats/v.rast.stats.py \
+    scripts/v.report/v.report.py \
+    scripts/v.unpack/v.unpack.py \
+    scripts/v.what.vect/v.what.vect.py \
+    scripts/wxpyimgview/wxpyimgview.py \
+    scripts/wxpyimgview/wxpyimgview_gui.py \
+    temporal/t.create/t.create.py \
+    temporal/t.info/t.info.py \
+    temporal/t.list/t.list.py \
+    temporal/t.merge/t.merge.py \
+    temporal/t.rast.accdetect/t.rast.accdetect.py \
+    temporal/t.rast.accumulate/t.rast.accumulate.py \
+    temporal/t.rast.aggregate/t.rast.aggregate.py \
+    temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py \
+    temporal/t.rast.colors/t.rast.colors.py \
+    temporal/t.rast.export/t.rast.export.py \
+    temporal/t.rast.extract/t.rast.extract.py \
+    temporal/t.rast.gapfill/t.rast.gapfill.py \
+    temporal/t.rast.import/t.rast.import.py \
+    temporal/t.rast.list/t.rast.list.py \
+    temporal/t.rast.mapcalc/t.rast.mapcalc.py \
+    temporal/t.rast.mapcalc2/t.rast.mapcalc2.py \
+    temporal/t.rast.neighbors/t.rast.neighbors.py \
+    temporal/t.rast.out.vtk/t.rast.out.vtk.py \
+    temporal/t.rast.series/t.rast.series.py \
+    temporal/t.rast.to.rast3/t.rast.to.rast3.py \
+    temporal/t.rast.univar/t.rast.univar.py \
+    temporal/t.rast3d.extract/t.rast3d.extract.py \
+    temporal/t.rast3d.list/t.rast3d.list.py \
+    temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py \
+    temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py \
+    temporal/t.rast3d.univar/t.rast3d.univar.py \
+    temporal/t.register/t.register.py \
+    temporal/t.remove/t.remove.py \
+    temporal/t.rename/t.rename.py \
+    temporal/t.sample/t.sample.py \
+    temporal/t.select/t.select.py \
+    temporal/t.shift/t.shift.py \
+    temporal/t.snap/t.snap.py \
+    temporal/t.support/t.support.py \
+    temporal/t.topology/t.topology.py \
+    temporal/t.unregister/t.unregister.py \
+    temporal/t.vect.db.select/t.vect.db.select.py \
+    temporal/t.vect.export/t.vect.export.py \
+    temporal/t.vect.extract/t.vect.extract.py \
+    temporal/t.vect.import/t.vect.import.py \
+    temporal/t.vect.list/t.vect.list.py \
+    temporal/t.vect.mapcalc/t.vect.mapcalc.py \
+    temporal/t.vect.observe.strds/t.vect.observe.strds.py \
+    temporal/t.vect.univar/t.vect.univar.py \
+    temporal/t.vect.what.strds/t.vect.what.strds.py \
+    tools/create_python_init_file.py \
+    tools/g.html2man/g.html2man.py \
+    tools/g.html2man/groff.py \
+    tools/g.html2man/html.py \
+    tools/g.html2man/rest.py \
+    tools/mkhtml.py \
+    tools/mkrest.py \
+    tools/reindent.py \
+    tools/thumbnails.py ]
 
 configure.ldflags-append -framework OpenGL -framework Accelerate
 configure.args \
@@ -318,7 +665,7 @@
 
 # python26 variant is only present to allow 'grass +wxgtk28' to coexist with py27-wxpython-3.0
 # once support for wxWidgets 3.0 is complete, support for Python 2.6 may be removed
-variant python26 conflicts python27 description {} {
+variant python26 conflicts python27 wxwidgets30 description {} {
     depends_lib-append    port:python26
     set python_bin        ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
     #                     Enable support for wxGUI Python extensions
@@ -331,7 +678,7 @@
     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|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
+        reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.sh
         foreach f $python_scripts {
             reinplace "s|/usr/bin/env python|${python_bin}|" $f
         }
@@ -346,7 +693,7 @@
 
     post-patch {
         set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
-        reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
+        reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.sh
         foreach f $python_scripts {
             reinplace "s|/usr/bin/env python|${python_bin}|" $f
         }
@@ -356,7 +703,7 @@
 # TODO: in principle wxWidgets is optional and could be disable with
 #       --disable-wxwidgets if there is demand for that
 #       grass 4.6.3 is not compatible with wxWidgets 3.0 yet
-variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
+variant wxwidgets30 conflicts wxwidgets28 wxgtk28 python26 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
     wxWidgets.use         wxPython-3.0
     depends_lib-append    port:${wxWidgets.port}
     configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
@@ -374,7 +721,7 @@
 }
 
 if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
-    default_variants-append +wxgtk28
+    default_variants-append +wxwidgets30
 }
 if {![variant_isset python26] && ![variant_isset python27]} {
     if {[variant_isset wxgtk28] || [variant_isset wxwidgets28]} {
@@ -389,11 +736,7 @@
 #       (in case there is demand for it)
 # TODO: the code below is ugly; any suggestions for improving it are welcome
 if {[variant_isset wxwidgets30]} {
-    if {[variant_isset python26]} {
-        depends_lib-append port:py26-wxpython-3.0
-    } elseif {[variant_isset python27]} {
-        depends_lib-append port:py27-wxpython-3.0
-    }
+    depends_lib-append port:py27-wxpython-3.0
 } else {
     if {[variant_isset python26]} {
         depends_lib-append port:py26-wxpython-2.8

Deleted: users/mojca/ports/gis/grass/files/patch-Makefile.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-Makefile.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-Makefile.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,39 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -24,7 +24,7 @@ include $(MODULE_TOPDIR)/include/Make/Grass.make
- 
- # Install directories
- exec_prefix=            ${prefix}
--BINDIR=			${UNIX_BIN}
-+BINDIR=			${DESTDIR}${UNIX_BIN}
- 
- # Shell commands
- MAKE_DIR_CMD=		mkdir -p -m 755
-@@ -81,6 +81,9 @@ DOXNAME=grass
- include $(MODULE_TOPDIR)/include/Make/Docs.make
- include $(MODULE_TOPDIR)/include/Make/Doxygen.make
- 
-+FINAL_GISBASE:=${INST_DIR}
-+INST_DIR:=${DESTDIR}${INST_DIR}
-+
- default: builddemolocation
- 	@echo "GRASS GIS compilation log"     > $(ERRORLOG)
- 	@echo "-------------------------"    >> $(ERRORLOG)
-@@ -272,7 +275,7 @@ real-install: FORCE
- 	test -d ${INST_DIR} || ${MAKE_DIR_CMD} ${INST_DIR}
- 	@##### test -d ${INST_DIR}/dev || ${MAKE_DIR_CMD} ${INST_DIR}/dev
- 	test -d ${BINDIR} || ${MAKE_DIR_CMD} ${BINDIR}
--	-sed -e "s#GISBASE=.*#GISBASE=${INST_DIR}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
-+	-sed -e "s#GISBASE=.*#GISBASE=${FINAL_GISBASE}#" ${ARCH_BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR} > ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
- 	-chmod a+x ${BINDIR}/grass${GRASS_VERSION_MAJOR}${GRASS_VERSION_MINOR}
- 	-cd ${GISBASE} ; tar cBf - $(FILES) | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
- 	-cd ${GISBASE} ; tar cBf - bin | (cd ${INST_DIR} ; tar xBf - ) 2>/dev/null
-@@ -310,8 +313,6 @@ ifeq ($(strip $(MINGW)),)
- 	-tar cBf - gem/skeleton | (cd ${INST_DIR}/etc ; tar xBf - ) 2>/dev/null
- 	-${INSTALL} gem/gem$(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR) ${BINDIR} 2>/dev/null
- endif
--	@# enable OSX Help Viewer
--	@if [ "`cat include/Make/Platform.make | grep -i '^ARCH.*darwin'`" ] ; then /bin/ln -sfh "${INST_DIR}/docs/html" /Library/Documentation/Help/GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR} ; fi
- 
- 
- install-strip: FORCE

Modified: users/mojca/ports/gis/grass/files/patch-configure.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-configure.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-configure.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,6 +1,6 @@
 --- configure.orig
 +++ configure
-@@ -1424,9 +1424,9 @@ fi
+@@ -1432,9 +1432,9 @@ fi
  # Set INST_DIR
  
  if test -n "$MACOSX_APP" ; then

Modified: users/mojca/ports/gis/grass/files/patch-ffmpeg.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-ffmpeg.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-ffmpeg.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,6 +1,6 @@
---- lib/ogsf/gsd_img_mpeg.c.orig	2013-10-03 10:01:55.000000000 -0700
-+++ lib/ogsf/gsd_img_mpeg.c	2013-10-03 10:02:38.000000000 -0700
-@@ -31,7 +31,7 @@
+--- lib/ogsf/gsd_img_mpeg.c.orig
++++ lib/ogsf/gsd_img_mpeg.c
+@@ -30,7 +30,7 @@
  #include <avutil.h>
  #else
  /* libavutil 51.22.1's avutil.h doesn't include libavutil/mathematics.h */

Deleted: users/mojca/ports/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,12 +0,0 @@
-just a temporary (pretty much useless) workaround that allows to start the GUI with wxPython 2.9.4
---- gui/wxpython/core/globalvar.py.orig
-+++ gui/wxpython/core/globalvar.py
-@@ -59,7 +59,7 @@ def CheckForWx():
-             raise ValueError('Your wxPython version is %s.%s.%s.%s' % tuple(version.split('.')))
-         if map(int, version.split('.')) >= unsupportedVersion:
-             print >> sys.stderr, 'ERROR: wxGUI does not support wxPython %s yet.' % version
--            sys.exit(1)
-+            # sys.exit(1)
-     except ImportError, e:
-         print >> sys.stderr, 'ERROR: wxGUI requires wxPython. %s' % str(e)
-         sys.exit(1)

Deleted: users/mojca/ports/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,21 +0,0 @@
-http://trac.osgeo.org/grass/changeset/51052
-Doesn't really help because grass refuses to run with "ERROR: wxGUI does not support wxPython 2.9.4.0 yet."
---- gui/wxpython/gui_core/ghelp.py.orig
-+++ gui/wxpython/gui_core/ghelp.py
-@@ -88,7 +88,6 @@ class SearchModuleWindow(wx.Panel):
-         """!Do layout"""
-         sizer = wx.StaticBoxSizer(self.box, wx.HORIZONTAL)
-         gridSizer = wx.GridBagSizer(hgap = 3, vgap = 3)
--        gridSizer.AddGrowableCol(1)
-         
-         gridSizer.Add(item = self.searchBy,
-                       flag = wx.ALIGN_CENTER_VERTICAL, pos = (0, 0))
-@@ -104,6 +103,8 @@ class SearchModuleWindow(wx.Panel):
-             gridSizer.Add(item = self.searchChoice,
-                           flag = wx.ALIGN_CENTER_VERTICAL | wx.EXPAND, pos = (row, 0), span = (1, 2))
-         
-+        gridSizer.AddGrowableCol(1)
-+
-         sizer.Add(item = gridSizer, proportion = 1)
-         
-         self.SetSizer(sizer)

Added: users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff
===================================================================
--- users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff	                        (rev 0)
+++ users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -0,0 +1,113 @@
+https://trac.osgeo.org/grass/ticket/764
+http://trac.osgeo.org/grass/ticket/1839
+
+--- include/Make/Install.make.orig
++++ include/Make/Install.make
+@@ -48,21 +48,21 @@
+ 	fi
+ 
+ install-check-parent:
+-	@ INST_PATH=`dirname $(INST_DIR)`; \
++	@ INST_PATH=`dirname $(DESTDIR)$(INST_DIR)`; \
+ 	while [ ! -d "$$INST_PATH" ]; do \
+ 		INST_PATH=`dirname $$INST_PATH`; \
+ 	done; \
+ 	if [ ! -d "$(INST_DIR)" -a ! -w "$$INST_PATH" ] ; then \
+ 		echo "ERROR: Directory $$INST_PATH is a parent directory of your" >&2 ; \
+-		echo "  install directory $(INST_DIR) and is not writable." >&2 ; \
++		echo "  install directory $(DESTDIR)$(INST_DIR) and is not writable." >&2 ; \
+ 		echo "  Perhaps you need root access." >&2 ; \
+ 		echo "  Installation aborted, exiting Make." >&2 ; \
+ 		exit 1; \
+ 	fi
+ 
+ install-check-writable:
+-	@ if [ -d "$(INST_DIR)" -a ! -w "$(INST_DIR)" ] ; then \
+-		echo "ERROR: Your install directory $(INST_DIR) is not writable." >&2 ; \
++	@ if [ -d "$(DESTDIR)$(INST_DIR)" -a ! -w "$(DESTDIR)$(INST_DIR)" ] ; then \
++		echo "ERROR: Your install directory $(DESTDIR)$(INST_DIR) is not writable." >&2 ; \
+ 		echo "  Perhaps you need root access." >&2 ; \
+ 		echo "  Installation aborted, exiting Make." >&2 ; \
+ 		exit 1; \
+@@ -71,7 +71,7 @@
+ install-check-prefix:
+ 	@ result=`echo "$(INST_DIR)" | awk '{ if ($$1 ~ /grass/) print $$1 }'`; \
+ 	if [ "$$result" = "" ] ; then \
+-		echo "WARNING: Your install directory $(INST_DIR)" >&2 ; \
++		echo "WARNING: Your install directory $(DESTDIR)$(INST_DIR)" >&2 ; \
+ 		echo "  does not contain the word 'grass'." >&2 ; \
+ 		echo "  It is highly recommended that the word 'grass' be part" >&2 ; \
+ 		echo "  of your install directory to avoid conflicts." >&2 ; \
+@@ -94,35 +94,30 @@
+ PLATMAKE = include/Make/Platform.make
+ GRASSMAKE = include/Make/Grass.make
+ 
+-real-install: | $(INST_DIR) $(UNIX_BIN)
+-	-tar cBCf $(GISBASE) - . | tar xBCf $(INST_DIR) - 2>/dev/null
+-	-rm $(INST_DIR)/$(GRASS_NAME).tmp
+-	$(MAKE) $(STARTUP)
++real-install: | $(DESTDIR)$(INST_DIR) $(UNIX_BIN)
++	-tar cBCf $(GISBASE) - . | tar xBCf $(DESTDIR)$(INST_DIR) - 2>/dev/null
++	-rm $(DESTDIR)$(INST_DIR)/$(GRASS_NAME).tmp
++	$(MAKE) $(DESTDIR)$(STARTUP)
+ 
+-	-rm $(INST_DIR)/$(FONTCAP)
+-	$(MAKE) $(INST_DIR)/$(FONTCAP)
++	-rm $(DESTDIR)$(INST_DIR)/$(FONTCAP)
++	$(MAKE) $(DESTDIR)$(INST_DIR)/$(FONTCAP)
+ 
+-	-rm $(INST_DIR)/$(TMPGISRC)
+-	$(MAKE) $(INST_DIR)/$(TMPGISRC)
++	-rm $(DESTDIR)$(INST_DIR)/$(TMPGISRC)
++	$(MAKE) $(DESTDIR)$(INST_DIR)/$(TMPGISRC)
+ 
+-	-rm $(INST_DIR)/$(PLATMAKE)
+-	$(MAKE) $(INST_DIR)/$(PLATMAKE)
++	-rm $(DESTDIR)$(INST_DIR)/$(PLATMAKE)
++	$(MAKE) $(DESTDIR)$(INST_DIR)/$(PLATMAKE)
+ 
+-	-rm $(INST_DIR)/$(GRASSMAKE)
+-	$(MAKE) $(INST_DIR)/$(GRASSMAKE)
++	-rm $(DESTDIR)$(INST_DIR)/$(GRASSMAKE)
++	$(MAKE) $(DESTDIR)$(INST_DIR)/$(GRASSMAKE)
+ 
+-	-$(INSTALL) config.status $(INST_DIR)/config.status
+-	-$(CHMOD) -R a+rX $(INST_DIR) 2>/dev/null
++	-$(INSTALL) config.status $(DESTDIR)$(INST_DIR)/config.status
++	-$(CHMOD) -R a+rX $(DESTDIR)$(INST_DIR) 2>/dev/null
+ 
+-ifneq ($(findstring darwin,$(ARCH)),)
+-	@# enable OSX Help Viewer
+-	@/bin/ln -sfh "$(INST_DIR)/docs/html" /Library/Documentation/Help/GRASS-$(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR)
+-endif
+-
+-$(INST_DIR) $(UNIX_BIN):
++$(DESTDIR)$(INST_DIR) $(UNIX_BIN):
+ 	$(MAKE_DIR_CMD) $@
+ 
+-$(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
++$(DESTDIR)$(STARTUP): $(ARCH_DISTDIR)/$(GRASS_NAME).tmp
+ 	sed -e 's#'@GISBASE@'#'$(INST_DIR)'#g' \
+ 	    -e 's#'@LD_LIBRARY_PATH_VAR@'#'$(LD_LIBRARY_PATH_VAR)'#g' \
+ 	    -e 's#'@CONFIG_PROJSHARE@'#'$(PROJSHARE)'#g' \
+@@ -143,16 +138,16 @@
+     -e 's#^\(ARCH_BINDIR.[^=]*\).*#\1= $(UNIX_BIN)#g' $< > $@
+ endef
+ 
+-$(INST_DIR)/$(FONTCAP): $(GISBASE)/$(FONTCAP)
++$(DESTDIR)$(INST_DIR)/$(FONTCAP): $(GISBASE)/$(FONTCAP)
+ 	$(call fix_gisbase)
+ 
+-$(INST_DIR)/$(TMPGISRC): $(GISBASE)/$(TMPGISRC)
++$(DESTDIR)$(INST_DIR)/$(TMPGISRC): $(GISBASE)/$(TMPGISRC)
+ 	$(call fix_gisbase)
+ 
+-$(INST_DIR)/$(PLATMAKE): $(GISBASE)/$(PLATMAKE)
++$(DESTDIR)$(INST_DIR)/$(PLATMAKE): $(GISBASE)/$(PLATMAKE)
+ 	$(call fix_grass_home)
+ 
+-$(INST_DIR)/$(GRASSMAKE): $(GISBASE)/$(GRASSMAKE)
++$(DESTDIR)$(INST_DIR)/$(GRASSMAKE): $(GISBASE)/$(GRASSMAKE)
+ 	$(call fix_grass_arch)
+ 
+ install-macosx:

Modified: users/mojca/ports/gis/grass/files/patch-is_void.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-is_void.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-is_void.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,7 +1,7 @@
 http://trac.osgeo.org/grass/ticket/2170
 
---- raster/r.terraflow/direction.cc.orig
-+++ raster/r.terraflow/direction.cc
+--- raster/r.terraflow/direction.cpp.orig
++++ raster/r.terraflow/direction.cpp
 @@ -53,11 +53,11 @@ encodeDirectionMFD(const genericWindow<elevation_type>& elevwin,
    
    if(!is_nodata(elevwin.get())) {
@@ -18,8 +18,8 @@
      }
    }
    
---- raster/r.terraflow/nodata.cc.orig
-+++ raster/r.terraflow/nodata.cc
+--- raster/r.terraflow/nodata.cpp.orig
++++ raster/r.terraflow/nodata.cpp
 @@ -73,7 +73,7 @@ is_nodata(float x) {
  
  

Copied: users/mojca/ports/gis/grass/files/patch-lib-init-grass.sh.diff (from rev 121091, trunk/dports/gis/grass/files/patch-lib-init-grass.src.diff)
===================================================================
--- users/mojca/ports/gis/grass/files/patch-lib-init-grass.sh.diff	                        (rev 0)
+++ users/mojca/ports/gis/grass/files/patch-lib-init-grass.sh.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -0,0 +1,11 @@
+--- lib/init/grass.sh.orig
++++ lib/init/grass.sh
+@@ -24,7 +24,7 @@
+ trap "echo 'User break!' ; exit" 2 3 9 15
+ 
+ if [ -z "$GRASS_PYTHON" ] ; then
+-    GRASS_PYTHON=python
++    GRASS_PYTHON=@@PYTHON@@
+ fi
+ export GRASS_PYTHON
+ 

Deleted: users/mojca/ports/gis/grass/files/patch-lib-init-grass.src.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-lib-init-grass.src.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-lib-init-grass.src.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,9 +0,0 @@
---- lib/init/grass.src.orig
-+++ lib/init/grass.src
-@@ -21,5 +21,6 @@ trap "echo 'User break!' ; exit" 2 3 9 15
- # Set the GISBASE variable
- GISBASE="GISBASE_VALUE"
- export GISBASE
-+export GRASS_PYTHON=@@PYTHON@@
- 
- exec "$GISBASE/etc/Init.sh" "$@"

Deleted: users/mojca/ports/gis/grass/files/patch-macosx_Makefile.diff
===================================================================
--- trunk/dports/gis/grass/files/patch-macosx_Makefile.diff	2014-06-17 10:33:58 UTC (rev 121091)
+++ users/mojca/ports/gis/grass/files/patch-macosx_Makefile.diff	2014-06-17 13:30:11 UTC (rev 121097)
@@ -1,11 +0,0 @@
---- macosx/Makefile.orig
-+++ macosx/Makefile
-@@ -35,6 +35,8 @@ FILES = AUTHORS COPYING CHANGES REQUIREMENTS.html GPL.TXT
- 
- include $(MODULE_TOPDIR)/include/Make/Dir.make
- 
-+INST_DIR:=${DESTDIR}${INST_DIR}
-+
- default: subdirs
- 
- include bundle.make
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140617/256b2dab/attachment-0001.html>


More information about the macports-changes mailing list