<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121097] users/mojca/ports</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121097">121097</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-17 06:30:11 -0700 (Tue, 17 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>mojca/grass: version 7.0.0beta2 with wxwidgets30</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersmojcaportsgisgrassPortfile">users/mojca/ports/gis/grass/Portfile</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchconfigurediff">users/mojca/ports/gis/grass/files/patch-configure.diff</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchffmpegdiff">users/mojca/ports/gis/grass/files/patch-ffmpeg.diff</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchis_voiddiff">users/mojca/ports/gis/grass/files/patch-is_void.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/mojca/ports/gis/</li>
<li>users/mojca/ports/gis/grass/</li>
<li><a href="#usersmojcaportsgisgrassfilespatchincludeMakeInstallmakediff">users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchlibinitgrassshdiff">users/mojca/ports/gis/grass/files/patch-lib-init-grass.sh.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersmojcaportsgisgrassfilespatchMakefilediff">users/mojca/ports/gis/grass/files/patch-Makefile.diff</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchguiwxpythoncoreglobalvarpydiff">users/mojca/ports/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchguiwxpythongui_coreghelppydiff">users/mojca/ports/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchlibinitgrasssrcdiff">users/mojca/ports/gis/grass/files/patch-lib-init-grass.src.diff</a></li>
<li><a href="#usersmojcaportsgisgrassfilespatchmacosx_Makefilediff">users/mojca/ports/gis/grass/files/patch-macosx_Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersmojcaportsgisgrassPortfile"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/gis/grass/Portfile (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6,8 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name grass
</span><span class="cx"> epoch 1
</span><del>-version 6.4.3
-revision 3
</del><ins>+version 7.0.0beta2
</ins><span class="cx"> maintainers nomaintainer
</span><span class="cx"> categories gis
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -20,8 +19,8 @@
</span><span class="cx"> homepage http://grass.osgeo.org/
</span><span class="cx"> master_sites ${homepage}grass[join [lrange [split ${version} .] 0 1] {}]/source/
</span><span class="cx">
</span><del>-checksums rmd160 bdbd671972730701aa8213c2041abe31a68eea4c \
- sha256 5d29d322a262330894aa046845e6790258cd6e3f95b28c350ed7839810672ed6
</del><ins>+checksums rmd160 bfc01c12afa8929fc17568359551861cd413089b \
+ sha256 b360de82f9683f04383f03c4b584287be233fa76d05b0cb1f50d57d2de5cffdd
</ins><span class="cx">
</span><span class="cx"> depends_build port:pkgconfig
</span><span class="cx"> depends_lib port:fftw-3 \
</span><span class="lines">@@ -43,97 +42,157 @@
</span><span class="cx">
</span><span class="cx"> patchfiles \
</span><span class="cx"> patch-configure.diff \
</span><del>- patch-gui-wxpython-core-globalvar.py.diff \
- patch-gui-wxpython-gui_core-ghelp.py.diff \
</del><ins>+ patch-include-Make-Install.make.diff \
</ins><span class="cx"> patch-is_void.diff \
</span><del>- patch-lib-init-grass.src.diff \
- patch-macosx_Makefile.diff \
- patch-Makefile.diff \
</del><ins>+ patch-lib-init-grass.sh.diff \
</ins><span class="cx"> patch-ffmpeg.diff
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" ${worksrcpath}/configure
</span><span class="cx"> # http://trac.osgeo.org/grass/ticket/2169
</span><del>- reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/gem/Makefile
</del><ins>+ # reinplace "s|CC=gcc|CC=${configure.cc}|" ${worksrcpath}/gem/Makefile
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # List of all python scripts. Used later to ensure usage of python26/python27
</span><span class="cx"> # (insteaf of the currently active python)
</span><span class="cx"> # Work around bug http://trac.osgeo.org/grass/ticket/1758
</span><span class="cx"> set python_scripts [ list \
</span><ins>+ 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 \
</ins><span class="cx"> doc/python/m.distance.py \
</span><span class="cx"> doc/python/raster_example_ctypes.py \
</span><span class="cx"> doc/python/vector_example_ctypes.py \
</span><ins>+ general/g.mapsets/g.mapsets_picker.py \
</ins><span class="cx"> general/g.parser/test.py \
</span><span class="cx"> gui/scripts/d.rast3d.py \
</span><del>- 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 \
</del><ins>+ 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 \
</ins><span class="cx"> gui/wxpython/core/debug.py \
</span><span class="cx"> gui/wxpython/core/gcmd.py \
</span><ins>+ gui/wxpython/core/gconsole.py \
+ gui/wxpython/core/giface.py \
</ins><span class="cx"> gui/wxpython/core/globalvar.py \
</span><del>- gui/wxpython/core/menudata.py \
</del><ins>+ gui/wxpython/core/layerlist.py \
+ gui/wxpython/core/menutree.py \
</ins><span class="cx"> gui/wxpython/core/render.py \
</span><span class="cx"> gui/wxpython/core/settings.py \
</span><ins>+ gui/wxpython/core/toolboxes.py \
+ gui/wxpython/core/treemodel.py \
</ins><span class="cx"> gui/wxpython/core/units.py \
</span><span class="cx"> gui/wxpython/core/utils.py \
</span><span class="cx"> gui/wxpython/core/workspace.py \
</span><del>- gui/wxpython/create__init__.py \
</del><ins>+ gui/wxpython/core/ws.py \
+ gui/wxpython/dbmgr/__init__.py \
+ gui/wxpython/dbmgr/base.py \
</ins><span class="cx"> gui/wxpython/dbmgr/dialogs.py \
</span><ins>+ gui/wxpython/dbmgr/g.gui.dbmgr.py \
</ins><span class="cx"> gui/wxpython/dbmgr/manager.py \
</span><span class="cx"> gui/wxpython/dbmgr/sqlbuilder.py \
</span><span class="cx"> gui/wxpython/dbmgr/vinfo.py \
</span><ins>+ gui/wxpython/gcp/__init__.py \
+ gui/wxpython/gcp/g.gui.gcp.py \
</ins><span class="cx"> gui/wxpython/gcp/manager.py \
</span><span class="cx"> gui/wxpython/gcp/mapdisplay.py \
</span><ins>+ gui/wxpython/gcp/statusbar.py \
</ins><span class="cx"> gui/wxpython/gcp/toolbars.py \
</span><span class="cx"> gui/wxpython/gis_set.py \
</span><ins>+ gui/wxpython/gis_set_error.py \
+ gui/wxpython/gmodeler/__init__.py \
</ins><span class="cx"> gui/wxpython/gmodeler/dialogs.py \
</span><span class="cx"> gui/wxpython/gmodeler/frame.py \
</span><ins>+ gui/wxpython/gmodeler/g.gui.gmodeler.py \
+ gui/wxpython/gmodeler/giface.py \
</ins><span class="cx"> gui/wxpython/gmodeler/menudata.py \
</span><span class="cx"> gui/wxpython/gmodeler/model.py \
</span><span class="cx"> gui/wxpython/gmodeler/preferences.py \
</span><span class="cx"> gui/wxpython/gmodeler/toolbars.py \
</span><ins>+ gui/wxpython/gui_core/__init__.py \
</ins><span class="cx"> gui/wxpython/gui_core/dialogs.py \
</span><span class="cx"> gui/wxpython/gui_core/forms.py \
</span><span class="cx"> gui/wxpython/gui_core/ghelp.py \
</span><span class="cx"> gui/wxpython/gui_core/goutput.py \
</span><span class="cx"> gui/wxpython/gui_core/gselect.py \
</span><span class="cx"> gui/wxpython/gui_core/mapdisp.py \
</span><del>- gui/wxpython/gui_core/mapwindow.py \
</del><span class="cx"> gui/wxpython/gui_core/menu.py \
</span><span class="cx"> gui/wxpython/gui_core/preferences.py \
</span><span class="cx"> gui/wxpython/gui_core/prompt.py \
</span><ins>+ gui/wxpython/gui_core/pystc.py \
+ gui/wxpython/gui_core/query.py \
+ gui/wxpython/gui_core/simplelmgr.py \
</ins><span class="cx"> gui/wxpython/gui_core/toolbars.py \
</span><ins>+ gui/wxpython/gui_core/treeview.py \
</ins><span class="cx"> gui/wxpython/gui_core/widgets.py \
</span><ins>+ 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 \
</ins><span class="cx"> gui/wxpython/icons/__init__.py \
</span><del>- gui/wxpython/icons/grass2_icons.py \
</del><span class="cx"> gui/wxpython/icons/grass_icons.py \
</span><span class="cx"> gui/wxpython/icons/icon.py \
</span><del>- gui/wxpython/icons/silk_icons.py \
</del><ins>+ 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 \
</ins><span class="cx"> gui/wxpython/lmgr/frame.py \
</span><ins>+ gui/wxpython/lmgr/giface.py \
</ins><span class="cx"> gui/wxpython/lmgr/layertree.py \
</span><span class="cx"> gui/wxpython/lmgr/menudata.py \
</span><span class="cx"> gui/wxpython/lmgr/pyshell.py \
</span><span class="cx"> gui/wxpython/lmgr/toolbars.py \
</span><ins>+ gui/wxpython/location_wizard/__init__.py \
</ins><span class="cx"> gui/wxpython/location_wizard/base.py \
</span><span class="cx"> gui/wxpython/location_wizard/dialogs.py \
</span><span class="cx"> gui/wxpython/location_wizard/wizard.py \
</span><ins>+ gui/wxpython/mapdisp/__init__.py \
</ins><span class="cx"> gui/wxpython/mapdisp/frame.py \
</span><span class="cx"> gui/wxpython/mapdisp/gprint.py \
</span><span class="cx"> gui/wxpython/mapdisp/main.py \
</span><del>- gui/wxpython/mapdisp/mapwindow.py \
- gui/wxpython/mapdisp/overlays.py \
</del><span class="cx"> gui/wxpython/mapdisp/statusbar.py \
</span><ins>+ gui/wxpython/mapdisp/test_mapdisp.py \
</ins><span class="cx"> gui/wxpython/mapdisp/toolbars.py \
</span><ins>+ 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 \
</ins><span class="cx"> gui/wxpython/modules/colorrules.py \
</span><span class="cx"> gui/wxpython/modules/extensions.py \
</span><span class="cx"> gui/wxpython/modules/histogram.py \
</span><span class="cx"> gui/wxpython/modules/mcalc_builder.py \
</span><del>- gui/wxpython/modules/ogc_services.py \
</del><span class="cx"> gui/wxpython/modules/vclean.py \
</span><ins>+ gui/wxpython/nviz/__init__.py \
</ins><span class="cx"> gui/wxpython/nviz/animation.py \
</span><span class="cx"> gui/wxpython/nviz/main.py \
</span><span class="cx"> gui/wxpython/nviz/mapwindow.py \
</span><span class="lines">@@ -141,35 +200,60 @@
</span><span class="cx"> gui/wxpython/nviz/tools.py \
</span><span class="cx"> gui/wxpython/nviz/workspace.py \
</span><span class="cx"> gui/wxpython/nviz/wxnviz.py \
</span><ins>+ gui/wxpython/psmap/__init__.py \
</ins><span class="cx"> gui/wxpython/psmap/dialogs.py \
</span><span class="cx"> gui/wxpython/psmap/frame.py \
</span><ins>+ gui/wxpython/psmap/g.gui.psmap.py \
</ins><span class="cx"> gui/wxpython/psmap/instructions.py \
</span><span class="cx"> gui/wxpython/psmap/menudata.py \
</span><span class="cx"> gui/wxpython/psmap/toolbars.py \
</span><span class="cx"> gui/wxpython/psmap/utils.py \
</span><del>- 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 \
</del><ins>+ 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 \
</ins><span class="cx"> gui/wxpython/scripts/vkrige.py \
</span><ins>+ gui/wxpython/timeline/__init__.py \
+ gui/wxpython/timeline/frame.py \
+ gui/wxpython/timeline/g.gui.timeline.py \
+ gui/wxpython/tools/build_modules_xml.py \
</ins><span class="cx"> gui/wxpython/tools/update_menudata.py \
</span><ins>+ gui/wxpython/vdigit/__init__.py \
</ins><span class="cx"> gui/wxpython/vdigit/dialogs.py \
</span><ins>+ gui/wxpython/vdigit/g.gui.vdigit.py \
</ins><span class="cx"> gui/wxpython/vdigit/main.py \
</span><span class="cx"> gui/wxpython/vdigit/mapwindow.py \
</span><span class="cx"> gui/wxpython/vdigit/preferences.py \
</span><span class="cx"> gui/wxpython/vdigit/toolbars.py \
</span><span class="cx"> gui/wxpython/vdigit/wxdigit.py \
</span><span class="cx"> gui/wxpython/vdigit/wxdisplay.py \
</span><ins>+ 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 \
</ins><span class="cx"> gui/wxpython/wxgui.py \
</span><ins>+ gui/wxpython/wxplot/__init__.py \
</ins><span class="cx"> gui/wxpython/wxplot/base.py \
</span><span class="cx"> gui/wxpython/wxplot/dialogs.py \
</span><ins>+ gui/wxpython/wxplot/histogram.py \
</ins><span class="cx"> gui/wxpython/wxplot/profile.py \
</span><ins>+ gui/wxpython/wxplot/scatter.py \
</ins><span class="cx"> imagery/i.atcorr/create_iwave.py \
</span><ins>+ lib/init/grass.py \
+ lib/init/prompt.py \
</ins><span class="cx"> lib/python/__init__.py \
</span><del>- lib/python/array.py \
- lib/python/core.py \
</del><span class="cx"> lib/python/ctypes/__init__.py \
</span><ins>+ lib/python/ctypes/arraystats.py \
+ lib/python/ctypes/cluster.py \
</ins><span class="cx"> lib/python/ctypes/ctypesgen.py \
</span><span class="cx"> lib/python/ctypes/ctypesgencore/__init__.py \
</span><span class="cx"> lib/python/ctypes/ctypesgencore/ctypedescs.py \
</span><span class="lines">@@ -199,13 +283,276 @@
</span><span class="cx"> lib/python/ctypes/ctypesgencore/processor/dependencies.py \
</span><span class="cx"> lib/python/ctypes/ctypesgencore/processor/operations.py \
</span><span class="cx"> lib/python/ctypes/ctypesgencore/processor/pipeline.py \
</span><ins>+ 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 \
</ins><span class="cx"> lib/python/ctypes/loader.py \
</span><ins>+ lib/python/ctypes/nviz.py \
+ lib/python/ctypes/ogsf.py \
</ins><span class="cx"> lib/python/ctypes/preamble.py \
</span><del>- lib/python/db.py \
- lib/python/grass__init__.py \
- lib/python/raster.py \
- lib/python/task.py \
- lib/python/vector.py ]
</del><ins>+ 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 ]
</ins><span class="cx">
</span><span class="cx"> configure.ldflags-append -framework OpenGL -framework Accelerate
</span><span class="cx"> configure.args \
</span><span class="lines">@@ -318,7 +665,7 @@
</span><span class="cx">
</span><span class="cx"> # python26 variant is only present to allow 'grass +wxgtk28' to coexist with py27-wxpython-3.0
</span><span class="cx"> # once support for wxWidgets 3.0 is complete, support for Python 2.6 may be removed
</span><del>-variant python26 conflicts python27 description {} {
</del><ins>+variant python26 conflicts python27 wxwidgets30 description {} {
</ins><span class="cx"> depends_lib-append port:python26
</span><span class="cx"> set python_bin ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
</span><span class="cx"> # Enable support for wxGUI Python extensions
</span><span class="lines">@@ -331,7 +678,7 @@
</span><span class="cx"> post-patch {
</span><span class="cx"> # for some reason it fails if python_bin is not defined inside post-patch (figure out why)
</span><span class="cx"> set python_bin ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
</span><del>- reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
</del><ins>+ reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.sh
</ins><span class="cx"> foreach f $python_scripts {
</span><span class="cx"> reinplace "s|/usr/bin/env python|${python_bin}|" $f
</span><span class="cx"> }
</span><span class="lines">@@ -346,7 +693,7 @@
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
</span><del>- reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.src
</del><ins>+ reinplace "s|@@PYTHON@@|${python_bin}|" ${worksrcpath}/lib/init/grass.sh
</ins><span class="cx"> foreach f $python_scripts {
</span><span class="cx"> reinplace "s|/usr/bin/env python|${python_bin}|" $f
</span><span class="cx"> }
</span><span class="lines">@@ -356,7 +703,7 @@
</span><span class="cx"> # TODO: in principle wxWidgets is optional and could be disable with
</span><span class="cx"> # --disable-wxwidgets if there is demand for that
</span><span class="cx"> # grass 4.6.3 is not compatible with wxWidgets 3.0 yet
</span><del>-variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
</del><ins>+variant wxwidgets30 conflicts wxwidgets28 wxgtk28 python26 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
</ins><span class="cx"> wxWidgets.use wxPython-3.0
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><span class="cx"> configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</span><span class="lines">@@ -374,7 +721,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
</span><del>- default_variants-append +wxgtk28
</del><ins>+ default_variants-append +wxwidgets30
</ins><span class="cx"> }
</span><span class="cx"> if {![variant_isset python26] && ![variant_isset python27]} {
</span><span class="cx"> if {[variant_isset wxgtk28] || [variant_isset wxwidgets28]} {
</span><span class="lines">@@ -389,11 +736,7 @@
</span><span class="cx"> # (in case there is demand for it)
</span><span class="cx"> # TODO: the code below is ugly; any suggestions for improving it are welcome
</span><span class="cx"> if {[variant_isset wxwidgets30]} {
</span><del>- if {[variant_isset python26]} {
- depends_lib-append port:py26-wxpython-3.0
- } elseif {[variant_isset python27]} {
- depends_lib-append port:py27-wxpython-3.0
- }
</del><ins>+ depends_lib-append port:py27-wxpython-3.0
</ins><span class="cx"> } else {
</span><span class="cx"> if {[variant_isset python26]} {
</span><span class="cx"> depends_lib-append port:py26-wxpython-2.8
</span></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchMakefilediff"></a>
<div class="delfile"><h4>Deleted: users/mojca/ports/gis/grass/files/patch-Makefile.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>---- 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
</del></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchconfigurediff"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/gis/grass/files/patch-configure.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- configure.orig
</span><span class="cx"> +++ configure
</span><del>-@@ -1424,9 +1424,9 @@ fi
</del><ins>+@@ -1432,9 +1432,9 @@ fi
</ins><span class="cx"> # Set INST_DIR
</span><span class="cx">
</span><span class="cx"> if test -n "$MACOSX_APP" ; then
</span></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchffmpegdiff"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/gis/grass/files/patch-ffmpeg.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- lib/ogsf/gsd_img_mpeg.c.orig
++++ lib/ogsf/gsd_img_mpeg.c
+@@ -30,7 +30,7 @@
</ins><span class="cx"> #include <avutil.h>
</span><span class="cx"> #else
</span><span class="cx"> /* libavutil 51.22.1's avutil.h doesn't include libavutil/mathematics.h */
</span></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchguiwxpythoncoreglobalvarpydiff"></a>
<div class="delfile"><h4>Deleted: users/mojca/ports/gis/grass/files/patch-gui-wxpython-core-globalvar.py.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,12 +0,0 @@
</span><del>-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)
</del></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchguiwxpythongui_coreghelppydiff"></a>
<div class="delfile"><h4>Deleted: users/mojca/ports/gis/grass/files/patch-gui-wxpython-gui_core-ghelp.py.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,21 +0,0 @@
</span><del>-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)
</del></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchincludeMakeInstallmakediff"></a>
<div class="addfile"><h4>Added: users/mojca/ports/gis/grass/files/patch-include-Make-Install.make.diff (0 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,113 @@
</span><ins>+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:
</ins></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchis_voiddiff"></a>
<div class="modfile"><h4>Modified: users/mojca/ports/gis/grass/files/patch-is_void.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> http://trac.osgeo.org/grass/ticket/2170
</span><span class="cx">
</span><del>---- raster/r.terraflow/direction.cc.orig
-+++ raster/r.terraflow/direction.cc
</del><ins>+--- raster/r.terraflow/direction.cpp.orig
++++ raster/r.terraflow/direction.cpp
</ins><span class="cx"> @@ -53,11 +53,11 @@ encodeDirectionMFD(const genericWindow<elevation_type>& elevwin,
</span><span class="cx">
</span><span class="cx"> if(!is_nodata(elevwin.get())) {
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>---- raster/r.terraflow/nodata.cc.orig
-+++ raster/r.terraflow/nodata.cc
</del><ins>+--- raster/r.terraflow/nodata.cpp.orig
++++ raster/r.terraflow/nodata.cpp
</ins><span class="cx"> @@ -73,7 +73,7 @@ is_nodata(float x) {
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchlibinitgrassshdifffromrev121091trunkdportsgisgrassfilespatchlibinitgrasssrcdiff"></a>
<div class="copfile"><h4>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) (0 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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
+
</ins></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchlibinitgrasssrcdiff"></a>
<div class="delfile"><h4>Deleted: users/mojca/ports/gis/grass/files/patch-lib-init-grass.src.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,9 +0,0 @@
</span><del>---- 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" "$@"
</del></span></pre></div>
<a id="usersmojcaportsgisgrassfilespatchmacosx_Makefilediff"></a>
<div class="delfile"><h4>Deleted: users/mojca/ports/gis/grass/files/patch-macosx_Makefile.diff (121091 => 121097)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- 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
</del></span></pre>
</div>
</div>
</body>
</html>