diff --git "a/Mac/Distributions/\050vise\051/Python 2.1.vct" "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
index 340f71c..f83c347 100644
--- "a/Mac/Distributions/\050vise\051/Python 2.1.vct"
+++ "b/Mac/Distributions/\050vise\051/Python 2.1.vct"
Binary files differ
diff --git a/Mac/Distributions/binary.exclude b/Mac/Distributions/binary.exclude
index 3e917cb..32586d2 100644
--- a/Mac/Distributions/binary.exclude
+++ b/Mac/Distributions/binary.exclude
@@ -30,3 +30,6 @@
 Makefile*
 Setup.in
 [(]*[)]
+*.mcp
+*.mcp.exp
+*.mcp.xml
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index 991d4ae..60f19dd 100644
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -18,16 +18,14 @@
 (':Extensions:Imaging', '')
 (':Extensions:Imaging:Tk', None)
 (':Extensions:Imaging:libImaging', None)
-(':Extensions:Numerical', '')
-(':Extensions:Numerical:Mac', None)
-(':Extensions:Numerical:Src', None)
 (':Extensions:Pmw', None)
 (':Extensions:PyDOM', None)
+(':Extensions:PyOpenGL-1.5.6a2', None)
+(':Extensions:PyXML-0.6.2', None)
 (':Extensions:README', None)
 (':Extensions:README.TOO', None)
 (':Extensions:audio', None)
 (':Extensions:img:Lib', '')
-(':Extensions:img:Mac', '')
 (':Extensions:img:README.img', '')
 (':Extensions:img:doc', None)
 (':Extensions:img:test', '')
@@ -83,6 +81,7 @@
 (':Mac:Contrib:BBPy:PythonSlave.py', '')
 (':Mac:Contrib:BBPy:README', '')
 (':Mac:Contrib:BBPy:Run as Python', '')
+(':Mac:Contrib:BBPy:Run as Python.sit', None)
 (':Mac:Contrib:BBPy:source', None)
 (':Mac:Contrib:ImageHelpers', '')
 (':Mac:Contrib:PythonDetector', '')
@@ -97,6 +96,7 @@
 (':Mac:Contrib:morefindertools', '')
 (':Mac:Contrib:osam:OSAm.exp', None)
 (':Mac:Contrib:osam:OSAm.ppc.slb', '')
+(':Mac:Contrib:osam:OSAm.ppc.slb.sit', None)
 (':Mac:Contrib:strptime:strptime.py', '')
 (':Mac:Demo', '')
 (':Mac:Distributions', None)
@@ -124,6 +124,7 @@
 (':Mac:Tools:bruce', None)
 (':Mac:Tools:macfreeze', '')
 (':Mac:Unsupported', None)
+(':Mac:Wastemods:readme.txt', None)
 (':Mac:_checkversion.py', '')
 (':Mac:mwerks', None)
 (':Mac:scripts', '')
