adium/adium

Remove some other references to mtn, make sure we can find it even if it was installed via macports.
adium-1.5.3
2012-08-09, Thijs Alkemade
87b1e45b7cd7
Parents fff1bfac2204
Children fc01993d6f99c5d7ac1fadb847a40e2af47d
Remove some other references to mtn, make sure we can find it even if it was installed via macports.
2 files changed, 7 insertions(+), 6 deletions(-)
  • +4 -3
    Dependencies/build.sh
  • +3 -3
    Dependencies/phases/build_purple.sh
    • --- a/Dependencies/build.sh Thu Aug 09 18:57:46 2012 +0200
    +++ b/Dependencies/build.sh Thu Aug 09 19:02:43 2012 +0200
    @@ -140,7 +140,7 @@
    --libpurple-branch=[branch] : Force a secific libpurple branch
    --libpurple-only : Assume all dependencies are already built
    and start the build with libpurple itself
    - --download-libpurple : Download the libpurple mtn bootstrap db.
    + --download-libpurple : Download the libpurple Mercurial repository
    --help : This help text
    Note that explicitly setting any arch flags implies a forced reconfigure.'
    @@ -179,12 +179,13 @@
    # assert that the developer can, in fact, build libpurple. Why waste his time if he can't?
    asserttools gcc
    -asserttools mtn
    +asserttools hg
    # Ok, so we keep running into issues where MacPorts will volunteer to supply
    # dependencies that we want to build ourselves.
    -# Getting mtn's path before we export our own (safer?) path will ensure it works,
    +# Getting hg's path before we export our own (safer?) path will ensure it works,
    # even if it's being managed by MacPorts, Fink, or similar.
    +HG=`which hg`
    export PATH=$ROOTDIR/build/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:$DEVELOPER/usr/bin:$DEVELOPER/usr/sbin
    export PKG_CONFIG="$ROOTDIR/build/bin/pkg-config"
    export PKG_CONFIG_PATH="$ROOTDIR/build/lib/pkgconfig:/usr/lib/pkgconfig"
    --- a/Dependencies/phases/build_purple.sh Thu Aug 09 18:57:46 2012 +0200
    +++ b/Dependencies/phases/build_purple.sh Thu Aug 09 19:02:43 2012 +0200
    @@ -26,12 +26,12 @@
    if [ -d "libpurple" ]; then
    status "Pulling latest changes to libpurple"
    cd "libpurple"
    - hg pull
    + $HG pull
    status "Updating libpurple with ${HG_UPDATE_PARAM}"
    - hg update ${HG_UPDATE_PARAM}
    + $HG update ${HG_UPDATE_PARAM}
    else
    - hg clone -b adium "http://hg.adium.im/libpurple/" libpurple
    + $HG clone -b adium "http://hg.adium.im/libpurple/" libpurple
    fi
    quiet popd