Mercurial > hg > Members > kono > nitros9-code

--- a/3rdparty/packages/arcadepak/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/arcadepak/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -6,22 +6,27 @@
 CMD		= $(6809L2)/cmds
 DISK_40D	= arcadepack_40d.dsk
 DISK_80D	= arcadepack_80d.dsk
+DISK_DW 	= arcadepack_dw.dsk
+DISK_BECKER	= arcadepack_becker.dsk
 CMDS		= grfdrv runb
 SHELLMODS	= $(CMD)/shell_21 $(CMD)/dir $(CMD)/echo $(CMD)/link $(CMD)/load $(CMD)/mdir

-SMASHCMDS	= $(shell $(CD) smash; make showobjs)
-SMASHSYS	= $(shell $(CD) smash; make showsys)
-SMASHROOT	= $(shell $(CD) smash; make showroot)
-THEXCMDS	= $(shell $(CD) thexder; make showobjs)
-THEXSYS		= $(shell $(CD) thexder; make showsys)
-THEXROOT	= $(shell $(CD) thexder; make showroot)
-SHANGCMDS	= $(shell $(CD) shanghai; make showobjs)
-SHANGSYS	= $(shell $(CD) shanghai; make showsys)
-SHANGROOT	= $(shell $(CD) shanghai; make showroot)
+SMASHCMDS	= $(shell $(CD) smash; make --no-print-directory showobjs)
+SMASHSYS	= $(shell $(CD) smash; make --no-print-directory showsys)
+SMASHROOT	= $(shell $(CD) smash; make --no-print-directory showroot)
+THEXCMDS	= $(shell $(CD) thexder; make --no-print-directory showobjs)
+THEXSYS		= $(shell $(CD) thexder; make --no-print-directory showsys)
+THEXROOT	= $(shell $(CD) thexder; make --no-print-directory showroot)
+SHANGCMDS	= $(shell $(CD) shanghai; make --no-print-directory showobjs)
+SHANGSYS	= $(shell $(CD) shanghai; make --no-print-directory showsys)
+SHANGROOT	= $(shell $(CD) shanghai; make --no-print-directory showroot)
 MD		= $(6809L2)/modules

 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_40 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL_DW 	= $(MD)/rel_40 $(MD)/boot_dw $(MD)/krn
+KERNEL_BECKER	= $(MD)/rel_40 $(MD)/boot_dw_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -42,14 +47,36 @@
 		$(MD)/w6.dw $(MD)/w7.dw \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

+OS9BOOT_DW 	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
+		$(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw $(MD)/w5.dw \
+		$(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
+OS9BOOT_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/cogrf.io $(MD)/term_win40.dt $(MD)/w.dw $(MD)/w1.dw \
+		$(MD)/w2.dw $(MD)/w3.dw $(MD)/w4.dw $(MD)/w5.dw \
+		$(MD)/w6.dw $(MD)/w7.dw \
+		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
 ALLOBJS		= $(CMDS)

+DSKS		= $(DISK_40D) $(DISK_80D) $(DISK_DW) $(DISK_BECKER)
+
 all: shell
 	$(CD) smash; make
 	$(CD) thexder; make
 	$(CD) shanghai; make

-dsk:	$(DISK_40D) $(DISK_80D)
+dsk:	all $(DSKS)

 shell:	$(DEPENDS)
 	$(MERGE) $(SHELLMODS)>$@
@@ -58,6 +85,7 @@
 	@$(ECHO) ""

 $(DISK_40D): all
+	$(RM) $@
 	$(CD) $(6809L2); make
 	$(OS9FORMAT_DS40) $@ -n"NitrOS-9 Arcade Pack"
 	$(MERGE) $(OS9BOOT_40D)>os9boot
@@ -87,6 +115,7 @@
 	$(CPL) startup $@,

 $(DISK_80D): all
+	$(RM) $@
 	$(CD) $(6809L2); make
 	$(OS9FORMAT_DS80) $@ -n"NitrOS-9 Arcade Pack"
 	$(MERGE) $(OS9BOOT_80D)>os9boot
@@ -95,7 +124,64 @@
 	$(RM) os9boot kernel_1773
 	$(MAKDIR) $@,CMDS
 	$(CP) shell $@,CMDS/shell
-	$(RM) shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MAKDIR) $@,SYS
+	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(CPL) startup $@,
+
+$(DISK_DW): all
+	$(RM) $@
+	$(CD) $(6809L2); make
+	$(OS9FORMAT_DW) $@ -n"NitrOS-9 Arcade Pack"
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) shell $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(CP) smash/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SMASHCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(CP) thexder/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(THEXCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(CP) shanghai/$(file) $@,CMDS/$(file);)
+	$(foreach file, $(SHANGCMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MAKDIR) $@,SYS
+	$(foreach file, $(SMASHSYS), $(CP) smash/$(file) $@,SYS/$(file);)
+	$(foreach file, $(THEXSYS), $(CP) thexder/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SHANGSYS), $(CP) shanghai/$(file) $@,SYS/$(file);)
+	$(foreach file, $(SMASHROOT), $(CP) smash/$(file) $@,$(file);)
+	$(foreach file, $(THEXROOT), $(CP) thexder/$(file) $@,$(file);)
+	$(foreach file, $(SHANGROOT), $(CP) shanghai/$(file) $@,$(file);)
+	$(CPL) startup $@,
+
+$(DISK_BECKER): all
+	$(RM) $@
+	$(CD) $(6809L2); make
+	$(OS9FORMAT_DW) $@ -n"NitrOS-9 Arcade Pack"
+	$(MERGE) $(OS9BOOT_BECKER)>os9boot
+	$(MERGE) $(KERNEL_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) shell $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
 	$(foreach file, $(CMDS), $(CP) $(6809L2)/cmds/$(file) $@,CMDS/$(file);)
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
@@ -122,10 +208,10 @@
 	$(CD) shanghai; make clean

 dskcopy: dsk
-	$(CP) $(DISK_40D) $(DISK_80D) $(DSKDIR)
+	$(CP) $(DSKS) $(DSKDIR)

 dskclean:
-	$(RM) $(DISK_40D) $(DISK_80D)
+	$(RM) $(DSKS)

 info:
 	@$(ECHO) "*** NitrOS-9 Arcade Pak ***"
--- a/3rdparty/packages/fsim2/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/fsim2/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,14 +4,17 @@

 DSK_FLOPPY	= fsim2.dsk
 DSK_DW		= fsim2_dw.dsk
+DSK_DW_BECKER	= fsim2_becker.dsk
+
 CMDS		= fs f2 f3 f4
 MD		= $(LEVEL2)/coco3/modules

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn

 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -33,6 +36,16 @@
 		$(MD)/clock_60hz $(MD)/clock2_dw \
 		$(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/ftdd.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw \
+		$(MD)/sysgo_dd
+
 SUPPORTFILES	= fa fd fp sf.standard

 ALLOBJS		= $(CMDS)
@@ -42,16 +55,33 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk:	$(DSKS)
+dsk:	all $(DSKS)

 $(DSK_DW):
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_SS35) -q $@ -n"Flight Simulator 2"
+	$(OS9FORMAT_DW) -q $@ -n"Flight Simulator 2"
 	$(MERGE) $(BOOTFILE_DW)>os9boot
-	$(MERGE) $(KERNEL_DW)>kernel_1773
-	$(OS9GEN) $@ -b=os9boot -t=kernel_1773
-	$(RM) os9boot kernel_1773
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/fs AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n"Flight Simulator 2"
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
 	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
@@ -66,9 +96,9 @@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_SS35) -q $@ -n"Flight Simulator 2"
 	$(MERGE) $(BOOTFILE_FLOPPY)>os9boot
-	$(MERGE) $(KERNEL_FLOPPY)>kernel_1773
-	$(OS9GEN) $@ -b=os9boot -t=kernel_1773
-	$(RM) os9boot kernel_1773
+	$(MERGE) $(KERNEL_FLOPPY)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
 	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
 	$(OS9ATTR_EXEC) $@,CMDS/shell
--- a/3rdparty/packages/koronis/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/koronis/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,14 +4,16 @@

 DSK_FLOPPY	= koronis.dsk
 DSK_DW		= koronis_dw.dsk
+DSK_DW_BECKER	= koronis_becker.dsk
 CMDS		= koronis
 MD		= $(LEVEL2)/coco3/modules

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -28,6 +30,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 SUPPORTFILES	= SAVE1 SAVE2 crobot2.c ctitle.c korvar \
 		level01 level02 level03 level04 level05 level06 level07 \
 		level08 level09 level10 level11 level12 level13 level14 \
@@ -76,6 +86,23 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)

+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS35) -q $@ -n"Koronis Rift"
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/koronis AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/kyumgai/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/kyumgai/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,14 +4,18 @@

 DSK_FLOPPY	= kyumgai.dsk
 DSK_DW		= kyumgai_dw.dsk
+DSK_DW_BECKER	= kyumgai_becker.dsk
+
 CMDS		= ninja ninja.snd1 ninja.snd2
 MD		= $(LEVEL2)/coco3/modules

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -28,6 +32,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 SUPPORTFILES	= backgnd.dat backgnd2.dat bigblocks.dat blakguy.dat \
 		gameover.dat giant.dat kyumgai.pla level1.dat level2.dat \
 		level3.dat level4.dat level5.dat level6.dat level7.dat \
@@ -79,6 +91,23 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)

+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS80) -q $@ -n"Kyum-Gai: To Be Ninja"
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/ninja AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,6 +1,6 @@
 include $(NITROS9DIR)/rules.mak

-dirs	= arcadepak basic09 deskmate3 cc fsim2 koronis kyumgai mm multivue pacos9 rof sierra subsim uucpbb
+dirs	= arcadepak basic09 deskmate3 cc fsim2 koronis kyumgai mm multivue os9l2bbs pacos9 raakatu rof sierra subsim uucpbb

 # Make all components
 all:
--- a/3rdparty/packages/mm/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/mm/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,15 +4,19 @@

 DSK_FLOPPY	= mm.dsk
 DSK_DW		= mm_dw.dsk
+DSK_DW_BECKER	= mm_dw_becker.dsk
+
 CMDS		= mm mod1.dat mod2.dat mod3.dat mod4.dat mod5.dat \
 		mod6.sbr mod7.sbr mod8.sbr
 MD		= $(LEVEL2)/coco3/modules

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -29,6 +33,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 SUPPORTFILES	= global.dat mm.lib mm.pnl mm.ttl mod7.lib

 ALLOBJS		= $(CMDS)
@@ -74,6 +86,23 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)

+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS80) -q $@ -n"Microscopic Mission"
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/mm AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_EXEC) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/multivue/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/multivue/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,6 +4,9 @@
 DSK63_FLOPPY	= multivue_6309.dsk
 DSK68_DW	= multivue_6809_dw.dsk
 DSK63_DW	= multivue_6309_dw.dsk
+DSK68_DW_BECKER	= multivue_6809_becker.dsk
+DSK63_DW_BECKER	= multivue_6309_becker.dsk
+
 CMDS68	= $(shell $(CD) cmds_6809; make --no-print-directory showobjs)
 CMDS63	= $(shell $(CD) cmds_6309; make --no-print-directory showobjs)
 ICONS	= icon.demo
@@ -12,7 +15,7 @@
 DEMO	= aif.dmo
 ROOTFILES = startup

-DSKS	= $(DSK68_FLOPPY) $(DSK63_FLOPPY) $(DSK68_DW) $(DSK63_DW)
+DSKS	= $(DSK68_FLOPPY) $(DSK63_FLOPPY) $(DSK68_DW) $(DSK63_DW) $(DSK68_DW_BECKER) $(DSK63_DW_BECKER)

 MD68	= $(LEVEL2)/coco3/modules
 MD63	= $(LEVEL2)/coco3_6309/modules
