[macports-ports] branch master updated: liblas: bump to 1.8.1

[mf2k at macports.org]

Hi Vince,


See below.

> On Jun 27, 2017, at 10:57 AM, Vincent <vince at macports.org> wrote:
> 
> Vincent (Veence) pushed a commit to branch master
> in repository macports-ports.
> 
> https://github.com/macports/macports-ports/commit/3d0aac3095640e42fabc64de06f9e16427d2664f <https://github.com/macports/macports-ports/commit/3d0aac3095640e42fabc64de06f9e16427d2664f>
> The following commit(s) were added to refs/heads/master by this push:
>      new 3d0aac3  liblas: bump to 1.8.1
> 3d0aac3 is described below
> 
> commit 3d0aac3095640e42fabc64de06f9e16427d2664f
> Author: Veence <vince at macports.org>
> AuthorDate: Tue Jun 27 18:56:52 2017 +0200
> 
>     liblas: bump to 1.8.1
> ---
>  gis/liblas/Portfile                         | 18 ++++++++++++++----
>  gis/liblas/files/patch-gt_citation_cpp.diff | 20 ++++++++++++++++++++
>  2 files changed, 34 insertions(+), 4 deletions(-)
> 
> diff --git a/gis/liblas/Portfile b/gis/liblas/Portfile
> index 572af16..7483696 100644
> --- a/gis/liblas/Portfile
> +++ b/gis/liblas/Portfile
> @@ -4,7 +4,9 @@ PortSystem          1.0
>  PortGroup           cmake 1.0
>  
>  name                liblas
> -version             1.7.0
> +version             1.8.1
> +distname            libLAS-${version}-src.tar

This is not the correct usage of distname (there should not be any encodings/compression in it), and it gets overridden later, and correctly, in the Portfile anyway. So this line should be removed. 

> +use_bzip2           yes
>  license             BSD
>  categories          gis
>  maintainers         gmail.com:venabled
> @@ -20,14 +22,22 @@ long_description \
>  homepage            http://www.liblas.org/index.html
>  master_sites        http://download.osgeo.org/liblas
>  
> -checksums           rmd160  74642d8a2eb302458e7e829eab733ba409725f87 \
> -                    sha256  e6b30c4530fef283e680fac59b199e1be6b96994fb663d08fd12838eef928277
> +checksums           rmd160  b397a8a1a108ea694f6fccbe8463636cff9a04d9 \
> +                    sha256  9adb4a98c63b461ed2bc82e214ae522cbd809cff578f28511122efe6c7ea4e76
>  
>  distname            libLAS-${version}
>  
> +patchfiles          patch-gt_citation_cpp.diff
>  configure.args-append \
> -                    -DWITH_GEOTIFF=ON
> +                    -DWITH_GEOTIFF=ON \
> +		    -DWITH_GDAL=ON 
>  
>  depends_lib-append  port:boost \
>                      port:gdal \
>                      port:libgeotiff
> +
> +post-destroot {
> +	exec install_name_tool -id ${prefix}/lib/liblas.2.4.0.dylib ${destroot}${prefix}/lib/liblas.2.4.0.dylib
> +	exec install_name_tool -id ${prefix}/lib/liblas_c.2.4.0.dylib ${destroot}${prefix}/lib/liblas_c.2.4.0.dylib
> +	exec install_name_tool -change "@rpath/liblas.3.dylib" ${prefix}/lib/liblas.3.dylib ${destroot}${prefix}/lib/liblas_c.2.4.0.dylib
> +}
> diff --git a/gis/liblas/files/patch-gt_citation_cpp.diff b/gis/liblas/files/patch-gt_citation_cpp.diff
> new file mode 100644
> index 0000000..c78a086
> --- /dev/null
> +++ b/gis/liblas/files/patch-gt_citation_cpp.diff
> @@ -0,0 +1,20 @@
> +--- src/gt_citation.cpp.orig	2017-06-27 18:51:08.000000000 +0200
> ++++ src/gt_citation.cpp	2017-06-27 18:51:45.000000000 +0200
> +@@ -155,7 +155,7 @@
> +         if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ')
> +           p1 --;
> +         p2 = p1 - 1;
> +-        while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
> ++        while( p2>(char *)0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
> +           p2--;
> +         if(p2 != p1 - 1)
> +           p1 = p2;
> +@@ -198,7 +198,7 @@
> +         if(p1[0] == '\0' || p1[0] == '\n' || p1[0] == ' ')
> +           p1 --;
> +         char* p2 = p1 - 1;
> +-        while( p2>0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
> ++        while( p2>(char *)0 && (p2[0] == ' ' || p2[0] == '\0' || p2[0] == '\n') )
> +           p2--;
> +         if(p2 != p1 - 1)
> +           p1 = p2;
> 

Cheers!
Frank
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-dev/attachments/20170627/3bf9c5c1/attachment.html>