One file per patch according to the guidelines.

1 files changed, 47 insertions, 96 deletions

diff --git a/mail/faces/files/patch-ad b/mail/faces/files/patch-ad
index ef2c4cac8dcf..e1ec4347ce1c 100644
--- a/mail/faces/files/patch-ad
+++ b/mail/faces/files/patch-ad
@@ -1,99 +1,50 @@
-diff -c -N ../faces/scripts/Makefile ./scripts/Makefile
-*** ../faces/scripts/Makefile	Tue May  7 00:55:26 1991
---- ./scripts/Makefile	Wed Dec 11 09:30:23 1996
+diff -c -N ../faces/faces.h ./faces.h
+*** ../faces/faces.h	Tue Nov 19 05:00:49 1991
+--- ./faces.h	Tue Dec 10 17:36:10 1996
 ***************
-*** 15,30 ****
-  BINDIR	= /usr/local/faces/bin
-  
-  install:
-! 	install -c -m 755 addxface $(BINDIR)
-! 	install -c -m 755 mailq.faces $(BINDIR)
-! 	install -c -m 755 from.faces $(BINDIR)
-! 	install -c -m 755 lpqall.faces $(BINDIR)
-! 	install -c -m 755 rotary.faces $(BINDIR)
-! 	install -c -m 755 facesaddr $(BINDIR)
-! 	install -c -m 755 facesall $(BINDIR)
-! 	install -c -m 755 mkfacesindex $(BINDIR)
-! 	install -c -m 755 newscheck.faces $(BINDIR)
-! 	install -c -m 755 newsfrom.faces $(BINDIR)
-  
-  install2:
-  	install -c -m 755 faces $(LBINDIR)
---- 15,30 ----
-  BINDIR	= /usr/local/faces/bin
-  
-  install:
-! 	install -c -o bin -m 755 addxface $(BINDIR)
-! 	install -c -o bin -m 755 mailq.faces $(BINDIR)
-! 	install -c -o bin -m 755 from.faces $(BINDIR)
-! 	install -c -o bin -m 755 lpqall.faces $(BINDIR)
-! 	install -c -o bin -m 755 rotary.faces $(BINDIR)
-! 	install -c -o bin -m 755 facesaddr $(BINDIR)
-! 	install -c -o bin -m 755 facesall $(BINDIR)
-! 	install -c -o bin -m 755 mkfacesindex $(BINDIR)
-! 	install -c -o bin -m 755 newscheck.faces $(BINDIR)
-! 	install -c -o bin -m 755 newsfrom.faces $(BINDIR)
-  
-  install2:
-  	install -c -m 755 faces $(LBINDIR)
-diff -c -N ../faces/scripts/addxface ./scripts/addxface
-*** ../faces/scripts/addxface	Tue Nov 19 05:05:58 1991
---- ./scripts/addxface	Tue Dec 10 17:52:45 1996
+*** 102,110 ****
+  enum mon_type { MONNEW, MONALL, MONPRINTER, MONPROG, MONUSERS } ;
+  
+  /* X resources used by faces. */
+! enum res_type { R_WINGEOM, R_ICONGEOM, R_FGCOLOR, R_BGCOLOR,
+!                 R_FONT,    R_BGICON,   R_PERIOD,  R_BELL,
+!                 R_FLASH,   R_LOWER,    R_RAISE,   R_BUT1CLR, R_DISPHOST,
+  #ifdef AUDIO_SUPPORT
+                  R_AUDIO,   R_AUDIOCMD, R_BELLFILE
+  #endif /*AUDIO_SUPPORT*/
+--- 102,111 ----
+  enum mon_type { MONNEW, MONALL, MONPRINTER, MONPROG, MONUSERS } ;
+  
+  /* X resources used by faces. */
+! enum res_type { R_WINGEOM, R_ICONGEOM,    R_FGCOLOR, R_BGCOLOR,
+!                 R_FONT,    R_BGICON,      R_PERIOD,  R_BELL,
+!                 R_FLASH,   R_BORDERWIDTH, R_LOWER,   R_RAISE,
+! 		R_BUT1CLR, R_DISPHOST,
+  #ifdef AUDIO_SUPPORT
+                  R_AUDIO,   R_AUDIOCMD, R_BELLFILE
+  #endif /*AUDIO_SUPPORT*/
 ***************
-*** 15,21 ****
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $faces = '/usr/local/faces';
-  $umask = 000;
-  
-  # addxface - install any X-Face: in the header of the given mail message
---- 15,21 ----
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $faces = '/usr/local/share/faces';
-  $umask = 000;
-  
-  # addxface - install any X-Face: in the header of the given mail message
-diff -c -N ../faces/scripts/facesall ./scripts/facesall
-*** ../faces/scripts/facesall	Mon Nov 25 01:30:24 1991
---- ./scripts/facesall	Tue Dec 10 17:57:49 1996
+*** 193,200 ****
+  #endif /*NOUTIME*/
+  
+  extern char *getenv P(()) ;
+- extern char *malloc P(()) ;
+- extern char *realloc P(()) ;
+  extern char *index P(()) ;
+  extern char *rindex P(()) ;
+  extern char *strcpy P(()) ;
+--- 194,199 ----
 ***************
-*** 20,26 ****
-  #$olddb = 1;
-  
-  $cols = 15; $rows = 13;
-! $FACEDIR = '/usr/local/faces';
-  
-  # facesall - show all available faces in the given faces bitmap directory
-  # usage: facesall [ -a ] [ bitmap_directory ]
---- 20,26 ----
-  #$olddb = 1;
-  
-  $cols = 15; $rows = 13;
-! $FACEDIR = '/usr/local/share/faces';
-  
-  # facesall - show all available faces in the given faces bitmap directory
-  # usage: facesall [ -a ] [ bitmap_directory ]
-diff -c -N ../faces/scripts/mkfacesindex ./scripts/mkfacesindex
-*** ../faces/scripts/mkfacesindex	Tue Nov 19 05:05:58 1991
---- ./scripts/mkfacesindex	Tue Dec 10 17:58:16 1996
-***************
-*** 15,21 ****
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $FACEDIR = '/usr/local/faces';
-  
-  # mkfacesindex - make a .index file at the root of a faces database that
-  #		 facesall can use more speedily instead of tabulating the
---- 15,21 ----
-  # than version v1.6.0:
-  #$olddb = 1;
-  
-! $FACEDIR = '/usr/local/share/faces';
-  
-  # mkfacesindex - make a .index file at the root of a faces database that
-  #		 facesall can use more speedily instead of tabulating the
-Common subdirectories: ../faces/scripts/rotary and ./scripts/rotary
+*** 217,223 ****
+--- 216,226 ----
+  #define  PRINTDEF   "lpq -P %s"
+  
+  /* Updating the faces database:   %s replaced with mail update alias name. */
++ #ifdef __FreeBSD__
++ #define  UPDATEDEF  "/usr/sbin/sendmail -oeq -oi %s"
++ #else
+  #define  UPDATEDEF  "/usr/lib/sendmail -oeq -oi %s"
++ #endif
+  
+  /* Monitoring users on a machine: %s replaced with hostname. */
+  #define  USERSDEF   "rusers -l %s"