Ticket #16378: Portfile.2.diff

File Portfile.2.diff, 5.5 KB (added by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez), 9 years ago)
  • Portfile

    old new  
    33PortSystem 1.0
    44
    55name                    boost
    6 version                 1.35.0
    7 revision                2
     6version                 1.36.0
    87categories              devel
    9 maintainers             sanchom@gmail.com
     8maintainers             gmail.com:sanchom
    109description             Collection of portable C++ source libraries
    1110long_description        Boost provides free portable peer-reviewed C++ \
    1211                        libraries. The emphasis is on portable libraries \
     
    1514master_sites            sourceforge
    1615distname                ${name}_[strsed ${version} {g/[.]/_/}]
    1716use_bzip2               yes
    18 checksums               md5 dce952a7214e72d6597516bcac84048b
     17checksums               md5 328bfec66c312150e4c2a78dcecb504b \
     18                        sha1 b8f0f5d90b260aff995ef38fad4eee5e73d00810 \
     19                        rmd160 0ac38ee3c355c22fd5534bc806bf516890e5182d
    1920platforms               darwin
    2021use_parallel_build      yes
    2122
    22 patchfiles              patch-tools-build-v2-tools-darwin.jam \
    23                         patch-boost-serialization-utility.hpp \
    24                         patch-configure
     23patchfiles              patch-configure
    2524
    2625depends_build           bin:bjam:boost-jam
     26depends_lib             port:zlib port:bzip2
     27
     28build.env-append        BZIP2_INCLUDE=${prefix}/include BZIP2_LIBPATH=${prefix}/lib \
     29                        ZLIB_INCLUDE=${prefix}/include ZLIB_LIBPATH=${prefix}/lib
     30destroot.env-append     BZIP2_INCLUDE=${prefix}/include BZIP2_LIBPATH=${prefix}/lib \
     31                        ZLIB_INCLUDE=${prefix}/include ZLIB_LIBPATH=${prefix}/lib
    2732
    2833platform darwin 9 {
    2934        depends_build-append    port:gmake
     
    3439        post-destroot {
    3540
    3641                # get the library version as it shows up in the library names:
    37                 # eg. 1_35
    38                 # this should be ...] 0 2] {_}] when 1_35_1 and later come out
     42                # eg. 1_36
     43                # this should be ...] 0 2] {_}] when 1_36_1 and later come out
    3944                set libver [join [lrange [split ${version} {.}] 0 1] {_}]
    4045               
    4146                # ensure the identification name of the dynamic libraries agree
     
    5358                        foreach lib2 [glob -directory ${destroot}${prefix}/lib/ *-${libver}.dylib] {
    5459                                system "install_name_tool -change ${libtail} ${installed_name} ${lib2}"
    5560                        }
     61                        if { [variant_isset openmpi] && ( [variant_isset python24] || [variant_isset python25] || [variant_isset python26] ) } {
     62                                system "install_name_tool -change ${libtail} ${installed_name} ${destroot}${prefix}/lib/mpi.so"
     63                        }
    5664                }
    5765
    5866                # create relative symbolic links to the versioned libraries (.dylib only;
     
    8997                }
    9098               
    9199                # create a symbolic link in the include directory pointing to the current
    92                 # version of the boost include directory (e.g. boost-1_35/boost -> include/boost)
     100                # version of the boost include directory (e.g. boost-1_36/boost -> include/boost)
    93101                system "cd  ${destroot}${prefix}/lib; ln -fs boost-${libver}/boost ${destroot}${prefix}/include/boost"
     102               
     103                if { [variant_isset openmpi] && ( [variant_isset python24] || [variant_isset python25] || [variant_isset python26] ) } {
     104                        if { [variant_isset python24] } {
     105                                set spkg ${prefix}/lib/python2.4/site-packages
     106                        } elseif { [variant_isset python25] } {
     107                                set spkg ${prefix}/lib/python2.5/site-packages
     108                        } elseif { [variant_isset python26] } {
     109                                # Can be removed once MacPorts 1.7.0 is released
     110                                if {![info exists frameworks_dir]} {
     111                                        set frameworks_dir ${prefix}/Library/Frameworks
     112                                }
     113                                set spkg ${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/site-packages
     114                        }
     115                       
     116                        xinstall -m 755 -d ${destroot}${spkg}
     117                        system "mv ${destroot}${prefix}/lib/mpi.so ${destroot}${spkg}"
     118                        system "install_name_tool -id ${spkg}/mpi.so ${destroot}${spkg}/mpi.so"                 
     119                }
    94120        }
    95121}
    96122
    97 destroot.args           PREFIX=${destroot}${prefix} EPREFIX=${destroot}${prefix} \
    98                         LIBDIR=${destroot}${prefix}/lib INCLUDEDIR=${destroot}${prefix}/include \
    99                         install
     123destroot.destdir        prefix=${destroot}${prefix}
    100124
    101125configure.args          --without-libraries=python --without-icu --with-bjam=${prefix}/bin/bjam
    102126
    103 variant python24 conflicts python25 {
     127variant python24 conflicts python25 python26 {
    104128        set pyversion           2.4
    105         depends_lib-append      lib:libpython${pyversion}:python[strsed ${pyversion} {g/[.]//}]
     129        depends_lib-append      port:python[strsed ${pyversion} {g/[.]//}]
     130
     131        configure.python        ${prefix}/bin/python${pyversion}
    106132
    107133        configure.args-delete   --without-libraries=python
    108         configure.args-append   --with-python=python${pyversion}
    109134}
    110135
    111 variant python25 conflicts python24 {
     136variant python25 conflicts python24 python26 {
    112137        set pyversion           2.5
    113         depends_lib-append      lib:libpython${pyversion}:python[strsed ${pyversion} {g/[.]//}]
     138        depends_lib-append      port:python[strsed ${pyversion} {g/[.]//}]
     139
     140        configure.python        ${prefix}/bin/python${pyversion}
     141
     142        configure.args-delete   --without-libraries=python
     143}
     144
     145variant python26 conflicts python24 python25 {
     146        set pyversion           2.6
     147        depends_lib-append      port:python[strsed ${pyversion} {g/[.]//}]
     148
     149        configure.python        ${prefix}/bin/python${pyversion}
    114150
    115151        configure.args-delete   --without-libraries=python
    116         configure.args-append   --with-python=python${pyversion}
    117152}
    118153
    119154variant icu {
     
    128163
    129164        configure.env-append    EXPAT_INCLUDE=${prefix}/include EXPAT_LIBPATH=${prefix}/lib
    130165        build.env-append            EXPAT_INCLUDE=${prefix}/include EXPAT_LIBPATH=${prefix}/lib
     166        destroot.env-append         EXPAT_INCLUDE=${prefix}/include EXPAT_LIBPATH=${prefix}/lib
    131167}
    132168
    133169variant openmpi {
     
    153189    }
    154190}
    155191
    156 # Should no longer conflict with icu in version 1.35.1, see:
    157 # http://svn.boost.org/trac/boost/ticket/1928
    158 variant complete conflicts icu description {Build all library types (debug, static, single-threaded)} {
     192variant complete description {Build all library types (debug, static, single-threaded)} {
    159193    patchfiles-append   patch-build-type-Jamroot
    160194}