@@ -21,6 +24,8 @@
 KERNEL63_FLOPPY	= $(MD63)/rel_40 $(MD63)/boot_1773_6ms $(MD63)/krn
 KERNEL68_DW	= $(MD68)/rel_40 $(MD68)/boot_dw $(MD68)/krn
 KERNEL63_DW	= $(MD63)/rel_40 $(MD63)/boot_dw $(MD63)/krn
+KERNEL68_DW_BECKER	= $(MD68)/rel_40 $(MD68)/boot_dw_becker $(MD68)/krn
+KERNEL63_DW_BECKER	= $(MD63)/rel_40 $(MD63)/boot_dw_becker $(MD63)/krn

 BOOTFILE68_FLOPPY	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
 		$(MD68)/rbf.mn \
@@ -58,6 +63,18 @@
 		$(MD68)/clock_60hz $(MD68)/clock2_dw \
 		$(MD68)/sysgo_dd

+BOOTFILE68_DW_BECKER	= $(MD68)/krnp2 $(MD68)/ioman $(MD68)/init \
+		$(MD68)/rbf.mn \
+		$(MD68)/rbdw.dr $(MD68)/dwio_becker.sb $(MD68)/ddx0.dd \
+		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
+		$(MD68)/scf.mn $(MD68)/vtio.dr \
+		$(MD68)/keydrv_cc3.sb $(MD68)/joydrv_joy.sb $(MD68)/snddrv_cc3.sb \
+		$(MD68)/cowin.io $(MD68)/term_win40.dt \
+		$(MD68)/w.dw $(MD68)/w1.dw $(MD68)/w2.dw $(MD68)/w3.dw \
+		$(MD68)/w4.dw $(MD68)/w5.dw $(MD68)/w6.dw $(MD68)/w7.dw \
+		$(MD68)/clock_60hz $(MD68)/clock2_dw \
+		$(MD68)/sysgo_dd
+
 BOOTFILE63_DW	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
 		$(MD63)/rbf.mn \
 		$(MD63)/rbdw.dr $(MD63)/dwio.sb $(MD63)/ddx0.dd \
@@ -70,6 +87,18 @@
 		$(MD63)/clock_60hz $(MD63)/clock2_dw \
 		$(MD63)/sysgo_dd

+BOOTFILE63_DW_BECKER	= $(MD63)/krnp2 $(MD63)/ioman $(MD63)/init \
+		$(MD63)/rbf.mn \
+		$(MD63)/rbdw.dr $(MD63)/dwio.sb $(MD63)/ddx0.dd \
+		$(MD68)/rb1773.dr $(MD68)/d0_40d.dd $(MD68)/d1_40d.dd \
+		$(MD63)/scf.mn $(MD63)/vtio.dr \
+		$(MD63)/keydrv_cc3.sb $(MD63)/joydrv_joy.sb $(MD63)/snddrv_cc3.sb \
+		$(MD63)/cowin.io $(MD63)/term_win40.dt \
+		$(MD63)/w.dw $(MD63)/w1.dw $(MD63)/w2.dw $(MD63)/w3.dw \
+		$(MD63)/w4.dw $(MD63)/w5.dw $(MD63)/w6.dw $(MD63)/w7.dw \
+		$(MD63)/clock_60hz $(MD63)/clock2_dw \
+		$(MD63)/sysgo_dd
+
 # Make all components
 all:
 	@$(ECHO) "**************************************************"
@@ -165,6 +194,31 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)

+$(DSK68_DW_BECKER):
+	$(RM) $@
+	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
+	$(MERGE) $(BOOTFILE68_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL68_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,CMDS/ICONS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEMO
+	$(CD) cmds_6809; $(CP) $(CMDS68) ../$@,CMDS
+	$(foreach file, $(CMDS68), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
+	$(OS9RENAME) $@,CMDS/gshell AutoEx
+	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) demo; $(CPL) $(DEMO) ../$@,DEMO
+	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $@,DEMO/$(file);)
+	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 $(DSK63_DW):
 	$(RM) $@
 	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
@@ -190,6 +244,31 @@
 	$(CPL) $(ROOTFILES) $@,.
 	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)

+$(DSK63_DW_BECKER):
+	$(RM) $@
+	$(OS9FORMAT_SS80) $@ -q -n"Multi-Vue"
+	$(MERGE) $(BOOTFILE63_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL63_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(MAKDIR) $@,CMDS/ICONS
+	$(MAKDIR) $@,SYS
+	$(MAKDIR) $@,DEMO
+	$(CD) cmds_6309; $(CP) $(CMDS63) ../$@,CMDS
+	$(foreach file, $(CMDS63), $(OS9ATTR_EXEC) $@,CMDS/$(notdir $(file));)
+	$(OS9RENAME) $@,CMDS/gshell AutoEx
+	$(CD) icons; $(CP) $(ICONS) ../$@,CMDS/ICONS
+	$(foreach file, $(ICONS), $(OS9ATTR_EXEC) $@,CMDS/ICONS/$(file);)
+	$(CD) sys; $(CP) $(SYSBIN) ../$@,SYS
+	$(foreach file, $(SYSBIN), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) sys; $(CPL) $(SYSTEXT) ../$@,SYS
+	$(foreach file, $(SYSTEXT), $(OS9ATTR_TEXT) $@,SYS/$(file);)
+	$(CD) demo; $(CPL) $(DEMO) ../$@,DEMO
+	$(foreach file, $(DEMO), $(OS9ATTR_TEXT) $@,DEMO/$(file);)
+	$(CPL) $(ROOTFILES) $@,.
+	$(foreach file, $(ROOTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/os9l2bbs/6809l2/defsfile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/os9l2bbs/6809l2/defsfile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,6 +1,4 @@
 Level    equ   2
-
-         use   os9defs
-         use   scfdefs
-         use   rbfdefs
-         use   systype
+         use   os9.d
+         use   scf.d
+         use   rbf.d
--- a/3rdparty/packages/os9l2bbs/cmds/New_user.asm	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/os9l2bbs/cmds/New_user.asm	Wed Jan 23 21:02:34 2013 -0600
@@ -63,7 +63,7 @@
 L0054      ldu    $02,S                                                 * 0054 EE 62          nb
            ldd    ,Y++                                                  * 0056 EC A1          l!
            beq    L0061                                                 * 0058 27 07          '.
-           leax   >,PC                                                  * 005A 30 8D FF A2    0.."
+           leax   0,PC                                                  * 005A 30 8D FF A2    0.."
            lbsr   L0164                                                 * 005E 17 01 03       ...
 L0061      ldd    ,Y++                                                  * 0061 EC A1          l!
            beq    L006A                                                 * 0063 27 05          '.
--- a/3rdparty/packages/pacos9/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/pacos9/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,7 +4,7 @@
 	score90.r scrns90.r setup90.r

 pacos9: $(RFILES)
-	rlink  $(RFILES) -o=pacos9 -l=$(C3BASE)/lib/sys.l
+	rlink  $(RFILES) -o=pacos9 -l=$(NITROS9DIR)/lib/sys6809l2.l

 clean:
 	$(RM) $(RFILES) pacos9
--- a/3rdparty/packages/raakatu/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/raakatu/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -7,7 +7,7 @@
 MD		= $(LEVEL2)/coco3/modules

 # We make our own bootfile and kernel track
-KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
+KERNEL   	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 OS9BOOT		= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
--- a/3rdparty/packages/raakatu/raaka-tu.asm	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/raakatu/raaka-tu.asm	Wed Jan 23 21:02:34 2013 -0600
@@ -4,7 +4,7 @@
 * Disassembled 2004/07/13 07:31:17 by Disasm v1.5 (C) 1988 by RML

          ifp1
-         use   os9defs
+         use   os9.d
          endc

 THEOS9WAY equ  1
--- a/3rdparty/packages/raakatu/raakatu.asm	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/raakatu/raakatu.asm	Wed Jan 23 21:02:34 2013 -0600
@@ -135,7 +135,7 @@
 * Disassembled 2004/07/13 07:31:17 by Disasm v1.5 (C) 1988 by RML

          ifp1
-         use   os9defs
+         use   os9.d
          endc

 tylg     set   Prgrm+Objct
@@ -2285,7 +2285,7 @@
 L1513          fcb       $20,$09,$00,$80,$34 ; 34: JUMP OVER   *          u.......
 L1518          fcb       $20,$05,$00,$80,$36 ; 36: JUMP IN     *          u.......
 L151D          fcb       $20,$06,$00,$80,$37 ; 37: JUMP OUT    *          u.......
-L1522          fcb       $00,
+L1522          fcb       $00


 ;##RoomDescriptions
@@ -4955,7 +4955,7 @@
 ;##InputWordTables

 ; --- IGNORES --- Maybe for curse words. No words in this list and thus never used.
-L3C29          fcb       $00,
+L3C29          fcb       $00
 ;
 ; --- VERBS ---
 L3C2A          fcb       $04,$52,$45,$41,$44,$01 ; READ     1
@@ -5012,7 +5012,7 @@
 L3D5F          fcb       $05,$50,$4C,$55,$47,$48,$32 ; PLUGH    50
 L3D66          fcb       $05,$4C,$45,$41,$56,$45,$2C ; LEAVE    44
 L3D6D          fcb       $04,$50,$49,$43,$4B,$34 ; PICK     52
-L3D73          fcb       $00,
+L3D73          fcb       $00
 ;
 ; --- NOUNS ---
 L3D74          fcb       $06,$50,$4F,$54,$49,$4F,$4E,$03 ; POTION   3
@@ -5065,10 +5065,10 @@
 L3EB8          fcb       $06,$54,$45,$4D,$50,$4C,$45,$39 ; TEMPLE   57
 L3EC0          fcb       $03,$50,$49,$54,$3A ; PIT      58
 L3EC5          fcb       $06,$43,$45,$49,$4C,$49,$4E,$3B ; CEILIN   59
-L3ECD          fcb       $00,
+L3ECD          fcb       $00
 ;
 ; --- ADJECTIVES ---
-L3ECE          fcb       $00,
+L3ECE          fcb       $00
 ;
 ; --- PREPOSITIONS ---
 L3ECF          fcb       $02,$54,$4F,$01     ; TO       1
@@ -5109,6 +5109,7 @@
          os9   I$WritLn
 DoCHROUT
          puls  d,x,y
+ rts
          pshs  x,b,a
          ldx   $88			get cursor position
          cmpa  #$08			backspace character?
@@ -5159,4 +5160,4 @@

                emod
 eom            equ       *
-			   end
\ No newline at end of file
+			   end
--- a/3rdparty/packages/rof/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/rof/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,14 +4,18 @@

 DSK_FLOPPY	= rof.dsk
 DSK_DW		= rof_dw.dsk
+DSK_DW_BECKER	= rof_becker.dsk
+
 CMDS		= rescue
 MD		= $(LEVEL2)/coco3/modules

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -28,6 +32,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 SUPPORTFILES	= body heads larms legs lips panel1 rofvar rship.c rtitle.c scores

 ALLOBJS		= $(CMDS)
@@ -73,6 +85,23 @@
 	$(CP) $(SUPPORTFILES) $@,.
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)

+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS35) -q $@ -n"Rescue on Fractalus"
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/rescue AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/blackcauldron/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/blackcauldron/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,8 +8,9 @@
 DSK_2_40D	= blackcauldron_d2_40d.dsk
 DSK_80D		= blackcauldron_80d.dsk
 DSK_DW		= blackcauldron_dw.dsk
+DSK_DW_BECKER	= blackcauldron_becker.dsk

-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW)
+DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW) $(DSK_DW_BECKER)

 DSK_1_40D_NAME = "The Black Cauldron Disk 1"
 DSK_2_40D_NAME = "The Black Cauldron Disk 2"
