Changes for Mac OS X. Most important is stack sizes in samterm,

which were completely bogus.  (Libthread used to ignore them but
not anymore.  Maybe we really should ignore them, but that breaks
Venti, which needs *really* big stacks.)

src/cmd/rm.c

@@ -6,7 +6,7 @@
 char	errbuf[ERRMAX];
 int	ignerr = 0;
 
-void
+static void
 err(char *f)
 {
 	if(!ignerr){

src/cmd/sam/sam.h

@@ -16,6 +16,7 @@
 #define	TRUE		1
 #define	FALSE		0
 
+#undef INFINITY	/* Darwin declares this as HUGE_VAL */
 #define	INFINITY	0x7FFFFFFFL
 #define	INCR		25
 #define	STRSIZE		(2*BLOCKSIZE)

src/cmd/samterm/mkfile

@@ -25,6 +25,6 @@ CFLAGS=$CFLAGS -I../sam
 LDFLAGS=$LDFLAGS -lframe -ldraw -lthread -l9 -lregexp9 \
 	-lbio -lfmt -lutf -L$X11/lib -lX11 -lm
 
-o.samterm: $PLAN9/lib/libdraw.a
+o.samterm: $PLAN9/lib/libframe.a $PLAN9/lib/libdraw.a $PLAN9/lib/libthread.a
 
 <$PLAN9/src/mkone

src/cmd/samterm/plan9.c

@@ -15,6 +15,8 @@
 
 static char *exname;
 
+#define STACK 8192
+
 void
 getscreen(int argc, char **argv)
 {
@@ -163,7 +165,7 @@ extstart(void)
 	plumbc = chancreate(sizeof(int), 0);
 	arg[0] = plumbc;
 	arg[1] = (void*)fd;
-	proccreate(extproc, arg, 8192);
+	proccreate(extproc, arg, STACK);
 	atexit(removeextern);
 }
 
@@ -256,7 +258,7 @@ plumbstart(void)
 	}
 	arg[0] =plumbc;
 	arg[1] = &fd;
-	proccreate(plumbproc, arg, 4096);
+	proccreate(plumbproc, arg, STACK);
 	return 1;
 }
 #endif
@@ -293,5 +295,5 @@ void
 hoststart(void)
 {
 	hostc = chancreate(sizeof(int), 0);
-	proccreate(hostproc, hostc, 1024);
+	proccreate(hostproc, hostc, STACK);
 }

src/cmd/venti/mkfile

@@ -72,7 +72,7 @@ it:V: all
 <$PLAN9/src/mkmany
 
 $SLIB: $LIBOFILES
-	ar rvc $SLIB $LIBOFILES
+	$AR rvc $SLIB $LIBOFILES
 
 # xml.c:D:	mkxml dat.h
 # 	./mkxml dat.h > xml.c