summaryrefslogtreecommitdiff
path: root/mail/faces/patches/patch-ah
blob: b15cd33437eef3318978c76dc9a0c9f37055887a (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
$NetBSD: patch-ah,v 1.3 2000/07/08 12:47:06 tron Exp $

--- faces.h.orig	Tue Nov 19 05:00:49 1991
+++ faces.h	Sat Jul  8 14:25:27 2000
@@ -44,7 +44,7 @@
 #endif  /* STDC */
 
 #ifndef FACEDIR
-#define  FACEDIR  "/usr/local/faces"
+#define  FACEDIR  "@localbase@/faces"
 #endif /*FACEDIR*/
 
 #define  CLOSE         (void) close       /* To make line happy. */
@@ -102,9 +102,10 @@
 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,
+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*/
@@ -193,8 +194,6 @@
 #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(()) ;
@@ -204,6 +203,8 @@
 extern FILE *popen P(()) ;
 #endif /*SYSV32*/
 
+#include <sys/param.h>
+
 /*  Various programs that are used by faces.
  *  You might need to change these on some machines.
  */
@@ -217,7 +218,11 @@
 #define  PRINTDEF   "lpq -P %s"
 
 /* Updating the faces database:   %s replaced with mail update alias name. */
+#if (defined(BSD) && BSD >= 199306)
+#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"