7 files changed, 12 insertions, 66 deletions
diff --git a/macosx/README b/macosx/README
index 3035bc8..cd3071f 100644
--- a/macosx/README
+++ b/macosx/README
@@ -113,7 +113,7 @@ The following build configurations are available:
 The Xcode projects refer to the toplevel tcl source directory via the
 TCL_SRCROOT user build setting, by default this is set to the project-relative
 path '../../tcl', if your tcl source directory is named differently, e.g.
-'../../tcl8.7', you need to manually change the TCL_SRCROOT setting by editing
+'../../tcl9.0', you need to manually change the TCL_SRCROOT setting by editing
 your ${USER}.pbxuser file (located inside the Tcl.xcodeproj bundle directory)
 with a text editor.
 
@@ -134,9 +134,9 @@ Detailed Instructions for building with macosx/GNUmakefile
 - Unpack the Tcl source release archive.
 
 - The following instructions assume the Tcl source tree is named "tcl${ver}",
-(where ${ver} is a shell variable containing the Tcl version number e.g. '8.7').
+(where ${ver} is a shell variable containing the Tcl version number e.g. '9.0').
 Setup this shell variable as follows:
-	ver="8.7"
+	ver="9.0"
 If you are building from CVS, omit this step (CVS source tree names usually do
 not contain a version number).
 
diff --git a/macosx/Tcl-Common.xcconfig b/macosx/Tcl-Common.xcconfig
index 5193b70..84c6303 100644
--- a/macosx/Tcl-Common.xcconfig
+++ b/macosx/Tcl-Common.xcconfig
@@ -34,4 +34,4 @@ TCL_CONFIGURE_ARGS = --enable-dtrace
 TCL_LIBRARY = $(LIBDIR)/tcl$(VERSION)
 TCL_PACKAGE_PATH = "$(LIBDIR)"
 TCL_DEFS = HAVE_TCL_CONFIG_H
-VERSION = 8.7
+VERSION = 9.0
diff --git a/macosx/Tcl.xcode/project.pbxproj b/macosx/Tcl.xcode/project.pbxproj
index 0746261..fd75ac3 100644
--- a/macosx/Tcl.xcode/project.pbxproj
+++ b/macosx/Tcl.xcode/project.pbxproj
@@ -1323,7 +1323,6 @@
 				F96D3F3B08F272A8004A47F5 /* dde */,
 				F96D3F8C08F272A8004A47F5 /* history.tcl */,
 				F96D3F8D08F272A8004A47F5 /* http */,
-				F96D3F9008F272A8004A47F5 /* http1.0 */,
 				F96D3F9308F272A8004A47F5 /* init.tcl */,
 				F96D3F9408F272A8004A47F5 /* msgcat */,
 				F96D401708F272AA004A47F5 /* opt */,
@@ -1357,15 +1356,6 @@
 			path = http;
 			sourceTree = "<group>";
 		};
-		F96D3F9008F272A8004A47F5 /* http1.0 */ = {
-			isa = PBXGroup;
-			children = (
-				F96D3F9108F272A8004A47F5 /* http.tcl */,
-				F96D3F9208F272A8004A47F5 /* pkgIndex.tcl */,
-			);
-			path = http1.0;
-			sourceTree = "<group>";
-		};
 		F96D3F9408F272A8004A47F5 /* msgcat */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/macosx/Tcl.xcodeproj/project.pbxproj b/macosx/Tcl.xcodeproj/project.pbxproj
index 6bb3417..8d67cc6 100644
--- a/macosx/Tcl.xcodeproj/project.pbxproj
+++ b/macosx/Tcl.xcodeproj/project.pbxproj
@@ -1323,7 +1323,6 @@
 				F96D3F3B08F272A8004A47F5 /* dde */,
 				F96D3F8C08F272A8004A47F5 /* history.tcl */,
 				F96D3F8D08F272A8004A47F5 /* http */,
-				F96D3F9008F272A8004A47F5 /* http1.0 */,
 				F96D3F9308F272A8004A47F5 /* init.tcl */,
 				F96D3F9408F272A8004A47F5 /* msgcat */,
 				F96D401708F272AA004A47F5 /* opt */,
@@ -1357,15 +1356,6 @@
 			path = http;
 			sourceTree = "<group>";
 		};
