--- ./RULES/r-gmake.dep	Sat Oct 12 02:55:22 2002
+++ ../cdrtools-2.00.3/./RULES/r-gmake.dep	Mon Nov 10 16:53:59 2003
@@ -73,4 +73,4 @@
 # Include the dependency file(s) generated from the rules above.
 #
 ###########################################################################
-include		$(PDEP_FILE)
+sinclude		$(PDEP_FILE)
--- ./RULES/rules.cnf	Mon Jan 28 02:11:31 2002
+++ ../cdrtools-2.00.3/./RULES/rules.cnf	Mon Nov 10 16:53:59 2003
@@ -53,7 +53,7 @@
 		cd $(OINCSDIR); \
 		CONFIG_NOFAIL=TRUE CC="$(XCCCOM)" CFLAGS="$(CFLAGS)" sh ../../conf/configure $(CONFFLAGS)
 ###########################################################################
-include $(OINCSDIR)/Inull
-include $(OINCSDIR)/rules.cnf
+sinclude $(OINCSDIR)/Inull
+sinclude $(OINCSDIR)/rules.cnf
 ###########################################################################
 include	$(SRCROOT)/$(RULESDIR)/$(LCONFIG)
--- ./RULES/rules1.top	Mon Jan 28 08:59:10 2002
+++ ../cdrtools-2.00.3/./RULES/rules1.top	Mon Nov 10 16:53:59 2003
@@ -210,7 +210,7 @@
 $(_DCC):
 	sh $(SRCROOT)/conf/cc-config.sh $(C_ARCH) $@
 
-include		$(_DCC)
+sinclude		$(_DCC)
 
 ###########################################################################
 #
--- ./RULES/local.cnf	Mon Feb 26 07:11:22 2001
+++ ../cdrtools-2.00.3/./RULES/local.cnf	Mon Nov 10 16:53:59 2003
@@ -36,6 +36,6 @@
 		cd $(ARCHDIR); \
 		CONFIG_NOFAIL=TRUE CC="$(XCCCOM)" CFLAGS="$(CFLAGS)" sh ../../configure $(CONFFLAGS)
 ###########################################################################
-include $(ARCHDIR)/Inull
-include $(ARCHDIR)/local.cnf
+sinclude $(ARCHDIR)/Inull
+sinclude $(ARCHDIR)/local.cnf
 ###########################################################################
--- ./DEFAULTS/Defaults.irix	Sun Feb 16 11:01:48 2003
+++ ../cdrtools-2.00.3/./DEFAULTS/Defaults.irix	Mon Nov 10 16:53:59 2003
@@ -19,8 +19,8 @@
 CWARNOPTS=
 
 DEFINCDIRS=	$(SRCROOT)/include
-LDPATH=		-L/opt/schily/lib
-RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
+LDPATH=		-L$(INS_BASE)/$(ABILIB)
+RUNPATH=	-R $(INS_BASE)/$(ABILIB) -R $(OLIBSDIR)
 
 ###########################################################################
 #
@@ -27,7 +27,8 @@
 # Installation config stuff
 #
 ###########################################################################
-INS_BASE=	/opt/schily
+INS_BASE=	/usr/freeware
+ABILIB=		lib32
 INS_KBASE=	/
 #
 DEFUMASK=	002
--- ./librscg/scsi-remote.c	Fri May 16 20:02:58 2003
+++ ../cdrtools-2.00.3/./librscg/scsi-remote.c	Mon Nov 10 17:26:08 2003
@@ -551,7 +551,7 @@
 	rscsipeer = host;
 
 	if ((rscsi = getenv("RSCSI")) == NULL)
-		rscsi = "/opt/schily/sbin/rscsi";
+		rscsi = "/usr/freeware/sbin/rscsi";
 	rsh = getenv("RSH");
 
 #ifdef	USE_RCMD_RSH
--- ./mkisofs/apple_driver.c	Wed Dec  6 01:25:05 2000
+++ ../cdrtools-2.00.3/./mkisofs/apple_driver.c	Mon Nov 10 16:53:59 2003
@@ -175,7 +175,7 @@
 	    }
 
 	    if (! IS_MAC_PART(mac_part) )
-		comerrno(EX_BAD, "Unable to find boot partition", 0);
+		comerrno(EX_BAD, "Unable to find boot partition");
 
 	} while (i++ < pmMapBlkCnt);
 
--- ./cdrecord/cdrecord.1	Wed Dec 25 02:28:40 2002
+++ ../cdrtools-2.00.3/./cdrecord/cdrecord.1	Mon Nov 10 17:26:51 2003
@@ -1408,7 +1408,7 @@
 If the 
 .B RSCSI
 environment is present, the remote SCSI server will not be the program
-.B /opt/schily/sbin/rscsi
+.B /usr/freeware/sbin/rscsi
 but the program pointed to by
 .BR RSCSI .
 Note that the remote SCSI server program name will be ignored if you log in
--- ./cdda2wav/cdda2wav.1	Wed Nov 27 08:36:56 2002
+++ ../cdrtools-2.00.3/./cdda2wav/cdda2wav.1	Mon Nov 10 17:12:51 2003
@@ -334,7 +334,7 @@
 If the 
 .B RSCSI
 environment variable is present, the remote SCSI server will not be the program
-.B /opt/schily/sbin/rscsi
+.B /usr/freeware/sbin/rscsi
 but the program pointed to by
 .BR RSCSI .
 Note that the remote SCSI server program name will be ignored if you log in
--- ./cdda2wav/cdda2ogg.1	Tue Dec 10 00:42:04 2002
+++ ../cdrtools-2.00.3/./cdda2wav/cdda2ogg.1	Mon Nov 10 16:53:59 2003
@@ -28,7 +28,7 @@
 .B ogg123
 is provided by the
 .B vorbis-tools
-which needs to beinstalled separately.
+which needs to be installed separately.
 See
 .B www.ogg.org
 for more information.
@@ -59,11 +59,11 @@
 The base part of the filename of resulting audio files
 
 .PP
-See /opt/schily/bin/cdda2ogg (cdda2mp3) files to get the default values
+See /usr/freeware/bin/cdda2ogg (cdda2mp3) files to get the default values
 .PP
 System administrator can also set default values by creating of a shell
 include file, defining the variables for the POSIX shell, and storing them as
-/etc/cdrecord/cdda2ogg (resp. cdda2mp3).
+/etc/default/cdda2ogg (resp. cdda2mp3).
 
 .SH "SEE ALSO"
 .BR cdda2wav (1)
--- ./readcd/readcd.1	Wed Dec 25 02:28:41 2002
+++ ../cdrtools-2.00.3/./readcd/readcd.1	Mon Nov 10 17:09:52 2003
@@ -384,7 +384,7 @@
 If the 
 .B RSCSI
 environment is present, the remote SCSI server will not be the program
-.B /opt/schily/sbin/rscsi
+.B /usr/freeware/sbin/rscsi
 but the program pointed to by
 .BR RSCSI .
 Note that the remote SCSI server program name will be ignored if you log in