Standardize patches (no functional change)

6 files changed, 178 insertions, 234 deletions

diff --git a/editors/joe/patches/patch-aa b/editors/joe/patches/patch-aa
index 119c42f52db..775be4887c0 100644
--- a/editors/joe/patches/patch-aa
+++ b/editors/joe/patches/patch-aa
@@ -1,125 +1,78 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 10:40:32 agc Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/22 11:37:16 wiz Exp $
 
-*** Makefile.orig	Mon Jan 23 01:01:28 1995
---- Makefile	Mon Apr  6 16:29:17 1998
-***************
-*** 9,17 ****
-  # to go and where you want the man page
-  # to go:
-  
-! WHEREJOE = /usr/local/bin
-! WHERERC = /usr/local/lib
-! WHEREMAN = /usr/man/man1
-  
-  # If you want to use TERMINFO, you have to set
-  # the following variable to 1.  Also you have to
---- 9,17 ----
-  # to go and where you want the man page
-  # to go:
-  
-! WHEREJOE = ${PREFIX}/bin
-! WHERERC = ${PREFIX}/lib
-! WHEREMAN = ${PREFIX}/man/man1
-  
-  # If you want to use TERMINFO, you have to set
-  # the following variable to 1.  Also you have to
-***************
-*** 27,33 ****
-  
-  # C compiler options: make's built-in rules use this variable
-  
-! CFLAGS = -O
-  
-  # C compiler to use: make's built-in rules use this variable
-  
---- 27,33 ----
-  
-  # C compiler options: make's built-in rules use this variable
-  
-! # CFLAGS = -O
-  
-  # C compiler to use: make's built-in rules use this variable
-  
-***************
-*** 45,51 ****
-  # add '-ltinfo', '-lcurses' or '-ltermlib',
-  # depending on the system.
-  
-! EXTRALIBS =
-  
-  # Object files
-  
---- 45,51 ----
-  # add '-ltinfo', '-lcurses' or '-ltermlib',
-  # depending on the system.
-  
-! EXTRALIBS = -ltermcap
-  
-  # Object files
-  
-***************
-*** 84,100 ****
-  
-  # Install proceedure
-  
-! install: joe termidx
-  	strip joe
-! 	strip termidx
-  	if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
-! 	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe $(WHEREJOE)/termidx
-  	mv joe $(WHEREJOE)
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
-! 	mv termidx $(WHEREJOE)
-  	if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
-  	rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
-  	cp joerc $(WHERERC)
---- 84,100 ----
-  
-  # Install proceedure
-  
-! install: joe # termidx
-  	strip joe
-! #	strip termidx
-  	if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
-! 	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe # $(WHEREJOE)/termidx
-  	mv joe $(WHEREJOE)
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
-  	ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
-! #	mv termidx $(WHEREJOE)
-  	if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
-  	rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
-  	cp joerc $(WHERERC)
-***************
-*** 114,126 ****
-  	chmod a+r $(WHERERC)/rjoerc
-  	chmod a+r $(WHERERC)/jpicorc
-  	chmod a+r $(WHEREMAN)/joe.1
-! 	chmod a+x $(WHEREJOE)/termidx
-! 	rm -f $(WHERERC)/termcap
-! 	cp termcap $(WHERERC)/termcap
-! 	chmod a+r $(WHERERC)/termcap
-! 	rm -f $(WHERERC)/terminfo
-! 	cp terminfo $(WHERERC)/terminfo
-! 	chmod a+r $(WHERERC)/terminfo
-  
-  # Cleanup proceedure
-  
---- 114,126 ----
-  	chmod a+r $(WHERERC)/rjoerc
-  	chmod a+r $(WHERERC)/jpicorc
-  	chmod a+r $(WHEREMAN)/joe.1
-! #	chmod a+x $(WHEREJOE)/termidx
-! #	rm -f $(WHERERC)/termcap
-! #	cp termcap $(WHERERC)/termcap
-! #	chmod a+r $(WHERERC)/termcap
-! #	rm -f $(WHERERC)/terminfo
-! #	cp terminfo $(WHERERC)/terminfo
-! #	chmod a+r $(WHERERC)/terminfo
-  
-  # Cleanup proceedure
-  
+--- Makefile.orig	Mon Jan 23 07:01:28 1995
++++ Makefile
+@@ -9,9 +9,9 @@
+ # to go and where you want the man page
+ # to go:
+ 
+-WHEREJOE = /usr/local/bin
+-WHERERC = /usr/local/lib
+-WHEREMAN = /usr/man/man1
++WHEREJOE = ${PREFIX}/bin
++WHERERC = ${PREFIX}/lib
++WHEREMAN = ${PREFIX}/man/man1
+ 
+ # If you want to use TERMINFO, you have to set
+ # the following variable to 1.  Also you have to
+@@ -27,7 +27,7 @@
+ 
+ # C compiler options: make's built-in rules use this variable
+ 
+-CFLAGS = -O
++# CFLAGS = -O
+ 
+ # C compiler to use: make's built-in rules use this variable
+ 
+@@ -45,7 +45,7 @@
+ # add '-ltinfo', '-lcurses' or '-ltermlib',
+ # depending on the system.
+ 
+-EXTRALIBS =
++EXTRALIBS = -ltermcap
+ 
+ # Object files
+ 
+@@ -84,17 +84,17 @@
+ 
+ # Install proceedure
+ 
+-install: joe termidx
++install: joe # termidx
+ 	strip joe
+-	strip termidx
++#	strip termidx
+ 	if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
+-	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe $(WHEREJOE)/termidx
++	rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe # $(WHEREJOE)/termidx
+ 	mv joe $(WHEREJOE)
+ 	ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
+ 	ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
+ 	ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
+ 	ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
+-	mv termidx $(WHEREJOE)
++#	mv termidx $(WHEREJOE)
+ 	if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
+ 	rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
+ 	cp joerc $(WHERERC)
+@@ -114,13 +114,13 @@
+ 	chmod a+r $(WHERERC)/rjoerc
+ 	chmod a+r $(WHERERC)/jpicorc
+ 	chmod a+r $(WHEREMAN)/joe.1
+-	chmod a+x $(WHEREJOE)/termidx
+-	rm -f $(WHERERC)/termcap
+-	cp termcap $(WHERERC)/termcap
+-	chmod a+r $(WHERERC)/termcap
+-	rm -f $(WHERERC)/terminfo
+-	cp terminfo $(WHERERC)/terminfo
+-	chmod a+r $(WHERERC)/terminfo
++#	chmod a+x $(WHEREJOE)/termidx
++#	rm -f $(WHERERC)/termcap
++#	cp termcap $(WHERERC)/termcap
++#	chmod a+r $(WHERERC)/termcap
++#	rm -f $(WHERERC)/terminfo
++#	cp terminfo $(WHERERC)/terminfo
++#	chmod a+r $(WHERERC)/terminfo
+ 
+ # Cleanup proceedure
+ 
diff --git a/editors/joe/patches/patch-ab b/editors/joe/patches/patch-ab
index abee2f894cf..edf91acefd6 100644
--- a/editors/joe/patches/patch-ab
+++ b/editors/joe/patches/patch-ab
@@ -1,65 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:32 agc Exp $
+$NetBSD: patch-ab,v 1.3 2001/05/22 11:37:16 wiz Exp $
 