@@ -178,8 +179,68 @@
 (':pystone.py', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Extensions:PyXML-0.6.2', None)
-(':Extensions:PyOpenGL-1.5.6a2', None)
-(':Mac:Wastemods:readme.txt', None)
-(':Mac:Contrib:osam:OSAm.ppc.slb.sit', None)
-(':Mac:Contrib:BBPy:Run as Python.sit', None)
+(':Extensions:img:Mac:genimgprojects.py', None)
+(':Extensions:img:Mac:imgcolormap.carbon.slb', '')
+(':Extensions:img:Mac:imgcolormap.ppc.slb', '')
+(':Extensions:img:Mac:imgformat.carbon.slb', '')
+(':Extensions:img:Mac:imgformat.ppc.slb', '')
+(':Extensions:img:Mac:imggif.carbon.slb', '')
+(':Extensions:img:Mac:imggif.ppc.slb', '')
+(':Extensions:img:Mac:imgjpeg.carbon.slb', '')
+(':Extensions:img:Mac:imgjpeg.ppc.slb', '')
+(':Extensions:img:Mac:imgop.carbon.slb', '')
+(':Extensions:img:Mac:imgop.ppc.slb', '')
+(':Extensions:img:Mac:imgpbm.carbon.slb', '')
+(':Extensions:img:Mac:imgpbm.ppc.slb', '')
+(':Extensions:img:Mac:imgpgm.carbon.slb', '')
+(':Extensions:img:Mac:imgpgm.ppc.slb', '')
+(':Extensions:img:Mac:imgpng.carbon.slb', '')
+(':Extensions:img:Mac:imgpng.ppc.slb', '')
+(':Extensions:img:Mac:imgppm.carbon.slb', '')
+(':Extensions:img:Mac:imgppm.ppc.slb', '')
+(':Extensions:img:Mac:imgsgi.carbon.slb', '')
+(':Extensions:img:Mac:imgsgi.ppc.slb', '')
+(':Extensions:img:Mac:imgtiff.carbon.slb', '')
+(':Extensions:img:Mac:imgtiff.ppc.slb', '')
+(':Extensions:Numerical:Legal.htm', '')
+(':Extensions:Numerical:DEVELOPERS', '')
+(':Extensions:Numerical:MANIFEST', '')
+(':Extensions:Numerical:README', '')
+(':Extensions:Numerical:setup_all.py', None)
+(':Extensions:Numerical:setup.py', None)
+(':Extensions:Numerical:build', None)
+(':Extensions:Numerical:Demo', '')
+(':Extensions:Numerical:Lib', '')
+(':Extensions:Numerical:Mac', None)
+(':Extensions:Numerical:Packages:FFT:setup.py', None)
+(':Extensions:Numerical:Packages:FFT:build', None)
+(':Extensions:Numerical:Packages:FFT:Lib', '')
+(':Extensions:Numerical:Packages:FFT:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:LALITE:build', None)
+(':Extensions:Numerical:Packages:LALITE:Lib', '')
+(':Extensions:Numerical:Packages:FFT:Src:fftpack.def', None)
+(':Extensions:Numerical:Packages:LALITE:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:MA:build', None)
+(':Extensions:Numerical:Packages:LALITE:Src:lapack_lite.def', None)
+(':Extensions:Numerical:Packages:LALITE:setup.py', None)
+(':Extensions:Numerical:Packages:LALITE:README', '')
+(':Extensions:Numerical:Packages:MA:Legal.htm', '')
+(':Extensions:Numerical:Packages:MA:setup.py', None)
+(':Extensions:Numerical:Packages:MA:Demo', '')
+(':Extensions:Numerical:Packages:MA:Lib', '')
+(':Extensions:Numerical:Packages:RANLIB:build', None)
+(':Extensions:Numerical:Packages:MA:Test:test.py', '')
+(':Extensions:Numerical:Packages:RANLIB:setup.py', None)
+(':Extensions:Numerical:Packages:RANLIB:Lib', '')
+(':Extensions:Numerical:Packages:RANLIB:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:RANLIB:Src:ranlib.def', None)
+(':Extensions:Numerical:Packages:RNG:Legal.htm', '')
+(':Extensions:Numerical:Packages:RNG:README', '')
+(':Extensions:Numerical:Packages:RNG:setup.py', None)
+(':Extensions:Numerical:Packages:RNG:build', None)
+(':Extensions:Numerical:Packages:RANLIB:README', '')
+(':Extensions:Numerical:Packages:RNG:Lib', '')
+(':Extensions:Numerical:Packages:RNG:Mac:Icon\r', None)
+(':Extensions:Numerical:Packages:RNG:Test', '')
+(':Extensions:Numerical:Src', None)
+(':Extensions:Numerical:Test', '')
diff --git a/Mac/Distributions/dev.include b/Mac/Distributions/dev.include
index 804e4a9..bd755d1 100644
--- a/Mac/Distributions/dev.include
+++ b/Mac/Distributions/dev.include
@@ -8,6 +8,7 @@
 (':Demo:pysvr', ':Demo:pysvr')
 (':Doc', None)
 (':EditPythonPrefs', None)
+(':Extensions:4Suite-0.9.2', None)
 (':Extensions:Imaging', None)
 (':Extensions:Makefile.pre.in', None)
 (':Extensions:Numerical', None)
@@ -18,6 +19,8 @@
 (':Extensions:Numerical:Makefile', None)
 (':Extensions:Numerical:README', None)
 (':Extensions:Numerical:setup.py', None)
+(':Extensions:PyOpenGL-1.5.6a2', None)
+(':Extensions:PyXML-0.6.2', None)
 (':Extensions:README', None)
 (':Extensions:README.TOO', None)
 (':Extensions:img', None)
@@ -30,159 +33,156 @@
 (':Include', '')
 (':LICENSE', None)
 (':Lib', None)
-(':Mac:Build:App.carbon.mcp', '')
-(':Mac:Build:App.carbon.mcp.exp', '')
-(':Mac:Build:App.carbon.mcp.xml', '')
-(':Mac:Build:App.mcp', '')
-(':Mac:Build:App.mcp.exp', '')
-(':Mac:Build:App.mcp.xml', '')
-(':Mac:Build:Cm.carbon.mcp', '')
-(':Mac:Build:Cm.carbon.mcp.exp', '')
-(':Mac:Build:Cm.carbon.mcp.xml', '')
-(':Mac:Build:Cm.mcp', '')
-(':Mac:Build:Cm.mcp.exp', '')
-(':Mac:Build:Cm.mcp.xml', '')
-(':Mac:Build:ColorPicker.carbon.mcp', '')
-(':Mac:Build:ColorPicker.carbon.mcp.exp', '')
-(':Mac:Build:ColorPicker.carbon.mcp.xml', '')
-(':Mac:Build:ColorPicker.mcp', '')
-(':Mac:Build:ColorPicker.mcp.exp', '')
-(':Mac:Build:ColorPicker.mcp.xml', '')
-(':Mac:Build:Fm.carbon.mcp', '')
-(':Mac:Build:Fm.carbon.mcp.exp', '')
-(':Mac:Build:Fm.carbon.mcp.xml', '')
-(':Mac:Build:Fm.mcp', '')
-(':Mac:Build:Fm.mcp.exp', '')
-(':Mac:Build:Fm.mcp.xml', '')
-(':Mac:Build:Help.mcp', '')
-(':Mac:Build:Help.mcp.exp', '')
-(':Mac:Build:Help.mcp.xml', '')
-(':Mac:Build:HtmlRender.prj', '')
-(':Mac:Build:HtmlRender.prj.exp', '')
-(':Mac:Build:Icn.carbon.mcp', '')
-(':Mac:Build:Icn.carbon.mcp.exp', '')
-(':Mac:Build:Icn.carbon.mcp.xml', '')
-(':Mac:Build:Icn.mcp', '')
-(':Mac:Build:Icn.mcp.exp', '')
-(':Mac:Build:Icn.mcp.xml', '')
-(':Mac:Build:List.carbon.mcp', '')
-(':Mac:Build:List.carbon.mcp.exp', '')
-(':Mac:Build:List.carbon.mcp.xml', '')
-(':Mac:Build:List.mcp', '')
-(':Mac:Build:List.mcp.exp', '')
-(':Mac:Build:List.mcp.xml', '')
-(':Mac:Build:Printing.mcp', '')
-(':Mac:Build:Printing.mcp.exp', '')
-(':Mac:Build:Printing.mcp.xml', '')
-(':Mac:Build:PythonCore.exp', '')
-(':Mac:Build:PythonCore.mcp', '')
-(':Mac:Build:PythonCoreCarbon.exp', '')
-(':Mac:Build:PythonInterpreter', '')
-(':Mac:Build:PythonInterpreter.mcp', '')
-(':Mac:Build:PythonStandSmall.mcp', '')
-(':Mac:Build:PythonStandalone.mcp', '')
-(':Mac:Build:PythonStandalone.old.mcp', '')
-(':Mac:Build:Qdoffs.carbon.mcp', '')
-(':Mac:Build:Qdoffs.carbon.mcp.exp', '')
-(':Mac:Build:Qdoffs.carbon.mcp.xml', '')
-(':Mac:Build:Qdoffs.mcp', '')
-(':Mac:Build:Qdoffs.mcp.exp', '')
-(':Mac:Build:Qdoffs.mcp.xml', '')
-(':Mac:Build:Qt.carbon.mcp', '')
-(':Mac:Build:Qt.carbon.mcp.exp', '')
-(':Mac:Build:Qt.carbon.mcp.xml', '')
-(':Mac:Build:Qt.mcp', '')
-(':Mac:Build:Qt.mcp.exp', '')
-(':Mac:Build:Qt.mcp.xml', '')
-(':Mac:Build:Scrap.carbon.mcp', '')
-(':Mac:Build:Scrap.carbon.mcp.exp', '')
-(':Mac:Build:Scrap.carbon.mcp.xml', '')
-(':Mac:Build:Scrap.mcp', '')
-(':Mac:Build:Scrap.mcp.exp', '')
-(':Mac:Build:Scrap.mcp.xml', '')
-(':Mac:Build:Snd.carbon.mcp', '')
-(':Mac:Build:Snd.carbon.mcp.exp', '')
-(':Mac:Build:Snd.carbon.mcp.xml', '')
-(':Mac:Build:Snd.mcp', '')
-(':Mac:Build:Snd.mcp.exp', '')
-(':Mac:Build:Snd.mcp.xml', '')
-(':Mac:Build:Sndihooks.carbon.mcp', '')
-(':Mac:Build:Sndihooks.carbon.mcp.exp', '')
-(':Mac:Build:Sndihooks.carbon.mcp.xml', '')
-(':Mac:Build:Sndihooks.mcp', '')
-(':Mac:Build:Sndihooks.mcp.exp', '')
-(':Mac:Build:Sndihooks.mcp.xml', '')
-(':Mac:Build:TE.carbon.mcp', '')
-(':Mac:Build:TE.carbon.mcp.exp', '')
-(':Mac:Build:TE.carbon.mcp.xml', '')
-(':Mac:Build:TE.mcp', '')
-(':Mac:Build:TE.mcp.exp', '')
-(':Mac:Build:TE.mcp.xml', '')
-(':Mac:Build:_symtable.carbon.mcp', '')
-(':Mac:Build:_symtable.carbon.mcp.exp', '')
-(':Mac:Build:_symtable.carbon.mcp.xml', '')
-(':Mac:Build:_symtable.mcp', '')
-(':Mac:Build:_symtable.mcp.exp', '')
-(':Mac:Build:_symtable.mcp.xml', '')
-(':Mac:Build:_testcapi.carbon.mcp', '')
-(':Mac:Build:_testcapi.carbon.mcp.exp', '')
-(':Mac:Build:_testcapi.carbon.mcp.xml', '')
-(':Mac:Build:_testcapi.mcp', '')
-(':Mac:Build:_testcapi.mcp.exp', '')
-(':Mac:Build:_testcapi.mcp.xml', '')
-(':Mac:Build:_weakref.carbon.mcp', '')
-(':Mac:Build:_weakref.carbon.mcp.exp', '')
-(':Mac:Build:_weakref.carbon.mcp.xml', '')
-(':Mac:Build:_weakref.mcp', '')
-(':Mac:Build:_weakref.mcp.exp', '')
-(':Mac:Build:_weakref.mcp.xml', '')
-(':Mac:Build:buildlibs.mcp', '')
-(':Mac:Build:calldll.carbon.mcp', '')
-(':Mac:Build:calldll.carbon.mcp.exp', '')
-(':Mac:Build:calldll.carbon.mcp.xml', '')
-(':Mac:Build:calldll.mcp', '')
-(':Mac:Build:calldll.mcp.exp', '')
-(':Mac:Build:calldll.mcp.xml', '')
-(':Mac:Build:ctb.mcp', '')
-(':Mac:Build:ctb.mcp.exp', '')
-(':Mac:Build:ctb.mcp.xml', '')
-(':Mac:Build:gdbm.carbon.mcp', '')
-(':Mac:Build:gdbm.carbon.mcp.exp', '')
-(':Mac:Build:gdbm.carbon.mcp.xml', '')
-(':Mac:Build:gdbm.mcp', '')
-(':Mac:Build:gdbm.mcp.exp', '')
-(':Mac:Build:gdbm.mcp.xml', '')
-(':Mac:Build:icglue.carbon.mcp', '')
-(':Mac:Build:icglue.carbon.mcp.exp', '')
-(':Mac:Build:icglue.carbon.mcp.xml', '')
-(':Mac:Build:icglue.mcp', '')
-(':Mac:Build:icglue.mcp.exp', '')
-(':Mac:Build:icglue.mcp.xml', '')
-(':Mac:Build:macspeech.mcp', '')
-(':Mac:Build:macspeech.mcp.exp', '')
-(':Mac:Build:macspeech.mcp.xml', '')
-(':Mac:Build:pyexpat.carbon.mcp', '')
-(':Mac:Build:pyexpat.carbon.mcp.exp', '')
-(':Mac:Build:pyexpat.carbon.mcp.xml', '')
-(':Mac:Build:pyexpat.mcp', '')
-(':Mac:Build:pyexpat.mcp.exp', '')
-(':Mac:Build:pyexpat.mcp.xml', '')
-(':Mac:Build:ucnhash.carbon.mcp', '')
-(':Mac:Build:ucnhash.mcp', '')
-(':Mac:Build:waste.carbon.mcp', '')
-(':Mac:Build:waste.carbon.mcp.exp', '')
-(':Mac:Build:waste.carbon.mcp.xml', '')
-(':Mac:Build:waste.mcp', '')
-(':Mac:Build:waste.mcp.exp', '')
-(':Mac:Build:waste.mcp.xml', '')
+(':Mac:Build:App.carbon.mcp', None)
+(':Mac:Build:App.carbon.mcp.exp', None)
+(':Mac:Build:App.carbon.mcp.xml', None)
+(':Mac:Build:App.mcp', None)
+(':Mac:Build:App.mcp.exp', None)
+(':Mac:Build:App.mcp.xml', None)
+(':Mac:Build:Cm.carbon.mcp', None)
+(':Mac:Build:Cm.carbon.mcp.exp', None)
+(':Mac:Build:Cm.carbon.mcp.xml', None)
+(':Mac:Build:Cm.mcp', None)
+(':Mac:Build:Cm.mcp.exp', None)
+(':Mac:Build:Cm.mcp.xml', None)
+(':Mac:Build:ColorPicker.carbon.mcp', None)
+(':Mac:Build:ColorPicker.carbon.mcp.exp', None)
+(':Mac:Build:ColorPicker.carbon.mcp.xml', None)
+(':Mac:Build:ColorPicker.mcp', None)
+(':Mac:Build:ColorPicker.mcp.exp', None)
+(':Mac:Build:ColorPicker.mcp.xml', None)
+(':Mac:Build:Fm.carbon.mcp', None)
+(':Mac:Build:Fm.carbon.mcp.exp', None)
+(':Mac:Build:Fm.carbon.mcp.xml', None)
+(':Mac:Build:Fm.mcp', None)
+(':Mac:Build:Fm.mcp.exp', None)
+(':Mac:Build:Fm.mcp.xml', None)
+(':Mac:Build:Help.mcp', None)
+(':Mac:Build:Help.mcp.exp', None)
+(':Mac:Build:Help.mcp.xml', None)
+(':Mac:Build:HtmlRender.prj', None)
+(':Mac:Build:HtmlRender.prj.exp', None)
+(':Mac:Build:Icn.carbon.mcp', None)
+(':Mac:Build:Icn.carbon.mcp.exp', None)
+(':Mac:Build:Icn.carbon.mcp.xml', None)
+(':Mac:Build:Icn.mcp', None)
+(':Mac:Build:Icn.mcp.exp', None)
+(':Mac:Build:Icn.mcp.xml', None)
+(':Mac:Build:List.carbon.mcp', None)
+(':Mac:Build:List.carbon.mcp.exp', None)
+(':Mac:Build:List.carbon.mcp.xml', None)
+(':Mac:Build:List.mcp', None)
+(':Mac:Build:List.mcp.exp', None)
+(':Mac:Build:List.mcp.xml', None)
+(':Mac:Build:Printing.mcp', None)
+(':Mac:Build:Printing.mcp.exp', None)
+(':Mac:Build:Printing.mcp.xml', None)
+(':Mac:Build:PythonCore.exp', None)
+(':Mac:Build:PythonCore.mcp', None)
+(':Mac:Build:PythonCoreCarbon.exp', None)
+(':Mac:Build:PythonInterpreter.mcp', None)
+(':Mac:Build:PythonStandSmall.mcp', None)
+(':Mac:Build:PythonStandalone.mcp', None)
+(':Mac:Build:Qdoffs.carbon.mcp', None)
+(':Mac:Build:Qdoffs.carbon.mcp.exp', None)
+(':Mac:Build:Qdoffs.carbon.mcp.xml', None)
+(':Mac:Build:Qdoffs.mcp', None)
+(':Mac:Build:Qdoffs.mcp.exp', None)
+(':Mac:Build:Qdoffs.mcp.xml', None)
+(':Mac:Build:Qt.carbon.mcp', None)
+(':Mac:Build:Qt.carbon.mcp.exp', None)
+(':Mac:Build:Qt.carbon.mcp.xml', None)
+(':Mac:Build:Qt.mcp', None)
+(':Mac:Build:Qt.mcp.exp', None)
+(':Mac:Build:Qt.mcp.xml', None)
+(':Mac:Build:Scrap.carbon.mcp', None)
+(':Mac:Build:Scrap.carbon.mcp.exp', None)
+(':Mac:Build:Scrap.carbon.mcp.xml', None)
+(':Mac:Build:Scrap.mcp', None)
+(':Mac:Build:Scrap.mcp.exp', None)
+(':Mac:Build:Scrap.mcp.xml', None)
+(':Mac:Build:Snd.carbon.mcp', None)
+(':Mac:Build:Snd.carbon.mcp.exp', None)
+(':Mac:Build:Snd.carbon.mcp.xml', None)
+(':Mac:Build:Snd.mcp', None)
+(':Mac:Build:Snd.mcp.exp', None)
+(':Mac:Build:Snd.mcp.xml', None)
+(':Mac:Build:Sndihooks.carbon.mcp', None)
+(':Mac:Build:Sndihooks.carbon.mcp.exp', None)
+(':Mac:Build:Sndihooks.carbon.mcp.xml', None)
+(':Mac:Build:Sndihooks.mcp', None)
+(':Mac:Build:Sndihooks.mcp.exp', None)
+(':Mac:Build:Sndihooks.mcp.xml', None)
+(':Mac:Build:TE.carbon.mcp', None)
+(':Mac:Build:TE.carbon.mcp.exp', None)
+(':Mac:Build:TE.carbon.mcp.xml', None)
+(':Mac:Build:TE.mcp', None)
+(':Mac:Build:TE.mcp.exp', None)
+(':Mac:Build:TE.mcp.xml', None)
+(':Mac:Build:TE.mcp.xml.out', None)
+(':Mac:Build:_symtable.carbon.mcp', None)
+(':Mac:Build:_symtable.carbon.mcp.exp', None)
+(':Mac:Build:_symtable.carbon.mcp.xml', None)
+(':Mac:Build:_symtable.mcp', None)
+(':Mac:Build:_symtable.mcp.exp', None)
+(':Mac:Build:_symtable.mcp.xml', None)
+(':Mac:Build:_testcapi.carbon.mcp', None)
+(':Mac:Build:_testcapi.carbon.mcp.exp', None)
+(':Mac:Build:_testcapi.carbon.mcp.xml', None)
+(':Mac:Build:_testcapi.mcp', None)
+(':Mac:Build:_testcapi.mcp.exp', None)
+(':Mac:Build:_testcapi.mcp.xml', None)
+(':Mac:Build:_weakref.carbon.mcp', None)
+(':Mac:Build:_weakref.carbon.mcp.exp', None)
+(':Mac:Build:_weakref.carbon.mcp.xml', None)
+(':Mac:Build:_weakref.mcp', None)
+(':Mac:Build:_weakref.mcp.exp', None)
+(':Mac:Build:_weakref.mcp.xml', None)
+(':Mac:Build:buildlibs.mcp', None)
+(':Mac:Build:calldll.carbon.mcp', None)
+(':Mac:Build:calldll.carbon.mcp.exp', None)
+(':Mac:Build:calldll.carbon.mcp.xml', None)
+(':Mac:Build:calldll.mcp', None)
+(':Mac:Build:calldll.mcp.exp', None)
+(':Mac:Build:calldll.mcp.xml', None)
+(':Mac:Build:ctb.mcp', None)
+(':Mac:Build:ctb.mcp.exp', None)
+(':Mac:Build:ctb.mcp.xml', None)
+(':Mac:Build:gdbm.carbon.mcp', None)
+(':Mac:Build:gdbm.carbon.mcp.exp', None)
+(':Mac:Build:gdbm.carbon.mcp.xml', None)
+(':Mac:Build:gdbm.mcp', None)
+(':Mac:Build:gdbm.mcp.exp', None)
+(':Mac:Build:gdbm.mcp.xml', None)
+(':Mac:Build:icglue.carbon.mcp', None)
+(':Mac:Build:icglue.carbon.mcp.exp', None)
+(':Mac:Build:icglue.carbon.mcp.xml', None)
+(':Mac:Build:icglue.mcp', None)
+(':Mac:Build:icglue.mcp.exp', None)
+(':Mac:Build:icglue.mcp.xml', None)
+(':Mac:Build:macspeech.mcp', None)
+(':Mac:Build:macspeech.mcp.exp', None)
+(':Mac:Build:macspeech.mcp.xml', None)
+(':Mac:Build:pyexpat.carbon.mcp', None)
+(':Mac:Build:pyexpat.carbon.mcp.exp', None)
+(':Mac:Build:pyexpat.carbon.mcp.xml', None)
+(':Mac:Build:pyexpat.mcp', None)
+(':Mac:Build:pyexpat.mcp.exp', None)
+(':Mac:Build:pyexpat.mcp.xml', None)
+(':Mac:Build:waste.carbon.mcp', None)
+(':Mac:Build:waste.carbon.mcp.exp', None)
+(':Mac:Build:waste.carbon.mcp.xml', None)
+(':Mac:Build:waste.mcp', None)
+(':Mac:Build:waste.mcp.exp', None)
+(':Mac:Build:waste.mcp.xml', None)
 (':Mac:Build:xx.prj', '')
 (':Mac:Build:xx.prj.exp', '')
-(':Mac:Build:zlib.carbon.mcp', '')
-(':Mac:Build:zlib.carbon.mcp.exp', '')
-(':Mac:Build:zlib.carbon.mcp.xml', '')
-(':Mac:Build:zlib.mcp', '')
-(':Mac:Build:zlib.mcp.exp', '')
-(':Mac:Build:zlib.mcp.xml', '')
+(':Mac:Build:zlib.carbon.mcp', None)
+(':Mac:Build:zlib.carbon.mcp.exp', None)
+(':Mac:Build:zlib.carbon.mcp.xml', None)
+(':Mac:Build:zlib.mcp', None)
+(':Mac:Build:zlib.mcp.exp', None)
+(':Mac:Build:zlib.mcp.xml', None)
 (':Mac:CVS', None)
 (':Mac:Compat', None)
 (':Mac:Contrib', None)
@@ -260,6 +260,7 @@
 (':Mac:Tools:macfreeze', None)
 (':Mac:Tools:twit', None)
 (':Mac:Unsupported', None)
+(':Mac:Wastemods', '')
 (':Mac:_checkversion.py', None)
 (':Mac:mwerks:Icon\r', None)
 (':Mac:mwerks:ShGUSIGlue.c', None)
@@ -297,13 +298,10 @@
 (':Modules:Setup.in', None)
 (':Modules:Setup.thread.in', None)
 (':Modules:_codecsmodule.c', None)
-(':Modules:_curses_panel.c', '')
 (':Modules:_cursesmodule.c', None)
 (':Modules:_localemodule.c', None)
 (':Modules:_sre.c', None)
-(':Modules:_testcapimodule.c', '')
 (':Modules:_tkinter.c', None)
-(':Modules:_weakref.c', '')
 (':Modules:almodule.c', None)
 (':Modules:arraymodule.c', None)
 (':Modules:audioop.c', None)
@@ -382,7 +380,6 @@
 (':Modules:structmodule.c', None)
 (':Modules:sunaudiodev.c', None)
 (':Modules:svmodule.c', None)
-(':Modules:symtablemodule.c', '')
 (':Modules:syslogmodule.c', None)
 (':Modules:tclNotify.c', None)
 (':Modules:termios.c', None)
@@ -393,11 +390,8 @@
 (':Modules:tkappinit.c', None)
 (':Modules:ucnhash.c', None)
 (':Modules:unicodedata.c', None)
-(':Modules:unicodedata_db.h', '')
 (':Modules:unicodedatabase.c', None)
 (':Modules:unicodedatabase.h', None)
-(':Modules:unicodename_db.h', '')
-(':Modules:xreadlinesmodule.c', '')
 (':Modules:xxmodule.c', '')
 (':Modules:yuv.h', None)
 (':Modules:yuvconvert.c', None)
@@ -453,8 +447,10 @@
 (':readmefiles', None)
 (':setup.py', None)
 (':site-packages', None)
-(':Extensions:4Suite-0.9.2', None)
-(':Extensions:PyXML-0.6.2', None)
-(':Extensions:PyOpenGL-1.5.6a2', None)
-(':Mac:Build:TE.mcp.xml.out', None)
-(':Mac:Wastemods', '')
+(':Modules:symtablemodule.c', None)
+(':Modules:_weakref.c', None)
+(':Modules:_testcapimodule.c', None)
+(':Modules:_curses_panel.c', None)
+(':Modules:xreadlinesmodule.c', None)
+(':Modules:unicodename_db.h', None)
+(':Modules:unicodedata_db.h', None)
diff --git a/Mac/Distributions/readme.txt b/Mac/Distributions/readme.txt
index 69476cf..d05a15a 100644
--- a/Mac/Distributions/readme.txt
+++ b/Mac/Distributions/readme.txt
@@ -1,11 +1,12 @@
 How to make a Python-distribution.
 ----------------------------------
 
-These notes are mainly for myself.
+These notes are mainly for myself, or for whoever tries to make a MacPython
+distribution when I'm fed up with it. They were last updated for 2.1a2.
 
-- Increase fragment version number in PythonCorePPC and PythonCoreCFM68K
-- Increase version number in STR resource (preffilename) and VERS resource
-- Update about box
+- Increase fragment version number in PythonCore and PythonCoreCarbon.
+  the fragment number is Python's sys.hexversion, it should be set in the
+  "PEF" preferences.
 - Increase version number in _versioncheck.py
 - Build PythonStandSmall, run once in root folder
 - Update Relnotes, readme's, Demo:build.html
@@ -14,9 +15,7 @@
 - Run configurepython
 - set "no console" on all applets
 - remove alis resource from all applets
-- mkdistr
-- remove stdwin, cwilib demos
+- mkdistr binary.include
+- mkdistr dev.include
+- make distribution archive with Installer Vise
 - test on virgin system. Make sure to test tkinter too.
-- make distribution archive
-- binhextree, synctree
-- update version number on the net
diff --git a/Mac/Include/macbuildno.h b/Mac/Include/macbuildno.h
index 3b11c1f..4c3d48f 100644
--- a/Mac/Include/macbuildno.h
+++ b/Mac/Include/macbuildno.h
@@ -1 +1 @@
-#define BUILD 71
+#define BUILD 80
diff --git a/Mac/ReadMe b/Mac/ReadMe
index b924dff..c426979 100644
--- a/Mac/ReadMe
+++ b/Mac/ReadMe
@@ -1,5 +1,21 @@
-How to install Python 2.0 on your Macintosh
--------------------------------------------
+How to install Python 2.1a2 on your Macintosh
+---------------------------------------------
+
+Note that this is really an alpha: it is only lightly tested and contains a lot
+of new code. Moreover, this release is Carbon only, so it will run on MacOS 8.6
+or later and MacOS X. The next alpha will again run in "classic MacOS" (8.0 or
+later).
+
+I'm hoping for a fairly quick alpha cycle, with about 3 distributions in quick
+succession, so please give feedback (to pythonmac-sig@python.org) as soon as
+possible. You should definitely include the full version number of you MacOS
+and the full version string of your MacPython.
+
+Whether PIL, Tk and Numeric work in this release is a complete guess.
+
+You should definitely read the Relnotes file too.
+
+------
 
 If this is your first encounter with Python: you definitely need the
 common user documentation (common to all platforms). You can find this
@@ -17,17 +33,13 @@
 This is a final candidate version, so use with caution, and please report
 problems as soon as possible, to pythonmac-sig@python.org.
 
-Aside from the general new Python 2.0 features (compared to 1.5.2, there
-was no 1.6 for the macintosh) like unicode support the main new features
-of this MacPython release is support for multithreading. This has had
-some preliminary testing, but please report any success or failure on
-the mailing list.
+Aside from the general new Python 2.1 features compared to 2.0 the main
+feature of this release is Carbon support.
 
-This installer installs MacPython for PowerPC only, if you really want
-68k support you will have to stay with 1.5.2. Or, if you are willing to
-invest the time and have access to CodeWarrior you are welcome to try
-and build a 68k distribution, most of the projects and sources are
-reasonably up to date (May 2000). Contact me for details.
+This installer installs MacPython for Carbon only. If you have a machine
+running 8.5 or earlier you should wait for the next alfa and sitck with 2.0.
+If you want
+68k support you will have to stay with 1.5.2.
 
 This version of Python expects a recent version of Appearance, so it may
 be that users with pre MacOS 8.5 systems have trouble running it. If
@@ -41,9 +53,7 @@
 This installer is PPC only: too many new MacOS features are not
 available on 68K, and doing workarounds, even just #ifdeffing in the
 code, is too much work for me right now. If someone wants to revive
-68K-MacPython: please do so. The project files still contain the 68K
-targets (they're simply skipped by the build process) so all that is
-needed is CodeWarrior, a source distribution and commitment.
+68K-MacPython: please do so.
 
 The optional parts in this distribution are
 - TK+PIL: Tkinter and support modules, plus Imaging, the Python image manipulation 
@@ -59,13 +69,11 @@
 
 After the installer finishes it automatically launches the
 ConfigurePython applet, to finish configuration of your Python.
-If you have previously installed another copy of 2.0 you should manually
-remove your preference file first (but no such action is needed for installing
-beside older MacPythons, and they will live together happily).
 
 Moving your Python installation after installing is generally not a good idea.
 If you have to do this anyway you should remove your preference file, run
-ConfigurePython and remove all .pyc files.
+ConfigurePython and remove all .pyc files. (there's a script zappyc.py that does
+the latter).
 
 If you don't have enough memory: the sizes choosen are somewhat
 arbitrary, and they are as high as they are so that test.autotest runs with fewer
@@ -79,8 +87,9 @@
 It is probably a good idea to run the automatic tests. Start
 Python and "import test.autotest". 
 
-Three tests will fail on the mac, all with MemoryErrors: test_sha,
-test_longexp and test_zlib. If you increase the PythonInterpreter memory
+Three tests will fail on MacOS9, all with MemoryErrors: test_gzip, test_sha,
+test_longexp and test_zlib (on MacOSX nothing should fail).
+If you increase the PythonInterpreter memory
 partition size they will pass. It will, however, print some messages
 about optional features not supported. You should not worry about these,
 they are modules that are supported by Python on other platforms. Also,
@@ -101,8 +110,8 @@
 ------------
 
 Two items are installed in the system folder: the interpreter shared
-library "PythonCore 2.0" lives in the Extensions folder and the
-"Python 2.0 Preferences" file in the Python subfolder in the
+libraries PythonCore and PythonCoreCarbon lives in the Extensions folder and the
+"Python 2.1a2 Preferences" file in the Python subfolder in the
 Preferences folder. All the rest of Python lives in the folder you
 installed in.
 
@@ -137,15 +146,15 @@
 Upgrading from older Python releases
 ------------------------------------
 
-Since release 1.4 Python releases are independent of each other, with
+Python releases are independent of each other, with
 separate Preferences files, shared library names, etc. The good news is
 that this means you can keep your older version around if you are unsure
 whether to upgrade. The bad news is that your old preference settings
 are lost and you have to set them again.
 
-After you are satisfied that 2.0 works as expected you can trash
+After you are satisfied that 2.1 works as expected you can trash
 anything in the system folder that has "python" in the name and not
-"2.0".
+"2.1".
 
 The installer
 -------------
@@ -188,11 +197,6 @@
 <pythonmac-sig@python.org> mailing list, which is explicitly meant for
 this purpose.
 
-Alternatively, you can try sending to comp.lang.python or
-python-list@cwi.nl, but since I read the newsgroup, not the mailinglist,
-I may miss it there (but other people may know quite a bit more than me
-anyway:-).
-
 Jack Jansen
 Oratrix Development BV
 Valeriusplein 30
diff --git a/Mac/Relnotes b/Mac/Relnotes
index b075f00..99f9556 100644
--- a/Mac/Relnotes
+++ b/Mac/Relnotes
@@ -1,4 +1,4 @@
-Changes in 2.0 since 1.5.2
+Changes in 2.1a2 since 2.0
 --------------------------
 
 These release notes refer to Mac-specific changes only. See NEWS (in the Misc folder)
@@ -8,52 +8,58 @@
 Mac-specific release notes for the changes in this release. So, I will
 have to leave it at the highlights:
 
-- 68K support has been dropped, this release is PPC only.
-- Threads support (through standard Python threads module).
-- Tkinter works again! At least: it doesn't immedeately crash in obvious ways.
-- Appearance support through App module and added calls in many other modules.
-  Most dialogs and applets have also been converted to Appearance. There's also a
-  ControlAccessor module that handles [GS]etControlData with their plethora of
-  argument types.
-- Navigation Services support, with macfs StandardFile calls transparently
-  replaced by their NavServices counterparts.
-- Offscreen QuickDraw and GWorld support through Qdoffs module.
-- Drag manager support (Drag module).
-- Much better CGI support and examples, see :Mac:Tools:CGI.
-- Better OSA/AppleEvent support.
-- Up/downcasting of handle-based types is now unified and implemented in the
-  inherting module, e.g.
-  handleobj = ctlobj.as_Resource()
-  ctlobj = Ctl.as_Control(handle)
-- Added macos.FreeMem(), MaxBlock() and CompactMem(), mainly so apps in Python can
-  give low-memory warnings.
-- MediaDescr module parses some QuickTime media descriptions (but definitely not all).
-- A new method EasyDialogs.GetArgv() which makes it easy for the end-user to provide
-  unix-style sys.argv arguments. (new since 2.0b1)
-- There's a new package, mkcwproject, that creates and builds CodeWarrior
-  projects. (new since 2.0b1)
-- The "keep console open" options are now always, never, on error and on
-  unseen output. The latter is the new default. There is also a call
-  MacOS.KeepConsole() which allows programs to override the behaviour, and
-  a call MacOS.OutputSeen() which acknowledges all output until now.
-  (new since 2.0b1)
-- Missing Numeric modules are included. They may not be on sys.path, however. (new since 2.0b1)
-- gdbm works again. (new since 2.0b1)
-- Command-. and threads don't bite each other as badly anymore. (new since 2.0c1)
-- InstallPython will optionally copy PythonCore in stead of creating an alias, when
-  needed. (new since 2.0c1)
-- All bugs reported to the pythonmac-sig in the 2.0c1 period have been fixed.
+- The good news: this release is Carbon-based, so it runs natively on MacOS 8.6 or
+  later and MacOSX.
+- The bad news: this release is Carbon-only. The next alpha release will be both
+  Carbon and classic PPC.
+- Distutils is included and seems to work.
+- There's a new module (package, actually) mkcwproject which builds CodeWarrior
+  projects from simple templates. See Distutils or :Mac:scripts:genpluginprojects.py
+  for examples of use.
+- Windows and Dialogs can now be different beasts, so you may have to call
+  dlg.GetDialogWindow() where you used to be able to call window methods straight
+  on the dialog. This also has consequences for code using FrameWork.DialogWindow.
+  THIS IS AN INCOMPATIBLE CHANGE.
+- ctl.GetControlDataHandle() has been renamed to GetControlData_Handle(), and similarly
+  for the other variants of GetControlData and SetControlData. This was needed
+  because Carbon defines a completely different routine with the name GetControlDataHandle.
+  THIS IS AN INCOMPATIBLE CHANGE.
+- Method mac.xstat() has disappeared. THIS IS AN INCOMPATIBLE CHANGE.
+- Menu.SetPopupData() and GetPopupData() are gone. Use SetPopupMenuHandle() and
+  SetPopupMenuID() (and the getters) in stead. THIS IS AN INCOMPATIBLE CHANGE.
+- Various methods have disappeared when running under Carbon. The script
+  :Mac:scripts:missingcarbonmethods.py can check your sources, but you need unix to run
+  it. Or use it as documentation and search by hand. THIS IS AN INCOMPATIBLE CHANGE.
+- The good news is that "direct access to toolbox structs" still works from Python,
+  so Python programmers have a lot less to fix than C programmers.
+  That's because the lowlevel code simply uses the accessors internally. The accessors
+  are available both in Carbon and Classic MacPython.
+- Scrap under Carbon is, you guessed it, the Carbon Scrap Manager. Some workarounds are
+  provided, though. THIS IS AN INCOMPATIBLE CHANGE.
+- The Internet Config routines that are missing from Carbon have been removed. This
+  is no problem if you use the "ic" module, but may be if you use "icglue" directly.
+  THIS IS AN INCOMPATIBLE CHANGE.
+- Various old toolbox names (CountMItems, EnableItem, etc) have disappeared. Use the
+  new forms (CountMenuItems, EnableMenuItem, etc). THIS IS AN INCOMPATIBLE CHANGE.
+- Waste now uses Waste 2.0.
+- The default memory size for the interpreter has been upped again.
+- The MacOS error messages have been updated to reflect the current state of
+  things. This was long overdue.
+- The crash in BuildApplication has been fixed.
+- struct.pack related problems (in Audio_Mac, for example) have been fixed.
+- (src/dev/cvs only): The project files now use the .mcp extension in stead of .prj.
+  Projects for almost all plugins and the img modules are automatically generated
+  with :Mac:scripts:genpluginprojects.py (also called by fullbuild). The .mcp files
+  are not in the repository, if you don't want to use genpluginprojects you can import
+  the .mcp.xml files in CodeWarrior.
 
 
 What is not in this distribution
 --------------------------------
 
-- The garbage collection mods to 2.0 have not been enabled, mainly due to lack of test-time.
+- The garbage collection mods have not been enabled, mainly due to lack of test-time.
 - Stackless Python/microthreads hasn't been ported to 2.0 yet. If/when it becomes available
   Just will undoubtedly announce it on pythonmac-sig and the MacPython homepage.
-- Carbon support is not in here, but should be happening as soon as GUSI is ready.
-- Distutils is incomplete for the Mac, unfortunately. A newer version should be available
-  soon and will be announced on pythonmac-sig and the MacPython homepage.
 
 Known problems
 --------------
@@ -63,3 +69,6 @@
 
 - The IDE and Tkinter do not work together. Run tkinter programs under PythonInterpreter.
 - Aliases do not work in sys.path entries.
+- The menu bar isn't always correctly restored before MacPython turns to <<terminated>>.
+- Under Carbon only you may occasionally see a spurious KeyboardInterrupt. I have absolutely
+  no clue as to what is causing this.