Only in cvsup-snap-16.1h-ppc: M3TARGET
diff -r -u cvsup-snap-16.1h/Makefile cvsup-snap-16.1h-ppc/Makefile
--- cvsup-snap-16.1h/Makefile	2003-03-04 20:26:05.000000000 +0100
+++ cvsup-snap-16.1h-ppc/Makefile	2004-10-31 11:38:49.694696232 +0100
@@ -37,7 +37,8 @@
 
 # Modula-3 compiler.  For the SRC and PM3 compilers it is "m3build".  For
 # the Critical Mass compiler use "cm3".
-M3=		m3build
+#M3=		m3build
+M3=		cm3
 
 # Extra flags to pass to the Modula-3 compiler.
 M3FLAGS=
@@ -47,7 +48,8 @@
 # of this file.
 ###############################################################################
 
-SUBDIR=		suptcp suplib server client cvpasswd
+#SUBDIR=		suptcp suplib server client cvpasswd
+SUBDIR=		suplib server client cvpasswd
 SUBMAKEARGS=	PREFIX="${PREFIX}" M3="${M3}" M3FLAGS="${M3FLAGS}"
 
 default:	all
Only in cvsup-snap-16.1h-ppc/client: PPC_LINUX
diff -r -u cvsup-snap-16.1h/client/src/FSClient.m3 cvsup-snap-16.1h-ppc/client/src/FSClient.m3
--- cvsup-snap-16.1h/client/src/FSClient.m3	2003-03-04 19:23:45.000000000 +0100
+++ cvsup-snap-16.1h-ppc/client/src/FSClient.m3	2004-06-27 18:45:19.161229472 +0200
@@ -38,8 +38,8 @@
   Thread, TokScan, TreeList, UnixMisc, Updater, Usignal, Version,
   WatchDog, Wr;
 
-IMPORT SupConnRW AS ConnRW;
-IMPORT SupTCP AS TCP;
+IMPORT ConnRW;
+IMPORT TCP;
 
 EXCEPTION
   Error(TEXT);
diff -r -u cvsup-snap-16.1h/client/src/m3makefile cvsup-snap-16.1h-ppc/client/src/m3makefile
--- cvsup-snap-16.1h/client/src/m3makefile	2003-03-04 20:26:12.000000000 +0100
+++ cvsup-snap-16.1h-ppc/client/src/m3makefile	2004-06-27 18:32:06.069797696 +0200
@@ -35,12 +35,13 @@
 end
 
 override("suplib", path() & "/../..")
-override("suptcp", path() & "/../..")
+%override("suptcp", path() & "/../..")
 
 import("libm3")
 import("tempfiles")
 import("suplib")
-import("suptcp")
+%import("suptcp")
+import("tcp")
 
 interface("Version")
 version_impl("Version")
Only in cvsup-snap-16.1h-ppc/config: PPC_LINUX
Only in cvsup-snap-16.1h-ppc/cvpasswd: PPC_LINUX
Only in cvsup-snap-16.1h-ppc: files-tcpimport
Only in cvsup-snap-16.1h-ppc/server: PPC_LINUX
diff -r -u cvsup-snap-16.1h/server/src/FSServer.m3 cvsup-snap-16.1h-ppc/server/src/FSServer.m3
--- cvsup-snap-16.1h/server/src/FSServer.m3	2003-04-07 01:48:55.000000000 +0200
+++ cvsup-snap-16.1h-ppc/server/src/FSServer.m3	2004-06-27 18:36:43.506620888 +0200
@@ -39,9 +39,9 @@
   Text, Thread, Time, TokScan, TreeComp, Uerror, Unix, Usignal,
   Utypes, Version, WatchDog, Wr;
 
-IMPORT SupConnRW AS ConnRW;
-IMPORT SupErrno AS Cerrno;
-IMPORT SupTCP AS TCP;
+IMPORT ConnRW;
+IMPORT Cerrno;
+IMPORT TCP;
 
 REVEAL
   T = Rep BRANDED OBJECT
diff -r -u cvsup-snap-16.1h/server/src/FSServerRep.i3 cvsup-snap-16.1h-ppc/server/src/FSServerRep.i3
--- cvsup-snap-16.1h/server/src/FSServerRep.i3	2003-03-04 20:26:15.000000000 +0100
+++ cvsup-snap-16.1h-ppc/server/src/FSServerRep.i3	2004-06-27 18:35:17.674669328 +0200
@@ -33,7 +33,7 @@
 INTERFACE FSServerRep;
 
 IMPORT FSServer, IP, Logger, Process, SigHandler, Time;
-IMPORT SupTCP AS TCP;
+IMPORT TCP;
 
 REVEAL
   FSServer.T <: Rep;
diff -r -u cvsup-snap-16.1h/server/src/m3makefile cvsup-snap-16.1h-ppc/server/src/m3makefile
--- cvsup-snap-16.1h/server/src/m3makefile	2003-03-04 20:26:17.000000000 +0100
+++ cvsup-snap-16.1h-ppc/server/src/m3makefile	2004-06-27 18:31:46.566762608 +0200
@@ -35,10 +35,11 @@
 end
 
 override("suplib", path() & "/../..")
-override("suptcp", path() & "/../..")
+%override("suptcp", path() & "/../..")
 import("libm3")
 import("suplib")
-import("suptcp")
+%import("suptcp")
+import("tcp")
 
 interface("Version")
 version_impl("Version")