@@ -25,6 +23,7 @@
 # We make our own bootfile and KERNEL_FLOPPY track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -52,6 +51,16 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -140,10 +149,35 @@
 	$(CPL) $(TEXTFILES) $(DSK_DW),.
 	$(OS9RENAME) $(DSK_DW),tOC_40d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DSK_DW),.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
+	$(MOVE) toctmp tocgen

-dsk:	dsk_40d dsk_80d dsk_dw
+dsk_dw_becker:	all
+	$(RM) $(DSK_DW_BECKER)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $(DSK_DW_BECKER) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $(DSK_DW_BECKER),CMDS
+	$(CP) $(CMDS) $(DSK_DW_BECKER),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DSK_DW_BECKER),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DSK_DW_BECKER),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $(DSK_DW_BECKER),.
+	$(OS9RENAME) $(DSK_DW_BECKER),tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW_BECKER),.
+	$(MOVE) tocgen toctmp
+	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
+	$(MOVE) toctmp tocgen
+
+
+dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/christmas86/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/christmas86/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -9,8 +6,9 @@

 DSK_FLOPPY	= christmas86.dsk
 DSK_DW		= christmas86_dw.dsk
+DSK_DW_BECKER	= christmas86_becker.dsk

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 DSK_NAME	= "Christmas 1986"

@@ -20,6 +18,7 @@
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn

 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -39,6 +38,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -81,7 +89,7 @@
 $(DSK_DW):	all
 	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $@ -n$(DSK_NAME)
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
 	$(MERGE) $(BOOTFILE_DW)>os9boot
 	$(MERGE) $(KERNEL_DW)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
@@ -95,8 +103,31 @@
 	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
+
+$(DSK_DW_BECKER):	all
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.

 dskcopy: dsk
--- a/3rdparty/packages/sierra/goldrush/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/goldrush/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,18 +1,16 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

 DEPENDS		= ./makefile

 DSKDW		= goldrush_dw.dsk
+DSKDWBECKER	= goldrush_becker.dsk
 DISK_1_80D	= goldrush_d1_80d.dsk
 DISK_2_80D	= goldrush_d2_80d.dsk
 DISK_3_80D	= goldrush_d3_80d.dsk

-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DSKDW)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DSKDW) $(DSKDWBECKER)

 DISK_1_80D_NAME = "Gold Rush Disk 1"
 DISK_2_80D_NAME = "Gold Rush Disk 2"
@@ -25,6 +23,7 @@
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 BOOTFILE_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -43,12 +42,22 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime

 TEXTFILES_D1	= ../startup tOC_80d.txt
 TEXTFILES_DW	= ../startup tOC_dw.txt
+TEXTFILES_DW_BECKER	= ../startup tOC_dw_becker.txt

 SUPPORTFILES_D1	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.9 vol.10 vol.11 vol.12 words.tok
@@ -57,14 +66,18 @@

 SUPPORTFILES_D3	= object vol.0 vol.4 vol.5 vol.9 vol.11 vol.12

+SUPPORTFILES_ALL	= logDir object picDir sndDir viewDir vol.0 \
+		vol.1 vol.2 vol.3 vol.4 vol.5 vol.9 vol.10 \
+		vol.11 vol.12 words.tok
+
 ALLOBJS		= $(CMDS)

 all:	$(ALLOBJS)

 clean:	dskclean
-	$(RM) $(ALLOBJS) kernel os9boot
+	$(RM) $(ALLOBJS)

-dsk:	all $(DSKDW) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)
+dsk:	all $(DSKDW) $(DSKDWBECKER) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D)

 $(DSKDW):
 	$(RM) $@
@@ -84,21 +97,42 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES_DW) $@,.
 	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $@,.
-	$(CP) $(SUPPORTFILES_D2) $@,.
-	$(CP) $(SUPPORTFILES_D3) $@,.
+	$(CP) $(SUPPORTFILES_ALL) $@,.
 	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DSKDWBECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DSKDW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW_BECKER) $@,.
+	$(OS9RENAME) $@,tOC_dw_becker.txt tOC.txt
+	$(CP) $(SUPPORTFILES_ALL) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen

 $(DISK_1_80D):
 	$(RM) $@
-	$(MOVE) toctmp tocgen
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
 	$(MERGE) $(BOOTFILE_80D)>os9boot
 	$(MERGE) $(KERNEL_FLOPPY)>kernel
 	$(OS9GEN) $@ -b=os9boot -t=kernel
-	$(RM) os9boot_80d os9boot_80d kernel_1773
+	$(RM) os9boot kernel
 	$(MAKDIR) $@,CMDS
 	$(CP) $(CMDS) $@,CMDS
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
@@ -110,8 +144,9 @@
 	$(CPL) $(TEXTFILES_D1) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES_D1) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen


 $(DISK_2_80D):
--- a/3rdparty/packages/sierra/kingsquest1/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/kingsquest1/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -9,8 +6,9 @@

 DISK_40D	= kingsquest1_40d.dsk
 DSKDW		= kingsquest1_dw.dsk
+DSKDWBECKER	= kingsquest1_becker.dsk

-DSKS		= $(DISK_40D) $(DSKDW)
+DSKS		= $(DISK_40D) $(DSKDW) $(DSKDWBECKER)

 DISK_40D_NAME	= "King's Quest I"
 DSKDW_NAME	= $(DISK_40D_NAME)
@@ -21,6 +19,7 @@
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn

 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -40,6 +39,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -56,7 +64,7 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk:	all $(DISK_40D) $(DSKDW)
+dsk:	all $(DISK_40D) $(DSKDW) $(DSKDWBECKER)

 $(DISK_40D):
 	$(RM) $@
@@ -99,8 +107,32 @@
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
+
+$(DSKDWBECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_40D_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(CP) $(SUPPORTFILES) $@,.

 dskcopy: dsk
--- a/3rdparty/packages/sierra/kingsquest2/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/kingsquest2/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -10,9 +7,10 @@
 DSK_1_40D	= kingsquest2_d1_40d.dsk
 DSK_2_40D	= kingsquest2_d2_40d.dsk
 DSK_80D		= kingsquest2_80d.dsk
-DSK_DW          = kingsquest2_dw.dsk
+DSK_DW		= kingsquest2_dw.dsk
+DSK_DW_BECKER	= kingsquest2_becker.dsk

-DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW)
+DSKS		= $(DSK_1_40D) $(DSK_2_40D) $(DSK_80D) $(DSK_DW) $(DSK_DW_BECKER)

 DSK_1_40D_NAME	= "King's Quest II Disk 1"
 DSK_2_40D_NAME	= "King's Quest II Disk 2"
@@ -24,7 +22,9 @@

 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW      =$(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 BOOTFILE_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -43,9 +43,18 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

-BOOTFILE_DW    = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
+		$(MD)/rbdw.dr $(MD)/dw.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dw_becker.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
@@ -144,9 +153,32 @@
 	$(CPL) $(TEXTFILES) $@,.
 	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen

+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen

 dsk:	all $(DSKS)

@@ -159,3 +191,4 @@
 info:
 	@$(ECHO) "*** King's Quest II ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
+
--- a/3rdparty/packages/sierra/kingsquest3/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/kingsquest3/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,9 +8,10 @@
 DISK_2_40D	= kingquest3_d2_40d.dsk
 DISK_3_40D	= kingquest3_d3_40d.dsk
 DISK_80D	= kingquest3_80d.dsk
-DSK_DW	= kingsquest3_dw.dsk
+DSK_DW		= kingsquest3_dw.dsk
+DSK_DW_BECKER	= kingsquest3_becker.dsk

-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSK_DW)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DSK_DW) $(DSK_DW_BECKER)

 DISK_1_40D_NAME = "King's Quest III Disk 1"
 DISK_2_40D_NAME = "King's Quest III Disk 2"
@@ -27,6 +25,7 @@
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn

 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -46,7 +45,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

-BOOTFILE_DW    = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -55,6 +54,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -150,10 +158,34 @@
 	$(CPL) $(TEXTFILES_DW) $(DSK_DW),.
 	$(OS9RENAME) $(DSK_DW),tOC_dw.txt tOC.txt
 	$(CP) $(SUPPORTFILES) $(DSK_DW),.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen $(DSK_DW),tOC.txt $(DSK_DW),tOC
+	$(MOVE) toctmp tocgen

-dsk:	dsk_40d dsk_80d dsk_dw
+dsk_dw_becker:	all
+	$(RM) $(DSK_DW_BECKER)
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $(DSK_DW_BECKER) -n$(DSK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot_dw
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel_dw
+	$(OS9GEN) $(DSK_DW_BECKER) -b=os9boot_dw -t=kernel_dw
+	$(RM) os9boot_dw kernel_dw
+	$(MAKDIR) $(DSK_DW_BECKER),CMDS
+	$(CP) $(CMDS) $(DSK_DW_BECKER),CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DSK_DW_BECKER),CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $(DSK_DW_BECKER),CMDS
+	$(RM) shell
+	$(OS9ATTR) $(DSK_DW_BECKER),CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $(DSK_DW_BECKER),CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $(DSK_DW_BECKER),.
+	$(OS9RENAME) $(DSK_DW_BECKER),tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $(DSK_DW_BECKER),.
+	$(MOVE) tocgen toctmp
+	tocgen $(DSK_DW_BECKER),tOC.txt $(DSK_DW_BECKER),tOC
+	$(MOVE) toctmp tocgen
+
+dsk:	dsk_40d dsk_80d dsk_dw dsk_dw_becker

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/kingsquest4/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/kingsquest4/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,8 +8,9 @@
 DISK_2_80D	= kingsquest4_d2_80d.dsk
 DISK_3_80D	= kingsquest4_d3_80d.dsk
 DISK_DW	= kingsquest4_dw.dsk
+DISK_DW_BECKER	= kingsquest4_becker.dsk

-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW) $(DISK_DW_BECKER)

 DISK_1_80D_NAME = "King's Quest IV Disk 1"
 DISK_2_80D_NAME = "King's Quest IV Disk 2"
@@ -25,6 +23,8 @@
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -34,7 +34,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

-BOOTFILE_DW    = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -43,6 +43,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -69,45 +78,84 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk:	all
-	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW)
+dsk:	all $(DSKS)
+
+$(DISK_1_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9FORMAT_DW) -q $(DISK_DW) -n$(DISK_DW_NAME)
-	$(MERGE) $(BOOTFILE_DW)>os9boot_dw
-	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773
-	$(OS9GEN) $(DISK_DW) -b=os9boot_dw -t=kernel_dw
-	$(RM) os9boot_80d os9boot_80d kernel_1773 os9boot_dw kernel_dw
-	$(MAKDIR) $(DISK_1_80D),CMDS
-	$(MAKDIR) $(DISK_DW),CMDS
-	$(CP) $(CMDS) $(DISK_1_80D),CMDS
-	$(CP) $(CMDS) $(DISK_DW),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_80D),CMDS
-	$(CP) shell $(DISK_DW),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_DW),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_80D),.
-	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
-	$(CPL) $(TEXTFILES_DW) $(DISK_DW),.
-	$(OS9RENAME) $(DISK_DW),tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),.
-	$(CP) $(SUPPORTFILES_DW) $(DISK_DW),.
-	$(RM) tocgen
-	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC
-	tocgen $(DISK_DW),tOC.txt $(DISK_DW),tOC
-	$(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),.
-	$(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_2_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_3_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.
+
+$(DISK_DW):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_DW_BECKER):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
@@ -118,3 +166,4 @@
 info:
 	@$(ECHO) "*** King's Quest IV ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
