Skip to content
Permalink
Browse files

libkml: conflicts with minizip

libkml builds and installs a copy of minizip that conflicts with the
MacPorts copy.

Also modernise checksums and add GitHub handle to maintainers.
  • Loading branch information
ryandesign committed Apr 28, 2019
1 parent a4ceae8 commit 92a5ffd5d6079a4be46da18b2cfa3c0b48182d8f
Showing with 16 additions and 7 deletions.
  1. +7 −2 archivers/zlib/Portfile
  2. +9 −5 gis/libkml/Portfile
@@ -6,7 +6,7 @@ PortGroup xcodeversion 1.0
name zlib
version 1.2.11
categories archivers
maintainers ryandesign openmaintainer
maintainers {ryandesign @ryandesign} openmaintainer
license zlib
homepage http://www.zlib.net/
platforms darwin freebsd
@@ -22,7 +22,8 @@ master_sites ${homepage}
use_xz yes

checksums rmd160 3f3ecd35efa6d41ba7b90e5f6e872e2ee8e42044 \
sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066
sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 \
size 467960

minimum_xcodeversions {8 2.4.1 9 3.1}

@@ -35,6 +36,8 @@ test.run yes
destroot.destdir prefix=${destroot}${prefix}

if {${name} eq ${subport}} {
revision 0

post-destroot {
platform darwin {
foreach {neededfile} "${prefix}/lib/libz.dylib" {
@@ -60,6 +63,8 @@ livecheck.url ${homepage}
livecheck.regex ${name}-(\[0-9.\]+)\\.tar

subport minizip {
revision 0
conflicts libkml

description Minizip zip file manipulation library
long_description ${description}
@@ -1,14 +1,15 @@
# -*- 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 conflicts_build 1.0

name libkml
version 1.2.0
revision 4
license BSD
platforms darwin
categories gis
maintainers ryandesign openmaintainer
maintainers {ryandesign @ryandesign} openmaintainer

description library to parse, generate and operate on KML

@@ -24,9 +25,9 @@ master_sites googlecode
# https://github.com/CPB9/libkml
# https://github.com/libkml/libkml

checksums md5 25d534437f971bf55a945608e39fea79 \
sha1 3fa5acdc2b2185d7f0316d205002b7162f079894 \
rmd160 f73ed3ce47d38c5d45bd04c9498a847b24c572da
checksums rmd160 f73ed3ce47d38c5d45bd04c9498a847b24c572da \
sha256 fae9085e4cd9f0d4ae0d0626be7acf4ad5cbb37991b9d886df29daf72df37cbc \
size 9041987

# 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.
@@ -52,6 +53,9 @@ post-patch {
}
}

conflicts minizip
conflicts_build minizip

use_autoreconf yes

configure.args-append --disable-dependency-tracking \
@@ -66,7 +70,7 @@ test.target check
post-destroot {
set docdir ${prefix}/share/doc/${subport}
xinstall -d ${destroot}${docdir}
xinstall -W ${worksrcpath} -m 644 \
xinstall -W ${worksrcpath} -m 0644 \
AUTHORS \
COPYING \
ChangeLog \

0 comments on commit 92a5ffd

Please sign in to comment.
You can’t perform that action at this time.