From nobody Fri Mar 29 19:36:28 2024 X-Original-To: dev-commits-ports-all@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 4V5rHw2PS8z5FZ4S; Fri, 29 Mar 2024 19:36:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V5rHw1YQFz45RW; Fri, 29 Mar 2024 19:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711740988; 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=5BqnbHmdYwxAZFULXY7VJmY6Z+TwnBi+wCJERAyrDgg=; b=S2ZgtARBO/6OqlIV0khicATJsv+Ocy2V+mnqdUFddpO0rC4O5xipoTHoLjRZy8ZPBAoz0E T77Rw8Q61Cv6Jxz6iozuaaDv6u8VK/rVLyK/OzQmFVKSbN1l060oCQVKCDqRpbMRRaU5Dc /R6Z6xPespMdpSU9MSwZTQyOgzWTAk/G28NidGfe6VvGLEuWB5HgbnuRjpO83JdF9+QopX Imhp50fQuXoJTNjCI4OMr6XVCwe3/TxFRyZRopKNLEP9rHw8cPB73pP3jX3lyymlIIif+Z X1yQkMV2COVW0YHEBLhyVM/Asl1Z7hu5X2NYDXfTln9dMXYbXHs6CE+MmkWsiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711740988; a=rsa-sha256; cv=none; b=uqSC6R0ng8wGWqbVjjK2Sj8jajJyWgzQ9FeMefqawom0Zixjjdi4gyq/A/jYHWkyqPwQoF 2nIPITeVbh2zeFwYW2lzKjaoIYuMTOxBPrYjKzfFOU9j78YoJzXusVl2+/WeRLIWn+4UJ0 TxH1VLP19Zzw7QyyBUltIAFIXDbJTLLPfrvKx5zWO5WMAbbCGmLe7f4WhZCFlqCmJRxCsS suNqF4Y8BgZ387iXVWPob3rQlaCd7gggWMODm7sXYHRtTH3mxhs2EbEA/d7U28vefd9I9k TtAi/8XDaA+TNRJ/F0EKRYN5GTyf+wmd5c76Sn/9kI8R8a054YoO3MDxCTKcwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711740988; 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=5BqnbHmdYwxAZFULXY7VJmY6Z+TwnBi+wCJERAyrDgg=; b=a73tfnOmnCNEdBSh+Y9mn5pb6Af8wevi5ZCYzHiYtw4NrjoTYd1ofoP/JGnUT9q5FsB+qv on7HYDZB8a7t9lsh8uJmeOldixBhxrnjiAR7Pu/820jJVJNwAa4eJbkYRbFByIRvzxIJO1 DsFgdPPQPTVbQtZHU/+OqiCu4h8VwaArj/GDgZvH/uHQuTu8HvMmqMiOz6dLnK+bFC8rd0 na0RxAlLnJ0Cs04sNRbYECAKdKs2pGROZPHupIagImbSLCbd1aHfXykA8hJWXnErtA6Coq okaG5WSTxnYkZHiKgijEUVwm0IXiF6EJnPAAa+E1s4jVUTfsYcw5emBOVWc//Q== 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 4V5rHw18DHzNmC; Fri, 29 Mar 2024 19:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42TJaSx2020952; Fri, 29 Mar 2024 19:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42TJaSvC020949; Fri, 29 Mar 2024 19:36:28 GMT (envelope-from git) Date: Fri, 29 Mar 2024 19:36:28 GMT Message-Id: <202403291936.42TJaSvC020949@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7f4c2cbbb186 - main - devel/gmake43: GNU version of 'make' utility (version 4.3 before slowdown occurred in 4.4.1) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7f4c2cbbb1862ddda967d9486e6a016eb8b067fb Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7f4c2cbbb1862ddda967d9486e6a016eb8b067fb commit 7f4c2cbbb1862ddda967d9486e6a016eb8b067fb Author: Yuri Victorovich AuthorDate: 2024-03-29 19:32:27 +0000 Commit: Yuri Victorovich CommitDate: 2024-03-29 19:36:23 +0000 devel/gmake43: GNU version of 'make' utility (version 4.3 before slowdown occurred in 4.4.1) --- devel/Makefile | 1 + devel/gmake43/Makefile | 35 +++++++++ devel/gmake43/distinfo | 3 + devel/gmake43/files/patch-10-6e6abd0c | 127 ++++++++++++++++++++++++++++++++ devel/gmake43/files/patch-lib-glob.c | 10 +++ devel/gmake43/files/patch-src-default.c | 11 +++ devel/gmake43/files/patch-src-makeint.h | 10 +++ devel/gmake43/pkg-descr | 3 + devel/gmake43/pkg-plist | 32 ++++++++ 9 files changed, 232 insertions(+) diff --git a/devel/Makefile b/devel/Makefile index d7e485d6c5d5..1355369aeca0 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -845,6 +845,7 @@ SUBDIR += glrparser SUBDIR += glui SUBDIR += gmake + SUBDIR += gmake43 SUBDIR += gn SUBDIR += gnome-builder SUBDIR += gnome-common diff --git a/devel/gmake43/Makefile b/devel/gmake43/Makefile new file mode 100644 index 000000000000..f012ce4c0cec --- /dev/null +++ b/devel/gmake43/Makefile @@ -0,0 +1,35 @@ +PORTNAME= gmake +PORTVERSION= 4.3 # pre-slowdown caused by the issues described here: https://savannah.gnu.org/bugs/?65533 +CATEGORIES= devel +MASTER_SITES= GNU/make +DISTNAME= make-${PORTVERSION} +PKGNAMESUFFIX= 43 + +# note: before committing to this port, contact portmgr to arrange for an +# experimental ports run. Untested commits may be backed out at portmgr's +# discretion. +MAINTAINER= tijl@FreeBSD.org +COMMENT= GNU version of 'make' utility +WWW= https://www.gnu.org/software/make/ + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +GNU_CONFIGURE= yes +GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +CONFIGURE_ARGS= --program-prefix=g \ + --without-guile + +USES= cpe tar:lz +CPE_VENDOR= gnu +CPE_PRODUCT= make + +OPTIONS_DEFINE= NLS +OPTIONS_SUB= yes + +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls + +INFO= make + +.include diff --git a/devel/gmake43/distinfo b/devel/gmake43/distinfo new file mode 100644 index 000000000000..b8f83469ce24 --- /dev/null +++ b/devel/gmake43/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1587222848 +SHA256 (make-4.3.tar.lz) = de1a441c4edf952521db30bfca80baae86a0ff1acd0a00402999344f04c45e82 +SIZE (make-4.3.tar.lz) = 1266180 diff --git a/devel/gmake43/files/patch-10-6e6abd0c b/devel/gmake43/files/patch-10-6e6abd0c new file mode 100644 index 000000000000..9e0f1e22caa8 --- /dev/null +++ b/devel/gmake43/files/patch-10-6e6abd0c @@ -0,0 +1,127 @@ +From: Bruno Haible +Date: Sat, 23 May 2020 10:19:34 +0000 (+0200) +Subject: findprog-in: Ignore directories. +X-Git-Url: https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=commitdiff_plain;h=6e6abd0cdfe4bb96f6412aebc511f10bf254a820 + +findprog-in: Ignore directories. + +Reported by Frederick Eaton via Dmitry Goncharov in +. + +* lib/findprog-in.c (find_in_given_path): When the file found is a +directory, set errno to EACCES and, during a PATH search, continue +searching. +* modules/findprog-in (Depends-on): Add sys_stat, stat. +--- + +diff --git a/lib/findprog-in.c b/lib/findprog-in.c +index c254f2f..0f76e36 100644 +--- lib/findprog-in.c ++++ lib/findprog-in.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include "filename.h" + #include "concat-filename.h" +@@ -58,8 +59,8 @@ static const char * const suffixes[] = + /* Note: The cmd.exe program does a different lookup: It searches according + to the PATHEXT environment variable. + See . +- Also, it executes files ending .bat and .cmd directly without letting the +- kernel interpret the program file. */ ++ Also, it executes files ending in .bat and .cmd directly without letting ++ the kernel interpret the program file. */ + #elif defined __CYGWIN__ + "", ".exe", ".com" + #elif defined __EMX__ +@@ -136,14 +137,26 @@ find_in_given_path (const char *progname, const char *path, + call access() despite its design flaw. */ + if (eaccess (progpathname, X_OK) == 0) + { +- /* Found! */ +- if (strcmp (progpathname, progname) == 0) ++ /* Check that the progpathname does not point to a ++ directory. */ ++ struct stat statbuf; ++ ++ if (stat (progpathname, &statbuf) >= 0) + { +- free (progpathname); +- return progname; ++ if (! S_ISDIR (statbuf.st_mode)) ++ { ++ /* Found! */ ++ if (strcmp (progpathname, progname) == 0) ++ { ++ free (progpathname); ++ return progname; ++ } ++ else ++ return progpathname; ++ } ++ ++ errno = EACCES; + } +- else +- return progpathname; + } + + if (errno != ENOENT) +@@ -210,25 +223,37 @@ find_in_given_path (const char *progname, const char *path, + call access() despite its design flaw. */ + if (eaccess (progpathname, X_OK) == 0) + { +- /* Found! */ +- if (strcmp (progpathname, progname) == 0) ++ /* Check that the progpathname does not point to a ++ directory. */ ++ struct stat statbuf; ++ ++ if (stat (progpathname, &statbuf) >= 0) + { +- free (progpathname); +- +- /* Add the "./" prefix for real, that +- xconcatenated_filename() optimized away. This +- avoids a second PATH search when the caller uses +- execl/execv/execlp/execvp. */ +- progpathname = +- XNMALLOC (2 + strlen (progname) + 1, char); +- progpathname[0] = '.'; +- progpathname[1] = NATIVE_SLASH; +- memcpy (progpathname + 2, progname, +- strlen (progname) + 1); +- } ++ if (! S_ISDIR (statbuf.st_mode)) ++ { ++ /* Found! */ ++ if (strcmp (progpathname, progname) == 0) ++ { ++ free (progpathname); ++ ++ /* Add the "./" prefix for real, that ++ xconcatenated_filename() optimized away. ++ This avoids a second PATH search when the ++ caller uses execl/execv/execlp/execvp. */ ++ progpathname = ++ XNMALLOC (2 + strlen (progname) + 1, char); ++ progpathname[0] = '.'; ++ progpathname[1] = NATIVE_SLASH; ++ memcpy (progpathname + 2, progname, ++ strlen (progname) + 1); ++ } ++ ++ free (path_copy); ++ return progpathname; ++ } + +- free (path_copy); +- return progpathname; ++ errno = EACCES; ++ } + } + + if (errno != ENOENT) diff --git a/devel/gmake43/files/patch-lib-glob.c b/devel/gmake43/files/patch-lib-glob.c new file mode 100644 index 000000000000..a51d38144d88 --- /dev/null +++ b/devel/gmake43/files/patch-lib-glob.c @@ -0,0 +1,10 @@ +--- lib/glob.c.orig 2020-01-03 07:11:27 UTC ++++ lib/glob.c +@@ -203,7 +203,6 @@ my_realloc (p, n) + return (char *) malloc (n); + return (char *) realloc (p, n); + } +-# define realloc my_realloc + # endif /* __SASC */ + #endif /* __GNU_LIBRARY__ || __DJGPP__ */ + diff --git a/devel/gmake43/files/patch-src-default.c b/devel/gmake43/files/patch-src-default.c new file mode 100644 index 000000000000..df78eb415b2e --- /dev/null +++ b/devel/gmake43/files/patch-src-default.c @@ -0,0 +1,11 @@ +--- src/default.c.orig 2020-01-03 07:11:27 UTC ++++ src/default.c +@@ -530,7 +530,7 @@ static const char *default_variables[] = + "OBJC", "gcc", + #else + "CC", "cc", +- "CXX", "g++", ++ "CXX", "c++", + "OBJC", "cc", + #endif + diff --git a/devel/gmake43/files/patch-src-makeint.h b/devel/gmake43/files/patch-src-makeint.h new file mode 100644 index 000000000000..0bf6dad2f146 --- /dev/null +++ b/devel/gmake43/files/patch-src-makeint.h @@ -0,0 +1,10 @@ +--- src/makeint.h.orig 2020-01-19 20:32:59 UTC ++++ src/makeint.h +@@ -116,7 +116,6 @@ extern int errno; + + /* Some systems define _POSIX_VERSION but are not really POSIX.1. */ + #if (defined (butterfly) || defined (__arm) || (defined (__mips) && defined (_SYSTYPE_SVR3)) || (defined (sequent) && defined (i386))) +-# undef POSIX + #endif + + #if !defined (POSIX) && defined (_AIX) && defined (_POSIX_SOURCE) diff --git a/devel/gmake43/pkg-descr b/devel/gmake43/pkg-descr new file mode 100644 index 000000000000..9e064d213a00 --- /dev/null +++ b/devel/gmake43/pkg-descr @@ -0,0 +1,3 @@ +GNU make is a tool that controls the generation of executables and other +non-source files from source files. Its purpose is the same as that +of the utility make(1). diff --git a/devel/gmake43/pkg-plist b/devel/gmake43/pkg-plist new file mode 100644 index 000000000000..7979f4a46ae9 --- /dev/null +++ b/devel/gmake43/pkg-plist @@ -0,0 +1,32 @@ +bin/gmake +include/gnumake.h +%%NLS%%share/locale/be/LC_MESSAGES/make.mo +%%NLS%%share/locale/bg/LC_MESSAGES/make.mo +%%NLS%%share/locale/cs/LC_MESSAGES/make.mo +%%NLS%%share/locale/da/LC_MESSAGES/make.mo +%%NLS%%share/locale/de/LC_MESSAGES/make.mo +%%NLS%%share/locale/es/LC_MESSAGES/make.mo +%%NLS%%share/locale/fi/LC_MESSAGES/make.mo +%%NLS%%share/locale/fr/LC_MESSAGES/make.mo +%%NLS%%share/locale/ga/LC_MESSAGES/make.mo +%%NLS%%share/locale/gl/LC_MESSAGES/make.mo +%%NLS%%share/locale/he/LC_MESSAGES/make.mo +%%NLS%%share/locale/hr/LC_MESSAGES/make.mo +%%NLS%%share/locale/id/LC_MESSAGES/make.mo +%%NLS%%share/locale/it/LC_MESSAGES/make.mo +%%NLS%%share/locale/ja/LC_MESSAGES/make.mo +%%NLS%%share/locale/ko/LC_MESSAGES/make.mo +%%NLS%%share/locale/lt/LC_MESSAGES/make.mo +%%NLS%%share/locale/nl/LC_MESSAGES/make.mo +%%NLS%%share/locale/pl/LC_MESSAGES/make.mo +%%NLS%%share/locale/pt/LC_MESSAGES/make.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/make.mo +%%NLS%%share/locale/ru/LC_MESSAGES/make.mo +%%NLS%%share/locale/sr/LC_MESSAGES/make.mo +%%NLS%%share/locale/sv/LC_MESSAGES/make.mo +%%NLS%%share/locale/tr/LC_MESSAGES/make.mo +%%NLS%%share/locale/uk/LC_MESSAGES/make.mo +%%NLS%%share/locale/vi/LC_MESSAGES/make.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/make.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/make.mo +share/man/man1/gmake.1.gz