+
--- a/3rdparty/packages/sierra/leisuresuitlarry/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/leisuresuitlarry/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -9,9 +6,11 @@

 DSK_FLOPPY	= leisuresuitlarry.dsk
 DSK_DW		= leisuresuitlarry_dw.dsk
+DSK_DW_BECKER	= leisuresuitlarry_becker.dsk
+
 DSK_NAME	= "Leisure Suit Larry"

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 CMDS		= sierra mnln scrn shdw tocgen
 MD		= $(LEVEL2)/coco3/modules
@@ -19,6 +18,8 @@
 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -27,6 +28,7 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
+
 BOOTFILE_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
@@ -36,6 +38,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 SUPPORTFILES	= logDir object picDir sndDir viewDir vol.0 \
 		vol.1 vol.2 vol.3 vol.4 words.tok

@@ -79,8 +90,27 @@
 	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(OS9RENAME) $@,CMDS/sierra AutoEx
 	$(CP) $(SUPPORTFILES) $@,.
-	$(RM) tocgen
+	$(MOVE) tocgen toctmp
 	tocgen tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)
+
+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DSK_NAME)
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,$(file);)

 dskcopy: dsk
--- a/3rdparty/packages/sierra/manhunter1/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/manhunter1/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,8 +8,10 @@
 DISK_2_80D	= manhunter1_d2_80d.dsk
 DISK_3_80D	= manhunter1_d3_80d.dsk
 DISK_DW	= manhunter1_dw.dsk
+DISK_DW_BECKER	= manhunter1_becker.dsk

-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) \
+		$(DISK_DW) $(DISK_DW_BECKER)

 DISK_1_80D_NAME = "Manhunter I Disk 1"
 DISK_2_80D_NAME = "Manhunter I Disk 2"
@@ -25,6 +24,7 @@
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn

 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
@@ -44,6 +44,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+OS9BOOT_DW_BECKER = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -69,45 +78,84 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk:	all
-	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW)
+dsk:	all $(DSKS)
+
+$(DISK_1_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME)
-	$(OS9FORMAT_DW) -q $(DISK_DW) -n$(DISK_DW_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(OS9BOOT_DW)>os9boot_dw
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773
-	$(OS9GEN) $(DISK_DW) -b=os9boot_dw -t=kernel_dw
-	$(RM) os9boot_80d os9boot_80d kernel_1773 os9boot_dw kernel_dw
-	$(MAKDIR) $(DISK_1_80D),CMDS
-	$(MAKDIR) $(DISK_DW),CMDS
-	$(CP) $(CMDS) $(DISK_1_80D),CMDS
-	$(CP) $(CMDS) $(DISK_DW),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_DW):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_80D),CMDS
-	$(CP) shell $(DISK_DW),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_DW),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_80D),.
-	$(CPL) $(TEXTFILES_DW) $(DISK_DW),.
-	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
-	$(OS9RENAME) $(DISK_DW),tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),.
-	$(CP) $(SUPPORTFILES_DW) $(DISK_DW),.
-	$(RM) tocgen
-	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC
-	tocgen $(DISK_DW),tOC.txt $(DISK_DW),tOC
-	$(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_DW_BECKER):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_2_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_3_80D):
+	$(RM) $@
 	$(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),.
+	$(CP) $(SUPPORTFILES_D3) $@,.

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
@@ -118,3 +166,4 @@
 info:
 	@$(ECHO) "*** Manhunter I ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
+
--- a/3rdparty/packages/sierra/manhunter1/tOC_80d.txt	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/manhunter1/tOC_80d.txt	Wed Jan 23 21:02:34 2013 -0600
@@ -2,4 +2,4 @@
 d1 s1 v0 v2 v10
 d2 s1 v0 v3
 d2 s1 v0 v4 v11 v12
-d3 s1 v0 v5 v9 v10 v11
\ No newline at end of file
+d3 s1 v0 v5 v9 v10 v11
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/manhunter1/tOC_dw.txt	Wed Jan 23 21:02:34 2013 -0600
@@ -0,0 +1,5 @@
+d1 s1 v0 v1 v9 v12
+d1 s1 v0 v2 v10
+d1 s1 v0 v3
+d1 s1 v0 v4 v11 v12
+d1 s1 v0 v5 v9 v10 v11
--- a/3rdparty/packages/sierra/manhunter1/tOC_dw3.txt	Wed Jan 23 14:54:29 2013 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-d1 s1 v0 v1 v9 v12
-d1 s1 v0 v2 v10
-d1 s1 v0 v3
-d1 s1 v0 v4 v11 v12
-d1 s1 v0 v5 v9 v10 v11
--- a/3rdparty/packages/sierra/manhunter2/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/manhunter2/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,8 +8,9 @@
 DISK_2_80D	= manhunter2_d2_80d.dsk
 DISK_3_80D	= manhunter2_d3_80d.dsk
 DISK_DW	= manhunter2_dw.dsk
+DISK_DW_BECKER	= manhunter2_becker.dsk

-DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW)
+DSKS		= $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW) $(DISK_DW_BECKER)

 DISK_1_80D_NAME = "Manhunter II Disk 1"
 DISK_2_80D_NAME = "Manhunter II Disk 2"
@@ -25,6 +23,7 @@
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
 OS9BOOT_80D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_80d.dd \
@@ -34,7 +33,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

-OS9BOOT_DW = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -43,6 +42,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -68,45 +76,85 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk:	all
-	$(RM) $(DISK_1_80D) $(DISK_2_80D) $(DISK_3_80D) $(DISK_DW)
+dsk:	all $(DSKS)
+
+$(DISK_1_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME)
-	$(OS9FORMAT_DW) -q $(DISK_DW) -n$(DISK_DW_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(OS9BOOT_DW)>os9boot_dw
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773
-	$(OS9GEN) $(DISK_DW) -b=os9boot_dw -t=kernel_dw
-	$(RM) os9boot_80d os9boot_80d os9boot_dw kernel_1773 kernel_dw
-	$(MAKDIR) $(DISK_1_80D),CMDS
-	$(MAKDIR) $(DISK_DW),CMDS
-	$(CP) $(CMDS) $(DISK_1_80D),CMDS
-	$(CP) $(CMDS) $(DISK_DW),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_80D),CMDS
-	$(CP) shell $(DISK_DW),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_DW),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_80D),.
-	$(CPL) $(TEXTFILES_DW) $(DISK_DW),.
-	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
-	$(OS9RENAME) $(DISK_DW),tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_80D),.
-	$(CP) $(SUPPORTFILES_DW) $(DISK_DW),.
-	$(RM) tocgen
-	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC
-	tocgen $(DISK_DW),tOC.txt $(DISK_DW),tOC
-	$(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_80D),.
-	$(OS9FORMAT_DS80) -q $(DISK_3_80D) -n$(DISK_3_80D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_80D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_2_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_3_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_3_80D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.
+
+$(DISK_DW):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_DW_BECKER):
+	$(RM) $@
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES_DW) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
@@ -117,3 +165,4 @@
 info:
 	@$(ECHO) "*** Manhunter II ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/3rdparty/packages/sierra/manhunter2/tOC_dw.txt	Wed Jan 23 21:02:34 2013 -0600
@@ -0,0 +1,3 @@
+d1 s1 v0 v1 v9 v10 v11
+d1 s1 v0 v2 v9 v10 v11
+d1 s1 v0 v3 v9 v10 v11
--- a/3rdparty/packages/sierra/manhunter2/tOC_dw3.txt	Wed Jan 23 14:54:29 2013 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-d1 s1 v0 v1 v9 v10 v11
-d1 s1 v0 v2 v9 v10 v11
-d1 s1 v0 v3 v9 v10 v11
--- a/3rdparty/packages/sierra/policequest1/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/policequest1/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,8 +8,9 @@
 DISK_2_40D	= policequest1_d2_40d.dsk
 DISK_3_40D	= policequest1_d3_40d.dsk
 DISK_DW	= policequest1_dw.dsk
+DISK_DW_BECKER	= policequest1_becker.dsk

-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_DW)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_DW) $(DISK_DW_BECKER)

 DISK_1_40D_NAME = "Police Quest I Disk 1"
 DISK_2_40D_NAME = "Police Quest I Disk 2"
@@ -25,6 +23,8 @@
 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -33,7 +33,8 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd
-OS9BOOT_DW = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -42,6 +43,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -67,45 +77,87 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_DW)
+dsk:	all $(DSKS)
+
+$(DISK_1_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(OS9FORMAT_DW) -q $(DISK_DW) -n$(DISK_DW_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(OS9BOOT_DW)>os9boot_dw
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(OS9GEN) $(DISK_DW) -b=os9boot_dw -t=kernel_dw
-	$(RM) os9boot_40d os9boot_80d os9boot_dw kernel_1773 kernel_dw
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(MAKDIR) $(DISK_DW),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_DW),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW),CMDS/$(file);)
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_1_40D_NAME)
+	$(MERGE) $(OS9BOOT_40D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
-	$(CP) shell $(DISK_DW),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9ATTR) $(DISK_DW),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(OS9RENAME) $(DISK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
-	$(CPL) $(TEXTFILES_DW) $(DISK_DW),.
-	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	$(OS9RENAME) $(DISK_DW),tOC_dw.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES) $(DISK_DW),.
-	$(RM) tocgen
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
-	tocgen $(DISK_DW),tOC.txt $(DISK_DW),tOC
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_2_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_3_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.
+
+$(DISK_DW):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/spacequest0/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/spacequest0/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -13,8 +10,9 @@
 DISK_1_80D	= spacequest0_d1_80d.dsk
 DISK_2_80D	= spacequest0_d2_80d.dsk
 DISK_DW	= spacequest0_dw.dsk
+DISK_DW_BECKER	= spacequest0_becker.dsk

-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_1_80D) $(DISK_2_80D) $(DISK_DW)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_1_80D) $(DISK_2_80D) $(DISK_DW) $(DISK_DW_BECKER)

 DISK_1_40D_NAME	= "Space Quest 0 Disk 1"
 DISK_2_40D_NAME	= "Space Quest 0 Disk 2"
@@ -28,7 +26,9 @@

 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW		= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -47,7 +47,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

-OS9BOOT_DW = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -56,6 +56,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -84,82 +93,114 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
+$(DISK_1_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d kernel_1773
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_1_40D_NAME)
+	$(MERGE) $(OS9BOOT_40D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
-	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
 	$(MOVE) tocgen toctmp
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
+	$(CP) $(SUPPORTFILES_D1) $@,.
+
+$(DISK_2_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.

-dsk_80d:	all
-	$(RM) $(DISK_1_80D) $(DISK_2_80D)
+$(DISK_3_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.
+
+$(DISK_1_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_1_80D) -n$(DISK_1_80D_NAME)
-	$(OS9FORMAT_DS80) -q $(DISK_2_80D) -n$(DISK_2_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_1_80D),CMDS
-	$(CP) $(CMDS) $(DISK_1_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_80D),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_1_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_80D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_1_80D),.
-	$(OS9RENAME) $(DISK_1_80D),tOC_80d.txt tOC.txt
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
 	$(MOVE) tocgen toctmp
-	tocgen $(DISK_1_80D),tOC.txt $(DISK_1_80D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $(DISK_1_80D),.
-	$(CP) $(SUPPORTFILES_D3) $(DISK_2_80D),.
+	$(CP) $(SUPPORTFILES) $@,.
+
+$(DISK_2_80D):
+	$(RM) $@
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_2_80D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.

-dsk_dw:	all
-	$(RM) $(DISK_DW)
+$(DISK_DW):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW) -q $(DISK_DW) -n$(DISK_DW_NAME)
-	$(MERGE) $(OS9BOOT_DW)>os9boot_dw
-	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DISK_DW) -b=os9boot_dw -t=kernel_dw
-	$(RM) os9boot_dw kernel_dw
-	$(MAKDIR) $(DISK_DW),CMDS
-	$(CP) $(CMDS) $(DISK_DW),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW),CMDS/$(file);)
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_DW),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_DW),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_DW) $(DISK_DW),.
-	$(OS9RENAME) $(DISK_DW),tOC_dw.txt tOC.txt
-	$(RM) tocgen
-	tocgen $(DISK_DW),tOC.txt $(DISK_DW),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_DW),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.

