Split patches one per source file.

Remove fuzz from patches.
Remove PATCH_FUZZ_FACTOR definition.

10 files changed, 226 insertions, 226 deletions

diff --git a/graphics/urt/Makefile b/graphics/urt/Makefile
index 81f714ed94f..242c84704ab 100644
--- a/graphics/urt/Makefile
+++ b/graphics/urt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 1999/11/12 10:41:22 agc Exp $
+# $NetBSD: Makefile,v 1.9 1999/11/22 11:11:32 agc Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/02/11 08:48:26 tg Exp
 #
 
@@ -28,8 +28,6 @@ MAKEFILE=	makefile
 MAKE_ENV+=	PKGSRCDIR=${BUILD_ROOT} WORKINGDIRNAME=${WRKDIR:T}
 ALL_TARGET=
 
-PATCH_FUZZ_FACTOR=	-F2
-
 post-install:
 	${MKDIR} ${PREFIX}/share/doc/urt ${PREFIX}/share/examples/urt
 	cd ${PREFIX}/share/doc/urt && (\
diff --git a/graphics/urt/files/patch-sum b/graphics/urt/files/patch-sum
index d4f16c2db82..278992bf031 100644
--- a/graphics/urt/files/patch-sum
+++ b/graphics/urt/files/patch-sum
@@ -1,11 +1,16 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:12 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/22 11:11:33 agc Exp $
 
 MD5 (patch-aa) = 1b585690ba8930a157e96a54be2ef1ea
-MD5 (patch-ab) = 9a885a36d5bce788822ea7b924f460eb
+MD5 (patch-ab) = d452d364f338abd9b93ba68063252f63
 MD5 (patch-ac) = 3442f1a97e317e64d45e7f45d58e9c43
 MD5 (patch-ad) = 2f8c2c83daf3d6a7384c34b0adefdc91
-MD5 (patch-ae) = 0c7c5fa8eeea659c5790d9384edc577d
+MD5 (patch-ae) = 33182ea6068e3b0307ed7e7604a87df3
 MD5 (patch-af) = d10f232bd3d6d1cae311fbb34032a57b
 MD5 (patch-ag) = 5fd8a529e2577fa07189fca6c141d012
-MD5 (patch-ah) = 4b2a3c7b6d6929c1e412b518de0ece5f
+MD5 (patch-ah) = 5c4c8ba9732314cbc321c9dcf69fa903
 MD5 (patch-ai) = cbc0d6e2b3f5c4767098ec09d1e675f0
+MD5 (patch-aj) = 9aeeb4ad08b208ed370ab4ee96091d79
+MD5 (patch-ak) = 9d6fc1fca189bd30739d3da25ed44cdf
+MD5 (patch-al) = 1d752bb6028c57455f1b43f8eca769ab
+MD5 (patch-am) = ffce71bdaac42d46480127f1010f61bf
+MD5 (patch-an) = 3d267c95fa1f4d3465444113643558d1
diff --git a/graphics/urt/patches/patch-ab b/graphics/urt/patches/patch-ab
index 159e19aa873..f72ef773075 100644
--- a/graphics/urt/patches/patch-ab
+++ b/graphics/urt/patches/patch-ab
@@ -1,6 +1,5 @@
-$NetBSD: patch-ab,v 1.1 1998/08/24 16:55:36 agc Exp $
+$NetBSD: patch-ab,v 1.2 1999/11/22 11:11:33 agc Exp $
 
-diff -ur ../urt-3.1b-orig/get/getx11/in_cmap.c ./get/getx11/in_cmap.c
 --- ../urt-3.1b-orig/get/getx11/in_cmap.c	Thu Apr 30 10:17:16 1992
 +++ ./get/getx11/in_cmap.c	Sat Sep 16 11:16:59 1995
 @@ -70,10 +70,10 @@
@@ -16,213 +15,3 @@ diff -ur ../urt-3.1b-orig/get/getx11/in_cmap.c ./get/getx11/in_cmap.c
      
      for (i = 0; i < 3; i++ ) {
  	for (j = 0; j < 256; j++)
-diff -ur ../urt-3.1b-orig/include/rle_config.tlr ./include/rle_config.tlr
---- ../urt-3.1b-orig/include/rle_config.tlr	Thu Apr 30 10:06:23 1992
-+++ ./include/rle_config.tlr	Sat Sep 16 11:31:57 1995
-@@ -48,7 +48,7 @@
- #endif /* NO_DECLARE_MALLOC */
- 
- #ifdef USE_PROTOTYPES
--extern char *getenv( CONST_DECL char *name );
-+extern char *getenv( CONST_DECL char *CONST_DECL name);
- #else
- extern char *getenv();
- #endif
-diff -ur ../urt-3.1b-orig/lib/buildmap.c ./lib/buildmap.c
---- ../urt-3.1b-orig/lib/buildmap.c	Thu Feb 27 18:17:01 1992
-+++ ./lib/buildmap.c	Sat Sep 16 12:11:12 1995
-@@ -26,6 +26,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include "rle.h"
- #include <math.h>
- 
-diff -ur ../urt-3.1b-orig/lib/makefile.src ./lib/makefile.src
---- ../urt-3.1b-orig/lib/makefile.src	Wed Mar  4 16:32:53 1992
-+++ ./lib/makefile.src	Sat Sep 16 10:44:35 1995
-@@ -26,7 +26,10 @@
- 	vaxshort.o \
- 	$(OPT_OBJS)
- 
--LIBNAME = librle.a
-+SOOBJS = $(OBJS:.o=.so)
-+
-+LIBANAME = librle.a
-+LIBSONAME = librle.so.1.0
- 
- # Just rebuild the object files.
- objs: $(OBJS)
-@@ -37,23 +40,13 @@
- # Do nothing if $(DEST) is empty (or not defined)
- install: buildlib
- 	@sh -c "if test '$(DEST)x' != x ; then \
--		echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
--		cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
-+		echo cp $(LIBANAME) $(DEST)/$(LIBANAME) ; \
-+		cp $(LIBANAME) $(DEST)/$(LIBANAME) ; \
-+		echo cp $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \
-+		cp $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \
- 		if test x$(RANLIB) != x ; then \
--			echo ranlib $(DEST)/$(LIBNAME) ; \
--			ranlib $(DEST)/$(LIBNAME) ; \
--		else \
--			true ; \
--		fi ; \
--		if test -d $(DEST)/debug ; then \
--			echo cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
--			if test x$(RANLIB) != x ; then \
--				cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
--				echo ranlib $(DEST)/debug/$(LIBNAME) ; \
--			else \
--				true ; \
--			fi ; \
--			ranlib $(DEST)/debug/$(LIBNAME) ; \
-+			echo ranlib $(DEST)/$(LIBANAME) ; \
-+			ranlib $(DEST)/$(LIBANAME) ; \
- 		else \
- 			true ; \
- 		fi ; \
-@@ -63,14 +56,24 @@
- 	touch install
- 
- # Rebuild the library from all the .o files.
--buildlib: $(OBJS)
--	-rm -f $(LIBNAME)
--	ar rc $(LIBNAME)
--	ar q $(LIBNAME) $(OBJS)
-+buildlib: $(LIBANAME) $(LIBSONAME)
-+
-+$(LIBANAME): $(OBJS)
-+	-rm -f $@
-+	ar rc $@ $?
- #ifndef NO_RANLIB
--	ranlib $(LIBNAME)
-+	ranlib $@
- #endif
--	touch buildlib
-+
-+.SUFFIXES: .so .o
-+
-+.c.so:
-+	$(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so
-+	$(LD) -X -r $*.so
-+
-+$(LIBSONAME): $(SOOBJS)
-+	-rm -f $@
-+	ld -Bshareable -o $@ $>
- 
- # Clean up installed stuff and binaries
- pristine: clean
-@@ -86,9 +89,12 @@
- # Get rid of everything which must be recompiled on a different computer.
- clean:
- 	-rm -f *.o
-+	-rm -f *.so
- 	-@if test x$(DEST) != x ; then \
--		echo rm -f $(LIBNAME) ; \
--		rm -f $(LIBNAME) ; \
-+		echo rm -f $(LIBANAME) ; \
-+		rm -f $(LIBANAME) ; \
-+		echo rm -f $(LIBSONAME) ; \
-+		rm -f $(LIBSONAME) ; \
- 	else \
- 		true ; \
- 	fi
-diff -ur ../urt-3.1b-orig/makefile.src ./makefile.src
---- ../urt-3.1b-orig/makefile.src	Fri Jun  7 11:58:13 1991
-+++ ./makefile.src	Fri Sep 15 22:09:01 1995
-@@ -17,7 +17,7 @@
- # clean deletes all but source, pristine (below) deletes installed stuff, too
- default clean: doit
- 	@for d in $(DIRS) ; do \
--		( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
-+		( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
- 	done
- 
- # install puts library, binaries and documentation into global location
-@@ -29,7 +29,7 @@
- 
- install $(MAKE_TARGET) pristine depend:: doit
- 	@for d in $(ALLDIRS) ; do \
--		( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
-+		( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
- 	done
- 
- 
-diff -ur ../urt-3.1b-orig/makefile.tlr ./makefile.tlr
---- ../urt-3.1b-orig/makefile.tlr	Tue Aug  4 13:17:57 1992
-+++ ./makefile.tlr	Sat Sep 16 10:35:58 1995
-@@ -7,7 +7,7 @@
- 	@sh -c "if test 'x$(DIRS)' != x ; then eval \
- 		'set -e ; for dir in $(DIRS) ; do \
- 			(cd \$$dir ; echo Make ${HERE}\$$dir ; \
--			 	make $(MFLAGS) $(DIRMFLAGS) ) ; \
-+			 	$(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \
- 		done' ; \
- 	  else \
- 		true ; \
-@@ -46,7 +46,7 @@
- 	@sh -c "if test 'x$(DIRS)' != x  ; then eval \
- 		'for dir in $(DIRS) ; do \
- 			(cd \$$dir ; echo Install ${HERE}\$$dir ; \
--			 make $(MFLAGS) $(DIRMFLAGS) install) ; \
-+			 $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \
- 		done' ; \
- 	  else \
- 		true ; \
-@@ -105,7 +105,7 @@
- 	    'for dir in $(ALLDIRS); do \
- 		if test -d $$dir ; then \
- 			(cd $$dir; echo Make ${HERE}$$dir pristine ; \
--			 make $(MFLAGS) pristine); \
-+			 $(MAKE) $(MFLAGS) pristine); \
- 		else \
- 			true; \
- 		fi; \
-@@ -124,7 +124,7 @@
- 	    'for dir in $(ALLDIRS); do \
- 		if test -d $$dir ; then \
- 			(cd $$dir; echo Clean ${HERE}$$dir ; \
--			 make $(MFLAGS) clean); \
-+			$(MAKE) $(MFLAGS) clean); \
- 		else \
- 			true; \
- 		fi; \
-diff -ur ../urt-3.1b-orig/tools/into.c ./tools/into.c
---- ../urt-3.1b-orig/tools/into.c	Thu Apr 30 10:10:15 1992
-+++ ./tools/into.c	Sat Sep 16 10:32:26 1995
-@@ -41,7 +41,10 @@
- short forceflg;				/* overwrite an unwritable file?
- */
- 
- extern int errno;
-+
-+#ifndef BSD
- extern char *sys_errlist[];
-+#endif
- 
- void
- main(argc, argv)
-diff -ur ../urt-3.1b-orig/tools/makefile.src ./tools/makefile.src
---- ../urt-3.1b-orig/tools/makefile.src	Tue Jan 28 15:47:42 1992
-+++ ./tools/makefile.src	Sat Sep 16 10:33:14 1995
-@@ -68,7 +68,7 @@
- fant.out: fant.o mallocNd.o
- 	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
- 	mv fant.new fant.out
--	
-+
- # rlebox and crop use some common code.
- rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
- 
-@@ -82,7 +82,7 @@
- # rleClock has it's own directory, must be built special
- 
- rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c
--	(cd clock ; make)
-+	(cd clock ; $(MAKE))
- 
- # Incremental install, copies everything ("$?") since last install to DEST dir.
- install: $(PGMS) install-pgm
diff --git a/graphics/urt/patches/patch-ae b/graphics/urt/patches/patch-ae
index 605fff5b9e5..0fab53de349 100644
--- a/graphics/urt/patches/patch-ae
+++ b/graphics/urt/patches/patch-ae
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.2 1999/02/10 15:10:47 frueauf Exp $
+$NetBSD: patch-ae,v 1.3 1999/11/22 11:11:33 agc Exp $
 
---- include/rle_config.tlr	Wed Nov 25 23:51:33 1998
-+++ include/rle_config.tlr	Wed Nov 25 23:53:33 1998
-@@ -91,15 +91,15 @@
+--- include/rle_config.tlr	Mon Nov 22 11:01:35 1999
++++ include/rle_config.tlr	Mon Nov 22 11:01:48 1999
+@@ -48,7 +48,7 @@
+ #endif /* NO_DECLARE_MALLOC */
+ 
+ #ifdef USE_PROTOTYPES
+-extern char *getenv( CONST_DECL char *name );
++extern char *getenv( CONST_DECL char *CONST_DECL name);
+ #else
+ extern char *getenv();
+ #endif
+@@ -58,15 +58,15 @@
  #ifdef USE_STRING_H
      /* SYS V string routines. */
  #   include <string.h>
diff --git a/graphics/urt/patches/patch-ah b/graphics/urt/patches/patch-ah
index 36f98ccf42f..4543b2b7db8 100644
--- a/graphics/urt/patches/patch-ah
+++ b/graphics/urt/patches/patch-ah
@@ -1,8 +1,19 @@
-$NetBSD: patch-ah,v 1.2 1999/02/10 15:10:47 frueauf Exp $
+$NetBSD: patch-ah,v 1.3 1999/11/22 11:11:33 agc Exp $
 
---- tools/into.c~	Wed Nov 25 23:51:32 1998
+--- tools/into.c	Wed Nov 25 23:51:32 1998
 +++ tools/into.c	Wed Nov 25 23:58:09 1998
-@@ -75,7 +75,7 @@
+@@ -41,7 +41,10 @@
+ short forceflg;				/* overwrite an unwritable file? */
+ 
+ extern int errno;
++
++#ifndef BSD
+ extern char *sys_errlist[];
++#endif
+ 
+ void
+ main(argc, argv)
+@@ -72,7 +75,7 @@
  	exit(1);
      }
  
diff --git a/graphics/urt/patches/patch-aj b/graphics/urt/patches/patch-aj
new file mode 100644
index 00000000000..5d5d950c4e7
--- /dev/null
+++ b/graphics/urt/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 1999/11/22 11:11:33 agc Exp $
+
+--- lib/buildmap.c	Thu Feb 27 18:17:01 1992
++++ lib/buildmap.c	Sat Sep 16 12:11:12 1995
+@@ -26,6 +26,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "rle.h"
+ #include <math.h>
+ 
diff --git a/graphics/urt/patches/patch-ak b/graphics/urt/patches/patch-ak
new file mode 100644
index 00000000000..bfbfb087f62
--- /dev/null
+++ b/graphics/urt/patches/patch-ak
@@ -0,0 +1,92 @@
+$NetBSD: patch-ak,v 1.1 1999/11/22 11:11:33 agc Exp $
+
+--- lib/makefile.src	Wed Mar  4 16:32:53 1992
++++ lib/makefile.src	Sat Sep 16 10:44:35 1995
+@@ -26,7 +26,10 @@
+ 	vaxshort.o \
+ 	$(OPT_OBJS)
+ 
+-LIBNAME = librle.a
++SOOBJS = $(OBJS:.o=.so)
++
++LIBANAME = librle.a
++LIBSONAME = librle.so.1.0
+ 
+ # Just rebuild the object files.
+ objs: $(OBJS)
+@@ -37,23 +40,13 @@
+ # Do nothing if $(DEST) is empty (or not defined)
+ install: buildlib
+ 	@sh -c "if test '$(DEST)x' != x ; then \
+-		echo cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
+-		cp $(LIBNAME) $(DEST)/$(LIBNAME) ; \
++		echo cp $(LIBANAME) $(DEST)/$(LIBANAME) ; \
++		cp $(LIBANAME) $(DEST)/$(LIBANAME) ; \
++		echo cp $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \
++		cp $(LIBSONAME) $(DEST)/$(LIBSONAME) ; \
+ 		if test x$(RANLIB) != x ; then \
+-			echo ranlib $(DEST)/$(LIBNAME) ; \
+-			ranlib $(DEST)/$(LIBNAME) ; \
+-		else \
+-			true ; \
+-		fi ; \
+-		if test -d $(DEST)/debug ; then \
+-			echo cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
+-			if test x$(RANLIB) != x ; then \
+-				cp $(LIBNAME) $(DEST)/debug/$(LIBNAME) ; \
+-				echo ranlib $(DEST)/debug/$(LIBNAME) ; \
+-			else \
+-				true ; \
+-			fi ; \
+-			ranlib $(DEST)/debug/$(LIBNAME) ; \
++			echo ranlib $(DEST)/$(LIBANAME) ; \
++			ranlib $(DEST)/$(LIBANAME) ; \
+ 		else \
+ 			true ; \
+ 		fi ; \
+@@ -63,14 +56,24 @@
+ 	touch install
+ 
+ # Rebuild the library from all the .o files.
+-buildlib: $(OBJS)
+-	-rm -f $(LIBNAME)
+-	ar rc $(LIBNAME)
+-	ar q $(LIBNAME) $(OBJS)
++buildlib: $(LIBANAME) $(LIBSONAME)
++
++$(LIBANAME): $(OBJS)
++	-rm -f $@
++	ar rc $@ $?
+ #ifndef NO_RANLIB
+-	ranlib $(LIBNAME)
++	ranlib $@
+ #endif
+-	touch buildlib
++
++.SUFFIXES: .so .o
++
++.c.so:
++	$(CC) -fPIC -DPIC $(CFLAGS) -c $*.c -o $*.so
++	$(LD) -X -r $*.so
++
++$(LIBSONAME): $(SOOBJS)
++	-rm -f $@
++	ld -Bshareable -o $@ $>
+ 
+ # Clean up installed stuff and binaries
+ pristine: clean
+@@ -86,9 +89,12 @@
+ # Get rid of everything which must be recompiled on a different computer.
+ clean:
+ 	-rm -f *.o
++	-rm -f *.so
+ 	-@if test x$(DEST) != x ; then \
+-		echo rm -f $(LIBNAME) ; \
+-		rm -f $(LIBNAME) ; \
++		echo rm -f $(LIBANAME) ; \
++		rm -f $(LIBANAME) ; \
++		echo rm -f $(LIBSONAME) ; \
++		rm -f $(LIBSONAME) ; \
+ 	else \
+ 		true ; \
+ 	fi
diff --git a/graphics/urt/patches/patch-al b/graphics/urt/patches/patch-al
new file mode 100644
index 00000000000..839c8b9d4f8
--- /dev/null
+++ b/graphics/urt/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1 1999/11/22 11:11:33 agc Exp $
+
+--- makefile.src	Fri Jun  7 11:58:13 1991
++++ makefile.src	Fri Sep 15 22:09:01 1995
+@@ -17,7 +17,7 @@
+ # clean deletes all but source, pristine (below) deletes installed stuff, too
+ default clean: doit
+ 	@for d in $(DIRS) ; do \
+-		( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
++		( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
+ 	done
+ 
+ # install puts library, binaries and documentation into global location
+@@ -29,7 +29,7 @@
+ 
+ install $(MAKE_TARGET) pristine depend:: doit
+ 	@for d in $(ALLDIRS) ; do \
+-		( cd $$d ; echo make $@ on $$d ; make $(MFLAGS) $@ ) ; \
++		( cd $$d ; echo make $@ on $$d ; $(MAKE) $(MFLAGS) $@ ) ; \
+ 	done
+ 
+ 
diff --git a/graphics/urt/patches/patch-am b/graphics/urt/patches/patch-am
new file mode 100644
index 00000000000..f6956e1a36b
--- /dev/null
+++ b/graphics/urt/patches/patch-am
@@ -0,0 +1,40 @@
+$NetBSD: patch-am,v 1.1 1999/11/22 11:11:33 agc Exp $
+
+--- makefile.tlr	Tue Aug  4 13:17:57 1992
++++ makefile.tlr	Sat Sep 16 10:35:58 1995
+@@ -7,7 +7,7 @@
+ 	@sh -c "if test 'x$(DIRS)' != x ; then eval \
+ 		'set -e ; for dir in $(DIRS) ; do \
+ 			(cd \$$dir ; echo Make ${HERE}\$$dir ; \
+-			 	make $(MFLAGS) $(DIRMFLAGS) ) ; \
++			 	$(MAKE) $(MFLAGS) $(DIRMFLAGS) ) ; \
+ 		done' ; \
+ 	  else \
+ 		true ; \
+@@ -46,7 +46,7 @@
+ 	@sh -c "if test 'x$(DIRS)' != x  ; then eval \
+ 		'for dir in $(DIRS) ; do \
+ 			(cd \$$dir ; echo Install ${HERE}\$$dir ; \
+-			 make $(MFLAGS) $(DIRMFLAGS) install) ; \
++			 $(MAKE) $(MFLAGS) $(DIRMFLAGS) install) ; \
+ 		done' ; \
+ 	  else \
+ 		true ; \
+@@ -105,7 +105,7 @@
+ 	    'for dir in $(ALLDIRS); do \
+ 		if test -d $$dir ; then \
+ 			(cd $$dir; echo Make ${HERE}$$dir pristine ; \
+-			 make $(MFLAGS) pristine); \
++			 $(MAKE) $(MFLAGS) pristine); \
+ 		else \
+ 			true; \
+ 		fi; \
+@@ -124,7 +124,7 @@
+ 	    'for dir in $(ALLDIRS); do \
+ 		if test -d $$dir ; then \
+ 			(cd $$dir; echo Clean ${HERE}$$dir ; \
+-			 make $(MFLAGS) clean); \
++			$(MAKE) $(MFLAGS) clean); \
+ 		else \
+ 			true; \
+ 		fi; \
diff --git a/graphics/urt/patches/patch-an b/graphics/urt/patches/patch-an
new file mode 100644
index 00000000000..41920ee3420
--- /dev/null
+++ b/graphics/urt/patches/patch-an
@@ -0,0 +1,22 @@
+$NetBSD: patch-an,v 1.1 1999/11/22 11:11:33 agc Exp $
+
+--- tools/makefile.src	Tue Jan 28 15:47:42 1992
++++ tools/makefile.src	Sat Sep 16 10:33:14 1995
+@@ -68,7 +68,7 @@
+ fant.out: fant.o mallocNd.o
+ 	$(CC) $(CFLAGS) -I$(RI) fant.o mallocNd.o $(LIBS) -lm -o fant.new
+ 	mv fant.new fant.out
+-	
++
+ # rlebox and crop use some common code.
+ rle_box.o: $(RI)/rle.h $(RI)/rle_config.h $(RI)/rle_raw.h
+ 
+@@ -82,7 +82,7 @@
+ # rleClock has it's own directory, must be built special
+ 
+ rleClock.out: clock/font.c clock/font.h clock/font.src clock/rleClock.c
+-	(cd clock ; make)
++	(cd clock ; $(MAKE))
+ 
+ # Incremental install, copies everything ("$?") since last install to DEST dir.
+ install: $(PGMS) install-pgm