diff options
| author | joerg <joerg@pkgsrc.org> | 2005-12-19 15:15:47 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2005-12-19 15:15:47 +0000 |
| commit | a87f6b63e30ad8c8e0277830471b6efb1668b2a1 (patch) | |
| tree | 0ad4fa769c12fccbba1bccaaac6701c8d0d6e85b /mail/faces | |
| parent | 65e54b0ea50ea1f6a8cdf171d74a1afcafe7ed26 (diff) | |
| download | pkgsrc-a87f6b63e30ad8c8e0277830471b6efb1668b2a1.tar.gz | |
Include errno.h on all platforms. Also include stdio.h, it provides
sys_nerr and sys_errlist on DragonFly and FreeBSD. Only define
it manually for platforms other than NetBSD, DragonFly, FreeBSD and
Interix.
Diffstat (limited to 'mail/faces')
| -rw-r--r-- | mail/faces/distinfo | 6 | ||||
| -rw-r--r-- | mail/faces/patches/patch-af | 22 | ||||
| -rw-r--r-- | mail/faces/patches/patch-av | 14 |
3 files changed, 23 insertions, 19 deletions
diff --git a/mail/faces/distinfo b/mail/faces/distinfo index 59844c53905..26880cf0c6a 100644 --- a/mail/faces/distinfo +++ b/mail/faces/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2005/03/15 03:59:38 tv Exp $ +$NetBSD: distinfo,v 1.11 2005/12/19 15:15:47 joerg Exp $ SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 2cd5dc0291d690060ad24aafa85d69fd9c8a4dee SHA1 (patch-ac) = adb2718262027b4ba68425ffd4bef37192ff6d0c SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68 SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088 -SHA1 (patch-af) = b49060da7e929c4136e4b9b761eec553eef926db +SHA1 (patch-af) = 280a41d41911ddbd7be1c35849d58e67e9b8b34b SHA1 (patch-ag) = df1e715582dd8f76fabed97ceb994d77d6d14ab7 SHA1 (patch-ah) = 0333bb755c9fb3f71bc17c963eaa9c0b1322a6d6 SHA1 (patch-ai) = 37ac5631b842794f5f6d24f33fad44573a186114 @@ -24,7 +24,7 @@ SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9 SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377 SHA1 (patch-at) = ee84e7a191c0db0f278be753562ba086050a7f8c SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318 -SHA1 (patch-av) = 856c345ff16873b39ea4e0fdf1df0e6bdfcdd95b +SHA1 (patch-av) = de7097291d730f08a3c41e7a3fbe9fb474dcdcdc SHA1 (patch-aw) = a53df4bc5b1eb696bc9416f7109d152d735b76f7 SHA1 (patch-ax) = d815d247fbbfe9a0553bd3c2187d842269d36000 SHA1 (patch-ay) = 47cfbfb581fcfb9a781c76dd9dfdcd410ce39a93 diff --git a/mail/faces/patches/patch-af b/mail/faces/patches/patch-af index d931c50bf07..e3b885da410 100644 --- a/mail/faces/patches/patch-af +++ b/mail/faces/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.5 2005/03/15 03:59:38 tv Exp $ +$NetBSD: patch-af,v 1.6 2005/12/19 15:15:47 joerg Exp $ ---- compface/uncmain.c.orig Wed Oct 23 22:28:07 1991 +--- compface/uncmain.c.orig 1991-10-24 02:28:07.000000000 +0000 +++ compface/uncmain.c @@ -18,6 +18,8 @@ #include <fcntl.h> @@ -11,14 +11,16 @@ $NetBSD: patch-af,v 1.5 2005/03/15 03:59:38 tv Exp $ /* the buffer is longer than needed to handle sparse input formats */ #define FACEBUFLEN 2048 char fbuf[FACEBUFLEN]; -@@ -33,12 +35,20 @@ char *cmdname; +@@ -33,12 +35,21 @@ char *cmdname; /* error handling definitions follow */ -+#if defined(__NetBSD__) || defined(__INTERIX) +-extern int errno, sys_nerr; +#include <errno.h> -+#else - extern int errno, sys_nerr; ++#include <stdio.h> ++ ++#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) ++extern int sys_nerr; extern char *sys_errlist[]; +#endif @@ -32,17 +34,17 @@ $NetBSD: patch-af,v 1.5 2005/03/15 03:59:38 tv Exp $ #define INITERR(s) {(void)strcpy(fbuf, cmdname); (void)strcat(fbuf, ": ");\ (void)strcat(fbuf, (s));} #define ADDERR(s) (void)strcat(fbuf, (s)); -@@ -59,6 +69,13 @@ char *argv[]; - while (**argv) +@@ -60,6 +71,13 @@ char *argv[]; if (*((*argv)++) == '/') cmdname = *argv; /* find the command's basename */ -+ + + if (argc > 1 && !strcmp(argv[1], "-X")) + { + xbitmap++; + argc--; + argv++; + } - ++ if (argc > 3) { + INITERR("usage: ") diff --git a/mail/faces/patches/patch-av b/mail/faces/patches/patch-av index 5da3ee89854..7995d7923e4 100644 --- a/mail/faces/patches/patch-av +++ b/mail/faces/patches/patch-av @@ -1,15 +1,17 @@ -$NetBSD: patch-av,v 1.2 2005/03/15 03:59:38 tv Exp $ +$NetBSD: patch-av,v 1.3 2005/12/19 15:15:47 joerg Exp $ ---- compface/cmain.c.orig Wed Oct 23 22:28:07 1991 +--- compface/cmain.c.orig 1991-10-24 02:28:07.000000000 +0000 +++ compface/cmain.c -@@ -33,12 +33,20 @@ char *cmdname; +@@ -33,12 +33,21 @@ char *cmdname; /* error handling definitions follow */ -+#if defined(__NetBSD__) || defined(__INTERIX) +-extern int errno, sys_nerr; +#include <errno.h> -+#else - extern int errno, sys_nerr; ++#include <stdio.h> ++ ++#if !defined(__NetBSD__) && !defined(__INTERIX) && !defined(__DragonFly__) && !defined(__FreeBSD__) ++extern int sys_nerr; extern char *sys_errlist[]; +#endif |