-dsk:	dsk_40d dsk_80d dsk_dw
+$(DISK_DW_BECKER):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_DW) $@,.
+	$(OS9RENAME) $@,tOC_dw.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.
+
+dsk:	all $(DSKS)

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
@@ -170,3 +211,4 @@
 info:
 	@$(ECHO) "*** Space Quest 0 ***"
 	@$(foreach dsk, $(DSKS), $(ECHO) $(dsk);)
+
--- a/3rdparty/packages/sierra/spacequest1/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/spacequest1/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,8 +8,9 @@
 DISK_2_40D	= spacequest1_d2_40d.dsk
 DISK_80D	= spacequest1_80d.dsk
 DISK_DW	= spacequest1_dw.dsk
+DISK_DW_BECKER	= spacequest1_becker.dsk

-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DISK_DW)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_80D) $(DISK_DW) $(DISK_DW_BECKER)

 DISK_1_40D_NAME	= "Space Quest I Disk 1"
 DISK_2_40D_NAME	= "Space Quest I Disk 2"
@@ -24,7 +22,9 @@

 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW		= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -43,7 +43,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

-OS9BOOT_DW = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -52,6 +52,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -74,78 +83,104 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D)
+$(DISK_1_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d kernel_1773
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(MERGE) $(OS9BOOT_40D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
-	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
 	$(MOVE) tocgen toctmp
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
+	$(CP) $(SUPPORTFILES_D1) $@,.

-dsk_80d:	all
-	$(RM) $(DISK_80D)
+$(DISK_2_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_80D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_80D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_80D),.
-	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
 	$(MOVE) tocgen toctmp
-	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen
-	$(CP) $(SUPPORTFILES) $(DISK_80D),.
+	$(CP) $(SUPPORTFILES) $@,.

-dsk_dw:	all
-	$(RM) $(DISK_DW)
+$(DISK_DW):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW) -q $(DISK_DW) -n$(DISK_DW_NAME)
-	$(MERGE) $(OS9BOOT_DW)>os9boot_dw
-	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DISK_DW) -b=os9boot_dw -t=kernel_dw
-	$(RM) os9boot_dw kernel_dw
-	$(MAKDIR) $(DISK_DW),CMDS
-	$(CP) $(CMDS) $(DISK_DW),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW),CMDS/$(file);)
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_DW),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_DW),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_DW),.
-	$(OS9RENAME) $(DISK_DW),tOC_80d.txt tOC.txt
-	$(RM) tocgen
-	tocgen $(DISK_DW),tOC.txt $(DISK_DW),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_DW),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.

+$(DISK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.

-dsk:	dsk_40d dsk_80d dsk_dw
+dsk:	all $(DSKS)

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/sierra/spacequest2/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/sierra/spacequest2/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,7 +1,4 @@
-ifndef	NITROS9DIR
-NITROS9DIR	= $(HOME)/nitros9
-endif
-include $(NITROS9DIR)/rules.mak
+include ../../../../rules.mak

 vpath %.asm ../objs_lsl

@@ -11,9 +8,11 @@
 DISK_2_40D	= spacequest2_d2_40d.dsk
 DISK_3_40D	= spacequest2_d3_40d.dsk
 DISK_80D	= spacequest2_80d.dsk
-DISK_DW	= spacequest3_dw.dsk
+DISK_DW	= spacequest2_dw.dsk
+DISK_DW_BECKER	= spacequest2_becker.dsk

-DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) $(DISK_DW)
+DSKS		= $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D) $(DISK_80D) \
+		$(DISK_DW) $(DISK_DW_BECKER)

 DISK_1_40D_NAME = "Space Quest II Disk 1"
 DISK_2_40D_NAME = "Space Quest II Disk 2"
@@ -26,7 +25,9 @@

 # We make our own bootfile and kernel track
 KERNEL		= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
-KERNEL_DW		= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 OS9BOOT_40D	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -45,7 +46,7 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_soft $(MD)/sysgo_dd

-OS9BOOT_DW = $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+OS9BOOT_DW	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rbdw.dr $(MD)/dwio.sb $(MD)/ddx0.dd \
 		$(MD)/scf.mn $(MD)/vtio.dr \
@@ -54,6 +55,15 @@
 		$(MD)/vrn.dr $(MD)/vi.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+OS9BOOT_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/vrn.dr $(MD)/vi.dd \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 BOOTCMDS	= $(LEVEL2)/coco3/cmds/shell_21 $(LEVEL2)/coco3/cmds/date \
 		$(LEVEL2)/coco3/cmds/echo $(LEVEL2)/coco3/cmds/link \
 		$(LEVEL2)/coco3/cmds/setime
@@ -78,80 +88,109 @@
 clean:	dskclean
 	$(RM) $(ALLOBJS)

-dsk_40d:	all
-	$(RM) $(DISK_1_40D) $(DISK_2_40D) $(DISK_3_40D)
+$(DISK_1_40D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
 	$(OS9FORMAT_DS40) -q $(DISK_1_40D) -n$(DISK_1_40D_NAME)
-	$(MERGE) $(OS9BOOT_40D)>os9boot_40d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_1_40D) -b=os9boot_40d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_1_40D),CMDS
-	$(CP) $(CMDS) $(DISK_1_40D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_1_40D),CMDS/$(file);)
+	$(MERGE) $(OS9BOOT_40D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_1_40D),CMDS
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_1_40D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_1_40D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES_D1) $(DISK_1_40D),.
-	$(OS9RENAME) $(DISK_1_40D),tOC_40d.txt tOC.txt
-	$(CP) $(SUPPORTFILES_D1) $(DISK_1_40D),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES_D1) $@,.
+	$(OS9RENAME) $@,tOC_40d.txt tOC.txt
+	$(CP) $(SUPPORTFILES_D1) $@,.
 	$(MOVE) tocgen toctmp
-	tocgen $(DISK_1_40D),tOC.txt $(DISK_1_40D),tOC
-	$(MOVE) toctmp tocgen
-	$(OS9FORMAT_DS40) -q $(DISK_2_40D) -n$(DISK_2_40D_NAME)
-	$(CP) $(SUPPORTFILES_D2) $(DISK_2_40D),.
-	$(OS9FORMAT_DS40) -q $(DISK_3_40D) -n$(DISK_3_40D_NAME)
-	$(CP) $(SUPPORTFILES_D3) $(DISK_3_40D),.
-
-dsk_80d:	all
-	$(RM) $(DISK_80D)
-	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DS80) -q $(DISK_80D) -n$(DISK_80D_NAME)
-	$(MERGE) $(OS9BOOT_80D)>os9boot_80d
-	$(MERGE) $(KERNEL)>kernel_1773
-	$(OS9GEN) $(DISK_80D) -b=os9boot_80d -t=kernel_1773
-	$(RM) os9boot_40d os9boot_80d kernel_1773
-	$(MAKDIR) $(DISK_80D),CMDS
-	$(CP) $(CMDS) $(DISK_80D),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_80D),CMDS/$(file);)
-	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_80D),CMDS
-	$(RM) shell
-	$(OS9ATTR) $(DISK_80D),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_80D),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_80D),.
-	$(OS9RENAME) $(DISK_80D),tOC_80d.txt tOC.txt
-	$(CP) $(SUPPORTFILES) $(DISK_80D),.
-	$(MOVE) tocgen toctmp
-	tocgen $(DISK_80D),tOC.txt $(DISK_80D),tOC
+	tocgen $@,tOC.txt $@,tOC
 	$(MOVE) toctmp tocgen

-dsk_dw:	all
-	$(RM) $(DISK_DW)
+$(DISK_2_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_2_40D_NAME)
+	$(CP) $(SUPPORTFILES_D2) $@,.
+
+$(DISK_3_40D):
+	$(RM) $@
+	$(OS9FORMAT_DS40) -q $@ -n$(DISK_3_40D_NAME)
+	$(CP) $(SUPPORTFILES_D3) $@,.
+
+$(DISK_80D):
+	$(RM) $@
 	$(CD) $(LEVEL2)/coco3; make
-	$(OS9FORMAT_DW) -q $(DISK_DW) -n$(DISK_DW_NAME)
-	$(MERGE) $(OS9BOOT_DW)>os9boot_dw
-	$(MERGE) $(KERNEL_DW)>kernel_dw
-	$(OS9GEN) $(DISK_DW) -b=os9boot_dw -t=kernel_dw
-	$(RM) os9boot_dw kernel_dw
-	$(MAKDIR) $(DISK_DW),CMDS
-	$(CP) $(CMDS) $(DISK_DW),CMDS
-	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $(DISK_DW),CMDS/$(file);)
+	$(OS9FORMAT_DS80) -q $@ -n$(DISK_80D_NAME)
+	$(MERGE) $(OS9BOOT_80D)>os9boot
+	$(MERGE) $(KERNEL)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
 	$(MERGE) $(BOOTCMDS)>shell
-	$(CP) shell $(DISK_DW),CMDS
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(CP) $(SUPPORTFILES) $@,.
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+
+$(DISK_DW):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW)>os9boot
+	$(MERGE) $(KERNEL_DW)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
 	$(RM) shell
-	$(OS9ATTR) $(DISK_DW),CMDS/shell -e -pe -pr -e -w -r
-	$(OS9RENAME) $(DISK_DW),CMDS/sierra AutoEx
-	$(CPL) $(TEXTFILES) $(DISK_DW),.
-	$(OS9RENAME) $(DISK_DW),tOC_80d.txt tOC.txt
-	$(RM) tocgen
-	tocgen $(DISK_DW),tOC.txt $(DISK_DW),tOC
-	$(CP) $(SUPPORTFILES) $(DISK_DW),.
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.

