<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e3710d6800e803ebaa9528d3bdb38fb2fcade513">https://github.com/macports/macports-ports/commit/e3710d6800e803ebaa9528d3bdb38fb2fcade513</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new e3710d6 PROJ: Upheaval to make proj4 and proj compatible. LASZIP: Initial commit PDAL: Initial commit
</span><span style='display:block; white-space:pre;color:#404040;'> new 554e875 Merge branch 'master' of https://github.com/macports/macports-ports
</span>e3710d6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e3710d6800e803ebaa9528d3bdb38fb2fcade513
</span>Author: Veence <vince@macports.org>
AuthorDate: Sun Mar 25 21:32:07 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> PROJ: Upheaval to make proj4 and proj compatible.
</span><span style='display:block; white-space:pre;color:#404040;'> LASZIP: Initial commit
</span><span style='display:block; white-space:pre;color:#404040;'> PDAL: Initial commit
</span>---
databases/mysql55-lib_mysqludf_fproj4/Portfile | 5 +-
databases/postgis/Portfile | 6 +-
databases/postgis2/Portfile | 6 +-
databases/spatialite-tools/Portfile | 4 +-
databases/spatialite/Portfile | 13 ++--
gis/gdal/Portfile | 6 +-
gis/grass/Portfile | 10 +--
gis/grass7/Portfile | 16 ++---
gis/laszip/Portfile | 26 ++++++++
gis/mapnik/Portfile | 4 +-
gis/mapserver/Portfile | 6 +-
gis/pdal/Portfile | 87 ++++++++++++++++++++++++++
gis/proj/Portfile | 5 +-
gis/{proj47 => proj4}/Portfile | 3 +-
gis/qgis/Portfile | 8 +--
gis/qgis3/Portfile | 8 +--
gis/qlandkarte/Portfile | 4 +-
gis/rsgislib/Portfile | 3 +-
gis/saga/Portfile | 19 +++---
graphics/libgeotiff/Portfile | 6 +-
graphics/shapelib/Portfile | 4 +-
math/octave-octproj/Portfile | 4 +-
perl/p5-pdl/Portfile | 4 +-
python/py-cartopy/Portfile | 4 +-
python/py-pyproj/Portfile | 4 +-
python/py-spatialite/Portfile | 4 +-
science/cdo/Portfile | 6 +-
science/metview/Portfile | 4 +-
science/ncarg/Portfile | 4 +-
science/relax3d/Portfile | 8 +--
science/sumo/Portfile | 4 +-
science/vapor/Portfile | 4 +-
science/wgrib2/Portfile | 3 +-
science/xastir/Portfile | 4 +-
x11/tk/Portfile | 10 +--
35 files changed, 218 insertions(+), 98 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55-lib_mysqludf_fproj4/Portfile b/databases/mysql55-lib_mysqludf_fproj4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bba9340..c2e8d3c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55-lib_mysqludf_fproj4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55-lib_mysqludf_fproj4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
set package.name lib_mysqludf_fPROJ4
version 0.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> set mysql.name mysql55
name ${mysql.name}-${package.name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,13 +51,14 @@ worksrcdir ${distname}-src
</span> checksums rmd160 062aabb5764d9c0d6bf3803faa7a5e0d0116d90a \
sha256 22ec139f1652040828da18a4b3a469355486d459f8000d25381422b9c9e45cdd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:proj4
</span>
use_configure no
configure.cflags-append \
-I${prefix}/include/${mysql.name} \
-I${prefix}/include/${mysql.name}/mysql \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/proj49/lib \
</span> -lproj \
-bundle \
-undefined dynamic_lookup
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis/Portfile b/databases/postgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 683cec1..5785205 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name postgis
version 1.5.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories databases
license GPL-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ depends_build \
</span>
depends_lib \
port:geos \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:libiconv \
port:libxml2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ patchfiles patch-postgis-Makefile.in.diff
</span>
configure.args \
--datadir=${prefix}/share/${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-projdir=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-projdir=${prefix}/lib/proj49 \
</span> --with-xsldir=${prefix}/share/xsl/docbook-xsl
configure.cflags-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis2/Portfile b/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cedafc8..9aac0c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ categories databases gis
</span> license GPL-2+
version 2.4.3
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
maintainers vince openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_build port:autoconf \
</span> port:libxslt
depends_lib port:geos\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4\
</span> port:libiconv\
port:libxml2\
port:json-c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,6 @@ variant comments description {Build comments -- ! broken } {
</span> port:ImageMagick
configure.args-append --datadir=${prefix}/share/${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-projdir=${prefix} \
</span> --with-xsldir=${prefix}/share/xsl/docbook-xsl \
--with-json \
--with-jsondir=${prefix}/lib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,6 +131,7 @@ configure.cflags-append \
</span>
# see https://trac.macports.org/wiki/UsingTheRightCompiler
configure.env-append CPPBIN=${configure.cpp}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append --with-projdir=${prefix}/lib/proj49
</span>
post-configure {
if {[variant_isset universal]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/spatialite-tools/Portfile b/databases/spatialite-tools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc43bf5..2de9e11 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/spatialite-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/spatialite-tools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name spatialite-tools
version 4.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories databases gis
license GPL-3
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ depends_build port:pkgconfig
</span> depends_lib port:spatialite\
port:libiconv\
port:geos\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj47\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4\
</span> port:expat \
port:readosm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/spatialite/Portfile b/databases/spatialite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2eb4efa..3781f4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/spatialite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/spatialite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name spatialite
version 4.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories databases gis
platforms darwin
license {MPL-1.1 GPL-2+ LGPL-2.1+}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,16 +30,15 @@ checksums rmd160 ee8d9f3f69f1c70f041b418e0e51a05ec40a5be7 \
</span> depends_build port:pkgconfig
depends_lib port:sqlite3 \
port:geos \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:libxml2
configure.args-append \
--enable-libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-freexl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-lib=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-incl=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-geos-lib=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-geos-incl=${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-freexl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/lib/proj49/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib/proj49/lib
</span>
post-configure {
fs-traverse file ${worksrcpath} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ff9c82d..1138d60 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup muniversal 1.0
</span>
name gdal
version 2.2.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories gis
license MIT BSD
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ depends_lib-append port:zlib \
</span> port:libgeotiff \
port:jpeg \
port:giflib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:qhull
set PYINST ""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ configure.args-append \
</span> --with-geotiff=${prefix} \
--with-jpeg=${prefix}\
--with-gif=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-static-proj4=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-static-proj4=${prefix}/lib/proj49 \
</span> --with-qhull=yes \
--without-pg \
--without-grass \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass/Portfile b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5740a81..24da2f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup active_variants 1.1
</span> name grass
epoch 1
version 6.4.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> maintainers nomaintainer
categories gis
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_lib port:fftw-3 \
</span> port:libpng \
port:mesa \
lib:libXm:openmotif \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj47 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:tk \
path:lib/pkgconfig/cairo.pc:cairo \
port:readline
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,9 +70,9 @@ configure.args \
</span> --with-motif-libs=${prefix}/lib \
--with-png-includes=${prefix}/include \
--with-png-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-includes=${prefix}/lib/proj47/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-libs=${prefix}/lib/proj47/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/lib/proj47/share/proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-includes=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-libs=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/proj49/share/proj \
</span> --with-tcltk-includes=${prefix}/include \
--with-tcltk-libs=${prefix}/lib \
--with-cxx \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bf34b2..6a425d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup wxWidgets 1.0
</span>
name grass7
version 7.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set realVersion ${version}
#distname grass-${version}
distname grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ depends_lib port:bzip2 \
</span> port:geos \
port:tiff \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4\
</span> port:liblas\
path:lib/pkgconfig/cairo.pc:cairo \
port:readline \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,8 @@ post-patch {
</span> ui_warn "WARNING! Experimental build. Report any problems."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append -framework OpenCL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env PATH=$::env(PATH):${prefix}/lib/proj49/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -framework OpenCL
</span>
configure.args \
--prefix=${prefix}/share \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,9 +77,9 @@ configure.args \
</span> --with-tiff-libs=${prefix}/lib \
--with-png-includes=${prefix}/include \
--with-png-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-includes=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-libs=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj-share=${prefix}/share/proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-includes=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-libs=${prefix}/lib/proj49/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj-share=${prefix}/lib/proj49/share/proj \
</span> --with-geos \
--with-geos-includes=${prefix}/include \
--with-geos-libs=${prefix}/lib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +97,8 @@ configure.args \
</span> --with-readline-includes=${prefix}/include/readline \
--with-readline-libs=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env PATH=$::env(PATH):${prefix}/lib/proj49/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target default
</span>
variant gui description {Builds with WxPython GUI} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/laszip/Portfile b/gis/laszip/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b31aeec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/laszip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup LASZip LASzip 3.2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name laszip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {vince @Veence}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description LASzip is a library to handle compressed point cloud data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.laszip.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8202240f2924ee863fe6236a4def7823e417d095 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 76a7eae65f8a397c3f8f709ad26476c84588aa531102d69af8eb4fd7c1bc3143 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 222623
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist {clang < 500}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+worksrcdir LASzip-LASzip-0a71b19
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapnik/Portfile b/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e31cded..4a59527 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapnik/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cxx11 1.1
</span>
name mapnik
version 3.0.19
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories gis devel
platforms darwin
license LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ depends_lib-append port:boost \
</span> port:webp \
port:zlib \
port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4
</span>
conflicts_build antigraingeometry
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/mapserver/Portfile b/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0bb2e7..3c72124 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/mapserver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name mapserver
version 6.2.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> maintainers hbaspecto.com:jea openmaintainer
categories gis
license permissive
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,8 +103,8 @@ variant ogr description {Add OGR input format support} {
</span> }
variant proj description {Proj.4 reprojection support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-proj=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-proj=${prefix}/lib/proj49
</span> }
variant fastcgi description {FastCGI support} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/pdal/Portfile b/gis/pdal/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c213826
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,87 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name pdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers vince openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description PDAL - Point Cloud Manipulation Library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description PDAL is a C++ BSD library for translating and\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ manipulating point cloud data. It is very much\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ like the GDAL library which handles raster and\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vector data.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage http://www.pdal.io/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites http://download.osgeo.org/pdal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname PDAL-${version}-src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 41875e22a158dfcef5a066e6d19e7ab1aac80f43 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 61f328691699f4fdd28486489b1e679fc3b83bb75300d3075f69fe1092e63efc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:geos \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gdal \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libgeotiff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:laszip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Python stuff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {27 35 36}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend python_variants python${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vrt python${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyversion [string index ${suffix} 0].[string index ${suffix} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${python_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${python_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pyfw ${frameworks_dir}/Python.framework/Versions/${pyversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} description "Use Python ${pyversion}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${vrt} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${suffix}-numpy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PLUGIN_PYTHON=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${pyversion} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_INCLUDE_DIR=${pyfw}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_LIBRARY=${pyfw}/lib/libpython${pyversion}.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {10 95 96}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend postgresql_variants postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vrt postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgversion [string index ${suffix} 0].[string index ${suffix} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${postgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${postgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} description "Use PostgreSQL ${pgversion}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPG_CONFIG=${prefix}/lib/${vrt}/bin/pg_config \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPOSTGRESQL_INCLUDE_DIR=${prefix}/include/${vrt} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPOSTGRESQL_LIBRARIES=${prefix}/lib/${vrt}/libpq.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj/Portfile b/gis/proj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbec3c2..09ec487 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/proj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,8 +10,8 @@ platforms darwin
</span> license MIT
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description PROJ.4 - Cartographic Projections Library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description PROJ.4 is a library for converting data between \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description PROJ - Cartographic Projections Library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description PROJ is a library for converting data between \
</span> cartographic projections.
homepage http://trac.osgeo.org/proj/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,7 @@ pre-destroot {
</span> file copy ${worksrcpath}/src/projects.h ${destroot}${prefix}/include
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args --prefix=${prefix}/lib/proj5
</span> configure.args --mandir=${prefix}/share/man
post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/proj47/Portfile b/gis/proj4/Portfile
</span>similarity index 96%
rename from gis/proj47/Portfile
rename to gis/proj4/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index c597605..8e688bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/proj47/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/proj4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,9 +3,8 @@
</span> PortSystem 1.0
set realname proj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name ${realname}47
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name ${realname}4
</span> version 4.9.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span> set datumgrid_version 1.5
categories gis
license MIT
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis/Portfile b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9c1ba8d..07f29bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup github 1.0
</span> PortGroup qt4 1.0
github.setup qgis QGIS 2_18_17 final-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> name qgis
version [string map {_ .} ${github.version}]
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ checksums rmd160 1b17a258c053e4114e2569e9465312c55dd0a566 \
</span> depends_lib-append port:libiconv \
port:expat \
path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:geos \
port:gdal \
port:sqlite3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -91,8 +91,8 @@ configure.args-append "-DGEOS_CONFIG=${prefix}/bin/geos-config"
</span> configure.args-append "-DGEOS_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib"
configure.args-append "-DGSL_CONFIG=${prefix}/bin/gsl-config"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/lib/proj49/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/proj49/lib/libproj.dylib"
</span> configure.args-append \
"-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4566bef..632b575 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup github 1.0
</span> PortGroup qt5 1.0
github.setup qgis QGIS 3_0_0 final-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> name qgis3
version [string map {_ .} ${github.version}]
categories gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ depends_lib-append port:libiconv \
</span> path:lib/libssl.dylib:openssl \
port:gsl \
port:fcgi \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:geos \
port:gdal \
port:sqlite3 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -215,8 +215,8 @@ configure.args-append "-DGEOS_CONFIG=${prefix}/bin/geos-config"
</span> configure.args-append "-DGEOS_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DGEOS_LIBRARY=${prefix}/lib/libgeos_c.dylib"
configure.args-append "-DGSL_CONFIG=${prefix}/bin/gsl-config"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/libproj.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DPROJ_INCLUDE_DIR=${prefix}/lib/proj49/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append "-DPROJ_LIBRARY=${prefix}/lib/proj49/libproj.dylib"
</span> configure.args-append "-DSPATIALITE_LIBRARY=${prefix}/lib/libspatialite.dylib"
configure.args-append "-DSPATIALITE_INCLUDE_DIR=${prefix}/include"
configure.args-append "-DSPATIALINDEX_LIBRARY=${prefix}/lib/libspatialindex.dylib"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qlandkarte/Portfile b/gis/qlandkarte/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eeeac11..df918aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qlandkarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qlandkarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ name qlandkarte
</span> categories gis
license GPL-2+
version 0.7.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ distname QLandkarte_${version}
</span>
checksums md5 51f804235511f1c10ae8538f86743135
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:proj4 \
</span> port:libusb-compat
configure.args --with-extra-includes=${prefix}/include\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/rsgislib/Portfile b/gis/rsgislib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2ce276..e7b33fd 100755
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/rsgislib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/rsgislib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup bitbucket 1.0
</span> PortGroup cmake 1.1
bitbucket.setup petebunting rsgislib 3.4.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories gis
license GPL-3
maintainers {vince @Veence}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,6 @@ checksums rmd160 028471cc352fc787ed8fd3e230f68c7db486107d \
</span> depends_lib-append port:gdal \
port:geos \
port:cgal \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span> port:boost \
port:xercesc3 \
port:gsl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/saga/Portfile b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf37476..3c0093c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/saga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,8 +7,8 @@ wxWidgets.use wxWidgets-3.0
</span> name saga
categories gis
license GPL
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 6.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 3
</span> #set branch [join [lrange [split ${version} .] 0 1] .]
platforms darwin
maintainers vince openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,8 +25,8 @@ master_sites sourceforge:project/saga-gis/SAGA%20-%206/SAGA%20-%20${versi
</span> distname saga-${version}
worksrcdir saga-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 dc08c3dab177b9989396599f0fc7c9a30a12de8a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da5767d339c3a2cd9d5905a66251e44b8be7325aa10b673db7ea55a8d4bffe6e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4fd7f91c0c6511f5356528a8b148b714d7d4c542 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 bb4b99406e3a25cdaa12559904ce3272c449acb542bc0883b2755ce6508dd243
</span>
patchfiles patch-configure.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,12 +36,14 @@ depends_build port:autoconf \
</span>
depends_lib port:geos \
port:gdal \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:laszip \
</span> port:jasper \
port:fftw-3 \
port:unixodbc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qhull \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:qhull
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:${wxWidgets.port}
</span>
post-patch {
reinplace -E "s|wx-config|${wxWidgets.wxconfig}|" ${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +54,9 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-append -I${prefix}/lib/proj49/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -L${prefix}/lib/proj49/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --disable-openmp \
--enable-debug \
--disable-triangle \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libgeotiff/Portfile b/graphics/libgeotiff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f873ec..785c6d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libgeotiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libgeotiff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name libgeotiff
version 1.4.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories graphics
platforms darwin
license X11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ master_sites http://download.osgeo.org/geotiff/libgeotiff/
</span> checksums rmd160 f5871407f64ed0e754fcbdc80ed57ac735bd8886 \
sha256 ad87048adb91167b07f34974a8e53e4ec356494c29f1748de95252e8f81a5e6e
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:tiff port:proj port:zlib port:jpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:tiff port:proj4 port:zlib port:jpeg
</span>
# Don't accidentally create flat-namespace dylibs on Yosemite (#44596).
patchfiles yosemite-libtool.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ post-patch {
</span> configure.args-append \
--with-zip=${prefix} \
--with-jpeg=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj=${prefix}/lib/proj49 \
</span> --enable-incode-epsg
use_parallel_build no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/shapelib/Portfile b/graphics/shapelib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e0c164..64aa2db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/shapelib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/shapelib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name shapelib
version 1.4.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories graphics
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,4 +20,4 @@ master_sites http://download.osgeo.org/shapelib/
</span> checksums rmd160 7e5714fcfc89927bbc68b9a4e1ea65d7e82748f2 \
sha256 a4c94817365761a3a4c21bb3ca1c680a6bdfd3edd61df9fdd291d3e7645923b3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:proj4
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-octproj/Portfile b/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58b4b3c..0353e1a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup octproj 1.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,4 +18,4 @@ checksums rmd160 f47e7addc3ced4f2373a5ab0e726186af0aa6644 \
</span> # do not override MacPorts flags
patchfiles-append patch-flags.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:proj4
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-pdl/Portfile b/perl/p5-pdl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 422379b..57ed5b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-pdl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-pdl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup perl5 1.0
</span>
perl5.branches 5.26
perl5.setup PDL 2.018
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> maintainers peculier.com:mgrimes openmaintainer
license {Artistic-1 GPL}
description Perl Data Language - scientific computing capability for perl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +98,7 @@ if {${perl5.major} != ""} {
</span> if {[variant_isset proj]} {
set enable_proj 1
depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4
</span> }
# pgplot is not universal
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cartopy/Portfile b/python/py-cartopy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 55f5f22..160e9de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cartopy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cartopy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span> PortGroup github 1.0
github.setup SciTools cartopy 0.15.1 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
name py-${github.project}
categories-append science gis graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-numpy
# default
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj4 \
</span> port:geos \
port:py${python.version}-numpy \
port:py${python.version}-pyshp \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyproj/Portfile b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1989031..9fc5dd6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name py-pyproj
version 1.9.5.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories-append devel
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ checksums rmd160 f1f3008fb452ac106310f8d4c73d7143f25690a3 \
</span> if {${name} ne ${subport}} {
depends_build-append \
port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:proj4
</span>
post-destroot {
xinstall -m 644 -W ${worksrcpath} \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-spatialite/Portfile b/python/py-spatialite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c0c9f56..7c9a69f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-spatialite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-spatialite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup github 1.0
</span> github.setup lokkju pyspatialite 3.0.1-alpha-0
name py-spatialite
version 3.0.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span>
# pyspatialite comes in several flavors according the spatialite API it's going to work with
set spatialite-compat "-spatialite.2.3.1"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ if {${name} ne ${subport}} {
</span> depends_lib-append \
port:spatialite \
port:geos \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4
</span>
patchfiles patch-setup_py.diff \
patch-connection_h.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/cdo/Portfile b/science/cdo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2e4451a..cefdfc4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/cdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/cdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cxx11 1.1
</span>
name cdo
version 1.9.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
maintainers takeshi openmaintainer
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +33,13 @@ depends_lib port:netcdf \
</span> port:hdf5 \
port:curl \
port:udunits2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:fftw-3
configure.args --with-netcdf=${prefix} \
--disable-dependency-tracking \
--disable-openmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-proj=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-proj=${prefix}/lib/proj49 \
</span> --with-hdf5=${prefix} \
--with-udunits2=${prefix} \
--with-fftw3 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/metview/Portfile b/science/metview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 60e2a9a..02053b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/metview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/metview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup qt4 1.0
</span>
name metview
version 4.9.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
maintainers takeshi
license Apache-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ depends_lib-append port:boost \
</span> port:netcdf \
port:netcdf-cxx \
port:openjpeg \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:xorg-libice \
port:xorg-libsm \
port:xorg-libX11 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ncarg/Portfile b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eb4280d..48963d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ncarg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ compilers.setup -clang -dragonegg -gfortran -llvm
</span>
name ncarg
version 6.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> categories science
platforms darwin
maintainers takeshi openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ checksums ${ncl_src} \
</span> sha256 ec79fb768ce9e45ca6c2c94fa4dfc99b30600d7f8f44d272cdb36ab542d59468
depends_lib path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:gdal \
port:udunits2 \
port:vis5d \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/relax3d/Portfile b/science/relax3d/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21778b3..9de88e6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/relax3d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/relax3d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup waf 1.0
</span>
name relax3d
version 1.0.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories science gis
platforms darwin
license GPL
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ checksums rmd160 10603dd3ecb0fa4ba743dc75db6accc566327caf \
</span>
depends_lib-append port:fftw-3-single \
port:gmt4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj47 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:python27
# gmt4 is not universal
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +41,8 @@ compilers.enforce_fortran fftw-3-single
</span>
configure.args --use-fftw \
--fftw-dir=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --proj-incdir=${prefix}/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --proj-libdir=${prefix}/lib/proj47/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --proj-incdir=${prefix}/lib/proj49/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --proj-libdir=${prefix}/lib/proj49/lib \
</span> --gmt-dir=${prefix}/lib/gmt4
configure.ldflags-append \
"-L${prefix}/lib -lfftw3 -lfftw3_threads -lfftw3f -lfftw3f_threads"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/sumo/Portfile b/science/sumo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1afbb02..8ca27dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/sumo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/sumo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name sumo
version 0.32.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories science devel
platforms darwin
maintainers gmail.com:tlockhart1976 openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ depends_lib-append \
</span> port:fox \
port:gdal \
port:libtool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:xercesc3
# py27-matplotlib requires perl so let it choose which version
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/vapor/Portfile b/science/vapor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f48d612..b06d1bb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/vapor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/vapor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name vapor
version 2.2.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 15
</span> categories science
maintainers nomaintainer
description interactive 3D scientific visualization environment
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ depends_lib port:assimp2 \
</span> port:hdf5 \
port:libgeotiff \
port:netcdf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:py27-numpy \
port:py27-scipy \
port:qt4-mac \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wgrib2/Portfile b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd30226..9880aae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wgrib2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup compilers 1.0
</span>
name wgrib2
version 2.0.7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
maintainers takeshi
license public-domain
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +33,7 @@ depends_lib port:jasper \
</span> port:libpng \
port:netcdf \
port:hdf5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:libaec
worksrcdir grib2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xastir/Portfile b/science/xastir/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2294762..3838769 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xastir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xastir/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name xastir
version 2.0.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories science
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ depends_lib port:xorg-libXp \
</span> port:pcre \
port:db46 \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:proj \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:proj4 \
</span> port:shapelib
patchfiles patch-acinclude.m4.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tk/Portfile b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7e0631..1bfc2de 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,15 +69,15 @@ if {${os.platform} eq "darwin" && ${os.subplatform} eq "macosx" && ${os.major} >
</span> port:Xft2 \
port:xorg-libXScrnSaver
# tk.h still includes and uses types from X11/Xlib.h
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# depends_lib-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port:xorg-libX11
</span> configure.ldflags-delete \
-lfontconfig
configure.args-append \
--enable-aqua
<span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/include/X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# delete ${destroot}${prefix}/include/X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# }
</span> }
variant x11 conflicts quartz {}
</pre><pre style='margin:0'>
</pre>