Changeset 153562 for trunk/dports/kde


Ignore:
Timestamp:
Oct 4, 2016, 1:59:59 PM (2 years ago)
Author:
nicos@…
Message:

kdepimlibs4: reinstate internal gpgpme++ from kdepimlibs4 for dependents, removed in r153292. Move headers away to avoid conflict with gpgme

Location:
trunk/dports/kde/kdepimlibs4
Files:
3 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/kde/kdepimlibs4/Portfile

    r153292 r153562  
    77name                kdepimlibs4
    88version             4.14.3
    9 revision            4
     9revision            5
    1010categories          kde kde4
    1111maintainers         nicos
     
    4242
    4343#Suppress build of kioslaves which conflict with openssl
    44 patchfiles-append   patch-CMakeLists.diff \
    45                     patch-gpgme.diff \
    46                     patch-qgpgme.diff \
    47                     patch-testqgpgme.diff
     44patchfiles-append   patch-CMakeLists.diff
    4845
    4946configure.args-append   -DMAILTRANSPORT_INPROCESS_SMTP=Off
     
    5148pre-configure {
    5249    #Deactivating gpgme++ to avoid conflict with gpgme port
    53     reinplace "s|add_subdirectory(gpgme++)|#add_subdirectory(gpgme++)|g" \
    54         ${worksrcpath}/CMakeLists.txt
    55     reinplace "s|%PREFIX%|${prefix}/lib|g" \
    56         ${worksrcpath}/qgpgme/CMakeLists.txt
    57     reinplace "s|%PREFIX%|${prefix}/lib|g" \
    58         ${worksrcpath}/qgpgme/tests/CMakeLists.txt
     50    reinplace "s|%PREFIX%|${prefix}|g" \
     51        ${worksrcpath}/gpgme++/CMakeLists.txt
    5952}
    6053
     
    6457        && [vercmp [lindex $vers 1] 4.12.0] < 0} {
    6558            registry_deactivate_composite kdepim4-runtime "" [list ports_nodepcheck 1]
     59    }
     60}
     61
     62post-destroot {
     63    #Move headers only in case of main port
     64    if {${subport} eq ${name}} {
     65        #Move internal gpgme headers out of the way
     66        file mkdir ${destroot}${prefix}/include/KDE4
     67        move ${destroot}${prefix}/include/gpgme++ \
     68            ${destroot}${prefix}/include/KDE4/gpgme++
    6669    }
    6770}
Note: See TracChangeset for help on using the changeset viewer.