+$(DISK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_DW) -q $@ -n$(DISK_DW_NAME)
+	$(MERGE) $(OS9BOOT_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(MERGE) $(BOOTCMDS)>shell
+	$(CP) shell $@,CMDS
+	$(RM) shell
+	$(OS9ATTR) $@,CMDS/shell -e -pe -pr -e -w -r
+	$(OS9RENAME) $@,CMDS/sierra AutoEx
+	$(CPL) $(TEXTFILES) $@,.
+	$(OS9RENAME) $@,tOC_80d.txt tOC.txt
+	$(MOVE) tocgen toctmp
+	tocgen $@,tOC.txt $@,tOC
+	$(MOVE) toctmp tocgen
+	$(CP) $(SUPPORTFILES) $@,.

-dsk:	dsk_40d dsk_80d dsk_dw
+dsk:	all $(DSKS)

 dskcopy: dsk
 	$(CP) $(DSKS) $(DSKDIR)
--- a/3rdparty/packages/subsim/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/packages/subsim/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -4,14 +4,18 @@

 DSK_FLOPPY	= subsim.dsk
 DSK_DW		= subsim_dw.dsk
+DSK_DW_BECKER	= subsim_becker.dsk
+
 CMDS		= presub sub sub1 sub2 sub3 sub4 sub5 sub6
 MD		= $(LEVEL2)/coco3/modules

-DSKS		= $(DSK_FLOPPY) $(DSK_DW)
+DSKS		= $(DSK_FLOPPY) $(DSK_DW) $(DSK_DW_BECKER)

 # We make our own bootfile and kernel track
 KERNEL_FLOPPY	= $(MD)/rel_32 $(MD)/boot_1773_6ms $(MD)/krn
 KERNEL_DW	= $(MD)/rel_32 $(MD)/boot_dw $(MD)/krn
+KERNEL_DW_BECKER	= $(MD)/rel_32 $(MD)/boot_dw_becker $(MD)/krn
+
 BOOTFILE_FLOPPY	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
 		$(MD)/rb1773.dr $(MD)/ddd0_40d.dd \
@@ -28,6 +32,14 @@
 		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
 		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd

+BOOTFILE_DW_BECKER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/rbf.mn \
+		$(MD)/rbdw.dr $(MD)/dwio_becker.sb $(MD)/ddx0.dd \
+		$(MD)/scf.mn $(MD)/vtio.dr \
+		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
+		$(MD)/covdg_small.io $(MD)/term_vdg.dt \
+		$(MD)/clock_60hz $(MD)/clock2_dw $(MD)/sysgo_dd
+
 SUPPORTFILES	= control1.cmp convoys.dat diesel.dat fonts.dat germap.cmp \
 		hiscore.dat mission.txt missions.dat radar.dat shipmap2.dat \
 		sintbl.dat stitle.pic sub.dat usamap.cmp status.dat substats.dat
@@ -79,7 +91,26 @@
 	$(OS9ATTR_EXEC) $@,SUB/sub6
 	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)

-dskcopy:
+$(DSK_DW_BECKER):
+	$(RM) $@
+	$(CD) $(LEVEL2)/coco3; make
+	$(OS9FORMAT_SS80) $@ -n"Sub Battle Simulator"
+	$(MERGE) $(BOOTFILE_DW_BECKER)>os9boot
+	$(MERGE) $(KERNEL_DW_BECKER)>kernel
+	$(OS9GEN) $@ -b=os9boot -t=kernel
+	$(RM) os9boot kernel
+	$(MAKDIR) $@,CMDS $@,SUB
+	$(CP) $(CMDS) $@,CMDS
+	$(foreach file, $(CMDS), $(OS9ATTR_EXEC) $@,CMDS/$(file);)
+	$(CP) $(LEVEL2)/coco3/cmds/shell_21 $@,CMDS/shell
+	$(OS9ATTR_EXEC) $@,CMDS/shell
+	$(OS9RENAME) $@,CMDS/presub AutoEx
+	$(CP) $(SUPPORTFILES) $@,SUB
+	$(CP) sub6 $@,SUB
+	$(OS9ATTR_EXEC) $@,SUB/sub6
+	$(foreach file, $(SUPPORTFILES), $(OS9ATTR_TEXT) $@,SUB/$(file);)
+
+dskcopy:	dsk
 	$(CP) $(DSKS) $(DSKDIR)

 dskclean:
--- a/3rdparty/utils/aaw/mkdskindex	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/utils/aaw/mkdskindex	Wed Jan 23 21:02:34 2013 -0600
@@ -45,9 +45,14 @@

   }

-  if ($dsk =~ m/_dw[\._]/)
+  if ($dsk =~ m/_dw3[\._]/)
   {
-    $format = "DriveWire";
+    $format = "DriveWire 3/4";
+  }
+
+  if ($dsk =~ m/_becker[\._]/)
+  {
+    $format = "DriveWire 3/4";
   }

   $size = -s "$dirtoget/$dsk";
--- a/3rdparty/utils/view/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/3rdparty/utils/view/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -2,8 +2,8 @@

 TARGET	= view
 #LFLAGS	+= -y -l=$(HOME)/Projects/c3/lib/rmalib/alib.l
-LFLAGS	+= $(C3BASE)/lib/root.r
-RMAFLAGS += -I$(C3BASE)/lib
+LFLAGS	+= $(NITROS9DIR)/lib/root.r
+RMAFLAGS += -I$(NITROS9DIR)/lib

 ROFS	= debug.r view.r view_arith.r view_clp.r view_cm3.r view_convert.r \
 		view_gfx.r view_gfx2.r view_gif.r view_gifcol.r view_gifpix.r \
--- a/ChangeLog	Wed Jan 23 14:54:29 2013 -0600
+++ b/ChangeLog	Wed Jan 23 21:02:34 2013 -0600
@@ -1,6 +1,517 @@
 NitrOS-9 V3.2.9:

 ----------------------------------------------------------