-		F96D3F9008F272A8004A47F5 /* http1.0 */ = {
-			isa = PBXGroup;
-			children = (
-				F96D3F9108F272A8004A47F5 /* http.tcl */,
-				F96D3F9208F272A8004A47F5 /* pkgIndex.tcl */,
-			);
-			path = http1.0;
-			sourceTree = "<group>";
-		};
 		F96D3F9408F272A8004A47F5 /* msgcat */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c
index 6707ef0..57ed0b9 100644
--- a/macosx/tclMacOSXBundle.c
+++ b/macosx/tclMacOSXBundle.c
@@ -146,41 +146,6 @@ OpenResourceMap(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_MacOSXOpenBundleResources --
- *
- *	Given the bundle name for a shared library, this routine sets
- *	libraryPath to the Resources/Scripts directory in the framework
- *	package. If hasResourceFile is true, it will also open the main
- *	resource file for the bundle.
- *
- * Results:
- *	TCL_OK if the bundle could be opened, and the Scripts folder found.
- *	TCL_ERROR otherwise.
- *
- * Side effects:
- *	libraryVariableName may be set, and the resource file opened.
- *
- *----------------------------------------------------------------------
- */
-
-#if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
-#undef Tcl_MacOSXOpenBundleResources
-int
-Tcl_MacOSXOpenBundleResources(
-    Tcl_Interp *interp,
-    const char *bundleName,
-    int hasResourceFile,
-    int maxPathLen,
-    char *libraryPath)
-{
-    return Tcl_MacOSXOpenVersionedBundleResources(interp, bundleName, NULL,
-	    hasResourceFile, maxPathLen, libraryPath);
-}
-#endif
-
-/*
- *----------------------------------------------------------------------
- *
  * Tcl_MacOSXOpenVersionedBundleResources --
  *
  *	Given the bundle and version name for a shared library (version name
@@ -205,7 +170,7 @@ Tcl_MacOSXOpenVersionedBundleResources(
     const char *bundleName,
     const char *bundleVersion,
     int hasResourceFile,
-    int maxPathLen,
+    size_t maxPathLen,
     char *libraryPath)
 {
 #ifdef HAVE_COREFOUNDATION
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c
index a70a789..b1961e9 100644
--- a/macosx/tclMacOSXFCmd.c
+++ b/macosx/tclMacOSXFCmd.c
@@ -639,9 +639,10 @@ SetOSTypeFromAny(
     int result = TCL_OK;
     Tcl_DString ds;
     Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman");
+    size_t length;
 
-    string = TclGetString(objPtr);
-    Tcl_UtfToExternalDString(encoding, string, objPtr->length, &ds);
+    string = Tcl_GetStringFromObj(objPtr, &length);
+    Tcl_UtfToExternalDString(encoding, string, length, &ds);
 
     if (Tcl_DStringLength(&ds) > 4) {
 	if (interp) {
@@ -692,7 +693,7 @@ UpdateStringOfOSType(
     Tcl_Obj *objPtr)	/* OSType object whose string rep to
 				 * update. */
 {
-    const int size = TCL_UTF_MAX * 4;
+    const size_t size = TCL_UTF_MAX * 4;
     char *dst = Tcl_InitStringRep(objPtr, NULL, size);
     OSType osType = (OSType) objPtr->internalRep.wideValue;
     int written = 0;
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index d7c4d7f..15a1cd5 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -1120,7 +1120,7 @@ TclpCreateFileHandler(
     FileHandler *filePtr = LookUpFileHandler(tsdPtr, fd, NULL);
 
     if (filePtr == NULL) {
-	filePtr = (FileHandler *) ckalloc(sizeof(FileHandler));
+	filePtr = (FileHandler *) Tcl_Alloc(sizeof(FileHandler));
 	filePtr->fd = fd;
 	filePtr->readyMask = 0;
 	filePtr->nextPtr = tsdPtr->firstFileHandlerPtr;
@@ -1235,7 +1235,7 @@ TclpDeleteFileHandler(
     } else {
 	prevPtr->nextPtr = filePtr->nextPtr;
     }
-    ckfree(filePtr);
+    Tcl_Free(filePtr);
 }
 
 /*
@@ -1518,7 +1518,7 @@ QueueFileEvents(
 
 	if (filePtr->readyMask == 0) {
 	    FileHandlerEvent *fileEvPtr = (FileHandlerEvent *)
-		    ckalloc(sizeof(FileHandlerEvent));
+		    Tcl_Alloc(sizeof(FileHandlerEvent));
 
 	    fileEvPtr->header.proc = FileHandlerEventProc;
 	    fileEvPtr->fd = filePtr->fd;