-*** main.c.old	Sun Jan 22 03:21:08 1995
---- main.c	Tue Oct 15 16:54:32 1996
-***************
-*** 18,23 ****
---- 18,27 ----
-  
-  #include <stdio.h>
-  #include <fcntl.h>
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+ #include <locale.h>
-+ #include <ctype.h>
-+ #endif
-  #include "config.h"
-  #include "w.h"
-  #include "tty.h"
-***************
-*** 186,191 ****
---- 190,209 ----
-  #else
-   run=namprt(argv[0]);
-  #endif 
-+ 
-+ #if defined(__FreeBSD__) || defined(__NetBSD__)
-+  setlocale(LC_ALL, "");
-+  for(c=0;c<256;c++)
-+   { int a=0;
-+     if(iscntrl(c))
-+      a|=UNDERLINE;
-+     if((c&0x80)&&!isprint(c))
-+      a|=INVERSE;
-+     xlata[c]=a;
-+     if(isprint(c))
-+      xlatc[c]=c;
-+   }
-+ #endif
-  
-   if(s=getenv("LINES")) sscanf(s,"%d",&lines);
-   if(s=getenv("COLUMNS")) sscanf(s,"%d",&columns);
-*** scrn.h.old	Thu Oct  6 10:09:04 1994
---- scrn.h	Tue Oct 15 16:42:29 1996
-***************
-*** 254,263 ****
-  
-  #define xlat(a,c) \
-    ( \
-!   (dspasis && ((unsigned)(c)>=128)) ? \
-        ((a)=0) \
-      : \
-!       (((a)=xlata[(unsigned)(c)]), ((c)=xlatc[(unsigned)(c)])) \
-    )
-  
-  /* int eraeol(SCRN *t,int x,int y);
---- 254,263 ----
-  
-  #define xlat(a,c) \
-    ( \
-!   (dspasis && ((unsigned char)(c)>=128)) ? \
-        ((a)=0) \
-      : \
-!       (((a)=xlata[(unsigned char)(c)]), ((c)=xlatc[(unsigned char)(c)])) \
-    )
-  
-  /* int eraeol(SCRN *t,int x,int y);
+--- b.c.orig	Fri Jan 20 09:38:25 1995
++++ b.c
+@@ -1928,7 +1928,7 @@
+  if(s[0]=='!') pclose(f);
+  else
+ #endif
+- if(zcmp(s,"-")) fclose(f);
++ if(zcmp(s,"-")) { if (fclose(f)) return error = -5; }
+  else fflush(f);
+ 
+  opnerr:;
diff --git a/editors/joe/patches/patch-ac b/editors/joe/patches/patch-ac
index fa0dd5b6cad..18d962f6532 100644
--- a/editors/joe/patches/patch-ac
+++ b/editors/joe/patches/patch-ac
@@ -1,34 +1,36 @@
-$NetBSD: patch-ac,v 1.2 1999/12/28 05:35:55 wiz Exp $
---- ../../work/joe/b.c	Fri Jan 20 09:38:25 1995
-+++ b.c	Thu Nov 25 18:17:59 1999
-@@ -1928,7 +1928,7 @@
-  if(s[0]=='!') pclose(f);
-  else
- #endif
-- if(zcmp(s,"-")) fclose(f);
-+ if(zcmp(s,"-")) { if (fclose(f)) return error = -5; }
-  else fflush(f);
+$NetBSD: patch-ac,v 1.3 2001/05/22 11:37:16 wiz Exp $
+
+--- main.c.orig	Sun Jan 22 01:21:08 1995
++++ main.c
+@@ -18,6 +18,10 @@
  
-  opnerr:;
---- ../../work/joe/ufile.c	Fri Jan 13 18:13:16 1995
-+++ ufile.c	Thu Nov 25 17:25:47 1999
-@@ -135,7 +135,7 @@
- int cp(from,to)
- char *from, *to;
-  {
-- int f, g, amnt;
-+ int f, g, amnt, rc;
-  struct stat sbuf;
+ #include <stdio.h>
+ #include <fcntl.h>
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++#include <locale.h>
++#include <ctype.h>
++#endif
+ #include "config.h"
+ #include "w.h"
+ #include "tty.h"
+@@ -186,6 +190,20 @@
+ #else
+  run=namprt(argv[0]);
+ #endif 
++
++#if defined(__FreeBSD__) || defined(__NetBSD__)
++ setlocale(LC_ALL, "");
++ for(c=0;c<256;c++)
++  { int a=0;
++    if(iscntrl(c))
++     a|=UNDERLINE;
++    if((c&0x80)&&!isprint(c))
++     a|=INVERSE;
++    xlata[c]=a;
++    if(isprint(c))
++     xlatc[c]=c;
++  }
++#endif
  
- #ifdef HAVEUTIME
-@@ -157,8 +157,8 @@
-   }
-  while((amnt=read(f,stdbuf,stdsiz))>0)
-   if(amnt!=write(g,stdbuf,amnt)) break;
-- close(f); close(g);
-- if(amnt) return -1;
-+ close(f); rc = close(g);
-+ if(amnt || rc) return -1;
- 
- #ifdef HAVEUTIME
- #ifdef NeXT
+  if(s=getenv("LINES")) sscanf(s,"%d",&lines);
+  if(s=getenv("COLUMNS")) sscanf(s,"%d",&columns);
diff --git a/editors/joe/patches/patch-ad b/editors/joe/patches/patch-ad
index fe081bcfdd0..2f5b288d784 100644
--- a/editors/joe/patches/patch-ad
+++ b/editors/joe/patches/patch-ad
@@ -1,16 +1,17 @@
-$NetBSD: patch-ad,v 1.1 2000/03/24 14:46:47 ad Exp $
+$NetBSD: patch-ad,v 1.2 2001/05/22 11:37:16 wiz Exp $
 
---- termcap.c.orig	Fri Mar 24 14:36:38 2000
-+++ termcap.c	Fri Mar 24 14:37:22 2000
-@@ -191,7 +191,11 @@
-    namebuf=0;
-   namebuf=vsncpy(sv(namebuf),sc(".termcap "));
-   namebuf=vsncpy(sv(namebuf),sc(JOERC));
-+#ifdef __NetBSD__
-+  namebuf=vsncpy(sv(namebuf),sc("termcap /usr/share/misc/termcap"));
-+#else
-   namebuf=vsncpy(sv(namebuf),sc("termcap /etc/termcap"));
-+#endif
-   }
-  }
+--- scrn.h.orig	Thu Oct  6 08:09:04 1994
++++ scrn.h
+@@ -254,10 +254,10 @@
  
+ #define xlat(a,c) \
+   ( \
+-  (dspasis && ((unsigned)(c)>=128)) ? \
++  (dspasis && ((unsigned char)(c)>=128)) ? \
+       ((a)=0) \
+     : \
+-      (((a)=xlata[(unsigned)(c)]), ((c)=xlatc[(unsigned)(c)])) \
++      (((a)=xlata[(unsigned char)(c)]), ((c)=xlatc[(unsigned char)(c)])) \
+   )
+ 
+ /* int eraeol(SCRN *t,int x,int y);
diff --git a/editors/joe/patches/patch-ae b/editors/joe/patches/patch-ae
new file mode 100644
index 00000000000..809f837e726
--- /dev/null
+++ b/editors/joe/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.1 2001/05/22 11:37:16 wiz Exp $
+
+--- termcap.c.orig	Mon Jan 23 10:07:10 1995
++++ termcap.c
+@@ -191,7 +191,11 @@
+    namebuf=0;
+   namebuf=vsncpy(sv(namebuf),sc(".termcap "));
+   namebuf=vsncpy(sv(namebuf),sc(JOERC));
++#ifdef __NetBSD__
++  namebuf=vsncpy(sv(namebuf),sc("termcap /usr/share/misc/termcap"));
++#else
+   namebuf=vsncpy(sv(namebuf),sc("termcap /etc/termcap"));
++#endif
+   }
+  }
+ 
diff --git a/editors/joe/patches/patch-af b/editors/joe/patches/patch-af
new file mode 100644
index 00000000000..a463cf9a903
--- /dev/null
+++ b/editors/joe/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 2001/05/22 11:37:17 wiz Exp $
+
+--- ufile.c.orig	Fri Jan 13 18:13:16 1995
++++ ufile.c
+@@ -135,7 +135,7 @@
+ int cp(from,to)
+ char *from, *to;
+  {
+- int f, g, amnt;
++ int f, g, amnt, rc;
+  struct stat sbuf;
+ 
+ #ifdef HAVEUTIME
+@@ -157,8 +157,8 @@
+   }
+  while((amnt=read(f,stdbuf,stdsiz))>0)
+   if(amnt!=write(g,stdbuf,amnt)) break;
+- close(f); close(g);
+- if(amnt) return -1;
++ close(f); rc = close(g);
++ if(amnt || rc) return -1;
+ 
+ #ifdef HAVEUTIME
+ #ifdef NeXT