From nobody Tue Oct 01 20:12:46 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XJ8Hy5SDPz5XKZ1; Tue, 01 Oct 2024 20:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XJ8Hy4ZRfz4jJJ; Tue, 1 Oct 2024 20:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727813566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqL0676OswoIXCw2d/Ot93DIWlZVsB90pATrhHrXrC0=; b=TxSdWT0KMvhI+a9/c9rL2wBKwwyIezDtLbEHa+JOxGsotarrWoKxcFXL6+R3RJHsrlImOh vyuDMm196VOrPOfzReGu2gAVanl/qCrWok2ekHNZoaWJdeRFgvYITXcJjqh48Z83eDV1Uc fWnlr53GP7XvaT2/JaqjtVGcUtkSi6noPu+obu+hwzu/BOYSDJtiWWtuTtO0nt0Y42klsy KsEX2q/PEdyjUjWetdp6nG7IgsEHD66r0QpyowHD3OLJE3RSr6Yyr3rOavxmbavMhXqFD+ eMHnC7pH/8mteVCtfGfChu218lgA3pmyzLGsRTDnA0CRMjrket1KGX9U8YKTBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727813566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jqL0676OswoIXCw2d/Ot93DIWlZVsB90pATrhHrXrC0=; b=qyTvSlNRdVMqBYWK+iQth4K70hkgAKOaKQLtBgZbMOaa5oMJ5CDmb+m/7CcvV+ETLNHeku SX5N/4wuI0SZtYrGAaDKxHlj3Vs1fiACk6kmgQFzamgC85g4uPswgWPiTqRE+Yz7xu+rAj BKwTqRWrGnlypCF25kPrZCvfgjt5myKdvXQBhe1rbq+ezbvIdRwPcIuyKX7bN3PhnQTTr+ piQm/F7VIXdy6v2eQ68FaLCPbL1AhA9y8ckJBiyEcdO2onuYbthD9h9w9Ceq8pGLr1NOVX krL73CN2WH9YxTRoSrHXzMtUbjsvMBwm4u+PfwyKnakqGWjmTg1UNBOwEgX65Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727813566; a=rsa-sha256; cv=none; b=mwz0R/8kY6l6Z8ZqfrvE9VyI5X7tQ9VyPh5X0PKVVIpugkuoeJo1xurdm1l5Ueoadrq7/L 71zRefYJsK23cbZN0rNnDIj6yIx3/BjuLudT4N4T7D2wQRlKm4OEVV6COPOXTz77bYNjGi rHwO0EQodsZW5mFO301itxbjz3VkzDOGtTIEuohuwMwen5dPirmEoimyj6leP73pGcWnfM UpHWIimUfNwIe64HdrAqK7jrLa+r/K5nN5Ciojyi8ohX4ahCfBGn9rKlXIMg/noxNlLaCx hv9wSlRz3l0PPmmW5aWXebt4JYic/z0rMKZ2QaTN+YFCBDhSdlijb6T9rJjtUQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XJ8Hy3ryQzsFx; Tue, 1 Oct 2024 20:12:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 491KCkKS049639; Tue, 1 Oct 2024 20:12:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 491KCkjG049636; Tue, 1 Oct 2024 20:12:46 GMT (envelope-from git) Date: Tue, 1 Oct 2024 20:12:46 GMT Message-Id: <202410012012.491KCkjG049636@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 4c00fb987e36 - main - mail/faces: include errno.h for errno List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c00fb987e36553e29286019b6e62317b5cf0838 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c00fb987e36553e29286019b6e62317b5cf0838 commit 4c00fb987e36553e29286019b6e62317b5cf0838 Author: Brooks Davis AuthorDate: 2024-09-30 18:17:36 +0000 Commit: Brooks Davis CommitDate: 2024-10-01 20:11:45 +0000 mail/faces: include errno.h for errno 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 --- mail/faces/Makefile | 2 +- mail/faces/files/patch-compface_cmain.c | 21 +++++++++++---------- mail/faces/files/patch-compface_uncmain.c | 23 ++++++++++++----------- mail/faces/files/patch-intl_dcgettext.c | 12 ++++++++++++ 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 6d6969d01a0c..3f69c2a0aeb6 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,6 +1,6 @@ PORTNAME= faces PORTVERSION= 1.7.7 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= mail MASTER_SITES= SF diff --git a/mail/faces/files/patch-compface_cmain.c b/mail/faces/files/patch-compface_cmain.c index c3f144a65ad0..12ddc1636d27 100644 --- a/mail/faces/files/patch-compface_cmain.c +++ b/mail/faces/files/patch-compface_cmain.c @@ -1,12 +1,14 @@ --- compface/cmain.c.orig +++ compface/cmain.c -@@ -13,77 +13,64 @@ +@@ -13,77 +13,63 @@ * to me, then an attempt will be made to fix them. */ -#include -#include ++#include #include ++#include #include "compface.h" -#define STRCAT (void) strcat @@ -33,11 +35,10 @@ -/* Error handling definitions follow */ +/* error handling definitions follow */ - extern int errno, sys_nerr; - extern char *sys_errlist[]; - +-extern int errno, sys_nerr; +-extern char *sys_errlist[]; +extern void exit P((int)) ; -+ + #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "") -#define INITERR(s) { \ - STRCPY(fbuf, cmdname); \ @@ -106,7 +107,7 @@ INITERR(inname) ADDERR(": ") ADDERR(ERR) -@@ -91,10 +78,11 @@ +@@ -91,10 +77,11 @@ } } @@ -121,7 +122,7 @@ INITERR(outname) ADDERR(": ") ADDERR(ERR) -@@ -103,7 +91,8 @@ +@@ -103,7 +90,8 @@ } (void) ReadBuf(); @@ -131,7 +132,7 @@ case -2 : INITERR("internal error") ERROR case -1 : INITERR(inname) -@@ -123,13 +112,15 @@ +@@ -123,13 +111,15 @@ int WriteBuf() { @@ -151,7 +152,7 @@ INITERR(outname) ADDERR(": ") ADDERR(ERR) -@@ -137,27 +128,30 @@ +@@ -137,27 +127,30 @@ } s += len; } @@ -188,7 +189,7 @@ INITWARN(inname) ADDWARN(" exceeds internal buffer size. Data may be lost") WARN -@@ -165,5 +159,5 @@ +@@ -165,5 +158,5 @@ } } *t = '\0'; diff --git a/mail/faces/files/patch-compface_uncmain.c b/mail/faces/files/patch-compface_uncmain.c index c71cab16fad7..fc5fa9a39953 100644 --- a/mail/faces/files/patch-compface_uncmain.c +++ b/mail/faces/files/patch-compface_uncmain.c @@ -1,12 +1,14 @@ --- compface/uncmain.c.orig +++ compface/uncmain.c -@@ -13,16 +13,12 @@ +@@ -13,16 +13,14 @@ * to me, then an attempt will be made to fix them. */ -#include -#include ++#include #include ++#include #include "compface.h" -#define STRCAT (void) strcat @@ -19,7 +21,7 @@ #define FACEBUFLEN 2048 char fbuf[FACEBUFLEN]; -@@ -32,56 +28,58 @@ +@@ -32,56 +30,55 @@ int outfile = 1; char *outname = ""; @@ -30,11 +32,10 @@ -/* Error handling definitions follow */ +/* error handling definitions follow */ - extern int errno, sys_nerr; - extern char *sys_errlist[]; - +-extern int errno, sys_nerr; +-extern char *sys_errlist[]; +extern void exit P((int)) ; -+ + #define ERR ((errno < sys_nerr) ? sys_errlist[errno] : "") -#define INITERR(s) { \ - STRCPY(fbuf, cmdname); \ @@ -108,7 +109,7 @@ INITERR(inname) ADDERR(": ") ADDERR(ERR) -@@ -89,10 +87,11 @@ +@@ -89,10 +86,11 @@ } } @@ -123,7 +124,7 @@ INITERR(outname) ADDERR(": ") ADDERR(ERR) -@@ -101,7 +100,8 @@ +@@ -101,7 +99,8 @@ } (void) ReadBuf(); @@ -133,7 +134,7 @@ case -2 : INITERR("internal error") ERROR case -1 : INITERR(inname) -@@ -121,13 +121,15 @@ +@@ -121,13 +120,15 @@ int WriteBuf() { @@ -153,7 +154,7 @@ INITERR(outname) ADDERR(": ") ADDERR(ERR) -@@ -135,27 +137,30 @@ +@@ -135,27 +136,30 @@ } s += len; } @@ -190,7 +191,7 @@ INITWARN(inname) ADDWARN(" exceeds internal buffer size. Data may be lost") WARN -@@ -163,5 +168,5 @@ +@@ -163,5 +167,5 @@ } } *t = '\0'; diff --git a/mail/faces/files/patch-intl_dcgettext.c b/mail/faces/files/patch-intl_dcgettext.c new file mode 100644 index 000000000000..67111a089265 --- /dev/null +++ b/mail/faces/files/patch-intl_dcgettext.c @@ -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 +-#ifndef errno +-extern int errno; +-#endif + #ifndef __set_errno + # define __set_errno(val) errno = (val) + #endif