freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shells/ksh-devel: update to the latest ksh93/ksh github commit

Browse Source
This commit is contained in:
Cy Schubert
2024-07-01 21:54:33 -07:00
parent 6d3749e0b0
commit c9835bc1f8
3 changed files with 5 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shells/ksh-devel/Makefile
+2 -3
View File
@@ -10,7 +10,6 @@
PORTNAME= ksh
PORTVERSION= ${AST_COMMIT_DATE}
PORTREVISION= 1
CATEGORIES= shells
PKGNAMESUFFIX= -devel
@@ -20,8 +19,8 @@ WWW= http://www.kornshell.com/
LICENSE= EPL
HASH= 1407f3be
AST_COMMIT_DATE= 2024.06.26
HASH= 9f856b04
AST_COMMIT_DATE= 2024.07.01
USES= compiler:c11
shells/ksh-devel/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1719406732
SHA256 (ksh93-ksh-2024.06.26-1407f3be_GH0.tar.gz) = e91b0c27d60af06527feedd0745cd4c63941e88161a4aba61db9a6b044057238
SIZE (ksh93-ksh-2024.06.26-1407f3be_GH0.tar.gz) = 2088543
TIMESTAMP = 1719895731
SHA256 (ksh93-ksh-2024.07.01-9f856b04_GH0.tar.gz) = 43f36cd250a60af62d5336905cd928dd115c0e850f56aa044ef4d75c99df3581
SIZE (ksh93-ksh-2024.07.01-9f856b04_GH0.tar.gz) = 2089750
shells/ksh-devel/files/patch-src_INIT_mamake.c
-53
View File
@@ -1,53 +0,0 @@
diff --git src/cmd/INIT/mamake.c src/cmd/INIT/mamake.c
index 1cc85f1f..6785ff03 100644
--- src/cmd/INIT/mamake.c
+++ src/cmd/INIT/mamake.c
@@ -27,7 +27,7 @@
* coded for portability
*/
-#define RELEASE_DATE "2024-06-25"
+#define RELEASE_DATE "2024-04-02"
static char id[] = "\n@(#)$Id: mamake (ksh 93u+m) " RELEASE_DATE " $\0\n";
#if _PACKAGE_ast
@@ -297,6 +297,7 @@ static struct /* program state */
int indent; /* debug indent */
int keepgoing; /* do siblings on error */
int never; /* never execute */
+ int probed; /* probe already done */
int verified; /* don't bother with verify() */
Stream_t streams[4]; /* input file stream stack */
@@ -1346,7 +1347,7 @@ static unsigned long run(Rule_t *r, char *s)
/* find commands in the current working directory first */
append(buf,
"case $PATH in\n"
- ".:* | :*) ;;\n"
+ ".:*) ;;\n"
"*) PATH=.:$PATH;;\n"
"esac\n"
);
@@ -1860,7 +1861,7 @@ static unsigned long make(Rule_t *r, int inloop, unsigned long modtime, Buf_t **
else
s = 0;
/* only bother if t is a path to a *.a we built (i.e. not -l...) */
- if (t[0] && (t[0] != '-' || t[1] != 'l'))
+ if (t[0] != '-' || t[1] != 'l')
{
q = rule(expand(buf, t));
attributes(q, v);
@@ -2112,8 +2113,11 @@ static unsigned long make(Rule_t *r, int inloop, unsigned long modtime, Buf_t **
setval(state.vars, t, v);
if (strcmp(t, "MAMAKE_STRICT") == 0)
state.strict = *v ? atoi(v) : 1;
- else if (strcmp(t, "CC") == 0)
- probe();
+ }
+ if (!state.probed && strcmp(t, "CC") == 0)
+ {
+ state.probed = 1;
+ probe();
}
continue;