sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

mail/faces: include errno.h for errno

Browse source 
errno must be accessed by a macro from errno.h.

Also add stdio.h for sys_nerr and sys_errlist.

PR:		281783
Approved by:	portmgr (build fix blanket), mikael
This commit is contained in:
Brooks Davis 2024-09-30 19:17:36 +01:00
parent 4680b0d8d0
commit 4c00fb987e
4 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mail/faces/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= faces PORTNAME= faces
PORTVERSION= 1.7.7 PORTVERSION= 1.7.7
PORTREVISION= 13 PORTREVISION= 14
CATEGORIES= mail CATEGORIES= mail
MASTER_SITES= SF MASTER_SITES= SF

21
mail/faces/files/patch-compface_cmain.c
View file

@ -1,12 +1,14 @@
--- compface/cmain.c.orig --- compface/cmain.c.orig
+++ compface/cmain.c +++ compface/cmain.c
@@ -13,77 +13,64 @@ @@ -13,77 +13,63 @@
* to me, then an attempt will be made to fix them. * to me, then an attempt will be made to fix them.
*/ */
-#include <stdlib.h> -#include <stdlib.h>
-#include <unistd.h> -#include <unistd.h>
+#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
+#include <stdio.h>
#include "compface.h" #include "compface.h"
-#define STRCAT (void) strcat -#define STRCAT (void) strcat
@ -33,11 +35,10 @@
-/* Error handling definitions follow */ -/* Error handling definitions follow */
+/* error handling definitions follow */ +/* error handling definitions follow */
extern int errno, sys_nerr; -extern int errno, sys_nerr;
extern char *sys_errlist[]; -extern char *sys_errlist[];
+extern void exit P((int)) ; +extern void exit P((int)) ;
+
#define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "") #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
-#define INITERR(s) { \ -#define INITERR(s) { \
- STRCPY(fbuf, cmdname); \ - STRCPY(fbuf, cmdname); \
@ -106,7 +107,7 @@
INITERR(inname) INITERR(inname)
ADDERR(": ") ADDERR(": ")
ADDERR(ERR) ADDERR(ERR)
@@ -91,10 +78,11 @@ @@ -91,10 +77,11 @@
} }
} }
@ -121,7 +122,7 @@
INITERR(outname) INITERR(outname)
ADDERR(": ") ADDERR(": ")
ADDERR(ERR) ADDERR(ERR)
@@ -103,7 +91,8 @@ @@ -103,7 +90,8 @@
} }
(void) ReadBuf(); (void) ReadBuf();
@ -131,7 +132,7 @@
case -2 : INITERR("internal error") case -2 : INITERR("internal error")
ERROR ERROR
case -1 : INITERR(inname) case -1 : INITERR(inname)
@@ -123,13 +112,15 @@ @@ -123,13 +111,15 @@
int int
WriteBuf() WriteBuf()
{ {
@ -151,7 +152,7 @@
INITERR(outname) INITERR(outname)
ADDERR(": ") ADDERR(": ")
ADDERR(ERR) ADDERR(ERR)
@@ -137,27 +128,30 @@ @@ -137,27 +127,30 @@
} }
s += len; s += len;
} }
@ -188,7 +189,7 @@
INITWARN(inname) INITWARN(inname)
ADDWARN(" exceeds internal buffer size. Data may be lost") ADDWARN(" exceeds internal buffer size. Data may be lost")
WARN WARN
@@ -165,5 +159,5 @@ @@ -165,5 +158,5 @@
} }
} }
*t = '\0'; *t = '\0';

23
mail/faces/files/patch-compface_uncmain.c
View file

@ -1,12 +1,14 @@
--- compface/uncmain.c.orig --- compface/uncmain.c.orig
+++ compface/uncmain.c +++ compface/uncmain.c
@@ -13,16 +13,12 @@ @@ -13,16 +13,14 @@
* to me, then an attempt will be made to fix them. * to me, then an attempt will be made to fix them.
*/ */
-#include <stdlib.h> -#include <stdlib.h>
-#include <unistd.h> -#include <unistd.h>
+#include <errno.h>
#include <fcntl.h> #include <fcntl.h>
+#include <stdio.h>
#include "compface.h" #include "compface.h"
-#define STRCAT (void) strcat -#define STRCAT (void) strcat
@ -19,7 +21,7 @@
#define FACEBUFLEN 2048 #define FACEBUFLEN 2048
char fbuf[FACEBUFLEN]; char fbuf[FACEBUFLEN];
@@ -32,56 +28,58 @@ @@ -32,56 +30,55 @@
int outfile = 1; int outfile = 1;
char *outname = "<stdout>"; char *outname = "<stdout>";
@ -30,11 +32,10 @@
-/* Error handling definitions follow */ -/* Error handling definitions follow */
+/* error handling definitions follow */ +/* error handling definitions follow */
extern int errno, sys_nerr; -extern int errno, sys_nerr;
extern char *sys_errlist[]; -extern char *sys_errlist[];
+extern void exit P((int)) ; +extern void exit P((int)) ;
+
#define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "") #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "")
-#define INITERR(s) { \ -#define INITERR(s) { \
- STRCPY(fbuf, cmdname); \ - STRCPY(fbuf, cmdname); \
@ -108,7 +109,7 @@
INITERR(inname) INITERR(inname)
ADDERR(": ") ADDERR(": ")
ADDERR(ERR) ADDERR(ERR)
@@ -89,10 +87,11 @@ @@ -89,10 +86,11 @@
} }
} }
@ -123,7 +124,7 @@
INITERR(outname) INITERR(outname)
ADDERR(": ") ADDERR(": ")
ADDERR(ERR) ADDERR(ERR)
@@ -101,7 +100,8 @@ @@ -101,7 +99,8 @@
} }
(void) ReadBuf(); (void) ReadBuf();
@ -133,7 +134,7 @@
case -2 : INITERR("internal error") case -2 : INITERR("internal error")
ERROR ERROR
case -1 : INITERR(inname) case -1 : INITERR(inname)
@@ -121,13 +121,15 @@ @@ -121,13 +120,15 @@
int int
WriteBuf() WriteBuf()
{ {
@ -153,7 +154,7 @@
INITERR(outname) INITERR(outname)
ADDERR(": ") ADDERR(": ")
ADDERR(ERR) ADDERR(ERR)
@@ -135,27 +137,30 @@ @@ -135,27 +136,30 @@
} }
s += len; s += len;
} }
@ -190,7 +191,7 @@
INITWARN(inname) INITWARN(inname)
ADDWARN(" exceeds internal buffer size. Data may be lost") ADDWARN(" exceeds internal buffer size. Data may be lost")
WARN WARN
@@ -163,5 +168,5 @@ @@ -163,5 +167,5 @@
} }
} }
*t = '\0'; *t = '\0';

12
mail/faces/files/patch-intl_dcgettext.c Normal file
View file

@ -0,0 +1,12 @@
--- intl/dcgettext.c.orig 2024-09-30 18:50:01.925202000 +0100
+++ intl/dcgettext.c 2024-09-30 18:51:19.264270000 +0100
@@ -39,9 +39,6 @@
#endif
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
#ifndef __set_errno
# define __set_errno(val) errno = (val)
#endif