Changeset 45074


Ignore:
Timestamp:
Jan 8, 2009, 7:07:36 AM (10 years ago)
Author:
blb@…
Message:

Multiple ports - work with either libtool 1.x or libtool 2.x installed,
ticket #17833 (maintainer timeout)

Location:
trunk/dports
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/archivers/arj/Portfile

    r33435 r45074  
    1818
    1919post-extract {
    20     copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}/${autoconf.dir}
     20    if {[file exists ${prefix}/share/libtool/config/config.guess]} {
     21        copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}/${autoconf.dir}
     22    } else {
     23        copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}/${autoconf.dir}
     24    }
    2125}
    2226
  • trunk/dports/comms/gnokii/Portfile

    r26898 r45074  
    1818
    1919depends_lib             lib:gtk.1:gtk1 \
    20                         path:${prefix}/share/libtool/ltmain.sh:libtool
     20                        port:libtool
    2121
    2222configure.args          --disable-shared --disable-nls -enable-security
     
    3030platform darwin {
    3131  post-extract {
    32     file copy           -force ${prefix}/share/libtool/ltmain.sh ${worksrcpath}/config
     32    if {[file exists ${prefix}/share/libtool/config/ltmain.sh]} {
     33      file copy         -force ${prefix}/share/libtool/config/ltmain.sh ${worksrcpath}/config
     34    } else {
     35      file copy         -force ${prefix}/share/libtool/ltmain.sh ${worksrcpath}/config
     36    }
    3337  }
    3438}
  • trunk/dports/erlang/erlsom/Portfile

    r39337 r45074  
    2525
    2626post-extract {
    27     copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     27    if {[file exists ${prefix}/share/libtool/config/config.guess]} {
     28        copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
     29    } else {
     30        copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     31    }
    2832    file delete -force "${worksrcpath}/configure"
    2933}
  • trunk/dports/net/libnet/Portfile

    r34445 r45074  
    3535        depends_lib-append port:libtool
    3636        pre-configure {
    37                 copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     37                if {[file exists ${prefix}/share/libtool/config/config.guess]} {
     38                        copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
     39                } else {
     40                        copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     41                }
    3842        }
    3943}
  • trunk/dports/net/ssldump/Portfile

    r36502 r45074  
    2424patchfiles                      patch-ssl_ssldecode_c
    2525pre-configure {
    26         copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     26        if {[file exists ${prefix}/share/libtool/config/config.guess]} {
     27                copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
     28        } else {
     29                copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     30        }
    2731}
    2832configure.args          --mandir=${destroot}${prefix}/share/man \
  • trunk/dports/net/trafshow/Portfile

    r33305 r45074  
    3030fetch.password  -macports@
    3131
    32 pre-configure           {       copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     32pre-configure           {       if {[file exists ${prefix}/share/libtool/config/config.guess]} {
     33                                        copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
     34                                } else {
     35                                        copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     36                                }
    3337                        }
    3438
  • trunk/dports/print/a2ps/Portfile

    r33149 r45074  
    2323        depends_lib-append port:libtool
    2424        post-patch {
    25                 copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}/auxdir/
     25                if {[file exists ${prefix}/share/libtool/config/config.guess]} {
     26                        copy -force ${prefix}/share/libtool/config/config.guess ${prefix}/share/libtool/config/config.sub ${worksrcpath}
     27                } else {
     28                        copy -force ${prefix}/share/libtool/config.guess ${prefix}/share/libtool/config.sub ${worksrcpath}
     29                }
    2630        }
    2731}
Note: See TracChangeset for help on using the changeset viewer.