Removed support for Mac OS Classic platform [Patch 918139]

5 files changed, 9 insertions, 33 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 7556452..f1192fc 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.91 2004/03/04 00:07:06 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.92 2004/03/17 18:15:50 das Exp $
 
 # Current Tk version;  used in various names.
 
@@ -1133,15 +1133,6 @@ dist:   $(UNIX_DIR)/configure mklinks
 		$(DISTDIR)/win/rc
 	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/*.rc
 	$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rc/wish.exe.manifest
-	mkdir $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/tkMacProjects.sea.hqx $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.c $(TOP_DIR)/mac/*.h $(TOP_DIR)/mac/*.r \
-		$(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/README $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.pch $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.doc $(DISTDIR)/mac
-	cp -p $(TOP_DIR)/mac/*.tcl $(DISTDIR)/mac
 	mkdir $(DISTDIR)/macosx
 	cp -p $(TOP_DIR)/macosx/Makefile $(TOP_DIR)/macosx/Wish.icns \
 		$(TOP_DIR)/macosx/*.c $(TOP_DIR)/macosx/*.h \
@@ -1230,21 +1221,6 @@ allpatch: dist
 	mv $(DISTROOT)/old $(DISTROOT)/tk${VERSION}
 
 #
-# Target to create a Macintosh version of the distribution.  This will
-# do a normal distribution and then massage the output to prepare it
-# for moving to the Mac platform.  This requires a few scripts and
-# programs found only in the Tcl greoup's tool workspace.
-#
-
-macdist: dist
-	rm -f $(DISTDIR)/mac/tkMacProjects.sea.hqx
-	$(TCL_EXE) $(TOOL_DIR)/man2html.tcl $(DISTDIR)/tmp ../.. tk$(VERSION)
-	mv $(DISTDIR)/tmp/tk$(VERSION) $(DISTDIR)/html
-	rm -rf $(DISTDIR)/doc
-	rm -rf $(DISTDIR)/tmp
-	$(TCL_EXE) $(TOOL_DIR)/cvtEOL.tcl $(DISTDIR)
-
-#
 # Targets to build Solaris package of the distribution for the current
 # architecture.  To build stream packages for both sun4 and i86pc
 # architectures: 
diff --git a/unix/README b/unix/README
index 2fbbe79..85c1d3e 100644
--- a/unix/README
+++ b/unix/README
@@ -18,9 +18,9 @@ changes on any UNIX-like system that approximates POSIX, BSD, or System
 V.  We know that it runs on workstations from Sun, H-P, DEC, IBM, and
 SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
 a PC running Windows, see the README file in the directory ../win.  To
-compile for a Macintosh, see the README file in the directory ../mac.
+compile for MacOSX, see the README file in the directory ../macosx.
 
-RCS: @(#) $Id: README,v 1.20 2003/03/04 23:50:44 dgp Exp $
+RCS: @(#) $Id: README,v 1.21 2004/03/17 18:15:50 das Exp $
 
 How To Compile And Install Tk:
 ------------------------------
diff --git a/unix/tk.spec b/unix/tk.spec
index 6fe28fe..0136981 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,4 +1,4 @@
-# $Id: tk.spec,v 1.17 2004/03/02 00:49:13 hobbs Exp $
+# $Id: tk.spec,v 1.18 2004/03/17 18:15:50 das Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
 %define version 8.5a1
@@ -21,7 +21,7 @@ The Tcl (Tool Command Language) provides a powerful platform for
 creating integration applications that tie together diverse
 applications, protocols, devices, and frameworks.  When paired with
 the Tk toolkit, Tcl provides the fastest and most powerful way to
-create GUI applications that run on PCs, Unix, and the Macintosh.  Tcl
+create GUI applications that run on PCs, Unix, and Mac OS X.  Tcl
 can also be used for a variety of web-related tasks and for creating
 powerful command languages for applications.
 
diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c
index 9d7bab5..940d1bd 100644
--- a/unix/tkUnix3d.c
+++ b/unix/tkUnix3d.c
@@ -9,12 +9,12 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnix3d.c,v 1.8 2004/01/13 02:06:01 davygrvy Exp $
+ * RCS: @(#) $Id: tkUnix3d.c,v 1.9 2004/03/17 18:15:50 das Exp $
  */
 
 #include <tk3d.h>
 
-#if !(defined(__WIN32__) || defined(MAC_TCL) || defined(MAC_OSX_TK))
+#if !(defined(__WIN32__) || defined(MAC_OSX_TK))
 #include "tkUnixInt.h"
 #endif
 
diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c
index 82576bf..39a4fe5 100644
--- a/unix/tkUnixDraw.c
+++ b/unix/tkUnixDraw.c
@@ -8,13 +8,13 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixDraw.c,v 1.6 2000/07/20 21:38:28 ericm Exp $
+ * RCS: @(#) $Id: tkUnixDraw.c,v 1.7 2004/03/17 18:15:50 das Exp $
  */
 
 #include "tkPort.h"
 #include "tkInt.h"
 
-#if !defined(__WIN32__) && !defined(MAC_TCL)
+#if !defined(__WIN32__)
 #include "tkUnixInt.h"
 #endif