git: 993ca87fedcc - main - japanese/mh: include errno.h for errno
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Oct 2024 20:12:50 UTC
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=993ca87fedcc6e2b7902c4438687dbb891f9de61 commit 993ca87fedcc6e2b7902c4438687dbb891f9de61 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2024-09-30 23:03:36 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2024-10-01 20:11:47 +0000 japanese/mh: include errno.h for errno errno must be accessed by a macro from errno.h. Due to the sheer number of instances use REINPLACE_CMD to replace most instances of "extern int errno;" with "#include <errno.h>". In a few places the errno decleration was a function-scope global where including a header didn't make sense patch those out (the files already included errno.h). This isn't the most elegant, but it's the least of the issues with this code. PR: 281787 Approved by: portmgr (build fix blanket), mikael --- japanese/mh/Makefile | 5 ++++- japanese/mh/files/patch-sbr_ruserpass.c | 10 ++++++++++ japanese/mh/files/patch-uip_mshcmds.c | 19 +++++++++++++++++++ japanese/mh/files/patch-zotnet_mf_muinc.c | 10 ++++++++++ japanese/mh/files/patch-zotnet_mf_uminc.c | 10 ++++++++++ 5 files changed, 53 insertions(+), 1 deletion(-) diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile index 85df8866578c..7d7d53ceab23 100644 --- a/japanese/mh/Makefile +++ b/japanese/mh/Makefile @@ -1,6 +1,6 @@ PORTNAME= mh PORTVERSION= ${VERSION}.j${JP_VERSION} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese mail MASTER_SITES= ftp://ftp.laic.u-hyogo.ac.jp/pub/net/mh/ DISTNAME= ${PORTNAME}-${VERSION}-JP-${JP_VERSION} @@ -47,6 +47,9 @@ post-patch: print; \ }' ${i}.rf > ${i}.tmp && ${MV} ${i}.tmp ${i}.rf) .endfor + ${FIND} ${WRKSRC} -type f \! -name \*.orig | \ + xargs grep -l "extern[ ]*int[ ]*errno" | \ + xargs ${REINPLACE_CMD} -e "s/^extern[ ]*int[ ]*errno;/#include <errno.h>/" post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* diff --git a/japanese/mh/files/patch-sbr_ruserpass.c b/japanese/mh/files/patch-sbr_ruserpass.c new file mode 100644 index 000000000000..5a79334e4e5d --- /dev/null +++ b/japanese/mh/files/patch-sbr_ruserpass.c @@ -0,0 +1,10 @@ +--- sbr/ruserpass.c.orig ++++ sbr/ruserpass.c +@@ -66,7 +66,6 @@ + char myname[MAXHOSTNAMELEN], *mydomain; + int t, i, c, usedefault = 0; + struct stat stb; +- extern int errno; + + hdir = getenv("HOME"); + if (hdir == NULL) diff --git a/japanese/mh/files/patch-uip_mshcmds.c b/japanese/mh/files/patch-uip_mshcmds.c new file mode 100644 index 000000000000..f3269a64f34a --- /dev/null +++ b/japanese/mh/files/patch-uip_mshcmds.c @@ -0,0 +1,19 @@ +--- uip/mshcmds.c.orig ++++ uip/mshcmds.c +@@ -29,8 +29,6 @@ + + /* */ + +-extern int errno; +- + /* BURST */ + static char delim3[] = "-------";/* from burst.c */ + +@@ -3529,7 +3527,6 @@ + (void) strcpy (tmpfil, m_scratch ("", invo_name)); + if ((out = fopen (tmpfil, "w")) == NULL) { + int olderr; +- extern int errno; + char newfil[80]; + + olderr = errno; diff --git a/japanese/mh/files/patch-zotnet_mf_muinc.c b/japanese/mh/files/patch-zotnet_mf_muinc.c new file mode 100644 index 000000000000..3799145a8f03 --- /dev/null +++ b/japanese/mh/files/patch-zotnet_mf_muinc.c @@ -0,0 +1,10 @@ +--- zotnet/mf/muinc.c.orig ++++ zotnet/mf/muinc.c +@@ -81,7 +81,6 @@ + { + int count, + fd; +- extern int errno; + + for (count = 2; count > 0; count--) + if ((fd = lkopen (file, 1)) == NOTOK) diff --git a/japanese/mh/files/patch-zotnet_mf_uminc.c b/japanese/mh/files/patch-zotnet_mf_uminc.c new file mode 100644 index 000000000000..31409c6db9b3 --- /dev/null +++ b/japanese/mh/files/patch-zotnet_mf_uminc.c @@ -0,0 +1,10 @@ +--- zotnet/mf/uminc.c.orig ++++ zotnet/mf/uminc.c +@@ -86,7 +86,6 @@ + int clear, + count, + fd; +- extern int errno; + struct stat stbuf; + + for (clear = FALSE, count = 2; count > 0; count--)