Only in cvsup-snap-16.1h-ppc/suplib: PPC_LINUX
diff -r -u cvsup-snap-16.1h/suplib/src/ChannelMux.i3 cvsup-snap-16.1h-ppc/suplib/src/ChannelMux.i3
--- cvsup-snap-16.1h/suplib/src/ChannelMux.i3	2003-03-04 20:26:19.000000000 +0100
+++ cvsup-snap-16.1h-ppc/suplib/src/ChannelMux.i3	2004-06-27 18:38:04.510306456 +0200
@@ -31,7 +31,7 @@
 INTERFACE ChannelMux;
 
 IMPORT Atom, IP, Rd, Thread, Wr;
-IMPORT SupConnFD AS ConnFD;
+IMPORT ConnFD;
 
 TYPE
   T <: ROOT;
diff -r -u cvsup-snap-16.1h/suplib/src/ChannelMux.m3 cvsup-snap-16.1h-ppc/suplib/src/ChannelMux.m3
--- cvsup-snap-16.1h/suplib/src/ChannelMux.m3	2003-03-04 20:26:19.000000000 +0100
+++ cvsup-snap-16.1h-ppc/suplib/src/ChannelMux.m3	2004-06-27 18:37:37.646390392 +0200
@@ -33,7 +33,7 @@
 
 IMPORT
   Atom, AtomList, IP, Rd, RefSeq, TCP, Thread, Word, Wr;
-IMPORT SupConnFD AS ConnFD;
+IMPORT ConnFD;
 
 (**)
 IMPORT Fmt, IO;
diff -r -u cvsup-snap-16.1h/suplib/src/ErrMsg.m3 cvsup-snap-16.1h-ppc/suplib/src/ErrMsg.m3
--- cvsup-snap-16.1h/suplib/src/ErrMsg.m3	2003-04-07 01:48:58.000000000 +0200
+++ cvsup-snap-16.1h-ppc/suplib/src/ErrMsg.m3	2004-06-27 18:35:17.675669176 +0200
@@ -33,7 +33,7 @@
 IMPORT
   Atom, AtomList, Cstring, EscapedRd, IO, IP, M3toC, Process, Text, TokScan;
 
-IMPORT SupTCP AS TCP;
+IMPORT TCP;
 
 FROM Stdio IMPORT stderr;
 
diff -r -u cvsup-snap-16.1h/suplib/src/SigHandler.m3 cvsup-snap-16.1h-ppc/suplib/src/SigHandler.m3
--- cvsup-snap-16.1h/suplib/src/SigHandler.m3	2003-04-07 01:48:58.000000000 +0200
+++ cvsup-snap-16.1h-ppc/suplib/src/SigHandler.m3	2004-06-27 18:36:56.431655984 +0200
@@ -47,7 +47,7 @@
 IMPORT
   Ctypes, SchedulerPosix, Thread, Uerror, Unix, UnixMisc, Uuio, Word;
 
-IMPORT SupErrno AS Cerrno;
+IMPORT Cerrno;
 
 TYPE
   Dispatcher = Thread.Closure OBJECT
diff -r -u cvsup-snap-16.1h/suplib/src/SupMisc.i3 cvsup-snap-16.1h-ppc/suplib/src/SupMisc.i3
--- cvsup-snap-16.1h/suplib/src/SupMisc.i3	2003-03-04 20:26:29.000000000 +0100
+++ cvsup-snap-16.1h-ppc/suplib/src/SupMisc.i3	2004-06-27 18:35:17.676669024 +0200
@@ -36,7 +36,7 @@
 IMPORT
   Glob, GlobTree, IP, OSError, Pathname, Rd, RegEx, SupFileRec,
   TextSeq, Thread, Wr;
-IMPORT SupTCP AS TCP;
+IMPORT TCP;
 
 TYPE
   ExitCode = { Success, TransientFailure, Failure };
diff -r -u cvsup-snap-16.1h/suplib/src/SupMisc.m3 cvsup-snap-16.1h-ppc/suplib/src/SupMisc.m3
--- cvsup-snap-16.1h/suplib/src/SupMisc.m3	2003-03-04 20:26:29.000000000 +0100
+++ cvsup-snap-16.1h-ppc/suplib/src/SupMisc.m3	2004-06-27 18:35:17.677668872 +0200
@@ -34,7 +34,7 @@
   FileAttr, Fmt, FS, Glob, GlobTree, IP, OSError, OSErrorPosix,
   Pathname, Process, Random, Rd, RdClass, RegEx, SupFileRec, Text,
   TextArraySort, TextSeq, Thread, TokScan, Uerror;
-IMPORT SupTCP AS TCP;
+IMPORT TCP;
 
 TYPE
   AtomicCounter = MUTEX OBJECT
diff -r -u cvsup-snap-16.1h/suplib/src/m3makefile cvsup-snap-16.1h-ppc/suplib/src/m3makefile
--- cvsup-snap-16.1h/suplib/src/m3makefile	2003-03-04 19:13:12.000000000 +0100
+++ cvsup-snap-16.1h-ppc/suplib/src/m3makefile	2004-06-27 18:31:20.760685728 +0200
@@ -33,10 +33,11 @@
 no_shared_lib()
 
 %m3_option("-commands")
-override("suptcp", path() & "/../..")
+%override("suptcp", path() & "/../..")
 import("libm3")
 import("set")
-import("suptcp")
+%import("suptcp")
+import("tcp")
 import("tempfiles")
 import_lib("z", "/usr/local/lib")
 if not equal(M3_VARIANT, "PM3")
@@ -45,6 +46,7 @@
 
 readonly DevTPieces = {
   "LINUXLIBC6" : [ "dev_t_linux" ],
+  "PPC_LINUX"  : [ "dev_t_linux" ],
   "default"    : [ "dev_t_posix" ]
 }