4 files changed, 11 insertions, 69 deletions
diff --git a/config/macintosh/Makedefs b/config/macintosh/Makedefs
index 381b077..c8af32b 100644
--- a/config/macintosh/Makedefs
+++ b/config/macintosh/Makedefs
@@ -10,12 +10,12 @@
 #  SFLAGS   flags for stripping iconx
 
 CC = cc
-CFLAGS = -I/usr/X11R6/include
+CFLAGS = 
 CFDYN =
 RLINK = -dynamic
 RLIBS = -lm
 TLIBS =
-XLIBS = -L/usr/X11R6/lib -lX11
-XPMDEFS = -DZPIPE -I/usr/X11R6/include
+XLIBS = -L/usr/X11/lib -lX11
+XPMDEFS = -DZPIPE
 GDIR = xpm
 SFLAGS = -Sx
diff --git a/config/macintosh/define.h b/config/macintosh/define.h
index e1857dd..bf2a07e 100644
--- a/config/macintosh/define.h
+++ b/config/macintosh/define.h
@@ -3,6 +3,7 @@
  */
 
 #define UNIX 1
+#define MACINTOSH 1
 #define LoadFunc 
 
-#define NamedSemaphores	    /* unnamed sempahores not implemented by OS 10.4 */
+#define NamedSemaphores     /* unnamed sempahores not implemented by OS 10.6 */
diff --git a/config/macintosh/powerpc.s b/config/macintosh/powerpc.s
deleted file mode 100644
index 71724a6..0000000
--- a/config/macintosh/powerpc.s
+++ /dev/null
@@ -1,52 +0,0 @@
-#  coswitch(old, new, first)
-#          GPR3  GPR4  GPR5
-
-# This code is modeled after the ppc_aix context switch
-# it was compared to the Darwin context switch routine to 
-# get the syntax correct for the Apple gcc compiler.
-.macro ENTRY
-	.text
-	.align		2
-	.globl		$0
-$0:
-.endmacro
-
-	.file	"rswitch.s"
-	.set	RSIZE, 80		; room for regs 13-31, rounded up mod16
-
-	ENTRY _coswitch
-
-	stwu	r1, -RSIZE(r1)		; allocate stack frame
-
-					; Save Old Context:
-	stw	r1, 0(r3)		; SP
-	stw	r2, 4(r3)		; TOC
-	mflr	r0
-	stw	r0, 8(r3)		; LR (return address)
-	mfcr	r0
-	stw	r0, 12(r3)		; CR
-	stmw	r13, -RSIZE(r1)		; GPRs 13-31 (save on stack)
-
-	cmpi	0, r5, 0
-	beq	first			; if first time
-
-					; Restore new context:
-	lwz	r1, 0(r4)		; SP
-	lwz	r2, 4(r4)		; TOC
-	lwz	r0, 8(r4)		; LR
-	mtlr	r0		
-	lwz	r0, 12(r4)		; CR
-	mtcr	r0
-	lmw	r13, -RSIZE(r1)		; GPRs 13-31 (from stack)
-	
-	addic	r1, r1, RSIZE		; deallocate stack frame
-	blr				; return into new context
-
-first:					; First-time call:
-	lwz	r1, 0(r4)		; SP as figured by Icon
-	addic	r1, r1, -64		; save area for callee
-	addi	r3, 0, 0		; arg1
-	addi	r4, 0, 0		; arg2
-	bl	_new_context		; new_context(0,0)
-	addi	r3, 0, 0
-	bl	_syserr
diff --git a/config/macintosh/status b/config/macintosh/status
index 43dffac..a49aecc 100644
--- a/config/macintosh/status
+++ b/config/macintosh/status
@@ -1,10 +1,10 @@
 System configuration:
 
-	Apple Macintosh running OS X (10.1 or newer)
+	Apple Macintosh running MacOS X
 
 Latest Icon version:
 
-	Version 9.4.3
+	Version 9.5.0
 
 Installer:
 
@@ -26,18 +26,11 @@ Comments:
 
 	Icon runs on Darwin, which is (loosely speaking) the
 	command-line-based Unix substructure of MacOS X.  The
-	Xcode Developer Tools must be installed.  (These come
-	with MacOS on a CD that is not always installed.)
+	Xcode Developer Tools must be installed to build Icon.
 
-	An Icon installation with graphics requires the X11 window
-	system, available from Apple but not always installed.
-	To install Icon without graphics, use "make Configure"
-	instead of "make X-Configure" when building.
-
-	This configuration can use pthreads for context switching.
-
-	Tested with MacOS 10.4.3 (Tiger).
+	Tested with MacOS 10.6.3 (Snow Leopard),
+	using Xcode 3.2.1 and GCC 4.2.1.
 
 Date:
 
-	November 10, 2005
+	March 29, 2010