Custer: update Universal Interfaces

patchset/Custer/2-mpw-tools.patch

@@ -5,7 +5,7 @@ Subject: MPW Tools
 diff --git a/DeclData/DeclData.make b/DeclData/DeclData.make
 --- a/DeclData/DeclData.make
 +++ b/DeclData/DeclData.make
-@@ -59,8 +59,8 @@ DeclHeaders	=	"{ObjDir}StandardEqu.d"						∂
+@@ -44,8 +44,8 @@ DeclHeaders	=	"{SonicDir}SonicEqu.a"
  #
  #	DeclData
  #
@@ -15,7 +15,7 @@ diff --git a/DeclData/DeclData.make b/DeclData/DeclData.make
 +	"{ToolDir}RomLink"	{DeclResources} -o "{Targ}"
  
  
- "{RsrcDir}DeclData.rsrc"		ƒ	"{RIncludes}Types.r"					∂
+ "{RsrcDir}DeclData.rsrc"		ƒ	"{DeclDir}DeclData.r"
 diff --git a/Make/FeatureList b/Make/FeatureList
 --- a/Make/FeatureList
 +++ b/Make/FeatureList

patchset/Custer/3-makefile-fixes.patch

@@ -15,9 +15,43 @@ diff --git a/Drivers/Drivers.make b/Drivers/Drivers.make
  #include {NewAgeDir}NewAge.make
  
  #include {IOPDir}IOP.make
+diff --git a/Libs/InterfaceSrcs/Interface.Make b/Libs/InterfaceSrcs/Interface.Make
+--- a/Libs/InterfaceSrcs/Interface.Make
++++ b/Libs/InterfaceSrcs/Interface.Make
+@@ -308,8 +308,7 @@ CommResourceMgrExtensionsObjs			=	"{IfObjDir}CommRsrcMgrExtensionsGlue.a.o"	∂
+ 	Asm {IfAOpts} -o "{Targ}" "{IfSrcDir}Power.a"
+ 
+ 
+-"{IfObjDir}"OSTraps.a.o						ƒ	"{ObjDir}"StandardEqu.d					∂
+-												"{IfSrcDir}OSTraps.a"
++"{IfObjDir}"OSTraps.a.o						ƒ	"{IfSrcDir}OSTraps.a"
+ 	Asm {IfAOpts} -o "{Targ}" "{IfSrcDir}OSTraps.a"
+ 
+ 
+diff --git a/Make/Build b/Make/Build
+--- a/Make/Build
++++ b/Make/Build
+@@ -228,7 +228,7 @@
+ #	Make sure that we FeatureSet as the first target
+ #
+ 	If "{Targets}"
+-		Set Targets "FeatureSet {Targets}"
++		Set Targets "FeatureSet StandardEqu {Targets}"
+ 	End
+ 
+ #
 diff --git a/Make/DBLite.make b/Make/DBLite.make
 --- a/Make/DBLite.make
 +++ b/Make/DBLite.make
+@@ -188,7 +188,7 @@ ResourceFiles	=	"{MiscDir}AppleTalk.ROM.RSRC"			∂
+ 					"{RsrcDir}kbd.rsrc"						
+ 
+ 
+-RomMondo						ƒ	FeatureSet "{ObjDir}StandardEqu.d" "{ImageDir}RomMondo"
++RomMondo						ƒ	FeatureSet StandardEqu "{ImageDir}RomMondo"
+ 	Beep;Beep;Beep
+ 
+ 
 @@ -254,7 +254,7 @@ Clean							ƒ
  .cp.o							ƒ	.c
  	{CPlus} {StdCPOpts} -o {Targ} {DepDir}{Default}.cp
@@ -38,6 +72,15 @@ diff --git a/Make/DBLite.make b/Make/DBLite.make
 diff --git a/Make/LC930.make b/Make/LC930.make
 --- a/Make/LC930.make
 +++ b/Make/LC930.make
+@@ -163,7 +163,7 @@ ResourceFiles	=	"{RsrcDir}ATBoot.RSRC"					∂
+ 					"{RsrcDir}kbd.rsrc"						
+ 
+ 
+-RomMondo						ƒ	FeatureSet "{ObjDir}StandardEqu.d" "{ImageDir}RomMondo"
++RomMondo						ƒ	FeatureSet StandardEqu "{ImageDir}RomMondo"
+ 	Beep;Beep;Beep
+ 
+ 
 @@ -236,12 +236,10 @@ Clean							ƒ
  	{CPlus} {StdCPOpts} -o {Targ} {DepDir}{Default}.cp
  
@@ -52,9 +95,29 @@ diff --git a/Make/LC930.make b/Make/LC930.make
 -#include {DriverDir}Drivers.make
 -
  #include {ResourceDir}Resources.make
+diff --git a/Make/MainCode.Make b/Make/MainCode.Make
+--- a/Make/MainCode.Make
++++ b/Make/MainCode.Make
+@@ -154,6 +154,7 @@ MainCodeLibs = 												∂
+ #	It would be nice to be able to avoid full builds although the
+ #	Traps.a files will use the stale setting of ROMFastTraps
+ #
++StandardEqu						ƒ	"{ObjDir}StandardEqu.d"
+ "{ObjDir}StandardEqu.d"			ƒ
+ 	Asm {StdEquAOpts} -o Dev:Null "{IntAIncludes}StandardEqu.a" -i "{IntAIncludes}"
+ 	Move -y StandardEqu.d "{Targ}"
 diff --git a/Make/RISC.make b/Make/RISC.make
 --- a/Make/RISC.make
 +++ b/Make/RISC.make
