Ticket #12096: Portfile.diff

Portfile

@@ -1 @@
-# $Id: Portfile 20404 2006-11-03 02:13:21Z jberry@macports.org $
+# $Id: Portfile 20404 2007-06-09 17:39:21Z sanchom@gmail.com $
 
 PortSystem 1.0
 
 name                    boost
-version                 1.33.1
+version                 1.34.0
 categories              devel
-maintainers             nomaintainer@macports.org
+maintainers             sanchom@gmail.com
 description             Collection of portable C++ source libraries
 long_description        Boost provides free portable peer-reviewed C++ \
                         libraries. The emphasis is on portable libraries \
@@ -14 +14 @@
 master_sites            sourceforge
 distname                ${name}_[strsed ${version} {g/[.]/_/}]
 use_bzip2               yes
-checksums               md5 2b999b2fb7798e1737d1fff8fac602ef
+checksums               md5 ed5b9291ffad776f8757a916e1726ad0
 platforms               darwin
 
 depends_build           bin:bjam:boost-jam
 
-patchfiles              patch-libs-test-build-Jamfile \
-                                patch-tools-build-v1-allyourbase.jam
-
-# Note: Boost will not build properly on Jaguar (to my knowledge)
-# Additional note: MACOSX_DEPLOYMENT_TARGET of at least 10.3 necessary
-# to allow dynamic lookup at runtime, preventing libtool to fail when
-# building tests
-
 platform darwin {
-        build.env-append        MACOSX_DEPLOYMENT_TARGET=10.3
-        build.args-append       -sTOOLS=darwin
-
-        destroot.env-append     MACOSX_DEPLOYMENT_TARGET=10.3
-        destroot.args-append    -sTOOLS=darwin
         post-destroot {
                 cd ${destroot}${prefix}/lib
-                set libver [join [lrange [split ${version} {.}] 0 2] {_}]
+
+                # get the library version as it shows up in the library names:
+                # eg. 1_34
+                set libver [join [lrange [split ${version} {.}] 0 1] {_}]
+                
+                # ensure the identification name of the dynamic libraries agree
+                # with their final destination path (not the destroot path that
+                # they've just been installed to)
                 foreach lib [glob *-${libver}.dylib] {
                         system "install_name_tool -id ${prefix}/lib/${lib} ${lib}"
                 }
-                foreach lib [glob *-${libver}.a *-${libver}.dylib] {
+
+                # create relative symbolic links to the versioned libraries (.dylib only;
+                # .a were built with unversioned extensions that are duplicate files of the
+                # versioned extensions... handled next)
+                foreach lib [glob *-${libver}.dylib] {
                         set libname [join [lrange [split [file rootname ${lib}] {-}] 0 end-1] {-}]
                         set libext [file extension ${lib}]
                         set liblink "${libname}${libext}"
@@ -50 +48 @@
                         }
                         system "ln -s ${lib} ${liblink}"
                 }
-        }
-}
 
-use_configure           no
-
-build.cmd               bjam
-build.pre_args          --prefix=${prefix}
-build.args              --without-python \
-                                -sgPYTHON_CONFIG_CHECKED=true \
-                                -sgNO_PYTHON_INSTALL=true
-
-destroot.cmd            bjam
-destroot.pre_args       --prefix=${destroot}${prefix}
-destroot.args           --without-python \
-                                -sgPYTHON_CONFIG_CHECKED=true \
-                                -sgNO_PYTHON_INSTALL=true
-destroot.post_args      install
-post-destroot {
-        set incdirver [join [lrange [split ${version} {.}] 0 2] {_}]
-        system "ln -fs boost-${incdirver}/boost ${destroot}${prefix}/include/boost"
+                # change the duplicated non-version-named .a libraries to
+                # symbolic links to the version-named .a libraries
+                foreach lib [glob *-${libver}.a] {
+                        set libname [join [lrange [split [file rootname ${lib}] {-}] 0 end-1] {-}]
+                        set libext [file extension ${lib}]
+                        set liblink "${libname}${libext}"
+                        # if this file is around, it is a duplicate, delete it
+                        if {[file exists ${liblink}]} {
+                                file delete -force ${liblink}
+                        }
+                        # add a symbolic link instead
+                        system "ln -s ${lib} ${liblink}"
+                }
+        }
 }
 
-variant icu {
-        depends_lib             lib:libicuuc:icu
-
-        build.args-append       -sHAVE_ICU=1 \
-                                        -sICU_PATH=${prefix}
+destroot.args           PREFIX=${destroot}${prefix} EPREFIX=${destroot}${prefix} \
+                        LIBDIR=${destroot}${prefix}/lib INCLUDEDIR=${destroot}${prefix}/include \
+                        install
 
-        destroot.args-append    -sHAVE_ICU=1 \
-                                        -sICU_PATH=${prefix}
-}
+configure.args          --without-libraries=python
 
 variant python {
-        set pyversion   2.4
-
+        set pyversion           2.4
         depends_lib             lib:libpython${pyversion}:python[strsed ${pyversion} {g/[.]//}]
 
-        build.args-delete       --without-python \
-                                        -sgPYTHON_CONFIG_CHECKED=true \
-                                        -sgNO_PYTHON_INSTALL=true
-        build.args-append       -sPYTHON_ROOT=${prefix} \
-                                        -sPYTHON_VERSION=${pyversion} \
-                                        --with-python-root=${prefix}
-
-        destroot.args-delete    --without-python \
-                                        -sgPYTHON_CONFIG_CHECKED=true \
-                                        -sgNO_PYTHON_INSTALL=true
-        destroot.args-append    -sPYTHON_ROOT=${prefix} \
-                                        -sPYTHON_VERSION=${pyversion} \
-                                        --with-python-root=${prefix}
+        configure.args-delete   --without-libraries=python
 }