From 2b35e02bb719c3f796a1c40017e08574d0ea1fa1 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Fri, 20 Jul 2007 23:32:11 +0000
Subject: [PATCH] Mac: changes for libcurl 7.16.4

svn path=/trunk/boinc/; revision=13205
---
 checkin_notes                             | 11 +++++++++++
 mac_build/HowToBuildBOINC_XCode.rtf       |  4 ++--
 mac_build/boinc.xcodeproj/project.pbxproj |  4 ++--
 mac_build/buildcurl.sh                    | 10 +++++-----
 mac_build/setupForBOINC.sh                |  8 ++++----
 5 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index a68d07e934..a337555717 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -7426,3 +7426,14 @@ David  20 July 2007
 
     tools/
         update_versions
+
+Charlie 20 July 2007
+    Mac: changes for libcurl 7.16.4.
+
+    mac_build/
+        boinc.xcodeproj/
+            project.pbxproj
+        buildcurl.sh
+        setupForBoinc.sh
+        HowToBuildBOINC_XCode.rtf
+        
diff --git a/mac_build/HowToBuildBOINC_XCode.rtf b/mac_build/HowToBuildBOINC_XCode.rtf
index 15e21e52f7..33d70e9f8c 100644
--- a/mac_build/HowToBuildBOINC_XCode.rtf
+++ b/mac_build/HowToBuildBOINC_XCode.rtf
@@ -11,7 +11,7 @@
 \f1\b0\fs24 \cf0 \
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\qc
 \cf0 Written by Charlie Fenton\
-Last updated 5/22/07\
+Last updated 7/20/07\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
 \cf0 \
 This document applies to BOINC version 5.9.6 and later.  It has instructions for building BOINC for Macintosh OSX, plus information for building science project applications to run under BOINC on Macintosh OSX.  \
@@ -120,7 +120,7 @@ curl-7.16.1:\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
 \f2\fs26 \cf0 	{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se"}}{\fldrslt http://curl.haxx.se}}\
-	{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.16.1.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.16.1.tar.gz}}\
+	{\field{\*\fldinst{HYPERLINK "http://curl.haxx.se/download/curl-7.16.4.tar.gz"}}{\fldrslt http://curl.haxx.se/download/curl-7.16.4.tar.gz}}\
 \pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural\pardirnatural
 
 \f1\fs24 \cf0 \
diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj
index a21c681fa9..00380891c8 100755
--- a/mac_build/boinc.xcodeproj/project.pbxproj
+++ b/mac_build/boinc.xcodeproj/project.pbxproj
@@ -4839,7 +4839,7 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
-				HEADER_SEARCH_PATHS = "../../curl-7.16.1/include";
+				HEADER_SEARCH_PATHS = "../../curl-7.16.4/include";
 				INSTALL_PATH = "";
 				LIBRARY_SEARCH_PATHS = "";
 				MACOSX_DEPLOYMENT_TARGET = 10.4;
@@ -4854,7 +4854,7 @@
 				OTHER_CFLAGS_ppc = "-DMAC_OS_X_VERSION_MAX_ALLOWED=1030 -D_THREAD_SAFE -D__WXMAC -include ../clientgui/mac/config.h";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = (
-					"../../curl-7.16.1/lib/.libs/libcurl.a",
+					"../../curl-7.16.4/lib/.libs/libcurl.a",
 					"-lcrypto",
 					"-lssl",
 					"-lz",
diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh
index cd6406924a..27c1e9d641 100644
--- a/mac_build/buildcurl.sh
+++ b/mac_build/buildcurl.sh
@@ -20,14 +20,14 @@
 # 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 #
-# Script to build Macintosh Universal Binary library of curl-7.16.1 for
+# Script to build Macintosh Universal Binary library of curl-7.16.4 for
 # use in building BOINC.
 #
 # by Charlie Fenton 7/21/06
-# Updated for curl-7.16.1 3/8/07
+# Updated for curl-7.16.4 7/20/07
 #
-## In Terminal, CD to the curl-7.16.1 directory.
-##     cd [path]/curl-7.16.1/
+## In Terminal, CD to the curl-7.16.4 directory.
+##     cd [path]/curl-7.16.4/
 ## then run this script:
 ##     source buildcurl.sh [ -clean ]
 ##
@@ -37,7 +37,7 @@
 if [ "$1" != "-clean" ]; then
   if [ -f lib/.libs/libcurl_ppc.a ] && [ -f lib/.libs/libcurl_i386.a ] && [ -f lib/.libs/libcurl.a ]; then
     
-    echo "curl-7.16.1 already built"
+    echo "curl-7.16.4 already built"
     return 0
   fi
 fi
diff --git a/mac_build/setupForBOINC.sh b/mac_build/setupForBOINC.sh
index ec4077f390..13aeead92e 100644
--- a/mac_build/setupForBOINC.sh
+++ b/mac_build/setupForBOINC.sh
@@ -21,10 +21,10 @@
 #
 #
 # Master script to build Universal Binary libraries needed by BOINC:
-# curl-7.16.1, jpeg-6b and wxMac-2.6.3
+# curl-7.16.4, jpeg-6b and wxMac-2.6.3
 #
 # by Charlie Fenton 7/21/06
-# Updated for curl-7.16.1 and wx-Mac 2.6.3 5/22/07
+# Updated for curl-7.16.4 7/20/07
 #
 # Download these three packages and place them in a common parent 
 # directory with the BOINC source tree.
@@ -49,13 +49,13 @@ fi
 
 echo ""
 echo "----------------------------------"
-echo "------- BUILD CURL-7.16.1 --------"
+echo "------- BUILD CURL-7.16.4 --------"
 echo "----------------------------------"
 echo ""
 
 SCRIPT_DIR=`pwd`
 
-cd ../../curl-7.16.1/
+cd ../../curl-7.16.4/
 if [  $? -ne 0 ]; then return 1; fi
 source "${SCRIPT_DIR}/buildcurl.sh" ${doclean}
 if [  $? -ne 0 ]; then return 1; fi