<!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>[134504] trunk/dports/gis/grass/Portfile</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/134504">134504</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2015-03-27 12:54:27 -0700 (Fri, 27 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>grass: whitespace only</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgrassPortfile">trunk/dports/gis/grass/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgrassPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/grass/Portfile (134503 => 134504)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/grass/Portfile 2015-03-27 19:48:17 UTC (rev 134503)
+++ trunk/dports/gis/grass/Portfile 2015-03-27 19:54:27 UTC (rev 134504)
</span><span class="lines">@@ -1,55 +1,55 @@
</span><ins>+# -*- coding: utf-8; mode: tcl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=2:ts=2:sts=2
</ins><span class="cx"> # $Id$
</span><span class="cx">
</span><del>-PortSystem 1.0
-PortGroup wxWidgets 1.0
-PortGroup active_variants 1.1
</del><ins>+PortSystem 1.0
+PortGroup wxWidgets 1.0
+PortGroup active_variants 1.1
</ins><span class="cx">
</span><del>-name grass
-version 6.4.3
-revision 5
-epoch 1
-maintainers nomaintainer
-categories gis
-license GPL-2+
-platforms darwin
</del><ins>+name grass
+version 6.4.3
+revision 5
+epoch 1
+maintainers nomaintainer
+categories gis
+license GPL-2+
+platforms darwin
</ins><span class="cx">
</span><del>-description GRASS
-long_description GRASS is a Geographic Information System (GIS) used for \
- geospatial data management and analysis.
</del><ins>+description GRASS
+long_description GRASS is a Geographic Information System (GIS) used for \
+ geospatial data management and analysis.
</ins><span class="cx">
</span><del>-homepage http://grass.osgeo.org/
-master_sites ${homepage}grass[join [lrange [split ${version} .] 0 1] {}]/source/
</del><ins>+homepage http://grass.osgeo.org/
+master_sites ${homepage}grass[join [lrange [split ${version} .] 0 1] {}]/source/
</ins><span class="cx">
</span><del>-checksums rmd160 bdbd671972730701aa8213c2041abe31a68eea4c \
- sha256 5d29d322a262330894aa046845e6790258cd6e3f95b28c350ed7839810672ed6
</del><ins>+checksums rmd160 bdbd671972730701aa8213c2041abe31a68eea4c \
+ sha256 5d29d322a262330894aa046845e6790258cd6e3f95b28c350ed7839810672ed6
</ins><span class="cx">
</span><del>-depends_build port:pkgconfig
-depends_lib port:fftw-3 \
- port:freetype \
- port:gdal \
- port:geos \
- port:jpeg \
- port:libpng \
- port:mesa \
- lib:libXm:openmotif \
- port:proj47 \
- port:tk \
- path:lib/pkgconfig/cairo.pc:cairo \
- port:readline
</del><ins>+depends_build port:pkgconfig
+depends_lib port:fftw-3 \
+ port:freetype \
+ port:gdal \
+ port:geos \
+ port:jpeg \
+ port:libpng \
+ port:mesa \
+ lib:libXm:openmotif \
+ port:proj47 \
+ port:tk \
+ path:lib/pkgconfig/cairo.pc:cairo \
+ port:readline
</ins><span class="cx">
</span><span class="cx"> # https://trac.macports.org/ticket/32790
</span><span class="cx"> # this should probably only apply to some Xcode versions
</span><span class="cx"> # compiler.blacklist *clang*
</span><span class="cx">
</span><del>-patchfiles \
- patch-configure.diff \
- patch-gui-wxpython-core-globalvar.py.diff \
- patch-gui-wxpython-gui_core-ghelp.py.diff \
- patch-is_void.diff \
- patch-lib-init-grass.src.diff \
- patch-macosx_Makefile.diff \
- patch-Makefile.diff \
- patch-ffmpeg.diff
</del><ins>+patchfiles patch-configure.diff \
+ patch-gui-wxpython-core-globalvar.py.diff \
+ patch-gui-wxpython-gui_core-ghelp.py.diff \
+ patch-is_void.diff \
+ patch-lib-init-grass.src.diff \
+ patch-macosx_Makefile.diff \
+ patch-Makefile.diff \
+ patch-ffmpeg.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" ${worksrcpath}/configure
</span><span class="lines">@@ -245,86 +245,86 @@
</span><span class="cx"> build.target default
</span><span class="cx">
</span><span class="cx"> variant mysql5 description {Add MySQL 5 support} {
</span><del>- depends_lib-append path:bin/mysql_config5:mysql5
- configure.args-append --with-mysql
- configure.args-append --with-mysql-includes=${prefix}/include/mysql5/mysql
- configure.args-append --with-mysql-libs=${prefix}/lib/mysql5/mysql
- configure.env-append MYSQLD_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
</del><ins>+ depends_lib-append path:bin/mysql_config5:mysql5
+ configure.args-append --with-mysql
+ configure.args-append --with-mysql-includes=${prefix}/include/mysql5/mysql
+ configure.args-append --with-mysql-libs=${prefix}/lib/mysql5/mysql
+ configure.env-append MYSQLD_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 postgresql93 description {Add PostgreSQL 8.3 support} {
</span><del>- depends_lib-append port:postgresql83
- configure.args-delete --without-postgres
- configure.args-append --with-postgres
- configure.args-append --with-postgres-includes=${prefix}/include/postgresql83
- configure.args-append --with-postgres-libs=${prefix}/lib/postgresql83
</del><ins>+ depends_lib-append port:postgresql83
+ configure.args-delete --without-postgres
+ configure.args-append --with-postgres
+ configure.args-append --with-postgres-includes=${prefix}/include/postgresql83
+ configure.args-append --with-postgres-libs=${prefix}/lib/postgresql83
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 postgresql92 postgresql93 description {Add PostgreSQL 8.4 support} {
</span><del>- depends_lib-append port:postgresql84
- configure.args-delete --without-postgres
- configure.args-append --with-postgres
- configure.args-append --with-postgres-includes=${prefix}/include/postgresql84
- configure.args-append --with-postgres-libs=${prefix}/lib/postgresql84
</del><ins>+ depends_lib-append port:postgresql84
+ configure.args-delete --without-postgres
+ configure.args-append --with-postgres
+ configure.args-append --with-postgres-includes=${prefix}/include/postgresql84
+ configure.args-append --with-postgres-libs=${prefix}/lib/postgresql84
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 postgresql92 postgresql93 description {Add PostgreSQL 9.0 support} {
</span><del>- depends_lib-append port:postgresql90
- configure.args-delete --without-postgres
- configure.args-append --with-postgres
- configure.args-append --with-postgres-includes=${prefix}/include/postgresql90
- configure.args-append --with-postgres-libs=${prefix}/lib/postgresql90
</del><ins>+ depends_lib-append port:postgresql90
+ configure.args-delete --without-postgres
+ configure.args-append --with-postgres
+ configure.args-append --with-postgres-includes=${prefix}/include/postgresql90
+ configure.args-append --with-postgres-libs=${prefix}/lib/postgresql90
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 postgresql92 postgresql93 description {Add PostgreSQL 9.1 support} {
</span><del>- depends_lib-append port:postgresql91
- configure.args-delete --without-postgres
- configure.args-append --with-postgres
- configure.args-append --with-postgres-includes=${prefix}/include/postgresql91
- configure.args-append --with-postgres-libs=${prefix}/lib/postgresql91
</del><ins>+ depends_lib-append port:postgresql91
+ configure.args-delete --without-postgres
+ configure.args-append --with-postgres
+ configure.args-append --with-postgres-includes=${prefix}/include/postgresql91
+ configure.args-append --with-postgres-libs=${prefix}/lib/postgresql91
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql92 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql93 description {Add PostgreSQL 9.2 support} {
</span><del>- depends_lib-append port:postgresql92
- configure.args-delete --without-postgres
- configure.args-append --with-postgres
- configure.args-append --with-postgres-includes=${prefix}/include/postgresql92
- configure.args-append --with-postgres-libs=${prefix}/lib/postgresql92
</del><ins>+ depends_lib-append port:postgresql92
+ configure.args-delete --without-postgres
+ configure.args-append --with-postgres
+ configure.args-append --with-postgres-includes=${prefix}/include/postgresql92
+ configure.args-append --with-postgres-libs=${prefix}/lib/postgresql92
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant postgresql93 conflicts postgresql83 postgresql84 postgresql90 postgresql91 postgresql92 description {Add PostgreSQL 9.3 support} {
</span><del>- depends_lib-append port:postgresql93
- configure.args-delete --without-postgres
- configure.args-append --with-postgres
- configure.args-append --with-postgres-includes=${prefix}/include/postgresql93
- configure.args-append --with-postgres-libs=${prefix}/lib/postgresql93
</del><ins>+ depends_lib-append port:postgresql93
+ configure.args-delete --without-postgres
+ configure.args-append --with-postgres
+ configure.args-append --with-postgres-includes=${prefix}/include/postgresql93
+ configure.args-append --with-postgres-libs=${prefix}/lib/postgresql93
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant sqlite3 description {Add SQLite 3 support} {
</span><del>- depends_lib-append port:sqlite3
- configure.args-append --with-sqlite
- configure.args-append --with-sqlite-includes=${prefix}/include
- configure.args-append --with-sqlite-libs=${prefix}/lib
</del><ins>+ depends_lib-append port:sqlite3
+ configure.args-append --with-sqlite
+ configure.args-append --with-sqlite-includes=${prefix}/include
+ configure.args-append --with-sqlite-libs=${prefix}/lib
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant ffmpeg description {Add ffmpeg support} {
</span><del>- depends_lib-append path:lib/libavcodec.dylib:ffmpeg
- configure.args-append --with-ffmpeg \
- --with-ffmpeg-includes=\"${prefix}/include/libavcodec \
- ${prefix}/include/libavformat \
- ${prefix}/include/libswscale\" \
- --with-ffmpeglibs=${prefix}/lib
</del><ins>+ depends_lib-append path:lib/libavcodec.dylib:ffmpeg
+ configure.args-append --with-ffmpeg \
+ --with-ffmpeg-includes=\"${prefix}/include/libavcodec \
+ ${prefix}/include/libavformat \
+ ${prefix}/include/libswscale\" \
+ --with-ffmpeglibs=${prefix}/lib
</ins><span class="cx"> }
</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><span class="cx"> variant python26 conflicts python27 description {} {
</span><del>- depends_lib-append port:python26
- set python_bin ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
- # Enable support for wxGUI Python extensions
- # (by removing this we wouldn't need to depend on py-wxpython-x.y)
- configure.args-append --with-python=${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6-config
- build.args-append PYTHON=${python_bin}
</del><ins>+ depends_lib-append port:python26
+ set python_bin ${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6
+ # Enable support for wxGUI Python extensions
+ # (by removing this we wouldn't need to depend on py-wxpython-x.y)
+ configure.args-append --with-python=${frameworks_dir}/Python.framework/Versions/2.6/bin/python2.6-config
+ build.args-append PYTHON=${python_bin}
</ins><span class="cx"> # TODO: this port doesn't work with the python portgroup because the group changes too much
</span><span class="cx"> # but it would make sense to fix this in such a way that python_bin could be determined automatically
</span><span class="cx">
</span><span class="lines">@@ -339,10 +339,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant python27 conflicts python26 description {} {
</span><del>- depends_lib-append port:python27
- set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
- configure.args-append --with-python=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7-config
- build.args-append PYTHON=${python_bin}
</del><ins>+ depends_lib-append port:python27
+ set python_bin ${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7
+ configure.args-append --with-python=${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7-config
+ build.args-append PYTHON=${python_bin}
</ins><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><span class="lines">@@ -357,20 +357,20 @@
</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><span class="cx"> variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
</span><del>- wxWidgets.use wxPython-3.0
- depends_lib-append port:${wxWidgets.port}
- configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</del><ins>+ wxWidgets.use wxPython-3.0
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</ins><span class="cx"> }
</span><span class="cx"> variant wxwidgets28 conflicts wxwidgets30 wxgtk28 description {Use Carbon-based wxWidgets 2.8} {
</span><span class="cx"> # untested (might not work)
</span><del>- wxWidgets.use wxWidgets-2.8
- depends_lib-append port:${wxWidgets.port}
- configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</del><ins>+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</ins><span class="cx"> }
</span><span class="cx"> variant wxgtk28 conflicts wxwidgets30 wxwidgets28 description {Use GTK-based wxWidgets 2.8} {
</span><del>- wxWidgets.use wxGTK-2.8
- depends_lib-append port:${wxWidgets.port}
- configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</del><ins>+ wxWidgets.use wxGTK-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
</span></span></pre>
</div>
</div>
</body>
</html>