[alt.sources] ecu patch 3

wht@tridom.uucp (Warren Tucker) (10/17/89)

This is ecu unet1 patch 3, which fixes further #$%@ problems with
making the #%@!% program.  With patches 1 and 2 applied, the software
remains at rev unet1.01 after this patch.

Problem is, I kept trying to build like it was on a machine other than
mine and kept finding dependencies on my ~/bin, etc..  This has been
simple enough with other postings, but over the last few years, building
ecu had come to use a lot of the idiosyncracies of my environment.  My
heart goes out to comp.sources.* moderators.  Posting a big source is
rough.  I'm not sure I'da tried it if I knew then what I know now :-).

Note: I got one report that the compiler was reporting errors about
redefining memcpy, strcpy, and the like.  I couldn't reproduce that here,
but the fix was to comment out the #include of <memory.h> and <strong.h>
in ecu.h.

>>> TO APPLY PATCH:
1. unshar the shell archive
2. enter the command: './apply.patch.03'

------- cut here ---------
#!/bin/sh
# shar:	Shell Archiver  (v1.22)
#
#	Run the following text with /bin/sh to create:
#	  apply.patch.03
#	  ecu.p3.01
#	  ecu.p3.02
#
sed 's/^X//' << 'SHAR_EOF' > apply.patch.03 &&
X#apply.patch.03
X#this file applies ecu unet1 patch three
X#the original 48-part posting, should have been unshared
X#ecu patches 1 and 2 must have been applied
Xpatch Makefile < ecu.p3.01 
Xrm Makefile.orig
Xpatch z/Makefile < ecu.p3.02 
Xrm z/Makefile.orig
SHAR_EOF
chmod 0644 apply.patch.03 || echo "restore of apply.patch.03 fails"
sed 's/^X//' << 'SHAR_EOF' > ecu.p3.01 &&
X*** /u4/ecu-unet1/release/Makefile	Sun Oct 15 18:32:42 1989
X--- Makefile	Sun Oct 15 16:19:17 1989
X***************
X*** 1,4
X! #  CHK=0x95EA
X  #+-------------------------------------------------------------------
X  # Makefile for ecu and related programs
X  # Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X
X--- 1,4 -----
X! #  CHK=0xA47A
X  #+-------------------------------------------------------------------
X  # Makefile for ecu and related programs
X  # Copyright 1986,1989 Warren H. Tucker, III. All Rights Reserved
X***************
X*** 7,12
X  # NOTE: run make install as root
X  #--------------------------------------------------------------------
X  #+:EDITS:*/
X  #:07-03-1989-22:57-wht------------- ecu 2.00 ----------------
X  #:06-11-1989-21:36-wht-source control point 1.85
X  #:05-08-1989-15:27-wht-strip a.out file at ld time
X
X--- 7,14 -----
X  # NOTE: run make install as root
X  #--------------------------------------------------------------------
X  #+:EDITS:*/
X+ #:10-11-1989-18:46-wht-needed more work to get makes to work away from my system
X+ #:10-11-1989-18:18-wht-unet1 release did not make bperr and needs it
X  #:07-03-1989-22:57-wht------------- ecu 2.00 ----------------
X  #:06-11-1989-21:36-wht-source control point 1.85
X  #:05-08-1989-15:27-wht-strip a.out file at ld time
X***************
X*** 19,28
X  SHELL = /bin/sh
X  .SUFFIXES: .o .c .h  
X  
X! SYSTEM = `./sysdep =M_I386 Xenix/386 Sys V =M_I286 Xenix/286 Sys V`
X! COMFLAGS = -i `./sysdep =M_I386 -Zi -M3e =M_I286 -M2let32 -LARGE -F 8000`
X! CFLAGS  = -Ox -DLINT_ARGS -DSHM -DAUTO_DIAL_PROC $(COMFLAGS)
X! LDFLAGS = `./sysdep =M_I386 =M_I286 -SEG 256` -lx -lcrypt -lcurses -ltermcap
X  
X  .PRECIOUS = lint_args.h
X  .c.o:;	./fcrc -u $*.c ; /bin/time cc -c $(CFLAGS) $*.c 
X
X--- 21,30 -----
X  SHELL = /bin/sh
X  .SUFFIXES: .o .c .h  
X  
X! SYSTEM = `sysdep =M_I386 Xenix/386 Sys V =M_I286 Xenix/286 Sys V`
X! COMFLAGS = -i `sysdep =M_I386 -Zi -M3e =M_I286 -M2let32 -LARGE -F 8000`
X! CFLAGS  = -Ox -DLINT_ARGS -DNO_SELECT -DAUTO_DIAL_PROC $(COMFLAGS)
X! LDFLAGS = `sysdep =M_I386 =M_I286 -SEG 256` -lx -lcrypt -lcurses -ltermcap
X  
X  .c.o:;	fcrc -u $*.c ; /bin/time cc -c $(CFLAGS) $*.c 
X  
X***************
X*** 24,31
X  CFLAGS  = -Ox -DLINT_ARGS -DSHM -DAUTO_DIAL_PROC $(COMFLAGS)
X  LDFLAGS = `./sysdep =M_I386 =M_I286 -SEG 256` -lx -lcrypt -lcurses -ltermcap
X  
X! .PRECIOUS = lint_args.h
X! .c.o:;	./fcrc -u $*.c ; /bin/time cc -c $(CFLAGS) $*.c 
X  
X  SRC	= \
X  	bamboozle.c\
X
X--- 26,32 -----
X  CFLAGS  = -Ox -DLINT_ARGS -DNO_SELECT -DAUTO_DIAL_PROC $(COMFLAGS)
X  LDFLAGS = `sysdep =M_I386 =M_I286 -SEG 256` -lx -lcrypt -lcurses -ltermcap
X  
X! .c.o:;	fcrc -u $*.c ; /bin/time cc -c $(CFLAGS) $*.c 
X  
X  SRC	= \
X  	bamboozle.c\
X***************
X*** 133,139
X  	smap.o\
X  	var.o
X  
X! all: sysdep afterlint fcrc ecu
X  
X  ecuhelp:
X  	cd help;make depend;make lint;make all
X
X--- 134,140 -----
X  	smap.o\
X  	var.o
X  
X! all: sysdep afterlint fcrc bperr/bperr ecu
X  
X  ecuhelp:
X  	cd help;make depend;make lint;make all
X***************
X*** 144,151
X  ecus:
X  	cd sea;make all
X  
X! ecubp:
X! 	cd bperr;make
X  
X  ecu: $(OBJ)
X  	buildrev `date` $(SYSTEM)  >ecurev.c
X
X--- 145,152 -----
X  ecus:
X  	cd sea;make all
X  
X! bperr/bperr: bperr/bperr.c
X! 	cd bperr;make bperr
X  
X  ecu: $(OBJ)
X  	echo 'char *revision="'`date` $(SYSTEM)'";'  >ecurev.c
X***************
X*** 148,154
X  	cd bperr;make
X  
X  ecu: $(OBJ)
X! 	buildrev `date` $(SYSTEM)  >ecurev.c
X  	cc -c $(CFLAGS) ecurev.c; rm ecurev.c
X  	/bin/time cc $(COMFLAGS) ecurev.o $(OBJ) $(LDFLAGS) -o ecu 
X  	rm ecurev.o
X
X--- 149,155 -----
X  	cd bperr;make bperr
X  
X  ecu: $(OBJ)
X! 	echo 'char *revision="'`date` $(SYSTEM)'";'  >ecurev.c
X  	cc -c $(CFLAGS) ecurev.c; rm ecurev.c
X  	/bin/time cc $(COMFLAGS) ecurev.o $(OBJ) $(LDFLAGS) -o ecu 
X  	rm ecurev.o
X***************
X*** 153,159
X  	/bin/time cc $(COMFLAGS) ecurev.o $(OBJ) $(LDFLAGS) -o ecu 
X  	rm ecurev.o
X  
X! proc_error.c: ecuerror.h
X  	bperr/bperr
X  
X  ecu.fls: $(SRC)
X
X--- 154,160 -----
X  	/bin/time cc $(COMFLAGS) ecurev.o $(OBJ) $(LDFLAGS) -o ecu 
X  	rm ecurev.o
X  
X! proc_error.c: ecuerror.h bperr/bperr
X  	bperr/bperr
X  
X  ecu.fls: $(SRC)
X***************
X*** 163,169
X  	csh zgcc ecu.fls lint_args.h $(CFLAGS)
X  	fcrc -u Makefile *.h
X  
X! install: all ecuhelp ecuz ecus ecuungetty #run as root
X  	cp ecu z/ecusz z/ecurz sea/ecusea $(LBIN)
X  	-mkdir /usr/lib/ecu
X  	cp models/*.mi help/ecuhelp.data /usr/lib/ecu
X
X--- 164,170 -----
X  	csh zgcc ecu.fls lint_args.h $(CFLAGS)
X  	fcrc -u Makefile *.h
X  
X! install: all ecuhelp ecuz ecus ecuug #run as root
X  	cp ecu z/ecusz z/ecurz sea/ecusea $(LBIN)
X  	-mkdir /usr/lib/ecu
X  	cd ecuungetty;make install
X***************
X*** 166,171
X  install: all ecuhelp ecuz ecus ecuungetty #run as root
X  	cp ecu z/ecusz z/ecurz sea/ecusea $(LBIN)
X  	-mkdir /usr/lib/ecu
X  	cp models/*.mi help/ecuhelp.data /usr/lib/ecu
X  	cp ecuungetty/ecuungetty /usr/lib/ecu
X  	chmod u+s /usr/lib/ecu/ecuungetty
X
X--- 167,173 -----
X  install: all ecuhelp ecuz ecus ecuug #run as root
X  	cp ecu z/ecusz z/ecurz sea/ecusea $(LBIN)
X  	-mkdir /usr/lib/ecu
X+ 	cd ecuungetty;make install
X  	cp models/*.mi help/ecuhelp.data /usr/lib/ecu
X  
X  shar:
X***************
X*** 167,174
X  	cp ecu z/ecusz z/ecurz sea/ecusea $(LBIN)
X  	-mkdir /usr/lib/ecu
X  	cp models/*.mi help/ecuhelp.data /usr/lib/ecu
X- 	cp ecuungetty/ecuungetty /usr/lib/ecu
X- 	chmod u+s /usr/lib/ecu/ecuungetty
X  
X  shar:
X  	csh -c 'shar -D -c -v -l30 -o/tmp/ecu. README Makefile *.c *.h \
X
X--- 169,174 -----
X  	-mkdir /usr/lib/ecu
X  	cd ecuungetty;make install
X  	cp models/*.mi help/ecuhelp.data /usr/lib/ecu
X  
X  shar:
X  	csh -c 'shar -D -c -v -l30 -o/tmp/ecu. README Makefile *.c *.h \
X***************
X*** 176,182
X  help/*.{c,src} ecuungetty/Makefile ecuungetty/*.{c,h} \
X  z/Makefile z/*.{c,h} sea/Makefile sea/*.{c,h,doc} \
X  uucp/*.c xsel386/* \
X! ckermit/* doc/*.{txt,man} doc/runoff models/*'
X  
X  fcrc: fcrc.c
X  	cc -O fcrc.c -o $@
X
X--- 176,182 -----
X  help/*.{c,src} ecuungetty/Makefile ecuungetty/*.{c,h} \
X  z/Makefile z/*.{c,h} sea/Makefile sea/*.{c,h,doc} \
X  uucp/*.c xsel386/* \
X! ckermit/* doc/*.{txt,man} doc/runoff models/* zgcc'
X  
X  fcrc: fcrc.c
X  	cc -O fcrc.c -o $@
X***************
X*** 180,185
X  
X  fcrc: fcrc.c
X  	cc -O fcrc.c -o $@
X  
X  sysdep: sysdep.c
X  	cc -O sysdep.c -o $@
X
X--- 180,186 -----
X  
X  fcrc: fcrc.c
X  	cc -O fcrc.c -o $@
X+ 	-cp fcrc $(LBIN)
X  
X  buildrev: buildrev.c
X  	cc -O buildrev.c -o $@
X***************
X*** 181,186
X  fcrc: fcrc.c
X  	cc -O fcrc.c -o $@
X  
X  sysdep: sysdep.c
X  	cc -O sysdep.c -o $@
X  
X
X--- 182,191 -----
X  	cc -O fcrc.c -o $@
X  	-cp fcrc $(LBIN)
X  
X+ buildrev: buildrev.c
X+ 	cc -O buildrev.c -o $@
X+ 	-cp buildrev $(LBIN)
X+ 
X  sysdep: sysdep.c
X  	cc -O sysdep.c -o $@
X  	-cp sysdep $(LBIN)
X***************
X*** 183,188
X  
X  sysdep: sysdep.c
X  	cc -O sysdep.c -o $@
X  
X  afterlint: afterlint.c
X  	cc -O afterlint.c -o $@
X
X--- 188,194 -----
X  
X  sysdep: sysdep.c
X  	cc -O sysdep.c -o $@
X+ 	-cp sysdep $(LBIN)
X  
X  afterlint: afterlint.c
X  	cc -O afterlint.c -o $@
X***************
X*** 186,191
X  
X  afterlint: afterlint.c
X  	cc -O afterlint.c -o $@
X  
X  #
X  #
X
X--- 192,198 -----
X  
X  afterlint: afterlint.c
X  	cc -O afterlint.c -o $@
X+ 	-cp afterlint $(LBIN)
X  
X  #
X  #
SHAR_EOF
chmod 0644 ecu.p3.01 || echo "restore of ecu.p3.01 fails"
sed 's/^X//' << 'SHAR_EOF' > ecu.p3.02 &&
X*** /u4/ecu-unet1/release/z/Makefile	Tue Oct 17 01:49:39 1989
X--- z/Makefile	Sun Oct 15 16:14:28 1989
X***************
X*** 1,4
X! #  CHK=0x21C3
X  #+-------------------------------------------------------------------
X  # Makefile for ecurz/ecusz (ecu file transfer)
X  #--------------------------------------------------------------------
X
X--- 1,4 -----
X! #  CHK=0x04C0
X  #+-------------------------------------------------------------------
X  # Makefile for ecurz/ecusz (ecu file transfer)
X  #--------------------------------------------------------------------
X***************
X*** 11,17
X  SHELL = /bin/sh
X  
X  .SUFFIXES: .o .c .h  
X- .PRECIOUS: zlint.h
X  
X  #PROFILE = -p
X  
X
X--- 11,16 -----
X  SHELL = /bin/sh
X  
X  .SUFFIXES: .o .c .h  
X  
X  #PROFILE = -p
X  
X***************
X*** 38,44
X  all: ecusz ecurz
X  
X  ecusz: ecusz.o $(COMMON_OBJ)
X! 	buildrev `date` $(SYSTEM) >ecuszrev.c
X  	cc $(CFLAGS) ecuszrev.c ; rm ecuszrev.c
X  	/bin/time cc $(COMFLAGS) ecusz.o ecuszrev.o $(COMMON_OBJ) $(LDFLAGS) -o ecusz
X  	rm -f ecuszrev.o
X
X--- 37,43 -----
X  all: ecusz ecurz
X  
X  ecusz: ecusz.o $(COMMON_OBJ)
X! 	echo 'char *revision="'`date` $(SYSTEM)'";'  >ecuszrev.c
X  	cc $(CFLAGS) ecuszrev.c ; rm ecuszrev.c
X  	/bin/time cc $(COMFLAGS) ecusz.o ecuszrev.o $(COMMON_OBJ) $(LDFLAGS) -o ecusz
X  	rm -f ecuszrev.o
X***************
X*** 44,51
X  	rm -f ecuszrev.o
X  
X  ecurz: ecurz.o $(COMMON_OBJ)
X! 	buildrev `date` $(SYSTEM) >ecurzrev.c
X! 	cc $CFLAGS) ecurzrev.c ; rm ecurzrev.c
X  	/bin/time cc $(COMFLAGS) ecurz.o ecurzrev.o $(COMMON_OBJ) $(LDFLAGS) -o ecurz 
X  	rm -f ecurzrev.o
X  
X
X--- 43,50 -----
X  	rm -f ecuszrev.o
X  
X  ecurz: ecurz.o $(COMMON_OBJ)
X! 	echo 'char *revision="'`date` $(SYSTEM)'";'  >ecurzrev.c
X! 	cc $(CFLAGS) ecurzrev.c ; rm ecurzrev.c
X  	/bin/time cc $(COMFLAGS) ecurz.o ecurzrev.o $(COMMON_OBJ) $(LDFLAGS) -o ecurz 
X  	rm -f ecurzrev.o
X  
SHAR_EOF
chmod 0644 ecu.p3.02 || echo "restore of ecu.p3.02 fails"
exit 0
-- 
-------------------------------------------------------------------
Warren Tucker, Tridom Corporation       ...!gatech!emory!tridom!wht 
Ker-au'-lo-phon.  An 8-foot partial flue-stop, having metal pipes
surmounted by adjustable rings, and with a hole bored near the top
of each pipe, producing a soft and "reedy" tone.