+2013/01/23 David Ladd
+M 3rdparty/utils/view/makefile
+M ChangeLog
+M level1/modules/dwread.asm
+M level1/modules/dwwrite.asm
+
+Corrected a ENDC that was in the incorrect location in
+dwread.asm and dwwrite.asm also moved the 6309 native code
+into the H6309 section and changed the IFEQ H6309 to IFNE H6309
+so the code would get correctly loaded.  Moved the 57600 6809
+code to the default location as it was in the old dwread.asm
+and dwwrite.asm before these files got overwritten by the
+dwread.asm and dwwrite.asm from HDBDOS project.
+
+Also did some updates to the 3rdparty/utils/view/makefile
+but this file is not done yet to try to fix all the problems
+with it.
+
+----------------------------------------------------------
+2013/01/18 David Ladd
+M ChangeLog
+M level2/coco3/cmds/makefile
+M level2/coco3_6309/cmds/makefile
+
+Robert Gault found a problem with building the NitrOS-9
+project from MinGW related to the level2/coco3_6309/cmds/
+makefile not including level2/coco3/cmds/makefile_common
+correctly.  Changed the include line to use $(CC368L2)/cmds/
+makefile_common in both level2/coco3/cmds/makefile and
+level2/coco3_6309/cmds/makefile .  This should help with
+this problem.
+
+----------------------------------------------------------
+2013/01/17 David Ladd
+M ChangeLog
+M 3rdparty/packages/pacos9/makefile
+
+Updated 3rdparty/packages/pacos9/makefile to use the newer
+sys.l file.  Changed the lib file to sys6809l2.l from sys.l
+
+----------------------------------------------------------
+2013/01/17 David Ladd
+M ChangeLog
+M level2/coco3/cmds/makefile
+M level2/coco3_6309/cmds/makefile
+A level2/coco3/cmds/makefile_common
+
+Thanks to Bill P. for finding that the commands in
+level2/coco3/cmds were being linked with sys6809l1.l when
+they should have been being linked with sys6809l2.l .
+Also found that the level2/coco3_6309/cmds were also
+using the makefile from the level2/coco3/cmds so that
+section was also using the sys6809l1.l for linking.
+
+Renamed level2/coco3/cmds/makefile to makefile_common then
+created a new makefile which calls makefile_common then
+does a LFLAGS          += -l=$(NITROS9DIR)/lib/sys6809l2.l
+and then removed the -l=$(NITROS9DIR)/lib/sys6809l1.l from
+the makefile_common.
+
+Then updated the level2/coco3_6309/makefile to include
+level2/coco3/cmds/makefile_common rather than makefile.
+Then added to level2/coco3_6309/makefile the new line
+LFLAGS          += -l=$(NITROS9DIR)/lib/sys6309l2.l
+and should fix any lose ends there.
+
+----------------------------------------------------------
+2013/01/17 David Ladd
+M ChangeLog
+M rules.mak
+
+Updated the rules.mak so that all os9 format commands will
+format the entire disk image.  This was done to fix some
+issues that some people were having.
+
+----------------------------------------------------------
+2013/01/16 David Ladd
+M ChangeLog
+M makefile
+
+Updated main makefile so that "dw3" and "becker" sections
+use dependency "dsk" so that disk images are created before
+the archives are created.
+
+----------------------------------------------------------
+2013/01/16 David Ladd
+M ChangeLog
+M 3rdparty/packages/arcadepak/makefile
+M makefile
+
+Updated makefile for the arcadepak to now create DW3 &
+BECKER boot disks.
+
+Added new make option to the main makefile.  New option
+is "make nightlytest"  This option uses environment
+variables called TESTSSHSERVER and TESTSSHDIR. This will
+allow testing of the nightly upload to a host ssh server
+of your choice as well as folder(s) on that account of
+your choice.  This was added strictly for testing use.
+
+Also added a check to the makefile at the nightly section
+if the user does not have the environment variable
+SOURCEUSER set then it will echo a responce saying that
+the user needs to set this environment variable before
+using this option.
+
+----------------------------------------------------------
+2013/01/16 David Ladd
+M 3rdparty/packages/arcadepak/makefile
+M 3rdparty/packages/arcadepak/smash/makefile
+M 3rdparty/packages/arcadepak/thexder/makefile
+M 3rdparty/packages/cc/makefile
+M 3rdparty/packages/sierra/blackcauldron/makefile
+M 3rdparty/packages/sierra/christmas86/makefile
+M ChangeLog
+A 3rdparty/packages/arcadepak/smash/empty_smash.txt
+A 3rdparty/packages/arcadepak/thexder/empty_thexder.txt
+
+Found a problem with with the makefile related to the
+arcadepak not building from the chained make.  Found the
+"--no-print-directory" was missing from the make statement
+to get the filenames for the sub folders.  Also found empty
+labels so created a empty_smash.txt and a empty_thexder.txt
+to correct for odd errors when dealing with the empty labels.
+
+Corrected blackcauldron and christmas86 makefile(s) related
+to disk creation.  Found that tocgen was being removed by
+some of the disk image sections. This has been corrected.
+
+----------------------------------------------------------
+2013/01/16 David Ladd
+M ChangeLog
+M 3rdparty/packages/arcadepak/shanghai/makefile
+M 3rdparty/packages/arcadepak/smash/makefile
+M 3rdparty/packages/arcadepak/thexder/makefile
+
+Found 3 more makefile(s) that needed the code added for the
+checking to see if NITROS9DIR was set or not.  Corrected.
+
+----------------------------------------------------------
+2013/01/15 David Ladd
+M ChangeLog
+M 3rdparty/utils/aaw/mkdskindex
+
+Updated mkdskindex to state that the becker disks are a
+DriveWire 3/4 server disk image rather than a normal
+disk image for the index.html creation.
+
+----------------------------------------------------------
+2013/01/15 David Ladd
+M ChangeLog
+M 3rdparty/packages/subsim/makefile
+
+Found a problem in the makefile for subsim. When using a
+"make dskcopy", make would try to copy the disk images even
+if they did not exist.  Found that the depend "dsk" was not
+in the dskcopy section like all the other makefile(s).
+Corrected and tested and the disk images are now being
+created when you do a "make dskcopy".
+
+----------------------------------------------------------
+2013/01/14 David Ladd
+M ChangeLog
+M 3rdparty/booters/makefile
+M 3rdparty/customboots/boisy/makefile
+M 3rdparty/drivers/burke/makefile
+M 3rdparty/drivers/disto/makefile
+M 3rdparty/drivers/emudsk/makefile
+M 3rdparty/drivers/ide/makefile
+M 3rdparty/drivers/makefile
+M 3rdparty/drivers/mmc/makefile
+M 3rdparty/drivers/s16550/makefile
+M 3rdparty/drivers/sdisk/makefile
+M 3rdparty/drivers/sdisk3/makefile
+M 3rdparty/drivers/tccc/makefile
+M 3rdparty/fmgrs/makefile
+M 3rdparty/fmgrs/msf/makefile
+M 3rdparty/makefile
+M 3rdparty/p2mods/makefile
+M 3rdparty/p2mods/noice/makefile
+M 3rdparty/packages/arcadepak/makefile
+M 3rdparty/packages/basic09/makefile
+M 3rdparty/packages/cc/makefile
+M 3rdparty/packages/coyota/makefile
+M 3rdparty/packages/deskmate3/makefile
+M 3rdparty/packages/ed/makefile
+M 3rdparty/packages/fsim2/makefile
+M 3rdparty/packages/koronis/makefile
+M 3rdparty/packages/kyumgai/makefile
+M 3rdparty/packages/makefile
+M 3rdparty/packages/mm/makefile
+M 3rdparty/packages/multivue/cmds_6309/makefile
+M 3rdparty/packages/multivue/cmds_6809/makefile
+M 3rdparty/packages/multivue/makefile
+M 3rdparty/packages/os9l2bbs/6809l2/makefile
+M 3rdparty/packages/os9l2bbs/makefile
+M 3rdparty/packages/pacos9/makefile
+M 3rdparty/packages/raakatu/makefile
+M 3rdparty/packages/rof/makefile
+M 3rdparty/packages/sierra/makefile
+M 3rdparty/packages/subsim/makefile
+M 3rdparty/packages/uemacs/makefile
+M 3rdparty/packages/uucpbb/cmds_6309/makefile
+M 3rdparty/packages/uucpbb/cmds_6809/makefile
+M 3rdparty/packages/uucpbb/makefile
+M 3rdparty/packages/uucpbb/src/makefile
+M 3rdparty/subrtns/makefile
+M 3rdparty/utils/boisy/makefile
+M 3rdparty/utils/dasm/makefile
+M 3rdparty/utils/makefile
+M 3rdparty/utils/smartwatch/makefile
+M 3rdparty/utils/supercomm/makefile
+M 3rdparty/utils/view/makefile
+M 3rdparty/utils/winfo/makefile
+M bootman/makefile
+M level1/atari/bootfiles/makefile
+M level1/atari/cmds/makefile
+M level1/atari/defs/makefile
+M level1/atari/makefile
+M level1/atari/modules/kernel/makefile
+M level1/atari/modules/makefile
+M level1/atari/sys/makefile
+M level1/cmds/makefile
+M level1/coco/bootfiles/makefile
+M level1/coco/bootroms/makefile
+M level1/coco/cmds/makefile
+M level1/coco/defs/makefile
+M level1/coco/makefile
+M level1/coco/modules/kernel/makefile
+M level1/coco/modules/makefile
+M level1/coco/sys/makefile
+M level1/d64/bootfiles/makefile
+M level1/d64/cmds/makefile
+M level1/d64/defs/makefile
+M level1/d64/makefile
+M level1/d64/modules/kernel/makefile
+M level1/d64/modules/makefile
+M level1/d64/sys/makefile
+M level1/dalpha/bootfiles/makefile
+M level1/dalpha/cmds/makefile
+M level1/dalpha/defs/makefile
+M level1/dalpha/makefile
+M level1/dalpha/modules/kernel/makefile
+M level1/dalpha/modules/makefile
+M level1/dalpha/sys/makefile
+M level1/makefile
+M level1/tano/bootfiles/makefile
+M level1/tano/cmds/makefile
+M level1/tano/defs/makefile
+M level1/tano/makefile
+M level1/tano/modules/kernel/makefile
+M level1/tano/modules/makefile
+M level1/tano/sys/makefile
+M level2/coco3/bootfiles/makefile
+M level2/coco3/bootroms/makefile
+M level2/coco3/cmds/makefile
+M level2/coco3/defs/makefile
+M level2/coco3/makefile_common
+M level2/coco3/modules/kernel/makefile
+M level2/coco3/modules/makefile
+M level2/coco3/sys/makefile
+M level2/coco3_6309/bootfiles/makefile
+M level2/coco3_6309/bootroms/makefile
+M level2/coco3_6309/defs/makefile
+M level2/coco3_6309/modules/kernel/makefile
+M level2/makefile
+M level2/sys/makefile
+M level3/coco3/bootfiles/makefile
+M level3/coco3/cmds/makefile
+M level3/coco3/defs/makefile
+M level3/coco3/makefile
+M level3/coco3/modules/kernel/makefile
+M level3/coco3/modules/makefile
+M level3/coco3/sys/makefile
+M level3/coco3_6309/bootfiles/makefile
+M level3/coco3_6309/cmds/makefile
+M level3/coco3_6309/defs/makefile
+M level3/coco3_6309/makefile
+M level3/coco3_6309/modules/kernel/makefile
+M level3/coco3_6309/modules/makefile
+M level3/coco3_6309/sys/makefile
+M lib/alib/makefile
+M lib/makefile
+M makefile
+M rules.mak
+
+Updated makefiles to fix for incorrectly not finding the rules.mak file.
+When running make without the envirornment variable "NITROS9DIR" being set
+you would get error's when building the project that "/rules.mak" could not
+be found.
+This is because the code to set the envirornment variable "NITROS9DIR" is in
+the rules.mak which can not be included because of the envirornment variable
+not being set. To fix this I put the code needed to set this envirornment
+variable before each include for the rules.mak.
+
+This change should not effect people who already have this envirornment
+variable set before building the project.
+
+----------------------------------------------------------
+2013/01/12 David Ladd
+M ChangeLog
+M makefile
+M level2/coco3/makefile_common
+
+Added option to main makefile to allow for "make becker" to create
+a zip archive of the becker boot disks for use with drivewire4 server.
+
+Updated level2/coco3/makefile_common so that the disk image for coco3
+and coco3_6309 becker images aren't referred to as a 80 track double sided
+disk.  Reason for this change is to reduce confusion as that the
+DriveWire4 server requires single sided disk images for the boot to work
+from the HDBDOS "DOS" command.
+
+----------------------------------------------------------
+2013/01/10 David Ladd
+M ChangeLog
+M 3rdparty/packages/fsim2/makefile
+M 3rdparty/packages/koronis/makefile
+M 3rdparty/packages/kyumgai/makefile
+M 3rdparty/packages/multivue/makefile
+M 3rdparty/packages/rof/makefile
+M 3rdparty/packages/sierra/blackcauldron/makefile
+M 3rdparty/packages/sierra/christmas86/makefile
+M 3rdparty/packages/sierra/goldrush/makefile
+M 3rdparty/packages/sierra/kingsquest1/makefile
+M 3rdparty/packages/sierra/kingsquest2/makefile
+M 3rdparty/packages/sierra/kingsquest3/makefile
+M 3rdparty/packages/sierra/kingsquest4/makefile
+M 3rdparty/packages/sierra/leisuresuitlarry/makefile
+M 3rdparty/packages/sierra/manhunter1/makefile
+M 3rdparty/packages/sierra/manhunter2/makefile
+M 3rdparty/packages/sierra/policequest1/makefile
+M 3rdparty/packages/sierra/spacequest0/makefile
+M 3rdparty/packages/sierra/spacequest1/makefile
+M 3rdparty/packages/sierra/spacequest2/makefile
+M 3rdparty/packages/subsim/makefile
+
+Updated some of the makefile(s) in 3rdparty/packages to bring the becker
+boot disk images in line with naming style of the nos9l1/2 disk images.
+The becker disk images were being created with _dw3_becker.dsk where
+they should have been created just with the _becker.dsk ending.
+
+
+----------------------------------------------------------
+2013/01/10 David Ladd
+M ChangeLog
+M level1/atari/bootfiles/makefile
+
+Updated level1/atari/bootfiles/makefile so that bootfile_p1 & bootfile_p2
+removed on a "make clean"
+
+----------------------------------------------------------
+2013/01/10 David Ladd
+M ChangeLog
+M rules.mak
+
+Updated rules.mak to increase compression of zip files to max.
+
+----------------------------------------------------------
+2013/01/10 David Ladd
+M ChangeLog
+M makefile
+M 3rdparty/packages/sierra/spacequest1/makefile
+M 3rdparty/packages/sierra/spacequest2/makefile
+M 3rdparty/packages/subsim/makefile
+M 3rdparty/packages/mm/makefile
+M 3rdparty/packages/multivue/makefile
+M 3rdparty/packages/rof/makefile
+
+Updated makefile(s) for spacequest1, spacequest2, subsim, mm, multivue,
+and rof so that becker boot disks, for use in drivewire4, are created.
+
+
+----------------------------------------------------------
+2013/01/09 David Ladd
+M ChangeLog
+M 3rdparty/packages/fsim2/makefile
+M 3rdparty/packages/kyumgai/makefile
+M 3rdparty/packages/sierra/policequest1/makefile
+M 3rdparty/packages/sierra/spacequest0/makefile
+
+Changed makefile(s) for fsim2, kyumgai, policequest1, and spacequest0
+so that becker boot disks for use with drivewire4 are created.
+
+----------------------------------------------------------
+2013/01/09 David Ladd
+M ChangeLog
+M 3rdparty/packages/sierra/kingsquest2/makefile
+M 3rdparty/packages/sierra/kingsquest3/makefile
+M 3rdparty/packages/sierra/kingsquest4/makefile
+M 3rdparty/packages/sierra/leisuresuitlarry/makefile
+M 3rdparty/packages/sierra/manhunter1/makefile
+M 3rdparty/packages/sierra/manhunter1/tOC_80d.txt
+M 3rdparty/packages/sierra/manhunter2/makefile
+
+Fixed tOC_80d.txt file related to manhunter1.  The last line did not
+have a return in it and was causing a segmentation fault when creating
+the disk set.
+
+Changed makefile(s) for kingsquest2, kingsquest3, kingsquest4,
+leisuresuitlarry, manhunter1, and manhunter2 so that becker
+boot disks for use with drivewire4 are created.
+
+----------------------------------------------------------
+2013/01/09 David Ladd
+M ChangeLog
+M 3rdparty/packages/sierra/goldrush/makefile
+A 3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt
+M 3rdparty/packages/sierra/kingsquest1/makefile
+
+Added 3rdparty/packages/sierra/goldrush/tOC_dw3_becker.txt
+
+Updated 3rdparty/packages/sierra/goldrush/makefile and
+3rdparty/packages/sierra/kingsquest1/makefile to now also create
+the becker disks for use with drivewire4 server.
+
+----------------------------------------------------------
+2013/01/09 David Ladd
+M ChangeLog
+M 3rdparty/packages/blackcauldron/makefile
+M 3rdparty/packages/christmas86/makefile
+
+Updated 3rdparty/packages/blackcauldron/makefile and
+3rdparty/packages/christmas86/makefile to now also create
+the becker disks for use with drivewire4 server.
+
+----------------------------------------------------------
+2013/01/09 David Ladd
+M ChangeLog
+M 3rdparty/packages/koronis/makefile
+
+Updated 3rdparty/packages/koronis/makefile to create a becker boot
+disk for use with drivewire4 server.
+
+----------------------------------------------------------
+2013/01/08 David Ladd
+M ChangeLog
+M makefile
+M rules.mak
+
+Found that primary makefile was not compiling files in the "lib" folder.
+Created a NOSLIB label in rules.mak for the full path to "lib" folder.
+Replaced the "lib" folder name that was in primary makefile to use
+the NOSLIB label to correct the problem with the makefile not branching
+into the "lib" folder to compile its files"
+
+----------------------------------------------------------
+2013/01/06 David Ladd
+M ChangeLog
+M level1/dalpha/makefile
+
+Found that LDSKS label was missing from level1/dalpha/makefile
+Corrected this oversite and tested.
+
+----------------------------------------------------------
+2013/01/06 David Ladd
+M ChangeLog
+M level1/modules/dwread.asm
+M level1/modules/dwwrite.asm
+M level1/modules/dw4read.asm
+M level1/modules/dw4write.asm
+
+Robert Gault found a problem related to the H6309-1 not always
+functioning as expected.  Changed dwread.asm, dwwrite.asm, dw4read.asm
+dw4write.asm to reflect these needed changes and movement of code to
+correct locations.
+
+In examining the dwwrite.asm source file found two sections of H6309-1 and
+code that were the same.  This might have been root problem of the
+compiling problems.  Verified both sections of code were identical before
+removing second copy.
+
+----------------------------------------------------------
+2013/01/05 David Ladd
+M ChangeLog
+M level1/coco/makefile
+M level1/coco/bootfiles/makefile
+
+Added needed sections to makefile(s) to create a NOS9 L1 Beckeer
+boot disk.
+
+----------------------------------------------------------
+2013/01/04 David Ladd
+List of files changed
+M ChangeLog
+A scripts/burst
+
+Got the burst script from Boisy that was needed for the web portal
+on sourceforge. This script is located in the scripts folder.  Please
+keep in mind that you will need to have this burst script on your
+sourceforge ssh server account to do the "make nightly".
+
+----------------------------------------------------------
+2013/01/03 David Ladd
+List of files changed
+M ChangeLog
+M makefile
+M rules.mak
+
+Changed the dw3 format information in the rules.mak to use a single
+sided format rather than double sided.  The double sided disk images
+were preventing users booting off of the drivewire4 server using the
+dw3 and becker boot disks.
+
+Also updated the makefile related to the nightly build to use a
+environment variable rather than boisy's fixed username.
+
+At this time the upload of the zip file only works. Specific users ssh
+account must have the burst script.
+
+----------------------------------------------------------
 2012/12/05 Robert Gualt
 List of files changed
 M ChangeLog
