ares, boost, expat, freetype archives updated to latest builds.

5 files changed, 24 insertions, 24 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 5851fc3221..17bb0e91ce 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -138,9 +138,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>577e89e72a6df485ee0c42ef7bfd8c34</string>
+              <string>e6caaeea16131e1f2343ecd7765e3147</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-darwin-20101004.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ares/rev/220963/arch/Darwin/installer/ares-1.7.1-darwin-20110217.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -186,9 +186,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3a8b4bc2ea3dde26c2a7e1481f039864</string>
+              <string>d98078791ce345bf6168ce9ba53ca2d7</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20101004.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/222752/arch/Darwin/installer/boost-1.45.0-darwin-20110304.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -354,9 +354,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>594e0d61d115ab06ca11bc84d374d23a</string>
+              <string>180e03d0be1f1acfc3244e78742d7bef</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/expat-1.95.8-darwin-20101004.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-expat/rev/221695/arch/Darwin/installer/expat-2.0.1-darwin-20110218.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -498,9 +498,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>753021e66345612b4fc77c711b426f11</string>
+              <string>3e7e133f1fa61d9acabdf01f5494209e</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-darwin-20101004.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/222716/arch/Darwin/installer/freetype-2.4.4-darwin-20110304.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
diff --git a/indra/cmake/APR.cmake b/indra/cmake/APR.cmake
index 5b31b0d237..daafa00fe2 100644
--- a/indra/cmake/APR.cmake
+++ b/indra/cmake/APR.cmake
@@ -32,8 +32,8 @@ else (STANDALONE)
       )
   elseif (DARWIN)
     if (LLCOMMON_LINK_SHARED)
-      set(APR_selector     "0.3.7.dylib")
-      set(APRUTIL_selector "0.3.8.dylib")
+      set(APR_selector     "0.dylib")
+      set(APRUTIL_selector "0.dylib")
     else (LLCOMMON_LINK_SHARED)
       set(APR_selector     "a")
       set(APRUTIL_selector "a")
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index b9c047a764..67dc9f0891 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -50,11 +50,11 @@ else (STANDALONE)
           debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})    
     endif (MSVC80)
   elseif (DARWIN)
-    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-xgcc40-mt)
-    set(BOOST_REGEX_LIBRARY boost_regex-xgcc40-mt)
-    set(BOOST_SIGNALS_LIBRARY boost_signals-xgcc40-mt)
-    set(BOOST_SYSTEM_LIBRARY boost_system-xgcc40-mt)
-    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-xgcc40-mt)
+    set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
+    set(BOOST_REGEX_LIBRARY boost_regex)
+#    set(BOOST_SIGNALS_LIBRARY boost_signals)
+    set(BOOST_SYSTEM_LIBRARY boost_system)
+    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
   elseif (LINUX)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-gcc41-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-gcc41-mt)
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 0c65229afc..43b0347aa9 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -200,11 +200,11 @@ elseif(DARWIN)
        )
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
-        libapr-1.0.3.7.dylib
+        libapr-1.0.dylib
         libapr-1.dylib
-        libaprutil-1.0.3.8.dylib
+        libaprutil-1.0.dylib
         libaprutil-1.dylib
-        libexpat.0.5.0.dylib
+        libexpat.1.5.2.dylib
         libexpat.dylib
         libllqtwebkit.dylib
         libndofdev.dylib
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3e09b9daa0..9be3aa709b 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -636,9 +636,9 @@ class DarwinManifest(ViewerManifest):
                     dylibs[lib] = True
 
                 if dylibs["llcommon"]:
-                    for libfile in ("libapr-1.0.3.7.dylib",
-                                    "libaprutil-1.0.3.8.dylib",
-                                    "libexpat.0.5.0.dylib",
+                    for libfile in ("libapr-1.0.dylib",
+                                    "libaprutil-1.0.dylib",
+                                    "libexpat.1.5.2.dylib",
                                     "libexception_handler.dylib",
                                     ):
                         self.path(os.path.join(libdir, libfile), libfile)
@@ -667,9 +667,9 @@ class DarwinManifest(ViewerManifest):
                     mac_updater_res_path = self.dst_path_of("mac-updater.app/Contents/Resources")
                     slplugin_res_path = self.dst_path_of("SLPlugin.app/Contents/Resources")
                     for libfile in ("libllcommon.dylib",
-                                    "libapr-1.0.3.7.dylib",
-                                    "libaprutil-1.0.3.8.dylib",
-                                    "libexpat.0.5.0.dylib",
+                                    "libapr-1.0.dylib",
+                                    "libaprutil-1.0.dylib",
+                                    "libexpat.1.5.2.dylib",
                                     "libexception_handler.dylib",
                                     ):
                         target_lib = os.path.join('../../..', libfile)