Changeset 136039


Ignore:
Timestamp:
May 10, 2015, 5:07:04 PM (4 years ago)
Author:
ryandesign@…
Message:

libkml: use the liburiparser installed by the uriparser port rather than installing a conflicting copy (#41271)

Location:
trunk/dports
Files:
2 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/devel/uriparser/Portfile

    r136031 r136039  
     1# -*- 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
    12# $Id$
    23
     
    45
    56name            uriparser
    6 conflicts       libkml
    77version         0.8.2
     8revision        1
    89categories      devel www
    910maintainers     ryandesign openmaintainer
     
    3031test.target     check
    3132
     33# Needed by libkml's build system.
     34destroot.delete_la_files no
     35
     36pre-activate {
     37    # libkml @1.2.0_1 and earlier installed a copy of liburiparser.dylib.
     38    if {![catch {set installed [lindex [registry_active libkml] 0]}]} {
     39        set _version [lindex $installed 1]
     40        set _revision [lindex $installed 2]
     41        if {[vercmp $_version 1.2.0] < 0 || ([vercmp $_version 1.2.0] == 0 && $_revision <= 1)} {
     42            registry_deactivate_composite libkml "" [list ports_nodepcheck 1]
     43        }
     44    }
     45}
     46
    3247livecheck.regex /${name}-(\[0-9.\]+)${extract.suffix}
  • trunk/dports/gis/libkml/Portfile

    r113175 r136039  
    55
    66name                    libkml
    7 conflicts               uriparser
    87version                 1.2.0
    9 revision                1
     8revision                2
    109license                 BSD
    1110platforms               darwin
     
    2221master_sites            googlecode
    2322
     23# Development might move to one of these forks:
     24# https://github.com/google/libkml
     25# https://github.com/CPB9/libkml
     26# https://github.com/libkml/libkml
     27
    2428checksums               md5     25d534437f971bf55a945608e39fea79 \
    2529                        sha1    3fa5acdc2b2185d7f0316d205002b7162f079894 \
    2630                        rmd160  f73ed3ce47d38c5d45bd04c9498a847b24c572da
    2731
    28 # Not sure what needs cURL, but the configure script looks for it
    29 depends_build-append    port:curl
     32# If curl is found, the networking examples will be built. There is no
     33# configure flag to turn this off, but the examples are not installed.
     34#depends_build-append    port:curl
    3035
    3136depends_lib-append      port:expat \
     37                        port:uriparser \
    3238                        port:zlib
    3339
    34 patchfiles              patch-src_kml_base_file_posix.cc.diff
     40patchfiles              patch-configure.ac.diff \
     41                        patch-support-external-liburiparse-and-boost.diff
    3542
    3643post-patch {
     
    3845    fs-traverse f ${worksrcpath} {
    3946        switch [file tail ${f}] {
    40             Makefile.in {
     47            Makefile.am {
    4148                reinplace "s| -Werror||g" ${f}
    4249            }
     
    4552}
    4653
    47 # Otherwise SWIG will be used if it's installed
    48 configure.args-append   --disable-swig
     54use_autoreconf          yes
     55
     56configure.args-append   --disable-dependency-tracking \
     57                        --disable-silent-rules \
     58                        --disable-swig \
     59                        --with-liburiparser=${prefix} \
     60                        --without-boost
    4961
    5062test.run                yes
     
    5264
    5365post-destroot {
    54     set docdir ${destroot}${prefix}/share/doc/${name}
    55     xinstall -d ${docdir}
     66    set docdir ${prefix}/share/doc/${subport}
     67    xinstall -d ${destroot}${docdir}
    5668    xinstall -W ${worksrcpath} -m 644 \
    5769        AUTHORS \
     
    6072        NEWS \
    6173        README \
    62         ${docdir}
     74        ${destroot}${docdir}
    6375}
Note: See TracChangeset for help on using the changeset viewer.