--- a/ReadMe	Wed Jan 23 14:54:29 2013 -0600
+++ b/ReadMe	Wed Jan 23 21:02:34 2013 -0600
@@ -70,3 +70,64 @@

 Repeat steps 3-5 for each additional disk.

+Addendum by Gene Heskett
+
+Unfortunately, many of the fdc chipsets shipping on motherboards for
+the last 5 years or so, do NOT understand, and will probably crash your
+pc when a 256 byte/sector disk read or write is attempted.  This rather
+high priced Asus M2n-SLI Deluxe board is one such board, so using floppies
+for the 'sneakernet' to get this stuff onto my coco3 cannot be done.
+email to gheskett AT wdtv DOT com.
+
+1. This repo is newer than the sourceforge repo, and a lot more of it
+Just Works(TM).  If you find something that doesn't, use the above
+email address.
+
+2. This repo's work will be transfered back to sourceforge when I can
+figure out how to do a commit in mercurial.  Tutorials on this are welcome.
+There are, since I did the hg clone about the 27th of October 2012,
+probably at least 50 files needing committed, changed in getting this
+back to buildable and bootable.
+
+3. Since we now have drivewire, the appropriate for your machine .dsk
+files can be downloaded and mounted directly as a fully read/write
+virtual disk.  Drivewire is the cats meow, many thanks to Aaron Wolfe.
+Make yourself a cable and join in on the dance floor, its amazing.
+
+4. I am still using mamou as the assembler, no attempt has been made
+to convert it to using William Astles lwtools just yet as I wanted
+this to be as close to 100% usable as possible before attempting the
+conversion so that only the conversion generated errors remain.  There
+will be some teething problems while that is going on in a separate
+tree that won't be visible until it Just Works(TM).
+
+5. One thing that was recently done by Boisy was to convert the
+boot_scsi.asm file from, because of code size constraints, the use of
+the former drive addressing scheme of a single marching set bit across
+the scsi bus drive address field, into a base zero decimal scheme, so the
+drive address contained in the 4th byte from the end can now be looked
+at as a decimal value where $00 is now a legal address for drive 0 on
+the bus.  A MAJOR change, and one in the right direction IMO, that was
+not even mentioned in the comments of the boot_scsi.asm header till I
+discovered it yesterday while reading the code trying to figure out why
+with that byte set to $01 like it had been for years, the boot was
+failing because it was trying to find OS9Boot on my drive 1, s1, and
+fixed the makefiles accordingly.
+
+6. I am not trying to keep this a secret but it probably will not get
+any ink on the coco list until such time as I have committed to source-
+forge and that repo is again useable, so bear with me.  I have cable
+dsl so my 'intertube' at 3 megabits isn't that fast.  A lot of traffic
+will probably result in my isp blocking the port address I do use to
+get past the port 80 block just like they do without admitting to it
+because if they did admit it, the FCC would probably discuss their
+common carrier status with the ISP's legal dept.  As that status has
+huge tax and licensing advantages to the ISP, they will not give that
+status up without a prolonged court fight.  I have even considered
+putting this page on port 6809, but when and if that happens, you'll
+see it in my email sig.
+
+Thats all for now folks, keep the old girl running till the rapture
+or whatever.
+
+Cheers, Gene
--- a/level1/atari/bootfiles/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/level1/atari/bootfiles/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -52,5 +52,5 @@
 	$(PADROM) -b 29696 $@

 clean:
-	$(RM) $(ALLOBJS) $(BOOTFILE_P1) $(BOOTFILE_P2)
+	$(RM) $(ALLOBJS) bootfile_p1 bootfile_p2
--- a/level1/dalpha/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/level1/dalpha/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -98,6 +98,7 @@
 LDSK720K        = $(DISTRONAME)_80d.dsk

 DSKS		= $(DSK360K_1) $(DSK360K_2) $(DSK720K)
+LDSKS		= $(LDSK360K_1) $(LDSK360K_2) $(LDSK720K)

 # Make all components
 all:
--- a/makefile	Wed Jan 23 14:54:29 2013 -0600
+++ b/makefile	Wed Jan 23 21:02:34 2013 -0600
@@ -1,6 +1,6 @@
 include rules.mak

-dirs	=  lib $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY)
+dirs	=  $(NOSLIB) $(LEVEL1) $(LEVEL2) $(LEVEL3) $(3RDPARTY)

 # Make all components
 all:
@@ -13,8 +13,10 @@

 # Clean all components
 clean:
-	-$(RM) nitros9project.zip dsks/*.dsk
+	-$(RM) nitros9project.zip $(DSKDIR)/*.dsk $(DSKDIR)/ReadMe $(DSKDIR)/index.shtml
 	$(foreach dir, $(dirs), ($(CD) $(dir); make clean);)
+	$(RM) $(DSKDIR)/ReadMe
+	$(RM) $(DSKDIR)/index.html

 # Do CVS update
 hgupdate:
@@ -39,15 +41,73 @@
 dwdsk = $(LEVEL1)/coco/nos96809l1coco1_dw.dsk $(LEVEL1)/coco/nos96809l1coco2_dw.dsk \
 	$(LEVEL2)/coco3/nos96809l2_dw.dsk $(LEVEL2)/coco3_6309/nos96309l2_dw.dsk

-dw:
-	$(ARCHIVE) nitros9_drivewire.zip $(dwdsk)
+dw:	dsk
+	$(ARCHIVE) nitros9_drivewire3.zip $(dwdsk)
+
+# DriveWire Becker DSK Images
+beckerdsk	= $(LEVEL1)/coco/nos96809l1coco_becker.dsk \
+	$(LEVEL2)/coco3/nos96809l2_becker.dsk $(LEVEL2)/coco3_6309/nos96309l2_becker.dsk
+
+becker:	dsk
+	$(ARCHIVE) nitros9_becker.zip $(beckerdsk)

 info:
 	@$(foreach dir, $(dirs), ($(CD) $(dir); make info);)

+# This section is to do the nightly build and upload
+# to sourceforge.net you must set the environment
+# variable SOURCEUSER to the userid you have for sourceforge.net
+# The "burst" script is found in the scripts folder and must
+# on your ssh account at sourceforge.net
+ifdef	SOURCEUSER
 nightly: clean hgupdate dskcopy
-	make info>dsks/ReadMe
-	$(ARCHIVE) nitros9project dsks/*
-	scp nitros9project.zip boisy,nitros9@web.sourceforge.net:/home/groups/n/ni/nitros9/htdocs
-	ssh boisy,nitros9@shell.sourceforge.net create
-	ssh boisy,nitros9@shell.sourceforge.net "./burst"
+	make info>$(DSKDIR)/ReadMe
+	$(ARCHIVE) nitros9project $(DSKDIR)/*
+	scp nitros9project.zip $(SOURCEUSER),nitros9@web.sourceforge.net:/home/groups/n/ni/nitros9/htdocs
+	ssh $(SOURCEUSER),nitros9@shell.sourceforge.net create
+	ssh $(SOURCEUSER),nitros9@shell.sourceforge.net "./burst"
+else
+nightly:
+	@echo ""
+	@echo ""
+	@echo "You need to set the SOURCEUSER variable"
+	@echo "You may wish to refer to the nightly"
+	@echo "section of the makefile."
+endif
+
+# This section is to run a nightly test.
+# This requires you to setup a environment variable
+# called TESTSSHSERVER.
+# example would be: TESTSSHSERVER='testuser@localhost'
+# another example: TESTSSHSERVER='testuser@test.testhost.com'
+#
+# You are also required to setup a target path for your file
+# and the environment variable that is being used in this
+# section is called TESTSSHDIR
+ifdef	TESTSSHSERVER
+ifdef	TESTSSHDIR
+nightlytest: clean hgupdate dskcopy
+	make info>$(DSKDIR)/ReadMe
+	$(ARCHIVE) nitros9project $(DSKDIR)/*
+	scp nitros9project.zip $(TESTSSHSERVER):$(TESTSSHDIR)
+	ssh $(TESTSSHSERVER) "./burst"
+else
+nightlytest:
+	@echo ""
+	@echo ""
+	@echo "You need to set the TESTSSHDIR variable"
+	@echo "You may wish to refer to the nightlytest"
+	@echo "section of the makefile to see what"
+	@echo "needs to be setup first before using"
+	@echo "this option"
+endif
+else
+nightlytest:
+	@echo ""
+	@echo ""
+	@echo "You need to set the TESTSSHSERVER variable"
+	@echo "You may wish to refer to the nightlytest"
+	@echo "section of the makefile to see what"
+	@echo "needs to be setup first before using"
+	@echo "this option."
+endif
--- a/rules.mak	Wed Jan 23 14:54:29 2013 -0600
+++ b/rules.mak	Wed Jan 23 21:02:34 2013 -0600
@@ -88,7 +88,7 @@
 LOSETUP		= sudo /sbin/losetup
 LINK		= ln
 SOFTLINK	= $(LINK) -s
-ARCHIVE		= zip -D -j
+ARCHIVE		= zip -D -9 -j
 MKDSKINDEX	= $(NITROS9DIR)/3rdparty/utils/aaw/mkdskindex

 # Directories
@@ -96,6 +96,7 @@
 LEVEL1		= $(NITROS9DIR)/level1
 LEVEL2		= $(NITROS9DIR)/level2
 LEVEL3		= $(NITROS9DIR)/level3
+NOSLIB		= $(NITROS9DIR)/lib
 CC68L1          = $(LEVEL1)/coco
 CC368L2         = $(LEVEL2)/coco3
 CC363L2         = $(LEVEL2)/coco3_6309