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