+@@ -316,7 +316,7 @@ ResourceFiles	=	"{RsrcDir}ATBoot.RSRC"					∂
+ 					"{RsrcDir}kbd.rsrc"
+ 
+ 
+-RomMondo						ƒ	FeatureSet "{ObjDir}StandardEqu.d" {ImageDir}RomMondo"
++RomMondo						ƒ	FeatureSet StandardEqu "{ImageDir}RomMondo"
+ 
+ 
+ "{ImageDir}RomMondo"			ƒ	{ResourceFiles}
 @@ -379,12 +379,10 @@ Clean							ƒ
  .cp.o							ƒ	.c
  	{CPlus} {StdCPOpts} -o {Targ} {DepDir}{Default}.cp
@@ -72,6 +135,15 @@ diff --git a/Make/RISC.make b/Make/RISC.make
 diff --git a/Make/Universal.make b/Make/Universal.make
 --- a/Make/Universal.make
 +++ b/Make/Universal.make
+@@ -297,7 +297,7 @@ ResourceFiles	=	"{MiscDir}AppleTalk.ROM.RSRC"			∂
+ 					"{RsrcDir}kbd.rsrc"						
+ 
+ 
+-RomMondo						ƒ	FeatureSet "{ObjDir}StandardEqu.d" "{ImageDir}RomMondo"
++RomMondo						ƒ	FeatureSet StandardEqu "{ImageDir}RomMondo"
+ 	beep 1300,3,25 0,1,0  1200,3,25 0,1,0 1100,3,25 0,1,0  1000,3,25 
+ 
+ 
 @@ -367,12 +367,10 @@ Clean							ƒ
  	{Pascal} {StdPOpts} -o {Targ} {DepDir}{Default}.p
  
@@ -130,7 +202,7 @@ diff --git a/Toolbox/Toolbox.make b/Toolbox/Toolbox.make
 new file mode 100644
 --- /dev/null
 +++ b/Toolbox/Toolbox.make
-@@ -0,0 +1,110 @@
+@@ -0,0 +1,115 @@
 +# This makefile was missing. Here is a rudimentary reconstruction.
 +
 +AliasMgrDir 				= "{ToolBoxDir}AliasMgr:"
@@ -194,12 +266,14 @@ new file mode 100644
 +ToolboxObjs	= 						"{ObjDir}PackageMgr.a.o"						∂
 +									"{ObjDir}SegmentLoader.a.o"						∂
 +									"{ObjDir}ShutDownMgr.a.o"						∂
++									"{ObjDir}ShutDownMgr.c.o"						∂
 +									"{ObjDir}Munger.a.o"							∂
 +									"{ObjDir}DeskMgr.a.o"							∂
 +									"{ObjDir}GetMgr.a.o"							∂
 +									"{ObjDir}TextEdit.a.o"							∂
 +									"{ObjDir}ScrapMgr.a.o"							∂
 +									"{ObjDir}PrintGlue.a.o"							∂
++									"{ObjDir}BlueBoxPrintHook.c.o"					∂
 +									"{ObjDir}SexyDate.a.o"							∂
 +
 +
@@ -218,6 +292,9 @@ new file mode 100644
 +"{ObjDir}ShutDownMgr.a.o"			ƒ	"{ToolboxDir}ShutDownMgr:ShutDownMgr.a"
 +	Asm {StdAOpts} -o "{Targ}" "{ToolboxDir}ShutDownMgr:ShutDownMgr.a"
 +
++"{ObjDir}ShutDownMgr.c.o"			ƒ	"{ToolboxDir}ShutDownMgr:ShutDownMgr.c"
++	C {StdCOpts} -o "{Targ}" "{ToolboxDir}ShutDownMgr:ShutDownMgr.c"
++
 +"{ObjDir}Munger.a.o"				ƒ	"{ToolboxDir}Munger:Munger.a"
 +	Asm {StdAOpts} -o "{Targ}" "{ToolboxDir}Munger:Munger.a"
 +
@@ -233,14 +310,14 @@ new file mode 100644
 +"{ObjDir}SexyDate.a.o"				ƒ	"{ToolboxDir}SexyDate.a"
 +	Asm {StdAOpts} -o "{Targ}" "{ToolboxDir}SexyDate.a"
 +
-+"{ObjDir}ScrapMgr.a.o"				ƒ	"{ObjDir}StandardEqu.d"						∂
-+										"{ScrapMgrDir}ScrapMgr.a"
++"{ObjDir}ScrapMgr.a.o"				ƒ	"{ScrapMgrDir}ScrapMgr.a"
 +	Asm {StdAOpts} -o "{Targ}" "{ScrapMgrDir}ScrapMgr.a"
 +
-+"{ObjDir}PrintGlue.a.o"				ƒ	"{ObjDir}StandardEqu.d"						∂
-+										"{AIncludes}PrPrivate.a"					∂
-+										"{PrintingDir}PrintGlue.a"
++"{ObjDir}PrintGlue.a.o"				ƒ	"{PrintingDir}PrintGlue.a"
 +	Asm {StdAOpts} -o "{Targ}" "{PrintingDir}PrintGlue.a"
++
++"{ObjDir}BlueBoxPrintHook.c.o"		ƒ	"{PrintingDir}BlueBoxPrintHook.c"
++	C {StdCOpts} -o "{Targ}" "{PrintingDir}BlueBoxPrintHook.c"
 diff --git a/Toolbox/Toolbox.make.idump b/Toolbox/Toolbox.make.idump
 new file mode 100644
 --- /dev/null