<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/92a5ffd5d6079a4be46da18b2cfa3c0b48182d8f">https://github.com/macports/macports-ports/commit/92a5ffd5d6079a4be46da18b2cfa3c0b48182d8f</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 92a5ffd libkml: conflicts with minizip
</span>92a5ffd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 92a5ffd5d6079a4be46da18b2cfa3c0b48182d8f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Apr 28 09:29:25 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> libkml: conflicts with minizip
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> libkml builds and installs a copy of minizip that conflicts with the
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts copy.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also modernise checksums and add GitHub handle to maintainers.
</span>---
archivers/zlib/Portfile | 9 +++++++--
gis/libkml/Portfile | 14 +++++++++-----
2 files changed, 16 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/Portfile b/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84c2296..30cbaef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup xcodeversion 1.0
</span> name zlib
version 1.2.11
categories archivers
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span> license zlib
homepage http://www.zlib.net/
platforms darwin freebsd
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,8 @@ master_sites ${homepage}
</span> use_xz yes
checksums rmd160 3f3ecd35efa6d41ba7b90e5f6e872e2ee8e42044 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 467960
</span>
minimum_xcodeversions {8 2.4.1 9 3.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +36,8 @@ test.run yes
</span> destroot.destdir prefix=${destroot}${prefix}
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
platform darwin {
foreach {neededfile} "${prefix}/lib/libz.dylib" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +63,8 @@ livecheck.url ${homepage}
</span> livecheck.regex ${name}-(\[0-9.\]+)\\.tar
subport minizip {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts libkml
</span>
description Minizip zip file manipulation library
long_description ${description}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/libkml/Portfile b/gis/libkml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d32cb49..1cd9438 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/libkml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/libkml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span> # -*- 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
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span>
name libkml
version 1.2.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +9,7 @@ revision 4
</span> license BSD
platforms darwin
categories gis
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers ryandesign openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {ryandesign @ryandesign} openmaintainer
</span>
description library to parse, generate and operate on KML
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +25,9 @@ master_sites googlecode
</span> # https://github.com/CPB9/libkml
# https://github.com/libkml/libkml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 25d534437f971bf55a945608e39fea79 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 3fa5acdc2b2185d7f0316d205002b7162f079894 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f73ed3ce47d38c5d45bd04c9498a847b24c572da
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f73ed3ce47d38c5d45bd04c9498a847b24c572da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fae9085e4cd9f0d4ae0d0626be7acf4ad5cbb37991b9d886df29daf72df37cbc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9041987
</span>
# If curl is found, the networking examples will be built. There is no
# configure flag to turn this off, but the examples are not installed.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +53,9 @@ post-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts minizip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build minizip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_autoreconf yes
configure.args-append --disable-dependency-tracking \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +70,7 @@ test.target check
</span> post-destroot {
set docdir ${prefix}/share/doc/${subport}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${worksrcpath} -m 644 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -W ${worksrcpath} -m 0644 \
</span> AUTHORS \
COPYING \
ChangeLog \
</pre><pre style='margin:0'>
</pre>